openchs-models 1.31.93 → 1.31.95

package/dist/CustomDashboardCache.js

@@ -11,6 +11,12 @@ 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; }
@@ -60,13 +66,20 @@ class CustomDashboardCache extends _BaseEntity.default {
     this.that.dashboardFiltersHash = x;
   }
 
-  static create(uuid, updatedAt, selectedValuesJSON = '{}', filterApplied) {
-    const customDashboardCache = new CustomDashboardCache();
-    customDashboardCache.uuid = uuid;
-    customDashboardCache.updatedAt = updatedAt;
-    customDashboardCache.selectedValuesJSON = selectedValuesJSON;
-    customDashboardCache.filterApplied = filterApplied;
-    return customDashboardCache;
+  get reportCardResults() {
+    return this.toEntityList("reportCardResults", _ReportCardResult.default);
+  }
+
+  set reportCardResults(x) {
+    this.that.reportCardResults = this.fromEntityList(x);
+  }
+
+  get nestedReportCardResults() {
+    return this.toEntityList("nestedReportCardResults", _NestedReportCardResult.default);
+  }
+
+  set nestedReportCardResults(x) {
+    this.that.nestedReportCardResults = this.fromEntityList(x);
   }
 
   static newInstance(dashboard, dashboardFiltersHash) {
@@ -81,13 +94,35 @@ class CustomDashboardCache extends _BaseEntity.default {
     this.filterApplied = false;
     this.selectedValuesJSON = JSON.stringify({});
     this.dashboardFiltersHash = dashboardFiltersHash;
-    this.updatedAt = new Date();
+    this.updatedAt = null;
+    this.reportCardResults = [];
+    this.nestedReportCardResults = [];
   }
 
   getSelectedValues() {
     return JSON.parse(this.selectedValuesJSON);
   }
 
+  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;
+    }
+  }
+
+  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;
+    });
+  }
+
   clone() {
     const customDashboardCache = new CustomDashboardCache();
     customDashboardCache.uuid = this.uuid;
@@ -96,9 +131,23 @@ class CustomDashboardCache extends _BaseEntity.default {
     customDashboardCache.selectedValuesJSON = this.selectedValuesJSON;
     customDashboardCache.filterApplied = this.filterApplied;
     customDashboardCache.dashboardFiltersHash = this.dashboardFiltersHash;
+    customDashboardCache.reportCardResults = this.reportCardResults;
+    customDashboardCache.nestedReportCardResults = this.nestedReportCardResults;
     return customDashboardCache;
   }
 
+  matchNestedReportCardResult(nestedReportCardResult) {
+    return this.nestedReportCardResults.find(x => x.reportCard === nestedReportCardResult.reportCard && x.itemKey === nestedReportCardResult.itemKey && x.dashboard === this.dashboard.uuid);
+  }
+
+  matchReportCardResult(reportCardResult) {
+    return this.reportCardResults.find(x => x.reportCard === reportCardResult.reportCard && x.dashboard === this.dashboard.uuid);
+  }
+
+  isCachePopulated() {
+    return _lodash.default.isNil(this.updatedAt);
+  }
+
 }
 
 _defineProperty(CustomDashboardCache, "schema", {
@@ -107,10 +156,21 @@ _defineProperty(CustomDashboardCache, "schema", {
   properties: {
     uuid: "string",
     dashboard: "Dashboard",
-    updatedAt: "date",
+    updatedAt: {
+      type: "date",
+      optional: true
+    },
     selectedValuesJSON: "string",
     filterApplied: "bool",
-    dashboardFiltersHash: "string"
+    dashboardFiltersHash: "string",
+    reportCardResults: {
+      type: "list",
+      objectType: "ReportCardResult"
+    },
+    nestedReportCardResults: {
+      type: "list",
+      objectType: "NestedReportCardResult"
+    }
   }
 });
 

package/dist/ReportCard.js

@@ -23,6 +23,8 @@ 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; }
@@ -215,6 +217,14 @@ class ReportCard extends _BaseEntity.default {
     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", {

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: 193,
+    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.`);

package/dist/index.js

@@ -801,6 +801,18 @@ Object.defineProperty(exports, "Range", {
     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"));
 
@@ -1058,6 +1070,10 @@ 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/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/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/package.json

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