From 02eed6da3489f9609676a3a5d8555e02a5c6b1ee Mon Sep 17 00:00:00 2001
From: SyaharaniSalsabilla <syaharanibilla1@gmail.com>
Date: Wed, 23 Sep 2026 14:37:08 +0700
Subject: [PATCH] solve jumlah lahan dan tanaman

---
 .../Web/Produktivitas/PetaniController.php          | 13 ++++---------
 .../views/produktivitas/petani/index.blade.php      |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Web/Produktivitas/PetaniController.php b/app/Http/Controllers/Web/Produktivitas/PetaniController.php
index ec187b6..cebfe94 100644
--- a/app/Http/Controllers/Web/Produktivitas/PetaniController.php
+++ b/app/Http/Controllers/Web/Produktivitas/PetaniController.php
@@ -111,15 +111,9 @@ class PetaniController extends Controller
         $desaOptions = $request->filled('kecamatan_id')
             ? DesaKelurahan::select('id', 'nama')->where('kecamatan_id', $request->kecamatan_id)->orderBy('nama')->get()
             : collect();
-        $lahanQuery = Lahan::whereIn('petani_id', $summaryPetaniIds)
-            ->when(
-                $request->filled('komoditas_id'),
-                fn ($query) => $query->where('komoditas_id', $request->komoditas_id),
-                fn ($query) => $query->whereIn('komoditas_id', $komoditas->pluck('id'))
-            );
-        $lahanIds = (clone $lahanQuery)->pluck('id');
-        $totalLuasLahan = (clone $lahanQuery)->sum('luas_lahan');
-        $totalTanaman = Tanaman::whereIn('lahan_id', $lahanIds)->count();
+        $totalLahan = Lahan::count();
+        $totalLuasLahan = Lahan::sum('luas_lahan');
+        $totalTanaman = Tanaman::count();
 
         $case = "
             CASE
@@ -146,6 +140,7 @@ class PetaniController extends Controller
             'desaOptions',
             'filters',
             'skor',
+            'totalLahan',
             'totalLuasLahan',
             'totalTanaman',
             'showFasilitatorColumn'
diff --git a/resources/views/produktivitas/petani/index.blade.php b/resources/views/produktivitas/petani/index.blade.php
index 31700c6..b977174 100644
--- a/resources/views/produktivitas/petani/index.blade.php
+++ b/resources/views/produktivitas/petani/index.blade.php
@@ -98,7 +98,7 @@
             <x-summary-card 
                 title="Lahan & Tanaman" 
                 count="{{ number_format(($totalLuasLahan ?? 0) / 10000, 2, ',', '.') }} ha" 
-                subtitle="{{ $totalTanaman ?? 0 }} tanaman dari {{ $komoditas?->count() }} komoditas utama" 
+                subtitle="{{ number_format($totalLahan ?? 0, 0, ',', '.') }} lahan, {{ number_format($totalTanaman ?? 0, 0, ',', '.') }} tanaman" 
                 icon="trees" 
                 color="success" 
             />