openchs-models 1.30.96 → 1.30.99

package/Makefile

@@ -13,7 +13,7 @@ build:
 
 release: get-current-version
 	@echo "\033[0m"
-	yarn version
+	@yarn version
 	@echo "   Now please run \nmake publish"
 
 publish:

package/dist/Checklist.js

@@ -128,8 +128,8 @@ class Checklist extends _BaseEntity.default {
         }`;
   }
 
-  getApprovalDescendantsWithLatestStatus(approvalStatus_status) {
-    return _EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.items, approvalStatus_status);
+  addApprovalDescendantsWithLatestStatus(approvalStatus_status, list) {
+    _EntityApprovalStatus.default.addMatchingApprovalStatusEntity(this.items, approvalStatus_status, "baseDate", list);
   }
 
 }

package/dist/EntityApprovalStatus.js

@@ -22,8 +22,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class EntityApprovalStatus extends _BaseEntity.default {
-  static getMatchingApprovalStatusEntity(entities, approvalStatus_status) {
-    return entities.filter(x => !_lodash.default.isNil(x.latestEntityApprovalStatus) && x.latestEntityApprovalStatus.hasStatus(approvalStatus_status));
+  static getMatchingApprovalStatusEntity(entities, approvalStatus_status, latestFieldPath) {
+    return _lodash.default.max(entities.filter(x => !_lodash.default.isNil(x.latestEntityApprovalStatus) && x.latestEntityApprovalStatus.hasStatus(approvalStatus_status)), y => _lodash.default.get(y, latestFieldPath));
+  }
+
+  static addMatchingApprovalStatusEntity(entities, approvalStatus_status, latestFieldPath, list, groupingByPath) {
+    Object.values(_lodash.default.groupBy(entities, x => _lodash.default.get(x, groupingByPath))).forEach(y => {
+      const latestEntity = EntityApprovalStatus.getMatchingApprovalStatusEntity(y, approvalStatus_status, latestFieldPath);
+      if (!_lodash.default.isNil(latestEntity)) list.push(latestEntity);
+    });
   }
 
   static getApprovalEntitiesSchema() {
@@ -149,6 +156,18 @@ class EntityApprovalStatus extends _BaseEntity.default {
     return this.approvalStatus.status === status;
   }
 
+  get isRejected() {
+    return this.approvalStatus.isRejected;
+  }
+
+  get isApproved() {
+    return this.approvalStatus.isApproved;
+  }
+
+  get isPending() {
+    return this.approvalStatus.isPending;
+  }
+
 }
 
 _defineProperty(EntityApprovalStatus, "schema", {

package/dist/Individual.js

@@ -974,10 +974,14 @@ class Individual extends _BaseEntity.default {
   getMemberEntitiesWithLatestStatus(approvalStatus_status) {
     let descendants = [];
     if (!_lodash.default.isNil(this.latestEntityApprovalStatus) && this.latestEntityApprovalStatus.hasStatus(approvalStatus_status)) descendants.push(this);
-    descendants = descendants.concat(_EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status));
-    descendants = descendants.concat(_EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.nonVoidedEnrolments(), approvalStatus_status));
+
+    _EntityApprovalStatus.default.addMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status, "encounterDateTime", descendants, "encounterType.uuid");
+
+    _EntityApprovalStatus.default.addMatchingApprovalStatusEntity(this.nonVoidedEnrolments(), approvalStatus_status, "enrolmentDateTime", descendants, "program.uuid");
+
     this.nonVoidedEnrolments().forEach(enrolment => {
-      descendants = descendants.concat(enrolment.getApprovalDescendantsWithLatestStatus(approvalStatus_status));
+      const latestEntity = enrolment.addApprovalDescendantsWithLatestStatus(approvalStatus_status, descendants);
+      if (!_lodash.default.isNil(latestEntity)) descendants.push(latestEntity);
     });
     return descendants;
   }

package/dist/ProgramEnrolment.js

@@ -591,13 +591,12 @@ class ProgramEnrolment extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
-  getApprovalDescendantsWithLatestStatus(approvalStatus_status) {
-    let descendants = _EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status);
+  addApprovalDescendantsWithLatestStatus(approvalStatus_status, list) {
+    _EntityApprovalStatus.default.addMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status, "encounterDateTime", list, "encounterType.uuid");
 
     this.checklists.filter(x => !x.voided).forEach(x => {
-      descendants = descendants.concat(x.getApprovalDescendantsWithLatestStatus(approvalStatus_status));
+      x.addApprovalDescendantsWithLatestStatus(approvalStatus_status, list);
     });
-    return descendants;
   }
 
   toJSON() {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.30.96",
+    "version": "1.30.99",
     "private": false,
     "repository": {
         "type": "git",