openchs-models 1.31.54 → 1.31.55

package/dist/AddressLevel.js

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

package/dist/ChecklistItem.js

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

package/dist/Encounter.js

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

package/dist/EntityMetaData.js

@@ -33,8 +33,6 @@ var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
 var _Encounter = _interopRequireDefault(require("./Encounter"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _Form = _interopRequireDefault(require("./application/Form"));
 
 var _FormElementGroup = _interopRequireDefault(require("./application/FormElementGroup"));
@@ -248,9 +246,6 @@ const program = refDataNameTranslated(_Program.default, {
   res: "operationalProgram",
   syncWeight: 3
 });
-const programOutcome = refDataNameTranslated(_ProgramOutcome.default, {
-  syncWeight: 3
-});
 const gender = refDataNameTranslated(_Gender.default, {
   syncWeight: 1
 });
@@ -630,7 +625,7 @@ class EntityMetaData {
 
   //order is important. last entity in each (tx and ref) with be executed first. parent should be synced before the child.
   static model() {
-    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, ruleFailureTelemetry, syncTelemetry];
+    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, ruleFailureTelemetry, syncTelemetry];
   }
 
   static entitiesLoadedFromServer() {

package/dist/Family.js

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

package/dist/Individual.js

@@ -891,6 +891,18 @@ class Individual extends _BaseEntity.default {
     return _lodash.default.filter(this.getEncounters(true), encounter => !encounter.encounterDateTime && _lodash.default.isNil(encounter.cancelDateTime));
   }
 
+  everScheduledEncounters() {
+    return _lodash.default.filter(this.getEncounters(true), encounter => !_lodash.default.isNil(encounter.earliestVisitDateTime) && _lodash.default.isNil(encounter.cancelDateTime));
+  }
+
+  scheduledEncountersOfType(encounterTypeName) {
+    return this.scheduledEncounters().filter(scheduledEncounter => scheduledEncounter.encounterType.name === encounterTypeName);
+  }
+
+  everScheduledEncountersOfType(encounterTypeName) {
+    return this.everScheduledEncounters().filter(scheduledEncounter => scheduledEncounter.encounterType.name === encounterTypeName);
+  }
+
   findObservationInLastEncounter(conceptNameOrUuid, currentEncounter) {
     const lastEncounter = this.findLastEncounterOfType(currentEncounter, _lodash.default.get(currentEncounter, 'encounterType'));
     return lastEncounter ? lastEncounter.findObservation(conceptNameOrUuid) : null;
@@ -1104,7 +1116,7 @@ _defineProperty(Individual, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     relationships: {
       type: "list",
@@ -1115,7 +1127,7 @@ _defineProperty(Individual, "schema", {
       objectType: "GroupSubject"
     },
     registrationLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     comments: {

package/dist/Observation.js

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

package/dist/ProgramEncounter.js

@@ -17,8 +17,6 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _ValidationResult = _interopRequireDefault(require("./application/ValidationResult"));
 
-var _Point = _interopRequireDefault(require("./geo/Point"));
-
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
@@ -196,7 +194,7 @@ _defineProperty(ProgramEncounter, "schema", {
     programEnrolment: _SchemaNames.default.ProgramEnrolment,
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     cancelDateTime: {
       type: "date",
@@ -204,14 +202,14 @@ _defineProperty(ProgramEncounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/ProgramEnrolment.js

@@ -11,8 +11,6 @@ var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
 
 var _Program = _interopRequireDefault(require("./Program"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _ProgramEncounter = _interopRequireDefault(require("./ProgramEncounter"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
@@ -98,14 +96,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     this.that.programExitObservations = this.fromEntityList(x);
   }
 
-  get programOutcome() {
-    return this.toEntity("programOutcome", _ProgramOutcome.default);
-  }
-
-  set programOutcome(x) {
-    this.that.programOutcome = this.fromObject(x);
-  }
-
   get encounters() {
     return this.toEntityList("encounters", _ProgramEncounter.default);
   }
@@ -217,7 +207,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     resource["programUUID"] = this.program.uuid;
     resource.enrolmentDateTime = _General.default.isoFormat(this.enrolmentDateTime);
     resource.programExitDateTime = _General.default.isoFormat(this.programExitDateTime);
-    resource["programOutcomeUUID"] = _lodash.default.isNil(this.programOutcome) ? null : this.programOutcome.uuid;
     resource["individualUUID"] = this.individual.uuid;
     if (!_lodash.default.isNil(this.checklist)) resource["checklistUUID"] = this.checklist.uuid;
     resource["observations"] = [];
@@ -242,20 +231,12 @@ class ProgramEnrolment extends _BaseEntity.default {
 
   static fromResource(resource, entityService) {
     const program = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "programUUID"), _Program.default.schema.name);
-
-    const programOutcomeUUID = _ResourceUtil.default.getUUIDFor(resource, "programOutcomeUUID");
-
     const individual = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "individualUUID"), _Individual.default.schema.name);
 
     const programEnrolment = _General.default.assignFields(resource, new ProgramEnrolment(), ["uuid", "voided"], ["enrolmentDateTime", "programExitDateTime"], ["observations", "programExitObservations"], entityService);
 
     programEnrolment.program = program;
     programEnrolment.individual = individual;
-
-    if (!_lodash.default.isNil(programOutcomeUUID)) {
-      programEnrolment.programOutcome = entityService.findByKey("uuid", programOutcomeUUID, _ProgramOutcome.default.schema.name);
-    }
-
     if (!_lodash.default.isNil(resource.enrolmentLocation)) programEnrolment.enrolmentLocation = _Point.default.fromResource(resource.enrolmentLocation);
     if (!_lodash.default.isNil(resource.exitLocation)) programEnrolment.exitLocation = _Point.default.fromResource(resource.exitLocation);
     (0, _AuditUtil.mapAuditFields)(programEnrolment, resource);
@@ -290,7 +271,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     programEnrolment.program = _lodash.default.isNil(this.program) ? null : this.program.clone();
     programEnrolment.enrolmentDateTime = this.enrolmentDateTime;
     programEnrolment.programExitDateTime = this.programExitDateTime;
-    programEnrolment.programOutcome = _lodash.default.isNil(this.programOutcome) ? null : this.programOutcome.clone();
     programEnrolment.individual = this.individual;
     programEnrolment.observations = _ObservationsHolder.default.clone(this.observations);
     programEnrolment.programExitObservations = _ObservationsHolder.default.clone(this.programExitObservations);
@@ -654,10 +634,6 @@ class ProgramEnrolment extends _BaseEntity.default {
       observations: this.observations,
       programExitDateTime: this.programExitDateTime,
       programExitObservations: this.programExitObservations,
-      programOutcome: {
-        type: "ProgramOutcome",
-        optional: true
-      },
       encounters: this.encounters,
       checklists: this.checklists,
       individualUUID: this.individual.uuid,
@@ -681,7 +657,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     enrolmentDateTime: "date",
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     programExitDateTime: {
       type: "date",
@@ -689,11 +665,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     programExitObservations: {
       type: "list",
-      objectType: "Observation"
-    },
-    programOutcome: {
-      type: "ProgramOutcome",
-      optional: true
+      objectType: "EmbeddedObservation"
     },
     encounters: {
       type: "list",
@@ -705,11 +677,11 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     individual: "Individual",
     enrolmentLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     exitLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/Schema.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createTransactionDataMapForEmbeddedFields = createTransactionDataMapForEmbeddedFields;
 exports.default = void 0;
 
 var _Settings = _interopRequireDefault(require("./Settings"));
@@ -19,8 +20,6 @@ var _Family = _interopRequireDefault(require("./Family"));
 
 var _AddressLevel = _interopRequireWildcard(require("./AddressLevel"));
 
-var _UserDefinedIndividualProperty = _interopRequireDefault(require("./UserDefinedIndividualProperty"));
-
 var _Gender = _interopRequireDefault(require("./Gender"));
 
 var _EntitySyncStatus = _interopRequireDefault(require("./EntitySyncStatus"));
@@ -37,8 +36,6 @@ var _Encounter = _interopRequireDefault(require("./Encounter"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _FormElement = _interopRequireDefault(require("./application/FormElement"));
 
 var _FormElementGroup = _interopRequireDefault(require("./application/FormElementGroup"));
@@ -53,8 +50,6 @@ var _EntityQueue = _interopRequireDefault(require("./EntityQueue"));
 
 var _FormMapping = _interopRequireDefault(require("./application/FormMapping"));
 
-var _ConfigFile = _interopRequireDefault(require("./ConfigFile"));
-
 var _ChecklistItemStatus = _interopRequireDefault(require("./ChecklistItemStatus"));
 
 var _ChecklistItemDetail = _interopRequireDefault(require("./ChecklistItemDetail"));
@@ -197,7 +192,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
+const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
 
 function migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
   console.log(`schema: ${schemaName}, field: ${field}`);
@@ -277,7 +272,100 @@ function migrateEmbeddedObjects(oldDB, newDB) {
   newDB.deleteModel("StringKeyNumericValue");
 }
 
-const VersionWithEmbeddedMigrationProblem = 185;
+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");
+}
 
 function createRealmConfig() {
   return {
@@ -287,17 +375,9 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 186,
+    schemaVersion: 187,
     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.default.schema.name, _ConfigFile.default.create(decisionConfig.fileName, decisionConfig.decisionCode), true);
-        });
-      }
 
       if (oldDB.schemaVersion < 17) {
         const oldObjects = oldDB.objects("AddressLevel");
@@ -901,7 +981,14 @@ function createRealmConfig() {
         migrateEmbeddedObjects(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 < 185) {
+        migrateAllEmbeddedForTxnData(oldDB, newDB);
+      }
+
+      if (oldDB.schemaVersion < 186) {// newDB.deleteModel("UserDefinedIndividualProperty");
+        // newDB.deleteModel("ConfigFile");
+        // newDB.deleteModel("Decision");
+        // newDB.deleteModel("ProgramOutcome");
       }
     }
   };

package/dist/SchemaNames.js

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

package/dist/SubjectType.js

@@ -176,6 +176,14 @@ class SubjectType extends _ReferenceEntity.default {
     this.that.directlyAssignable = x;
   }
 
+  get settings() {
+    return this.that.settings;
+  }
+
+  set settings(x) {
+    this.that.settings = x;
+  }
+
   static create(name, group = false, household = false, type) {
     let subjectType = new SubjectType();
     subjectType.uuid = _General.default.randomUUID();
@@ -210,6 +218,7 @@ class SubjectType extends _ReferenceEntity.default {
     subjectType.syncRegistrationConcept1 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept1');
     subjectType.syncRegistrationConcept2 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept2');
     subjectType.nameHelpText = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'nameHelpText');
+    subjectType.settings = !_.isNil(operationalSubjectType.settings) ? JSON.stringify(operationalSubjectType.settings) : '{}';
     return subjectType;
   }
 
@@ -237,6 +246,7 @@ class SubjectType extends _ReferenceEntity.default {
     cloned.syncRegistrationConcept1 = this.syncRegistrationConcept1;
     cloned.syncRegistrationConcept2 = this.syncRegistrationConcept2;
     cloned.nameHelpText = this.nameHelpText;
+    cloned.settings = this.settings;
     return cloned;
   }
 
@@ -264,6 +274,14 @@ class SubjectType extends _ReferenceEntity.default {
     return !_.isNil(this.iconFileS3Key);
   }
 
+  getSettings() {
+    return JSON.parse(this.settings);
+  }
+
+  getSetting(settingName) {
+    return this.getSettings()[settingName];
+  }
+
 }
 
 _defineProperty(SubjectType, "schema", {
@@ -344,6 +362,10 @@ _defineProperty(SubjectType, "schema", {
     nameHelpText: {
       type: "string",
       optional: true
+    },
+    settings: {
+      type: "string",
+      default: '{}'
     }
   }
 });
@@ -355,5 +377,10 @@ _defineProperty(SubjectType, "types", {
   Household: 'Household'
 });
 
+_defineProperty(SubjectType, "settingKeys", {
+  displayRegistrationDetails: 'displayRegistrationDetails',
+  displayPlannedEncounters: 'displayPlannedEncounters'
+});
+
 var _default = SubjectType;
 exports.default = _default;

package/dist/application/Form.js

@@ -66,6 +66,14 @@ class Form extends _BaseEntity.default {
     this.that.decisionRule = x;
   }
 
+  get editFormRule() {
+    return this.that.editFormRule;
+  }
+
+  set editFormRule(x) {
+    this.that.editFormRule = x;
+  }
+
   get visitScheduleRule() {
     return this.that.visitScheduleRule;
   }
@@ -118,7 +126,7 @@ class Form extends _BaseEntity.default {
       this.deleteOutOfSyncDrafts(entityService, resource.uuid);
     }
 
-    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
+    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
   }
 
   static deleteOutOfSyncDrafts(entityService, formUUID) {
@@ -219,6 +227,32 @@ 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) {
@@ -348,6 +382,10 @@ _defineProperty(Form, "schema", {
       type: "string",
       optional: true
     },
+    editFormRule: {
+      type: "string",
+      optional: true
+    },
     visitScheduleRule: {
       type: "string",
       optional: true

package/dist/draft/DraftEncounter.js

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

package/dist/draft/DraftSubject.js

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

package/dist/error/SyncError.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 
 //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
-function SyncError(code, message, fileName, lineNumber) {
-  let instance = new Error(message, fileName, lineNumber);
+function SyncError(code, message) {
+  let instance = new Error(message);
   instance.errorCode = code;
   instance.errorText = message;
 

package/dist/geo/Point.js

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

package/dist/index.js

@@ -75,18 +75,6 @@ Object.defineProperty(exports, "ConceptAnswer", {
     return _ConceptAnswer.default;
   }
 });
-Object.defineProperty(exports, "ConfigFile", {
-  enumerable: true,
-  get: function () {
-    return _ConfigFile.default;
-  }
-});
-Object.defineProperty(exports, "Decision", {
-  enumerable: true,
-  get: function () {
-    return _Decision.default;
-  }
-});
 Object.defineProperty(exports, "Duration", {
   enumerable: true,
   get: function () {
@@ -297,12 +285,6 @@ Object.defineProperty(exports, "Program", {
     return _Program.default;
   }
 });
-Object.defineProperty(exports, "ProgramOutcome", {
-  enumerable: true,
-  get: function () {
-    return _ProgramOutcome.default;
-  }
-});
 Object.defineProperty(exports, "ReferenceEntity", {
   enumerable: true,
   get: function () {
@@ -357,12 +339,6 @@ Object.defineProperty(exports, "StringKeyNumericValue", {
     return _StringKeyNumericValue.default;
   }
 });
-Object.defineProperty(exports, "UserDefinedIndividualProperty", {
-  enumerable: true,
-  get: function () {
-    return _UserDefinedIndividualProperty.default;
-  }
-});
 Object.defineProperty(exports, "UserInfo", {
   enumerable: true,
   get: function () {
@@ -830,10 +806,6 @@ var _Concept = _interopRequireDefault(require("./Concept"));
 
 var _ConceptAnswer = _interopRequireDefault(require("./ConceptAnswer"));
 
-var _ConfigFile = _interopRequireDefault(require("./ConfigFile"));
-
-var _Decision = _interopRequireDefault(require("./Decision"));
-
 var _Duration = _interopRequireDefault(require("./Duration"));
 
 var _Encounter = _interopRequireDefault(require("./Encounter"));
@@ -902,8 +874,6 @@ var _ProgramEnrolment = _interopRequireDefault(require("./ProgramEnrolment"));
 
 var _Program = _interopRequireDefault(require("./Program"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
 
 var _RuleDependency = _interopRequireDefault(require("./RuleDependency"));
@@ -922,8 +892,6 @@ var _StaticFormElementGroup = _interopRequireDefault(require("./application/Stat
 
 var _StringKeyNumericValue = _interopRequireDefault(require("./application/StringKeyNumericValue"));
 
-var _UserDefinedIndividualProperty = _interopRequireDefault(require("./UserDefinedIndividualProperty"));
-
 var _UserInfo = _interopRequireDefault(require("./UserInfo"));
 
 var _ValidationResult = _interopRequireDefault(require("./application/ValidationResult"));

package/dist/program/SubjectProgramEligibility.js

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

package/dist/relationship/IndividualRelationship.js

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

package/dist/task/Task.js

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

package/package.json

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

package/dist/ConfigFile.js

@@ -1,58 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
-
-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; }
-
-class ConfigFile extends _PersistedObject.default {
-  constructor(that = null) {
-    super(that);
-  }
-
-  get fileName() {
-    return this.that.fileName;
-  }
-
-  set fileName(x) {
-    this.that.fileName = x;
-  }
-
-  get contents() {
-    return this.that.contents;
-  }
-
-  set contents(x) {
-    this.that.contents = x;
-  }
-
-  static create(fileName, contents) {
-    const configFile = new ConfigFile();
-    configFile.fileName = fileName.toLowerCase();
-    configFile.contents = contents;
-    return configFile;
-  }
-
-  toString() {
-    return this.fileName;
-  }
-
-}
-
-_defineProperty(ConfigFile, "schema", {
-  name: "ConfigFile",
-  primaryKey: "fileName",
-  properties: {
-    fileName: "string",
-    contents: "string"
-  }
-});
-
-var _default = ConfigFile;
-exports.default = _default;

package/dist/Decision.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
-
-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; }
-
-class Decision extends _PersistedObject.default {
-  constructor(that = null) {
-    super(that);
-  }
-
-  get name() {
-    return this.that.name;
-  }
-
-  set name(x) {
-    this.that.name = x;
-  }
-
-  get value() {
-    return this.that.value;
-  }
-
-  set value(x) {
-    this.that.value = x;
-  }
-
-  get code() {
-    return this.that.code;
-  }
-
-  set code(x) {
-    this.that.code = x;
-  }
-
-  static newInstance(name, code, value) {
-    return {
-      name: name,
-      code: code,
-      value: value
-    };
-  }
-
-}
-
-_defineProperty(Decision, "schema", {
-  name: "Decision",
-  properties: {
-    name: "string",
-    code: "string",
-    value: "string"
-  }
-});
-
-var _default = Decision;
-exports.default = _default;

package/dist/ProgramOutcome.js

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
-
-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; }
-
-class ProgramOutcome extends _ReferenceEntity.default {
-  constructor(that = null) {
-    super(that);
-  }
-
-  get name() {
-    return this.that.name;
-  }
-
-  set name(x) {
-    this.that.name = x;
-  }
-
-}
-
-_defineProperty(ProgramOutcome, "schema", {
-  name: "ProgramOutcome",
-  primaryKey: "uuid",
-  properties: {
-    uuid: "string",
-    name: "string"
-  }
-});
-
-var _default = ProgramOutcome;
-exports.default = _default;

package/dist/UserDefinedIndividualProperty.js

@@ -1,58 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
-
-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; }
-
-class UserDefinedIndividualProperty extends _PersistedObject.default {
-  constructor(that = null) {
-    super(that);
-  }
-
-  get name() {
-    return this.that.name;
-  }
-
-  set name(x) {
-    this.that.name = x;
-  }
-
-  get value() {
-    return this.that.value;
-  }
-
-  set value(x) {
-    this.that.value = x;
-  }
-
-  get unit() {
-    return this.that.unit;
-  }
-
-  set unit(x) {
-    this.that.unit = x;
-  }
-
-}
-
-_defineProperty(UserDefinedIndividualProperty, "schema", {
-  name: "UserDefinedIndividualProperty",
-  properties: {
-    name: "string",
-    value: "string",
-    unit: {
-      type: "string",
-      optional: true
-    }
-  }
-});
-
-var _default = UserDefinedIndividualProperty;
-exports.default = _default;