openchs-models 1.29.4 → 1.29.6

package/dist/reports/DashboardFilter.js

@@ -22,6 +22,14 @@ class DashboardFilter extends _BaseEntity.default {
     super(that);
   }
 
+  get name() {
+    return this.that.name;
+  }
+
+  set name(x) {
+    this.that.name = x;
+  }
+
   get dashboard() {
     return this.toEntity("dashboard", _Dashboard.default);
   }
@@ -30,18 +38,18 @@ class DashboardFilter extends _BaseEntity.default {
     this.that.dashboard = this.fromObject(x);
   }
 
-  get filter() {
-    return this.that.filter;
+  get filterConfig() {
+    return this.that.filterConfig;
   }
 
-  set filter(x) {
-    this.that.filter = x;
+  set filterConfig(x) {
+    this.that.filterConfig = x;
   }
 
   static fromResource(resource, entityService) {
-    const dashboardFilter = _General.default.assignFields(resource, new DashboardFilter(), ["uuid", "voided"]);
+    const dashboardFilter = _General.default.assignFields(resource, new DashboardFilter(), ["uuid", "voided", "name"]);
 
-    dashboardFilter.filter = JSON.stringify(resource["filter"]);
+    dashboardFilter.filterConfig = JSON.stringify(resource["filterConfig"]);
     dashboardFilter.dashboard = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "dashboardUUID"), _Dashboard.default.schema.name);
     return dashboardFilter;
   }

package/dist/reports/DashboardFilterConfig.js

@@ -43,7 +43,7 @@ class ObservationBasedFilter {
   toServerRequest() {
     return {
       scope: this.scope,
-      concept: this.concept.uuid,
+      conceptUUID: this.concept.uuid,
       programUUIDs: this.programs.map(x => x.uuid),
       encounterTypeUUIDs: this.encounterTypes.map(x => x.uuid)
     };
@@ -105,6 +105,7 @@ class GroupSubjectTypeFilter {
 }
 
 exports.GroupSubjectTypeFilter = GroupSubjectTypeFilter;
+const dateFilterTypes = [_CustomFilter.default.type.RegistrationDate, _CustomFilter.default.type.EnrolmentDate, _CustomFilter.default.type.EncounterDate, _CustomFilter.default.type.ProgramEncounterDate];
 
 class DashboardFilterConfig {
   constructor() {
@@ -119,6 +120,18 @@ class DashboardFilterConfig {
     _defineProperty(this, "observationBasedFilter", void 0);
   }
 
+  getInputDataType() {
+    if (this.isConceptTypeFilter()) {
+      return this.observationBasedFilter.concept.datatype;
+    } else if (this.isGroupSubjectTypeFilter()) {
+      return _Concept.default.dataType.Subject;
+    } else if (dateFilterTypes.includes(this.type)) {
+      return _Concept.default.dataType.Date;
+    } else {
+      return this.type;
+    }
+  }
+
   isConceptTypeFilter() {
     return this.type === _CustomFilter.default.type.Concept;
   }

package/package.json

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