openchs-models 1.32.38 → 1.32.40

package/dist/Concept.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.MediaType = exports.default = void 0;
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
@@ -84,6 +84,22 @@ class Concept extends _BaseEntity.default {
     this.that.unit = x;
   }
 
+  get mediaUrl() {
+    return this.that.mediaUrl;
+  }
+
+  set mediaUrl(x) {
+    this.that.mediaUrl = x;
+  }
+
+  get mediaType() {
+    return this.that.mediaType;
+  }
+
+  set mediaType(x) {
+    this.that.mediaType = x;
+  }
+
   get name() {
     return this.that.name;
   }
@@ -129,6 +145,8 @@ class Concept extends _BaseEntity.default {
     concept.voided = conceptResource.voided || false; //This change should be independently deployable irrespective of server
 
     concept.keyValues = _lodash.default.map(conceptResource.keyValues, _KeyValue.default.fromResource);
+    concept.mediaUrl = conceptResource.mediaUrl;
+    concept.mediaType = conceptResource.mediaType;
     return concept;
   }
 
@@ -271,7 +289,7 @@ class Concept extends _BaseEntity.default {
   }
 
   isMediaSelectConcept() {
-    return _lodash.default.includes([Concept.dataType.Image, Concept.dataType.Video, Concept.dataType.File], this.datatype);
+    return _lodash.default.includes([Concept.dataType.Image, Concept.dataType.ImageV2, Concept.dataType.Video, Concept.dataType.File], this.datatype);
   }
 
   isSelectConcept() {
@@ -333,6 +351,26 @@ class Concept extends _BaseEntity.default {
     return keyValue === _KeyValue.default.ContactYesValue;
   }
 
+  isMediaTypeImage() {
+    return this.mediaType === MediaType.Image;
+  }
+
+  hasMediaType() {
+    return !_lodash.default.isNil(this.mediaType);
+  }
+
+  hasMediaUrl() {
+    return !_lodash.default.isNil(this.mediaUrl) && this.mediaUrl !== '';
+  }
+
+  hasAnswersWithMedia() {
+    return _lodash.default.some(this.answers, answer => answer.concept.hasMediaUrl() || answer.concept.hasMediaType());
+  }
+
+  hasMedia() {
+    return this.hasMediaUrl() || this.hasMediaType() || this.hasAnswersWithMedia();
+  }
+
 }
 
 exports.default = Concept;
@@ -380,6 +418,14 @@ _defineProperty(Concept, "schema", {
     voided: {
       type: "bool",
       default: false
+    },
+    mediaUrl: {
+      type: "string",
+      optional: true
+    },
+    mediaType: {
+      type: "string",
+      optional: true
     }
   }
 });
@@ -428,4 +474,9 @@ _defineProperty(Concept, "dataType", {
 
 });
 
-_defineProperty(Concept, "merge", () => _BaseEntity.default.mergeOn("answers"));
+_defineProperty(Concept, "merge", () => _BaseEntity.default.mergeOn("answers"));
+
+const MediaType = {
+  Image: "Image"
+};
+exports.MediaType = MediaType;

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: 200,
     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.`);
@@ -971,6 +971,13 @@ function createRealmConfig() {
           program.showGrowthChart = _lodash.default.toLower(program.name) === "child";
         });
       }
+
+      if (oldDB.schemaVersion < 200) {
+        _lodash.default.forEach(newDB.objects("Concept"), concept => {
+          concept.mediaType = null;
+          concept.mediaUrl = null;
+        });
+      }
     }
   };
 }

package/package.json

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