openchs-models 1.32.14 → 1.32.16

package/dist/Schema.js

@@ -283,7 +283,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 198,
+    schemaVersion: 197,
     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.`);
@@ -923,6 +923,13 @@ function createRealmConfig() {
       }
 
       if (oldDB.schemaVersion < 197) {
+        _lodash.default.forEach(newDB.objects("ReportCard"), reportCard => {
+          if (reportCard.standardReportCardType && ['Last 24 hours registrations', 'Last 24 hours enrolments', 'Last 24 hours visits'].includes(reportCard.standardReportCardType.name)) reportCard.standardReportCardInputRecentDurationJSON = JSON.stringify({
+            value: "1",
+            unit: "days"
+          });
+        });
+
         _lodash.default.forEach(newDB.objects("StandardReportCardType"), standardReportCardType => {
           if (standardReportCardType.name === 'Last 24 hours registrations') {
             standardReportCardType.description = 'Recent registrations';
@@ -943,21 +950,6 @@ function createRealmConfig() {
         const dashboardCache = newDB.objects("DashboardCache");
         newDB.delete(dashboardCache);
       }
-
-      if (oldDB.schemaVersion < 198) {
-        const oldObjects = oldDB.objects(_FormElementGroup.default.schema.name);
-        const newObjects = newDB.objects(_FormElementGroup.default.schema.name); // loop through all objects and set the name property in the
-        // new schema to display property
-
-        for (const objectIndex in oldObjects) {
-          const oldObject = oldObjects[objectIndex];
-          const newObject = newObjects[objectIndex];
-
-          if (!_lodash.default.isEmpty(oldObject.display) && oldObject.name !== oldObject.display) {
-            newObject.name = oldObject.display;
-          }
-        }
-      }
     }
   };
 }

package/dist/application/FormElementGroup.js

@@ -48,6 +48,14 @@ class FormElementGroup extends _BaseEntity.default {
     this.that.displayOrder = x;
   }
 
+  get display() {
+    return this.that.display;
+  }
+
+  set display(x) {
+    this.that.display = x;
+  }
+
   get formElements() {
     return this.toEntityList("formElements", _FormElement.default);
   }
@@ -113,7 +121,7 @@ class FormElementGroup extends _BaseEntity.default {
   }
 
   static fromResource(resource, entityService) {
-    const formElementGroup = _General.default.assignFields(resource, new FormElementGroup(), ["uuid", "name", "displayOrder", "voided", "rule", "startTime", "stayTime", "timed", "textColour", "backgroundColour"]);
+    const formElementGroup = _General.default.assignFields(resource, new FormElementGroup(), ["uuid", "name", "displayOrder", "display", "voided", "rule", "startTime", "stayTime", "timed", "textColour", "backgroundColour"]);
 
     formElementGroup.form = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "formUUID"), _Form.default.schema.name);
     return formElementGroup;
@@ -234,7 +242,7 @@ class FormElementGroup extends _BaseEntity.default {
   }
 
   get translatedFieldValue() {
-    return this.name;
+    return this.display;
   }
 
   removeFormElement(formElementName) {
@@ -283,6 +291,7 @@ class FormElementGroup extends _BaseEntity.default {
       uuid: this.uuid,
       name: this.name,
       displayOrder: this.displayOrder,
+      display: this.display,
       formElements: this.formElements,
       formUUID: this.form.uuid,
       startTime: this.startTime,
@@ -302,6 +311,10 @@ _defineProperty(FormElementGroup, "schema", {
     uuid: "string",
     name: "string",
     displayOrder: "double",
+    display: {
+      type: "string",
+      optional: true
+    },
     formElements: {
       type: "list",
       objectType: "FormElement"

package/package.json

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