avniproject/avni-client#1571 | Fix display of observations when the s…

…ame concept is used both within a QuestionGroup and outside in the same FormElementGroup
avniproject · Jan 30, 2025 · 9ec2c7e · 9ec2c7e
1 parent eaf34fe
commit 9ec2c7e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/application/Form.js b/src/application/Form.js
@@ -321,11 +321,11 @@ class Form extends BaseEntity {
             })
         );
         const orderedFormElements = _.sortBy(childFormElements, fe => fe.displayOrder);
-        _.forEach(orderedFormElements, (formElement) => this.addSortedObservations(formElement, observations, orderedChildObs));
+        _.forEach(orderedFormElements, (formElement) => this.addSortedObservations(formElement, observations, orderedChildObs, true));
         return orderedChildObs;
     }
 
-    addSortedObservations(formElement, observations, orderedObservations) {
+    addSortedObservations(formElement, observations, orderedObservations, forQGChildren = false) {
         const concept = formElement.concept;
         const foundObs = observations.find((obs) => obs.concept.uuid === concept.uuid);
         if (!_.isNil(foundObs) && concept.isQuestionGroup()) {
@@ -340,7 +340,7 @@ class Form extends BaseEntity {
                 orderedObservations.push(clonedObs);
             }
         } else {
-            if (!_.isNil(foundObs)) {
+            if (!_.isNil(foundObs) && (_.isNil(formElement.groupUuid) || forQGChildren)) {
                 foundObs.styles = formElement.styles;
                 orderedObservations.push(foundObs);
             }