openchs-models 1.31.79 → 1.31.81

package/dist/CustomDashboardCache.js

@@ -7,10 +7,6 @@ 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; }
@@ -20,6 +16,14 @@ 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;
   }
@@ -44,49 +48,84 @@ class CustomDashboardCache extends _BaseEntity.default {
     this.that.filterApplied = x;
   }
 
-  get dashboard() {
-    return this.toEntity("dashboard", _Dashboard.default);
+  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;
   }
 
-  set dashboard(x) {
-    this.that.dashboard = this.fromObject(x);
+  get transformedFiltersJSON() {
+    return this.that.transformedFiltersJSON;
   }
 
-  static create(uuid, updatedAt, selectedValuesJSON = '{}', filterApplied) {
+  set transformedFiltersJSON(x) {
+    this.that.transformedFiltersJSON = x;
+  }
+
+  static create(uuid, checksum, updatedAt, selectedValuesJSON, filterApplied, filterErrorsJSON, ruleInputJSON, transformedFiltersJSON) {
     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 newInstance(dashboard) {
-    const customDashboardCache = new CustomDashboardCache();
-    customDashboardCache.uuid = _General.default.randomUUID();
-    customDashboardCache.dashboard = dashboard;
-    customDashboardCache.reset();
-    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();
   }
 
-  reset() {
-    this.filterApplied = false;
-    this.selectedValuesJSON = JSON.stringify({});
-    this.updatedAt = new Date();
+  getChecksum() {
+    return this.checksum;
   }
 
   getSelectedValues() {
-    return JSON.parse(this.selectedValuesJSON);
+    return this.selectedValuesJSON && JSON.parse(this.selectedValuesJSON) || {};
   }
 
-  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;
+  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: []
+    };
   }
 
 }
@@ -96,10 +135,16 @@ _defineProperty(CustomDashboardCache, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    dashboard: "Dashboard",
+    checksum: "string",
     updatedAt: "date",
     selectedValuesJSON: "string",
-    filterApplied: "bool"
+    filterApplied: {
+      type: "bool",
+      default: false
+    },
+    filterErrorsJSON: "string",
+    ruleInputJSON: "string",
+    transformedFiltersJSON: "string"
   }
 });
 

package/dist/CustomFilter.js

@@ -41,8 +41,7 @@ _defineProperty(CustomFilter, "type", {
   EncounterDate: "EncounterDate",
   Address: "Address",
   Concept: "Concept",
-  GroupSubject: "GroupSubject",
-  SubjectType: "SubjectType"
+  GroupSubject: "GroupSubject"
 });
 
 _defineProperty(CustomFilter, "scope", {

package/dist/MediaQueue.js

@@ -9,6 +9,8 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 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; }
@@ -67,7 +69,7 @@ class MediaQueue extends _BaseEntity.default {
   }
 
   static create(entityUUID, entityName, fileName, type, entityTargetField, conceptUUID, uuid = _General.default.randomUUID()) {
-    var mediaQueue = new MediaQueue();
+    const mediaQueue = new MediaQueue();
     mediaQueue.entityUUID = entityUUID;
     mediaQueue.uuid = uuid;
     mediaQueue.entityName = entityName;
@@ -90,6 +92,18 @@ class MediaQueue extends _BaseEntity.default {
     return mediaQueueItem;
   }
 
+  getDisplayText() {
+    // generate safe to string
+    let str = "";
+    if (!_lodash.default.isNil(this.entityName)) str += "EntityName: " + this.entityName + ", ";
+    if (!_lodash.default.isNil(this.entityUUID)) str += "EntityUUID: " + this.entityUUID + ", ";
+    if (!_lodash.default.isNil(this.entityTargetField)) str += "EntityTargetField: " + this.entityTargetField + ", ";
+    if (!_lodash.default.isNil(this.fileName)) str += "FileName: " + this.fileName + ", ";
+    if (!_lodash.default.isNil(this.type)) str += "Type: " + this.type + ", ";
+    if (!_lodash.default.isNil(this.conceptUUID)) str += "ConceptUUID: " + this.conceptUUID;
+    return str;
+  }
+
 }
 
 _defineProperty(MediaQueue, "schema", {

package/dist/ReportCard.js

@@ -15,25 +15,15 @@ var _StandardReportCardType = _interopRequireDefault(require("./StandardReportCa
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _SubjectType = _interopRequireDefault(require("./SubjectType"));
-
-var _Program = _interopRequireDefault(require("./Program"));
-
-var _EncounterType = _interopRequireDefault(require("./EncounterType"));
-
 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; }
 
-class ReportCard extends _BaseEntity.default {
-  static newReportCard() {
-    const reportCard = new ReportCard();
-    reportCard.standardReportCardInputSubjectTypes = [];
-    reportCard.standardReportCardInputPrograms = [];
-    reportCard.standardReportCardInputEncounterTypes = [];
-    return reportCard;
-  }
+function throwInvalidIndexError(index, reportCardsLength) {
+  throw new Error(`Invalid index ${index} specified for reportCard with length ${reportCardsLength}`);
+}
 
+class ReportCard extends _BaseEntity.default {
   constructor(that = null) {
     super(that);
   }
@@ -106,30 +96,6 @@ class ReportCard extends _BaseEntity.default {
   get textColor() {
     return _lodash.default.isNil(this.standardReportCardType) ? '#ffffff' : this.standardReportCardType.textColor;
   }
-
-  get standardReportCardInputSubjectTypes() {
-    return this.toEntityList("standardReportCardInputSubjectTypes", _SubjectType.default);
-  }
-
-  set standardReportCardInputSubjectTypes(x) {
-    this.that.standardReportCardInputSubjectTypes = this.fromEntityList(x);
-  }
-
-  get standardReportCardInputPrograms() {
-    return this.toEntityList("standardReportCardInputPrograms", _Program.default);
-  }
-
-  set standardReportCardInputPrograms(x) {
-    this.that.standardReportCardInputPrograms = this.fromEntityList(x);
-  }
-
-  get standardReportCardInputEncounterTypes() {
-    return this.toEntityList("standardReportCardInputEncounterTypes", _EncounterType.default);
-  }
-
-  set standardReportCardInputEncounterTypes(x) {
-    this.that.standardReportCardInputEncounterTypes = this.fromEntityList(x);
-  }
   /**
    * Helper method used to generate unique key value for Nested Report Cards using UUID and Index of the Report Card.
    * The Nested Report Card's query responses would be mapped to the corresponding Dashboard Report cards using the UUID and Index.
@@ -156,18 +122,9 @@ class ReportCard extends _BaseEntity.default {
   }
 
   static fromResource(resource, entityService) {
-    const reportCard = _General.default.assignFields(resource, ReportCard.newReportCard(), ["uuid", "name", "query", "description", "colour", "voided", "nested", "countOfCards"]);
+    const reportCard = _General.default.assignFields(resource, new ReportCard(), ["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;
   }
 
@@ -175,14 +132,6 @@ class ReportCard extends _BaseEntity.default {
     return _lodash.default.isNil(this.standardReportCardType) ? false : this.standardReportCardType.isTaskType();
   }
 
-  isStandardReportType() {
-    return !_lodash.default.isNil(this.standardReportCardType);
-  }
-
-  isSubjectTypeFilterSupported() {
-    return this.isStandardReportType() && this.standardReportCardType.isSubjectTypeFilterSupported();
-  }
-
 }
 
 _defineProperty(ReportCard, "schema", {
@@ -217,20 +166,8 @@ _defineProperty(ReportCard, "schema", {
       type: "int",
       default: 1,
       optional: true
-    },
-    //Used only by nested ReportCards
-    standardReportCardInputSubjectTypes: {
-      type: "list",
-      objectType: "SubjectType"
-    },
-    standardReportCardInputPrograms: {
-      type: "list",
-      objectType: "Program"
-    },
-    standardReportCardInputEncounterTypes: {
-      type: "list",
-      objectType: "EncounterType"
-    }
+    } //Used only by nested ReportCards
+
   }
 });
 

package/dist/Schema.js

@@ -279,7 +279,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 191,
+    schemaVersion: 190,
     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,10 +913,6 @@ 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/dist/StandardReportCardType.js

@@ -118,10 +118,6 @@ class StandardReportCardType extends _BaseEntity.default {
     return typeToStatusMap[this.name];
   }
 
-  isSubjectTypeFilterSupported() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits].includes(this.name);
-  }
-
 }
 
 _defineProperty(StandardReportCardType, "schema", {

package/dist/reports/DashboardFilterConfig.js

@@ -111,8 +111,6 @@ const dateFilterTypes = [_CustomFilter.default.type.RegistrationDate, _CustomFil
 
 class DashboardFilterConfig {
   constructor() {
-    _defineProperty(this, "subjectType", void 0);
-
     _defineProperty(this, "type", void 0);
 
     _defineProperty(this, "widget", void 0);
@@ -142,10 +140,6 @@ class DashboardFilterConfig {
     return this.type === _CustomFilter.default.type.GroupSubject;
   }
 
-  isSubjectTypeFilter() {
-    return this.type === _CustomFilter.default.type.SubjectType;
-  }
-
   isValid() {
     const valid = !_lodash.default.isNil(this.type);
     if (!valid) return valid;
@@ -155,7 +149,6 @@ class DashboardFilterConfig {
   toServerRequest() {
     const request = {
       type: this.type,
-      subjectTypeUUID: this.subjectType && this.subjectType.uuid,
       widget: this.widget
     };
     if (this.isConceptTypeFilter()) request.observationBasedFilter = this.observationBasedFilter.toServerRequest();else if (this.isGroupSubjectTypeFilter()) request.groupSubjectTypeFilter = this.groupSubjectTypeFilter.toServerRequest();
@@ -182,12 +175,6 @@ class DashboardFilterConfig {
     return [RegistrationDate, EnrolmentDate, ProgramEncounterDate, EncounterDate].includes(this.type) || this.isConceptTypeFilter() && this.observationBasedFilter.isWidgetRequired();
   }
 
-  setSubjectType(subjectType) {
-    if (_lodash.default.get(subjectType, "uuid") !== _lodash.default.get(this.subjectType, "uuid")) {
-      this.subjectType = subjectType;
-    }
-  }
-
   willObservationBeInScopeOfProgramEnrolment() {
     return this.isConceptTypeFilter() && this.observationBasedFilter.willObservationBeInScopeOfProgramEnrolment();
   }
@@ -213,7 +200,6 @@ class DashboardFilterConfig {
   clone() {
     const clone = new DashboardFilterConfig();
     clone.type = this.type;
-    clone.subjectType = this.subjectType;
     clone.widget = this.widget;
     clone.groupSubjectTypeFilter = this.groupSubjectTypeFilter;
     clone.observationBasedFilter = this.observationBasedFilter;

package/package.json

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