From 44b7c7294b35351d0cc3d4b41bd30ae37599f0cc Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Fri, 3 Jan 2025 03:33:30 +0800 Subject: [PATCH] Admin Workflow - New UI for Admin to go through questions and answers (update) --- .../Modules/Exports/Services/ExportsQuestionsAnswers.php | 4 ++-- .../sections/QuestionAnswerSectionComponent.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsQuestionsAnswers.php b/app/Classes/Modules/Exports/Services/ExportsQuestionsAnswers.php index 68b6f5da..6c12713e 100644 --- a/app/Classes/Modules/Exports/Services/ExportsQuestionsAnswers.php +++ b/app/Classes/Modules/Exports/Services/ExportsQuestionsAnswers.php @@ -85,10 +85,10 @@ class ExportsQuestionsAnswers implements FromQuery, WithHeadings, WithHeadingRow if ($nextId) { $temp = QAUserAnswerSelected::where('reference', '=', $userAnswer->reference)->where('id', '>', $userAnswer->id) - ->where('id', '<', $nextId)->get(); + ->where('id', '<', $nextId)->withTrashed()->get(); } else{ - $temp = QAUserAnswerSelected::where('reference', '=', $userAnswer->reference)->where('id', '>', $userAnswer->id)->get(); + $temp = QAUserAnswerSelected::where('reference', '=', $userAnswer->reference)->where('id', '>', $userAnswer->id)->withTrashed()->get(); } foreach ($temp as $relatedAnswer) { diff --git a/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue b/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue index 5b41892b..fdab0db0 100644 --- a/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue +++ b/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue @@ -101,7 +101,7 @@ }, options: { 'per_page': 10, - 'order_by': {column: 'created_at', DESC: false}, + 'order_by': {column: 'created_at', DESC: true}, 'with_answers': "", }, currentKey: 1,