From fde792e56c3c87c7e1b789845a99a7df315d8e6f Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Thu, 13 Mar 2025 10:02:16 +0700
Subject: [PATCH] fix(penilai/surveyor): perbaikkan luas tanah, wkatu berjalan,
 tanggal survey dan ganti print out standard ke standar

---
 app/Http/Controllers/SurveyorController.php   |   1 +
 ....blade.php => print-out-standar.blade.php} |   0
 resources/views/penilai/show.blade.php        |   4 +-
 .../print-out/apartement-kantor.blade.php     | 196 ++++++++++--------
 .../components/print-out/main.blade.php       |   2 +-
 .../components/print-out/tanah.blade.php      |   2 +-
 .../views/surveyor/components/tanah.blade.php |   4 +-
 7 files changed, 119 insertions(+), 90 deletions(-)
 rename resources/views/penilai/components/{print-out-standard.blade.php => print-out-standar.blade.php} (100%)

diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 2cc6438..f695013 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -772,6 +772,7 @@ class SurveyorController extends Controller
 
             $penilaian->update([
                 'status' => 'survey-completed',
+                'updated_at' => now(),
             ]);
 
 
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standar.blade.php
similarity index 100%
rename from resources/views/penilai/components/print-out-standard.blade.php
rename to resources/views/penilai/components/print-out-standar.blade.php
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index 297f1bc..a9a1696 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -92,7 +92,7 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) ?? '' }}</p>
+                            {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) ?? '' }}</p>
                     </div>
                     @if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang']))
 
@@ -167,7 +167,7 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</p>
+                                {{ formatTanggalIndonesia($permohonan->penilaian->updated_at) }}</p>
                         </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
diff --git a/resources/views/surveyor/components/print-out/apartement-kantor.blade.php b/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
index 00e0e2c..f8a6dc2 100644
--- a/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
+++ b/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
@@ -10,24 +10,75 @@
             </td>
         </tr>
     </table>
-<table>
-    <tr>
-        @php
-            $cekLuas = isset($forminspeksi['luas_unit']['tidak sesuai']) ? 'tidak sesuai' : 'sesuai';
+    <table>
+        <tr>
+
+
+            @php
+
+                $cekLuas =
+                    old('luas_unit_radio') ??
+                    (isset($forminspeksiluas_unit['luas_unit']['tidak sesuai']) ? 'tidak sesuai' : 'sesuai');
+
+                $luasSesuai = $forminspeksiluas_unit['luas_unit']['sesuai'] ?? null;
+                $luasTidakSesuai = $forminspeksiluas_unit['luas_unit']['tidak sesuai'] ?? null;
+            @endphp
+            <td style="padding: 2px;">Luas Unit</td>
+            <td style="padding: 2px;">:</td>
+            <td width="" style="text-align: left">
+                <table>
+                    <tr>
+                        <td>
+                            <label>
+                                <input type="radio" name="luas_tanah_radio" value="sesuai"
+                                    {{ $cekLuas == 'sesuai' ? 'checked' : '' }}>
+                                Sesuai {{ $luasSesuai ? '- ' . $luasSesuai . ' m²' : '' }}
+                            </label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label>
+                                <input type="radio" name="luas_tanah_radio" value="tidak sesuai"
+                                    {{ $cekLuas == 'tidak sesuai' ? 'checked' : '' }}>
+                                Tidak Sesuai {{ $luasTidakSesuai ? '- ' . $luasTidakSesuai . ' m² (luas fisik)' : '' }}
+                            </label>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+
+        </tr>
+        <tr>
+            <td><strong>Bentuk Unit</strong></td>
+            <td>
+                @if (isset($basicData['bentukUnit']))
+                    <table class="checkbox-list">
+                        <tr>
+                            @foreach ($basicData['bentukUnit'] as $index => $item)
+                                @if ($index % 3 == 0 && $index > 0)
+                        </tr>
+                        <tr>
+                @endif
+            <td class="checkbox-item">
+                <label class="checkbox-label">
+                    <input type="checkbox"
+                        {{ isset($forminspeksi['bentuk_unit']) && in_array($item->name, $forminspeksi['bentuk_unit']) ? 'checked' : '' }}>
+                    {{ $item->name }}
+                </label>
+            </td>
+            @endforeach
+        </tr>
+    </table>
+    @endif
 
-            $luas = $forminspeksi['luas_unit'][$cekLuas] ?? null;
-        @endphp
-        <td style="padding: 2px;">Luas Unit</td>
-        <td style="padding: 2px;">:</td>
-        <td style="padding: 2px;">{{ $luas ?? '' }}</td>
-    </tr>
     <tr>
-        <td><strong>Bentuk Unit</strong></td>
+        <td><strong>Kondisi Unit</strong></td>
         <td>
-            @if (isset($basicData['bentukUnit']))
+            @if (isset($basicData['kondisiUnit']))
                 <table class="checkbox-list">
                     <tr>
-                        @foreach ($basicData['bentukUnit'] as $index => $item)
+                        @foreach ($basicData['kondisiUnit'] as $index => $item)
                             @if ($index % 3 == 0 && $index > 0)
                     </tr>
                     <tr>
@@ -35,80 +86,57 @@
         <td class="checkbox-item">
             <label class="checkbox-label">
                 <input type="checkbox"
-                    {{ isset($forminspeksi['bentuk_unit']) && in_array($item->name, $forminspeksi['bentuk_unit']) ? 'checked' : '' }}>
+                    {{ isset($forminspeksi['kondisi_unit']) && in_array($item->name, $forminspeksi['kondisi_unit']) ? 'checked' : '' }}>
                 {{ $item->name }}
             </label>
         </td>
         @endforeach
     </tr>
-</table>
-@endif
-
-<tr>
-    <td><strong>Kondisi Unit</strong></td>
-    <td>
-        @if (isset($basicData['kondisiUnit']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['kondisiUnit'] as $index => $item)
-                        @if ($index % 3 == 0 && $index > 0)
-                </tr>
-                <tr>
-        @endif
-    <td class="checkbox-item">
-        <label class="checkbox-label">
-            <input type="checkbox"
-                {{ isset($forminspeksi['kondisi_unit']) && in_array($item->name, $forminspeksi['kondisi_unit']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-<tr>
-    <td><strong>Posisi Unit</strong></td>
-    <td>
-        @if (isset($basicData['posisiUnit']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['posisiUnit'] as $index => $item)
-                        @if ($index % 3 == 0 && $index > 0)
-                </tr>
-                <tr>
-        @endif
-    <td class="checkbox-item">
-        <label class="checkbox-label">
-            <input type="checkbox"
-                {{ isset($forminspeksi['posisi_unit']) && in_array($item->name, $forminspeksi['posisi_unit']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-<tr>
-    <td><strong>View Unit</strong></td>
-    <td>
-        @if (isset($basicData['view']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['view'] as $index => $item)
-                        @if ($index % 3 == 0 && $index > 0)
-                </tr>
-                <tr>
-        @endif
-    <td class="checkbox-item">
-        <label class="checkbox-label">
-            <input type="checkbox"
-                {{ isset($forminspeksi['view']) && in_array($item->name, $forminspeksi['view']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</table>
+    </table>
+    @endif
+    <tr>
+        <td><strong>Posisi Unit</strong></td>
+        <td>
+            @if (isset($basicData['posisiUnit']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['posisiUnit'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
+            <label class="checkbox-label">
+                <input type="checkbox"
+                    {{ isset($forminspeksi['posisi_unit']) && in_array($item->name, $forminspeksi['posisi_unit']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    <tr>
+        <td><strong>View Unit</strong></td>
+        <td>
+            @if (isset($basicData['view']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['view'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
+            <label class="checkbox-label">
+                <input type="checkbox"
+                    {{ isset($forminspeksi['view']) && in_array($item->name, $forminspeksi['view']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    </table>
 </div>
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index 39e8bd2..96109a1 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -274,7 +274,7 @@
                                 Tanggal Survey</td>
                             <td style="width: 1%; padding: 2px;">:</td>
                             <td style="vertical-align: top;  padding: 2px;">
-                                {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
+                                {{ formatTanggalIndonesia($permohonan->penilaian->updated_at) }}</td>
                         </tr>
                         <tr>
                             <td style="width: 25%; padding: 2px; vertical-align: top;">Pihak Bank</td>
diff --git a/resources/views/surveyor/components/print-out/tanah.blade.php b/resources/views/surveyor/components/print-out/tanah.blade.php
index 1654c21..15581b1 100644
--- a/resources/views/surveyor/components/print-out/tanah.blade.php
+++ b/resources/views/surveyor/components/print-out/tanah.blade.php
@@ -41,7 +41,7 @@
                             <label>
                                 <input type="radio" name="luas_tanah_radio" value="tidak sesuai"
                                     {{ $cekLuas == 'tidak sesuai' ? 'checked' : '' }}>
-                                Tidak Sesuai {{ $luasTidakSesuai ? '- ' . $luasTidakSesuai . ' m²' : '' }}
+                                Tidak Sesuai {{ $luasTidakSesuai ? '- ' . $luasTidakSesuai . ' m² (luas fisik)' : '' }}
                             </label>
                         </td>
                     </tr>
diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php
index ea7f5db..431532c 100644
--- a/resources/views/surveyor/components/tanah.blade.php
+++ b/resources/views/surveyor/components/tanah.blade.php
@@ -186,12 +186,12 @@
                                     @if (strcasecmp($item->name, 'Lebih Tinggi') == 0)
                                         <input id="input-lebih-tinggi" type="text"
                                             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="m"
+                                            name="ketinggian_lebih_tinggi" class="input w-full mt-2" placeholder="Masukkan Ketinggian..."
                                             value="{{ old('ketinggian_lebih_tinggi', $forminspeksi['tanah']['ketinggian_tanah']['lebih_tinggi'] ?? '') }}" />
                                     @elseif (strcasecmp($item->name, 'Lebih Rendah') == 0)
                                         <input id="input-lebih-rendah" type="text"
                                             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="m"
+                                            name="ketinggian_lebih_rendah" class="input w-full mt-2" placeholder="Masukkan Ketinggian..."
                                             value="{{ old('ketinggian_lebih_rendah', $forminspeksi['tanah']['ketinggian_tanah']['lebih_rendah'] ?? '') }}" />
                                     @endif