openchs-models 1.30.96 → 1.30.98

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 {
         }`;
   }
 
-  getApprovalDescendantsWithLatestStatus(approvalStatus_status) {
-    return _EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.items, approvalStatus_status);
-  }
-
 }
 
 _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,10 +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) {
-    return entities.filter(x => !_lodash.default.isNil(x.latestEntityApprovalStatus) && x.latestEntityApprovalStatus.hasStatus(approvalStatus_status));
-  }
-
   static getApprovalEntitiesSchema() {
     return [_SchemaNames.default.Individual, _SchemaNames.default.ProgramEncounter, _SchemaNames.default.Encounter, _SchemaNames.default.ProgramEnrolment, _SchemaNames.default.ChecklistItem];
   }
@@ -145,10 +141,6 @@ class EntityApprovalStatus extends _BaseEntity.default {
     }];
   }
 
-  hasStatus(status) {
-    return this.approvalStatus.status === status;
-  }
-
 }
 
 _defineProperty(EntityApprovalStatus, "schema", {

package/dist/Individual.js

@@ -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);
@@ -971,17 +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);
-    descendants = descendants.concat(_EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status));
-    descendants = descendants.concat(_EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.nonVoidedEnrolments(), approvalStatus_status));
-    this.nonVoidedEnrolments().forEach(enrolment => {
-      descendants = descendants.concat(enrolment.getApprovalDescendantsWithLatestStatus(approvalStatus_status));
-    });
-    return descendants;
-  }
-
   toJSON() {
     return {
       uuid: this.uuid,
@@ -1007,10 +996,6 @@ class Individual extends _BaseEntity.default {
     };
   }
 
-  getSchemaName() {
-    return _SchemaNames.default.Individual;
-  }
-
 }
 
 _defineProperty(Individual, "schema", {

package/dist/Observation.js

@@ -264,5 +264,10 @@ _defineProperty(Observation, "schema", {
   }
 });
 
+_defineProperty(Observation, "AnswerSource", {
+  Manual: 'manual',
+  Auto: 'auto'
+});
+
 var _default = Observation;
 exports.default = _default;

package/dist/ObservationsHolder.js

@@ -121,9 +121,9 @@ class ObservationsHolder {
     }
   }
 
-  addOrUpdatePrimitiveObs(concept, value, answerSource = _General.default.AnswerSource.Manual) {
+  addOrUpdatePrimitiveObs(concept, value, answerSource = _Observation.default.AnswerSource.Manual) {
     let currentObservation = this.findObservation(concept);
-    const currentValue = currentObservation && currentObservation.getValueWrapper() || {}; // if (currentValue.answerSource === General.AnswerSource.Manual) return;
+    const currentValue = currentObservation && currentObservation.getValueWrapper() || {};
 
     this._removeExistingObs(concept);
 
@@ -146,7 +146,7 @@ class ObservationsHolder {
     }
   }
 
-  addOrUpdateCodedObs(concept, value, isSingleSelect) {
+  addOrUpdateCodedObs(concept, value, isSingleSelect, answerSource = _Observation.default.AnswerSource.Auto) {
     this._removeExistingObs(concept);
 
     const getConceptUUID = conceptAnswer => conceptAnswer ? conceptAnswer.concept.uuid : undefined;
@@ -154,7 +154,7 @@ class ObservationsHolder {
     if (!_lodash.default.isEmpty(value)) {
       const answerUUID = isSingleSelect ? getConceptUUID(concept.getAnswerWithConceptName(value)) : value.map(v => getConceptUUID(concept.getAnswerWithConceptName(v)));
 
-      const observation = _Observation.default.create(concept, isSingleSelect ? new _SingleCodedValue.default(answerUUID, _General.default.AnswerSource.Auto) : new _MultipleCodedValues.default(answerUUID, _General.default.AnswerSource.Auto));
+      const observation = _Observation.default.create(concept, isSingleSelect ? new _SingleCodedValue.default(answerUUID, answerSource) : new _MultipleCodedValues.default(answerUUID, answerSource));
 
       this.observations.push(observation);
     }
@@ -300,15 +300,7 @@ class ObservationsHolder {
             });
           });
         } else {
-          const observation = this.findObservation(concept);
-
-          if (!_lodash.default.isNil(observation) && observation.valueJSON.answerSource === _General.default.AnswerSource.Manual) {
-            _General.default.logDebug('ObservationsHolder', 'updatePrimitiveCodedObs: Not updating because answerSource is manual');
-
-            return;
-          }
-
-          concept.isCodedConcept() ? this.addOrUpdateCodedObs(concept, value, fe.isSingleSelect()) : this.addOrUpdatePrimitiveObs(concept, value, _General.default.AnswerSource.Auto);
+          concept.isCodedConcept() ? this.addOrUpdateCodedObs(concept, value, fe.isSingleSelect()) : this.addOrUpdatePrimitiveObs(concept, value, _Observation.default.AnswerSource.Auto);
         }
       }
     });
@@ -334,6 +326,7 @@ class ObservationsHolder {
         return null;
       }
 
+      observation.valueJSON.answerSource = _Observation.default.AnswerSource.Manual;
       return observation;
     }
   }

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,15 +591,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
-  getApprovalDescendantsWithLatestStatus(approvalStatus_status) {
-    let descendants = _EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status);
-
-    this.checklists.filter(x => !x.voided).forEach(x => {
-      descendants = descendants.concat(x.getApprovalDescendantsWithLatestStatus(approvalStatus_status));
-    });
-    return descendants;
-  }
-
   toJSON() {
     return {
       uuid: this.uuid,
@@ -620,10 +611,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     };
   }
 
-  getSchemaName() {
-    return _SchemaNames.default.ProgramEnrolment;
-  }
-
 }
 
 _defineProperty(ProgramEnrolment, "schema", {

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/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/dist/observation/MultipleCodedValues.js

@@ -9,12 +9,12 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _ArrayHelper = _interopRequireDefault(require("../framework/ArrayHelper"));
 
-var _General = _interopRequireDefault(require("../utility/General"));
+var _Observation = _interopRequireDefault(require("../Observation"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class MultipleCodedValues {
-  constructor(answer, answerSource = _General.default.AnswerSource.Manual) {
+  constructor(answer, answerSource = _Observation.default.AnswerSource.Manual) {
     this.answer = _lodash.default.isNil(answer) ? [] : answer;
     this.answerSource = answerSource;
   }

package/dist/observation/PrimitiveValue.js

@@ -13,10 +13,12 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _General = _interopRequireDefault(require("../utility/General"));
 
+var _Observation = _interopRequireDefault(require("../Observation"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class PrimitiveValue {
-  constructor(value, datatype, answerSource = _General.default.AnswerSource.Manual) {
+  constructor(value, datatype, answerSource = _Observation.default.AnswerSource.Manual) {
     this.value = value;
     this.datatype = datatype;
     this.answer = this._valueFromString();

package/dist/observation/SingleCodedValue.js

@@ -7,12 +7,12 @@ exports.default = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _General = _interopRequireDefault(require("../utility/General"));
+var _Observation = _interopRequireDefault(require("../Observation"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class SingleCodedValue {
-  constructor(answerUUID, answerSource = _General.default.AnswerSource.Manual) {
+  constructor(answerUUID, answerSource = _Observation.default.AnswerSource.Manual) {
     this.answer = answerUUID;
     this.answerSource = answerSource;
   }

package/dist/utility/General.js

@@ -303,10 +303,5 @@ _defineProperty(General, "LogLevel", {
   Debug: 1
 });
 
-_defineProperty(General, "AnswerSource", {
-  Manual: 'manual',
-  Auto: 'auto'
-});
-
 var _default = General;
 exports.default = _default;

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.98",
     "private": false,
     "repository": {
         "type": "git",