From 48f525e8fc682e2044714ec33bc18c6009da3a13 Mon Sep 17 00:00:00 2001 From: rahmagustin Date: Tue, 7 Apr 2026 22:31:08 +0700 Subject: [PATCH] tag berita --- app/Http/Controllers/IndexController.php | 101 +++++++++---------- resources/views/user/detail-berita.blade.php | 3 +- 2 files changed, 49 insertions(+), 55 deletions(-) diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index c5e86ac..e7de692 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -10,61 +10,56 @@ class IndexController extends Controller { public function index() -{ - $tahun = date('Y'); + { + $tahun = date('Y'); + $dataSampah = Sampah::where('tahun', $tahun) + ->orderBy('bulan') + ->get(); - // Ambil data sampah per bulan - $dataSampah = Sampah::where('tahun', $tahun) - ->orderBy('bulan') - ->get(); + $bulan = []; + $timbulan = []; + $kelola = []; + $daur = []; + $sisa = []; - $bulan = []; - $timbulan = []; - $kelola = []; - $daur = []; - $sisa = []; + foreach ($dataSampah as $d) { + $bulan[] = \Carbon\Carbon::create()->month($d->bulan)->translatedFormat('M'); + $timbulan[] = $d->total_sampah; + $kelola[] = $d->total_kelola; + $daur[] = $d->total_daur_ulang; + $sisa[] = $d->sisa_sampah; + } - foreach ($dataSampah as $d) { - $bulan[] = \Carbon\Carbon::create()->month($d->bulan)->translatedFormat('M'); - $timbulan[] = $d->total_sampah; - $kelola[] = $d->total_kelola; - $daur[] = $d->total_daur_ulang; - $sisa[] = $d->sisa_sampah; + $rekap = [ + 'timbulan' => array_sum($timbulan), + 'kelola' => array_sum($kelola), + 'daur' => array_sum($daur), + 'sisa' => array_sum($sisa), + ]; + + $sampah = Sampah::orderBy('tahun', 'desc')->first(); + + $kategoriTps = KategoriTps::orderBy('id_kategori_tps')->get(); + $tps = LokasiTps::all(); + + $jumlahTps = LokasiTps::where('kategori_tps_id', 1)->count(); + $jumlahTps3r = LokasiTps::where('kategori_tps_id', 2)->count(); + $jumlahTpa = LokasiTps::where('kategori_tps_id', 3)->count(); + + return view('user.index', compact( + 'sampah', + 'kategoriTps', + 'tps', + 'jumlahTps', + 'jumlahTps3r', + 'jumlahTpa', + 'bulan', + 'timbulan', + 'kelola', + 'daur', + 'sisa', + 'rekap', + 'tahun' + )); } - - // Rekap total satu tahun - $rekap = [ - 'timbulan' => array_sum($timbulan), - 'kelola' => array_sum($kelola), - 'daur' => array_sum($daur), - 'sisa' => array_sum($sisa), - ]; - - // Data sampah terbaru untuk card - $sampah = Sampah::orderBy('tahun', 'desc')->first(); - - // Data TPS - $kategoriTps = KategoriTps::orderBy('id_kategori_tps')->get(); - $tps = LokasiTps::all(); - - $jumlahTps = LokasiTps::where('kategori_tps_id', 1)->count(); - $jumlahTps3r = LokasiTps::where('kategori_tps_id', 2)->count(); - $jumlahTpa = LokasiTps::where('kategori_tps_id', 3)->count(); - - return view('user.index', compact( - 'sampah', - 'kategoriTps', - 'tps', - 'jumlahTps', - 'jumlahTps3r', - 'jumlahTpa', - 'bulan', - 'timbulan', - 'kelola', - 'daur', - 'sisa', - 'rekap', - 'tahun' - )); -} } diff --git a/resources/views/user/detail-berita.blade.php b/resources/views/user/detail-berita.blade.php index a8b4929..e55ea28 100644 --- a/resources/views/user/detail-berita.blade.php +++ b/resources/views/user/detail-berita.blade.php @@ -11,8 +11,7 @@