openchs-models 1.32.8 → 1.32.9

package/dist/Schema.js

@@ -921,21 +921,6 @@ function createRealmConfig() {
       if (oldDB.schemaVersion < 191) {
         newDB.delete(newDB.objects("CustomDashboardCache"));
       }
-
-      if (oldDB.schemaVersion < 197) {
-        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/StandardReportCardType.js

@@ -42,28 +42,36 @@ class StandardReportCardType extends _BaseEntity.default {
     this.that.description = x;
   }
 
+  get type() {
+    return this.that.type;
+  }
+
+  set type(x) {
+    this.that.type = x;
+  }
+
   get iconName() {
     const typeIcon = {
-      [StandardReportCardType.type.Approved]: 'check-circle',
-      [StandardReportCardType.type.Rejected]: 'cancel',
-      [StandardReportCardType.type.PendingApproval]: 'av-timer',
-      [StandardReportCardType.type.Comments]: 'message',
-      [StandardReportCardType.type.CallTasks]: 'call',
-      [StandardReportCardType.type.OpenSubjectTasks]: 'sticky-note-2'
+      [StandardReportCardType.types.Approved]: 'check-circle',
+      [StandardReportCardType.types.Rejected]: 'cancel',
+      [StandardReportCardType.types.PendingApproval]: 'av-timer',
+      [StandardReportCardType.types.Comments]: 'message',
+      [StandardReportCardType.types.CallTasks]: 'call',
+      [StandardReportCardType.types.OpenSubjectTasks]: 'sticky-note-2'
     };
-    return typeIcon[this.name];
+    return typeIcon[this.type];
   }
 
   get cardColor() {
     const typeCardColor = {
-      [StandardReportCardType.type.Approved]: '#00897b',
-      [StandardReportCardType.type.Rejected]: '#bf360c',
-      [StandardReportCardType.type.PendingApproval]: '#6a1b9a',
-      [StandardReportCardType.type.Comments]: '#3949ab',
-      [StandardReportCardType.type.CallTasks]: '#69a672',
-      [StandardReportCardType.type.OpenSubjectTasks]: '#717cac'
+      [StandardReportCardType.types.Approved]: '#00897b',
+      [StandardReportCardType.types.Rejected]: '#bf360c',
+      [StandardReportCardType.types.PendingApproval]: '#6a1b9a',
+      [StandardReportCardType.types.Comments]: '#3949ab',
+      [StandardReportCardType.types.CallTasks]: '#69a672',
+      [StandardReportCardType.types.OpenSubjectTasks]: '#717cac'
     };
-    return typeCardColor[this.name];
+    return typeCardColor[this.type];
   }
 
   get textColor() {
@@ -71,61 +79,61 @@ class StandardReportCardType extends _BaseEntity.default {
   }
 
   static fromResource(resource) {
-    return _General.default.assignFields(resource, new StandardReportCardType(), ["uuid", "name", "description", "voided"]);
+    return _General.default.assignFields(resource, new StandardReportCardType(), ["uuid", "name", "description", "voided", "type"]);
   }
 
   isStandardCard() {
-    return _lodash.default.includes([...this.approvalTypes(), StandardReportCardType.type.Comments, StandardReportCardType.type.CallTasks, StandardReportCardType.type.OpenSubjectTasks], this.name);
+    return _lodash.default.includes([...this.approvalTypes(), StandardReportCardType.types.Comments, StandardReportCardType.types.CallTasks, StandardReportCardType.types.OpenSubjectTasks], this.type);
   }
 
   approvalTypes() {
-    return [StandardReportCardType.type.PendingApproval, StandardReportCardType.type.Approved, StandardReportCardType.type.Rejected];
+    return [StandardReportCardType.types.PendingApproval, StandardReportCardType.types.Approved, StandardReportCardType.types.Rejected];
   }
 
   defaultTypes() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits, StandardReportCardType.type.Total];
+    return [StandardReportCardType.types.ScheduledVisits, StandardReportCardType.types.OverdueVisits, StandardReportCardType.types.RecentRegistrations, StandardReportCardType.types.RecentEnrolments, StandardReportCardType.types.RecentVisits, StandardReportCardType.types.Total];
   }
 
   isApprovalType() {
-    return _lodash.default.includes(this.approvalTypes(), this.name);
+    return _lodash.default.includes(this.approvalTypes(), this.type);
   }
 
   isCommentType() {
-    return this.name === StandardReportCardType.type.Comments;
+    return this.type === StandardReportCardType.types.Comments;
   }
 
   isTaskType() {
-    return _lodash.default.includes([StandardReportCardType.type.CallTasks, StandardReportCardType.type.OpenSubjectTasks], this.name);
+    return _lodash.default.includes([StandardReportCardType.types.CallTasks, StandardReportCardType.types.OpenSubjectTasks], this.type);
   }
 
   isChecklistType() {
-    return this.name === StandardReportCardType.type.DueChecklist;
+    return this.type === StandardReportCardType.types.DueChecklist;
   }
 
   getTaskTypeType() {
-    switch (this.name) {
-      case StandardReportCardType.type.CallTasks:
+    switch (this.type) {
+      case StandardReportCardType.types.CallTasks:
         return _TaskType.default.TaskTypeName.Call;
 
-      case StandardReportCardType.type.OpenSubjectTasks:
+      case StandardReportCardType.types.OpenSubjectTasks:
         return _TaskType.default.TaskTypeName.OpenSubject;
     }
   }
 
   isDefaultType() {
-    return _lodash.default.includes(this.defaultTypes(), this.name);
+    return _lodash.default.includes(this.defaultTypes(), this.type);
   }
 
   getApprovalStatusForType() {
-    return typeToStatusMap[this.name];
+    return typeToStatusMap[this.type];
   }
 
   isSubjectTypeFilterSupported() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits, StandardReportCardType.type.Total].includes(this.name);
+    return [StandardReportCardType.types.ScheduledVisits, StandardReportCardType.types.OverdueVisits, StandardReportCardType.types.RecentRegistrations, StandardReportCardType.types.RecentEnrolments, StandardReportCardType.types.RecentVisits, StandardReportCardType.types.Total].includes(this.type);
   }
 
   isRecentType() {
-    return [StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits].includes(this.name);
+    return [StandardReportCardType.types.RecentRegistrations, StandardReportCardType.types.RecentEnrolments, StandardReportCardType.types.RecentVisits].includes(this.type);
   }
 
 }
@@ -140,6 +148,10 @@ _defineProperty(StandardReportCardType, "schema", {
       type: "string",
       optional: true
     },
+    type: {
+      type: "string",
+      optional: true
+    },
     voided: {
       type: "bool",
       default: false
@@ -147,28 +159,28 @@ _defineProperty(StandardReportCardType, "schema", {
   }
 });
 
-_defineProperty(StandardReportCardType, "type", {
-  PendingApproval: "Pending approval",
+_defineProperty(StandardReportCardType, "types", {
+  PendingApproval: "PendingApproval",
   Approved: "Approved",
   Rejected: "Rejected",
-  ScheduledVisits: "Scheduled visits",
-  OverdueVisits: "Overdue visits",
-  RecentRegistrations: "Recent registrations",
-  RecentEnrolments: "Recent enrolments",
-  RecentVisits: "Recent visits",
+  ScheduledVisits: "ScheduledVisits",
+  OverdueVisits: "OverdueVisits",
+  RecentRegistrations: "RecentRegistrations",
+  RecentEnrolments: "RecentEnrolments",
+  RecentVisits: "RecentVisits",
   Total: "Total",
   Comments: "Comments",
-  CallTasks: "Call tasks",
-  OpenSubjectTasks: "Open subject tasks",
-  DueChecklist: "Due checklist"
+  CallTasks: "CallTasks",
+  OpenSubjectTasks: "OpenSubjectTasks",
+  DueChecklist: "DueChecklist"
 });
 
 _defineProperty(StandardReportCardType, "recentCardDurationUnits", [_Duration.default.Day, _Duration.default.Week, _Duration.default.Month]);
 
 const typeToStatusMap = {
-  [StandardReportCardType.type.PendingApproval]: _ApprovalStatus.default.statuses.Pending,
-  [StandardReportCardType.type.Approved]: _ApprovalStatus.default.statuses.Approved,
-  [StandardReportCardType.type.Rejected]: _ApprovalStatus.default.statuses.Rejected
+  [StandardReportCardType.types.PendingApproval]: _ApprovalStatus.default.statuses.Pending,
+  [StandardReportCardType.types.Approved]: _ApprovalStatus.default.statuses.Approved,
+  [StandardReportCardType.types.Rejected]: _ApprovalStatus.default.statuses.Rejected
 };
 var _default = StandardReportCardType;
 exports.default = _default;

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.8",
+    "version": "1.32.9",
     "private": false,
     "repository": {
         "type": "git",