openchs-models 1.31.82 → 1.31.83

package/dist/CustomDashboardCache.js

@@ -15,6 +15,8 @@ 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 EmptyObjectHash = "99914b932bd37a50b983c5e7c90ae93b";
+
 class CustomDashboardCache extends _BaseEntity.default {
   constructor(that = null) {
     super(that);
@@ -52,6 +54,14 @@ class CustomDashboardCache extends _BaseEntity.default {
     this.that.dashboard = this.fromObject(x);
   }
 
+  get dashboardFiltersHash() {
+    return this.that.dashboardFiltersHash;
+  }
+
+  set dashboardFiltersHash(x) {
+    this.that.dashboardFiltersHash = x;
+  }
+
   static create(uuid, updatedAt, selectedValuesJSON = '{}', filterApplied) {
     const customDashboardCache = new CustomDashboardCache();
     customDashboardCache.uuid = uuid;
@@ -72,6 +82,7 @@ class CustomDashboardCache extends _BaseEntity.default {
   reset() {
     this.filterApplied = false;
     this.selectedValuesJSON = JSON.stringify({});
+    this.dashboardFiltersHash = EmptyObjectHash;
     this.updatedAt = new Date();
   }
 
@@ -86,6 +97,7 @@ class CustomDashboardCache extends _BaseEntity.default {
     customDashboardCache.updatedAt = this.updatedAt;
     customDashboardCache.selectedValuesJSON = this.selectedValuesJSON;
     customDashboardCache.filterApplied = this.filterApplied;
+    customDashboardCache.dashboardFiltersHash = this.dashboardFiltersHash;
     return customDashboardCache;
   }
 
@@ -99,7 +111,8 @@ _defineProperty(CustomDashboardCache, "schema", {
     dashboard: "Dashboard",
     updatedAt: "date",
     selectedValuesJSON: "string",
-    filterApplied: "bool"
+    filterApplied: "bool",
+    dashboardFiltersHash: "string"
   }
 });
 

package/dist/Schema.js

@@ -279,7 +279,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 191,
+    schemaVersion: 192,
     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

@@ -795,6 +795,12 @@ Object.defineProperty(exports, "Locations", {
     return _Locations.default;
   }
 });
+Object.defineProperty(exports, "Range", {
+  enumerable: true,
+  get: function () {
+    return _Range.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1050,6 +1056,8 @@ 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/reports/DashboardFilterConfig.js

@@ -13,6 +13,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _DateTimeUtil = _interopRequireDefault(require("../utility/DateTimeUtil"));
 
+var _Range = _interopRequireDefault(require("./Range"));
+
 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; }
@@ -127,8 +129,10 @@ class DashboardFilterConfig {
       return this.observationBasedFilter.concept.datatype;
     } else if (this.isGroupSubjectTypeFilter()) {
       return _Concept.default.dataType.Subject;
-    } else if (dateFilterTypes.includes(this.type)) {
+    } else if (dateFilterTypes.includes(this.type) && this.widget === _CustomFilter.default.widget.Default) {
       return _Concept.default.dataType.Date;
+    } else if (dateFilterTypes.includes(this.type) && this.widget === _CustomFilter.default.widget.Range) {
+      return _Range.default.DateRange;
     } else {
       return this.type;
     }
@@ -199,14 +203,10 @@ 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 (_Range.default.DateRange === inputDataType) {
       return _DateTimeUtil.default.validateDateRange(filterValue.minValue, filterValue.maxValue);
     }
 
-    if (_Concept.default.dataType.Time === inputDataType && this.widget === _CustomFilter.default.widget.Range) {
-      return _DateTimeUtil.default.validateTimeRange(filterValue.minValue, filterValue.maxValue);
-    }
-
     return [true];
   }
 

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/package.json

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