From 4a22b56774354fe2aaee4ddc0004e26ccf69ebeb Mon Sep 17 00:00:00 2001 From: himeshr Date: Fri, 10 May 2024 13:24:34 +0530 Subject: [PATCH] #1221 | Handle Repeatable Question Group media observations --- src/dataEntryApp/components/Observations.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/dataEntryApp/components/Observations.js b/src/dataEntryApp/components/Observations.js index 09321b7e6..804c1a737 100644 --- a/src/dataEntryApp/components/Observations.js +++ b/src/dataEntryApp/components/Observations.js @@ -113,12 +113,17 @@ function initMediaObservations(observations) { const mediaObservations = [ ...observations.filter(obs => includes([Concept.dataType.Image, Concept.dataType.Video, Concept.dataType.File], obs.concept.datatype)) ]; - //TODO handle Repeatable Question Group media observations observations .filter(obs => obs.concept.isQuestionGroup()) - .map( - qgObservation => qgObservation.valueJSON.groupObservations && mediaObservations.push(...qgObservation.valueJSON.groupObservations) - ); + .forEach(qgObservation => { + if (qgObservation.valueJSON.repeatableObservations) { + qgObservation.valueJSON.repeatableObservations.forEach( + rqg => rqg.groupObservations && mediaObservations.push(...rqg.groupObservations) + ); + } else { + qgObservation.valueJSON.groupObservations && mediaObservations.push(...qgObservation.valueJSON.groupObservations); + } + }); return mediaObservations; }