From 52ea624bbc24fa6ff29a29de95db08ef7b50ba3b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 15:01:49 +0700
Subject: [PATCH] Perbaiki penanganan error dan pemilihan dropdown

Memperbaiki referensi keys untuk penanganan error pada beberapa field. Sekarang, keys error mengacu pada field yang benar (jenis_fasilitas_kredit_id, nilai_plafond_id, dan status_bayar). Juga, menambahkan logika untuk menetapkan value yang dipilih dengan benar pada dropdown (menggunakan nilai 'old' atau nilai dari 'permohonan'). Menghapus pengulangan kode untuk 'status permohonan'.
---
 resources/views/permohonan/form.blade.php | 92 +++++++----------------
 1 file changed, 26 insertions(+), 66 deletions(-)

diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index cfb066b..223194a 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -95,7 +95,7 @@
                                             @endforeach
                                         @endif
                                     </select>
-                                    @error('status')
+                                    @error('jenis_fasilitas_kredit_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -122,7 +122,7 @@
                                             @endforeach
                                         @endif
                                     </select>
-                                    @error('status')
+                                    @error('nilai_plafond_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -138,7 +138,7 @@
                                         <option {{ $permohonan->status_bayar=="sudah_bayar" ? 'selected' : '' }} value="sudah_bayar">Sudah Bayar</option>
                                         <option {{ $permohonan->status_bayar=="belum_bayar" ? 'selected' : '' }} value="belum_bayar">Belum Bayar</option>
                                     </select>
-                                    @error('status')
+                                    @error('status_bayar')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -211,19 +211,14 @@
                                 Tujuan Penilaian
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
                                     <option value="">Pilih Tujuan Penilaian</option>
                                     @if(isset($tujuanPenilaian))
                                         @foreach($tujuanPenilaian as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->tujuan_penilaian_id) && $permohonan->tujuan_penilaian_id == $row->id?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
+                                            <option value="{{ $row->id }}"
+                                                {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
+                                                {{ $row->name }}
+                                            </option>
                                         @endforeach
                                     @endif
                                 </select>
@@ -242,19 +237,14 @@
                                     <option value="">Pilih Fasilitas Kredit</option>
                                     @if(isset($fasilitasKredit))
                                         @foreach($fasilitasKredit as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->jenis_fasilitas_kredit_id) && $permohonan->jenis_fasilitas_kredit_id == $row->id ?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
+                                            <option value="{{ $row->id }}"
+                                                {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
+                                                {{ $row->name }}
+                                            </option>
                                         @endforeach
                                     @endif
                                 </select>
-                                @error('status')
+                                @error('jenis_fasilitas_kredit_id')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -266,22 +256,17 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                    <option value="">Pilih Nilai Flafond</option>
+                                    <option value="">Pilih Nilai Plafond</option>
                                     @if(isset($plafond))
                                         @foreach($plafond as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->nilai_plafond_id) && $permohonan->nilai_plafond_id == $row->id ?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
+                                            <option value="{{ $row->id }}"
+                                                {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
+                                                {{ $row->name }}
+                                            </option>
                                         @endforeach
                                     @endif
                                 </select>
-                                @error('status')
+                                @error('nilai_plafond_id')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -294,10 +279,10 @@
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
                                     <option value="">Pilih Status Bayar</option>
-                                    <option value="sudah_bayar">Sudah Bayar</option>
-                                    <option value="belum_bayar">Belum Bayar</option>
+                                    <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
+                                    <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
                                 </select>
-                                @error('status')
+                                @error('status_bayar')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -308,41 +293,16 @@
                                 Nilai NJOP
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
+                                       type="text"
+                                       name="nilai_njop"
+                                       value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
                                 @error('nilai_njop')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
                         </div>
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Status Permohonan
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('status') border-danger bg-danger-light @enderror" name="status" id="status">
-                                    <option value="">Pilih Status Permohonan</option>
-                                    @if(isset($status))
-                                        @foreach($status as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->slug }}" {{ isset($permohonan->status) && $permohonan->status == $row->slug ?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->slug }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
-                                        @endforeach
-                                    @endif
-                                </select>
-                                @error('status')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                                @enderror
-                            </div>
-                        </div>
-
-
                         <div class="flex justify-end">
                             <button type="submit" class="btn btn-primary">
                                 Save