From 3d1d1cce11fd7959556d1774292c12171e17800c Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 21 Nov 2023 19:41:30 +0800 Subject: [PATCH] Fix feedback answer text not displaying correctly at admin dashboard --- app/Classes/Modules/Exports/Services/ExportsFeedback.php | 2 +- app/Http/Resources/HelpMenuQuestionsAnswersResource.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsFeedback.php b/app/Classes/Modules/Exports/Services/ExportsFeedback.php index 1e07a854..e83930d4 100644 --- a/app/Classes/Modules/Exports/Services/ExportsFeedback.php +++ b/app/Classes/Modules/Exports/Services/ExportsFeedback.php @@ -64,7 +64,7 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa $userAnswer->question->questionnaire->version, $userAnswer->question->questionnaire->description, $userAnswer->question->question_text, - $userAnswer->free_text_answer, + $answer->display_text, $answer->value, $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system), $user ? $user_marking : $source->marking, diff --git a/app/Http/Resources/HelpMenuQuestionsAnswersResource.php b/app/Http/Resources/HelpMenuQuestionsAnswersResource.php index 1136ed9b..0d74319a 100644 --- a/app/Http/Resources/HelpMenuQuestionsAnswersResource.php +++ b/app/Http/Resources/HelpMenuQuestionsAnswersResource.php @@ -33,7 +33,7 @@ class HelpMenuQuestionsAnswersResource extends JsonResource 'question_id' => $this->question_id, 'questionnaire' => new HelpMenuQuestionnaireSetsResource($this->question->questionnaire), 'question_text' => $question ? $question->question_text : null, - 'free_text_answer' => $this->free_text_answer, + 'free_text_answer' => $answerOption ? $answerOption->display_text : null, 'answer_value' => $answerOption ? $answerOption->value : null, 'source_system' => $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system), 'source_marking' => $user ? $user_marking : $source->marking,