openchs-models 1.31.78 → 1.31.79

package/dist/CustomDashboardCache.js

@@ -7,6 +7,10 @@ exports.default = void 0;
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
+var _Dashboard = _interopRequireDefault(require("./Dashboard"));
+
+var _General = _interopRequireDefault(require("./utility/General"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -16,14 +20,6 @@ class CustomDashboardCache extends _BaseEntity.default {
     super(that);
   }
 
-  get checksum() {
-    return this.that.checksum;
-  }
-
-  set checksum(x) {
-    this.that.checksum = x;
-  }
-
   get updatedAt() {
     return this.that.updatedAt;
   }
@@ -48,84 +44,49 @@ class CustomDashboardCache extends _BaseEntity.default {
     this.that.filterApplied = x;
   }
 
-  get filterErrorsJSON() {
-    return this.that.filterErrorsJSON;
-  }
-
-  set filterErrorsJSON(x) {
-    this.that.filterErrorsJSON = x;
-  }
-
-  get ruleInputJSON() {
-    return this.that.ruleInputJSON;
-  }
-
-  set ruleInputJSON(x) {
-    this.that.ruleInputJSON = x;
+  get dashboard() {
+    return this.toEntity("dashboard", _Dashboard.default);
   }
 
-  get transformedFiltersJSON() {
-    return this.that.transformedFiltersJSON;
+  set dashboard(x) {
+    this.that.dashboard = this.fromObject(x);
   }
 
-  set transformedFiltersJSON(x) {
-    this.that.transformedFiltersJSON = x;
-  }
-
-  static create(uuid, checksum, updatedAt, selectedValuesJSON, filterApplied, filterErrorsJSON, ruleInputJSON, transformedFiltersJSON) {
+  static create(uuid, updatedAt, selectedValuesJSON = '{}', filterApplied) {
     const customDashboardCache = new CustomDashboardCache();
     customDashboardCache.uuid = uuid;
-    customDashboardCache.checksum = checksum;
     customDashboardCache.updatedAt = updatedAt;
     customDashboardCache.selectedValuesJSON = selectedValuesJSON;
     customDashboardCache.filterApplied = filterApplied;
-    customDashboardCache.filterErrorsJSON = filterErrorsJSON;
-    customDashboardCache.ruleInputJSON = ruleInputJSON;
-    customDashboardCache.transformedFiltersJSON = transformedFiltersJSON;
     return customDashboardCache;
   }
 
-  static getSelectedValuesFromState(state) {
-    const filterCache = {
-      date: state.date,
-      applied: false,
-      selectedLocations: state.selectedLocations,
-      selectedCustomFilters: state.selectedCustomFilters,
-      selectedGenders: state.selectedGenders
-    };
-    return filterCache;
-  }
-
-  static createEmptyInstance() {
-    return new CustomDashboardCache();
+  static newInstance(dashboard) {
+    const customDashboardCache = new CustomDashboardCache();
+    customDashboardCache.uuid = _General.default.randomUUID();
+    customDashboardCache.dashboard = dashboard;
+    customDashboardCache.reset();
+    return customDashboardCache;
   }
 
-  getChecksum() {
-    return this.checksum;
+  reset() {
+    this.filterApplied = false;
+    this.selectedValuesJSON = JSON.stringify({});
+    this.updatedAt = new Date();
   }
 
   getSelectedValues() {
-    return this.selectedValuesJSON && JSON.parse(this.selectedValuesJSON) || {};
+    return JSON.parse(this.selectedValuesJSON);
   }
 
-  getFilterErrors() {
-    return this.filterErrorsJSON && JSON.parse(this.filterErrorsJSON) || {};
-  }
-
-  getRuleInput() {
-    return this.ruleInputJSON && JSON.parse(this.ruleInputJSON) || {
-      ruleInputArray: null
-    };
-  }
-
-  getTransformedFilters() {
-    return this.transformedFiltersJSON && JSON.parse(this.transformedFiltersJSON) || {
-      date: new Date(),
-      applied: false,
-      selectedLocations: [],
-      selectedCustomFilters: [],
-      selectedGenders: []
-    };
+  clone() {
+    const customDashboardCache = new CustomDashboardCache();
+    customDashboardCache.uuid = this.uuid;
+    customDashboardCache.dashboard = this.dashboard;
+    customDashboardCache.updatedAt = this.updatedAt;
+    customDashboardCache.selectedValuesJSON = this.selectedValuesJSON;
+    customDashboardCache.filterApplied = this.filterApplied;
+    return customDashboardCache;
   }
 
 }
@@ -135,16 +96,10 @@ _defineProperty(CustomDashboardCache, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    checksum: "string",
+    dashboard: "Dashboard",
     updatedAt: "date",
     selectedValuesJSON: "string",
-    filterApplied: {
-      type: "bool",
-      default: false
-    },
-    filterErrorsJSON: "string",
-    ruleInputJSON: "string",
-    transformedFiltersJSON: "string"
+    filterApplied: "bool"
   }
 });
 

package/dist/ReportCard.js

@@ -26,6 +26,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class ReportCard extends _BaseEntity.default {
+  static newReportCard() {
+    const reportCard = new ReportCard();
+    reportCard.standardReportCardInputSubjectTypes = [];
+    reportCard.standardReportCardInputPrograms = [];
+    reportCard.standardReportCardInputEncounterTypes = [];
+    return reportCard;
+  }
+
   constructor(that = null) {
     super(that);
   }
@@ -148,9 +156,18 @@ class ReportCard extends _BaseEntity.default {
   }
 
   static fromResource(resource, entityService) {
-    const reportCard = _General.default.assignFields(resource, new ReportCard(), ["uuid", "name", "query", "description", "colour", "voided", "nested", "countOfCards"]);
+    const reportCard = _General.default.assignFields(resource, ReportCard.newReportCard(), ["uuid", "name", "query", "description", "colour", "voided", "nested", "countOfCards"]);
 
     reportCard.standardReportCardType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "standardReportCardUUID"), _StandardReportCardType.default.schema.name);
+    resource.standardReportCardInputSubjectTypes.forEach(uuid => {
+      reportCard.standardReportCardInputSubjectTypes.push(entityService.findByUUID(uuid, _SubjectType.default.schema.name));
+    });
+    resource.standardReportCardInputPrograms.forEach(uuid => {
+      reportCard.standardReportCardInputPrograms.push(entityService.findByUUID(uuid, _Program.default.schema.name));
+    });
+    resource.standardReportCardInputEncounterTypes.forEach(uuid => {
+      reportCard.standardReportCardInputEncounterTypes.push(entityService.findByUUID(uuid, _EncounterType.default.schema.name));
+    });
     return reportCard;
   }
 

package/dist/Schema.js

@@ -279,7 +279,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 190,
+    schemaVersion: 191,
     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.`);
@@ -913,6 +913,10 @@ function createRealmConfig() {
       if (oldDB.schemaVersion < 190) {// PlaceHolder for SubjectType.User changes, so that people with previous version of client
         // are not able to use fastSync of version 190 and above
       }
+
+      if (oldDB.schemaVersion < 191) {
+        newDB.delete(newDB.objects("CustomDashboardCache"));
+      }
     }
   };
 }

package/package.json

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