Merge remote-tracking branch 'origin/feature/senior-officer' into staging

app/Services/SaveFormInspesksiService.php

@@ -222,7 +222,7 @@ class SaveFormInspesksiService
         $tusuk_sate_key = ($data['tusuk_sate'] ?? null) === 'Ya' ? 'Ya' : 'Tidak';
 
         $tusuk_sate = [];
-        $tusuk_sate[$tusuk_sate_key] = $data['tusuk_sate_ya'] ?? null;
+        $tusuk_sate[$tusuk_sate_key] = $data['tusuk_sate_ya'] ?? "Tidak";
 
 
         return [

resources/views/penilai/components/analisa/tanah.blade.php

@@ -1,13 +1,13 @@
 <div class="no-break">
-<table style="width: 100%; ">
+    <table style="width: 100%; ">
         <tr>
             <td style="width: 100%; border: 1px solid #000; text-align: center;">
                 ANALISA TANAH
             </td>
         </tr>
-</table>
+    </table>
 
-<table style="width: 100%; ">
+    <table style="width: 100%; ">
         <tr>
             @php
                 $cekLuas = isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai']) ? 'tidak sesuai' : 'sesuai';
@@ -117,11 +117,13 @@
             <td>Tusuk Sate</td>
             <td>:</td>
             <td>
-            {{ isset($forminspeksi['tanah']['tusuk_sate']) &&  $forminspeksi['tanah']['tusuk_sate']['Ya'] ? 'Ya' : 'Tidak' }}
+                {{ isset($forminspeksi['tanah']['tusuk_sate']) && is_array($forminspeksi['tanah']['tusuk_sate']) && !empty($forminspeksi['tanah']['tusuk_sate']['Ya']) ? 'Ya' : 'Tidak' }}
-            @if (isset($forminspeksi['tanah']['tusuk_sate']) && $forminspeksi['tanah']['tusuk_sate']['Ya'])
+
+                @if (isset($forminspeksi['tanah']['tusuk_sate']) &&
+                        is_array($forminspeksi['tanah']['tusuk_sate']) &&
+                        !empty($forminspeksi['tanah']['tusuk_sate']['Ya']))
                     {{ isset($forminspeksi['tanah']['tusuk_sate_ya']) ? ' (' . $forminspeksi['tanah']['tusuk_sate_ya'] . ')' : '' }}
                 @endif
-
             </td>
         </tr>
         <tr>
@@ -149,5 +151,5 @@
 
         </tr>
 
-</table>
+    </table>
 </div>

resources/views/penilai/components/print-out-sederhana.blade.php

@@ -777,10 +777,10 @@
                             </td>
                         </tr>
                         <tr>
-                            <td style="padding: 3px; text-align: right; width:30%">
+                            <td style="padding: 3px; text-align: right; width:20%">
                                 {{ $lpjData['likuidasi'] ?? '' }}%
                             </td>
-                            <td style="padding: 3px; text-align: left; font-weight: bold; width:30%">
+                            <td style="padding: 3px; text-align: left; font-weight: bold; width:40%">
                                 <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
                             </td>
                             <td style="padding: 3px; text-align: left; width:40%;">
@@ -1020,24 +1020,6 @@
             </tr>
         </table>
     </div>
-    <div class="page-break"></div>
+
-    <table style="width: 100%; border-collapse: collapse; border: 1px solid #000;">
-        <tr>
-            <td style="width:20%; padding: 2px; border: 1px solid #000">Nama Debitur</td>
-            <td style=" width: 1%; padding: 2px; border: 1px solid #000">:</td>
-            <td style="padding: 2px; border: 1px solid #000">{{ $permohonan->debiture->name ?? '' }}</td>
-        </tr>
-        <tr>
-            <td style="padding: 2px; border: 1px solid #000">Nomor Laporan</td>
-            <td style="padding: 2px; border: 1px solid #000">:</td>
-            <td style="padding: 2px; border: 1px solid #000">{{ $nomorLaporan }}</td>
-        </tr>
-        <tr>
-            <td style="padding: 2px; border: 1px solid #000">Tanggal Laporan</td>
-            <td style="padding: 2px; border: 1px solid #000">:</td>
-            <td style="padding: 2px; border: 1px solid #000">{{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}
-            </td>
-        </tr>
-    </table>
 </main>
 @include('lpj::penilai.components.footer')

resources/views/penilai/data.json

@@ -1,26 +0,0 @@
-{
-  "kepada": " rustam",
-  "dari": "dasd",
-  "nomor_memo": "C04\/250123721\/MAK\/REG0000019\/I\/25",
-  "tanggal": "2025-03-08",
-  "perihal": "kamua harus",
-  "jenis_asset_tidak_sesuai": "Unit Apartemen",
-  "lokasi": {
-    "lokasi": "dsd",
-    "address": "Jl. Kali Pasir Kecil No.1, RT.2\/RW.1, Cikini, Kec. Menteng, Kota Jakarta Pusat, Daerah Khusus Ibukota Jakarta 10330",
-    "province_code": "35",
-    "city_code": "",
-    "district_code": "",
-    "village_code": "",
-    "tanggal_survey": "2025-03-08",
-    "penilai": "te"
-  },
-  "terlampir": ["te"],
-  "hasil_survey": ["te"],
-  "kesimpulan_saran": ["te"],
-  "foto": [
-    "\/storage\/memo_photos\/1741367564_1. Tampak Akses Jalan Menuju Objek Penilaian.png",
-    "\/storage\/memo_photos\/1741367564_2. Tampak Akses Jalan Menuju Objek penilaian.png",
-    "\/storage\/memo_photos\/1741367564_3. Tampak Akses Jalan Menuju Objek Penilaian.png"
-  ]
-}

resources/views/surveyor/components/header.blade.php

@@ -189,6 +189,7 @@
                                     @if (isset($basicData['jenisJaminan']))
                                         @foreach ($basicData['jenisJaminan'] as $item)
                                             <option value="{{ $item->name }}"
+                                                {{ old('jenis_asset_tidak_sesuai', $selectedValue) == $item->name ? 'selected' : '' }}>
                                                 {{ old('jenis_asset_tidak_sesuai', $selectedValue) == $item->name ? 'selected' : '' }}>
                                                 {{ $item->name }}
                                             </option>

resources/views/surveyor/components/print-out/main.blade.php

@@ -309,11 +309,16 @@
                 @php
                     $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai']) ? 'sesuai' : 'tidak sesuai';
                     $selectedData = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null;
+
+                    $lainnya = isset($forminspeksi['asset']['jenis_asset']['Lainnya'])
+                        ? $forminspeksi['asset']['jenis_asset']['Lainnya']
+                        : null;
+
                 @endphp
                 <td width="25%" style="padding: 2px; vertical-align: top;">Jenis Aset</td>
                 <td width="1%" style=" vertical-align: top;">:</td>
                 <td style="vertical-align: top; width: %;">
-                    {{ $selectedData ?? '' }}
+                    {{ $selectedData ?? '' }} {{ $lainnya ?? '' }}
                 </td>
             </tr>