Merge pull request #419 from compucorp/RSE-1053-fix-create-activity

RSE-1053: Fix create activity
compucorp · Apr 1, 2020 · f6238ca · f6238ca
2 parents bbf722a + b91fccb
commit f6238ca
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/ang/civicase-base/providers/case-type.provider.js b/ang/civicase-base/providers/case-type.provider.js
@@ -12,6 +12,7 @@
     this.$get = $get;
     this.getAll = getAll;
     this.getByCategory = getByCategory;
+    this.getById = getById;
     this.getTitlesForNames = getTitlesForNames;
 
     /**
@@ -24,6 +25,7 @@
       return {
         getAll: getAll,
         getByCategory: getByCategory,
+        getById: getById,
         getItemsForCaseType: getItemsForCaseType,
         getTitlesForNames: getTitlesForNames
       };
@@ -58,6 +60,14 @@
       });
     }
 
+    /**
+     * @param {number} caseTypeId the id for the case type.
+     * @returns {object} the case type for the given ID.
+     */
+    function getById (caseTypeId) {
+      return caseTypes[caseTypeId];
+    }
+
     /**
      * Returns a list of case type titles for the given names.
      *

diff --git a/ang/civicase/activity/directives/add-activity-menu.directive.js b/ang/civicase/activity/directives/add-activity-menu.directive.js
@@ -107,7 +107,11 @@
      * @returns {string} url
      */
     $scope.newActivityUrl = function (actType) {
-      var caseQueryParams = JSON.stringify(getCaseQueryParams({ caseId: $scope.case.id }));
+      var caseType = CaseType.getById($scope.case.case_type_id);
+      var caseQueryParams = JSON.stringify(getCaseQueryParams({
+        caseId: $scope.case.id,
+        caseTypeCategory: caseType.case_type_category
+      }));
       var newActivity = {
         activity_type_id: actType.id,
         case_id: $scope.case.id,

diff --git a/ang/test/civicase-base/services/case-type.service.spec.js b/ang/test/civicase-base/services/case-type.service.spec.js
@@ -1,6 +1,6 @@
 /* eslint-env jasmine */
 
-(() => {
+((_) => {
   describe('Case Type', () => {
     let CaseType, CaseTypesData;
 
@@ -40,5 +40,19 @@
         ]);
       });
     });
+
+    describe('when getting a case type by id', () => {
+      let expectedCaseType, returnedCaseType;
+
+      beforeEach(() => {
+        const caseTypeId = _.chain(CaseTypesData).keys().sample().value();
+        expectedCaseType = CaseTypesData[caseTypeId];
+        returnedCaseType = CaseType.getById(caseTypeId);
+      });
+
+      it('returns the matching case type', () => {
+        expect(returnedCaseType).toEqual(expectedCaseType);
+      });
+    });
   });
-})();
+})(CRM._);