From 5893050e840aac1012f4ba994fd4e294c0e5b765 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 24 Dec 2024 14:08:51 +0700 Subject: [PATCH 01/21] Perbaiki pengecekan variabel pada komponen foto lampiran - Mengganti pengecekan `isset($formFoto)` menjadi `isset($formFoto['rute_menuju_lokasi'])` - Memastikan data yang diakses lebih spesifik untuk menghindari potensi error. --- resources/views/penilai/components/foto-lampiran.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/penilai/components/foto-lampiran.blade.php b/resources/views/penilai/components/foto-lampiran.blade.php index b7dc091..8391381 100644 --- a/resources/views/penilai/components/foto-lampiran.blade.php +++ b/resources/views/penilai/components/foto-lampiran.blade.php @@ -5,7 +5,7 @@
- @if (isset($formFoto)) + @if (isset($formFoto['rute_menuju_lokasi'])) @foreach ($formFoto['rute_menuju_lokasi'] as $item)
From cf75f63c203a93e8384212c1efe6547af2a7d877 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 24 Dec 2024 14:20:29 +0700 Subject: [PATCH 02/21] Setel input harga diskon menjadi readonly - Menambahkan atribut `readonly` pada input `harga_diskon` dan `harga_diskon_pembanding` untuk mencegah pengeditan langsung. - Menghapus pembatas nilai maksimum 100 pada event listener input diskon pembanding. --- .../views/surveyor/components/data-pembanding.blade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php index 33426a8..ba5b74c 100644 --- a/resources/views/surveyor/components/data-pembanding.blade.php +++ b/resources/views/surveyor/components/data-pembanding.blade.php @@ -451,11 +451,11 @@ Harga Setelah Diskon - - @@ -777,7 +777,6 @@ if (input.name.includes('diskon_pembanding')) { input.addEventListener('input', function() { let value = parseFloat(this.value.replace(/[^\d]/g, '') || '0'); - value = Math.min(value, 100); this.value = formatCurrency(value.toString()); }); } From baeb38c47d588e1e2f4c54fad504b11e8df56a79 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 24 Dec 2024 14:36:36 +0700 Subject: [PATCH 03/21] Perbaiki logika dan format pada komponen tanah - Menambahkan validasi array pada penghitungan luas tanah. - Memperbaiki format dan konsistensi kode pada radio button, checkbox, dan input field. - Mengoptimalkan toggle visibility untuk elemen dinamis (e.g., input "lainnya"). - Menyesuaikan struktur form untuk meningkatkan keterbacaan dan maintainability. --- .../views/surveyor/components/tanah.blade.php | 173 +++++++++--------- 1 file changed, 88 insertions(+), 85 deletions(-) diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php index 4e3d596..85d4366 100644 --- a/resources/views/surveyor/components/tanah.blade.php +++ b/resources/views/surveyor/components/tanah.blade.php @@ -1,5 +1,3 @@ - -

@@ -16,8 +14,12 @@ @foreach ($permohonan->debiture->documents as $item) @php $luas = $item->detail; - $details = json_decode($luas[0]->details, true); - $luas_tanah = isset($details['luas']) ? $details['luas'] : 'N/A'; + if(is_array($luas)){ + $details = json_decode($luas[0]->details, true); + $luas_tanah = isset($details['luas']) ? $details['luas'] : 'N/A'; + } else { + $luas_tanah = 'N/A'; + } @endphp

{{ $luas_tanah }} m2

@@ -25,30 +27,31 @@ @endif
-
- - -
- - -
+
+ + +
+ +
- - +
+ +

@@ -66,7 +69,7 @@ : 'N/A'; @endphp + value="{{ $hadap_mata_angin }}">

{{ $hadap_mata_angin }} m2

@endforeach @endif @@ -74,42 +77,42 @@
+ style="{{ old('hadap_mata_angin', isset($forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai'])) ? '' : 'display: none;' }}"> - {{-- --}} + @endif + + {{-- --}}
@@ -126,22 +129,22 @@
@if (strcasecmp($item->name, 'lainnya') == 0) + style="{{ isset($forminspeksi['tanah']['bentuk_tanah']['lainnya']) && $forminspeksi['tanah']['bentuk_tanah']['lainnya'] ? '' : 'display: none;' }}" + name="bentuk_tanah_lainnya" class="input w-full mt-2" + placeholder="Masukkan bentuk tanah..." + value="{{ old('bentuk_tanah_lainnya', $forminspeksi['tanah']['bentuk_tanah']['lainnya'] ?? '') }}"/> @endif
@endforeach @@ -159,7 +162,7 @@ @foreach ($basicData['konturTanah'] as $item) @@ -179,24 +182,24 @@
@if (strcasecmp($item->name, 'Lebih Tinggi') == 0) + style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ? '' : 'display: none;' }}" + name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="m2" + value="{{ old('ketinggian_lebih_tinggi', $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ?? '') }}"/> @elseif (strcasecmp($item->name, 'Lebih Rendah') == 0) + style="{{ isset($forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah']) && $forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah'] ? '' : 'display: none;' }}" + name="ketinggian_lebih_rendah" class="input w-full mt-2" placeholder="m2" + value="{{ old('ketinggian_lebih_rendah', $forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah'] ?? '') }}"/> @endif
@@ -246,17 +249,17 @@
@if (strcasecmp($item->name, 'Lainnya') == 0) + style="{{ $lainnyaValue ? '' : 'display: none' }}" + name="posisi_kavling_lainnya" class="input w-full mt-2" + placeholder="Masukkan Posisi Kavling lainnya..." + value="{{ $lainnyaValue }}"/> @endif
@endforeach @@ -315,9 +318,9 @@ @foreach ($basicData['kondisiFisikTanah'] as $item) @@ -325,9 +328,9 @@ @if (strcasecmp($item->name, 'lainnya') == 0)
+ id="kondisi_fisik_tanah_lainnya" class="input mt-2" + placeholder="Masukkan Kondisi Fisik Tanah..." style="display: none;" + value="{{ old('kondisi_fisik_tanah_lainnya', isset($forminspeksi['tanah']['kondisi_fisik_tanah']['lainnya'])) }}">
@endif @endforeach From f9f9f455ed5e0ac345aa97222564d6d00a1d1fcf Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 24 Dec 2024 14:40:21 +0700 Subject: [PATCH 04/21] Perbaiki logika pengolahan data luas tanah - Menambahkan pengecekan jenis data untuk variabel `luas` sebelum mengakses detailnya. - Mencegah potensi error dengan mengatur default value `luas_tanah` menjadi 'N/A' jika data tidak valid. --- resources/views/surveyor/components/tanah.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php index 85d4366..6fc9531 100644 --- a/resources/views/surveyor/components/tanah.blade.php +++ b/resources/views/surveyor/components/tanah.blade.php @@ -63,10 +63,14 @@ @foreach ($permohonan->debiture->documents as $item) @php $luas = $item->detail; + if(is_array($luas)){ $details = json_decode($luas[0]->details, true); $hadap_mata_angin = isset($details['hadap_mata_angin']) ? $details['hadap_mata_angin'] : 'N/A'; + } else { + $luas_tanah = 'N/A'; + } @endphp From 5738269bffc951dca42eae666bbb6e7d8bcbf716 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 24 Dec 2024 14:48:04 +0700 Subject: [PATCH 05/21] Perbaiki penugasan variabel di komponen tanah - Memperbaiki kesalahan penugasan variabel `$hadap_mata_angin` pada kondisi fallback. - Menghindari potensi bug dengan memastikan nilai default tertulis dengan benar. --- resources/views/surveyor/components/tanah.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php index 6fc9531..990d490 100644 --- a/resources/views/surveyor/components/tanah.blade.php +++ b/resources/views/surveyor/components/tanah.blade.php @@ -69,7 +69,7 @@ ? $details['hadap_mata_angin'] : 'N/A'; } else { - $luas_tanah = 'N/A'; + $luas_tanah = $hadap_mata_angin= 'N/A'; } @endphp Date: Tue, 24 Dec 2024 14:54:47 +0700 Subject: [PATCH 06/21] Update render logic for table fields to handle null values - Menambahkan pengecekan null untuk beberapa field seperti user, branch, tujuan penilaian, dan jenis fasilitas kredit. - Mencegah error dengan menampilkan 'N/A' jika data tidak tersedia. --- resources/views/surveyor/index.blade.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php index c6f19d6..d57ccc8 100644 --- a/resources/views/surveyor/index.blade.php +++ b/resources/views/surveyor/index.blade.php @@ -138,23 +138,19 @@ }, user_id: { title: 'User Pemohon', - render: (item, data) => `${data.user.name}`, + render: (item, data) => data.user ? `${data.user.name}` : 'N/A', }, branch_id: { title: 'Cabang Pemohon', - render: (item, data) => `${data.branch.name}`, - }, - debitur_id: { - title: 'Debitur', - render: (item, data) => `${data.debiture.name}`, + render: (item, data) => data.branch ? `${data.branch.name}` : 'N/A', }, tujuan_penilaian_id: { title: 'Tujuan Penilaian', - render: (item, data) => `${data.tujuan_penilaian.name}`, + render: (item, data) => data.tujuan_penilaian ? `${data.tujuan_penilaian.name}` : 'N/A', }, jenis_fasilitas_kredit_id: { title: 'Fasilitas Kredit', - render: (item, data) => `${data.jenis_fasilitas_kredit.name}`, + render: (item, data) => data.jenis_fasilitas_kredit ? `${data.jenis_fasilitas_kredit.name}` : 'N/A', }, actions: { title: 'Action', From 98f6e9cf3cf5162342b0fab146adfc0654d687d4 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 24 Dec 2024 14:56:11 +0700 Subject: [PATCH 07/21] Tambahkan kolom "Debitur" pada tabel surveyor - Menambahkan kolom baru dengan judul "Debitur" di tabel pada halaman surveyor. - Data diambil dari properti `debiture.name` atau ditampilkan sebagai "N/A" jika tidak tersedia. --- resources/views/surveyor/index.blade.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php index d57ccc8..0abd3b0 100644 --- a/resources/views/surveyor/index.blade.php +++ b/resources/views/surveyor/index.blade.php @@ -144,6 +144,12 @@ title: 'Cabang Pemohon', render: (item, data) => data.branch ? `${data.branch.name}` : 'N/A', }, + debitur_id: { + title: 'Debitur', + render: (item, data) => { + return data.debiture ? `${data.debiture.name}` : 'N/A'; + }, + }, tujuan_penilaian_id: { title: 'Tujuan Penilaian', render: (item, data) => data.tujuan_penilaian ? `${data.tujuan_penilaian.name}` : 'N/A', From c15e08e7c51248aafb37c0cd9d48d930b39122a2 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 25 Dec 2024 07:52:19 +0700 Subject: [PATCH 08/21] Tambahkan validasi form untuk data debitur - Menambahkan properti `id` pada elemen form untuk mempermudah manipulasi DOM. - Menandai field wajib dengan tanda bintang (*) dan memastikan validasi untuk field yang diperlukan. - Menambahkan script JavaScript untuk validasi input form secara dinamis, termasuk cek keberadaan data dan memberikan feedback error real-time. - Menambahkan event listener untuk memastikan semua field tervalidasi sebelum pengiriman form. --- .../debitur/components/debitur.blade.php | 167 ++++++++++++++++-- 1 file changed, 153 insertions(+), 14 deletions(-) diff --git a/resources/views/debitur/components/debitur.blade.php b/resources/views/debitur/components/debitur.blade.php index 157ad1b..c873210 100644 --- a/resources/views/debitur/components/debitur.blade.php +++ b/resources/views/debitur/components/debitur.blade.php @@ -1,12 +1,15 @@ -
+ @if(isset($debitur->id)) @method('PUT') @endif @csrf
-
-
-
@@ -120,6 +115,11 @@
@@ -129,6 +129,11 @@
@@ -138,23 +143,36 @@
- +
- +
- +
- + +
+
+ +
+ +
+
@@ -167,7 +185,6 @@
-

@@ -181,7 +198,7 @@
- +
@@ -190,12 +207,12 @@
- @if (!empty($forminspeksi['hasil_survey'])) - @foreach ($forminspeksi['hasil_survey'] as $index => $positif) + @if (!empty($memo->hasil_survey)) + @foreach ($memo->hasil_survey as $index => $positif)
@@ -204,13 +221,13 @@
@endif
@@ -220,28 +237,28 @@
- @if (!empty($forminspeksi['kesimpulan_saran'])) - @foreach ($forminspeksi['kesimpulan_saran'] as $index => $negatif) + @if (!empty($memo->kesimpulan_saran)) + @foreach ($memo->kesimpulan_saran as $index => $negatif)
@endforeach @else
- +
@endif
@@ -250,7 +267,6 @@
-

@@ -279,7 +295,7 @@

{{ $item }} + alt="{{ $item }}">
@@ -315,10 +331,7 @@ {{ $item['name_rute'] . ' ' . $loop->index + 1 }}

- - -
@@ -449,8 +462,6 @@ @endsection @include('lpj::surveyor.js.utils') - -