openchs-models 1.18.0 → 1.18.1

package/dist/ObservationsHolder.js

@@ -52,6 +52,17 @@ class ObservationsHolder {
     });
   }
 
+  findQuestionGroupObservation(concept, parentFormElement, questionGroupIndex) {
+    const observations = this.findObservation(parentFormElement.concept);
+    const groupObservations = observations && observations.getValueWrapper();
+
+    if (parentFormElement.repeatable) {
+      return groupObservations && groupObservations.getGroupObservationAtIndex(questionGroupIndex).getObservation(concept);
+    }
+
+    return groupObservations && groupObservations.getObservation(concept);
+  }
+
   getObservation(concept) {
     return this.findObservation(concept);
   }
@@ -344,11 +355,11 @@ class ObservationsHolder {
     return observation;
   }
 
-  updateGroupQuestion(parentFormElement, childFormElement, value) {
+  updateGroupQuestion(parentFormElement, childFormElement, value, verified = false, skipVerification = false) {
     const parentConcept = parentFormElement.concept;
     const parentObservation = this.getObservation(parentConcept);
     const childObservations = _lodash.default.isEmpty(parentObservation) ? new _QuestionGroup.default() : parentObservation.getValueWrapper();
-    this.updateChildObservations(childFormElement, childObservations, value);
+    this.updateChildObservations(childFormElement, childObservations, value, verified, skipVerification);
 
     this._removeExistingObs(parentConcept);
 
@@ -357,10 +368,10 @@ class ObservationsHolder {
     }
   }
 
-  updateChildObservations(childFormElement, childObservations, value) {
+  updateChildObservations(childFormElement, childObservations, value, verified = false, skipVerification = false) {
     const childConcept = childFormElement.concept;
 
-    if (childConcept.isPrimitive() && _lodash.default.isNil(childFormElement.durationOptions)) {
+    if (childConcept.isPrimitive()) {
       childObservations.removeExistingObs(childConcept);
 
       if (!_lodash.default.isEmpty(_lodash.default.toString(value))) {
@@ -385,9 +396,29 @@ class ObservationsHolder {
         }
       }
     }
+
+    if (childFormElement.getType() === _Concept.default.dataType.Duration && !(0, _lodash.isNil)(childFormElement.durationOptions)) {
+      childObservations.removeExistingObs(childConcept);
+
+      if (!_lodash.default.isEmpty(value) && !_lodash.default.isEmpty(value.durations)) {
+        const observation = _Observation.default.create(childFormElement.concept, _CompositeDuration.default.fromObs(value));
+
+        childObservations.addObservation(observation);
+      }
+    }
+
+    if (childFormElement.getType() === _Concept.default.dataType.PhoneNumber) {
+      childObservations.removeExistingObs(childConcept);
+
+      if (!_lodash.default.isEmpty(value)) {
+        const observation = _Observation.default.create(childFormElement.concept, new _PhoneNumber.default(value, verified, skipVerification));
+
+        childObservations.addObservation(observation);
+      }
+    }
   }
 
-  updateRepeatableGroupQuestion(index, parentFormElement, childFormElement, value, action) {
+  updateRepeatableGroupQuestion(index, parentFormElement, childFormElement, value, action, verified = false, skipVerification = false) {
     const parentConcept = parentFormElement.concept;
     const observations = this.getObservation(parentConcept);
     const repeatableObservations = _lodash.default.isEmpty(observations) ? new _RepeatableQuestionGroup.default() : observations.getValueWrapper();
@@ -401,7 +432,7 @@ class ObservationsHolder {
     }
 
     const childObservations = repeatableObservations.getGroupObservationAtIndex(index);
-    this.updateChildObservations(childFormElement, childObservations, value);
+    this.updateChildObservations(childFormElement, childObservations, value, verified, skipVerification);
     repeatableObservations.updateGroupObservationsAtIndex(childObservations, index);
 
     this._removeExistingObs(parentConcept);

package/dist/PhoneNumber.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _lodash = require("lodash");
+
 class PhoneNumber {
   constructor(phoneNumber, verified = false, skipVerification = false) {
     this.phoneNumber = phoneNumber;
@@ -20,7 +22,7 @@ class PhoneNumber {
   }
 
   static fromObs(obs) {
-    return new PhoneNumber(obs.phoneNumber, obs.verified, obs.skipVerification);
+    return (0, _lodash.get)(obs, 'phoneNumber', null) ? new PhoneNumber(obs.phoneNumber, obs.verified, obs.skipVerification) : null;
   }
 
   getValue() {

package/dist/observation/QuestionGroup.js

@@ -51,7 +51,8 @@ class QuestionGroup {
       const observation = new _Observation.default();
       observation.concept = QuestionGroup.constructConceptModel(concept);
       const value = valueJSON.answer || valueJSON.value;
-      observation.valueJSON = observation.concept.getValueWrapperFor(value);
+      const valueToPass = _lodash.default.includes([_Concept.default.dataType.Duration, _Concept.default.dataType.PhoneNumber, _Concept.default.dataType.Id], concept.datatype) ? valueJSON : value;
+      observation.valueJSON = observation.concept.getValueWrapperFor(valueToPass);
       return observation;
     });
 

package/package.json

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