From 7cb8d32729a7182b0ef2298d20119b3bd40e2065 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Thu, 12 Mar 2026 10:33:19 +0700 Subject: [PATCH] refactor: Simplify attendance schedule query logic, update course ID parameter name, remove attendance badge, and adjust attendance resource navigation sort. --- .../Learning/Attendances/AttendanceResource.php | 2 +- .../Attendances/Pages/ManageAttendances.php | 8 ++------ .../attendances/pages/list-attendances.blade.php | 14 ++------------ 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/app/Filament/Resources/Learning/Attendances/AttendanceResource.php b/app/Filament/Resources/Learning/Attendances/AttendanceResource.php index 67fbeab..45bf3f4 100644 --- a/app/Filament/Resources/Learning/Attendances/AttendanceResource.php +++ b/app/Filament/Resources/Learning/Attendances/AttendanceResource.php @@ -19,7 +19,7 @@ class AttendanceResource extends Resource protected static ?string $navigationLabel = 'Presensi'; - protected static ?int $navigationSort = 20; + protected static ?int $navigationSort = 3; protected static ?string $modelLabel = 'Presensi'; diff --git a/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php b/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php index 54df747..3ab7f1c 100644 --- a/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php +++ b/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php @@ -33,12 +33,8 @@ public function getSchedules() return CourseSchedule::query() ->where('day_of_week', $today) - ->whereHas('course', function ($q) use ($semester, $student) { - $q->where('semester', $semester) - ->whereHas('studyGroups', function ($sq) use ($student) { - $sq->where('leader_id', $student->id) - ->orWhereHas('students', fn ($asq) => $asq->where('students.id', $student->id)); - }); + ->whereHas('course', function ($q) use ($semester) { + $q->where('semester', $semester); }) ->with(['course.lecturer', 'attendances' => function ($q) use ($student) { $q->where('student_id', $student->id) diff --git a/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php b/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php index f2d7128..db2b94e 100644 --- a/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php +++ b/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php @@ -14,16 +14,6 @@ $card->is_attended, ])> - @if ($card->is_attended) -
- - - Hadir - -
- @endif -

-
+
!$card->is_attended, @@ -79,7 +69,7 @@ class="text-[10px] font-bold uppercase text-gray-400 tracking-widest leading-non
!$card->is_attended, 'border-primary-200 dark:border-primary-800' => $card->is_attended, ])>