openchs-models 1.33.38 → 1.33.39

package/dist/ObservationsHolder.js

@@ -152,8 +152,12 @@ class ObservationsHolder {
     });
     const inApplicableFormElements = _lodash.default.differenceWith(formElementsIncludingRepeatableElements, applicableFormElements, (a, b) => a.uuid === b.uuid && a.questionGroupIndex === b.questionGroupIndex);
     applicableFormElements.forEach(fe => {
-      if (fe.concept.isCodedConcept() && (!_lodash.default.isEmpty(fe.answersToShow) || !_lodash.default.isEmpty(fe.answersToExclude))) {
+      const hasFilters = !_lodash.default.isEmpty(fe.answersToShow) || !_lodash.default.isEmpty(fe.answersToExclude);
+      if (!hasFilters) return;
+      if (fe.concept.isCodedConcept()) {
         fe.isQuestionGroup() ? this.removeNonApplicableAnswersFromQuestionGroup(fe, fe.isSingleSelect(), allFormElements) : this.removeNonApplicableAnswers(fe, fe.isSingleSelect(), this.getObservation(fe.concept));
+      } else if (fe.concept.isSubjectConcept()) {
+        this.removeNonApplicableSubjectAnswers(fe, fe.isSingleSelect(), this.getObservation(fe.concept));
       }
     });
     return _lodash.default.flatten(inApplicableFormElements.map(fe => this._removeObs(fe))).filter(obs => !_lodash.default.isEmpty(obs));
@@ -202,6 +206,24 @@ class ObservationsHolder {
     }
   }
 
+  //private
+  removeNonApplicableSubjectAnswers(fe, isSingleSelect, observation) {
+    if (_lodash.default.isEmpty(observation)) return;
+    const allowedUUIDs = fe.getApplicableSubjectUUIDs();
+    const excludedUUIDs = fe.getExcludedSubjectUUIDs();
+    const currentValues = _lodash.default.flatten([observation.getValue()]);
+    const applicableValues = _lodash.default.filter(currentValues, value => {
+      if (allowedUUIDs && !_lodash.default.includes(allowedUUIDs, value)) return false;
+      if (_lodash.default.includes(excludedUUIDs, value)) return false;
+      return true;
+    });
+    if (applicableValues.length === currentValues.length) return;
+    _ArrayHelper.default.remove(this.observations, obs => obs.concept.uuid === observation.concept.uuid);
+    const newValue = isSingleSelect ? new _SingleCodedValue.default(_lodash.default.head(applicableValues)) : new _MultipleCodedValues.default(applicableValues);
+    const newObservation = _Observation.default.create(observation.concept, newValue);
+    this.observations.push(newObservation);
+  }
+
   /*
   Called from wizard after the update of the fields is called for all types. This is to sync up the coded fields based on the rules.
    */

package/dist/application/FormElement.js

@@ -217,6 +217,13 @@ class FormElement extends _BaseEntity.default {
   getApplicableAnswerConceptUUIDs() {
     return _lodash.default.map(this.getAnswers(), ca => ca.concept.uuid);
   }
+  getApplicableSubjectUUIDs() {
+    if (!_lodash.default.isEmpty(this.answersToShow)) return [...this.answersToShow];
+    return null;
+  }
+  getExcludedSubjectUUIDs() {
+    return _lodash.default.isEmpty(this.answersToExclude) ? [] : [...this.answersToExclude];
+  }
   getAnswerWithConceptName(conceptName) {
     return _lodash.default.find(this.concept.getAnswers(), answer => answer.concept.name === conceptName);
   }

package/package.json

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