openchs-models 1.31.82 → 1.31.84

package/dist/CustomDashboardCache.js

@@ -52,6 +52,14 @@ class CustomDashboardCache extends _BaseEntity.default {
     this.that.dashboard = this.fromObject(x);
   }
 
+  get dashboardFiltersHash() {
+    return this.that.dashboardFiltersHash;
+  }
+
+  set dashboardFiltersHash(x) {
+    this.that.dashboardFiltersHash = x;
+  }
+
   static create(uuid, updatedAt, selectedValuesJSON = '{}', filterApplied) {
     const customDashboardCache = new CustomDashboardCache();
     customDashboardCache.uuid = uuid;
@@ -61,17 +69,18 @@ class CustomDashboardCache extends _BaseEntity.default {
     return customDashboardCache;
   }
 
-  static newInstance(dashboard) {
+  static newInstance(dashboard, dashboardFiltersHash) {
     const customDashboardCache = new CustomDashboardCache();
     customDashboardCache.uuid = _General.default.randomUUID();
     customDashboardCache.dashboard = dashboard;
-    customDashboardCache.reset();
+    customDashboardCache.reset(dashboardFiltersHash);
     return customDashboardCache;
   }
 
-  reset() {
+  reset(dashboardFiltersHash) {
     this.filterApplied = false;
     this.selectedValuesJSON = JSON.stringify({});
+    this.dashboardFiltersHash = dashboardFiltersHash;
     this.updatedAt = new Date();
   }
 
@@ -86,6 +95,7 @@ class CustomDashboardCache extends _BaseEntity.default {
     customDashboardCache.updatedAt = this.updatedAt;
     customDashboardCache.selectedValuesJSON = this.selectedValuesJSON;
     customDashboardCache.filterApplied = this.filterApplied;
+    customDashboardCache.dashboardFiltersHash = this.dashboardFiltersHash;
     return customDashboardCache;
   }
 
@@ -99,7 +109,8 @@ _defineProperty(CustomDashboardCache, "schema", {
     dashboard: "Dashboard",
     updatedAt: "date",
     selectedValuesJSON: "string",
-    filterApplied: "bool"
+    filterApplied: "bool",
+    dashboardFiltersHash: "string"
   }
 });
 

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: 192,
     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/index.js

@@ -795,6 +795,12 @@ Object.defineProperty(exports, "Locations", {
     return _Locations.default;
   }
 });
+Object.defineProperty(exports, "Range", {
+  enumerable: true,
+  get: function () {
+    return _Range.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1050,6 +1056,8 @@ var _JsonStringify = require("./utility/JsonStringify");
 
 var _Locations = _interopRequireDefault(require("./location/Locations"));
 
+var _Range = _interopRequireDefault(require("./reports/Range"));
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/dist/reports/DashboardFilterConfig.js

@@ -13,11 +13,23 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _DateTimeUtil = _interopRequireDefault(require("../utility/DateTimeUtil"));
 
+var _Range = _interopRequireDefault(require("./Range"));
+
+var _Gender = _interopRequireDefault(require("../Gender"));
+
+var _AddressLevel = _interopRequireDefault(require("../AddressLevel"));
+
+var _Individual = _interopRequireDefault(require("../Individual"));
+
 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; }
 
 const widgetConceptDataTypes = [_Concept.default.dataType.Date, _Concept.default.dataType.DateTime, _Concept.default.dataType.Time, _Concept.default.dataType.Numeric];
+const conceptEntityTypes = {
+  [_Concept.default.dataType.Coded]: _Concept.default.schema.name,
+  [_Concept.default.dataType.Location]: _AddressLevel.default.schema.name
+};
 
 class ObservationBasedFilter {
   constructor() {
@@ -42,6 +54,15 @@ class ObservationBasedFilter {
     return !_lodash.default.isNil(concept) && (!_lodash.default.isEmpty(programs) || !_lodash.default.isEmpty(encounterTypes) || this.scope === _CustomFilter.default.scope.Registration);
   }
 
+  isMultiEntityType() {
+    return [_Concept.default.dataType.Coded, _Concept.default.dataType.Location].includes(this.concept.datatype);
+  }
+
+  getEntityType() {
+    if (this.isMultiEntityType()) return conceptEntityTypes[this.concept.datatype];
+    throw new Error("Unsupported concept data type for getting entity type: " + this.concept.datatype);
+  }
+
   toServerRequest() {
     return {
       scope: this.scope,
@@ -108,6 +129,23 @@ class GroupSubjectTypeFilter {
 
 exports.GroupSubjectTypeFilter = GroupSubjectTypeFilter;
 const dateFilterTypes = [_CustomFilter.default.type.RegistrationDate, _CustomFilter.default.type.EnrolmentDate, _CustomFilter.default.type.EncounterDate, _CustomFilter.default.type.ProgramEncounterDate];
+const entityTypes = {
+  [_CustomFilter.default.type.Gender]: _Gender.default.schema.name,
+  [_CustomFilter.default.type.Address]: _AddressLevel.default.schema.name,
+  [_CustomFilter.default.type.GroupSubject]: _Individual.default.schema.name
+};
+
+function isDateDataType(dashboardFilterConfig) {
+  return dateFilterTypes.includes(dashboardFilterConfig.type) || dashboardFilterConfig.isConceptTypeFilter() && dashboardFilterConfig.observationBasedFilter.concept.datatype === _Concept.default.dataType.Date;
+}
+
+function isDateTimeDataType(dashboardFilterConfig) {
+  return dashboardFilterConfig.isConceptTypeFilter() && dashboardFilterConfig.observationBasedFilter.concept.datatype === _Concept.default.dataType.DateTime;
+}
+
+function isTimeDataType(dashboardFilterConfig) {
+  return dashboardFilterConfig.isConceptTypeFilter() && dashboardFilterConfig.observationBasedFilter.concept.datatype === _Concept.default.dataType.Time;
+}
 
 class DashboardFilterConfig {
   constructor() {
@@ -122,22 +160,92 @@ class DashboardFilterConfig {
     _defineProperty(this, "observationBasedFilter", void 0);
   }
 
+  toDisplayText() {
+    let s = `Type: ${this.type}.`;
+
+    if (this.widget === _CustomFilter.default.widget.Range) {
+      s += ` Widget: ${this.widget}.`;
+    }
+
+    if (this.isConceptTypeFilter()) {
+      s += ` Concept: ${this.observationBasedFilter.concept.name}. DataType: ${this.observationBasedFilter.concept.datatype}.`;
+    }
+
+    return s;
+  }
+
   getInputDataType() {
     if (this.isConceptTypeFilter()) {
       return this.observationBasedFilter.concept.datatype;
-    } else if (this.isGroupSubjectTypeFilter()) {
-      return _Concept.default.dataType.Subject;
-    } else if (dateFilterTypes.includes(this.type)) {
+    } else if ([_CustomFilter.default.type.Gender, _CustomFilter.default.type.Address, _CustomFilter.default.type.GroupSubject].includes(this.type)) {
+      return DashboardFilterConfig.dataTypes.array;
+    } else if (dateFilterTypes.includes(this.type) && this.widget === _CustomFilter.default.widget.Default) {
       return _Concept.default.dataType.Date;
-    } else {
-      return this.type;
+    } else if (dateFilterTypes.includes(this.type) && this.widget === _CustomFilter.default.widget.Range) {
+      return _Range.default.DateRange;
+    } else if (this.type === _CustomFilter.default.type.SubjectType) {
+      return DashboardFilterConfig.dataTypes.formMetaData;
+    }
+
+    throw new Error("Unsupported filter type: " + this.type);
+  }
+
+  isDateFilterType() {
+    return isDateDataType(this) && this.widget !== _CustomFilter.default.widget.Range;
+  }
+
+  isDateRangeFilterType() {
+    return isDateDataType(this) && this.widget === _CustomFilter.default.widget.Range;
+  }
+
+  isDateTimeFilterType() {
+    return isDateTimeDataType(this) && this.widget !== _CustomFilter.default.widget.Range;
+  }
+
+  isDateTimeRangeFilterType() {
+    return isDateTimeDataType(this) && this.widget === _CustomFilter.default.widget.Range;
+  }
+
+  isTimeFilterType() {
+    return isTimeDataType(this) && this.widget !== _CustomFilter.default.widget.Range;
+  }
+
+  isTimeRangeFilterType() {
+    return isTimeDataType(this) && this.widget === _CustomFilter.default.widget.Range;
+  }
+
+  isNumericRangeFilterType() {
+    return this.isConceptTypeFilter() && this.observationBasedFilter.concept.datatype === _Concept.default.dataType.Numeric && this.widget === _CustomFilter.default.widget.Range;
+  }
+
+  isDateLikeFilterType() {
+    return this.isDateFilterType() || this.isDateTimeFilterType() || this.isTimeFilterType();
+  }
+
+  isDateLikeRangeFilterType() {
+    return this.isDateRangeFilterType() || this.isDateTimeRangeFilterType() || this.isTimeRangeFilterType();
+  }
+
+  isMultiEntityType() {
+    return [_CustomFilter.default.type.Gender, _CustomFilter.default.type.Address, _CustomFilter.default.type.GroupSubject].includes(this.type) || this.isConceptTypeFilter() && this.observationBasedFilter.isMultiEntityType();
+  }
+
+  getEntityType() {
+    if (this.isMultiEntityType()) {
+      return _lodash.default.isNil(entityTypes[this.type]) ? this.observationBasedFilter.getEntityType() : entityTypes[this.type];
     }
+
+    throw new Error("Unsupported filter type: " + this.type);
   }
 
   isConceptTypeFilter() {
     return this.type === _CustomFilter.default.type.Concept;
   }
 
+  isNonCodedObservationDataType() {
+    return this.isConceptTypeFilter() && this.observationBasedFilter.concept.datatype !== _Concept.default.dataType.Coded;
+  }
+
   isGroupSubjectTypeFilter() {
     return this.type === _CustomFilter.default.type.GroupSubject;
   }
@@ -199,11 +307,11 @@ class DashboardFilterConfig {
   validate(filterValue) {
     const inputDataType = this.getInputDataType();
 
-    if ([_Concept.default.dataType.Date, _Concept.default.dataType.DateTime].includes(inputDataType) && this.widget === _CustomFilter.default.widget.Range) {
+    if (this.isDateRangeFilterType()) {
       return _DateTimeUtil.default.validateDateRange(filterValue.minValue, filterValue.maxValue);
     }
 
-    if (_Concept.default.dataType.Time === inputDataType && this.widget === _CustomFilter.default.widget.Range) {
+    if (this.isTimeRangeFilterType()) {
       return _DateTimeUtil.default.validateTimeRange(filterValue.minValue, filterValue.maxValue);
     }
 
@@ -222,5 +330,10 @@ class DashboardFilterConfig {
 
 }
 
+_defineProperty(DashboardFilterConfig, "dataTypes", {
+  array: "array",
+  formMetaData: "formMetaData"
+});
+
 var _default = DashboardFilterConfig;
 exports.default = _default;

package/dist/reports/Range.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+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; }
+
+class Range {
+  constructor(minValue, maxValue) {
+    _defineProperty(this, "minValue", void 0);
+
+    _defineProperty(this, "maxValue", void 0);
+
+    this.minValue = minValue;
+    this.maxValue = maxValue;
+  }
+
+  static empty() {
+    return new Range(null, null);
+  }
+
+  isEmpty() {
+    return _lodash.default.isNil(this.minValue) || _lodash.default.isNil(this.maxValue);
+  }
+
+}
+
+_defineProperty(Range, "DateRange", "DateRange");
+
+var _default = Range;
+exports.default = _default;

package/dist/service/MetaDataService.js

@@ -99,6 +99,10 @@ class MetaDataService {
     return _lodash.default.filter(formMappings, formMapping => formMapping.formType === _Form.default.formTypes.ProgramEncounter || formMapping.formType === _Form.default.formTypes.ProgramEncounterCancellation);
   }
 
+  static getProgramEncounterFormMappingsForFormType(formMappings, formType) {
+    return _lodash.default.filter(formMappings, formMapping => formMapping.formType === formType);
+  }
+
   static getProgramsForSubjectType(allPrograms, subjectType, formMappings) {
     if (_lodash.default.isNil(subjectType)) return allPrograms;
 
@@ -116,9 +120,9 @@ class MetaDataService {
   }
 
   static getEncounterTypesForPrograms(allEncounterTypes, programs, formMappings) {
-    const programEncounterTypeMappings = MetaDataService.getProgramEncounterFormMappings(formMappings);
+    const programEncounterTypeMappings = MetaDataService.getProgramEncounterFormMappingsForFormType(formMappings, _Form.default.formTypes.ProgramEncounter);
 
-    const encounterTypeMappingsForPrograms = _lodash.default.intersectionWith(programEncounterTypeMappings, programs, (etMapping, program) => etMapping.programUUID === program.uuid);
+    const encounterTypeMappingsForPrograms = _lodash.default.filter(programEncounterTypeMappings, formMapping => _lodash.default.some(programs, program => formMapping.programUUID === program.uuid));
 
     return encounterTypeMappingsForPrograms.map(x => _lodash.default.find(allEncounterTypes, et => et.uuid === x.encounterTypeUUID));
   }

package/package.json

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