openchs-models 1.30.0 → 1.30.2

package/dist/ObservationsHolder.js

@@ -258,10 +258,11 @@ class ObservationsHolder {
 
       const {
         value,
-        questionGroupIndex
+        questionGroupIndex,
+        initializedWithNullValueOnPurpose
       } = formElementStatus;
 
-      if (!_lodash.default.isNil(value)) {
+      if (!_lodash.default.isNil(value) || !!initializedWithNullValueOnPurpose) {
         const concept = fe.concept;
 
         if (fe.isQuestionGroup()) {
@@ -270,7 +271,7 @@ class ObservationsHolder {
           }) => fe.groupUuid === uuid);
 
           updateQuestionGroupObs(parentFormElement, questionGroupIndex, fe, value);
-        } else if (concept.isQuestionGroup() && _lodash.default.isArray(value)) {
+        } else if (concept.isQuestionGroup() && !_lodash.default.isNil(value) && _lodash.default.isArray(value)) {
           const observation = this.findObservation(concept);
           const questionGroup = observation && observation.getValueWrapper();
           const size = questionGroup ? questionGroup.size() : 0;
@@ -391,9 +392,11 @@ class ObservationsHolder {
         observation = _Observation.default.create(childConcept, isSingleSelect ? new _SingleCodedValue.default(value) : new _MultipleCodedValues.default().push(value));
         childObservations.addObservation(observation);
       } else {
-        isSingleSelect ? observation.toggleSingleSelectAnswer(value) : observation.toggleMultiSelectAnswer(value);
+        if (!_lodash.default.isNil(value)) {
+          isSingleSelect ? observation.toggleSingleSelectAnswer(value) : observation.toggleMultiSelectAnswer(value);
+        }
 
-        if (observation.hasNoAnswer()) {
+        if (observation.hasNoAnswer() || _lodash.default.isNil(value)) {
           childObservations.removeExistingObs(childConcept);
         }
       }

package/dist/application/FormElementStatus.js

@@ -5,14 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 class FormElementStatus {
-  constructor(uuid, visibility, value, answersToSkip = [], validationErrors = [], answersToShow = []) {
+  constructor(uuid, visibility, value, answersToSkip = [], validationErrors = [], answersToShow = [], initializedWithNullValueOnPurpose = false) {
     this.uuid = uuid;
     this.visibility = visibility;
     this.value = value;
     this.answersToSkip = answersToSkip;
     this.validationErrors = validationErrors;
     this.answersToShow = answersToShow;
+    this.initializedWithNullValueOnPurpose = initializedWithNullValueOnPurpose;
+  }
+
+  static _resetIfValueIsNull(uuid, visibility, value, answersToSkip = [], validationErrors = [], answersToShow = []) {
+    return new FormElementStatus(uuid, visibility, value, answersToSkip, validationErrors, answersToShow, _lodash.default.isNil(value));
   }
 
   _bool(formElementStatus, op) {
@@ -24,6 +33,7 @@ class FormElementStatus {
     oredFormElementStatus.validationErrors = this.validationErrors;
     oredFormElementStatus.answersToShow = this.answersToShow;
     oredFormElementStatus.questionGroupIndex = this.questionGroupIndex;
+    oredFormElementStatus.initializedWithNullValueOnPurpose = this.initializedWithNullValueOnPurpose;
     return oredFormElementStatus;
   }
 

package/dist/index.js

@@ -783,6 +783,12 @@ Object.defineProperty(exports, "ArrayUtil", {
     return _ArrayUtil.default;
   }
 });
+Object.defineProperty(exports, "DateTimeUtil", {
+  enumerable: true,
+  get: function () {
+    return _DateTimeUtil.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1038,6 +1044,8 @@ var _MetaDataService = _interopRequireDefault(require("./service/MetaDataService
 
 var _ArrayUtil = _interopRequireDefault(require("./utility/ArrayUtil"));
 
+var _DateTimeUtil = _interopRequireDefault(require("./utility/DateTimeUtil"));
+
 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

@@ -11,6 +11,8 @@ var _Concept = _interopRequireDefault(require("../Concept"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _DateTimeUtil = _interopRequireDefault(require("../utility/DateTimeUtil"));
+
 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; }
@@ -197,6 +199,16 @@ class DashboardFilterConfig {
     return this.isConceptTypeFilter() && this.observationBasedFilter.willObservationBeInScopeOfEncounter();
   }
 
+  validate(filterValue) {
+    const inputDataType = this.getInputDataType();
+
+    if ([_Concept.default.dataType.Date, _Concept.default.dataType.DateTime, _Concept.default.dataType.Time].includes(inputDataType) && this.widget === _CustomFilter.default.widget.Range) {
+      return _DateTimeUtil.default.validateDateRange(filterValue.minValue, filterValue.maxValue);
+    }
+
+    return [true];
+  }
+
   clone() {
     const clone = new DashboardFilterConfig();
     clone.type = this.type;

package/dist/utility/DateTimeUtil.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _moment = _interopRequireDefault(require("moment"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class DateTimeUtil {
+  static validateDateRange(fromDate, toDate) {
+    if (_lodash.default.isNil(toDate) && _lodash.default.isNil(fromDate)) return [true];
+    if (_lodash.default.isNil(toDate) || _lodash.default.isNil(fromDate)) return [false, 'bothDateShouldBeSelectedError'];
+    if (!(0, _moment.default)(fromDate).isSameOrBefore(toDate)) return [false, 'startDateGreaterThanEndError'];
+    return [true];
+  }
+
+}
+
+var _default = DateTimeUtil;
+exports.default = _default;

package/dist/utility/General.js

@@ -285,6 +285,16 @@ class General {
     return !isNaN(parseFloat(str)) && isFinite(str);
   }
 
+  static isDeepEmpty(x) {
+    if (_lodash.default.isEmpty(x)) return true;
+
+    if (!_lodash.default.isArray(x)) {
+      return _lodash.default.reduce(Object.values(x), (isEmpty, v) => _lodash.default.isNil(v) && isEmpty, true);
+    }
+
+    return false;
+  }
+
 }
 
 _defineProperty(General, "LogLevel", {

package/package.json

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