Merge pull request #400 from beda-software/readonly-qrform-choicecolumn

Fix getting display for readonly qrform choice and reference with ch…
beda-software · Dec 5, 2024 · 64b8fcb · 64b8fcb
2 parents f6c7392 + 348b976
commit 64b8fcb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/components/BaseQuestionnaireResponseForm/readonly-widgets/choice.tsx b/src/components/BaseQuestionnaireResponseForm/readonly-widgets/choice.tsx
@@ -8,7 +8,7 @@ import s from './ReadonlyWidgets.module.scss';
 import { S } from './ReadonlyWidgets.styles';
 
 export function QuestionChoice({ parentPath, questionItem }: QuestionItemProps) {
-    const { linkId, text, repeats, hidden } = questionItem;
+    const { linkId, text, repeats, hidden, choiceColumn } = questionItem;
     const fieldName = repeats ? [...parentPath, linkId] : [...parentPath, linkId, 0];
     const { value } = useFieldController(fieldName, questionItem);
 
@@ -20,14 +20,14 @@ export function QuestionChoice({ parentPath, questionItem }: QuestionItemProps)
         return (
             <S.Question className={classNames(s.question, s.row, 'form__question')}>
                 <span className={s.questionText}>{text}</span>
-                <span className={s.answer}>{getArrayDisplay(value) || '-'}</span>
+                <span className={s.answer}>{getArrayDisplay(value, choiceColumn) || '-'}</span>
             </S.Question>
         );
     } else {
         return (
             <S.Question className={classNames(s.question, s.row, 'form__question')}>
                 <span className={s.questionText}>{text}</span>
-                <span className={s.answer}>{getDisplay(value?.value) || '-'}</span>
+                <span className={s.answer}>{getDisplay(value?.value, choiceColumn) || '-'}</span>
             </S.Question>
         );
     }

diff --git a/src/components/BaseQuestionnaireResponseForm/readonly-widgets/reference.tsx b/src/components/BaseQuestionnaireResponseForm/readonly-widgets/reference.tsx
@@ -10,20 +10,20 @@ import { AnswerReferenceProps, useAnswerReference } from '../widgets/reference';
 function QuestionReferenceUnsafe<R extends Resource = any, IR extends Resource = any>(
     props: AnswerReferenceProps<R, IR>,
 ) {
-    const { fieldController, text, repeats } = useAnswerReference(props);
+    const { fieldController, text, repeats, choiceColumn } = useAnswerReference(props);
 
     if (repeats) {
         return (
             <S.Question className={classNames(s.question, s.row, 'form__question')}>
                 <span className={s.questionText}>{text}</span>
-                <span className={s.answer}>{getArrayDisplay(fieldController.value?.value) || '-'}</span>
+                <span className={s.answer}>{getArrayDisplay(fieldController.value?.value, choiceColumn) || '-'}</span>
             </S.Question>
         );
     } else {
         return (
             <S.Question className={classNames(s.question, s.row, 'form__question')}>
                 <span className={s.questionText}>{text}</span>
-                <span className={s.answer}>{getDisplay(fieldController.value?.value) || '-'}</span>
+                <span className={s.answer}>{getDisplay(fieldController.value?.value, choiceColumn) || '-'}</span>
             </S.Question>
         );
     }

diff --git a/src/components/BaseQuestionnaireResponseForm/widgets/reference.tsx b/src/components/BaseQuestionnaireResponseForm/widgets/reference.tsx
@@ -174,6 +174,7 @@ export function useAnswerReference<R extends Resource = any, IR extends Resource
         text,
         repeats,
         placeholder: entryFormat,
+        choiceColumn,
     };
 }
 

diff --git a/src/utils/questionnaire.ts b/src/utils/questionnaire.ts
@@ -71,12 +71,12 @@ export function getDisplay(
     return '';
 }
 
-export function getArrayDisplay(options?: QuestionnaireResponseItemAnswer[]): string | null {
+export function getArrayDisplay(options?: QuestionnaireResponseItemAnswer[], choiceColumn?: QuestionnaireItemChoiceColumn[]): string | null {
     if (!options) {
         return null;
     }
 
-    return options.map((v: QuestionnaireResponseItemAnswer) => getDisplay(v.value)).join(', ');
+    return options.map((v: QuestionnaireResponseItemAnswer) => getDisplay(v.value, choiceColumn)).join(', ');
 }
 
 export function questionnaireItemsToValidationSchema(questionnaireItems: QuestionnaireItem[]) {
-Original file line number
+Diff line change
@@ Expand Up @@
             text,
             repeats,
             placeholder: entryFormat,
+            choiceColumn,
         };
     }
@@ Expand Down @@