openchs-models 1.31.87 → 1.31.88

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,59 @@ 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;
+  get dashboard() {
+    return this.toEntity("dashboard", _Dashboard.default);
   }
 
-  set ruleInputJSON(x) {
-    this.that.ruleInputJSON = x;
+  set dashboard(x) {
+    this.that.dashboard = this.fromObject(x);
   }
 
-  get transformedFiltersJSON() {
-    return this.that.transformedFiltersJSON;
+  get dashboardFiltersHash() {
+    return this.that.dashboardFiltersHash;
   }
 
-  set transformedFiltersJSON(x) {
-    this.that.transformedFiltersJSON = x;
+  set dashboardFiltersHash(x) {
+    this.that.dashboardFiltersHash = 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, dashboardFiltersHash) {
+    const customDashboardCache = new CustomDashboardCache();
+    customDashboardCache.uuid = _General.default.randomUUID();
+    customDashboardCache.dashboard = dashboard;
+    customDashboardCache.reset(dashboardFiltersHash);
+    return customDashboardCache;
   }
 
-  getChecksum() {
-    return this.checksum;
+  reset(dashboardFiltersHash) {
+    this.filterApplied = false;
+    this.selectedValuesJSON = JSON.stringify({});
+    this.dashboardFiltersHash = dashboardFiltersHash;
+    this.updatedAt = new Date();
   }
 
   getSelectedValues() {
-    return this.selectedValuesJSON && JSON.parse(this.selectedValuesJSON) || {};
-  }
-
-  getFilterErrors() {
-    return this.filterErrorsJSON && JSON.parse(this.filterErrorsJSON) || {};
-  }
-
-  getRuleInput() {
-    return this.ruleInputJSON && JSON.parse(this.ruleInputJSON) || {
-      ruleInputArray: null
-    };
+    return JSON.parse(this.selectedValuesJSON);
   }
 
-  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;
+    customDashboardCache.dashboardFiltersHash = this.dashboardFiltersHash;
+    return customDashboardCache;
   }
 
 }
@@ -135,16 +106,11 @@ _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",
+    dashboardFiltersHash: "string"
   }
 });
 

package/dist/CustomFilter.js

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

package/dist/Dashboard.js

@@ -36,6 +36,14 @@ class Dashboard extends _BaseEntity.default {
     this.that.description = x;
   }
 
+  get filters() {
+    return this.toEntityList("filters", _DashboardFilter.default);
+  }
+
+  set filters(x) {
+    this.that.filters = this.fromEntityList(x);
+  }
+
   static fromResource(resource) {
     return _General.default.assignFields(resource, new Dashboard(), ["uuid", "name", "description", "voided"]);
   }

package/dist/MediaQueue.js

@@ -9,8 +9,6 @@ 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; }
@@ -69,7 +67,7 @@ class MediaQueue extends _BaseEntity.default {
   }
 
   static create(entityUUID, entityName, fileName, type, entityTargetField, conceptUUID, uuid = _General.default.randomUUID()) {
-    const mediaQueue = new MediaQueue();
+    var mediaQueue = new MediaQueue();
     mediaQueue.entityUUID = entityUUID;
     mediaQueue.uuid = uuid;
     mediaQueue.entityName = entityName;
@@ -92,18 +90,6 @@ 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/Observation.js

@@ -21,19 +21,16 @@ 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; }
 
-const clone = function (concept, valueJSON, abnormal) {
+const clone = function (concept, valueJSON) {
   const observation = new Observation();
   observation.concept = concept;
   observation.valueJSON = valueJSON;
-  observation.abnormal = abnormal;
   return observation;
 };
 
 class Observation extends _PersistedObject.default {
   constructor(that = null) {
     super(that);
-
-    _defineProperty(this, "abnormal", void 0);
   }
 
   get concept() {
@@ -52,11 +49,10 @@ class Observation extends _PersistedObject.default {
     this.that.valueJSON = x;
   }
 
-  static create(concept, value, abnormal = false) {
+  static create(concept, value) {
     const observation = new Observation();
     observation.concept = concept;
     observation.valueJSON = value;
-    observation.abnormal = abnormal;
     return observation;
   }
 

package/dist/ReportCard.js

@@ -15,15 +15,26 @@ 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; }
 
-function throwInvalidIndexError(index, reportCardsLength) {
-  throw new Error(`Invalid index ${index} specified for reportCard with length ${reportCardsLength}`);
-}
-
 class ReportCard extends _BaseEntity.default {
+  static newReportCard() {
+    const reportCard = new ReportCard();
+    reportCard.standardReportCardInputSubjectTypes = [];
+    reportCard.standardReportCardInputPrograms = [];
+    reportCard.standardReportCardInputEncounterTypes = [];
+    reportCard.standardReportCardInputRecentDuration = null;
+    return reportCard;
+  }
+
   constructor(that = null) {
     super(that);
   }
@@ -96,6 +107,38 @@ 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);
+  }
+
+  get standardReportCardInputRecentDurationJSON() {
+    return JSON.parse(this.that.standardReportCardInputRecentDurationJSON);
+  }
+
+  set standardReportCardInputRecentDurationJSON(x) {
+    this.that.standardReportCardInputRecentDurationJSON = 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.
@@ -122,9 +165,19 @@ 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));
+    });
+    reportCard.standardReportCardInputRecentDurationJSON = resource.standardReportCardInputRecentDuration;
     return reportCard;
   }
 
@@ -132,6 +185,18 @@ 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();
+  }
+
+  isRecentType() {
+    return this.isStandardReportType() && this.standardReportCardType.isRecentType();
+  }
+
 }
 
 _defineProperty(ReportCard, "schema", {
@@ -166,8 +231,24 @@ _defineProperty(ReportCard, "schema", {
       type: "int",
       default: 1,
       optional: true
-    } //Used only by nested ReportCards
-
+    },
+    //Used only by nested ReportCards
+    standardReportCardInputSubjectTypes: {
+      type: "list",
+      objectType: "SubjectType"
+    },
+    standardReportCardInputPrograms: {
+      type: "list",
+      objectType: "Program"
+    },
+    standardReportCardInputEncounterTypes: {
+      type: "list",
+      objectType: "EncounterType"
+    },
+    standardReportCardInputRecentDurationJSON: {
+      type: "string",
+      optional: true
+    }
   }
 });
 

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: 193,
     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/dist/StandardReportCardType.js

@@ -81,7 +81,7 @@ class StandardReportCardType extends _BaseEntity.default {
   }
 
   defaultTypes() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.LatestRegistrations, StandardReportCardType.type.LatestEnrolments, StandardReportCardType.type.LatestVisits, StandardReportCardType.type.Total];
+    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits, StandardReportCardType.type.Total];
   }
 
   isApprovalType() {
@@ -118,6 +118,14 @@ class StandardReportCardType extends _BaseEntity.default {
     return typeToStatusMap[this.name];
   }
 
+  isSubjectTypeFilterSupported() {
+    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits].includes(this.name);
+  }
+
+  isRecentType() {
+    return [StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits].includes(this.name);
+  }
+
 }
 
 _defineProperty(StandardReportCardType, "schema", {
@@ -143,9 +151,9 @@ _defineProperty(StandardReportCardType, "type", {
   Rejected: "Rejected",
   ScheduledVisits: "Scheduled visits",
   OverdueVisits: "Overdue visits",
-  LatestRegistrations: "Last 24 hours registrations",
-  LatestEnrolments: "Last 24 hours enrolments",
-  LatestVisits: "Last 24 hours visits",
+  RecentRegistrations: "Recent registrations",
+  RecentEnrolments: "Recent enrolments",
+  RecentVisits: "Recent visits",
   Total: "Total",
   Comments: "Comments",
   CallTasks: "Call tasks",
@@ -153,6 +161,8 @@ _defineProperty(StandardReportCardType, "type", {
   DueChecklist: "Due checklist"
 });
 
+_defineProperty(StandardReportCardType, "recentCardDurationUnits", ["days", "weeks", "months"]);
+
 const typeToStatusMap = {
   [StandardReportCardType.type.PendingApproval]: _ApprovalStatus.default.statuses.Pending,
   [StandardReportCardType.type.Approved]: _ApprovalStatus.default.statuses.Approved,

package/dist/index.js

@@ -789,6 +789,18 @@ Object.defineProperty(exports, "JSONStringify", {
     return _JsonStringify.JSONStringify;
   }
 });
+Object.defineProperty(exports, "Locations", {
+  enumerable: true,
+  get: function () {
+    return _Locations.default;
+  }
+});
+Object.defineProperty(exports, "Range", {
+  enumerable: true,
+  get: function () {
+    return _Range.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1042,6 +1054,10 @@ var _DashboardCacheFilter = _interopRequireDefault(require("./application/Dashbo
 
 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/location/Locations.js

@@ -0,0 +1,21 @@
+"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 }; }
+
+// AddressLevel = Location
+class Locations {
+  static getUniqueLevels(locations) {
+    return _lodash.default.uniq(locations.map(x => x.level));
+  }
+
+}
+
+var _default = Locations;
+exports.default = _default;

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,
@@ -107,10 +128,29 @@ class GroupSubjectTypeFilter {
 }
 
 exports.GroupSubjectTypeFilter = GroupSubjectTypeFilter;
-const dateFilterTypes = [_CustomFilter.default.type.RegistrationDate, _CustomFilter.default.type.EnrolmentDate, _CustomFilter.default.type.EncounterDate, _CustomFilter.default.type.ProgramEncounterDate];
+const dateFilterTypes = [_CustomFilter.default.type.RegistrationDate, _CustomFilter.default.type.EnrolmentDate, _CustomFilter.default.type.EncounterDate, _CustomFilter.default.type.ProgramEncounterDate, _CustomFilter.default.type.AsOnDate];
+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() {
+    _defineProperty(this, "subjectType", void 0);
+
     _defineProperty(this, "type", void 0);
 
     _defineProperty(this, "widget", void 0);
@@ -120,26 +160,104 @@ class DashboardFilterConfig {
     _defineProperty(this, "observationBasedFilter", void 0);
   }
 
+  toDisplayText() {
+    let s = `Type: ${this.type}.`;
+
+    if (this.isRangeWidget()) {
+      s += ` Widget: ${this.widget}.`;
+    }
+
+    if (this.isConceptTypeFilter()) {
+      s += ` Concept: ${this.observationBasedFilter.concept.name}. DataType: ${this.observationBasedFilter.concept.datatype}.`;
+    }
+
+    return s;
+  }
+
+  isRangeWidget() {
+    return this.widget === _CustomFilter.default.widget.Range;
+  }
+
   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.isRangeWidget()) {
       return _Concept.default.dataType.Date;
-    } else {
-      return this.type;
+    } else if (dateFilterTypes.includes(this.type) && this.isRangeWidget()) {
+      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.isRangeWidget();
+  }
+
+  isDateRangeFilterType() {
+    return isDateDataType(this) && this.isRangeWidget();
+  }
+
+  isDateTimeFilterType() {
+    return isDateTimeDataType(this) && !this.isRangeWidget();
+  }
+
+  isDateTimeRangeFilterType() {
+    return isDateTimeDataType(this) && this.isRangeWidget();
+  }
+
+  isTimeFilterType() {
+    return isTimeDataType(this) && !this.isRangeWidget();
+  }
+
+  isTimeRangeFilterType() {
+    return isTimeDataType(this) && this.isRangeWidget();
+  }
+
+  isNumericRangeFilterType() {
+    return this.isConceptTypeFilter() && this.observationBasedFilter.concept.datatype === _Concept.default.dataType.Numeric && this.isRangeWidget();
+  }
+
+  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;
   }
 
+  requiresSpecificSubjectType() {
+    return ![_CustomFilter.default.type.SubjectType, _CustomFilter.default.type.AsOnDate].includes(this.type);
+  }
+
   isValid() {
     const valid = !_lodash.default.isNil(this.type);
     if (!valid) return valid;
@@ -149,6 +267,7 @@ 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();
@@ -175,6 +294,12 @@ 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();
   }
@@ -184,13 +309,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);
     }
 
@@ -200,6 +323,7 @@ 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;
@@ -208,5 +332,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.87",
+    "version": "1.31.88",
     "private": false,
     "repository": {
         "type": "git",