openchs-models 1.12.0 → 1.13.0

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: 150,
+  schemaVersion: 151,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");

package/dist/SubjectType.js

@@ -63,6 +63,7 @@ class SubjectType extends _ReferenceEntity.default {
     subjectType.iconFileS3Key = operationalSubjectType.iconFileS3Key;
     subjectType.syncRegistrationConcept1 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept1');
     subjectType.syncRegistrationConcept2 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept2');
+    subjectType.nameHelpText = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'nameHelpText');
     return subjectType;
   }
 
@@ -83,6 +84,7 @@ class SubjectType extends _ReferenceEntity.default {
     cloned.iconFileS3Key = this.iconFileS3Key;
     cloned.syncRegistrationConcept1 = this.syncRegistrationConcept1;
     cloned.syncRegistrationConcept2 = this.syncRegistrationConcept2;
+    cloned.nameHelpText = this.nameHelpText;
     return cloned;
   }
 
@@ -162,6 +164,10 @@ _defineProperty(SubjectType, "schema", {
     syncRegistrationConcept2: {
       type: "string",
       optional: true
+    },
+    nameHelpText: {
+      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.12.0",
+    "version": "1.13.0",
     "private": false,
     "repository": {
         "type": "git",