openchs-models 1.17.1 → 1.17.4

package/dist/Observation.js

@@ -164,7 +164,8 @@ class Observation {
   }
 
   getReadableValue() {
-    let value = this.getValue();
+    const valueWrapper = this.getValueWrapper();
+    let value = valueWrapper.getValue();
 
     if (!_lodash.default.isNil(value)) {
       if (this.concept.isCodedConcept()) {
@@ -188,9 +189,7 @@ class Observation {
             });
         }
       } else if (this.concept.isQuestionGroup()) {
-        return _lodash.default.map(value, obs => ({
-          [obs.concept.name]: obs.getReadableValue()
-        }));
+        return valueWrapper.isRepeatable() ? _lodash.default.map(value, qg => qg.getReadableValue()) : valueWrapper.getReadableValue();
       }
 
       return value;

package/dist/ObservationsHolder.js

@@ -234,10 +234,19 @@ class ObservationsHolder {
   }
 
   updatePrimitiveCodedObs(applicableFormElements, formElementStatuses) {
+    const updateQuestionGroupObs = (parentFormElement, questionGroupIndex, fe, value) => {
+      parentFormElement.repeatable ? this.updateRepeatableGroupQuestion(questionGroupIndex, parentFormElement, fe, value) : this.updateGroupQuestion(parentFormElement, fe, value);
+    };
+
     applicableFormElements.forEach(fe => {
-      let value = _lodash.default.find(formElementStatuses, formElementStatus => {
-        return fe.uuid === formElementStatus.uuid;
-      }).value;
+      const formElementStatus = _lodash.default.find(formElementStatuses, formElementStatus => {
+        return fe.uuid === formElementStatus.uuid && (_lodash.default.isNil(fe.questionGroupIndex) || fe.questionGroupIndex === formElementStatus.questionGroupIndex);
+      });
+
+      const {
+        value,
+        questionGroupIndex
+      } = formElementStatus;
 
       if (!_lodash.default.isNil(value)) {
         const concept = fe.concept;
@@ -247,7 +256,35 @@ class ObservationsHolder {
             uuid
           }) => fe.groupUuid === uuid);
 
-          this.updateGroupQuestion(parentFormElement, fe, value);
+          updateQuestionGroupObs(parentFormElement, questionGroupIndex, fe, value);
+        } else if (concept.isQuestionGroup() && _lodash.default.isArray(value)) {
+          const observation = this.findObservation(concept);
+          const questionGroup = observation && observation.getValueWrapper();
+          const size = questionGroup ? questionGroup.size() : 0;
+
+          if (size >= value.length) {
+            // Don't populate the values if already done. This will allow users to edit the prepopulated values.
+            // This check is added to make sure user can update the group values.
+            return;
+          }
+
+          _lodash.default.forEach(value, (questionGroupValue, index) => {
+            if (fe.repeatable && size < index + 1) {
+              this.updateRepeatableGroupQuestion(index, fe, null, null, 'add');
+            }
+
+            _lodash.default.forEach(questionGroupValue, (answerValue, conceptUUID) => {
+              const childFormElement = _lodash.default.find(fe.formElementGroup.getFormElements(), ({
+                concept
+              }) => concept.uuid === conceptUUID);
+
+              if (childFormElement.concept.isCodedConcept() && childFormElement.isMultiSelect() && _lodash.default.isArray(answerValue)) {
+                _lodash.default.forEach(answerValue, v => updateQuestionGroupObs(fe, index, childFormElement, v));
+              } else {
+                updateQuestionGroupObs(fe, index, childFormElement, answerValue);
+              }
+            });
+          });
         } else {
           concept.isCodedConcept() ? this.addOrUpdateCodedObs(concept, value, fe.isSingleSelect()) : this.addOrUpdatePrimitiveObs(concept, value);
         }
@@ -333,7 +370,7 @@ class ObservationsHolder {
       }
     }
 
-    if (childConcept.isCodedConcept()) {
+    if (childConcept.isCodedConcept() || childConcept.isMediaConcept()) {
       let observation = childObservations.getObservation(childConcept);
       const isSingleSelect = childFormElement.isSingleSelect();
 

package/dist/application/FormElementGroup.js

@@ -21,8 +21,6 @@ var _QuestionGroup = _interopRequireDefault(require("../observation/QuestionGrou
 
 var _RepeatableQuestionGroup = _interopRequireDefault(require("../observation/RepeatableQuestionGroup"));
 
-var _ValidationResult = _interopRequireDefault(require("./ValidationResult"));
-
 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; }
@@ -81,21 +79,10 @@ class FormElementGroup {
 
         if (formElement.repeatable) {
           const repeatableQuestionGroup = _lodash.default.isEmpty(observations) ? new _RepeatableQuestionGroup.default() : observations.getValueWrapper();
-          const groupValidationResults = [];
 
           _lodash.default.forEach(repeatableQuestionGroup.getAllQuestionGroupObservations(), (questionGroup, index) => {
-            const childValidations = [];
-            this.validateQuestionGroup(questionGroup, childFormElements, childValidations, index);
-            groupValidationResults.push(childValidations);
+            this.validateQuestionGroup(questionGroup, childFormElements, validationResults, index);
           });
-
-          const isSuccess = _lodash.default.every(groupValidationResults, childValidations => _lodash.default.every(childValidations, ({
-            success
-          }) => success));
-
-          const validationResult = new _ValidationResult.default(isSuccess, formElement.uuid);
-          validationResult.groupValidations = groupValidationResults;
-          validationResults.push(validationResult);
         } else {
           const questionGroup = _lodash.default.isEmpty(observations) ? new _QuestionGroup.default() : observations.getValueWrapper();
           this.validateQuestionGroup(questionGroup, childFormElements, validationResults, 0);
@@ -109,12 +96,13 @@ class FormElementGroup {
 
   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);
+      return this.validateFormElement(formElement, questionGroup.findObservation(formElement.concept), validationResults, questionGroupIndex);
     });
   }
 
-  validateFormElement(formElement, observation, validationResults) {
+  validateFormElement(formElement, observation, validationResults, questionGroupIndex) {
     const validationResult = formElement.validate(_lodash.default.isNil(observation) ? null : observation.getValue());
+    validationResult.addQuestionGroupIndex(questionGroupIndex);
     validationResults.push(validationResult);
   }
 

package/dist/application/ValidationResult.js

@@ -12,12 +12,16 @@ var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class ValidationResult {
-  constructor(success, formIdentifier, messageKey, extra) {
+  constructor(success, formIdentifier, messageKey, extra, questionGroupIndex) {
     this.success = success;
     this.formIdentifier = formIdentifier;
     this.messageKey = messageKey;
     this.extra = extra;
-    this.groupValidations = [];
+    this.questionGroupIndex = questionGroupIndex;
+  }
+
+  addQuestionGroupIndex(index) {
+    this.questionGroupIndex = index;
   }
 
   static successful(formIdentifier) {
@@ -38,7 +42,7 @@ class ValidationResult {
 
 
   static clone(validationResult) {
-    return new ValidationResult(validationResult.success, validationResult.formIdentifier, validationResult.messageKey, validationResult.extra);
+    return new ValidationResult(validationResult.success, validationResult.formIdentifier, validationResult.messageKey, validationResult.extra, validationResult.questionGroupIndex);
   }
 
   static findByFormIdentifier(validationResults, formIdentifier) {

package/dist/observation/QuestionGroup.js

@@ -79,6 +79,14 @@ class QuestionGroup {
     return this.groupObservations;
   }
 
+  getReadableValue() {
+    return _lodash.default.map(this.groupObservations, obs => {
+      return {
+        [obs.concept.name]: obs.getReadableValue()
+      };
+    });
+  }
+
   isRepeatable() {
     return false;
   }

package/dist/observation/RepeatableQuestionGroup.js

@@ -34,6 +34,12 @@ class RepeatableQuestionGroup {
     return this.repeatableObservations;
   }
 
+  getReadableValue() {
+    return _lodash.default.map(this.repeatableObservations, questionGroup => {
+      return questionGroup.getReadableValue();
+    });
+  }
+
   isRepeatable() {
     return true;
   }

package/package.json

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