openchs-models 1.32.31 → 1.32.33

package/dist/ObservationsHolder.js

@@ -142,8 +142,6 @@ class ObservationsHolder {
             formElementsIncludingRepeatableElements.push(newFormElement);
           });
         });
-
-        formElementsIncludingRepeatableElements.push(fe);
       } else if (_lodash.default.isNil(fe.groupUuid)) {
         formElementsIncludingRepeatableElements.push(fe);
       }

package/dist/Program.js

@@ -68,14 +68,6 @@ class Program extends _ReferenceEntity.default {
     this.that.manualEligibilityCheckRequired = x;
   }
 
-  get showGrowthChart() {
-    return this.that.showGrowthChart;
-  }
-
-  set showGrowthChart(x) {
-    this.that.showGrowthChart = x;
-  }
-
   get enrolmentSummaryRule() {
     return this.that.enrolmentSummaryRule;
   }
@@ -126,7 +118,6 @@ class Program extends _ReferenceEntity.default {
     program.programSubjectLabel = operationalProgram.programSubjectLabel || operationalProgram.name || program.name;
     program.enrolmentSummaryRule = operationalProgram.enrolmentSummaryRule;
     program.manualEligibilityCheckRequired = operationalProgram.manualEligibilityCheckRequired;
-    program.showGrowthChart = operationalProgram.showGrowthChart;
     program.manualEnrolmentEligibilityCheckRule = operationalProgram.manualEnrolmentEligibilityCheckRule;
     program.enrolmentEligibilityCheckRule = operationalProgram.enrolmentEligibilityCheckRule;
     program.allowMultipleEnrolments = operationalProgram.allowMultipleEnrolments;
@@ -171,7 +162,6 @@ _defineProperty(Program, "schema", {
       optional: true
     },
     manualEligibilityCheckRequired: 'bool',
-    showGrowthChart: 'bool',
     manualEnrolmentEligibilityCheckRule: {
       type: 'string',
       optional: true

package/dist/Schema.js

@@ -283,7 +283,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 199,
+    schemaVersion: 198,
     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.`);
@@ -965,12 +965,6 @@ function createRealmConfig() {
           }
         }
       }
-
-      if (oldDB.schemaVersion < 199) {
-        _lodash.default.forEach(newDB.objects("Program"), program => {
-          program.showGrowthChart = _lodash.default.toLower(program.name) === "child";
-        });
-      }
     }
   };
 }

package/dist/application/Form.js

@@ -305,12 +305,12 @@ class Form extends _BaseEntity.default {
 
     const orderedFormElements = _lodash.default.sortBy(childFormElements, fe => fe.displayOrder);
 
-    _lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs, true));
+    _lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs));
 
     return orderedChildObs;
   }
 
-  addSortedObservations(formElement, observations, orderedObservations, forQGChildren = false) {
+  addSortedObservations(formElement, observations, orderedObservations) {
     const concept = formElement.concept;
     const foundObs = observations.find(obs => obs.concept.uuid === concept.uuid);
 
@@ -326,7 +326,7 @@ class Form extends _BaseEntity.default {
         orderedObservations.push(clonedObs);
       }
     } else {
-      if (!_lodash.default.isNil(foundObs) && (_lodash.default.isNil(formElement.groupUuid) || forQGChildren)) {
+      if (!_lodash.default.isNil(foundObs)) {
         foundObs.styles = formElement.styles;
         orderedObservations.push(foundObs);
       }

package/dist/application/FormElement.js

@@ -478,7 +478,8 @@ _defineProperty(FormElement, "keys", {
   groupSubjectRoleUUID: "groupSubjectRoleUUID",
   allowedTypes: "allowedTypes",
   allowedMaxSize: "allowedMaxSize",
-  displayAllGroupMembers: "displayAllGroupMembers"
+  displayAllGroupMembers: "displayAllGroupMembers",
+  searchOptions: "searchOptions"
 });
 
 _defineProperty(FormElement, "values", {

package/package.json

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