diff --git a/entity/Activity_entity/entityfields/category/displayValueProcess.js b/entity/Activity_entity/entityfields/category/displayValueProcess.js index 05aefdcf5311c34ab4c294743782a3f70f8ce8c7..5a77b5521266503239321a1a8a471047b9c58cd9 100644 --- a/entity/Activity_entity/entityfields/category/displayValueProcess.js +++ b/entity/Activity_entity/entityfields/category/displayValueProcess.js @@ -1,6 +1,6 @@ -import("system.result"); -import("system.vars"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); - -result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY"))); +import("system.result"); +import("system.vars"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY"))); \ No newline at end of file diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js index c30d6b2520c493830ac572123194912dd8ef0d1b..db1ed69d22949c42f33e439c7a6fe0d8b9bcb94b 100644 --- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js +++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js @@ -1,7 +1,5 @@ import("system.vars"); import("system.result"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); -var histMedium = vars.get("$field.CATEGORY"); -result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), histMedium) + ")" : "")); +var category = vars.get("$field.CATEGORY.displayValue"); +result.string(vars.get("$field.SUBJECT") + (category ? " (" + category + ")" : "")); \ No newline at end of file