Skip to content

Commit

Permalink
#1133 | Handle preview of media content within QuestionGroups in Obse…
Browse files Browse the repository at this point in the history
…rvations Summary view
  • Loading branch information
himeshr committed Apr 4, 2024
1 parent aa97c66 commit fdce203
Showing 1 changed file with 21 additions and 7 deletions.
28 changes: 21 additions & 7 deletions src/dataEntryApp/components/Observations.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,26 @@ function renderSingleQuestionGroup(
);
}

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)
);
return mediaObservations;
}

const Observations = ({ observations, additionalRows, form, customKey, highlight }) => {
const i = new i18n();
const { t } = useTranslation();
Expand Down Expand Up @@ -324,13 +344,7 @@ const Observations = ({ observations, additionalRows, form, customKey, highlight
const orderedObs = isNotAssociatedWithForm
? observations
: form.orderObservationsPerFEG(observations);

const mediaObservations = observations.filter(obs =>
includes(
[Concept.dataType.Image, Concept.dataType.Video, Concept.dataType.File],
obs.concept.datatype
)
);
const mediaObservations = initMediaObservations(observations);

React.useEffect(() => {
refreshSignedUrlsForMedia().then(mediaDataList => setMediaDataList(mediaDataList));
Expand Down

0 comments on commit fdce203

Please sign in to comment.