openchs-models 1.33.37 → 1.33.39

package/dist/Concept.js

@@ -231,10 +231,10 @@ class Concept extends _BaseEntity.default {
     return this.isType(Concept.dataType.Encounter);
   }
   isMediaConcept() {
-    return _lodash.default.includes(Concept.dataType.Media, this.datatype);
+    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.Media, this.datatype);
+    return _lodash.default.includes([Concept.dataType.Image, Concept.dataType.ImageV2, Concept.dataType.Video, Concept.dataType.File], this.datatype);
   }
   isSelectConcept() {
     return this.isCodedConcept() || this.isSubjectConcept() || this.isEncounterConcept() || this.isMediaSelectConcept();

package/dist/CustomCardConfig.js

@@ -32,8 +32,29 @@ class CustomCardConfig extends _BaseEntity.default {
   set dataRule(x) {
     this.that.dataRule = x;
   }
+  get translations() {
+    return this.that.translations;
+  }
+  set translations(x) {
+    this.that.translations = x;
+  }
+  getTranslations() {
+    if (!this.translations) {
+      return {};
+    }
+    try {
+      const parsed = JSON.parse(this.translations);
+      return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+    } catch (e) {
+      return {};
+    }
+  }
   static fromResource(resource) {
-    return _General.default.assignFields(resource, new CustomCardConfig(), ["uuid", "name", "htmlFileS3Key", "dataRule", "voided"]);
+    const config = _General.default.assignFields(resource, new CustomCardConfig(), ["uuid", "name", "htmlFileS3Key", "dataRule", "voided"]);
+    if (resource && "translations" in resource) {
+      config.translations = resource.translations && typeof resource.translations === 'object' ? JSON.stringify(resource.translations) : null;
+    }
+    return config;
   }
 }
 _defineProperty(CustomCardConfig, "schema", {
@@ -47,6 +68,10 @@ _defineProperty(CustomCardConfig, "schema", {
       type: "string",
       optional: true
     },
+    translations: {
+      type: "string",
+      optional: true
+    },
     voided: {
       type: "bool",
       default: false

package/dist/ObservationsHolder.js

@@ -152,8 +152,12 @@ class ObservationsHolder {
     });
     const inApplicableFormElements = _lodash.default.differenceWith(formElementsIncludingRepeatableElements, applicableFormElements, (a, b) => a.uuid === b.uuid && a.questionGroupIndex === b.questionGroupIndex);
     applicableFormElements.forEach(fe => {
-      if (fe.concept.isCodedConcept() && (!_lodash.default.isEmpty(fe.answersToShow) || !_lodash.default.isEmpty(fe.answersToExclude))) {
+      const hasFilters = !_lodash.default.isEmpty(fe.answersToShow) || !_lodash.default.isEmpty(fe.answersToExclude);
+      if (!hasFilters) return;
+      if (fe.concept.isCodedConcept()) {
         fe.isQuestionGroup() ? this.removeNonApplicableAnswersFromQuestionGroup(fe, fe.isSingleSelect(), allFormElements) : this.removeNonApplicableAnswers(fe, fe.isSingleSelect(), this.getObservation(fe.concept));
+      } else if (fe.concept.isSubjectConcept()) {
+        this.removeNonApplicableSubjectAnswers(fe, fe.isSingleSelect(), this.getObservation(fe.concept));
       }
     });
     return _lodash.default.flatten(inApplicableFormElements.map(fe => this._removeObs(fe))).filter(obs => !_lodash.default.isEmpty(obs));
@@ -202,6 +206,24 @@ class ObservationsHolder {
     }
   }
 
+  //private
+  removeNonApplicableSubjectAnswers(fe, isSingleSelect, observation) {
+    if (_lodash.default.isEmpty(observation)) return;
+    const allowedUUIDs = fe.getApplicableSubjectUUIDs();
+    const excludedUUIDs = fe.getExcludedSubjectUUIDs();
+    const currentValues = _lodash.default.flatten([observation.getValue()]);
+    const applicableValues = _lodash.default.filter(currentValues, value => {
+      if (allowedUUIDs && !_lodash.default.includes(allowedUUIDs, value)) return false;
+      if (_lodash.default.includes(excludedUUIDs, value)) return false;
+      return true;
+    });
+    if (applicableValues.length === currentValues.length) return;
+    _ArrayHelper.default.remove(this.observations, obs => obs.concept.uuid === observation.concept.uuid);
+    const newValue = isSingleSelect ? new _SingleCodedValue.default(_lodash.default.head(applicableValues)) : new _MultipleCodedValues.default(applicableValues);
+    const newObservation = _Observation.default.create(observation.concept, newValue);
+    this.observations.push(newObservation);
+  }
+
   /*
   Called from wizard after the update of the fields is called for all types. This is to sync up the coded fields based on the rules.
    */

package/dist/Privilege.js

@@ -77,10 +77,7 @@ _defineProperty(Privilege, "privilegeName", {
   approveEnrolment: "Approve Enrolment",
   approveEncounter: "Approve Encounter",
   approveChecklistItem: "Approve ChecklistItem",
-  viewEditEntitiesOnDataEntryApp: 'View Or Edit Entities On DataEntry App',
-  shareSubject: "Share subject",
-  shareEnrolment: "Share enrolment",
-  shareEncounter: "Share encounter"
+  viewEditEntitiesOnDataEntryApp: 'View Or Edit Entities On DataEntry App'
 });
 _defineProperty(Privilege, "PrivilegeType", {
   AddMember: "AddMember",
@@ -142,10 +139,7 @@ _defineProperty(Privilege, "PrivilegeType", {
   DownloadBundle: "DownloadBundle",
   EditTaskType: "EditTaskType",
   ViewEditEntitiesOnDataEntryApp: "ViewEditEntitiesOnDataEntryApp",
-  DeleteOrganisationConfiguration: "DeleteOrganisationConfiguration",
-  ShareSubject: "ShareSubject",
-  ShareEnrolment: "ShareEnrolment",
-  ShareEncounter: "ShareEncounter"
+  DeleteOrganisationConfiguration: "DeleteOrganisationConfiguration"
 });
 _defineProperty(Privilege, "privilegeEntityType", {
   subject: "Subject",

package/dist/Schema.js

@@ -181,7 +181,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 209,
+    schemaVersion: 210,
     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.`);
@@ -802,6 +802,16 @@ function createRealmConfig() {
           }
         });
       }
+      if (oldDB.schemaVersion < 210) {
+        _lodash.default.forEach(newDB.objects(_EntitySyncStatus.default.schema.name), ess => {
+          if (ess.entityName === 'CustomCardConfig') {
+            ess.loadedSince = _EntitySyncStatus.default.REALLY_OLD_DATE;
+          }
+        });
+        _lodash.default.forEach(newDB.objects("CustomCardConfig"), config => {
+          config.translations = null;
+        });
+      }
     }
   };
 }

package/dist/application/FormElement.js

@@ -217,6 +217,13 @@ class FormElement extends _BaseEntity.default {
   getApplicableAnswerConceptUUIDs() {
     return _lodash.default.map(this.getAnswers(), ca => ca.concept.uuid);
   }
+  getApplicableSubjectUUIDs() {
+    if (!_lodash.default.isEmpty(this.answersToShow)) return [...this.answersToShow];
+    return null;
+  }
+  getExcludedSubjectUUIDs() {
+    return _lodash.default.isEmpty(this.answersToExclude) ? [] : [...this.answersToExclude];
+  }
   getAnswerWithConceptName(conceptName) {
     return _lodash.default.find(this.concept.getAnswers(), answer => answer.concept.name === conceptName);
   }

package/package.json

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