Merge remote-tracking branch 'origin/master'

avniproject · Apr 4, 2024 · d8f1c6e · d8f1c6e
2 parents 799a6df + 13ca4c4
commit d8f1c6e
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 34 deletions.
diff --git a/src/common/subjectModelMapper.js b/src/common/subjectModelMapper.js
@@ -50,12 +50,12 @@ export const mapIndividual = individualDetails => {
   return individual;
 };
 
-export const mapObservations = observations => {
+export function mapObservations(observations) {
   if (observations)
     return observations.map(observation => {
       return mapObservation(observation);
     });
-};
+}
 
 function getAnswers(answersJson) {
   return map(answersJson, answerJson => {
@@ -84,7 +84,11 @@ export const mapConcept = conceptJson => {
   return concept;
 };
 
-export const mapObservation = observationJson => {
+function looksLikeRepeatableQuestionGroupValue(value) {
+  return _.isArrayLike(value) && value.length > 1 && _.isArrayLike(value[0]);
+}
+
+export function mapObservation(observationJson) {
   if (observationJson) {
     const observation = new Observation();
     const concept = mapConcept(observationJson.concept);
@@ -96,7 +100,7 @@ export const mapObservation = observationJson => {
     observationJson.location && addressLevelService.addAddressLevel(observationJson.location);
     let value;
     if (concept.isQuestionGroup()) {
-      if (_.isArrayLike(observationJson.value)) {
+      if (looksLikeRepeatableQuestionGroupValue(observationJson.value)) {
         //RepeatableQuestionGroup
         const repeatableQuestionGroupObservations = _.map(
           observationJson.value,
@@ -115,7 +119,7 @@ export const mapObservation = observationJson => {
     observation.valueJSON = value;
     return observation;
   }
-};
+}
 
 //subject Dashboard profile Tab
 export const mapProfile = subjectProfile => {
@@ -301,7 +305,7 @@ export const mapEncounterType = encounterType => {
   return General.assignFields(encounterType, new EncounterType(), ["name", "uuid"]);
 };
 
-// general tab subject Dashbord
+// general tab subject Dashboard
 export const mapGeneral = subjectGeneral => {
   if (subjectGeneral && subjectGeneral.encounters) {
     return subjectGeneral.encounters.map(encounters => {

diff --git a/src/dataEntryApp/components/QuestionGroupFormElement.js b/src/dataEntryApp/components/QuestionGroupFormElement.js
@@ -2,17 +2,10 @@ import React, { Fragment } from "react";
 import { filter, includes, map, sortBy, get } from "lodash";
 import { FormElement } from "./FormElement";
 import { Concept, QuestionGroup } from "avni-models";
-
-function getChildObservationValue(concept, questionGroupObservation) {
-  const qgObservationValue = questionGroupObservation
-    ? questionGroupObservation.getValueWrapper()
-    : new QuestionGroup();
-  const childObs = qgObservationValue.findObservation(concept);
-  return childObs && childObs.getValueWrapper().getValue();
-}
+import _ from "lodash";
 
 function getQuestionGroupLabel(formElement, isRepeatable, repeatableIndex) {
-  if (isRepeatable) return `${formElement.name} - ${repeatableIndex}`;
+  if (isRepeatable) return `${formElement.name} - ${repeatableIndex + 1}`;
   return formElement.name;
 }
 
@@ -23,7 +16,7 @@ export default function QuestionGroupFormElement({
   filteredFormElements,
   updateObs,
   isRepeatable = false,
-  repeatableIndex
+  questionGroupIndex
 }) {
   const allChildren = sortBy(
     filter(filteredFormElements, ffe => get(ffe, "group.uuid") === formElement.uuid && !ffe.voided),
@@ -43,18 +36,23 @@ export default function QuestionGroupFormElement({
         concept.datatype
       )
   );
-  const childObservations = obsHolder.findObservation(formElement.concept);
+  const observation = obsHolder.findObservation(formElement.concept);
+  let questionGroup;
+  if (_.isNil(observation)) questionGroup = new QuestionGroup();
+  else if (formElement.repeatable)
+    questionGroup = observation.getValueWrapper().getGroupObservationAtIndex(questionGroupIndex);
+  else questionGroup = observation.getValueWrapper();
 
   return (
     <Fragment>
-      <div>{getQuestionGroupLabel(formElement, isRepeatable, repeatableIndex)}</div>
+      <div>{getQuestionGroupLabel(formElement, isRepeatable, questionGroupIndex)}</div>
       <div style={{ flexDirection: "row", alignItems: "center", marginTop: "10px" }}>
         {map(textNumericAndNotes, childFormElement => (
           <FormElement
             key={childFormElement.uuid}
             concept={childFormElement.concept}
             obsHolder={obsHolder}
-            value={getChildObservationValue(childFormElement.concept, childObservations)}
+            value={questionGroup.getValueForConcept(childFormElement.concept)}
             validationResults={validationResults}
             uuid={childFormElement.uuid}
             update={value => {
@@ -70,22 +68,22 @@ export default function QuestionGroupFormElement({
         ))}
       </div>
       <div style={{ marginRight: "15px" }}>
-        {map(otherQuestions, fe => (
-          <div key={fe.uuid} style={{ marginTop: "20px" }}>
+        {map(otherQuestions, childFormElement => (
+          <div key={childFormElement.uuid} style={{ marginTop: "20px" }}>
             <FormElement
-              concept={fe.concept}
+              concept={childFormElement.concept}
               obsHolder={obsHolder}
-              value={getChildObservationValue(fe.concept, childObservations)}
+              value={questionGroup.getValueForConcept(childFormElement.concept)}
               validationResults={validationResults}
-              uuid={fe.uuid}
+              uuid={childFormElement.uuid}
               update={value => {
-                updateObs(formElement, value, fe);
+                updateObs(formElement, value, childFormElement);
               }}
-              feIndex={fe.displayOrder}
+              feIndex={childFormElement.displayOrder}
               filteredFormElements={filteredFormElements}
               ignoreLineBreak={true}
             >
-              {fe}
+              {childFormElement}
             </FormElement>
           </div>
         ))}

diff --git a/src/dataEntryApp/components/RepeatableQuestionGroupElement.js b/src/dataEntryApp/components/RepeatableQuestionGroupElement.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { RepeatableQuestionGroup } from "openchs-models";
 import QuestionGroupFormElement from "./QuestionGroupFormElement";
+import _ from "lodash";
 
 export function RepeatableQuestionGroupElement({
   formElement,
@@ -9,8 +10,8 @@ export function RepeatableQuestionGroupElement({
   filteredFormElements,
   updateObs
 }) {
-  const childObservations = obsHolder.findObservation(formElement.concept);
-  const repeatableQuestionGroup = new RepeatableQuestionGroup(childObservations);
+  let repeatableQuestionGroup = obsHolder.findObservation(formElement.concept);
+  if (_.isNil(repeatableQuestionGroup)) repeatableQuestionGroup = new RepeatableQuestionGroup();
   return repeatableQuestionGroup.getValue().map((x, index) => {
     return (
       <QuestionGroupFormElement
@@ -20,7 +21,7 @@ export function RepeatableQuestionGroupElement({
         updateObs={updateObs}
         validationResults={validationResults}
         isRepeatable={true}
-        repeatableIndex={1}
+        questionGroupIndex={index}
         key={index}
       />
     );

diff --git a/src/dataEntryApp/services/FormElementService.js b/src/dataEntryApp/services/FormElementService.js
@@ -3,11 +3,29 @@ import { differenceWith, some, filter, flatMap, head, isEmpty, isNil, map, remov
 import { getFormElementsStatuses } from "./RuleEvaluationService";
 
 export default {
-  updateObservations(observationsHolder, formElement, value, childFormElement) {
+  updateObservations(
+    observationsHolder,
+    formElement,
+    value,
+    childFormElement,
+    questionGroupIndex = 0
+  ) {
     if (!isNil(childFormElement) && !isNil(childFormElement.groupUuid)) {
-      observationsHolder.updateGroupQuestion(formElement, childFormElement, value);
-
-      const questionGroupTypeObservation = observationsHolder.findObservation(formElement.concept);
+      if (formElement.repeatable) {
+        observationsHolder.updateRepeatableGroupQuestion(
+          questionGroupIndex,
+          formElement,
+          childFormElement,
+          value
+        );
+      } else {
+        observationsHolder.updateGroupQuestion(formElement, childFormElement, value);
+      }
+      const questionGroupTypeObservation = observationsHolder.findQuestionGroupObservation(
+        formElement.concept,
+        formElement,
+        questionGroupIndex
+      );
       let questionGroup;
       if (questionGroupTypeObservation) {
         questionGroup = questionGroupTypeObservation.getValueWrapper();