openchs-models 1.32.39 → 1.32.41

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;
   }
 
@@ -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

@@ -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/dist/application/Form.js

@@ -120,26 +120,9 @@ class Form extends _BaseEntity.default {
   }
 
   static fromResource(resource, entityService) {
-    const formSyncStatus = entityService.findByCriteria(`entityName = 'Form'`, _EntitySyncStatus.default.schema.name);
-
-    if (resource.formType === this.formTypes.IndividualProfile && formSyncStatus && (0, _moment.default)(formSyncStatus.loadedSince).isBefore((0, _moment.default)(resource.lastModifiedDateTime))) {
-      this.deleteOutOfSyncDrafts(entityService, resource.uuid);
-    }
-
     return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
   }
 
-  static deleteOutOfSyncDrafts(entityService, formUUID) {
-    const formMappings = entityService.findAllByCriteria(`form.uuid = '${formUUID}'`, _FormMapping.default.schema.name);
-
-    _lodash.default.forEach(formMappings, ({
-      subjectType
-    }) => {
-      const outOfSyncDrafts = entityService.findAll("DraftSubject").filtered(`subjectType.uuid = $0`, subjectType.uuid);
-      entityService.deleteEntities(outOfSyncDrafts);
-    });
-  }
-
   static associateChild(child, childEntityClass, childResource, entityService) {
     let form = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, "formUUID", Form.schema.name);
 

package/package.json

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