Update Dashboard Karakteristik Petani

app/Http/Controllers/Web/Dashboard/DemografiPetaniController.php

@@ -39,8 +39,29 @@ class DemografiPetaniController extends Controller
         $demografiData = $this->contentData($request);
         $indeksData = app(IndeksPetaniController::class)->contentData($request);
 
+        $tableFilters = [
+            'gender' => ['Gender', ['1' => 'Laki-laki', '0' => 'Perempuan']],
+            'umur' => ['Kelompok Umur', ['kurang_30' => '< 30 tahun', '30_39' => '30–39 tahun', '40_49' => '40–49 tahun', '50_59' => '50–59 tahun', '60_keatas' => '≥ 60 tahun']],
+            'pendidikan' => ['Pendidikan', ['tidak_sekolah' => 'Tidak Sekolah', 'sd' => 'SD', 'smp' => 'SMP', 'sma' => 'SMA', 'diploma' => 'Diploma', 's1_keatas' => 'Sarjana ke atas']],
+            'jumlah_tanggungan' => ['Jumlah Tanggungan', ['0' => '0 orang', '1_2' => '1–2 orang', '3_4' => '3–4 orang', '5_keatas' => '≥ 5 orang']],
+            'kelompok_tani' => ['Keanggotaan Kelompok Tani', ['terdaftar' => 'Terdaftar', 'tidak_terdaftar' => 'Tidak Terdaftar', 'belum_terisi' => 'Belum Terisi']],
+            'komoditas' => ['Komoditas', $indeksData['komoditas']->pluck('nama', 'id')->all()],
+            'luas_lahan' => ['Luas Lahan', ['kurang_05' => '< 0,5 ha', '05_1' => '0,5–1 ha', '1_2' => '> 1–2 ha', 'lebih_2' => '> 2 ha']],
+            'status_kepemilikan_lahan' => ['Status Kepemilikan Lahan', ['sendiri' => 'Milik Pribadi', 'sewa' => 'Sewa', 'adat' => 'Tanah Adat']],
+            'penghasilan' => ['Rentang Pendapatan', ['kurang_1' => '< Rp1 juta', '1_3' => 'Rp1–3 juta', '3_5' => '> Rp3–5 juta', '5_10' => '> Rp5–10 juta', 'lebih_10' => '> Rp10 juta']],
+        ];
+
         return view('dashboard.karakteristik-petani', [
             'activeTab' => $activeTab,
+            'tableFilters' => $tableFilters,
+            'dashboardFilters' => $request->only([
+                'provinsi_id',
+                'kabupatenKota_id',
+                'kecamatan_id',
+                'desaKelurahan_id',
+                'komoditas_id',
+                'segmen',
+            ]),
             'indeksFilterAction' => route('dashboard.karakteristik-petani'),
         ] + $demografiData + $indeksData);
     }
@@ -183,14 +204,11 @@ class DemografiPetaniController extends Controller
             ->groupBy('sosial_ekonomi.petani_id')
             ->selectRaw('SUM(pendapatan_komoditas.pendapatan) as total_pendapatan');
 
-        $ratarataPenghasilan = (float) DB::query()
-            ->fromSub(clone $pendapatanPerPetaniQuery, 'agg')
-            ->avg('total_pendapatan');
-
         $penghasilanBuckets = DB::query()->fromSub(
             clone $pendapatanPerPetaniQuery,
             'agg'
         )->selectRaw("
+            AVG(total_pendapatan) as rata_rata,
             COUNT(*) FILTER (WHERE total_pendapatan < 1000000) as kurang_1,
             COUNT(*) FILTER (WHERE total_pendapatan >= 1000000 AND total_pendapatan <= 3000000) as p1_3,
             COUNT(*) FILTER (WHERE total_pendapatan > 3000000 AND total_pendapatan <= 5000000) as p3_5,
@@ -198,6 +216,8 @@ class DemografiPetaniController extends Controller
             COUNT(*) FILTER (WHERE total_pendapatan > 10000000) as lebih_10
         ")->first();
 
+        $ratarataPenghasilan = (float) ($penghasilanBuckets->rata_rata ?? 0);
+
         $penghasilan = [
             'kurang_1' => $penghasilanBuckets->kurang_1,
             '1_3'      => $penghasilanBuckets->p1_3,
@@ -247,13 +267,7 @@ class DemografiPetaniController extends Controller
             'penghasilan' => $penghasilan,
         ];
 
-        $daftarPetani = Petani::with(['komoditas'])
-            ->whereIn('petani.id', clone $filteredPetaniIds)
-            ->withSum('lahans as total_luas_lahan', 'luas_lahan')
-            ->orderBy('id')
-            ->paginate(10);
-
-        return compact('data', 'daftarPetani');
+        return compact('data');
     }
 
     private function filteredPetaniIdsQuery(Request $request)