From b6c09206378304c7cfefbdbd9b2c47c1b4b60e34 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Fri, 22 May 2026 09:36:28 +0700
Subject: [PATCH] update

---
 app/Http/Controllers/HomeController.php       |  8 +++-
 .../views/modules/dashboard/admin.blade.php   | 42 +++++++++++--------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index f98cd1e..796fc3c 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -138,9 +138,11 @@ class HomeController extends Controller
                     ')->first();
                 
                 $data['ranking_sekolah'] = \DB::table('penilaian as p')
+                ->where('tahun',date('Y'))
                 ->join('ms_sekolah as ms', 'ms.MsSekolahId', '=', 'p.ms_sekolah_id')
                 ->select(
                     'p.ms_sekolah_id',
+                    'p.tahun',
                     'ms.nama_sekolah',
                     'ms.npsn',
                     \DB::raw('COUNT(*) as total_pengelolaan_sampah')
@@ -148,7 +150,7 @@ class HomeController extends Controller
                 ->whereRaw(
                     "p.value::text ILIKE '%Pengelolaan Sampah%'"
                 )
-                ->groupBy('p.ms_sekolah_id', 'ms.nama_sekolah','ms.npsn')
+                ->groupBy('p.ms_sekolah_id', 'ms.nama_sekolah','ms.npsn','p.tahun')
                 ->orderByDesc('total_pengelolaan_sampah')
                 ->limit(4)
                 ->get();
@@ -180,9 +182,11 @@ class HomeController extends Controller
                     ')->first();
                 
                 $data['ranking_sekolah'] = \DB::table('penilaian as p')
+                ->where('tahun',date('Y'))
                 ->join('ms_sekolah as ms', 'ms.MsSekolahId', '=', 'p.ms_sekolah_id')
                 ->select(
                     'p.ms_sekolah_id',
+                    'p.tahun',
                     'ms.nama_sekolah',
                     'ms.npsn',
                     \DB::raw('COUNT(*) as total_pengelolaan_sampah')
@@ -190,7 +194,7 @@ class HomeController extends Controller
                 ->whereRaw(
                     "p.value::text ILIKE '%Pengelolaan Sampah%'"
                 )
-                ->groupBy('p.ms_sekolah_id', 'ms.nama_sekolah','ms.npsn')
+                ->groupBy('p.ms_sekolah_id', 'ms.nama_sekolah','ms.npsn','p.tahun')
                 ->orderByDesc('total_pengelolaan_sampah')
                 ->limit(4)
                 ->get();
diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php
index 83068ea..3319c02 100644
--- a/resources/views/modules/dashboard/admin.blade.php
+++ b/resources/views/modules/dashboard/admin.blade.php
@@ -282,28 +282,36 @@
         </div>
     </div>
     <div class="col-sm-12 col-xl-6">
-        <h5 class="fw-500 text-warning"><i class="fal fa-trophy"></i>&nbsp;Ranking Sekolah Pengolahan Sampah</h5>
         <div class="row">
-            @foreach ($ranking_sekolah as $dataSekolah)
-                <div class="col-xl-12 col-sm-6 mb-2">
-                    <div class="card">
-                        <div class="card-body p-3">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div>
-                                    <h5><b>{{ $dataSekolah->nama_sekolah }}</b></h5>
+            <div class="col-xl-12 col-sm-6 mb-2">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="fw-500 text-warning mb-0"><i class="fal fa-trophy"></i>&nbsp;Ranking Sekolah Pengolahan Sampah</h5>
+                    </div>
+                    <div class="card-body p-3">
+                        <table class="table border">
+                            <tr class="border bg-primary-light text-primary">
+                                <th class="border">No</th>
+                                <th class="border">Sekolah</th>
+                                <th class="border">Tahun</th>
+                                <th class="border">Persentase</th>
+                            </tr>
+                            @foreach ($ranking_sekolah as $k => $dataSekolah)
+                            <tr class="border">
+                                <td class="border text-center align-middle">{{$k+1}}</td>
+                                <td class="border">
+                                    <b>{{ ucwords(strtolower($dataSekolah->nama_sekolah)) }}</b><br>
                                     <span class="badge bg-warning-light text-warning">{{wilayah($dataSekolah->npsn)}}</span>
                                     <span class="badge bg-success-light text-success">{{levelAdiwiyata($dataSekolah->npsn)}}</span>
-                                </div>
-                                <div class="bg-primary-light text-primary p-3 rounded-circle">
-                                    <h6 class="fw-500 mb-0">{{ $dataSekolah->total_pengelolaan_sampah }}%</h6>
-                                </div>
-                            </div>
-                        </div>
+                                </td>
+                                <td class="border text-center align-middle">{{$dataSekolah->tahun}}</td>
+                                <td class="border text-center align-middle">{{ $dataSekolah->total_pengelolaan_sampah }}%</td>
+                            </tr>
+                            @endforeach
+                        </table>
                     </div>
                 </div>
-            @endforeach
-            
-           
+            </div>
         </div>
     </div>
 </div>