openchs-models 1.32.33 → 1.32.35

package/dist/Concept.js

@@ -267,11 +267,15 @@ class Concept extends _BaseEntity.default {
   }
 
   isMediaConcept() {
+    return _lodash.default.includes([Concept.dataType.Image, Concept.dataType.ImageV2, Concept.dataType.Video, Concept.dataType.File], this.datatype);
+  }
+
+  isMediaSelectConcept() {
     return _lodash.default.includes([Concept.dataType.Image, Concept.dataType.Video, Concept.dataType.File], this.datatype);
   }
 
   isSelectConcept() {
-    return this.isCodedConcept() || this.isSubjectConcept() || this.isEncounterConcept() || this.isMediaConcept();
+    return this.isCodedConcept() || this.isSubjectConcept() || this.isEncounterConcept() || this.isMediaSelectConcept();
   }
 
   isDurationConcept() {
@@ -406,6 +410,7 @@ _defineProperty(Concept, "dataType", {
   Notes: "Notes",
   NA: "NA",
   Image: "Image",
+  ImageV2: "ImageV2",
   Video: "Video",
   Audio: "Audio",
   Id: "Id",
@@ -418,7 +423,7 @@ _defineProperty(Concept, "dataType", {
   Encounter: "Encounter",
 
   get Media() {
-    return [this.Image, this.Video, this.Audio, this.File];
+    return [this.Image, this.ImageV2, this.Video, this.Audio, this.File];
   }
 
 });

package/dist/Observation.js

@@ -86,6 +86,8 @@ class Observation extends _PersistedObject.default {
       return new _Displayable.default(valueWrapper.asDisplayDate(), null);
     } else if (observation.concept.datatype === _Concept.default.dataType.Time) {
       return new _Displayable.default(valueWrapper.asDisplayTime(), null);
+    } else if (observation.concept.datatype === _Concept.default.dataType.ImageV2) {
+      return new _Displayable.default(JSON.parse(valueWrapper.getValue()), null);
     } else if (valueWrapper.isSingleCoded) {
       if (observation.concept.datatype === _Concept.default.dataType.Subject) {
         const uuid = valueWrapper.getValue();

package/dist/ObservationsHolder.js

@@ -142,6 +142,8 @@ class ObservationsHolder {
             formElementsIncludingRepeatableElements.push(newFormElement);
           });
         });
+
+        formElementsIncludingRepeatableElements.push(fe);
       } else if (_lodash.default.isNil(fe.groupUuid)) {
         formElementsIncludingRepeatableElements.push(fe);
       }
@@ -487,7 +489,19 @@ class ObservationsHolder {
     if (observation) {
       const valueWrapper = observation.getValueWrapper();
 
-      if (valueWrapper.isMultipleCoded) {
+      if (observation.concept.datatype === _Concept.default.dataType.ImageV2) {
+        const mediaObjects = JSON.parse(valueWrapper.getValue());
+
+        const newAnswers = _lodash.default.map(mediaObjects, mediaObject => {
+          if (mediaObject.uri === oldValue) {
+            mediaObject.uri = newValue;
+          }
+
+          return mediaObject;
+        });
+
+        observation.valueJSON = new _PrimitiveValue.default(JSON.stringify(newAnswers), _Concept.default.dataType.ImageV2);
+      } else if (valueWrapper.isMultipleCoded) {
         const answers = valueWrapper.getValue();
 
         const oldValueIndex = _lodash.default.indexOf(answers, oldValue);

package/dist/Program.js

@@ -68,6 +68,14 @@ 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;
   }
@@ -118,6 +126,7 @@ 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;
@@ -162,6 +171,7 @@ _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: 198,
+    schemaVersion: 199,
     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,6 +965,12 @@ 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));
+    _lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs, true));
 
     return orderedChildObs;
   }
 
-  addSortedObservations(formElement, observations, orderedObservations) {
+  addSortedObservations(formElement, observations, orderedObservations, forQGChildren = false) {
     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)) {
+      if (!_lodash.default.isNil(foundObs) && (_lodash.default.isNil(formElement.groupUuid) || forQGChildren)) {
         foundObs.styles = formElement.styles;
         orderedObservations.push(foundObs);
       }

package/dist/application/FormElement.js

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

package/dist/index.js

@@ -165,6 +165,12 @@ Object.defineProperty(exports, "FormMapping", {
     return _FormMapping.default;
   }
 });
+Object.defineProperty(exports, "findMediaObservations", {
+  enumerable: true,
+  get: function () {
+    return _Media.findMediaObservations;
+  }
+});
 Object.defineProperty(exports, "MenuItem", {
   enumerable: true,
   get: function () {
@@ -864,6 +870,8 @@ var _Form = _interopRequireDefault(require("./application/Form"));
 
 var _FormMapping = _interopRequireDefault(require("./application/FormMapping"));
 
+var _Media = require("./Media");
+
 var _MenuItem = _interopRequireDefault(require("./application/MenuItem"));
 
 var _Gender = _interopRequireDefault(require("./Gender"));

package/package.json

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