openchs-models 1.32.26 → 1.32.29

package/dist/Concept.js

@@ -270,8 +270,12 @@ class Concept extends _BaseEntity.default {
     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() {

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,9 +142,9 @@ class ObservationsHolder {
             formElementsIncludingRepeatableElements.push(newFormElement);
           });
         });
-      } else if (_lodash.default.isNil(fe.groupUuid)) {
-        formElementsIncludingRepeatableElements.push(fe);
       }
+
+      formElementsIncludingRepeatableElements.push(fe);
     });
 
     const inApplicableFormElements = _lodash.default.differenceWith(formElementsIncludingRepeatableElements, applicableFormElements, (a, b) => a.uuid === b.uuid && a.questionGroupIndex === b.questionGroupIndex);
@@ -487,7 +487,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/package.json

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