openchs-models 1.32.29 → 1.32.31

package/dist/Concept.js

@@ -267,15 +267,11 @@ 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.isMediaSelectConcept();
+    return this.isCodedConcept() || this.isSubjectConcept() || this.isEncounterConcept() || this.isMediaConcept();
   }
 
   isDurationConcept() {
@@ -410,7 +406,6 @@ _defineProperty(Concept, "dataType", {
   Notes: "Notes",
   NA: "NA",
   Image: "Image",
-  ImageV2: "ImageV2",
   Video: "Video",
   Audio: "Audio",
   Id: "Id",
@@ -423,7 +418,7 @@ _defineProperty(Concept, "dataType", {
   Encounter: "Encounter",
 
   get Media() {
-    return [this.Image, this.ImageV2, this.Video, this.Audio, this.File];
+    return [this.Image, this.Video, this.Audio, this.File];
   }
 
 });

package/dist/Observation.js

@@ -86,8 +86,6 @@ 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,11 @@ class ObservationsHolder {
             formElementsIncludingRepeatableElements.push(newFormElement);
           });
         });
-      }
 
-      formElementsIncludingRepeatableElements.push(fe);
+        formElementsIncludingRepeatableElements.push(fe);
+      } else if (_lodash.default.isNil(fe.groupUuid)) {
+        formElementsIncludingRepeatableElements.push(fe);
+      }
     });
 
     const inApplicableFormElements = _lodash.default.differenceWith(formElementsIncludingRepeatableElements, applicableFormElements, (a, b) => a.uuid === b.uuid && a.questionGroupIndex === b.questionGroupIndex);
@@ -487,19 +489,7 @@ class ObservationsHolder {
     if (observation) {
       const valueWrapper = observation.getValueWrapper();
 
-      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) {
+      if (valueWrapper.isMultipleCoded) {
         const answers = valueWrapper.getValue();
 
         const oldValueIndex = _lodash.default.indexOf(answers, oldValue);

package/dist/index.js

@@ -165,12 +165,6 @@ 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 () {
@@ -870,8 +864,6 @@ 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.29",
+    "version": "1.32.31",
     "private": false,
     "repository": {
         "type": "git",