fix(classes): halaman Kelas default TA berjalan (36 kelas) + filter pilih tahun ajaran

2026-08-07 08:49:44 +07:00
parent 830405a747
commit f075449018
2 changed files with 12 additions and 0 deletions
@@ -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(),