openchs-models 1.11.2 → 1.11.3

package/dist/AbstractEncounter.js

@@ -113,12 +113,19 @@ class AbstractEncounter extends _BaseEntity.default {
     };
   }
 
-  findObservation(conceptNameOrUuid) {
-    return _lodash.default.find(this.observations, observation => {
+  findObservation(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observations = _lodash.default.isNil(parentConceptNameOrUuid) ? this.observations : this.findGroupedObservation(parentConceptNameOrUuid);
+    return _lodash.default.find(observations, observation => {
       return observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
     });
   }
 
+  findGroupedObservation(parentConceptNameOrUuid) {
+    const groupedObservations = _lodash.default.find(this.observations, observation => observation.concept.name === parentConceptNameOrUuid || observation.concept.uuid === parentConceptNameOrUuid);
+
+    return _lodash.default.isEmpty(groupedObservations) ? [] : groupedObservations.getValue();
+  }
+
   findCancelEncounterObservation(conceptNameOrUuid) {
     return _lodash.default.find(this.cancelObservations, observation => {
       return observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
@@ -130,13 +137,13 @@ class AbstractEncounter extends _BaseEntity.default {
     return _lodash.default.isEmpty(observationForConcept) ? observationForConcept : observationForConcept.getReadableValue();
   }
 
-  getObservationValue(conceptNameOrUuid) {
-    const observationForConcept = this.findObservation(conceptNameOrUuid);
+  getObservationValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationForConcept = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
     return _lodash.default.isEmpty(observationForConcept) ? observationForConcept : observationForConcept.getValue();
   }
 
-  getObservationReadableValue(conceptNameOrUuid) {
-    const observationForConcept = this.findObservation(conceptNameOrUuid);
+  getObservationReadableValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationForConcept = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
     return _lodash.default.isEmpty(observationForConcept) ? observationForConcept : observationForConcept.getReadableValue();
   }
 

package/dist/Individual.js

@@ -288,7 +288,7 @@ class Individual extends _BaseEntity.default {
 
   get nameStringWithUniqueAttribute() {
     if (this.subjectType.name === 'Farmer') {
-      const mobileNumber = this.getObservationReadableValue('Mobile Number');
+      const mobileNumber = this.getObservationReadableValue('Mobile Number', null);
       const numberToDisplay = mobileNumber ? `(${mobileNumber})` : '';
       return `${this.nameString} ${numberToDisplay}`;
     } else {
@@ -544,14 +544,21 @@ class Individual extends _BaseEntity.default {
     }
   }
 
-  findObservation(conceptNameOrUuid) {
-    return _lodash.default.find(this.observations, observation => {
+  findObservation(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observations = _lodash.default.isNil(parentConceptNameOrUuid) ? this.observations : this.findGroupedObservation(parentConceptNameOrUuid);
+    return _lodash.default.find(observations, observation => {
       return observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
     });
   }
 
-  getObservationValue(conceptNameOrUuid) {
-    const observationForConcept = this.findObservation(conceptNameOrUuid);
+  findGroupedObservation(parentConceptNameOrUuid) {
+    const groupedObservations = _lodash.default.find(this.observations, observation => observation.concept.name === parentConceptNameOrUuid || observation.concept.uuid === parentConceptNameOrUuid);
+
+    return _lodash.default.isEmpty(groupedObservations) ? [] : groupedObservations.getValue();
+  }
+
+  getObservationValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationForConcept = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
     return _lodash.default.isEmpty(observationForConcept) ? observationForConcept : observationForConcept.getValue();
   }
 
@@ -751,8 +758,8 @@ class Individual extends _BaseEntity.default {
     }
   }
 
-  getObservationReadableValue(conceptNameOrUuid) {
-    const observationForConcept = this.findObservation(conceptNameOrUuid);
+  getObservationReadableValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationForConcept = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
     return _lodash.default.isEmpty(observationForConcept) ? observationForConcept : observationForConcept.getReadableValue();
   }
 

package/dist/ObservationsHolder.js

@@ -151,7 +151,20 @@ class ObservationsHolder {
         this.removeNonApplicableAnswers(fe, fe.isSingleSelect());
       }
     });
-    return _lodash.default.flatten(inApplicableFormElements.map(fe => _lodash.default.remove(this.observations, obs => obs.concept.uuid === fe.concept.uuid)));
+    return _lodash.default.flatten(inApplicableFormElements.map(fe => this._removeObs(fe, allFormElements)));
+  }
+
+  _removeObs(formElement, allFormElements) {
+    if (formElement.isQuestionGroup()) {
+      const parentFormElement = _lodash.default.find(allFormElements, ({
+        uuid
+      }) => formElement.groupUuid === uuid);
+
+      const parentObservation = this.getObservation(parentFormElement.concept);
+      return _lodash.default.isNil(parentObservation) ? [] : parentObservation.getValueWrapper().removeExistingObs(formElement.concept);
+    } else {
+      return _lodash.default.remove(this.observations, obs => obs.concept.uuid === formElement.concept.uuid);
+    }
   }
 
   removeNonApplicableAnswers(fe, isSingleSelect) {
@@ -180,7 +193,16 @@ class ObservationsHolder {
 
       if (!_lodash.default.isNil(value)) {
         const concept = fe.concept;
-        concept.isCodedConcept() ? this.addOrUpdateCodedObs(concept, value, fe.isSingleSelect()) : this.addOrUpdatePrimitiveObs(concept, value);
+
+        if (fe.isQuestionGroup()) {
+          const parentFormElement = _lodash.default.find(applicableFormElements, ({
+            uuid
+          }) => fe.groupUuid === uuid);
+
+          this.updateGroupQuestion(_lodash.default.get(parentFormElement, 'concept'), concept, value, fe);
+        } else {
+          concept.isCodedConcept() ? this.addOrUpdateCodedObs(concept, value, fe.isSingleSelect()) : this.addOrUpdatePrimitiveObs(concept, value);
+        }
       }
     });
   }

package/dist/ProgramEnrolment.js

@@ -245,11 +245,11 @@ class ProgramEnrolment extends _BaseEntity.default {
     };
   }
 
-  findObservationInEntireEnrolment(conceptNameOrUuid, currentEncounter, latest = false) {
+  findObservationInEntireEnrolment(conceptNameOrUuid, currentEncounter, latest = false, parentConceptNameOrUuid) {
     let encounters = _lodash.default.chain(this.getEncounters()).filter(enc => currentEncounter ? enc.uuid !== currentEncounter.uuid : true).concat(currentEncounter).compact().sortBy(enc => enc.encounterDateTime).value();
 
     encounters = latest ? _lodash.default.reverse(encounters) : encounters;
-    return this._findObservationFromEntireEnrolment(conceptNameOrUuid, encounters, true);
+    return this._findObservationFromEntireEnrolment(conceptNameOrUuid, encounters, true, parentConceptNameOrUuid);
   }
 
   observationExistsInEntireEnrolment(conceptNameOrUuid, currentEncounter) {
@@ -268,10 +268,10 @@ class ProgramEnrolment extends _BaseEntity.default {
     return this._findObservationFromEntireEnrolment(conceptNameOrUuid, encounters, checkInEnrolment);
   }
 
-  findLatestObservationFromPreviousEncounters(conceptNameOrUuid, currentEncounter) {
+  findLatestObservationFromPreviousEncounters(conceptNameOrUuid, currentEncounter, parentConceptNameOrUuid) {
     const encounters = _lodash.default.chain(this.getEncounters()).filter(enc => enc.encounterDateTime).filter(enc => enc.encounterDateTime < currentEncounter.encounterDateTime).value();
 
-    return this._findObservationFromEntireEnrolment(conceptNameOrUuid, encounters, false);
+    return this._findObservationFromEntireEnrolment(conceptNameOrUuid, encounters, false, parentConceptNameOrUuid);
   }
 
   findLatestPreviousEncounterWithValueForConcept(currentEncounter, conceptNameOrUuid, valueConceptName) {
@@ -284,24 +284,24 @@ class ProgramEnrolment extends _BaseEntity.default {
     return null;
   }
 
-  _encounterHasObsForConcept(encounter, conceptNameOrUuid) {
-    const observation = encounter.getObservationValue(conceptNameOrUuid);
+  _encounterHasObsForConcept(encounter, conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observation = encounter.getObservationValue(conceptNameOrUuid, parentConceptNameOrUuid);
     return !_lodash.default.isNil(observation);
   }
 
-  findLatestPreviousEncounterWithObservationForConcept(currentEncounter, conceptNameOrUuid) {
+  findLatestPreviousEncounterWithObservationForConcept(currentEncounter, conceptNameOrUuid, parentConceptNameOrUuid) {
     const encounters = _lodash.default.chain(this.getEncounters()).filter(enc => enc.encounterDateTime).filter(enc => enc.encounterDateTime < currentEncounter.encounterDateTime).value();
 
     for (let i = 0; i < encounters.length; i++) {
-      if (this._encounterHasObsForConcept(encounters[i], conceptNameOrUuid)) return encounters[i];
+      if (this._encounterHasObsForConcept(encounters[i], conceptNameOrUuid, parentConceptNameOrUuid)) return encounters[i];
     }
 
     return null;
   }
 
-  findObservationInLastEncounter(conceptNameOrUuid, currentEncounter) {
+  findObservationInLastEncounter(conceptNameOrUuid, currentEncounter, parentConceptNameOrUuid) {
     const lastEncounter = this.findLastEncounterOfType(currentEncounter, _lodash.default.get(currentEncounter, 'encounterType'));
-    return lastEncounter ? lastEncounter.findObservation(conceptNameOrUuid) : null;
+    return lastEncounter ? lastEncounter.findObservation(conceptNameOrUuid, parentConceptNameOrUuid) : null;
   }
 
   findLastEncounterOfType(currentEncounter, encounterTypes = []) {
@@ -323,17 +323,17 @@ class ProgramEnrolment extends _BaseEntity.default {
     return observation.getValueWrapper().hasValue(answerUuid);
   }
 
-  _findObservationFromEntireEnrolment(conceptNameOrUuid, encounters, checkInEnrolment = true) {
-    return this._findObservationWithDateFromEntireEnrolment(conceptNameOrUuid, encounters, checkInEnrolment).observation;
+  _findObservationFromEntireEnrolment(conceptNameOrUuid, encounters, checkInEnrolment = true, parentConceptNameOrUuid) {
+    return this._findObservationWithDateFromEntireEnrolment(conceptNameOrUuid, encounters, checkInEnrolment, parentConceptNameOrUuid).observation;
   }
 
-  _findObservationWithDateFromEntireEnrolment(conceptNameOrUuid, encounters, checkInEnrolment = true) {
+  _findObservationWithDateFromEntireEnrolment(conceptNameOrUuid, encounters, checkInEnrolment = true, parentConceptNameOrUuid) {
     let observation;
     let encounter;
 
     for (let i = 0; i < encounters.length; i++) {
       encounter = encounters[i];
-      observation = encounters[i].findObservation(conceptNameOrUuid);
+      observation = encounters[i].findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
       if (!_lodash.default.isNil(observation)) return {
         observation: observation,
         date: encounter.encounterDateTime
@@ -341,7 +341,7 @@ class ProgramEnrolment extends _BaseEntity.default {
     }
 
     if (checkInEnrolment) return {
-      observation: this.findObservation(conceptNameOrUuid),
+      observation: this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid),
       date: this.enrolmentDateTime
     };
     return {};
@@ -352,12 +352,19 @@ class ProgramEnrolment extends _BaseEntity.default {
     return obs ? obs.getReadableValue() : undefined;
   }
 
-  findObservation(conceptNameOrUuid) {
-    return _lodash.default.find(this.observations, observation => {
+  findObservation(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observations = _lodash.default.isNil(parentConceptNameOrUuid) ? this.observations : this.findGroupedObservation(parentConceptNameOrUuid);
+    return _lodash.default.find(observations, observation => {
       return observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
     });
   }
 
+  findGroupedObservation(parentConceptNameOrUuid) {
+    const groupedObservations = _lodash.default.find(this.observations, observation => observation.concept.name === parentConceptNameOrUuid || observation.concept.uuid === parentConceptNameOrUuid);
+
+    return _lodash.default.isEmpty(groupedObservations) ? [] : groupedObservations.getValue();
+  }
+
   findExitObservation(conceptNameOrUuid) {
     return _lodash.default.find(this.programExitObservations, observation => observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid);
   }
@@ -428,13 +435,13 @@ class ProgramEnrolment extends _BaseEntity.default {
   } //get has been taken by the prototype
 
 
-  getObservationValue(conceptNameOrUuid) {
-    const observationValue = this.findObservation(conceptNameOrUuid);
+  getObservationValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationValue = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
     return _lodash.default.isEmpty(observationValue) ? undefined : observationValue.getValue();
   }
 
-  getObservationReadableValue(conceptNameOrUuid) {
-    const observationValue = this.findObservation(conceptNameOrUuid);
+  getObservationReadableValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationValue = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
     return _lodash.default.isNil(observationValue) ? undefined : observationValue.getReadableValue();
   }
 

package/dist/observation/QuestionGroup.js

@@ -81,7 +81,7 @@ class QuestionGroup {
   }
 
   removeExistingObs(concept) {
-    _lodash.default.remove(this.groupObservations, obs => obs.concept.uuid === concept.uuid);
+    return _lodash.default.remove(this.groupObservations, obs => obs.concept.uuid === concept.uuid);
   }
 
   getValueForConcept(concept) {

package/package.json

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