openchs-models 1.31.97 → 1.31.98

package/dist/CustomDashboardCache.js

@@ -7,6 +7,16 @@ exports.default = void 0;
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
+var _Dashboard = _interopRequireDefault(require("./Dashboard"));
+
+var _General = _interopRequireDefault(require("./utility/General"));
+
+var _ReportCardResult = _interopRequireDefault(require("./reports/ReportCardResult"));
+
+var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedReportCardResult"));
+
+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; }
@@ -16,14 +26,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 +50,102 @@ class CustomDashboardCache extends _BaseEntity.default {
     this.that.filterApplied = x;
   }
 
-  get filterErrorsJSON() {
-    return this.that.filterErrorsJSON;
+  get dashboard() {
+    return this.toEntity("dashboard", _Dashboard.default);
+  }
+
+  set dashboard(x) {
+    this.that.dashboard = this.fromObject(x);
   }
 
-  set filterErrorsJSON(x) {
-    this.that.filterErrorsJSON = x;
+  get dashboardFiltersHash() {
+    return this.that.dashboardFiltersHash;
   }
 
-  get ruleInputJSON() {
-    return this.that.ruleInputJSON;
+  set dashboardFiltersHash(x) {
+    this.that.dashboardFiltersHash = x;
   }
 
-  set ruleInputJSON(x) {
-    this.that.ruleInputJSON = x;
+  get reportCardResults() {
+    return this.toEntityList("reportCardResults", _ReportCardResult.default);
   }
 
-  get transformedFiltersJSON() {
-    return this.that.transformedFiltersJSON;
+  set reportCardResults(x) {
+    this.that.reportCardResults = this.fromEntityList(x);
   }
 
-  set transformedFiltersJSON(x) {
-    this.that.transformedFiltersJSON = x;
+  get nestedReportCardResults() {
+    return this.toEntityList("nestedReportCardResults", _NestedReportCardResult.default);
   }
 
-  static create(uuid, checksum, updatedAt, selectedValuesJSON, filterApplied, filterErrorsJSON, ruleInputJSON, transformedFiltersJSON) {
+  set nestedReportCardResults(x) {
+    this.that.nestedReportCardResults = this.fromEntityList(x);
+  }
+
+  static newInstance(dashboard, dashboardFiltersHash) {
     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;
+    customDashboardCache.uuid = _General.default.randomUUID();
+    customDashboardCache.dashboard = dashboard;
+    customDashboardCache.reset(dashboardFiltersHash);
     return customDashboardCache;
   }
 
-  static getSelectedValuesFromState(state) {
-    const filterCache = {
-      date: state.date,
-      applied: false,
-      selectedLocations: state.selectedLocations,
-      selectedCustomFilters: state.selectedCustomFilters,
-      selectedGenders: state.selectedGenders
-    };
-    return filterCache;
+  reset(dashboardFiltersHash) {
+    this.filterApplied = false;
+    this.selectedValuesJSON = JSON.stringify({});
+    this.dashboardFiltersHash = dashboardFiltersHash;
+    this.updatedAt = null;
+    this.reportCardResults = [];
+    this.nestedReportCardResults = [];
   }
 
-  static createEmptyInstance() {
-    return new CustomDashboardCache();
+  getSelectedValues() {
+    return JSON.parse(this.selectedValuesJSON);
   }
 
-  getChecksum() {
-    return this.checksum;
+  getReportCardResult(reportCard) {
+    const result = this.reportCardResults.find(reportCardResult => reportCardResult.reportCard === reportCard.uuid && reportCardResult.dashboard === this.dashboard.uuid);
+
+    if (_lodash.default.isNil(result)) {
+      return result;
+    } else {
+      result.clickable = true;
+      result.hasErrorMsg = false;
+      return result;
+    }
   }
 
-  getSelectedValues() {
-    return this.selectedValuesJSON && JSON.parse(this.selectedValuesJSON) || {};
+  getNestedReportCardResults(reportCard) {
+    return this.nestedReportCardResults.filter(nestedReportCardResult => nestedReportCardResult.reportCard === reportCard.uuid && nestedReportCardResult.dashboard === this.dashboard.uuid).map(x => {
+      x.clickable = true;
+      x.hasErrorMsg = false;
+      return x;
+    });
   }
 
-  getFilterErrors() {
-    return this.filterErrorsJSON && JSON.parse(this.filterErrorsJSON) || {};
+  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;
+    customDashboardCache.reportCardResults = this.reportCardResults;
+    customDashboardCache.nestedReportCardResults = this.nestedReportCardResults;
+    return customDashboardCache;
   }
 
-  getRuleInput() {
-    return this.ruleInputJSON && JSON.parse(this.ruleInputJSON) || {
-      ruleInputArray: null
-    };
+  matchNestedReportCardResult(nestedReportCardResult) {
+    return this.nestedReportCardResults.find(x => x.reportCard === nestedReportCardResult.reportCard && x.itemKey === nestedReportCardResult.itemKey && x.dashboard === this.dashboard.uuid);
   }
 
-  getTransformedFilters() {
-    return this.transformedFiltersJSON && JSON.parse(this.transformedFiltersJSON) || {
-      date: new Date(),
-      applied: false,
-      selectedLocations: [],
-      selectedCustomFilters: [],
-      selectedGenders: []
-    };
+  matchReportCardResult(reportCardResult) {
+    return this.reportCardResults.find(x => x.reportCard === reportCardResult.reportCard && x.dashboard === this.dashboard.uuid);
+  }
+
+  isCachePopulated() {
+    return _lodash.default.isNil(this.updatedAt);
   }
 
 }
@@ -135,16 +155,22 @@ _defineProperty(CustomDashboardCache, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    checksum: "string",
-    updatedAt: "date",
+    dashboard: "Dashboard",
+    updatedAt: {
+      type: "date",
+      optional: true
+    },
     selectedValuesJSON: "string",
-    filterApplied: {
-      type: "bool",
-      default: false
+    filterApplied: "bool",
+    dashboardFiltersHash: "string",
+    reportCardResults: {
+      type: "list",
+      objectType: "ReportCardResult"
     },
-    filterErrorsJSON: "string",
-    ruleInputJSON: "string",
-    transformedFiltersJSON: "string"
+    nestedReportCardResults: {
+      type: "list",
+      objectType: "NestedReportCardResult"
+    }
   }
 });
 

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"]);
   }
@@ -48,6 +56,14 @@ class Dashboard extends _BaseEntity.default {
     return dashboard;
   }
 
+  getFilterOfType(filterType) {
+    return this.filters.find(filter => filter.filterConfig.type === filterType);
+  }
+
+  getFilter(filterUUID) {
+    return this.filters.find(filter => filter.uuid === filterUUID);
+  }
+
 }
 
 _defineProperty(Dashboard, "schema", {

package/dist/Duration.js

@@ -9,13 +9,16 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
-var _SingleCodedValue = _interopRequireDefault(require("./observation/SingleCodedValue"));
-
 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 Duration {
+  constructor(durationValue, durationUnit) {
+    this._durationValue = durationValue;
+    this.durationUnit = durationUnit;
+  }
+
   static inDay(value) {
     return new Duration(value, Duration.Day);
   }
@@ -42,11 +45,6 @@ class Duration {
     }
   }
 
-  constructor(durationValue, durationUnit) {
-    this._durationValue = durationValue;
-    this.durationUnit = durationUnit;
-  }
-
   get isInYears() {
     return this.durationUnit === Duration.Year;
   }

package/dist/ReportCard.js

@@ -15,15 +15,29 @@ 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"));
+
+var _Duration = _interopRequireDefault(require("./Duration"));
+
+var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedReportCardResult"));
+
 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 = [];
+    return reportCard;
+  }
+
   constructor(that = null) {
     super(that);
   }
@@ -96,6 +110,39 @@ 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);
+  }
+
+  getStandardReportCardInputRecentDuration() {
+    const duration = JSON.parse(this.that.standardReportCardInputRecentDurationJSON);
+    return new _Duration.default(duration.value, duration.unit);
+  }
+
+  setStandardReportCardInputRecentDurationJSON(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 +169,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.setStandardReportCardInputRecentDurationJSON(resource.standardReportCardInputRecentDuration);
     return reportCard;
   }
 
@@ -132,6 +189,42 @@ 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();
+  }
+
+  hasInputForSubject() {
+    return this.standardReportCardInputSubjectTypes.length > 0;
+  }
+
+  hasInputForEnrolment() {
+    return this.standardReportCardInputPrograms.length > 0;
+  }
+
+  hasInputForProgramEncounter() {
+    return this.hasInputForEnrolment() && this.standardReportCardInputEncounterTypes.length > 0;
+  }
+
+  hasInputForGeneralEncounter() {
+    return this.standardReportCardInputEncounterTypes.length > 0;
+  }
+
+  createNestedErrorResults(primaryValue, secondaryValue) {
+    const reportCard = this;
+    return Array(this.card.countOfCards).map(index => {
+      const itemKey = reportCard.getCardId(index);
+      return _NestedReportCardResult.default.create(primaryValue, secondaryValue, false, true, itemKey);
+    });
+  }
+
 }
 
 _defineProperty(ReportCard, "schema", {
@@ -166,8 +259,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

@@ -183,13 +183,17 @@ var _MigrationsHelper = _interopRequireDefault(require("./MigrationsHelper"));
 
 var _MetaDataService = _interopRequireDefault(require("./service/MetaDataService"));
 
+var _ReportCardResult = _interopRequireDefault(require("./reports/ReportCardResult"));
+
+var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedReportCardResult"));
+
 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; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
+const entities = [_ReportCardResult.default, _NestedReportCardResult.default, _DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
 
 function migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
   console.log(`schema: ${schemaName}, field: ${field}`);
@@ -279,7 +283,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 190,
+    schemaVersion: 196,
     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 +917,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

@@ -15,6 +15,8 @@ var _ApprovalStatus = _interopRequireDefault(require("./ApprovalStatus"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _Duration = _interopRequireDefault(require("./Duration"));
+
 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; }
@@ -81,7 +83,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 +120,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, StandardReportCardType.type.Total].includes(this.name);
+  }
+
+  isRecentType() {
+    return [StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits].includes(this.name);
+  }
+
 }
 
 _defineProperty(StandardReportCardType, "schema", {
@@ -143,9 +153,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 +163,8 @@ _defineProperty(StandardReportCardType, "type", {
   DueChecklist: "Due checklist"
 });
 
+_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,

package/dist/application/FormElementGroup.js

@@ -226,7 +226,11 @@ class FormElementGroup extends _BaseEntity.default {
   }
 
   nonVoidedFormElements() {
-    return _lodash.default.filter(this.formElements, formElement => !formElement.voided);
+    return _lodash.default.filter(this.formElements, formElement => {
+      let parentFormElement;
+      if (!_lodash.default.isNil(formElement.groupUuid)) parentFormElement = _lodash.default.find(this.formElements, fe => fe.uuid === formElement.groupUuid);
+      return !formElement.voided && (_lodash.default.isNil(parentFormElement) || !parentFormElement.voided);
+    });
   }
 
   getFormElements() {

package/dist/index.js

@@ -789,6 +789,30 @@ 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;
+  }
+});
+Object.defineProperty(exports, "ReportCardResult", {
+  enumerable: true,
+  get: function () {
+    return _ReportCardResult.default;
+  }
+});
+Object.defineProperty(exports, "NestedReportCardResult", {
+  enumerable: true,
+  get: function () {
+    return _NestedReportCardResult.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1042,6 +1066,14 @@ var _DashboardCacheFilter = _interopRequireDefault(require("./application/Dashbo
 
 var _JsonStringify = require("./utility/JsonStringify");
 
+var _Locations = _interopRequireDefault(require("./location/Locations"));
+
+var _Range = _interopRequireDefault(require("./reports/Range"));
+
+var _ReportCardResult = _interopRequireDefault(require("./reports/ReportCardResult"));
+
+var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedReportCardResult"));
+
 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/NestedReportCardResult.js

@@ -0,0 +1,145 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+
+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; }
+
+class NestedReportCardResult extends _BaseEntity.default {
+  // transient state
+  constructor(that) {
+    super(that);
+
+    _defineProperty(this, "clickable", void 0);
+
+    _defineProperty(this, "hasErrorMsg", void 0);
+  }
+
+  static create(primaryValue, secondaryValue, clickable, hasErrorMsg, itemKey) {
+    const nestedReportCardResult = new NestedReportCardResult();
+    nestedReportCardResult.uuid = _General.default.randomUUID();
+    nestedReportCardResult.primaryValue = _lodash.default.toString(primaryValue);
+    nestedReportCardResult.secondaryValue = _lodash.default.toString(secondaryValue);
+    nestedReportCardResult.clickable = clickable;
+    nestedReportCardResult.hasErrorMsg = hasErrorMsg;
+    nestedReportCardResult.itemKey = itemKey;
+    return nestedReportCardResult;
+  }
+
+  get dashboard() {
+    return this.that.dashboard;
+  }
+
+  set dashboard(x) {
+    this.that.dashboard = x;
+  }
+
+  get reportCard() {
+    return this.that.reportCard;
+  }
+
+  set reportCard(x) {
+    this.that.reportCard = x;
+  }
+
+  get primaryValue() {
+    return this.that.primaryValue;
+  }
+
+  set primaryValue(x) {
+    this.that.primaryValue = x;
+  }
+
+  get secondaryValue() {
+    return this.that.secondaryValue;
+  }
+
+  set secondaryValue(x) {
+    this.that.secondaryValue = x;
+  }
+
+  get itemKey() {
+    return this.that.itemKey;
+  }
+
+  set itemKey(x) {
+    this.that.itemKey = x;
+  }
+
+  get cardName() {
+    return this.that.cardName;
+  }
+
+  set cardName(x) {
+    this.that.cardName = x;
+  }
+
+  get cardColor() {
+    return this.that.cardColor;
+  }
+
+  set cardColor(x) {
+    this.that.cardColor = x;
+  }
+
+  get textColor() {
+    return this.that.textColor;
+  }
+
+  set textColor(x) {
+    this.that.textColor = x;
+  }
+
+  get reportCardUUID() {
+    return this.that.reportCardUUID;
+  }
+
+  set reportCardUUID(x) {
+    this.that.reportCardUUID = x;
+  }
+
+  static fromQueryResult(ruleResult, reportCard, index) {
+    const nestedReportCardResult = NestedReportCardResult.create(ruleResult.primaryValue, ruleResult.secondaryValue, _lodash.default.isFunction(ruleResult.lineListFunction), ruleResult.hasErrorMsg, reportCard.getCardId(index));
+
+    if (ruleResult.hasErrorMsg) {
+      return nestedReportCardResult;
+    }
+
+    nestedReportCardResult.cardName = ruleResult.cardName;
+    nestedReportCardResult.cardColor = _lodash.default.isNil(ruleResult.cardColor) ? reportCard.colour : ruleResult.cardColor;
+    nestedReportCardResult.textColor = ruleResult.textColor;
+    nestedReportCardResult.reportCardUUID = reportCard.uuid;
+    return nestedReportCardResult;
+  }
+
+}
+
+_defineProperty(NestedReportCardResult, "schema", {
+  name: "NestedReportCardResult",
+  embedded: true,
+  properties: {
+    uuid: "string",
+    dashboard: "string",
+    reportCard: "string",
+    primaryValue: "string",
+    secondaryValue: "string",
+    itemKey: "string",
+    cardName: "string",
+    cardColor: "string",
+    textColor: "string",
+    reportCardUUID: "string"
+  }
+});
+
+var _default = NestedReportCardResult;
+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/reports/ReportCardResult.js

@@ -0,0 +1,93 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+
+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; }
+
+class ReportCardResult extends _BaseEntity.default {
+  // transient state
+  constructor(that) {
+    super(that);
+
+    _defineProperty(this, "clickable", void 0);
+
+    _defineProperty(this, "hasErrorMsg", void 0);
+  }
+
+  get primaryValue() {
+    return this.that.primaryValue;
+  }
+
+  set primaryValue(x) {
+    this.that.primaryValue = x;
+  }
+
+  get secondaryValue() {
+    return this.that.secondaryValue;
+  }
+
+  set secondaryValue(x) {
+    this.that.secondaryValue = x;
+  }
+
+  get dashboard() {
+    return this.that.dashboard;
+  }
+
+  set dashboard(x) {
+    this.that.dashboard = x;
+  }
+
+  get reportCard() {
+    return this.that.reportCard;
+  }
+
+  set reportCard(x) {
+    this.that.reportCard = x;
+  }
+
+  static create(primaryValue, secondaryValue, clickable, hasErrorMsg = false) {
+    const reportCardResult = new ReportCardResult();
+    reportCardResult.uuid = _General.default.randomUUID();
+    reportCardResult.primaryValue = _lodash.default.toString(primaryValue);
+    reportCardResult.secondaryValue = _lodash.default.toString(secondaryValue);
+    reportCardResult.clickable = clickable;
+    reportCardResult.hasErrorMsg = hasErrorMsg;
+    return reportCardResult;
+  }
+
+  static fromQueryResult(result) {
+    return ReportCardResult.create(result.primaryValue, result.secondaryValue, _lodash.default.isFunction(result.lineListFunction), result.hasErrorMsg);
+  }
+
+  get lineListFunction() {
+    return _lodash.default.noop;
+  }
+
+}
+
+_defineProperty(ReportCardResult, "schema", {
+  name: "ReportCardResult",
+  embedded: true,
+  properties: {
+    uuid: "string",
+    dashboard: "string",
+    reportCard: "string",
+    primaryValue: "string",
+    secondaryValue: "string"
+  }
+});
+
+var _default = ReportCardResult;
+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.97",
+    "version": "1.31.98",
     "private": false,
     "repository": {
         "type": "git",