Improve public controls and dashboard student statistics

app/Http/Controllers/BrandingSettingController.php

@@ -29,10 +29,12 @@ class BrandingSettingController extends Controller
             'remove_app_logo' => ['nullable', 'boolean'],
             'remove_app_favicon' => ['nullable', 'boolean'],
             'remove_public_portal_logo' => ['nullable', 'boolean'],
+            'public_show_student_documents' => ['nullable', 'boolean'],
         ]);
 
         AppSetting::setValue('app_name', $data['app_name']);
         AppSetting::setValue('app_short_name', $data['app_short_name']);
+        AppSetting::setValue('public_show_student_documents', $request->boolean('public_show_student_documents') ? '1' : '0');
 
         $this->handleAssetUpdate($request, 'app_logo', 'branding/app-logo', (bool) ($data['remove_app_logo'] ?? false));
         $this->handleAssetUpdate($request, 'app_favicon', 'branding/app-favicon', (bool) ($data['remove_app_favicon'] ?? false));

app/Http/Controllers/DashboardController.php

@@ -7,6 +7,7 @@ use App\Models\Department;
 use App\Models\DocumentType;
 use App\Models\SchoolClass;
 use App\Models\Student;
+use Illuminate\Database\Eloquent\Builder;
 use App\Models\StudentAchievement;
 use App\Models\StudentExit;
 use App\Models\StudentTransfer;
@@ -21,7 +22,9 @@ class DashboardController extends Controller
             ->where('is_required', true)
             ->pluck('id');
 
-        $students = Student::with('documents')->get();
+        $students = Student::with('documents')
+            ->where('status', 'active')
+            ->get();
 
         $completion = $this->calculateCompletion($students, $requiredDocumentTypeIds);
 
@@ -42,24 +45,46 @@ class DashboardController extends Controller
             ->filter(fn (array $item) => $item['total'] > 0)
             ->values();
 
+        $activeAcademicYearId = AcademicYear::query()->where('is_active', true)->value('id');
+
+        $studentStatisticsByClass = SchoolClass::query()
+            ->with(['academicYear', 'department'])
+            ->when($activeAcademicYearId, fn (Builder $query) => $query->where('academic_year_id', $activeAcademicYearId))
+            ->withCount([
+                'students as active_students_count' => fn (Builder $query) => $query->where('status', 'active'),
+                'students as male_students_count' => fn (Builder $query) => $query->where('status', 'active')->where('gender', 'L'),
+                'students as female_students_count' => fn (Builder $query) => $query->where('status', 'active')->where('gender', 'P'),
+            ])
+            ->orderBy('level')
+            ->orderBy('name')
+            ->get()
+            ->filter(fn (SchoolClass $classRoom) => $classRoom->active_students_count > 0)
+            ->values();
+
         return view('dashboard', [
             'stats' => [
                 'academicYears' => AcademicYear::count(),
                 'departments' => Department::count(),
                 'classes' => SchoolClass::count(),
                 'documentTypes' => DocumentType::count(),
-                'students' => Student::count(),
+                'students' => Student::where('status', 'active')->count(),
                 'studentsDropped' => StudentExit::count(),
                 'studentsTransferred' => StudentTransfer::count(),
                 'studentsGraduated' => Student::where('status', 'graduated')->count(),
-                'studentAchievements' => StudentAchievement::count(),
+                'studentAchievements' => StudentAchievement::query()
-                'studentsWithAchievements' => StudentAchievement::distinct('student_id')->count('student_id'),
+                    ->whereHas('student', fn (Builder $query) => $query->where('status', 'active'))
+                    ->count(),
+                'studentsWithAchievements' => StudentAchievement::query()
+                    ->whereHas('student', fn (Builder $query) => $query->where('status', 'active'))
+                    ->distinct('student_id')
+                    ->count('student_id'),
                 'studentsCompleteDocuments' => $completion['complete'],
                 'studentsIncompleteDocuments' => $completion['incomplete'],
                 'studentsVerifiedDocuments' => $completion['verified_complete'],
                 'studentsUnverifiedDocuments' => $completion['verified_incomplete'],
             ],
             'studentGenderByAcademicYear' => $studentGenderByAcademicYear,
+            'studentStatisticsByClass' => $studentStatisticsByClass,
         ]);
     }
 

app/Models/AppSetting.php

@@ -35,6 +35,7 @@ class AppSetting extends Model
             'app_logo' => null,
             'app_favicon' => null,
             'public_portal_logo' => null,
+            'public_show_student_documents' => '1',
         ];
     }
 

resources/views/dashboard.blade.php

@@ -260,71 +260,44 @@
                 </div>
             </x-master-card>
 
-            <x-master-card title="Status Modul" subtitle="Modul yang sudah hidup dan siap dipakai.">
+            <x-master-card title="Statistik Siswa Perkelas" subtitle="Ringkasan jumlah siswa aktif di setiap kelas pada tahun ajaran aktif.">
-                <div class="space-y-4">
+                <div class="max-h-[38rem] space-y-4 overflow-y-auto pr-1 text-sm text-slate-600">
-                    <div class="flex items-center justify-between rounded-2xl bg-slate-50 px-4 py-3 transition hover:bg-slate-100">
+                    @forelse ($studentStatisticsByClass as $classStat)
-                        <div class="flex items-center gap-3">
+                        <div class="rounded-3xl border border-slate-200 bg-slate-50/80 px-4 py-4 shadow-sm transition hover:border-slate-300 hover:bg-white">
-                            <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-emerald-100 text-emerald-600">
+                            <div class="flex items-center justify-between gap-4">
-                                <i class="fa-solid fa-lock text-sm"></i>
+                                <div class="flex items-center gap-3 min-w-0">
+                                    <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-cyan-100 text-cyan-600 shrink-0">
+                                        <i class="fa-solid fa-chalkboard text-sm"></i>
                                     </span>
-                            <span class="text-sm text-slate-600">Auth & Login</span>
+                                    <div class="min-w-0">
+                                        <div class="font-semibold text-slate-800 truncate">{{ $classStat->name }}</div>
+                                        <div class="text-xs text-slate-400 truncate">{{ $classStat->academicYear?->name ?: '-' }} · {{ $classStat->department?->name ?: '-' }}</div>
                                     </div>
-                        <span class="inline-flex items-center gap-2 rounded-full bg-emerald-100 px-3 py-1 text-xs font-semibold text-emerald-700"><span class="h-2 w-2 rounded-full bg-emerald-500"></span>Aktif</span>
                                 </div>
-                    <div class="flex items-center justify-between rounded-2xl bg-slate-50 px-4 py-3 transition hover:bg-slate-100">
+                                <div class="rounded-full bg-slate-900 px-3 py-1 text-xs font-semibold uppercase tracking-[0.14em] text-white">Total {{ $classStat->active_students_count }}</div>
-                        <div class="flex items-center gap-3">
-                            <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-cyan-100 text-cyan-600">
-                                <i class="fa-solid fa-database text-sm"></i>
-                            </span>
-                            <span class="text-sm text-slate-600">Master Data</span>
                             </div>
-                        <span class="inline-flex items-center gap-2 rounded-full bg-emerald-100 px-3 py-1 text-xs font-semibold text-emerald-700"><span class="h-2 w-2 rounded-full bg-emerald-500"></span>Aktif</span>
+                            <div class="mt-4 grid grid-cols-2 gap-3">
+                                <div class="rounded-2xl border border-sky-100 bg-white px-4 py-3 shadow-sm">
+                                    <div class="flex items-center gap-2 text-xs font-semibold uppercase tracking-[0.14em] text-sky-500">
+                                        <i class="fa-solid fa-mars text-[11px]"></i>
+                                        <span>Laki-laki</span>
                                     </div>
-                    <div class="flex items-center justify-between rounded-2xl bg-slate-50 px-4 py-3 transition hover:bg-slate-100">
+                                    <div class="mt-2 text-2xl font-bold text-slate-900">{{ $classStat->male_students_count }}</div>
-                        <div class="flex items-center gap-3">
-                            <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-indigo-100 text-indigo-600">
-                                <i class="fa-solid fa-users text-sm"></i>
-                            </span>
-                            <span class="text-sm text-slate-600">Data Siswa</span>
                                 </div>
-                        <span class="inline-flex items-center gap-2 rounded-full bg-emerald-100 px-3 py-1 text-xs font-semibold text-emerald-700"><span class="h-2 w-2 rounded-full bg-emerald-500"></span>Aktif</span>
+                                <div class="rounded-2xl border border-rose-100 bg-white px-4 py-3 shadow-sm">
+                                    <div class="flex items-center gap-2 text-xs font-semibold uppercase tracking-[0.14em] text-rose-500">
+                                        <i class="fa-solid fa-venus text-[11px]"></i>
+                                        <span>Perempuan</span>
                                     </div>
-                    <div class="flex items-center justify-between rounded-2xl bg-slate-50 px-4 py-3 transition hover:bg-slate-100">
+                                    <div class="mt-2 text-2xl font-bold text-slate-900">{{ $classStat->female_students_count }}</div>
-                        <div class="flex items-center gap-3">
-                            <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-violet-100 text-violet-600">
-                                <i class="fa-solid fa-folder-check text-sm"></i>
-                            </span>
-                            <span class="text-sm text-slate-600">Dokumen & Verifikasi</span>
                                 </div>
-                        <span class="inline-flex items-center gap-2 rounded-full bg-emerald-100 px-3 py-1 text-xs font-semibold text-emerald-700"><span class="h-2 w-2 rounded-full bg-emerald-500"></span>Aktif</span>
                             </div>
-                    <div class="flex items-center justify-between rounded-2xl bg-slate-50 px-4 py-3 transition hover:bg-slate-100">
-                        <div class="flex items-center gap-3">
-                            <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-sky-100 text-sky-600">
-                                <i class="fa-solid fa-clock-rotate-left text-sm"></i>
-                            </span>
-                            <span class="text-sm text-slate-600">Histori Akademik</span>
                         </div>
-                        <span class="inline-flex items-center gap-2 rounded-full bg-sky-100 px-3 py-1 text-xs font-semibold text-sky-700"><span class="h-2 w-2 rounded-full bg-sky-500"></span>Siap</span>
+                    @empty
-                    </div>
+                        <div class="rounded-2xl bg-slate-50 px-4 py-4 text-sm text-slate-500">
-                    <div class="flex items-center justify-between rounded-2xl bg-slate-50 px-4 py-3 transition hover:bg-slate-100">
+                            Belum ada data siswa aktif yang bisa direkap per kelas.
-                        <div class="flex items-center gap-3">
-                            <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-lime-100 text-lime-600">
-                                <i class="fa-solid fa-arrow-trend-up text-sm"></i>
-                            </span>
-                            <span class="text-sm text-slate-600">Promosi Siswa</span>
-                        </div>
-                        <span class="inline-flex items-center gap-2 rounded-full bg-sky-100 px-3 py-1 text-xs font-semibold text-sky-700"><span class="h-2 w-2 rounded-full bg-sky-500"></span>Siap</span>
-                    </div>
-                    <div class="flex items-center justify-between rounded-2xl bg-slate-50 px-4 py-3 transition hover:bg-slate-100">
-                        <div class="flex items-center gap-3">
-                            <span class="inline-flex h-10 w-10 items-center justify-center rounded-xl bg-amber-100 text-amber-600">
-                                <i class="fa-solid fa-trophy text-sm"></i>
-                            </span>
-                            <span class="text-sm text-slate-600">Siswa Berprestasi</span>
-                        </div>
-                        <span class="inline-flex items-center gap-2 rounded-full bg-sky-100 px-3 py-1 text-xs font-semibold text-sky-700"><span class="h-2 w-2 rounded-full bg-sky-500"></span>Siap</span>
                         </div>
+                    @endforelse
                 </div>
             </x-master-card>
 

resources/views/public/student-lookup.blade.php

@@ -11,6 +11,15 @@
             return sprintf('%04d-%s-%06d', $achievement->achievement_year ?? 0, optional($achievement->achievement_date)->format('Y-m-d') ?? '0000-00-00', $achievement->id);
         })
         : collect();
+    $showPublicStudentDocuments = (\App\Models\AppSetting::getValue('public_show_student_documents', '1') === '1');
+    $publicStatusLabel = match ($student?->status) {
+        'transferred' => 'Pindah Sekolah',
+        'dropped' => 'Keluar Sekolah',
+        'graduated' => 'Lulus',
+        'inactive' => 'Nonaktif',
+        'active' => 'Aktif',
+        default => $student?->status ? ucfirst($student->status) : '-',
+    };
 @endphp
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
@@ -234,7 +243,14 @@
                                                 <div class="inline-flex items-center rounded-full bg-emerald-100 px-3 py-1 text-[11px] font-semibold uppercase tracking-[0.16em] text-emerald-700">
                                                     Data ditemukan
                                                 </div>
-                                                <h2 class="mt-3 text-2xl font-bold tracking-tight text-slate-900 sm:text-3xl">{{ $student->full_name }}</h2>
+                                                <div class="mt-3 flex flex-col gap-2 sm:flex-row sm:items-center sm:gap-3">
+                                                    <h2 class="text-2xl font-bold tracking-tight text-slate-900 sm:text-3xl">{{ $student->full_name }}</h2>
+                                                    <div class="inline-flex items-center gap-2 self-start rounded-full border border-sky-200 bg-sky-50 px-3 py-1 text-xs text-sky-700">
+                                                        <span class="font-semibold">Wali Kelas</span>
+                                                        <span class="text-slate-400">•</span>
+                                                        <span class="font-medium">{{ $student->classRoom?->homeroom_teacher ?: '-' }}</span>
+                                                    </div>
+                                                </div>
                                                 <p class="mt-2 max-w-2xl text-sm leading-6 text-slate-500">
                                                     Pencarian cocok berdasarkan {{ strtolower($matchedBy ?? 'data siswa') }} dan menampilkan ringkasan informasi siswa yang tersedia untuk publik.
                                                 </p>
@@ -271,7 +287,7 @@
                                             </div>
                                             <div class="rounded-2xl border border-slate-200 bg-slate-50 px-4 py-3">
                                                 <div class="text-[11px] font-semibold uppercase tracking-[0.16em] text-slate-400">Status</div>
-                                                <div class="mt-1 text-sm font-semibold text-slate-800">{{ ucfirst($student->status) }}</div>
+                                                <div class="mt-1 text-sm font-semibold text-slate-800">{{ $publicStatusLabel }}</div>
                                             </div>
                                         </div>
                                     </div>
@@ -332,7 +348,7 @@
                                                         <div class="font-medium text-slate-700">{{ $student->classRoom?->name ?: '-' }}</div>
 
                                                         <div class="text-xs font-semibold uppercase tracking-[0.14em] text-slate-400">Status</div>
-                                                        <div class="font-medium text-slate-700">{{ ucfirst($student->status) }}</div>
+                                                        <div class="font-medium text-slate-700">{{ $publicStatusLabel }}</div>
 
                                                         <div class="text-xs font-semibold uppercase tracking-[0.14em] text-slate-400">Masuk</div>
                                                         <div class="font-medium text-slate-700">{{ $student->entry_date?->format('d-m-Y') ?: '-' }}</div>
@@ -416,6 +432,7 @@
                                     </div>
                                 @endif
 
+                                @if ($showPublicStudentDocuments)
                                     <div class="rounded-3xl border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50 sm:p-6">
                                         <div class="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
                                             <div>
@@ -480,6 +497,7 @@
                                         </div>
                                     </div>
                                 @endif
+                            @endif
                         </div>
                     @else
                         <div class="overflow-hidden rounded-3xl border border-amber-200 bg-white shadow-sm shadow-amber-100/60">

resources/views/settings/branding.blade.php

@@ -18,6 +18,21 @@
                 </div>
             </div>
 
+            <div class="rounded-3xl border border-slate-200 bg-slate-50 p-5">
+                <div class="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
+                    <div>
+                        <h3 class="text-sm font-semibold text-slate-900">Kontrol Portal Publik</h3>
+                        <p class="mt-1 text-xs text-slate-500">Atur apakah card Dokumen Kelengkapan Siswa boleh tampil di halaman publik.</p>
+                    </div>
+                    <label class="inline-flex items-center gap-3 rounded-2xl border border-slate-200 bg-white px-4 py-3 text-sm font-medium text-slate-700">
+                        <input type="hidden" name="public_show_student_documents" value="0">
+                        <input type="checkbox" name="public_show_student_documents" value="1" class="h-5 w-5 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500" @checked(old('public_show_student_documents', $branding['public_show_student_documents']) == '1')>
+                        <span>Tampilkan card Dokumen Kelengkapan Siswa di portal publik</span>
+                    </label>
+                </div>
+                <p class="mt-3 text-xs text-slate-500">Jika dimatikan, pengunjung publik tetap bisa mencari data siswa, tetapi card dokumen tidak akan ditampilkan.</p>
+            </div>
+
             <div class="grid grid-cols-1 gap-6 xl:grid-cols-3">
                 <div class="rounded-3xl border border-slate-200 bg-slate-50 p-5">
                     <div class="mb-4 flex items-center justify-between gap-3">

tests/Feature/StudentPromotionTest.php

@@ -262,6 +262,124 @@ class StudentPromotionTest extends TestCase
         $this->assertDatabaseCount('student_academic_histories', 2);
     }
 
+    public function test_non_active_students_are_hidden_from_promotion_index_and_rejected_if_posted(): void
+    {
+        $admin = User::factory()->create(['role' => 'admin']);
+
+        [$fromYear, $toYear, $department, $fromClass, $targetClass] = $this->createPromotionContext();
+
+        $droppedStudent = Student::create([
+            'student_number' => 'S-004',
+            'full_name' => 'Eko Keluar',
+            'gender' => 'L',
+            'academic_year_id' => $fromYear->id,
+            'department_id' => $department->id,
+            'class_id' => $fromClass->id,
+            'status' => 'dropped',
+        ]);
+
+        $transferredStudent = Student::create([
+            'student_number' => 'S-005',
+            'full_name' => 'Fani Pindah',
+            'gender' => 'P',
+            'academic_year_id' => $fromYear->id,
+            'department_id' => $department->id,
+            'class_id' => $fromClass->id,
+            'status' => 'transferred',
+        ]);
+
+        $activeStudent = Student::create([
+            'student_number' => 'S-006',
+            'full_name' => 'Gilang Aktif',
+            'gender' => 'L',
+            'academic_year_id' => $fromYear->id,
+            'department_id' => $department->id,
+            'class_id' => $fromClass->id,
+            'status' => 'active',
+        ]);
+
+        $response = $this->actingAs($admin)->get(route('student-promotions.index', [
+            'from_academic_year_id' => $fromYear->id,
+            'to_academic_year_id' => $toYear->id,
+            'class_id' => $fromClass->id,
+        ]));
+
+        $response->assertOk();
+        $response->assertSee('Gilang Aktif');
+        $response->assertDontSee('Eko Keluar');
+        $response->assertDontSee('Fani Pindah');
+
+        $droppedPost = $this->from(route('student-promotions.index', [
+            'from_academic_year_id' => $fromYear->id,
+            'to_academic_year_id' => $toYear->id,
+            'class_id' => $fromClass->id,
+        ]))->actingAs($admin)->post(route('student-promotions.store'), [
+            'from_academic_year_id' => $fromYear->id,
+            'to_academic_year_id' => $toYear->id,
+            'class_id' => $fromClass->id,
+            'promotions' => [
+                [
+                    'student_id' => $droppedStudent->id,
+                    'target_class_id' => $targetClass->id,
+                    'action' => 'promote',
+                    'notes' => 'Tidak boleh ikut promosi.',
+                ],
+            ],
+        ]);
+
+        $droppedPost->assertRedirect(route('student-promotions.index', [
+            'from_academic_year_id' => $fromYear->id,
+            'to_academic_year_id' => $toYear->id,
+            'class_id' => $fromClass->id,
+        ]));
+        $droppedPost->assertSessionHasErrors([
+            'promotions.0.student_id' => 'Siswa Eko Keluar tidak berstatus aktif sehingga tidak bisa diproses promosi.',
+        ]);
+
+        $transferredPost = $this->from(route('student-promotions.index', [
+            'from_academic_year_id' => $fromYear->id,
+            'to_academic_year_id' => $toYear->id,
+            'class_id' => $fromClass->id,
+        ]))->actingAs($admin)->post(route('student-promotions.store'), [
+            'from_academic_year_id' => $fromYear->id,
+            'to_academic_year_id' => $toYear->id,
+            'class_id' => $fromClass->id,
+            'promotions' => [
+                [
+                    'student_id' => $transferredStudent->id,
+                    'target_class_id' => $targetClass->id,
+                    'action' => 'promote',
+                    'notes' => 'Tidak boleh ikut promosi.',
+                ],
+            ],
+        ]);
+
+        $transferredPost->assertRedirect(route('student-promotions.index', [
+            'from_academic_year_id' => $fromYear->id,
+            'to_academic_year_id' => $toYear->id,
+            'class_id' => $fromClass->id,
+        ]));
+        $transferredPost->assertSessionHasErrors([
+            'promotions.0.student_id' => 'Siswa Fani Pindah tidak berstatus aktif sehingga tidak bisa diproses promosi.',
+        ]);
+
+        $droppedStudent->refresh();
+        $transferredStudent->refresh();
+        $activeStudent->refresh();
+
+        $this->assertSame('dropped', $droppedStudent->status);
+        $this->assertSame('transferred', $transferredStudent->status);
+        $this->assertSame('active', $activeStudent->status);
+        $this->assertDatabaseMissing('student_academic_histories', [
+            'student_id' => $droppedStudent->id,
+            'academic_year_id' => $toYear->id,
+        ]);
+        $this->assertDatabaseMissing('student_academic_histories', [
+            'student_id' => $transferredStudent->id,
+            'academic_year_id' => $toYear->id,
+        ]);
+    }
+
     protected function createPromotionContext(array $overrides = []): array
     {
         $fromYear = AcademicYear::create([