Update Logo Sidebar

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

@@ -34,12 +34,42 @@ class SummaryController extends Controller
         $totalpetani    = Profile::where('role', 'petani')->count();
         $totallahan     = Lahan::whereNotNull('path')->count();
         
-        $petaniList = Profile::where('role', 'petani')
-            ->with(['lahan.tanaman.komoditas', 'desaKelurahan'])
+        $petaniList = Profile::select('id', 'nama', 'role', 'desa_kelurahan_id')
+            ->where('role', 'petani')
+            ->with([
+                'lahan:id,profile_id,luas_lahan',
+                'desaKelurahan:id,nama,kecamatan_id',
+            ])
             ->paginate(20);
 
-        $allLahan = Lahan::whereNotNull('path')
-            ->with(['profile', 'tanaman.komoditas', 'desaKelurahan.kecamatan.kabupatenKota.provinsi'])
+        $lahanSummaryByDesa = Lahan::whereNotNull('path')
+            ->whereNotNull('desa_kelurahan_id')
+            ->select('desa_kelurahan_id')
+            ->selectRaw('COUNT(*) as total_lahan')
+            ->selectRaw('COALESCE(SUM(luas_lahan), 0) as total_luas')
+            ->groupBy('desa_kelurahan_id')
+            ->get();
+
+        $desaList = DesaKelurahan::select('id', 'nama', 'path', 'kecamatan_id')
+            ->whereIn('id', $lahanSummaryByDesa->pluck('desa_kelurahan_id')->filter()->unique()->values())
+            ->with([
+                'kecamatan:id,nama,path,kabupaten_kota_id',
+                'kecamatan.kabupatenKota:id,nama,path,provinsi_id',
+                'kecamatan.kabupatenKota.provinsi:id,nama,path',
+            ])
+            ->get()
+            ->keyBy('id');
+
+        $mapLahanLimit = min(max((int) $request->integer('map_lahan_limit', 500), 0), 2000);
+        $mapLahan = Lahan::whereNotNull('path')
+            ->select('id', 'profile_id', 'desa_kelurahan_id', 'path', 'luas_lahan')
+            ->with([
+                'profile:id,nama',
+                'tanaman:id,lahan_id,komoditas_id',
+                'tanaman.komoditas:id,nama',
+            ])
+            ->orderByDesc('updated_at')
+            ->limit($mapLahanLimit)
             ->get();
 
         $geoProvinsi    = [];
@@ -48,47 +78,51 @@ class SummaryController extends Controller
         $geoDesa        = [];
         $geoLahan       = [];
 
-        foreach ($allLahan as $lahan) {
-            $desa   = $lahan->desaKelurahan;
+        foreach ($lahanSummaryByDesa as $summary) {
+            $desa   = $desaList->get($summary->desa_kelurahan_id);
             $kec    = $desa ? $desa->kecamatan : null;
             $kab    = $kec ? $kec->kabupatenKota : null;
             $prov   = $kab ? $kab->provinsi : null;
+            $totalLahan = (int) $summary->total_lahan;
+            $totalLuas = (float) $summary->total_luas;
 
             if ($prov && $prov->path) {
                 if (!isset($geoProvinsi[$prov->id])) {
                     $geoProvinsi[$prov->id] = ['id' => $prov->id, 'nama' => $prov->nama, 'polygon' => $prov->path, 'total_lahan' => 0, 'total_luas' => 0];
                 }
-                $geoProvinsi[$prov->id]['total_lahan']++;
-                $geoProvinsi[$prov->id]['total_luas'] += $lahan->luas_lahan;
+                $geoProvinsi[$prov->id]['total_lahan'] += $totalLahan;
+                $geoProvinsi[$prov->id]['total_luas'] += $totalLuas;
             }
 
             if ($kab && $kab->path) {
                 if (!isset($geoKabupaten[$kab->id])) {
                     $geoKabupaten[$kab->id] = ['id' => $kab->id, 'parent_id' => $prov->id ?? null, 'nama' => $kab->nama, 'polygon' => $kab->path, 'total_lahan' => 0, 'total_luas' => 0];
                 }
-                $geoKabupaten[$kab->id]['total_lahan']++;
-                $geoKabupaten[$kab->id]['total_luas'] += $lahan->luas_lahan;
+                $geoKabupaten[$kab->id]['total_lahan'] += $totalLahan;
+                $geoKabupaten[$kab->id]['total_luas'] += $totalLuas;
             }
 
             if ($kec && $kec->path) {
                 if (!isset($geoKecamatan[$kec->id])) {
                     $geoKecamatan[$kec->id] = ['id' => $kec->id, 'parent_id' => $kab->id ?? null, 'nama' => $kec->nama, 'polygon' => $kec->path, 'total_lahan' => 0, 'total_luas' => 0];
                 }
-                $geoKecamatan[$kec->id]['total_lahan']++;
-                $geoKecamatan[$kec->id]['total_luas'] += $lahan->luas_lahan;
+                $geoKecamatan[$kec->id]['total_lahan'] += $totalLahan;
+                $geoKecamatan[$kec->id]['total_luas'] += $totalLuas;
             }
             
             if ($desa && $desa->path) {
                 if (!isset($geoDesa[$desa->id])) {
                     $geoDesa[$desa->id] = ['id' => $desa->id, 'parent_id' => $kec->id ?? null, 'nama' => $desa->nama, 'polygon' => $desa->path, 'total_lahan' => 0, 'total_luas' => 0];
                 }
-                $geoDesa[$desa->id]['total_lahan']++;
-                $geoDesa[$desa->id]['total_luas'] += $lahan->luas_lahan;
+                $geoDesa[$desa->id]['total_lahan'] += $totalLahan;
+                $geoDesa[$desa->id]['total_luas'] += $totalLuas;
+            }
         }
 
+        foreach ($mapLahan as $lahan) {
             $geoLahan[] = [
                 'id'            => $lahan->id,
-                'parent_id'     => $desa->id ?? null,
+                'parent_id'     => $lahan->desa_kelurahan_id,
                 'polygon'       => $lahan->path,
                 'nama_petani'   => $lahan->profile->nama ?? 'N/A',
                 'luas'          => $lahan->luas_lahan,

app/Http/Controllers/Web/Produktivitas/PetaniController.php

@@ -34,9 +34,16 @@ class PetaniController extends Controller
             abort(403);
         }
 
-        $provinsi = Provinsi::orderBy('kode', 'asc')->get();
+        $provinsi = Provinsi::select('id', 'kode', 'nama')->orderBy('kode', 'asc')->get();
 
-        $query = Petani::with('desakelurahan')
+        $query = Petani::with([
+                'desaKelurahan:id,nama,kecamatan_id',
+                'desaKelurahan.kecamatan:id,nama,kabupaten_kota_id',
+                'desaKelurahan.kecamatan.kabupatenKota:id,nama,provinsi_id',
+                'desaKelurahan.kecamatan.kabupatenKota.provinsi:id,nama',
+                'komoditas:id,nama',
+                'skor:id,petani_id,skor_kesiapan_adopsi',
+            ])
             ->orderBy('created_at', 'desc');
 
         if ($request->search) {
@@ -53,12 +60,12 @@ class PetaniController extends Controller
         $summaryPetaniIds = (clone $query)->pluck('id');
         $petani = $query->paginate($request->per_page ?? 10);
 
-        $komoditas = Komoditas::where('is_utama', true)->get();
-        $lahan = Lahan::whereIn('petani_id', $summaryPetaniIds)
-            ->whereIn('komoditas_id', $komoditas->pluck('id'))
-            ->get();
-        $tanaman = Tanaman::whereIn('lahan_id', $lahan->pluck('id'))
-            ->get();
+        $komoditas = Komoditas::select('id', 'nama')->where('is_utama', true)->get();
+        $lahanQuery = Lahan::whereIn('petani_id', $summaryPetaniIds)
+            ->whereIn('komoditas_id', $komoditas->pluck('id'));
+        $lahanIds = (clone $lahanQuery)->pluck('id');
+        $totalLuasLahan = (clone $lahanQuery)->sum('luas_lahan');
+        $totalTanaman = Tanaman::whereIn('lahan_id', $lahanIds)->count();
 
         $case = "
             CASE
@@ -74,7 +81,7 @@ class PetaniController extends Controller
                         ->groupByRaw($case)
                         ->get();
 
-        return view('produktivitas.petani.index', compact('petani', 'provinsi', 'lahan', 'komoditas', 'tanaman', 'skor'));
+        return view('produktivitas.petani.index', compact('petani', 'provinsi', 'komoditas', 'skor', 'totalLuasLahan', 'totalTanaman'));
     }
 
     public function create()

app/Http/Controllers/Web/Produktivitas/SurveyProduktivitasController.php

@@ -3,23 +3,40 @@
 namespace App\Http\Controllers\Web\Produktivitas;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-
 use App\Models\Pertanian\Petani;
 use App\Models\Pertanian\SurveyProduktivitas;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 
 class SurveyProduktivitasController extends Controller
 {
     public function store($petaniId, Request $request)
     {
         $petani = Petani::findOrFail($petaniId);
-        $validated = $request->validate([
-            'produktivitas_komoditas'                       => ['required', 'array'],
-            'produktivitas_komoditas.*.komoditas_id'        => ['nullable', 'exists:master_komoditas,id'],
-            'produktivitas_komoditas.*.hasil_panen_3_musim' => ['nullable', 'numeric'],
-            'produktivitas_komoditas.*.satuan'              => ['nullable', 'string'],
+
+        $validator = Validator::make($request->all(), [
+            'produktivitas_komoditas' => ['required', 'array', 'min:1'],
+            'produktivitas_komoditas.*.komoditas_id' => ['required', 'exists:master_komoditas,id'],
+            'produktivitas_komoditas.*.hasil_panen_3_musim' => ['required', 'numeric', 'min:0'],
+            'produktivitas_komoditas.*.satuan' => ['required', 'in:ha_tahun,pohon_tahun'],
+        ], [
+            'produktivitas_komoditas.required' => 'Minimal satu data produktivitas harus diisi.',
+            'produktivitas_komoditas.*.komoditas_id.required' => 'Komoditas wajib dipilih.',
+            'produktivitas_komoditas.*.komoditas_id.exists' => 'Komoditas yang dipilih tidak valid.',
+            'produktivitas_komoditas.*.hasil_panen_3_musim.required' => 'Hasil panen wajib diisi.',
+            'produktivitas_komoditas.*.hasil_panen_3_musim.numeric' => 'Hasil panen harus berupa angka.',
+            'produktivitas_komoditas.*.hasil_panen_3_musim.min' => 'Hasil panen tidak boleh kurang dari 0.',
+            'produktivitas_komoditas.*.satuan.required' => 'Satuan wajib dipilih.',
+            'produktivitas_komoditas.*.satuan.in' => 'Satuan yang dipilih tidak valid.',
         ]);
+
+        if ($validator->fails()) {
+            return $this->redirectBackToFragment($request)->withErrors($validator)->withInput();
+        }
+
+        $validated = $validator->validated();
+
         foreach ($validated['produktivitas_komoditas'] as $row) {
             SurveyProduktivitas::create([
                 'uid' => 'SPV-'.strtoupper(Str::random(10)),

resources/views/layout/sidebar.blade.php

@@ -3,6 +3,7 @@
         <a href="{{ route('home') }}" class="app-brand-link">
             <span class="app-brand-logo demo">
                 <span>
+                    <!-- AgroMonev -->
                     <svg width="32" height="24" viewBox="0 0 32 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path opacity="0.3" d="M16 2.5C16 2.5 5 6.5 5 15.5C5 20.5 11 23.5 16 23.5V2.5Z" fill="#28a745" />
                         <path opacity="0.6" d="M16 2.5C16 2.5 27 6.5 27 15.5C27 20.5 21 23.5 16 23.5V2.5Z" fill="#28a745" />
@@ -10,6 +11,24 @@
                         <path d="M15 15L27 4" stroke="#ED1C24" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" />
                         <circle cx="27" cy="4" r="2.5" fill="#ED1C24" />
                     </svg>
+                    <!-- AgroPro -->
+                    <!-- <svg width="32" height="24" viewBox="0 0 32 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path opacity="0.25" d="M16 2.5C16 2.5 5 6.5 5 15.5C5 20.5 11 23.5 16 23.5V2.5Z" fill="#28A745"/>
+                        <path opacity="0.5" d="M16 2.5C16 2.5 27 6.5 27 15.5C27 20.5 21 23.5 16 23.5V2.5Z" fill="#28A745"/>
+                        <rect x="5.5" y="5.5" width="21" height="15" rx="2.5" fill="white" stroke="#0054A6" stroke-width="1.5"/>
+                        <rect x="11" y="3.5" width="10" height="4" rx="2" fill="#0054A6"/>
+                        <circle cx="9.5" cy="10" r="1.7" fill="#28A745"/>
+                        <path d="M8.7 10L9.3 10.6L10.4 9.3" stroke="white" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
+                        <path d="M13 10H23" stroke="#D9E2EC" stroke-width="2" stroke-linecap="round"/>
+                        <path d="M13 10H22" stroke="#0054A6" stroke-width="2" stroke-linecap="round"/>
+                        <circle cx="9.5" cy="14" r="1.7" fill="#28A745"/>
+                        <path d="M8.7 14L9.3 14.6L10.4 13.3" stroke="white" stroke-width="1" stroke-linecap="round" stroke-linejoin="round"/>
+                        <path d="M13 14H23" stroke="#D9E2EC" stroke-width="2" stroke-linecap="round"/>
+                        <path d="M13 14H19.5" stroke="#F4B400" stroke-width="2" stroke-linecap="round"/>
+                        <circle cx="9.5" cy="18" r="1.7" fill="white" stroke="#ED1C24" stroke-width="1.3"/>
+                        <path d="M13 18H23" stroke="#D9E2EC" stroke-width="2" stroke-linecap="round"/>
+                        <path d="M13 18H17" stroke="#ED1C24" stroke-width="2" stroke-linecap="round"/>
+                    </svg> -->
                 </span>
             </span>
 

resources/views/produktivitas/petani/index.blade.php

@@ -15,8 +15,8 @@
         <div class="w-25">
             <x-summary-card 
                 title="Lahan & Tanaman" 
-                count="{{ number_format(($lahan?->sum('luas_lahan') ?? 0) / 10000, 2, ',', '.') }} ha" 
-                subtitle="{{ $tanaman?->count() }} tanaman dari {{ $komoditas?->count() }} komoditas utama" 
+                count="{{ number_format(($totalLuasLahan ?? 0) / 10000, 2, ',', '.') }} ha" 
+                subtitle="{{ $totalTanaman ?? 0 }} tanaman dari {{ $komoditas?->count() }} komoditas utama" 
                 icon="trees" 
                 color="success" 
             />

resources/views/produktivitas/petani/praktik-budidaya/edit.blade.php

@@ -1598,42 +1598,66 @@
                         action="{{ route('petani.survey-produktivitas.store', $petani->id) }}"
                         class="form-repeater">
                         @csrf
-                        <input type="hidden" name="redirect_fragment" value="section-kehilangan-hasil">
+                        <input type="hidden" name="redirect_fragment" value="section-produktivitas">
+
+                        @php
+                            $produktivitasRows = old('produktivitas_komoditas');
+
+                            if (!is_array($produktivitasRows) || count($produktivitasRows) === 0) {
+                                $produktivitasRows = [
+                                    [
+                                        'komoditas_id' => null,
+                                        'hasil_panen_3_musim' => null,
+                                        'satuan' => null,
+                                    ],
+                                ];
+                            }
+                        @endphp
 
                         <div data-repeater-list="produktivitas_komoditas">
+                            @foreach ($produktivitasRows as $index => $produktivitasRow)
                             <div data-repeater-item>
                                 <div class="row align-items-end">
 
                                     <div class="col-md-4 mb-3">
                                         <label class="form-label">Komoditas</label>
-                                        <select name="komoditas_id" class="form-select">
+                                        <select name="komoditas_id" class="form-select @error('produktivitas_komoditas.' . $index . '.komoditas_id') is-invalid @enderror">
                                             <option value="">Pilih Komoditas</option>
                                             @foreach ($komoditas as $item)
-                                                <option value="{{ $item->id }}">{{ $item->nama }}</option>
+                                                <option value="{{ $item->id }}" @selected((string) data_get($produktivitasRow, 'komoditas_id') === (string) $item->id)>{{ $item->nama }}</option>
                                             @endforeach
                                         </select>
+                                        @error('produktivitas_komoditas.' . $index . '.komoditas_id')
+                                            <div class="invalid-feedback d-block">{{ $message }}</div>
+                                        @enderror
                                     </div>
 
                                     <div class="col-md-3 mb-3">
                                         <label class="form-label">Hasil</label>
                                         <div class="input-group">
-                                            <input type="number" name="hasil_panen_3_musim" class="form-control" step="0.01" min="0">
+                                            <input type="number" name="hasil_panen_3_musim" class="form-control @error('produktivitas_komoditas.' . $index . '.hasil_panen_3_musim') is-invalid @enderror" step="0.01" min="0" value="{{ data_get($produktivitasRow, 'hasil_panen_3_musim') }}">
                                             <span class="input-group-text">Kg</span>
                                         </div>
+                                        @error('produktivitas_komoditas.' . $index . '.hasil_panen_3_musim')
+                                            <div class="invalid-feedback d-block">{{ $message }}</div>
+                                        @enderror
                                     </div>
 
                                     <div class="col-md-3 mb-3">
                                         <label class="form-label d-block">Satuan</label>
 
                                         <label class="form-check form-check-inline">
-                                            <input class="form-check-input" type="radio" name="satuan" value="ha_tahun">
+                                            <input class="form-check-input @error('produktivitas_komoditas.' . $index . '.satuan') is-invalid @enderror" type="radio" name="satuan" value="ha_tahun" @checked(data_get($produktivitasRow, 'satuan') === 'ha_tahun')>
                                             <span class="form-check-label">Ha/Tahun</span>
                                         </label>
 
                                         <label class="form-check form-check-inline">
-                                            <input class="form-check-input" type="radio" name="satuan" value="pohon_tahun">
+                                            <input class="form-check-input @error('produktivitas_komoditas.' . $index . '.satuan') is-invalid @enderror" type="radio" name="satuan" value="pohon_tahun" @checked(data_get($produktivitasRow, 'satuan') === 'pohon_tahun')>
                                             <span class="form-check-label">Pohon/Tahun</span>
                                         </label>
+                                        @error('produktivitas_komoditas.' . $index . '.satuan')
+                                            <div class="invalid-feedback d-block">{{ $message }}</div>
+                                        @enderror
                                     </div>
 
                                     <div class="col-md-2 mb-3">
@@ -1645,6 +1669,7 @@
                                 </div>
                                 <hr>
                             </div>
+                            @endforeach
                         </div>
 
                         <div class="mt-4 d-flex justify-content-between">