diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 5262ad9..3d67e6a 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -12,6 +12,7 @@ use App\Models\Penilaian;
use App\Models\SK;
use App\Models\Usulan;
use App\Models\SampahTerkelola;
+use App\Models\SampahBelumTerkelola;
class HomeController extends Controller
{
@@ -126,6 +127,31 @@ class HomeController extends Controller
$data['total_sekolah_mandiri'] = Kuesioner::whereHas('sekolah',function($query){
$query->where('ms_kabupaten_id',session('kabupaten_id'));
})->where('tahun',date('Y'))->where('level',3)->where('status',11)->count();
+
+ $data['summary2'] = SampahBelumTerkelola::whereHas('sekolah',function($query){
+ $query->where('ms_kabupaten_id',session('kabupaten_id'));
+ })->where('tahun', date('Y'))
+ ->selectRaw('SUM(organik::integer) as organik,
+ SUM(sampah_anorganik::integer) as anorganik,
+ SUM(b3::integer) as b3,
+ SUM(residu::integer) as minyak
+ ')->first();
+
+ $data['ranking_sekolah'] = Penilaian::join('ms_sekolah as ms', 'ms.MsSekolahId', '=', 'ms_sekolah_id')
+ ->select(
+ 'ms_sekolah_id',
+ 'ms.nama_sekolah',
+ 'ms.npsn',
+ \DB::raw('COUNT(*) as total_pengelolaan_sampah')
+ )
+ ->whereRaw(
+ "p.value::text ILIKE '%Pengelolaan Sampah%'"
+ )
+ ->groupBy('ms_sekolah_id', 'ms.nama_sekolah','ms.npsn')
+ ->orderByDesc('total_pengelolaan_sampah')
+ ->limit(4)
+ ->get();
+
}else{
$data['usulan'] = Kuesioner::where('tahun',date('Y'))->get();
$data['total_usulan_kab'] = Kuesioner::where('tahun',date('Y'))->where('level',0)->count();
@@ -145,6 +171,13 @@ class HomeController extends Controller
SUM(minyak_jelantah::integer) as minyak
')->first();
+ $data['summary2'] = SampahBelumTerkelola::where('tahun', date('Y'))
+ ->selectRaw('SUM(organik::integer) as organik,
+ SUM(sampah_anorganik::integer) as anorganik,
+ SUM(b3::integer) as b3,
+ SUM(residu::integer) as minyak
+ ')->first();
+
$data['ranking_sekolah'] = \DB::table('penilaian as p')
->join('ms_sekolah as ms', 'ms.MsSekolahId', '=', 'p.ms_sekolah_id')
->select(
diff --git a/resources/views/.DS_Store b/resources/views/.DS_Store
index 5008ddf..941f0ae 100644
Binary files a/resources/views/.DS_Store and b/resources/views/.DS_Store differ
diff --git a/resources/views/layouts/testdashboard.html b/resources/views/layouts/testdashboard.html
new file mode 100644
index 0000000..7dc9e79
--- /dev/null
+++ b/resources/views/layouts/testdashboard.html
@@ -0,0 +1,583 @@
+
+
+
+
+
+ SIDIA Jakarta - Comprehensive Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Dashboard Overview
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Usulan Adiwiyata Kota
+
+
+
+
+
+
Usulan Adiwiyata Provinsi
+
+
+
+
+
+
Usulan Adiwiyata Nasional
+
+
+
+
+
+
Usulan Adiwiyata Mandiri
+
+
+
+
+
+
+
+
+
+
+
Sekolah Adiwiyata Kota
+
+
+
+
+
+
Sekolah Adiwiyata Provinsi
+
+
+
+
+
+
Sekolah Adiwiyata Nasional
+
+
+
+
+
+
Sekolah Adiwiyata Mandiri
+
+
+
+
+
+
+
+
+
+
+
+
Total Sampah Organik
+
219 Kg
+
+
+
+
+
Total Sampah Anorganik
+
201 Kg
+
+
+
+
+
Total Sampah B3
+
201 Kg
+
+
+
+
+
Total Minyak Jelantah
+
222 Kg
+
+
+
+
+
+
+
+
+
+
+
+
Total Sampah Organik
+
0 Kg
+
+
+
+
+
Total Sampah Anorganik
+
0 Kg
+
+
+
+
+
Total Sampah B3
+
0 Kg
+
+
+
+
+
Total Sampah Residu
+
0 Kg
+
+
+
+
+
+
+
+
+
+
+
Grafik Pengolahan Sampah 2026
+
Data Bulanan
+
+
+
+
+
+
+
Ranking Sekolah
+
+
+
+
+
01
+
+
SDN Pejagalan 09 Pg.
+
Jakarta Utara
+
+
+
24%
+
+
+
+
+
+
02
+
+
SD NEGERI RAWA BADAK
+
Jakarta Utara
+
+
+
21%
+
+
+
+
+
+
03
+
+
SD CIKAL AMRI
+
Jakarta Timur
+
+
+
3%
+
+
+
+
+
+
+
+
+
+
+
+
+
Verifikasi Kuesioner Leveling
+
Lihat Semua
+
+
+
+
+
+ | # |
+ Nama Sekolah |
+ Status |
+
+
+
+
+ |
+
+ SD NEGERI TOMANG 08 PAGI
+ Jakarta Barat
+ |
+ Dikembalikan |
+
+
+ |
+
+ SDN PEJAGALAN 09 Pg.
+ Jakarta Utara
+ |
+ Terbit SK |
+
+
+
+
+
+
+
+
+
+
+
+
Usulan Adiwiyata
+ 5 Entri
+
+
+
+
+
+ | # |
+ Sekolah & Usulan |
+ Status |
+
+
+
+
+ | 1 |
+
+ SD NEGERI TOMANG 08 PAGI
+ Adiwiyata Kab/Kota
+ |
+ Dikembalikan |
+
+
+ | 2 |
+
+ SDN RAWA BADAK UTARA 07
+ Adiwiyata Provinsi
+ |
+ Terbit SK |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php
index c9a8f29..83068ea 100644
--- a/resources/views/modules/dashboard/admin.blade.php
+++ b/resources/views/modules/dashboard/admin.blade.php
@@ -168,7 +168,7 @@
-
Statistik Sampah Terkelola
+ Summary Sampah Terkelola
+
+
+
Summary Timbulan Sampah
+
+
+
+
+
+
+ Total Sampah Organik
+
{{number_format(@$summary2->organik)}} Kg
+
+
+
+
+
+
+
+
+
+
+ Total Sampah Anorganik
+
{{number_format(@$summary2->anorganik)}} Kg
+
+
+
+
+
+
+
+
+
+
+ Total Sampah B3
+
{{number_format(@$summary2->b3)}} Kg
+
+
+
+
+
+
+
+
+
+
+ Total Sampah Residu
+
{{number_format(@$summary2->residu)}} Kg
+
+
+
+
+
+