openchs-models 1.30.94 → 1.30.95

package/dist/Checklist.js

@@ -21,6 +21,8 @@ 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; }
@@ -126,6 +128,10 @@ class Checklist extends _BaseEntity.default {
         }`;
   }
 
+  getApprovalDescendantsWithLatestStatus(approvalStatus_status) {
+    return _EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.items, approvalStatus_status);
+  }
+
 }
 
 _defineProperty(Checklist, "schema", {

package/dist/ChecklistItem.js

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

package/dist/Encounter.js

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

package/dist/EntityApprovalStatus.js

@@ -22,6 +22,10 @@ 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];
   }
@@ -141,6 +145,10 @@ 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) {
-    var individual = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, "individualAUUID", Individual.schema.name);
+    let 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 {
-      var memberSubject = getParentByUUID("memberSubjectUUID");
+      let memberSubject = getParentByUUID("memberSubjectUUID");
       memberSubject = copyFieldsForSubject(memberSubject);
 
       _BaseEntity.default.addNewChild(child, memberSubject.groups);
@@ -971,6 +971,17 @@ 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.nonVoidedEnrolments(), approvalStatus_status));
+    descendants = descendants.concat(_EntityApprovalStatus.default.getMatchingApprovalStatusEntity(this.nonVoidedEncounters(), approvalStatus_status));
+    this.nonVoidedEnrolments().forEach(enrolment => {
+      descendants = descendants.concat(enrolment.getApprovalDescendantsWithLatestStatus(approvalStatus_status));
+    });
+    return descendants;
+  }
+
   toJSON() {
     return {
       uuid: this.uuid,
@@ -996,6 +1007,10 @@ class Individual extends _BaseEntity.default {
     };
   }
 
+  getSchemaName() {
+    return _SchemaNames.default.Individual;
+  }
+
 }
 
 _defineProperty(Individual, "schema", {

package/dist/Observation.js

@@ -264,10 +264,5 @@ _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 = _Observation.default.AnswerSource.Manual) {
+  addOrUpdatePrimitiveObs(concept, value, answerSource = _General.default.AnswerSource.Manual) {
     let currentObservation = this.findObservation(concept);
-    const currentValue = currentObservation && currentObservation.getValueWrapper() || {};
+    const currentValue = currentObservation && currentObservation.getValueWrapper() || {}; // if (currentValue.answerSource === General.AnswerSource.Manual) return;
 
     this._removeExistingObs(concept);
 
@@ -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, _Observation.default.AnswerSource.Auto) : new _MultipleCodedValues.default(answerUUID, _Observation.default.AnswerSource.Auto));
+      const observation = _Observation.default.create(concept, isSingleSelect ? new _SingleCodedValue.default(answerUUID, _General.default.AnswerSource.Auto) : new _MultipleCodedValues.default(answerUUID, _General.default.AnswerSource.Auto));
 
       this.observations.push(observation);
     }
@@ -302,13 +302,13 @@ class ObservationsHolder {
         } else {
           const observation = this.findObservation(concept);
 
-          if (!_lodash.default.isNil(observation) && observation.valueJSON.answerSource === _Observation.default.AnswerSource.Manual) {
+          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, _Observation.default.AnswerSource.Auto);
+          concept.isCodedConcept() ? this.addOrUpdateCodedObs(concept, value, fe.isSingleSelect()) : this.addOrUpdatePrimitiveObs(concept, value, _General.default.AnswerSource.Auto);
         }
       }
     });

package/dist/ProgramEncounter.js

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

package/dist/ProgramEnrolment.js

@@ -591,6 +591,15 @@ 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,
@@ -611,6 +620,10 @@ class ProgramEnrolment extends _BaseEntity.default {
     };
   }
 
+  getSchemaName() {
+    return _SchemaNames.default.ProgramEnrolment;
+  }
+
 }
 
 _defineProperty(ProgramEnrolment, "schema", {

package/dist/StandardReportCardType.js

@@ -11,6 +11,8 @@ 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; }
@@ -110,6 +112,10 @@ class StandardReportCardType extends _BaseEntity.default {
     return _.includes(this.defaultTypes(), this.name);
   }
 
+  getApprovalStatusForType() {
+    return typeToStatusMap[this.name];
+  }
+
 }
 
 _defineProperty(StandardReportCardType, "schema", {
@@ -145,5 +151,10 @@ _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/framework/RealmResultsProxy.js

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

package/dist/observation/MultipleCodedValues.js

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

package/dist/observation/PrimitiveValue.js

@@ -13,12 +13,10 @@ 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 = _Observation.default.AnswerSource.Manual) {
+  constructor(value, datatype, answerSource = _General.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 _Observation = _interopRequireDefault(require("../Observation"));
+var _General = _interopRequireDefault(require("../utility/General"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class SingleCodedValue {
-  constructor(answerUUID, answerSource = _Observation.default.AnswerSource.Manual) {
+  constructor(answerUUID, answerSource = _General.default.AnswerSource.Manual) {
     this.answer = answerUUID;
     this.answerSource = answerSource;
   }

package/dist/utility/General.js

@@ -303,5 +303,10 @@ _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.94",
+    "version": "1.30.95",
     "private": false,
     "repository": {
         "type": "git",