From f075449018149e14ab4f38dc4afda7cfcd970317 Mon Sep 17 00:00:00 2001 From: novysan87 Date: Fri, 7 Aug 2026 08:49:44 +0700 Subject: [PATCH] fix(classes): halaman Kelas default TA berjalan (36 kelas) + filter pilih tahun ajaran --- app/Http/Controllers/SchoolClassController.php | 3 +++ resources/views/classes/index.blade.php | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/app/Http/Controllers/SchoolClassController.php b/app/Http/Controllers/SchoolClassController.php index d4b2682..7f251af 100644 --- a/app/Http/Controllers/SchoolClassController.php +++ b/app/Http/Controllers/SchoolClassController.php @@ -23,9 +23,11 @@ class SchoolClassController extends Controller public function index(Request $request): View { $search = trim((string) $request->get('search')); + $academicYearId = $request->integer('academic_year_id') ?: null; $classes = SchoolClass::with(['academicYear', 'department']) ->withCount(['students', 'academicHistories']) + ->when($academicYearId, fn ($query) => $query->where('academic_year_id', $academicYearId), fn ($query) => $query->forActiveAcademicYear()) ->when($search !== '', function ($query) use ($search) { $query->where('name', 'like', "%{$search}%") ->orWhere('level', 'like', "%{$search}%") @@ -38,6 +40,7 @@ class SchoolClassController extends Controller return view('classes.index', [ 'classes' => $classes, 'search' => $search, + 'academicYearId' => $academicYearId, 'academicYears' => AcademicYear::orderByDesc('start_year')->orderByDesc('end_year')->get(), 'importPreview' => $request->session()->get('class_import_preview'), 'importReferenceData' => $this->importReferenceData(), diff --git a/resources/views/classes/index.blade.php b/resources/views/classes/index.blade.php index 17cce5f..3a5a2a4 100644 --- a/resources/views/classes/index.blade.php +++ b/resources/views/classes/index.blade.php @@ -162,6 +162,15 @@
+
+ + +
Reset