openchs-models 1.31.6 → 1.31.8

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

@@ -21,8 +21,6 @@ var _ChecklistDetail = _interopRequireDefault(require("./ChecklistDetail"));
 
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
-var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -128,10 +126,6 @@ class Checklist extends _BaseEntity.default {
         }`;
   }
 
-  addApprovalDescendantsWithLatestStatus(approvalStatus_status, list) {
-    _EntityApprovalStatus.default.addMatchingApprovalStatusEntity(this.items, approvalStatus_status, "baseDate", list);
-  }
-
 }
 
 _defineProperty(Checklist, "schema", {

package/dist/ChecklistItem.js

@@ -305,10 +305,6 @@ class ChecklistItem extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
-  getSchemaName() {
-    return _SchemaNames.default.ChecklistItem;
-  }
-
 }
 
 _defineProperty(ChecklistItem, "schema", {

package/dist/Encounter.js

@@ -109,10 +109,6 @@ class Encounter extends _AbstractEncounter.default {
     return realmEncounter;
   }
 
-  getSchemaName() {
-    return _SchemaNames.default.Encounter;
-  }
-
 }
 
 _defineProperty(Encounter, "schema", {

package/dist/EntityApprovalStatus.js

@@ -22,17 +22,6 @@ 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, 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() {
     return [_SchemaNames.default.Individual, _SchemaNames.default.ProgramEncounter, _SchemaNames.default.Encounter, _SchemaNames.default.ProgramEnrolment, _SchemaNames.default.ChecklistItem];
   }
@@ -152,22 +141,6 @@ class EntityApprovalStatus extends _BaseEntity.default {
     }];
   }
 
-  hasStatus(status) {
-    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

@@ -232,7 +232,7 @@ class Individual extends _BaseEntity.default {
     const individual = new Individual();
     individual.uuid = _General.default.randomUUID();
     individual.subjectType = _SubjectType.default.create("");
-    individual.registrationDate = (0, _moment.default)().startOf('day').toDate();
+    individual.registrationDate = new Date();
     individual.gender = _Gender.default.create("");
     individual.observations = [];
     individual.encounters = [];
@@ -330,7 +330,7 @@ class Individual extends _BaseEntity.default {
   }
 
   static associateRelationship(child, childEntityClass, childResource, entityService) {
-    let individual = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, "individualAUUID", Individual.schema.name);
+    var individual = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, "individualAUUID", Individual.schema.name);
 
     individual = _General.default.pick(individual, ["uuid"], ["enrolments", "encounters", "relationships", "groupSubjects", "comments", "groups"]);
 
@@ -351,7 +351,7 @@ class Individual extends _BaseEntity.default {
 
 
     try {
-      let memberSubject = getParentByUUID("memberSubjectUUID");
+      var memberSubject = getParentByUUID("memberSubjectUUID");
       memberSubject = copyFieldsForSubject(memberSubject);
 
       _BaseEntity.default.addNewChild(child, memberSubject.groups);
@@ -453,12 +453,12 @@ class Individual extends _BaseEntity.default {
   }
 
   setDateOfBirth(date) {
-    this.dateOfBirth = (0, _moment.default)(date).startOf('day').toDate();
+    this.dateOfBirth = date;
     this.dateOfBirthVerified = true;
   }
 
   setAge(age, isInYears) {
-    this.dateOfBirth = (0, _moment.default)().subtract(age, isInYears ? "years" : "months").startOf('day').toDate();
+    this.dateOfBirth = (0, _moment.default)().subtract(age, isInYears ? "years" : "months").toDate();
     this.dateOfBirthVerified = false;
   }
 
@@ -971,21 +971,6 @@ class Individual extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
-  getMemberEntitiesWithLatestStatus(approvalStatus_status) {
-    let descendants = [];
-    if (!_lodash.default.isNil(this.latestEntityApprovalStatus) && this.latestEntityApprovalStatus.hasStatus(approvalStatus_status)) descendants.push(this);
-
-    _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 => {
-      const latestEntity = enrolment.addApprovalDescendantsWithLatestStatus(approvalStatus_status, descendants);
-      if (!_lodash.default.isNil(latestEntity)) descendants.push(latestEntity);
-    });
-    return descendants;
-  }
-
   toJSON() {
     return {
       uuid: this.uuid,
@@ -1011,10 +996,6 @@ class Individual extends _BaseEntity.default {
     };
   }
 
-  getSchemaName() {
-    return _SchemaNames.default.Individual;
-  }
-
 }
 
 _defineProperty(Individual, "schema", {

package/dist/ProgramEncounter.js

@@ -145,10 +145,6 @@ class ProgramEncounter extends _AbstractEncounter.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
-  getSchemaName() {
-    return _SchemaNames.default.ProgramEncounter;
-  }
-
 }
 
 _defineProperty(ProgramEncounter, "fieldKeys", {

package/dist/ProgramEnrolment.js

@@ -591,14 +591,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
-  addApprovalDescendantsWithLatestStatus(approvalStatus_status, list) {
-    _EntityApprovalStatus.default.addMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status, "encounterDateTime", list, "encounterType.uuid");
-
-    this.checklists.filter(x => !x.voided).forEach(x => {
-      x.addApprovalDescendantsWithLatestStatus(approvalStatus_status, list);
-    });
-  }
-
   toJSON() {
     return {
       uuid: this.uuid,
@@ -619,10 +611,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     };
   }
 
-  getSchemaName() {
-    return _SchemaNames.default.ProgramEnrolment;
-  }
-
 }
 
 _defineProperty(ProgramEnrolment, "schema", {

package/dist/RuleFailureTelemetry.js

@@ -172,10 +172,22 @@ _defineProperty(RuleFailureTelemetry, "schema", {
       default: false
     },
     errorDateTime: "date",
-    sourceType: "string",
-    sourceId: "string",
-    entityType: "string",
-    entityId: "string",
+    sourceType: {
+      type: "string",
+      optional: true
+    },
+    sourceId: {
+      type: "string",
+      optional: true
+    },
+    entityType: {
+      type: "string",
+      optional: true
+    },
+    entityId: {
+      type: "string",
+      optional: true
+    },
     appType: "string"
   }
 });

package/dist/StandardReportCardType.js

@@ -11,8 +11,6 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _TaskType = _interopRequireDefault(require("./task/TaskType"));
 
-var _ApprovalStatus = _interopRequireDefault(require("./ApprovalStatus"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -112,10 +110,6 @@ class StandardReportCardType extends _BaseEntity.default {
     return _.includes(this.defaultTypes(), this.name);
   }
 
-  getApprovalStatusForType() {
-    return typeToStatusMap[this.name];
-  }
-
 }
 
 _defineProperty(StandardReportCardType, "schema", {
@@ -151,10 +145,5 @@ _defineProperty(StandardReportCardType, "type", {
   DueChecklist: "Due checklist"
 });
 
-const typeToStatusMap = {
-  [StandardReportCardType.type.PendingApproval]: _ApprovalStatus.default.statuses.Pending,
-  [StandardReportCardType.type.Approved]: _ApprovalStatus.default.statuses.Approved,
-  [StandardReportCardType.type.Rejected]: _ApprovalStatus.default.statuses.Rejected
-};
 var _default = StandardReportCardType;
 exports.default = _default;

package/dist/application/FormMapping.js

@@ -100,6 +100,58 @@ class FormMapping extends _BaseEntity.default {
     return formMapping;
   }
 
+  getSchemaAndFilterQuery() {
+    switch (this.form.formType) {
+      case _Form.default.formTypes.IndividualProfile:
+        return {
+          schema: "Individual",
+          filterQuery: `subjectType.uuid = '${this.subjectType.uuid}'`
+        };
+
+      case _Form.default.formTypes.IndividualEncounterCancellation:
+        return {
+          schema: "Encounter",
+          filterQuery: `individual.subjectType.uuid = '${this.subjectType.uuid}' and encounterType.uuid = '${this.observationsTypeEntityUUID}' and cancelDateTime <> null`
+        };
+
+      case _Form.default.formTypes.Encounter:
+        return {
+          schema: "Encounter",
+          filterQuery: `individual.subjectType.uuid = '${this.subjectType.uuid}' and encounterType.uuid = '${this.observationsTypeEntityUUID}' and cancelDateTime = null`
+        };
+
+      case _Form.default.formTypes.ProgramEnrolment:
+        return {
+          schema: "ProgramEnrolment",
+          filterQuery: `individual.subjectType.uuid = '${this.subjectType.uuid}' and program.uuid = '${this.entityUUID}' and programExitDateTime = null`
+        };
+
+      case _Form.default.formTypes.ProgramExit:
+        return {
+          schema: "ProgramEnrolment",
+          filterQuery: `individual.subjectType.uuid = '${this.subjectType.uuid}' and program.uuid = '${this.entityUUID}' and programExitDateTime <> null`
+        };
+
+      case _Form.default.formTypes.ProgramEncounter:
+        return {
+          schema: "ProgramEncounter",
+          filterQuery: `programEnrolment.individual.subjectType.uuid = '${this.subjectType.uuid}' and programEnrolment.program.uuid =  '${this.entityUUID}' and encounterType.uuid = '${this.observationsTypeEntityUUID}' and cancelDateTime = null`
+        };
+
+      case _Form.default.formTypes.ProgramEncounterCancellation:
+        return {
+          schema: "ProgramEncounter",
+          filterQuery: `programEnrolment.individual.subjectType.uuid = '${this.subjectType.uuid}' and programEnrolment.program.uuid =  '${this.entityUUID}' and encounterType.uuid = '${this.observationsTypeEntityUUID}' and cancelDateTime <> null`
+        };
+
+      case _Form.default.formTypes.ChecklistItem:
+        return {
+          schema: "ChecklistItem",
+          filterQuery: ''
+        };
+    }
+  }
+
   getEntityNameAndEntityTypeUUID() {
     const formTypes = _Form.default.formTypes;
 

package/dist/draft/DraftEncounter.js

@@ -124,13 +124,13 @@ class DraftEncounter extends _BaseEntity.default {
     draftEncounter.encounterType = encounter.encounterType;
     draftEncounter.encounterDateTime = encounter.encounterDateTime;
     draftEncounter.individual = encounter.individual;
-    draftEncounter.observations = _ObservationsHolder.default.clone(encounter.observations);
+    draftEncounter.observations = encounter.observations;
     draftEncounter.encounterLocation = encounter.encounterLocation;
     draftEncounter.name = encounter.name;
     draftEncounter.earliestVisitDateTime = encounter.earliestVisitDateTime;
     draftEncounter.maxVisitDateTime = encounter.maxVisitDateTime;
     draftEncounter.cancelDateTime = encounter.cancelDateTime;
-    draftEncounter.cancelObservations = _ObservationsHolder.default.clone(encounter.cancelObservations);
+    draftEncounter.cancelObservations = encounter.cancelObservations;
     draftEncounter.cancelLocation = encounter.cancelLocation;
     draftEncounter.voided = encounter.voided;
     draftEncounter.registrationLocation = encounter.registrationLocation;

package/dist/draft/DraftSubject.js

@@ -148,7 +148,7 @@ class DraftSubject extends _BaseEntity.default {
     draftSubject.dateOfBirthVerified = subject.dateOfBirthVerified;
     draftSubject.gender = subject.gender;
     draftSubject.lowestAddressLevel = subject.lowestAddressLevel;
-    draftSubject.observations = _ObservationsHolder.default.clone(subject.observations);
+    draftSubject.observations = subject.observations;
     draftSubject.registrationLocation = subject.registrationLocation;
     draftSubject.totalMembers = _.isEmpty(totalMembers) ? null : totalMembers;
     draftSubject.updatedOn = new Date();

package/dist/framework/RealmResultsProxy.js

@@ -60,9 +60,7 @@ class RealmResultsProxy {
 
   filtered(query, ...args) {
     if (this.logQueries) console.log(this.entityClass, query, ...args);
-    const realmResultsProxy = RealmResultsProxy.create(this.realmCollection.filtered(query, ...args), this.entityClass);
-    realmResultsProxy.setLogQueries(this.logQueries);
-    return realmResultsProxy;
+    return RealmResultsProxy.create(this.realmCollection.filtered(query, ...args), this.entityClass);
   }
 
   getAt(index) {

package/package.json

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