From 97b291862968a3d516775133ef8bfa9034c69eda Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 28 Apr 2017 10:51:03 -0400 Subject: [PATCH 1/4] CRM-20478 Case type timeline: restore list of activity types --- ang/crmCaseType/timelineTable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html index 27beff493f3c..e447f535dbd3 100644 --- a/ang/crmCaseType/timelineTable.html +++ b/ang/crmCaseType/timelineTable.html @@ -39,7 +39,7 @@ ui-jq="select2" ui-options="{dropdownAutoWidth : true}" ng-model="activity.reference_activity" - ng-options="actTypeName as actTypeName for actTypeName in activityTypeNames" + ng-options="activityType.name as activityType.label for (activityTypeName,activityType) in activityTypes" ng-hide="activity.name == 'Open Case'" ng-required="activity.name != 'Open Case'" > From be5aae338c4f9e20f5166c10530e9391953f6785 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 28 Apr 2017 21:46:47 -0400 Subject: [PATCH 2/4] CRM-20478 Case type: timeline displayed activity type and status names rather than labels --- ang/crmCaseType.js | 6 ++++++ ang/crmCaseType/timelineTable.html | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ang/crmCaseType.js b/ang/crmCaseType.js index d1765d5c4ca3..f4e732bd6dd8 100644 --- a/ang/crmCaseType.js +++ b/ang/crmCaseType.js @@ -149,6 +149,11 @@ $scope.caseType.definition = $scope.caseType.definition || []; $scope.caseType.definition.activityTypes = $scope.caseType.definition.activityTypes || []; $scope.caseType.definition.activitySets = $scope.caseType.definition.activitySets || []; + _.each($scope.caseType.definition.activitySets, function (set) { + _.each(set.activityTypes, function (type, name) { + type.label = $scope.activityTypes[type.name].label; + }); + }); $scope.caseType.definition.caseRoles = $scope.caseType.definition.caseRoles || []; $scope.caseType.definition.statuses = $scope.caseType.definition.statuses || []; @@ -181,6 +186,7 @@ function addActivityToSet(activitySet, activityTypeName) { activitySet.activityTypes.push({ name: activityTypeName, + label: $scope.activityTypes[activityTypeName].label, status: 'Scheduled', reference_activity: 'Open Case', reference_offset: '1', diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html index e447f535dbd3..c8108f98496d 100644 --- a/ang/crmCaseType/timelineTable.html +++ b/ang/crmCaseType/timelineTable.html @@ -22,14 +22,14 @@ - {{ activity.name }} + {{ activity.label }} @@ -39,7 +39,7 @@ ui-jq="select2" ui-options="{dropdownAutoWidth : true}" ng-model="activity.reference_activity" - ng-options="activityType.name as activityType.label for (activityTypeName,activityType) in activityTypes" + ng-options="activityType.name as activityType.label for activityType in activitySet.activityTypes" ng-hide="activity.name == 'Open Case'" ng-required="activity.name != 'Open Case'" > From 69ca66d295973156b79bfc0aea5474671c345589 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Fri, 28 Apr 2017 22:10:18 -0400 Subject: [PATCH 3/4] CRM-20478 Case type: translate newest & oldest --- ang/crmCaseType/timelineTable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html index c8108f98496d..c1ad99adaea8 100644 --- a/ang/crmCaseType/timelineTable.html +++ b/ang/crmCaseType/timelineTable.html @@ -60,7 +60,7 @@ ui-jq="select2" ui-options="{dropdownAutoWidth : true}" ng-model="activity.reference_select" - ng-options="key as value for (key,value) in {newest: 'Newest', oldest: 'Oldest'}" + ng-options="key as value for (key,value) in {newest: ts('Newest'), oldest: ts('Oldest')}" ng-hide="activity.name == 'Open Case'" ng-required="activity.name != 'Open Case'" > From ba1ac52dff875bb2e4aa291d89634ce7bacad790 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Mon, 1 May 2017 11:19:05 -0400 Subject: [PATCH 4/4] CRM-20478 Case type: test missing activity types for lookup --- tests/karma/unit/crmCaseTypeSpec.js | 31 ++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/tests/karma/unit/crmCaseTypeSpec.js b/tests/karma/unit/crmCaseTypeSpec.js index 3c20dc32c3f8..9c87916489d6 100644 --- a/tests/karma/unit/crmCaseTypeSpec.js +++ b/tests/karma/unit/crmCaseTypeSpec.js @@ -121,7 +121,36 @@ describe('crmCaseType', function() { "is_reserved": "1", "is_active": "1", "component_id": "7" - } + }, + { + "id": "18", + "option_group_id": "2", + "label": "Open Case", + "value": "13", + "name": "Open Case", + "filter": "0", + "is_default": "0", + "weight": "13", + "is_optgroup": "0", + "is_reserved": "1", + "is_active": "1", + "component_id": "7", + "icon": "fa-folder-open-o" + }, + { + "id": "857", + "option_group_id": "2", + "label": "Medical evaluation", + "value": "55", + "name": "Medical evaluation", + "filter": "0", + "is_default": "0", + "weight": "56", + "is_optgroup": "0", + "is_reserved": "0", + "is_active": "1", + "component_id": "7" + }, ] }, relTypes: {