openchs-models 1.32.31 → 1.32.32

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

@@ -489,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/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.31",
+    "version": "1.32.32",
     "private": false,
     "repository": {
         "type": "git",