openchs-models 1.33.43 → 1.33.45

package/dist/Schema.js

@@ -181,7 +181,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 210,
+    schemaVersion: 211,
     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.`);

package/dist/application/Form.js

@@ -76,6 +76,39 @@ class Form extends _BaseEntity.default {
   set taskScheduleRule(x) {
     this.that.taskScheduleRule = x;
   }
+  get shareRule() {
+    return this.that.shareRule;
+  }
+  set shareRule(x) {
+    this.that.shareRule = x;
+  }
+  get shareTemplateS3Key() {
+    return this.that.shareTemplateS3Key;
+  }
+  set shareTemplateS3Key(x) {
+    this.that.shareTemplateS3Key = x;
+  }
+  get shareTranslations() {
+    return this.that.shareTranslations;
+  }
+  set shareTranslations(x) {
+    this.that.shareTranslations = x;
+  }
+  hasShareRule() {
+    return !_lodash.default.isEmpty(_lodash.default.trim(this.shareRule));
+  }
+  hasShareTemplate() {
+    return !_lodash.default.isEmpty(_lodash.default.trim(this.shareTemplateS3Key));
+  }
+  getShareTranslations() {
+    if (!this.shareTranslations) return {};
+    try {
+      const parsed = JSON.parse(this.shareTranslations);
+      return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+    } catch (e) {
+      return {};
+    }
+  }
   static safeInstance() {
     const form = new Form();
     form.formElementGroups = [];
@@ -88,7 +121,11 @@ class Form extends _BaseEntity.default {
     return this;
   }
   static fromResource(resource, entityService) {
-    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
+    const form = _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule", "shareRule", "shareTemplateS3Key"]);
+    if (resource && "shareTranslations" in resource) {
+      form.shareTranslations = resource.shareTranslations && typeof resource.shareTranslations === "object" ? JSON.stringify(resource.shareTranslations) : null;
+    }
+    return form;
   }
   static associateChild(child, childEntityClass, childResource, entityService) {
     let form = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, "formUUID", Form.schema.name);
@@ -300,6 +337,18 @@ _defineProperty(Form, "schema", {
     taskScheduleRule: {
       type: "string",
       optional: true
+    },
+    shareRule: {
+      type: "string",
+      optional: true
+    },
+    shareTemplateS3Key: {
+      type: "string",
+      optional: true
+    },
+    shareTranslations: {
+      type: "string",
+      optional: true
     }
   }
 });

package/dist/application/FormElement.js

@@ -202,7 +202,7 @@ class FormElement extends _BaseEntity.default {
     return yearDifference <= 2000;
   }
   getAnswers() {
-    const allAnswers = this.concept.getAnswers();
+    const allAnswers = this.concept.getAnswers().filter(ca => !ca.concept.voided);
     if (!_lodash.default.isEmpty(this.answersToShow)) {
       return _lodash.default.filter(allAnswers, allConceptAnswer => _lodash.default.includes(this.answersToShow, allConceptAnswer.concept.name));
     } else {

package/package.json

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