From c1b573a275bc27fdf76b75f12c455db87cb543e3 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Fri, 10 Jan 2025 15:53:58 +0700
Subject: [PATCH] perbaikan print out memo, resume, rap , standard dan
 sederhana

---
 app/Http/Controllers/PenilaiController.php    |   7 +-
 .../components/foto-lampiran.blade.php        |   2 +
 .../penilai/components/print-memo.blade.php   |  22 +-
 .../components/print-out-rap.blade.php        |  18 +-
 .../components/print-out-sederhana.blade.php  | 240 +++++++------
 .../components/print-out-standard.blade.php   | 319 ++++++++++++------
 .../penilai/components/print-resume.blade.php |  18 +-
 7 files changed, 385 insertions(+), 241 deletions(-)

diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 21643e0..f1c1660 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -764,6 +764,7 @@ class PenilaiController extends Controller
         $lpj = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
 
         $nomorLaporan = getNomorLaporan($permohonanId, $documentId);
+        $tanggalLaporan =  $lpj->created_at ?? null;
         $forminspeksi = null;
         $lpjData = null;
         $formFoto  = null;
@@ -808,7 +809,8 @@ class PenilaiController extends Controller
                     'dataPembanding',
                     'nomorLaporan',
                     'memo',
-                    'resumeData'
+                    'resumeData',
+                    'tanggalLaporan'
                 ));
 
                 $pdf->setPaper('A4', 'portrait');
@@ -828,7 +830,8 @@ class PenilaiController extends Controller
                     'dataPembanding',
                     'nomorLaporan',
                     'memo',
-                    'resumeData'
+                    'resumeData',
+                    'tanggalLaporan'
                 ));
 
                 // return $pdf;
diff --git a/resources/views/penilai/components/foto-lampiran.blade.php b/resources/views/penilai/components/foto-lampiran.blade.php
index 5882d84..f2396fe 100644
--- a/resources/views/penilai/components/foto-lampiran.blade.php
+++ b/resources/views/penilai/components/foto-lampiran.blade.php
@@ -89,6 +89,7 @@
             @foreach ($formFoto['foto_lantai_unit'] as $floorIndex => $floorPhotos)
                 <div class="mt-5">
                     @foreach ($floorPhotos as $index => $item)
+                    @if (is_int($index) && isset($item['name'], $item['path']) && is_string($item['path']))
                         <div class="flex items-center justify-between mt-3">
                             <div class="grid gap-3">
                                 <h3 class="text-gray-600 font-semibold text-lg">
@@ -101,6 +102,7 @@
                                 </div>
                             </div>
                         </div>
+                        @endif
                     @endforeach
                 </div>
             @endforeach
diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index e78c721..552b475 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -157,7 +157,7 @@
         <table>
             <tr>
                 <td>
-                    Menindak lanjuti permintann penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang Ternate
+                    Menindak lanjuti permintann penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang  {{ $permohonan->debiture->branch->name ?? '' }}
                     tanggal , dapat di sampaikan sebagai berikut:
                 </td>
             </tr>
@@ -368,16 +368,16 @@
         </table>
 
         <div class="page-break"></div>
-        <table style="width: 100%">
-            <tr>
-                <td style=" width: 100%; padding: 2px; border: 1px solid #000; text-align: center">FOTO JAMINAN</td>
-            </tr>
-            <tr>
-                <td>
-                    @include('lpj::penilai.components.foto-jaminan')
-                </td>
-            </tr>
-        </table>
+
+        <div class="section">
+            <div class="judul">
+                <h6 class="border" style="text-align: center">
+                    FOTO JAMINAN
+                </h6>
+            </div>
+            @include('lpj::penilai.components.foto-jaminan')
+        </div>
+
     </main>
 
     <footer>
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index a264493..8a2068c 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -327,16 +327,14 @@
 
         <div class="page-break"></div>
 
-        <table style="width: 100%;">
-            <tr>
-                <td style="width: 100%; padding: 2px; border: 1px solid #000; text-align: center;">FOTO JAMINAN</td>
-            </tr>
-            <tr>
-                <td>
-                    @include('lpj::penilai.components.foto-jaminan')
-                </td>
-            </tr>
-        </table>
+        <div class="section">
+            <div class="judul">
+                <h6 class="border" style="text-align: center">
+                    FOTO JAMINAN
+                </h6>
+            </div>
+            @include('lpj::penilai.components.foto-jaminan')
+        </div>
     </main>
 
     <footer></footer>
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 3daaa7e..7377caf 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -9,12 +9,16 @@
     <title>Laporan Penilai Jaminan</title>
 
     <style>
-        * {
-            font-size: 6px;
+        body {
+            font-family: Arial, sans-serif;
         }
 
-        h2 {
-            font-size: 10px
+        * {
+            font-size: 9px;
+        }
+
+        h3 {
+            font-size: 14px
         }
 
         /** Define the header rules **/
@@ -54,7 +58,7 @@
             left: 0;
             right: 0;
             height: 50px;
-            text-align: center;
+            text-align: left;
             border-top: 1px solid #ddd;
             padding-top: 10px;
         }
@@ -102,6 +106,12 @@
             display: block;
             margin: 0 auto;
         }
+
+        table {
+            width: 100%;
+            /* border: 1px solid #000; */
+            /* border-collapse: collapse; */
+        }
     </style>
 
 </head>
@@ -226,12 +236,12 @@
                         <tr>
                             <td style="padding: 2px;">Tanggal Laporan</td>
                             <td style="padding: 2px;">:</td>
-                            <td style="padding: 2px;"></td>
+                            <td style="padding: 2px;">{{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}</td>
                         </tr>
                         <tr>
                             <td style="padding: 2px;">Waktu Penyelesaian</td>
                             <td style="padding: 2px;">:</td>
-                            <td style="padding: 2px;">-</td>
+                            <td style="padding: 2px;">{{hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan)}}</td>
                         </tr>
                     </table>
                 </td>
@@ -283,7 +293,7 @@
                             @foreach ($dokumen->detail as $details)
                                 <tr>
                                     <td style=" padding: 2px;">
-                                        <strong>{{ $details->jenisLegalitasJaminan->name ?? '' }}</strong>
+                                       {{ $details->jenisLegalitasJaminan->name ?? '' }}
                                     </td>
                                     <td style=" padding: 2px;">:</td>
                                     <td style=" padding: 2px;">
@@ -690,10 +700,6 @@
                             @endif
                         @endif
                     @endforeach
-
-
-
-
                 </td>
 
                 <td style="width: 50%; vertical-align: top;">
@@ -846,15 +852,10 @@
                         $exportData = [];
                         if (isset($dataPembanding['data_pembanding'])) {
                             foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
-                                if ($index == 0) {
-                                    $exportData['pembanding1'] = $pembanding;
-                                } elseif ($index == 1) {
-                                    $exportData['pembanding2'] = $pembanding;
-                                } elseif ($index == 2) {
-                                    $exportData['pembanding3'] = $pembanding;
-                                }
+                                $exportData['pembanding' . ($index + 1)] = $pembanding;
                             }
                         }
+
                         $fields = [
                             'nama_nara_sumber' => 'Marketing',
                             'nomor_tlp' => 'No Telepon',
@@ -866,10 +867,13 @@
                             'harga_diskon' => 'Indikasi Harga Transaksi',
                         ];
                     @endphp
-                    @foreach (['pembanding1', 'pembanding2', 'pembanding3'] as $index => $pembanding)
-                        <table style="width: 100%; margin-bottom: 5px;">
+
+                    @foreach ($exportData as $index => $data)
+                        <table style="width: 100%; margin-bottom: 15px; border-bottom: 1px solid #ddd;">
                             <tr>
-                                <td style="font-weight: bold;">Pembanding {{ $index + 1 }}</td>
+                                <td style="font-weight: bold; padding-bottom: 8px;">
+                                    Pembanding {{ substr($index, -1) }}
+                                </td>
                             </tr>
                             @foreach ($fields as $key => $label)
                                 <tr>
@@ -877,11 +881,11 @@
                                     <td style="width: 5%;">:</td>
                                     <td style="width: 62%;">
                                         @if ($key == 'luas_tanah' || $key == 'luas_bangunan')
-                                            {{ $exportData[$pembanding][$key] ?? '-' }} m²
+                                            {{ $data[$key] ?? '-' }} m²
                                         @elseif($key == 'harga' || $key == 'harga_diskon')
-                                            Rp. {{ $exportData[$pembanding][$key] ?? '-' }}
+                                            Rp. {{ $data[$key] ?? 0 }}
                                         @else
-                                            {{ $exportData[$pembanding][$key] ?? '-' }}
+                                            {{ $data[$key] ?? '-' }}
                                         @endif
                                     </td>
                                 </tr>
@@ -893,9 +897,6 @@
         </table>
 
 
-        </tr>
-        </table>
-
         <table style="width: 100%">
             <tr>
                 <td style="border: 1px solid #000; "> <strong>F. INFORMASI NILAI</strong>
@@ -905,42 +906,67 @@
 
         <table style="width: 100%;">
             <tr>
-                <td colspan="3" style="padding: 8px;">
+                <td style="padding: 8px; width: 100%;">
                     <table style="width: 100%; border-collapse: collapse;">
                         <tr>
                             <td colspan="3" style="padding: 8px; text-align: left;">
                                 <strong>a. Total Nilai Pasar Wajar</strong>
                             </td>
                         </tr>
+                        @php
+                            $labelNilai = [
+                                'bangunan' => 'Luas Bangunan',
+                                'tanah' => 'Luas Tanah',
+                                'apartement-kantor' => 'Luas Apartemen/Kantor',
+                                'alat-berat' => 'Luas Alat Berat',
+                                'mesin' => 'Luas Mesin',
+                                'kendaraan' => 'Luas Kendaraan',
+                                'pesawat' => 'Luas Pesawat',
+                                'kapal' => 'Luas Kapal',
+                            ];
+                        @endphp
+                        @foreach ($labelNilai as $key => $label)
+                            @if (isset($lpjData['luas_' . $key]))
+                                <tr>
+                                    <td style="padding: 3px; text-align: right; width:30%; ">
+                                        {{ $label }} {{ $lpjData['luas_' . $key] ?? '' }} m<sup>2</sup>
+                                    </td>
+                                    <td style="padding: 3px; width:30%;">
+                                        <span style="padding-left:20px; padding-right: 20px">X</span> Rp
+                                        {{ $lpjData['nilai_' . $key . '_1'] ?? '' }}
+                                    </td>
+                                    <td style="padding: 3px; text-align: left; width:40%;">
+                                        <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
+                                        {{ $lpjData['nilai_' . $key . '_2'] ?? '' }}
+                                    </td>
+                                </tr>
+                            @endif
+                        @endforeach
+                        @if (isset($lpjData['npw_tambahan']))
+                            @foreach ($lpjData['npw_tambahan'] as $npw)
+                                <tr>
+                                    <td style="padding: 3px; text-align: right;">
+                                        {{ $npw['name'] }} {{ $npw['luas'] }} m<sup>2</sup>
+                                    </td>
+                                    <td style="padding: 3px;">
+                                        <span style="padding-left:20px; padding-right: 20px">X</span> Rp
+                                        {{ $npw['nilai_1'] }}
+                                    </td>
+                                    <td style="padding: 3px; text-align: left; width:40%">
+                                        <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
+                                        {{ $npw['nilai_2'] }}
+                                    </td>
+                                </tr>
+                            @endforeach
+                        @endif
                         <tr>
-                            <td style="padding: 8px; text-align: right;">Luas Tanah
-                                {{ $lpjData['luas_tanah'] ?? '' }}m<sup>2</sup>
-                            </td>
-                            <td style="padding: 8px; text-align: right;">X {{ $lpjData['nilai_tanah_1'] ?? '' }}</td>
-                            <td style="padding: 8px; text-align: right;">= {{ $lpjData['nilai_tanah_2'] ?? '' }}</td>
-                        </tr>
-                        <tr>
-                            <td style="padding: 8px; text-align: right;">Luas Bangunan
-                                {{ $lpjData['luas_bangunan'] ?? '' }}m<sup>2</sup>
-                            </td>
-                            <td style="padding: 8px; text-align: right;">X {{ $lpjData['nilai_bangunan_1'] ?? '' }}
-                            </td>
-                            <td style="padding: 8px; text-align: right;">= {{ $lpjData['nilai_bangunan_2'] ?? '' }}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="padding: 8px; text-align: right;">Sarana Pelengkap
-                                {{ $lpjData['sarana_pelengkap_penilai'] ?? '' }}m<sup>2</sup>
-                            </td>
-                            <td style="padding: 8px; text-align: right;">X
-                                {{ $lpjData['nilai_sarana_pelengkap_1'] ?? '' }}</td>
-                            <td style="padding: 8px; text-align: right;">=
-                                {{ $lpjData['nilai_sarana_pelengkap_2'] ?? '' }}</td>
-                        </tr>
-                        <tr>
-                            <td style="padding: 8px; font-weight: bold;">Total Nilai Pasar Wajar</td>
-                            <td colspan="2" style="padding: 8px; text-align: right; font-weight: bold;">=
-                                {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }}
+                            <td style="padding: 3px; font-weight: bold; width:30%;">Total Nilai Pasar Wajar</td>
+                            <td style="padding: 3px; text-align: right; font-weight: bold; width:30%"></td>
+                            <td style="padding: 3px; text-align: left; font-weight: bold; width: 40%;">
+                                <span style="padding-left: 20px; padding-right: 20px;">=</span>
+                                <div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
+                                    Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }}
+                                </div>
                             </td>
                         </tr>
                         <tr>
@@ -949,10 +975,14 @@
                             </td>
                         </tr>
                         <tr>
-                            <td style="padding: 8px; text-align: right;">
-                                {{ $lpjData['likuidasi'] ?? '' }}% X Total Nilai Pasar Wajar
+                            <td style="padding: 3px; text-align: right; width:30%">
+                                {{ $lpjData['likuidasi'] ?? '' }}%
                             </td>
-                            <td colspan="2" style="padding: 8px; text-align: right;">=
+                            <td style="padding: 3px; text-align: left; font-weight: bold; width:30%">
+                                <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
+                            </td>
+                            <td style="padding: 3px; text-align: left; width:40%;">
+                                <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
                                 {{ $lpjData['likuidasi_nilai_1'] ?? '' }}
                             </td>
                         </tr>
@@ -976,7 +1006,7 @@
                                 <table style="width: 100%; border-collapse: collapse;">
                                     @foreach ($forminspeksi['fakta']['fakta_positif'] as $key => $item)
                                         <tr>
-                                            <td>[{{ $key }}] {{ $item }}</td>
+                                            <td>{!! nl2br(e($item)) !!}</td>
                                         </tr>
                                     @endforeach
                                 </table>
@@ -990,16 +1020,13 @@
                                 <table style="width: 100%; border-collapse: collapse;">
                                     @foreach ($forminspeksi['fakta']['fakta_negatif'] as $key => $item)
                                         <tr>
-                                            <td>[{{ $key }}] {{ $item }}</td>
+                                            <td>{!! nl2br(e($item)) !!}</td>
                                         </tr>
                                     @endforeach
                                 </table>
                             @endisset
                         </td>
                     </tr>
-
-
-
                 </table>
             </tr>
 
@@ -1039,61 +1066,66 @@
             <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"></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"></td>
+                <td style="padding: 2px; border: 1px solid #000">{{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}</td>
             </tr>
         </table>
+        <div class="section">
+            <div class="judul" >
+                <h6 class="border" style="text-align: center">
+                    PETA
+                </h6>
+            </div>
 
-        <table style="width: 100%">
-            <tr>
-                <td style=" width: 100%; padding: 2px; border: 1px solid #000; text-align: center">PETA</td>
-            </tr>
+            <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;">
+                @php
+                    $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
+                    // Memindahkan foto_tempat ke depan jika ada
+                    if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
+                        unset($fotoTypes[$key]);
+                        array_unshift($fotoTypes, 'foto_tempat');
+                    }
+                @endphp
 
-            <tr>
-                <td>
-                    @php
-                        $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
-                        if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
-                            unset($fotoTypes[$key]);
-                            array_unshift($fotoTypes, 'foto_tempat');
-                        }
-                    @endphp
-
-                        @if (isset($forminspeksi))
-                        @forelse ($fotoTypes as $type)
-                    <div class="border photo-item">
+                @if (isset($forminspeksi))
+                    @foreach ($fotoTypes as $type)
                         @php
                             $imagePath = $forminspeksi[$type] ?? null;
                         @endphp
 
                         @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
-                            <img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $type }}"
-                                class="photo-image">
+                            <div style="border: 1px solid #ddd; padding: 10px; text-align: center;">
+                                <img src="{{ storage_path('app/public/' . $imagePath) }}"
+                                    alt="{{ $type }}"
+                                    style="max-width: 100%; height: auto; margin-bottom: 10px;">
+                                <p style="margin: 0; font-size: 14px;">
+                                    {{ Str::title(str_replace('_', ' ', $type)) }}
+                                </p>
+                            </div>
                         @endif
-                        <p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p>
-                    </div>
-                @empty
-                    <p>Tidak ada tipe foto yang tersedia</p>
-                @endforelse
-                        @endif
-                </td>
-            </tr>
+                    @endforeach
+                @endif
+            </div>
+        </div>
+
+        <div class="section">
+            <div class="judul">
+                <h6 class="border" style="text-align: center">
+                    FOTO JAMINAN
+                </h6>
+            </div>
+            @include('lpj::penilai.components.foto-jaminan')
+        </div>
+        </div>
 
-            <tr>
-                <td style=" width: 100%; padding: 2px; border: 1px solid #000; text-align: center">FOTO JAMINAN</td>
-            </tr>
-            <tr>
-                <td>
-                    @include('lpj::penilai.components.foto-jaminan')
-                </td>
-            </tr>
-        </table>
     </main>
-    <footer id="footer"></footer>
+    <footer id="footer">
+        Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
+    </footer>
 
     <script>
         const datas = @json($forminspeksi);
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php
index 603f29e..20e9246 100644
--- a/resources/views/penilai/components/print-out-standard.blade.php
+++ b/resources/views/penilai/components/print-out-standard.blade.php
@@ -159,12 +159,12 @@
         label.checkbox-label {
             display: flex;
             align-items: center;
-            font-size: 6px;
+            font-size: 8px;
         }
 
         label.checkbox-label input[type="checkbox"] {
             margin-right: 6px;
-            transform: scale(1.0);
+            transform: scale(1.3);
             /* Memperkecil ukuran checkbox */
         }
 
@@ -185,7 +185,7 @@
             left: 0;
             right: 0;
             height: 50px;
-            text-align: center;
+            text-align: right;
             border-top: 1px solid #ddd;
             padding-top: 10px;
         }
@@ -244,28 +244,35 @@
 
         <div class="container">
             <div class="header">
-                <table style="width: 100%; border: none; table-layout: fixed;">
+                <table style="width: 100%; border: none; table-layout: fixed; margin-bottom: 10px;">
                     <tr>
-                        <td style="width: 50%; text-align: left; padding-right: 10px;">
-                            @include('lpj::component.logo-bag')
+                        <td style="text-align: left; padding-right: 10px;">
+                            @include('lpj::component.logo-bag', ['width' => 190, 'height' => 45.51])
                         </td>
-                        <td style="width: 50%; text-align: right; padding-left: 10px;">
-                            <h3>Tanggal : {{ date('Y-m-d') }}</h3>
-                            <h3>Waktu : {{ date('H:i:s') }}</h3>
-                            <h3>User : {{ Auth::user()->name }}</h3>
+                        <td style="text-align: right;">
+                            <div style="">
+                                <p>Tanggal: {{ date('Y-m-d') }}</p>
+                                <p>Waktu: {{ date('H:i:s') }}</p>
+                                <p>User: {{ Auth::user()->name }}</p>
+                            </div>
                         </td>
                     </tr>
                 </table>
 
-                <h4 style="text-align: center; text-transform: uppercase; font-size: 14px;">LAPORAN PENILAIAN ATAS
-                    {{ $data }}</h4>
-                <p style="text-align: center; font-size:12px;">NO:
-                    {{ $nomorLaporan }}
-                </p>
+
+                <div style="text-align: center; margin-top: 5px;">
+                    <h4 style="text-transform: uppercase; font-size: 16px; margin: 0;">LAPORAN PENILAIAN ATAS
+                        {{ $data }}</h4>
+                    <p style="font-size: 12px; margin: 5px 0;">NO: {{ $nomorLaporan }}</p>
+                </div>
+
             </div>
 
             <div class="section">
+
                 <div class="judul">
+                    <div style="text-align: left; margin-bottom: 10px;">
+                        Cabang : {{ $permohonan->debiture->branch->name ?? '' }}</div>
                     <table class="judul-table">
                         <tr>
                             <td class="border1">
@@ -1258,18 +1265,18 @@
                         </tr>
                     </table>
                 </div>
-                <table>
+                <table style="width: 100%">
                     <tr>
                         <td>1. Kesimpulan dan saran penilai:</td>
                     </tr>
                     <tr>
                         <td width="25%" style="vertical-align: top;"><strong>Faktor Positif</strong></td>
-                        <td>
+                        <td width="100%">
                             @isset($forminspeksi['fakta']['fakta_positif'])
                                 <table style="width: 100%; border-collapse: collapse;">
                                     @foreach ($forminspeksi['fakta']['fakta_positif'] as $key => $item)
                                         <tr>
-                                            <td>[{{ $key }}] {{ $item }}</td>
+                                            <td>{!! nl2br(e($item)) !!}</td>
                                         </tr>
                                     @endforeach
                                 </table>
@@ -1294,7 +1301,7 @@
                                 <table style="width: 100%; border-collapse: collapse;">
                                     @foreach ($faktaNegatifFiltered as $key => $item)
                                         <tr>
-                                            <td>[{{ $key + 1 }}] {{ $item }}</td>
+                                            <td>{!! nl2br(e($item)) !!}</td>
                                         </tr>
                                     @endforeach
                                 </table>
@@ -1308,45 +1315,47 @@
                     <tr>
                         <td width="25%" style="vertical-align: top;"><strong>Lain - lain :</strong></td>
                         <td>
-                            <p>- Berdasarkan hasil kunjungan di lapangan dapat disampaikan sebagai berikut :</p>
+                            <p>{{ $forminspeksi['fakta']['keterangan'] ?? '' }}</p>
+                            <p>{{ $forminspeksi['fakta']['rute_menuju'] ?? '' }}</p>
 
+                            @foreach ($forminspeksi['fakta']['informasi_dokument'] ?? [] as $informasi)
+                                <p>{!! nl2br(e($informasi)) !!}</p>
+                            @endforeach
+
+                            @foreach ($forminspeksi['fakta']['kondisi_lingkungan'] ?? [] as $kondisi)
+                                <p>{!! nl2br(e($kondisi)) !!}</p>
+                            @endforeach
+
+                            @foreach ($forminspeksi['fakta']['batas_batas_input'] ?? [] as $arah => $batas)
+                                @if ($batas)
+                                    <p> - {{ $arah }} : {{ $batas }}</p>
+                                @endif
+                            @endforeach
+
+                            @foreach ($forminspeksi['fakta']['kondisi_lain_bangunan'] ?? [] as $kondisiLain)
+                                <p>{!! nl2br(e($kondisiLain)) !!}</p>
+                            @endforeach
                             @php
-                                $excludedKeys = [
-                                    'fakta_positif',
-                                    'fakta_negatif',
-                                    'rute_menuju',
-                                    'batas_batas',
-                                    'batas_batas_input',
-                                    'kondisi_lingkungan',
-                                    'kondisi_lain_bangunan',
-                                    'informasi_dokument',
-                                ];
+                            $informasi = [
+                                'peruntukan',
+                                'kdb',
+                                'kdh',
+                                'gsb',
+                                'max_lantai',
+                                'klb',
+                                'gss',
+                                'pelebaran_jalan',
+                                'nama_petugas'
+                            ];
+                        @endphp
 
-                                $additionalFakta = [];
-                                if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) {
-                                    foreach ($forminspeksi['fakta'] as $key => $item) {
-                                        // Cek apakah key tidak ada di daftar yang dikecualikan
-                                        if (!in_array($key, $excludedKeys)) {
-                                            // Pastikan item bukan array kosong atau null
-                                            if (!empty($item) && (!is_array($item) || count($item) > 0)) {
-                                                $additionalFakta[$key] = $item;
-                                            }
-                                        }
-                                    }
-                                }
-                            @endphp
-
-                            @if (!empty($additionalFakta))
-                                @foreach ($additionalFakta as $key => $item)
-                                    @if (is_array($item))
-                                        <p>{{ $key }}: {{ implode(', ', array_filter($item)) }}</p>
-                                    @else
-                                        <p>{{ $item }}</p>
-                                    @endif
-                                @endforeach
-                            @else
-                                <p>Tidak ada informasi tambahan yang dapat disampaikan.</p>
+                        @foreach ($informasi as $key)
+                            @if(isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
+                                <p> - {{ ucfirst(str_replace('_', ' ', $key)) }}: {{ $forminspeksi['fakta'][$key] }}</p>
                             @endif
+                        @endforeach
+
+
                         </td>
                     </tr>
 
@@ -1354,8 +1363,52 @@
                         <td>2. Informasi Harga:</td>
                     </tr>
                     <tr>
-                        <td width="25%" style="vertical-align: top;"><strong>Lain - lain :</strong></td>
+                        <td width="25%" style="vertical-align: top;"><strong>Instansi yang relevan :</strong></td>
                         <td>
+                            @php
+                                $exportData = [];
+                                if (isset($dataPembanding['data_pembanding'])) {
+                                    foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
+                                        $exportData['pembanding' . ($index + 1)] = $pembanding;
+                                    }
+                                }
+
+                                $fields = [
+                                    'nama_nara_sumber' => 'Marketing',
+                                    'nomor_tlp' => 'No Telepon',
+                                    'address' => 'Alamat Data',
+                                    'status_nara_sumber' => 'Status Narasumber',
+                                    'luas_tanah' => 'Luas Tanah',
+                                    'luas_bangunan' => 'Luas Bangunan',
+                                    'harga' => 'Harga',
+                                    'harga_diskon' => 'Indikasi Harga Transaksi',
+                                ];
+                            @endphp
+
+                            @foreach ($exportData as $index => $data)
+                                <table style="width: 100%; margin-bottom: 15px; border-bottom: 1px solid #ddd;">
+                                    <tr>
+                                        <td style="font-weight: bold; padding-bottom: 8px;">
+                                            Pembanding {{ substr($index, -1) }}
+                                        </td>
+                                    </tr>
+                                    @foreach ($fields as $key => $label)
+                                        <tr>
+                                            <td style="width: 33%;">{{ $label }}</td>
+                                            <td style="width: 5%;">:</td>
+                                            <td style="width: 62%;">
+                                                @if ($key == 'luas_tanah' || $key == 'luas_bangunan')
+                                                    {{ $data[$key] ?? '-' }} m²
+                                                @elseif($key == 'harga' || $key == 'harga_diskon')
+                                                    Rp. {{ $data[$key] ?? 0 }}
+                                                @else
+                                                    {{ $data[$key] ?? '-' }}
+                                                @endif
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </table>
+                            @endforeach
                         </td>
                     </tr>
                     <tr>
@@ -1364,43 +1417,81 @@
                     <tr>
                         <td colspan="3" style=" padding: 8px; text-align: left;">a. Total Nilai Pasar Wajar</td>
                     </tr>
+                    @php
+                        $labelNilai = [
+                            'bangunan' => 'Luas Bangunan',
+                            'tanah' => 'Luas Tanah',
+                            'apartement-kantor' => 'Luas Apartemen/Kantor',
+                            'alat-berat' => 'Luas Alat Berat',
+                            'mesin' => 'Luas Mesin',
+                            'kendaraan' => 'Luas Kendaraan',
+                            'pesawat' => 'Luas Pesawat',
+                            'kapal' => 'Luas Kapal',
+                        ];
+                    @endphp
+                    @foreach ($labelNilai as $key => $label)
+                        @if (isset($lpjData['luas_' . $key]))
+                            <tr>
+                                <td style="padding: 3px; text-align: right; width:10%; ">
+                                    {{ $label }} {{ $lpjData['luas_' . $key] ?? '' }} m<sup>2</sup>
+                                </td>
+                                <td style="padding: 3px; width:10%;">
+                                    <span style="padding-left:20px; padding-right: 20px">X</span> Rp
+                                    {{ $lpjData['nilai_' . $key . '_1'] ?? '' }}
+                                </td>
+                                <td style="padding: 3px; text-align: left; width:70%;">
+                                    <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
+                                    {{ $lpjData['nilai_' . $key . '_2'] ?? '' }}
+                                </td>
+                            </tr>
+                        @endif
+                    @endforeach
+
+                    @if (isset($lpjData['npw_tambahan']))
+                        @foreach ($lpjData['npw_tambahan'] as $npw)
+                            <tr>
+                                <td style="padding: 3px; text-align: right;">
+                                    {{ $npw['name'] }} {{ $npw['luas'] }} m<sup>2</sup>
+                                </td>
+                                <td style="padding: 3px;">
+                                    <span style="padding-left:20px; padding-right: 20px">X</span> Rp
+                                    {{ $npw['nilai_1'] }}
+                                </td>
+                                <td style="padding: 3px; text-align: left; width:70%">
+                                    <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
+                                    {{ $npw['nilai_2'] }}
+                                </td>
+                            </tr>
+                        @endforeach
+                    @endif
                     <tr>
-                        <td style=" padding: 8px; text-align: right;">Luas Tanah
-                            {{ $lpjData['luas_tanah'] ?? '' }}m<sup>2</sup></td>
-                        <td style="padding: 8px; text-align: right;">X {{ $lpjData['nilai_tanah_1'] ?? '' }}</td>
-                        <td style=" padding: 8px; text-align: right;">= {{ $lpjData['nilai_tanah_2'] ?? '' }}</td>
-                    </tr>
-                    <tr>
-                        <td style=" padding: 8px; text-align: right;">Luas Bangunan
-                            {{ $lpjData['luas_bangunan'] ?? '' }}m<sup>2</sup></td>
-                        <td style=" padding: 8px; text-align: right;">X {{ $lpjData['nilai_bangunan_1'] ?? '' }}</td>
-                        <td style=" padding: 8px; text-align: right;">= {{ $lpjData['nilai_bangunan_2'] ?? '' }}</td>
-                    </tr>
-                    <tr>
-                        <td style=" padding: 8px; text-align: right;">Sarana Pelengkap
-                            {{ $lpjData['sarana_pelengkap_penilai'] ?? '' }}m<sup>2</sup></td>
-                        <td style=" padding: 8px; text-align: right;">X
-                            {{ $lpjData['nilai_sarana_pelengkap_1'] ?? '' }}
+                        <td style="padding: 3px; font-weight: bold; width:10%;">Total Nilai Pasar Wajar</td>
+                        <td style="padding: 3px; text-align: right; font-weight: bold; width:10%"></td>
+                        <td style="padding: 3px; text-align: left; font-weight: bold; width: 70%;">
+                            <span style="padding-left: 20px; padding-right: 20px;">=</span>
+                            <div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
+                                Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }}
+                            </div>
                         </td>
-                        <td style=" padding: 8px; text-align: right;">=
-                            {{ $lpjData['nilai_sarana_pelengkap_2'] ?? '' }}
+                    </tr>
+
+                    <!-- Total Nilai Likuidasi -->
+                    <tr>
+                        <td colspan="3" style="padding: 8px; text-align: left; font-weight: bold;">
+                            b. Total Nilai Likuidasi
                         </td>
                     </tr>
                     <tr>
-                        <td style=" padding: 8px; font-weight: bold;">Total Nilai Pasar Wajar</td>
-                        <td colspan="2" style=" padding: 8px; text-align: right; font-weight: bold;">=
-                            {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }}</td>
-                    </tr>
-                    <tr>
-                        <td colspan="3" style=" padding: 8px; text-align: left; font-weight: bold;">b. Total Nilai
-                            Likuidasi</td>
-                    </tr>
-                    <tr>
-                        <td style=" padding: 8px; text-align: right;">{{ $lpjData['likuidasi'] ?? '' }}% X Total
-                            Nilai
-                            Pasar Wajar</td>
-                        <td colspan="2" style=" padding: 8px; text-align: right;">=
-                            {{ $lpjData['likuidasi_nilai_1'] ?? '' }}</td>
+                        <td style="padding: 3px; text-align: right; width:10%">
+                            {{ $lpjData['likuidasi'] ?? '' }}%
+                        </td>
+                        <td style="padding: 3px; text-align: left; font-weight: bold; width:10%">
+                            <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
+                        </td>
+                        <td style="padding: 3px; text-align: left; width:70%;">
+                            <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
+                            {{ $lpjData['likuidasi_nilai_1'] ?? '' }}
+                        </td>
                     </tr>
 
                     <tr>
@@ -1465,7 +1556,23 @@
             </div>
         </div>
         <div class="page-break"></div>
-
+        <table style="width: 100%; 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>
 
         <div class="section">
             <div class="judul">
@@ -1474,9 +1581,10 @@
                 </h6>
             </div>
 
-            <div>
+            <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;">
                 @php
                     $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
+                    // Memindahkan foto_tempat ke depan jika ada
                     if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
                         unset($fotoTypes[$key]);
                         array_unshift($fotoTypes, 'foto_tempat');
@@ -1484,25 +1592,26 @@
                 @endphp
 
                 @if (isset($forminspeksi))
-                    @forelse ($fotoTypes as $type)
-                        <div class="border photo-item">
-                            @php
-                                $imagePath = $forminspeksi[$type] ?? null;
-                            @endphp
+                    @foreach ($fotoTypes as $type)
+                        @php
+                            $imagePath = $forminspeksi[$type] ?? null;
+                        @endphp
 
-                            @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
+                        @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
+                            <div style="border: 1px solid #ddd; padding: 10px; text-align: center;">
                                 <img src="{{ storage_path('app/public/' . $imagePath) }}"
-                                    alt="{{ $type }}" class="photo-image">
-                            @endif
-                            <p class="mt-2 text-sm">{{ Str::title(str_replace('_', ' ', $type)) }}</p>
-                        </div>
-                    @empty
-                        <p>Tidak ada tipe foto yang tersedia</p>
-                    @endforelse
+                                    alt="{{ $type }}"
+                                    style="max-width: 100%; height: auto; margin-bottom: 10px;">
+                                <p style="margin: 0; font-size: 14px;">
+                                    {{ Str::title(str_replace('_', ' ', $type)) }}
+                                </p>
+                            </div>
+                        @endif
+                    @endforeach
                 @endif
             </div>
-
         </div>
+
         <div class="section">
             <div class="judul">
                 <h6 class="border">
@@ -1514,7 +1623,9 @@
         </div>
     </main>
 
-    <footer id="footer"></footer>
+    <footer id="footer">
+        Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
+    </footer>
     <script>
         const datas = @json($forminspeksi);
         console.log(datas);
diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php
index 0ed591a..c1512e5 100644
--- a/resources/views/penilai/components/print-resume.blade.php
+++ b/resources/views/penilai/components/print-resume.blade.php
@@ -318,16 +318,14 @@
         </table>
 
         <div class="page-break"></div>
-        <table style="width: 100%">
-            <tr>
-                <td style=" width: 100%; padding: 2px; border: 1px solid #000; text-align: center">FOTO JAMINAN</td>
-            </tr>
-            <tr>
-                <td>
-                    @include('lpj::penilai.components.foto-jaminan')
-                </td>
-            </tr>
-        </table>
+        <div class="section">
+            <div class="judul">
+                <h6 class="border" style="text-align: center">
+                    FOTO JAMINAN
+                </h6>
+            </div>
+            @include('lpj::penilai.components.foto-jaminan')
+        </div>
     </main>
 
     <footer>