openchs-models 1.17.0 → 1.17.1

package/dist/ObservationsHolder.js

@@ -148,32 +148,76 @@ class ObservationsHolder {
   }
 
   removeNonApplicableObs(allFormElements, applicableFormElements) {
-    const inApplicableFormElements = _lodash.default.differenceBy(allFormElements, applicableFormElements, fe => fe.uuid);
+    const formElementsIncludingRepeatableElements = [];
+
+    _lodash.default.forEach(allFormElements, fe => {
+      if (fe.concept.isQuestionGroup()) {
+        const observations = this.findObservation(fe.concept);
+        const questionGroupObs = observations && observations.getValueWrapper();
+        const size = questionGroupObs ? questionGroupObs.size() : 1;
+
+        const childFormElements = _lodash.default.filter(allFormElements, ({
+          groupUuid
+        }) => groupUuid === fe.uuid);
+
+        _lodash.default.forEach(childFormElements, cfe => {
+          _lodash.default.range(size).forEach(questionGroupIndex => {
+            const newFormElement = cfe.clone();
+            newFormElement.questionGroupIndex = _lodash.default.isEmpty(cfe.rule) ? undefined : questionGroupIndex;
+            formElementsIncludingRepeatableElements.push(newFormElement);
+          });
+        });
+      } else if (_lodash.default.isNil(fe.groupUuid)) {
+        formElementsIncludingRepeatableElements.push(fe);
+      }
+    });
+
+    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))) {
-        this.removeNonApplicableAnswers(fe, fe.isSingleSelect());
+        fe.isQuestionGroup() ? this.removeNonApplicableAnswersFromQuestionGroup(fe, fe.isSingleSelect(), allFormElements) : this.removeNonApplicableAnswers(fe, fe.isSingleSelect(), this.getObservation(fe.concept));
       }
     });
-    return _lodash.default.flatten(inApplicableFormElements.map(fe => this._removeObs(fe, allFormElements)));
+    return _lodash.default.flatten(inApplicableFormElements.map(fe => this._removeObs(fe))).filter(obs => !_lodash.default.isEmpty(obs));
   }
 
-  _removeObs(formElement, allFormElements) {
-    if (formElement.isQuestionGroup()) {
-      const parentFormElement = _lodash.default.find(allFormElements, ({
-        uuid
-      }) => formElement.groupUuid === uuid);
+  removeNonApplicableAnswersFromQuestionGroup(fe, isSingleSelect, allFormElements) {
+    const questionGroup = this.getQuestionGroups(fe);
+    const questionGroupObservation = questionGroup && questionGroup.getGroupObservationAtIndex(fe.questionGroupIndex);
+    const observation = questionGroupObservation && questionGroupObservation.getObservation(fe.concept);
+
+    if (!_lodash.default.isEmpty(observation)) {
+      questionGroupObservation.removeExistingObs(fe.concept);
+      const applicableConceptAnswerUUIDs = fe.getApplicableAnswerConceptUUIDs();
+
+      const applicableAnswers = _lodash.default.filter(_lodash.default.flatten([observation.getValue()]), value => _lodash.default.includes(applicableConceptAnswerUUIDs, value));
 
-      const parentObservation = this.getObservation(parentFormElement.concept);
-      return _lodash.default.isNil(parentObservation) ? [] : parentObservation.getValueWrapper().removeExistingObs(formElement.concept);
+      const newValue = isSingleSelect ? new _SingleCodedValue.default(_lodash.default.head(applicableAnswers)) : new _MultipleCodedValues.default(applicableAnswers);
+
+      const newObservation = _Observation.default.create(observation.concept, newValue);
+
+      questionGroupObservation.addObservation(newObservation);
+    }
+  }
+
+  _removeObs(formElement) {
+    if (formElement.isQuestionGroup()) {
+      const questionGroup = this.getQuestionGroups(formElement);
+      const questionGroupObservation = questionGroup && questionGroup.getGroupObservationAtIndex(formElement.questionGroupIndex);
+      return questionGroupObservation && questionGroupObservation.removeExistingObs(formElement.concept);
     } else {
       return _lodash.default.remove(this.observations, obs => obs.concept.uuid === formElement.concept.uuid);
     }
   }
 
-  removeNonApplicableAnswers(fe, isSingleSelect) {
-    const observation = this.getObservation(fe.concept);
+  getQuestionGroups(formElement) {
+    const parentFormElement = formElement.getParentFormElement();
+    const questionGroupObservations = this.getObservation(parentFormElement.concept);
+    return questionGroupObservations && questionGroupObservations.getValueWrapper();
+  }
 
+  removeNonApplicableAnswers(fe, isSingleSelect, observation) {
     if (!_lodash.default.isEmpty(observation)) {
       _lodash.default.remove(this.observations, obs => obs.concept.uuid === observation.concept.uuid);
 

package/dist/application/FormElement.js

@@ -258,6 +258,27 @@ class FormElement {
     return _lodash.default.isNil(allowedMaxSize) ? oneMBInBytes : _lodash.default.toNumber(allowedMaxSize.getValue()) * oneMBInBytes;
   }
 
+  getParentFormElement() {
+    return _lodash.default.find(this.formElementGroup.getFormElements(), fe => fe.uuid === this.groupUuid);
+  }
+
+  clone() {
+    const formElement = new FormElement();
+    formElement.uuid = this.uuid;
+    formElement.name = this.name;
+    formElement.displayOrder = this.displayOrder;
+    formElement.mandatory = this.mandatory;
+    formElement.keyValues = this.keyValues;
+    formElement.concept = this.concept;
+    formElement.type = this.type;
+    formElement.formElementGroup = this.formElementGroup;
+    formElement.validFormat = this.validFormat;
+    formElement.voided = this.voided;
+    formElement.rule = this.rule;
+    formElement.groupUuid = this.groupUuid;
+    return formElement;
+  }
+
 }
 
 _defineProperty(FormElement, "schema", {

package/dist/application/FormElementGroup.js

@@ -83,9 +83,9 @@ class FormElementGroup {
           const repeatableQuestionGroup = _lodash.default.isEmpty(observations) ? new _RepeatableQuestionGroup.default() : observations.getValueWrapper();
           const groupValidationResults = [];
 
-          _lodash.default.forEach(repeatableQuestionGroup.getAllQuestionGroupObservations(), questionGroup => {
+          _lodash.default.forEach(repeatableQuestionGroup.getAllQuestionGroupObservations(), (questionGroup, index) => {
             const childValidations = [];
-            this.validateQuestionGroup(questionGroup, childFormElements, childValidations);
+            this.validateQuestionGroup(questionGroup, childFormElements, childValidations, index);
             groupValidationResults.push(childValidations);
           });
 
@@ -98,7 +98,7 @@ class FormElementGroup {
           validationResults.push(validationResult);
         } else {
           const questionGroup = _lodash.default.isEmpty(observations) ? new _QuestionGroup.default() : observations.getValueWrapper();
-          this.validateQuestionGroup(questionGroup, childFormElements, validationResults);
+          this.validateQuestionGroup(questionGroup, childFormElements, validationResults, 0);
         }
       } else if (!formElement.isQuestionGroup()) {
         this.validateFormElement(formElement, observationHolder.findObservation(formElement.concept), validationResults);
@@ -107,8 +107,10 @@ class FormElementGroup {
     return validationResults;
   }
 
-  validateQuestionGroup(questionGroup, childFormElements, validationResults) {
-    _lodash.default.forEach(childFormElements, formElement => this.validateFormElement(formElement, questionGroup.findObservation(formElement.concept), validationResults));
+  validateQuestionGroup(questionGroup, childFormElements, validationResults, questionGroupIndex) {
+    _lodash.default.filter(childFormElements, fe => _lodash.default.isNil(fe.questionGroupIndex) || fe.questionGroupIndex === questionGroupIndex).forEach(formElement => {
+      return this.validateFormElement(formElement, questionGroup.findObservation(formElement.concept), validationResults);
+    });
   }
 
   validateFormElement(formElement, observation, validationResults) {
@@ -144,13 +146,29 @@ class FormElementGroup {
   }
 
   filterElements(formElementStatuses) {
-    let filtered = _lodash.default.filter(this.getFormElements(), formElement => _lodash.default.some(formElementStatuses, formElementStatus => formElementStatus.uuid === formElement.uuid && formElementStatus.visibility && (() => {
-      formElement.setAnswersToShow = formElementStatus.answersToShow;
-      formElement.answersToSkip = formElementStatus.answersToSkip;
-      return true;
-    })()));
+    const filteredFormElements = [];
+    const allFormElements = this.getFormElements();
+
+    _lodash.default.forEach(formElementStatuses, ({
+      questionGroupIndex,
+      uuid,
+      visibility,
+      answersToShow,
+      answersToSkip
+    }) => {
+      const formElement = _lodash.default.find(allFormElements, fe => fe.uuid === uuid);
+
+      if (visibility && formElement) {
+        //clone is required to assign different questionGroupIndex to the same form element
+        const newFormElement = formElement.clone();
+        newFormElement.setAnswersToShow = answersToShow;
+        newFormElement.answersToSkip = answersToSkip;
+        newFormElement.questionGroupIndex = questionGroupIndex;
+        filteredFormElements.push(newFormElement);
+      }
+    });
 
-    return FormElementGroup._sortedFormElements(filtered);
+    return FormElementGroup._sortedFormElements(filteredFormElements);
   }
 
   toJSON() {

package/dist/application/FormElementStatus.js

@@ -23,9 +23,14 @@ class FormElementStatus {
     oredFormElementStatus.answersToSkip = this.answersToSkip;
     oredFormElementStatus.validationErrors = this.validationErrors;
     oredFormElementStatus.answersToShow = this.answersToShow;
+    oredFormElementStatus.questionGroupIndex = this.questionGroupIndex;
     return oredFormElementStatus;
   }
 
+  addQuestionGroupInformation(questionGroupIndex) {
+    this.questionGroupIndex = questionGroupIndex;
+  }
+
   or(formElementStatus) {
     return this._bool(formElementStatus, (a, b) => a || b);
   }

package/dist/observation/QuestionGroup.js

@@ -89,6 +89,14 @@ class QuestionGroup {
     });
   }
 
+  findObservationByConceptUUID(conceptNameOrUUID) {
+    return _lodash.default.find(this.groupObservations, obs => obs.concept.uuid === conceptNameOrUUID || obs.concept.name === conceptNameOrUUID);
+  }
+
+  getGroupObservationAtIndex(index) {
+    return this;
+  }
+
   getObservation(concept) {
     return this.findObservation(concept);
   }
@@ -116,6 +124,10 @@ class QuestionGroup {
     return _lodash.default.isEmpty(this.groupObservations);
   }
 
+  size() {
+    return 1;
+  }
+
 }
 
 var _default = QuestionGroup;

package/package.json

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