From 16aabd5da012e8ab998065b06fef45e420f4febb Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 14:37:52 +0700
Subject: [PATCH 1/2] fix(permohonan): ubah status_bayar menjadi nullable dan
 perbaiki tampilan form

- Mengubah validasi 'status_bayar' dari 'required' menjadi 'nullable'.
- Menambahkan ID wrapper untuk 'status_bayar' di form.
- Menyembunyikan atau menampilkan wrapper 'status_bayar' berdasarkan kondisi tertentu.
---
 app/Http/Requests/PermohonanRequest.php   | 2 +-
 resources/views/permohonan/form.blade.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php
index 3f2f252..a3a579f 100644
--- a/app/Http/Requests/PermohonanRequest.php
+++ b/app/Http/Requests/PermohonanRequest.php
@@ -23,7 +23,7 @@
                 'status'                    => 'nullable|string',
                 'jenis_fasilitas_kredit_id' => 'required|exists:jenis_fasilitas_kredit,id',
                 'nilai_plafond_id'          => 'required|exists:nilai_plafond,id',
-                'status_bayar'              => 'required|string',
+                'status_bayar'              => 'nullable|string',
                 'nilai_njop'                => 'nullable|numeric'
             ];
 
diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index 3b7b6af..f5e8371 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -64,7 +64,7 @@
                     @endphp
 
                     @foreach($formFields as $field => $config)
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <div id="{{ $field }}_wrapper" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">{{ $config['label'] }}</label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 @if($config['type'] === 'select')
@@ -114,6 +114,7 @@
             const tujuanPenilaianSelect = document.getElementById('tujuan_penilaian_id');
             const nilaiPlafondSelect = document.getElementById('nilai_plafond_id');
             const statusBayarSelect = document.getElementById('status_bayar');
+            const statusBayarWrapper = document.getElementById('status_bayar_wrapper');
 
             // Initialize TomSelect
             const statusBayarTomSelect = new window.TomSelect(statusBayarSelect, {
@@ -131,16 +132,15 @@
 
                 if (tujuanPenilaianValue === '2' && (nilaiPlafondValue === '2' || nilaiPlafondValue === '3')) {
                     statusBayarTomSelect.setValue('sudah_bayar');
-                    statusBayarTomSelect.disable();
+                    statusBayarWrapper.style.display = 'none';
                 } else {
                     @if(isset($permohonan))
                     statusBayarTomSelect.setValue('{{$permohonan->status_bayar ?? ''}}');
                     @else
                     statusBayarTomSelect.setValue('');
                     @endif
-                    statusBayarTomSelect.enable();
+                        statusBayarWrapper.style.display = 'flex';
                 }
-
                 console.log('Status Bayar:', statusBayarTomSelect.getValue());
             }
 

From 3ac83aa7fe22df44974d111db801eb63f9257891 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 5 Mar 2025 14:31:55 +0700
Subject: [PATCH 2/2] fix(surveyor/so): perbaikkan back di surveyor, luas denah
 decimal dan revisi di so

---
 app/Http/Controllers/PenilaianController.php  |  2 +-
 app/Http/Controllers/SurveyorController.php   | 21 +++++++++------
 .../surveyor/components/bangunan.blade.php    |  2 +-
 .../surveyor/components/header.blade.php      |  2 +-
 .../views/surveyor/components/tanah.blade.php |  2 +-
 resources/views/surveyor/js/utils.blade.php   | 26 ++++++++++++-------
 6 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 5e88202..616f5b9 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -891,7 +891,7 @@ class PenilaianController extends Controller
 
     public function revisiLaporan(Request $request, $id)
     {
-        $permohonan = Permohonan::findOrFail($id);
+        $permohonan = Permohonan::find($id);
         $userRole = Auth::user()->roles[0]->name;
 
         $authorization = Authorization::where('permohonan_id', $permohonan->id)
diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index d17c338..4f254df 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -292,7 +292,7 @@ class SurveyorController extends Controller
         $validator = $request->validate([
             'foto_denah.*' => 'nullable|file|mimes:jpg,jpeg,png,bmp,gif,webp,pdf',
             'nama_denah.*' => 'nullable|string|max:255',
-            'luas_denah.*' => 'nullable|numeric',
+            'luas_denah.*' => 'nullable',
             'permohonan_id' => 'required|exists:permohonan,id',
             'dokument_id' => 'required',
             'nomor_registrasi' => 'required'
@@ -2469,7 +2469,7 @@ class SurveyorController extends Controller
         $hasil_tanah = $luas_tanah_key === 'sesuai'
             ? ($data['luas_tanah_sesuai'] ?? null)
             : ($data['luas_tanah_tidak_sesuai'] ?? null);
-        $luas_tanah[$luas_tanah_key] = $hasil_tanah;
+        $luas_tanah[$luas_tanah_key] = preg_replace('/[^0-9.,]/', '', $hasil_tanah);
 
         // Hadap mata angin key
         $hadap_mata_angin_key = ($data['hadap_mata_angin'] ?? null) === 'sesuai' ? 'sesuai' : 'tidak sesuai';
@@ -2571,7 +2571,7 @@ class SurveyorController extends Controller
             : ($data['luas_tanah_bagunan_tidak_sesuai'] ?? null);
 
         // Masukkan key baru yang sesuai
-        $luas_tanah_bagunan[$luas_tanah_bagunan_key] = $hasil_tanah_bagunan;
+        $luas_tanah_bagunan[$luas_tanah_bagunan_key] = preg_replace('/[^0-9.,]/', '', $hasil_tanah_bagunan);
 
 
         return [
@@ -3255,14 +3255,19 @@ class SurveyorController extends Controller
 
     private function getUnitData($data, $request): array
     {
+        $luas_unit_key = ($data['luas_unit'] ?? null) === 'sesuai' ? 'sesuai' : 'tidak sesuai';
+        $luas_unit = [];
+
+        $hasil_luas_unit = $luas_unit_key === 'sesuai'
+            ? ($data['luas_unit_sesuai'] ?? null)
+            : ($data['luas_unit_tidak_sesuai'] ?? null);
+
+        // Masukkan key baru yang sesuai
+        $luas_luas_unit[$luas_luas_unit_key] = preg_replace('/[^0-9.,]/', '', $hasil_luas_unit);
 
         return [
             'action' => $data['action'] ?? null,
-            'luas_unit' => $this->getFieldData(
-                $data,
-                'luas_unit',
-                true
-            ),
+            'luas_unit' => $luas_luas_unit,
             'kondisi_unit' => $data['kondisi_unit'] ?? null,
             'posisi_unit' => $data['posisi_unit'] ?? null,
             'lantai' => $data['lantai'] ?? null,
diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php
index e10405a..e47c164 100644
--- a/resources/views/surveyor/components/bangunan.blade.php
+++ b/resources/views/surveyor/components/bangunan.blade.php
@@ -66,7 +66,7 @@
                                     name="luas_tanah_bagunan_tidak_sesuai" class="w-full number-format"
                                     placeholder="Masukan Luas Bangunan Tidak Sesuai..."
                                     value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? '') }}">
-                                    <i>M<sup>2</sup></i>
+
                                  </div>
                                 <button type="button" class="btn btn-md btn-primary"
                                     onclick="updateAnalisa('analisa_bangunan')">
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index fd21e6e..f8b732b 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -23,7 +23,7 @@
                     </a>
                 @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
                     @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan'))
-                        <a href="{{ route('surveyor.show', request()->get('dokument')) }}" class="btn btn-xs btn-info">
+                        <a href="{{ route('surveyor.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
                     @else
diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php
index 84409ec..a2cb070 100644
--- a/resources/views/surveyor/components/tanah.blade.php
+++ b/resources/views/surveyor/components/tanah.blade.php
@@ -55,7 +55,7 @@
                                     <input id="analisa_tanah_tidak_sesuai" type="text" name="luas_tanah_tidak_sesuai"
                                         class="w-full number-format" placeholder="Masukan Luas Tanah"
                                         value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
-                                    <i>M<sup>2</sup></i>
+
                                 </div>
                                 <button type="button" class="btn btn-md btn-primary"
                                     onclick="updateAnalisa('analisa_tanah')">Save
diff --git a/resources/views/surveyor/js/utils.blade.php b/resources/views/surveyor/js/utils.blade.php
index ebcba62..580fc70 100644
--- a/resources/views/surveyor/js/utils.blade.php
+++ b/resources/views/surveyor/js/utils.blade.php
@@ -27,19 +27,27 @@
 
 
     function formatNumber(input) {
-        // Ambil posisi kursor saat ini
-        const cursorPosition = input.selectionStart;
+    const cursorPosition = input.selectionStart;
 
-        // Ambil nilai input tanpa "m²" dan karakter non-angka
-        let value = input.value.replace(/[^\d]/g, '');
+    let value = input.value.replace(/[^0-9,]/g, '');
 
-        // Update nilai input dengan format angka dan "m²"
-        input.value = value ? value + ' m²' : 'm²';
-
-        // Atur posisi kursor di depan "m²"
-        input.setSelectionRange(cursorPosition, cursorPosition);
+    if ((value.match(/,/g) || []).length > 1) {
+        value = value.replace(/,/g, (match, offset) => (offset === value.indexOf(',') ? ',' : ''));
     }
 
+    if (value.includes(',')) {
+        const [beforeComma, afterComma] = value.split(',');
+        value = `${beforeComma},${afterComma.substring(0, 2)}`;
+    }
+
+    input.value = value ? value + ' m²' : 'm²';
+
+
+    input.setSelectionRange(cursorPosition, cursorPosition);
+}
+
+
+
 
 
     function formatCurrency(value, isDiskon = false) {