openchs-models 1.29.2 → 1.29.3

package/dist/Dashboard.js

@@ -9,6 +9,8 @@ var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
 var _General = _interopRequireDefault(require("./utility/General"));
 
+var _DashboardFilter = _interopRequireDefault(require("./reports/DashboardFilter"));
+
 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; }
@@ -38,6 +40,14 @@ class Dashboard extends _BaseEntity.default {
     return _General.default.assignFields(resource, new Dashboard(), ["uuid", "name", "description", "voided"]);
   }
 
+  static associateChild(child, childEntityClass, childResource, entityService) {
+    let dashboard = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, "dashboardUUID", Dashboard.schema.name);
+
+    dashboard = _General.default.pick(dashboard, ["uuid"], ["filters"]);
+    if (childEntityClass === _DashboardFilter.default) _BaseEntity.default.addNewChild(child, dashboard.filters);
+    return dashboard;
+  }
+
 }
 
 _defineProperty(Dashboard, "schema", {
@@ -50,6 +60,10 @@ _defineProperty(Dashboard, "schema", {
       type: "string",
       optional: true
     },
+    filters: {
+      type: "list",
+      objectType: "DashboardFilter"
+    },
     voided: {
       type: "bool",
       default: false
@@ -57,5 +71,7 @@ _defineProperty(Dashboard, "schema", {
   }
 });
 
+_defineProperty(Dashboard, "merge", () => _BaseEntity.default.mergeOn("filters"));
+
 var _default = Dashboard;
 exports.default = _default;

package/dist/DashboardSectionCardMapping.js

@@ -9,8 +9,6 @@ var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
 var _General = _interopRequireDefault(require("./utility/General"));
 
-var _Dashboard = _interopRequireDefault(require("./Dashboard"));
-
 var _ReportCard = _interopRequireDefault(require("./ReportCard"));
 
 var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));

package/dist/EntityMetaData.js

@@ -147,6 +147,8 @@ var _MenuItem = _interopRequireDefault(require("./application/MenuItem"));
 
 var _UserSubjectAssignment = _interopRequireDefault(require("./assignment/UserSubjectAssignment"));
 
+var _DashboardFilter = _interopRequireDefault(require("./reports/DashboardFilter"));
+
 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; }
@@ -467,6 +469,11 @@ const dashboard = refData(_Dashboard.default, {
   res: "dashboard",
   syncWeight: 0
 });
+const dashboardFilter = refData(_DashboardFilter.default, {
+  res: 'dashboardFilter',
+  parent: dashboard,
+  syncWeight: 0
+});
 const dashboardSection = refData(_DashboardSection.default, {
   res: "dashboardSection",
   syncWeight: 0
@@ -642,7 +649,7 @@ class EntityMetaData {
 
   //order is important. last entity in each (tx and ref) with be executed first. parent should be synced before the child.
   static model() {
-    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
+    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
   }
 
   static entitiesLoadedFromServer() {

package/dist/Schema.js

@@ -185,18 +185,20 @@ var _UserSubjectAssignment = _interopRequireDefault(require("./assignment/UserSu
 
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
+var _DashboardFilter = _interopRequireDefault(require("./reports/DashboardFilter"));
+
 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 = [_LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.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, _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 = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.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, _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 createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 173,
+    schemaVersion: 174,
     migration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 

package/dist/index.js

@@ -603,6 +603,12 @@ Object.defineProperty(exports, "DashboardSection", {
     return _DashboardSection.default;
   }
 });
+Object.defineProperty(exports, "DashboardFilter", {
+  enumerable: true,
+  get: function () {
+    return _DashboardFilter.default;
+  }
+});
 Object.defineProperty(exports, "SyncError", {
   enumerable: true,
   get: function () {
@@ -948,6 +954,8 @@ var _GroupDashboard = _interopRequireDefault(require("./GroupDashboard"));
 
 var _DashboardSection = _interopRequireDefault(require("./DashboardSection"));
 
+var _DashboardFilter = _interopRequireDefault(require("./reports/DashboardFilter"));
+
 var _SyncError = _interopRequireDefault(require("./error/SyncError"));
 
 var _News = _interopRequireDefault(require("./News"));

package/dist/reports/DashboardFilter.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+
+var _Dashboard = _interopRequireDefault(require("../Dashboard"));
+
+var _General = _interopRequireDefault(require("../utility/General"));
+
+var _ResourceUtil = _interopRequireDefault(require("../utility/ResourceUtil"));
+
+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 DashboardFilter extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get dashboard() {
+    return this.toEntity("dashboard", _Dashboard.default);
+  }
+
+  set dashboard(x) {
+    this.that.dashboard = this.fromObject(x);
+  }
+
+  get filter() {
+    return this.that.filter;
+  }
+
+  set filter(x) {
+    this.that.filter = x;
+  }
+
+  static fromResource(resource, entityService) {
+    const dashboardFilter = _General.default.assignFields(resource, new DashboardFilter(), ["uuid", "voided"]);
+
+    dashboardFilter.filter = JSON.stringify(resource["filter"]);
+    dashboardFilter.dashboard = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "dashboardUUID"), _Dashboard.default.schema.name);
+    return dashboardFilter;
+  }
+
+}
+
+_defineProperty(DashboardFilter, "schema", {
+  name: "DashboardFilter",
+  primaryKey: "uuid",
+  properties: {
+    uuid: "string",
+    dashboard: "Dashboard",
+    filter: "string",
+    voided: {
+      type: "bool",
+      default: false
+    }
+  }
+});
+
+var _default = DashboardFilter;
+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.29.2",
+    "version": "1.29.3",
     "private": false,
     "repository": {
         "type": "git",