openchs-models 1.31.86 → 1.31.88

package/dist/CustomFilter.js

@@ -42,7 +42,8 @@ _defineProperty(CustomFilter, "type", {
   Address: "Address",
   Concept: "Concept",
   GroupSubject: "GroupSubject",
-  SubjectType: "SubjectType"
+  SubjectType: "SubjectType",
+  AsOnDate: "AsOnDate"
 });
 
 _defineProperty(CustomFilter, "scope", {

package/dist/reports/DashboardFilterConfig.js

@@ -128,7 +128,7 @@ 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,
@@ -163,7 +163,7 @@ class DashboardFilterConfig {
   toDisplayText() {
     let s = `Type: ${this.type}.`;
 
-    if (this.widget === _CustomFilter.default.widget.Range) {
+    if (this.isRangeWidget()) {
       s += ` Widget: ${this.widget}.`;
     }
 
@@ -174,14 +174,18 @@ class DashboardFilterConfig {
     return s;
   }
 
+  isRangeWidget() {
+    return this.widget === _CustomFilter.default.widget.Range;
+  }
+
   getInputDataType() {
     if (this.isConceptTypeFilter()) {
       return this.observationBasedFilter.concept.datatype;
     } 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.widget === _CustomFilter.default.widget.Default) {
+    } else if (dateFilterTypes.includes(this.type) && !this.isRangeWidget()) {
       return _Concept.default.dataType.Date;
-    } else if (dateFilterTypes.includes(this.type) && this.widget === _CustomFilter.default.widget.Range) {
+    } else if (dateFilterTypes.includes(this.type) && this.isRangeWidget()) {
       return _Range.default.DateRange;
     } else if (this.type === _CustomFilter.default.type.SubjectType) {
       return DashboardFilterConfig.dataTypes.formMetaData;
@@ -191,31 +195,31 @@ class DashboardFilterConfig {
   }
 
   isDateFilterType() {
-    return isDateDataType(this) && this.widget !== _CustomFilter.default.widget.Range;
+    return isDateDataType(this) && !this.isRangeWidget();
   }
 
   isDateRangeFilterType() {
-    return isDateDataType(this) && this.widget === _CustomFilter.default.widget.Range;
+    return isDateDataType(this) && this.isRangeWidget();
   }
 
   isDateTimeFilterType() {
-    return isDateTimeDataType(this) && this.widget !== _CustomFilter.default.widget.Range;
+    return isDateTimeDataType(this) && !this.isRangeWidget();
   }
 
   isDateTimeRangeFilterType() {
-    return isDateTimeDataType(this) && this.widget === _CustomFilter.default.widget.Range;
+    return isDateTimeDataType(this) && this.isRangeWidget();
   }
 
   isTimeFilterType() {
-    return isTimeDataType(this) && this.widget !== _CustomFilter.default.widget.Range;
+    return isTimeDataType(this) && !this.isRangeWidget();
   }
 
   isTimeRangeFilterType() {
-    return isTimeDataType(this) && this.widget === _CustomFilter.default.widget.Range;
+    return isTimeDataType(this) && this.isRangeWidget();
   }
 
   isNumericRangeFilterType() {
-    return this.isConceptTypeFilter() && this.observationBasedFilter.concept.datatype === _Concept.default.dataType.Numeric && this.widget === _CustomFilter.default.widget.Range;
+    return this.isConceptTypeFilter() && this.observationBasedFilter.concept.datatype === _Concept.default.dataType.Numeric && this.isRangeWidget();
   }
 
   isDateLikeFilterType() {
@@ -250,8 +254,8 @@ class DashboardFilterConfig {
     return this.type === _CustomFilter.default.type.GroupSubject;
   }
 
-  isSubjectTypeFilter() {
-    return this.type === _CustomFilter.default.type.SubjectType;
+  requiresSpecificSubjectType() {
+    return ![_CustomFilter.default.type.SubjectType, _CustomFilter.default.type.AsOnDate].includes(this.type);
   }
 
   isValid() {
@@ -305,8 +309,6 @@ class DashboardFilterConfig {
   }
 
   validate(filterValue) {
-    const inputDataType = this.getInputDataType();
-
     if (this.isDateRangeFilterType()) {
       return _DateTimeUtil.default.validateDateRange(filterValue.minValue, filterValue.maxValue);
     }

package/package.json

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