From 46f31d18d5272ff42299a85da9e52a8cffeeaa03 Mon Sep 17 00:00:00 2001 From: "Siwat T." Date: Tue, 17 Sep 2024 00:21:56 +0700 Subject: [PATCH] fix: hide verify button for attendee (#4) --- app/Http/Controllers/ProjectController.php | 2 +- resources/js/Components/ProjectClosureStatus.vue | 2 +- resources/js/Pages/ProjectClosureVerify.vue | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 9d0b30c..fdb32ad 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -148,7 +148,7 @@ public function show(Request $request, Project $project) { ); $project->shouldVerify = ( $project->canVerify() - and $project->participants->where('user_id', Auth::id())->isNotEmpty() + and $project->participants->where('user_id', Auth::id())->where('type', '!=', 'attendee')->isNotEmpty() and ($project->closure_status != ProjectClosureStatus::REJECTED_AND_RESUBMIT) ); diff --git a/resources/js/Components/ProjectClosureStatus.vue b/resources/js/Components/ProjectClosureStatus.vue index e2695c3..9b85f97 100644 --- a/resources/js/Components/ProjectClosureStatus.vue +++ b/resources/js/Components/ProjectClosureStatus.vue @@ -51,6 +51,6 @@ const organizerPercentage = computed(() => { }); const staff = computed(() => props.participants.filter(p => p.type === 'staff')); const staffPercentage = computed(() => { - return Math.round(staff.filter(p => p.verify_status).length / staff.length * 100); + return Math.round(staff.value.filter(p => p.verify_status).length / staff.value.length * 100); }); diff --git a/resources/js/Pages/ProjectClosureVerify.vue b/resources/js/Pages/ProjectClosureVerify.vue index 83f482b..fc820bc 100644 --- a/resources/js/Pages/ProjectClosureVerify.vue +++ b/resources/js/Pages/ProjectClosureVerify.vue @@ -76,7 +76,7 @@ - +

@@ -133,7 +133,8 @@

-
+

กรุณาตรวจสอบรายชื่อนิสิตผู้เกี่ยวข้องข้างต้น