openchs-models 1.31.55 → 1.31.57

package/dist/AbstractEncounter.js

@@ -412,6 +412,19 @@ class AbstractEncounter extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
+  updateAudit(userInfo, isNew, isGettingFilled) {
+    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
+
+    if (_lodash.default.isNil(this.filledByUUID) && isGettingFilled) {
+      this.filledByUUID = userInfo.userUUID;
+      this.filledBy = userInfo.name;
+    }
+  }
+
+  isFilled() {
+    return !_lodash.default.isNil(this.encounterDateTime);
+  }
+
 }
 
 _defineProperty(AbstractEncounter, "fieldKeys", {

package/dist/AddressLevel.js

@@ -261,7 +261,7 @@ _defineProperty(AddressLevel, "schema", {
     },
     locationProperties: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     titleLineage: {
       type: "string",

package/dist/ChecklistItem.js

@@ -362,7 +362,7 @@ _defineProperty(ChecklistItem, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     checklist: "Checklist",
     approvalStatuses: {

package/dist/Encounter.js

@@ -132,10 +132,10 @@ _defineProperty(Encounter, "schema", {
     individual: _SchemaNames.default.Individual,
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     name: {
@@ -156,10 +156,10 @@ _defineProperty(Encounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     voided: {

package/dist/Family.js

@@ -226,7 +226,7 @@ _defineProperty(Family, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     }
   }
 });

package/dist/GroupDashboard.js

@@ -32,6 +32,14 @@ class GroupDashboard extends _BaseEntity.default {
     this.that.primaryDashboard = x;
   }
 
+  get secondaryDashboard() {
+    return this.that.secondaryDashboard;
+  }
+
+  set secondaryDashboard(x) {
+    this.that.secondaryDashboard = x;
+  }
+
   get group() {
     return this.toEntity("group", _Groups.default);
   }
@@ -49,7 +57,7 @@ class GroupDashboard extends _BaseEntity.default {
   }
 
   static fromResource(resource, entityService) {
-    const groupDashboard = _General.default.assignFields(resource, new GroupDashboard(), ["uuid", "primaryDashboard", "voided"]);
+    const groupDashboard = _General.default.assignFields(resource, new GroupDashboard(), ["uuid", "primaryDashboard", "secondaryDashboard", "voided"]);
 
     groupDashboard.group = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "groupUUID"), _Groups.default.schema.name);
     groupDashboard.dashboard = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "dashboardUUID"), _Dashboard.default.schema.name);
@@ -67,6 +75,10 @@ _defineProperty(GroupDashboard, "schema", {
       type: "bool",
       default: false
     },
+    secondaryDashboard: {
+      type: "bool",
+      default: false
+    },
     group: {
       type: "Groups",
       optional: true

package/dist/Individual.js

@@ -1066,6 +1066,10 @@ class Individual extends _BaseEntity.default {
     return _SchemaNames.default.Individual;
   }
 
+  updateAudit(userInfo, isNew) {
+    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
+  }
+
 }
 
 _defineProperty(Individual, "schema", {
@@ -1116,7 +1120,7 @@ _defineProperty(Individual, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     relationships: {
       type: "list",
@@ -1127,7 +1131,7 @@ _defineProperty(Individual, "schema", {
       objectType: "GroupSubject"
     },
     registrationLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     comments: {

package/dist/Observation.js

@@ -261,8 +261,7 @@ class Observation extends _PersistedObject.default {
 }
 
 _defineProperty(Observation, "schema", {
-  name: "EmbeddedObservation",
-  embedded: true,
+  name: "Observation",
   properties: {
     concept: "Concept",
     valueJSON: "string"

package/dist/ProgramEncounter.js

@@ -194,7 +194,7 @@ _defineProperty(ProgramEncounter, "schema", {
     programEnrolment: _SchemaNames.default.ProgramEnrolment,
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     cancelDateTime: {
       type: "date",
@@ -202,14 +202,14 @@ _defineProperty(ProgramEncounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     cancelLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     voided: {

package/dist/ProgramEnrolment.js

@@ -646,6 +646,10 @@ class ProgramEnrolment extends _BaseEntity.default {
     return _SchemaNames.default.ProgramEnrolment;
   }
 
+  updateAudit(userInfo, isNew) {
+    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
+  }
+
 }
 
 _defineProperty(ProgramEnrolment, "schema", {
@@ -657,7 +661,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     enrolmentDateTime: "date",
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     programExitDateTime: {
       type: "date",
@@ -665,7 +669,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     programExitObservations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     encounters: {
       type: "list",
@@ -677,11 +681,11 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     individual: "Individual",
     enrolmentLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     exitLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     voided: {

package/dist/Schema.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createTransactionDataMapForEmbeddedFields = createTransactionDataMapForEmbeddedFields;
 exports.default = void 0;
 
 var _Settings = _interopRequireDefault(require("./Settings"));
@@ -272,100 +271,7 @@ function migrateEmbeddedObjects(oldDB, newDB) {
   newDB.deleteModel("StringKeyNumericValue");
 }
 
-function flush(db) {
-  db.commitTransaction();
-  db.beginTransaction();
-}
-
-function shouldFlush(numberOfRecords) {
-  const batchSize = 100;
-  return numberOfRecords % batchSize === batchSize - 1;
-}
-
-function createTransactionDataMapForEmbeddedFields() {
-  const map = new Map();
-
-  _MetaDataService.default.forEachPointField((fieldName, schemaName) => {
-    if (map.has(schemaName)) {
-      map.get(schemaName).push({
-        fieldName,
-        fieldType: "Point"
-      });
-    } else {
-      map.set(schemaName, [{
-        fieldName,
-        fieldType: "Point"
-      }]);
-    }
-  });
-
-  _MetaDataService.default.forEachObservationField((fieldName, schemaName) => {
-    if (map.has(schemaName)) {
-      map.get(schemaName).push({
-        fieldName,
-        fieldType: "Obs"
-      });
-    } else {
-      map.set(schemaName, [{
-        fieldName,
-        fieldType: "Obs"
-      }]);
-    }
-  });
-
-  return map;
-}
-
-function migrateAllEmbeddedForTxnData(oldDB, newDB) {
-  const startTime = new Date();
-  flush(newDB);
-  const map = createTransactionDataMapForEmbeddedFields();
-  let recordCounter = 0;
-  const conceptMap = new Map();
-  map.forEach((fields, schemaName) => {
-    console.log(`schema: ${schemaName}, fields: ${fields.length}`);
-    newDB.objects(schemaName).forEach(newDbParentEntity => {
-      if (shouldFlush(recordCounter)) {
-        flush(newDB);
-      }
-
-      fields.forEach(field => {
-        const oldEntity = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0];
-        const oldValue = oldEntity[field.fieldName];
-
-        if (!_lodash.default.isNil(oldValue)) {
-          if (field.fieldType === "Point") newDbParentEntity[field.fieldName] = {
-            x: oldValue.x,
-            y: oldValue.y
-          };else {
-            const newObsList = [];
-            oldValue.forEach(oldItemValue => {
-              let newConcept = conceptMap.get(oldItemValue.concept.uuid);
-
-              if (_lodash.default.isNil(newConcept)) {
-                newConcept = newDB.objects("Concept").filtered(`uuid = "${oldItemValue.concept.uuid}"`)[0];
-                conceptMap.set(oldItemValue.concept.uuid, newConcept);
-              }
-
-              newObsList.push({
-                concept: newConcept,
-                valueJSON: oldItemValue.valueJSON
-              });
-            });
-            newDbParentEntity[field.fieldName] = newObsList;
-          }
-        }
-      });
-      recordCounter++;
-    });
-  });
-  flush(newDB);
-  newDB.deleteModel("Point");
-  newDB.deleteModel("Observation");
-  const endTime = new Date();
-  const diff = (0, _moment.default)(endTime).diff(startTime, "seconds", true);
-  console.log("Total Time Taken", diff, "seconds");
-}
+const VersionWithEmbeddedMigrationProblem = 185;
 
 function createRealmConfig() {
   return {
@@ -375,9 +281,17 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 187,
+    schemaVersion: 188,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
+      if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
+
+      if (oldDB.schemaVersion < 10) {
+        const oldObjects = oldDB.objects("DecisionConfig");
+        oldObjects.forEach(decisionConfig => {
+          newDB.create(ConfigFile.schema.name, ConfigFile.create(decisionConfig.fileName, decisionConfig.decisionCode), true);
+        });
+      }
 
       if (oldDB.schemaVersion < 17) {
         const oldObjects = oldDB.objects("AddressLevel");
@@ -981,8 +895,7 @@ function createRealmConfig() {
         migrateEmbeddedObjects(oldDB, newDB);
       }
 
-      if (oldDB.schemaVersion < 185) {
-        migrateAllEmbeddedForTxnData(oldDB, newDB);
+      if (oldDB.schemaVersion < VersionWithEmbeddedMigrationProblem) {// removed migration code. keeping the version number in case this number is required for any checks later
       }
 
       if (oldDB.schemaVersion < 186) {// newDB.deleteModel("UserDefinedIndividualProperty");

package/dist/SchemaNames.js

@@ -91,7 +91,7 @@ _defineProperty(SchemaNames, "Concept", "Concept");
 
 _defineProperty(SchemaNames, "EntityApprovalStatus", "EntityApprovalStatus");
 
-_defineProperty(SchemaNames, "EmbeddedPoint", "EmbeddedPoint");
+_defineProperty(SchemaNames, "Point", "Point");
 
 var _default = SchemaNames;
 exports.default = _default;

package/dist/application/Form.js

@@ -227,32 +227,6 @@ class Form extends _BaseEntity.default {
 
     const extraObs = observations.filter(obs => _lodash.default.isNil(orderedObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
     return orderedObservations.concat(extraObs);
-  } //TODO add tests
-
-
-  orderObservationsPerFEG(observations) {
-    const orderedObservations = [];
-
-    const formElementOrdering = _lodash.default.sortBy(this.formElementGroups, feg => feg.displayOrder).map(feg => {
-      let fegOrderedObservations = [];
-      const returnValue = {};
-      returnValue.uuid = feg.uuid;
-      returnValue.feg = feg;
-      returnValue.sortedObservationsArray = fegOrderedObservations;
-      this.orderObservationsWithinAFEG(feg.getFormElements(), observations, fegOrderedObservations);
-      orderedObservations.concat(fegOrderedObservations);
-      return returnValue;
-    });
-
-    return formElementOrdering;
-  }
-
-  orderObservationsWithinAFEG(formElements, observations, orderedObservations) {
-    _lodash.default.sortBy(formElements, fe => fe.displayOrder).forEach(formElement => this.addSortedObservations(formElement, observations, orderedObservations));
-
-    const extraObs = observations.filter(obs => _lodash.default.isNil(orderedObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
-    orderedObservations.concat(extraObs);
-    return extraObs;
   }
 
   sectionWiseOrderedObservations(observations) {

package/dist/draft/DraftEncounter.js

@@ -170,10 +170,10 @@ _defineProperty(DraftEncounter, "schema", {
     individual: "Individual",
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     name: {
@@ -194,10 +194,10 @@ _defineProperty(DraftEncounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     voided: {

package/dist/draft/DraftSubject.js

@@ -211,10 +211,10 @@ _defineProperty(DraftSubject, "schema", {
     lowestAddressLevel: "AddressLevel",
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     registrationLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: _SchemaNames.default.Point,
       optional: true
     },
     updatedOn: "date",

package/dist/geo/Point.js

@@ -57,8 +57,7 @@ class Point extends _PersistedObject.default {
 }
 
 _defineProperty(Point, "schema", {
-  name: "EmbeddedPoint",
-  embedded: true,
+  name: "Point",
   properties: {
     x: "double",
     y: "double"

package/dist/program/SubjectProgramEligibility.js

@@ -221,7 +221,7 @@ _defineProperty(SubjectProgramEligibility, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     voided: {
       type: "bool",

package/dist/relationship/IndividualRelationship.js

@@ -207,7 +207,7 @@ _defineProperty(IndividualRelationship, "schema", {
     },
     exitObservations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     voided: {
       type: "bool",

package/dist/task/Task.js

@@ -230,7 +230,7 @@ _defineProperty(Task, "schema", {
     },
     metadata: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     subject: {
       type: 'Individual',
@@ -238,7 +238,7 @@ _defineProperty(Task, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     voided: {
       type: 'bool',

package/dist/utility/AuditUtil.js

@@ -3,10 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapAuditFields = exports.AuditFields = void 0;
+exports.updateAuditFields = updateAuditFields;
+exports.mapAuditFields = mapAuditFields;
+exports.AuditFields = void 0;
 
 var _ResourceUtil = _interopRequireDefault(require("./ResourceUtil"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const AuditFields = {
@@ -29,11 +33,23 @@ const AuditFields = {
 };
 exports.AuditFields = AuditFields;
 
-const mapAuditFields = function (txnEntity, txnResource) {
+function updateAuditFields(entity, userInfo, isNew = false) {
+  // old entities may have createdByUUID as null if never synced after audit release
+  // isNew must be passed by callers to specify that it is indeed a create scenario
+  if (_lodash.default.isNil(entity.createdByUUID) && isNew) {
+    entity.createdByUUID = userInfo.userUUID;
+    entity.createdBy = userInfo.name;
+  }
+
+  if (_lodash.default.isNil(entity.lastModifiedByUUID)) {
+    entity.lastModifiedByUUID = userInfo.userUUID;
+    entity.lastModifiedBy = userInfo.name;
+  }
+}
+
+function mapAuditFields(txnEntity, txnResource) {
   txnEntity.createdBy = _ResourceUtil.default.getFieldValue(txnResource, "createdBy");
   txnEntity.createdByUUID = _ResourceUtil.default.getFieldValue(txnResource, "createdByUUID");
   txnEntity.lastModifiedBy = _ResourceUtil.default.getFieldValue(txnResource, "lastModifiedBy");
   txnEntity.lastModifiedByUUID = _ResourceUtil.default.getFieldValue(txnResource, "lastModifiedByUUID");
-};
-
-exports.mapAuditFields = mapAuditFields;
+}

package/package.json

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