openchs-models 1.11.4 → 1.12.2

package/dist/Schema.js

@@ -168,7 +168,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var _default = {
   //order is important, should be arranged according to the dependency
   schema: [_LocaleMapping.default, _Settings.default, _Concept.ConceptAnswer, _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, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.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, _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],
-  schemaVersion: 149,
+  schemaVersion: 150,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");

package/dist/SubjectMigration.js

@@ -27,15 +27,30 @@ class SubjectMigration extends _BaseEntity.default {
 
     _defineProperty(this, "newAddressLevelUUID", void 0);
 
+    _defineProperty(this, "oldSyncConcept1Value", void 0);
+
+    _defineProperty(this, "newSyncConcept1Value", void 0);
+
+    _defineProperty(this, "oldSyncConcept2Value", void 0);
+
+    _defineProperty(this, "newSyncConcept2Value", void 0);
+
+    _defineProperty(this, "subjectTypeUUID", void 0);
+
     _defineProperty(this, "hasMigrated", void 0);
   }
 
-  static create(subjectUUID, oldAddressLevelUUID, newAddressLevelUUID) {
+  static create(subjectUUID, oldAddressLevelUUID, newAddressLevelUUID, oldSyncConcept1Value, newSyncConcept1Value, oldSyncConcept2Value, newSyncConcept2Value, subjectTypeUUID) {
     let subjectMigration = new SubjectMigration();
     subjectMigration.uuid = _General.default.randomUUID();
     subjectMigration.subjectUUID = subjectUUID;
     subjectMigration.oldAddressLevelUUID = oldAddressLevelUUID;
     subjectMigration.newAddressLevelUUID = newAddressLevelUUID;
+    subjectMigration.oldSyncConcept1Value = oldSyncConcept1Value;
+    subjectMigration.newSyncConcept1Value = newSyncConcept1Value;
+    subjectMigration.oldSyncConcept2Value = oldSyncConcept2Value;
+    subjectMigration.newSyncConcept2Value = newSyncConcept2Value;
+    subjectMigration.subjectTypeUUID = subjectTypeUUID;
     return subjectMigration;
   }
 
@@ -45,6 +60,11 @@ class SubjectMigration extends _BaseEntity.default {
     subjectMigration.subjectUUID = _ResourceUtil.default.getUUIDFor(resource, 'individualUUID');
     subjectMigration.oldAddressLevelUUID = _ResourceUtil.default.getUUIDFor(resource, 'oldAddressLevelUUID');
     subjectMigration.newAddressLevelUUID = _ResourceUtil.default.getUUIDFor(resource, 'newAddressLevelUUID');
+    subjectMigration.subjectTypeUUID = _ResourceUtil.default.getUUIDFor(resource, 'subjectTypeUUID');
+    subjectMigration.oldSyncConcept1Value = resource.oldSyncConcept1Value;
+    subjectMigration.newSyncConcept1Value = resource.newSyncConcept1Value;
+    subjectMigration.oldSyncConcept2Value = resource.oldSyncConcept2Value;
+    subjectMigration.newSyncConcept2Value = resource.newSyncConcept2Value;
     return subjectMigration;
   }
 
@@ -54,6 +74,11 @@ class SubjectMigration extends _BaseEntity.default {
     cloned.subjectUUID = this.subjectUUID;
     cloned.oldAddressLevelUUID = this.oldAddressLevelUUID;
     cloned.newAddressLevelUUID = this.newAddressLevelUUID;
+    cloned.oldSyncConcept1Value = this.oldSyncConcept1Value;
+    cloned.newSyncConcept1Value = this.newSyncConcept1Value;
+    cloned.oldSyncConcept2Value = this.oldSyncConcept2Value;
+    cloned.newSyncConcept2Value = this.newSyncConcept2Value;
+    cloned.subjectTypeUUID = this.subjectTypeUUID;
     cloned.hasMigrated = this.hasMigrated;
     return cloned;
   }
@@ -66,8 +91,31 @@ _defineProperty(SubjectMigration, "schema", {
   properties: {
     uuid: 'string',
     subjectUUID: 'string',
-    oldAddressLevelUUID: 'string',
-    newAddressLevelUUID: 'string',
+    oldAddressLevelUUID: {
+      type: 'string',
+      optional: true
+    },
+    newAddressLevelUUID: {
+      type: 'string',
+      optional: true
+    },
+    oldSyncConcept1Value: {
+      type: 'string',
+      optional: true
+    },
+    newSyncConcept1Value: {
+      type: 'string',
+      optional: true
+    },
+    oldSyncConcept2Value: {
+      type: 'string',
+      optional: true
+    },
+    newSyncConcept2Value: {
+      type: 'string',
+      optional: true
+    },
+    subjectTypeUUID: 'string',
     hasMigrated: {
       type: 'bool',
       default: false

package/dist/SubjectType.js

@@ -11,6 +11,8 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _Format = _interopRequireDefault(require("./application/Format"));
 
+var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
+
 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; }
@@ -59,6 +61,8 @@ class SubjectType extends _ReferenceEntity.default {
     subjectType.validFirstNameFormat = _Format.default.fromResource(operationalSubjectType["validFirstNameFormat"]);
     subjectType.validLastNameFormat = _Format.default.fromResource(operationalSubjectType["validLastNameFormat"]);
     subjectType.iconFileS3Key = operationalSubjectType.iconFileS3Key;
+    subjectType.syncRegistrationConcept1 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept1');
+    subjectType.syncRegistrationConcept2 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept2');
     return subjectType;
   }
 
@@ -77,6 +81,8 @@ class SubjectType extends _ReferenceEntity.default {
     cloned.validFirstNameFormat = this.validFirstNameFormat;
     cloned.validLastNameFormat = this.validLastNameFormat;
     cloned.iconFileS3Key = this.iconFileS3Key;
+    cloned.syncRegistrationConcept1 = this.syncRegistrationConcept1;
+    cloned.syncRegistrationConcept2 = this.syncRegistrationConcept2;
     return cloned;
   }
 
@@ -148,6 +154,14 @@ _defineProperty(SubjectType, "schema", {
     iconFileS3Key: {
       type: "string",
       optional: true
+    },
+    syncRegistrationConcept1: {
+      type: "string",
+      optional: true
+    },
+    syncRegistrationConcept2: {
+      type: "string",
+      optional: true
     }
   }
 });

package/dist/UserInfo.js

@@ -19,6 +19,7 @@ class UserInfo {
     userInfo.organisationName = resource.organisationName;
     userInfo.settings = _lodash.default.isNil(resource.settings) ? UserInfo.DEFAULT_SETTINGS : JSON.stringify(resource.settings);
     userInfo.name = resource.name;
+    userInfo.syncSettings = _lodash.default.isNil(resource.syncSettings) ? '{}' : JSON.stringify(resource.syncSettings);
     return userInfo;
   }
 
@@ -30,6 +31,10 @@ class UserInfo {
     return JSON.parse(this.settings);
   }
 
+  getSyncSettings() {
+    return JSON.parse(this.syncSettings);
+  }
+
   getDisplayUsername() {
     return _lodash.default.isNil(this.name) ? this.username : this.name;
   }
@@ -47,6 +52,7 @@ class UserInfo {
     userInfo.uuid = this.uuid;
     userInfo.organisationName = this.organisationName;
     userInfo.settings = this.settings;
+    userInfo.syncSettings = this.syncSettings;
     userInfo.name = this.name;
     return userInfo;
   }
@@ -54,6 +60,7 @@ class UserInfo {
   static createEmptyInstance() {
     const userInfo = new UserInfo();
     userInfo.settings = UserInfo.DEFAULT_SETTINGS;
+    userInfo.syncSettings = '{}';
     return userInfo;
   }
 
@@ -74,6 +81,10 @@ _defineProperty(UserInfo, "schema", {
     name: {
       type: "string",
       optional: true
+    },
+    syncSettings: {
+      type: "string",
+      optional: true
     }
   }
 });

package/dist/application/Form.js

@@ -180,17 +180,31 @@ class Form {
     return sections;
   }
 
+  orderQuestionGroupObservations(observations, groupUuid) {
+    const childFormElements = [];
+    const orderedChildObs = [];
+
+    _lodash.default.forEach(this.formElementGroups, feg => _lodash.default.forEach(feg.getFormElements(), fe => {
+      if (fe.groupUuid === groupUuid) {
+        childFormElements.push(fe);
+      }
+    }));
+
+    const orderedFormElements = _lodash.default.sortBy(childFormElements, fe => fe.displayOrder);
+
+    _lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs));
+
+    return orderedChildObs;
+  }
+
   addSortedObservations(formElement, observations, orderedObservations) {
     const concept = formElement.concept;
     const foundObs = observations.find(obs => obs.concept.uuid === concept.uuid);
 
     if (!_lodash.default.isNil(foundObs) && concept.isQuestionGroup()) {
       const clonedObs = foundObs.cloneForEdit();
-      const sortedChildObs = this.orderObservations(clonedObs.getValueWrapper().getValue());
-
-      const uniqueObs = _lodash.default.uniqBy(sortedChildObs, obs => obs.concept.uuid);
-
-      clonedObs.valueJSON = JSON.stringify(new _QuestionGroup.default(uniqueObs));
+      const sortedChildObs = this.orderQuestionGroupObservations(clonedObs.getValueWrapper().getValue(), formElement.uuid);
+      clonedObs.valueJSON = JSON.stringify(new _QuestionGroup.default(sortedChildObs));
       if (!_lodash.default.isEmpty(sortedChildObs)) orderedObservations.push(clonedObs);
     } else {
       if (!_lodash.default.isNil(foundObs)) orderedObservations.push(foundObs);

package/package.json

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