From 68bca678996ad332493f288c9efcb98c2e23caac Mon Sep 17 00:00:00 2001
From: daengdeni <ddeni05@gmail.com>
Date: Tue, 4 Mar 2025 08:37:54 +0700
Subject: [PATCH 01/13] fix(permohonan/index): perbaiki penanganan data pada
 reschedule jadwal survey

- Mengubah parameter yang dikirim ke fungsi surveyorRescheduleJadwalSurvey menjadi string
- Memastikan data yang dikirim tidak mengalami kesalahan format
---
 resources/views/permohonan/index.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index 806cea4..767ba7b 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -209,9 +209,9 @@
             <a onclick="surveyorRescheduleJadwalSurvey(
             ${data.id},
             ${data.penilaian.id},
-            ${data.nomor_registrasi},
-            ${data.debiture.name},
-            ${data.penilaian.waktu_penilaian},
+            '${data.nomor_registrasi}',
+            '${data.debiture.name}',
+            '${data.penilaian.waktu_penilaian}',
              ${JSON.stringify(data.penilaian.rejected_note)}
              )" class="delete btn btn-sm btn-outline btn-light" title="Reschedule Jadwal Survey">
     <i class="ki-filled ki-calendar-remove"></i>

From 5a6cf46f9ed0f0f06570856156b251b429020378 Mon Sep 17 00:00:00 2001
From: daengdeni <ddeni05@gmail.com>
Date: Tue, 4 Mar 2025 08:40:00 +0700
Subject: [PATCH 02/13] fix(permohonan/index): perbaiki penanganan data debitur

- Tambahkan optional chaining pada akses nama debitur untuk mencegah error jika data debitur tidak ada.
- Perbarui beberapa bagian kode untuk menggunakan debitur dengan aman saat menghapus dan menyetujui jadwal kunjungan.
---
 resources/views/permohonan/index.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index 767ba7b..aebf7f7 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -157,7 +157,7 @@
                     title: 'Debitur',
                     render: (item, data) => {
                         if (data.debiture) {
-                            return `${data.debiture.name.toUpperCase()}`;
+                            return `${data.debiture?.name.toUpperCase()}`;
                         }
                         return "-";
                     },
@@ -210,7 +210,7 @@
             ${data.id},
             ${data.penilaian.id},
             '${data.nomor_registrasi}',
-            '${data.debiture.name}',
+            '${data.debiture?.name}',
             '${data.penilaian.waktu_penilaian}',
              ${JSON.stringify(data.penilaian.rejected_note)}
              )" class="delete btn btn-sm btn-outline btn-light" title="Reschedule Jadwal Survey">
@@ -221,7 +221,7 @@
                         if (data && data.penilaian && data.penilaian.waktu_penilaian !== null && data.status !==
                             'done' && data.penilaian.authorized_status == null || data.status === 'approved-reschedule') {
                             actionHtml += `
-            <a class="btn btn-sm btn-outline btn-primary" href="javascript:void(0)" onclick="surveyorApproveKunjungan(${data.id},${data.penilaian.id},'${data.nomor_registrasi}', '${data.debiture.name}', '${data.penilaian.waktu_penilaian}')" title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" >
+            <a class="btn btn-sm btn-outline btn-primary" href="javascript:void(0)" onclick="surveyorApproveKunjungan(${data.id},${data.penilaian.id},'${data.nomor_registrasi}', '${data.debiture?.name}', '${data.penilaian.waktu_penilaian}')" title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" >
                     <i class="ki-filled ki-calendar-edit"></i>
                 </a>
             `;
@@ -241,7 +241,7 @@
             </a>`;
                         if (data.status !== 'batal') {
                             actionHtml += `
-            <a onclick="deleteData(${data.id}, '${data.nomor_registrasi}','${data.debiture.name}')" class="delete btn btn-sm btn-outline btn-danger" title="Batalkan Permohonan">
+            <a onclick="deleteData(${data.id}, '${data.nomor_registrasi}','${data.debiture?.name}')" class="delete btn btn-sm btn-outline btn-danger" title="Batalkan Permohonan">
                 <i class="ki-outline ki-cross-square"></i>
             </a>`;
 

From 4cec4f2e42f54191b00a83f98405d525f9d77ab4 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 4 Mar 2025 09:13:19 +0700
Subject: [PATCH 03/13] fix(debitur): ubah label 'Address' menjadi 'Alamat'

- Mengganti label 'Address' dengan 'Alamat' pada komponen debitur dan dokumen.
- Memastikan konsistensi penggunaan bahasa dalam antarmuka pengguna.
---
 resources/views/debitur/components/debitur.blade.php | 2 +-
 resources/views/debitur/components/dokumen.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/debitur/components/debitur.blade.php b/resources/views/debitur/components/debitur.blade.php
index c873210..7c927b3 100644
--- a/resources/views/debitur/components/debitur.blade.php
+++ b/resources/views/debitur/components/debitur.blade.php
@@ -102,7 +102,7 @@
     </div>
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
         <label class="form-label max-w-56 gap-1">
-            Address
+            Alamat
             <span class="text-danger">
                 *
            </span>
diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 59cf330..2a0d74c 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -145,7 +145,7 @@
 
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
         <label class="form-label max-w-56">
-            Address
+            Alamat
         </label>
         <div class="flex flex-wrap items-baseline w-full">
             <div class="flex flex-col lg:flex-row gap-2 w-full">

From 16c799e512fa65282b9ed0fef4cb08bf762720b4 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 4 Mar 2025 09:20:47 +0700
Subject: [PATCH 04/13] fix(pemilik_jaminan/form, permohonan/print): ubah label
 'Address' menjadi 'Alamat'

- Mengganti label 'Address' menjadi 'Alamat' pada form pemilik jaminan.
- Mengupdate label 'Address' menjadi 'Alamat' pada halaman cetak permohonan.
---
 resources/views/pemilik_jaminan/form.blade.php | 2 +-
 resources/views/permohonan/print.blade.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/pemilik_jaminan/form.blade.php b/resources/views/pemilik_jaminan/form.blade.php
index 41b8a9f..12f9ffe 100644
--- a/resources/views/pemilik_jaminan/form.blade.php
+++ b/resources/views/pemilik_jaminan/form.blade.php
@@ -156,7 +156,7 @@
 
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
-                            Address
+                            Alamat
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <div class="flex flex-col lg:flex-row gap-2 w-full">
diff --git a/resources/views/permohonan/print.blade.php b/resources/views/permohonan/print.blade.php
index 4249476..dc38774 100644
--- a/resources/views/permohonan/print.blade.php
+++ b/resources/views/permohonan/print.blade.php
@@ -128,7 +128,7 @@
                                     </tr>
                                     <tr>
                                         <td class="py-3 text-gray-600 font-normal">
-                                            Address
+                                            Alamat
                                         </td>
                                         <td class="py-3 text-gray-700 text-sm font-normal">
                                             {{ $permohonan->debiture->address ?? "" }}

From fe3b1bebcebe57ae1ac531e071808fb132374f26 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 4 Mar 2025 13:30:21 +0700
Subject: [PATCH 05/13] fix(prosespenawaran): perbaiki penanganan data dan
 tampilan

- Menambahkan pengambilan data Permohonan berdasarkan nomor registrasi pada metode show.
- Memperbaiki tampilan dengan menggunakan komponen detail-jaminan untuk menampilkan data proses penawaran.
- Menghapus kode yang tidak diperlukan untuk meningkatkan kebersihan kode.
---
 .../Controllers/ProsesPenawaranController.php |  6 +-
 .../views/component/detail-jaminan.blade.php  |  3 +-
 .../views/prosespenawaran/show.blade.php      | 62 ++++++-------------
 3 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php
index 6339a94..c6e6ccc 100644
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -437,7 +437,11 @@ class ProsesPenawaranController extends Controller
     public function show($id)
     {
         $prosespenawaran  = PenawaranTender::find($id);
-        return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran'));
+        $permohonan = "";
+        if($prosespenawaran){
+            $permohonan = Permohonan::where('nomor_registrasi',$prosespenawaran->nomor_registrasi)->first();
+        }
+        return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran','permohonan'));
     }
 
     public function updateDraft(Request $request, $id): JsonResponse
diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php
index 8338814..3d996ed 100644
--- a/resources/views/component/detail-jaminan.blade.php
+++ b/resources/views/component/detail-jaminan.blade.php
@@ -1,6 +1,6 @@
 @if (!isset($status))
     <div class="card border border-agi-100 {{ isset($hidePermohonan) ? 'hidden' : '' }}">
-        <div class="card-header light:bg-agi-50" id="advanced_settings_appearance">
+        <div class="card-header bg-agi-50" id="advanced_settings_appearance">
             @php
                 $title = $title ?? 'Data Permohonan';
             @endphp
@@ -9,6 +9,7 @@
             </h3>
 
             <div class="flex items-center gap-2">
+                {!! $customlink ?? "" !!}
                 @if (isset($id))
                     @php
                         $parameters = isset($id) ? ['id' => $id] : [];
diff --git a/resources/views/prosespenawaran/show.blade.php b/resources/views/prosespenawaran/show.blade.php
index 4376f2b..8e9ebfc 100644
--- a/resources/views/prosespenawaran/show.blade.php
+++ b/resources/views/prosespenawaran/show.blade.php
@@ -7,48 +7,24 @@
     $route = explode('.', Route::currentRouteName());
 @endphp
 @section('content')
-<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-    <div class="card border border-agi-100 pb-2.5">
-        <div class="card-header bg-agi-50" id="basic_settings">
-            <h3 class="card-title">
-                Detail Data Proses Penawaran
-            </h3>
-            <div class="flex items-center gap-2">
-                @php
-                    $buttonProses='';
-                    if('tender'==$prosespenawaran->status)
-                    {
-                        $buttonProses='<a href="'. route('tender.prosespenawaran.edit', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran"><i class="ki-outline ki-notepad-edit"></i> Proses Penawaran</a>';
-                    }
-                    elseif ('proposal-tender'==$prosespenawaran->status)
-                    {
-                        $buttonProses='<a href="'. route('tender.prosespenawaran.editulang', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran Ulang"><i class="ki-filled ki-arrow-circle-right"></i> Proses Penawaran Ulang</a>';
-                    }
-                @endphp
-                {!! $buttonProses !!}
-                <a href="{{ route('tender.prosespenawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
-            </div>
-        </div>
-        <div class="card-body lg:py-7.5 grid grid-cols-3">
-            <div class="mb-5">
-                <h3 class="text-md font-medium text-gray-900">
-                    Nomor Register Permohonan:
-                </h3>
-                <span class="text-2sm text-gray-700">
-                    {{ $prosespenawaran->nomor_registrasi }}
-                </span>
-            </div>
-            <div class="mb-5">
-                <h3 class="text-md font-medium text-gray-900">
-                    Nomor Penawaran:
-                </h3>
-                <span class="text-2sm text-gray-700">
-                    {{ $prosespenawaran->code }}
-                </span>
-            </div>
-        </div>
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        @php
+            $buttonProses='';
+            if('tender'==$prosespenawaran->status)
+            {
+                $buttonProses='<a href="'. route('tender.prosespenawaran.edit', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran"><i class="ki-outline ki-notepad-edit"></i> Proses Penawaran</a>';
+            }
+            elseif ('proposal-tender'==$prosespenawaran->status)
+            {
+                $buttonProses='<a href="'. route('tender.prosespenawaran.editulang', $id) .'" class="btn btn-xs btn-primary" title="Proses Penawaran Ulang"><i class="ki-filled ki-arrow-circle-right"></i> Proses Penawaran Ulang</a>';
+            }
+        @endphp
+
+        @include('lpj::component.detail-jaminan', [
+                   'customlink' => $buttonProses,
+                   'backLink' => 'tender.prosespenawaran.index',
+                   'title' => 'Detail Data Proses Penawaran',
+               ])
+
     </div>
-</div>
-
-
 @endsection

From 3ba43b8579f527f4b2992eb6bf427e7c6fd89bfb Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Tue, 4 Mar 2025 09:36:15 +0700
Subject: [PATCH 06/13] fix(surveyor): perbaikan luas tanah, bangunan, unit not
 found

---
 app/Http/Controllers/SurveyorController.php   | 27 +++++--
 resources/views/laporan/index.blade.php       | 11 +--
 .../components/apartemen-kantor.blade.php     | 34 +++++----
 .../surveyor/components/bangunan.blade.php    |  6 ++
 .../views/surveyor/components/tanah.blade.php |  6 ++
 resources/views/surveyor/js/utils.blade.php   | 71 +++++++++++--------
 6 files changed, 105 insertions(+), 50 deletions(-)

diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 0164cc4..01076f5 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -2007,7 +2007,21 @@ class SurveyorController extends Controller
                     'analisa_unit' => 'luas_unit',
                 };
 
-                $this->updateDetails($permohonan, $key, $request->input($key));
+
+                $jenis_jaminan_mapping = [
+                    'luas_unit' => $request->input('jenis_legalistas_jaminan_unit_id'),
+                    'luas_bangunan' => $request->input('jenis_legalistas_jaminan_bangunan_id'),
+                    'luas_tanah' => $request->input('jenis_legalistas_jaminan_tanah_id'),
+                ];
+
+
+                $jenis_jaminan_id = $jenis_jaminan_mapping[$key] ?? 0;
+                // dd($jenis_jaminan_id);
+
+                $inputValue = $request->input($key);
+
+                $cleanedValue = preg_replace('/\D/', '', $inputValue);
+                $this->updateDetails($permohonan, $key, $cleanedValue, $jenis_jaminan_id);
             }
 
             return response()->json([
@@ -2031,7 +2045,7 @@ class SurveyorController extends Controller
             ]);
     }
 
-    private function updateDetails($permohonan, $key, $newValue)
+    private function updateDetails($permohonan, $key, $newValue, $jenis_jaminan_id)
     {
         $document = $permohonan->documents->first();
 
@@ -2039,7 +2053,12 @@ class SurveyorController extends Controller
             throw new \Exception("Document not found");
         }
 
-        $detailsUpdate = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->first();
+        // dd($jenis_jaminan_id);
+        $detailsUpdate = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)
+        ->where('jenis_legalitas_jaminan_id', $jenis_jaminan_id)
+        ->first();
+
+        // dd($detailsUpdate);
 
         if (!$detailsUpdate) {
             throw new \Exception("DetailDokumenJaminan not found");
@@ -2055,7 +2074,7 @@ class SurveyorController extends Controller
         if (array_key_exists($key, $datas)) {
             $datas[$key] = $newValue;
         } else {
-            throw new \Exception("Key '{$key}' not found in details");
+            $datas[$key] = $newValue;
         }
 
         // Simpan kembali ke database
diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php
index de09784..788f865 100644
--- a/resources/views/laporan/index.blade.php
+++ b/resources/views/laporan/index.blade.php
@@ -194,6 +194,8 @@
                         let laporanButton = '';
                         let resumeButton = '';
 
+
+
                         if(data.penilai.resume) {
                             resumeButton = `
                         <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0" class="btn btn-sm btn-success">
@@ -203,7 +205,7 @@
 
                         if(data.nilai_liquidasi==null) {
                             laporanButton = `
-                            <a href="laporan/${data.id}" class="btn btn-sm btn-dark">
+                            <a href="laporan/${data.id}" class="btn btn-sm btn-primary">
                                 Laporan
                             </a>`;
                         }
@@ -211,19 +213,20 @@
                         if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) {
                             if(data.penilai.type_penilai=='resume' && !data.penilai.resume){
                                 laporanButton = `
-                            <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${type}" class="btn btn-sm btn-dark">
+                            <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${type}" class="btn btn-sm btn-primary">
                                 Laporan
                             </a>`;
                             } else {
                                 laporanButton = `
-                            <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${typePenilaian}" class="btn btn-sm btn-dark">
+                            <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${typePenilaian}" class="btn btn-sm btn-primary">
                                 Laporan
                             </a>`;
                             }
 
                         }
 
-                        return `${resumeButton} ${laporanButton}`;
+
+                        return `<div class="flex flex-wrap justify-end gap-1.5"> ${resumeButton} ${laporanButton} </div>`;
                     },
                 }
             },
diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php
index effaaf2..3529e98 100644
--- a/resources/views/surveyor/components/apartemen-kantor.blade.php
+++ b/resources/views/surveyor/components/apartemen-kantor.blade.php
@@ -12,22 +12,28 @@
                 <label class="form-label max-w-56">Luas Unit</label>
                 @if (isset($permohonan->documents))
                     @foreach ($permohonan->documents as $item)
-                        @php
-                            $luas_units = 'N/A';
-                            if ($item->detail) {
-                                foreach ($item->detail as $luas) {
-                                    if (isset($luas->name) && $luas->name === 'Sertifikat') {
-                                        $details = json_decode($luas->details, true);
-                                        $luas_units = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A';
-                                        break;
-                                    }
-                                }
+                    @php
+                    $luas_tanah = 0;
+                    $jenis_legalitas_jaminan_id = 0;
+                    if ($item->detail) {
+                        foreach ($item->detail as $luas) {
+                            if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 1) {
+                                $jenis_legalitas_jaminan_id = $luas->jenis_legalitas_jaminan_id;
+                                $details = json_decode($luas->details, true);
+                                $luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 0;
+                                break;
                             }
-                        @endphp
-                        <input type="hidden" name="luas_unit_sesuai" class="input" value="{{ $luas_units }}">
-                        <p class="text-2sm text-gray-700">{{ $luas_units }} m<sup>2</sup></p>
-                    @endforeach
+                        }
+                    }
+                @endphp
+                        <input type="hidden"
+                        id="jenis_legalistas_jaminan_unit_id"
+                        name="jenis_legalistas_jaminan_unit_id"
+                        class="input" value="{{ $jenis_legalitas_jaminan_id }}">
+                        <input type="hidden" name="luas_unit_sesuai" class="input" value="{{ $luas_tanah }}">
 
+                        <p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p>
+                    @endforeach
                 @endif
 
                 <div class="flex flex-wrap items-baseline w-full">
diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php
index 000dfb4..e10405a 100644
--- a/resources/views/surveyor/components/bangunan.blade.php
+++ b/resources/views/surveyor/components/bangunan.blade.php
@@ -14,9 +14,11 @@
                     @foreach ($permohonan->documents as $item)
                         @php
                             $luas_bangunan = 0;
+                            $jenis_legalitas_jaminan_id = 0;
                             if ($item->detail) {
                                 foreach ($item->detail as $luas) {
                                     if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 10) {
+                                        $jenis_legalitas_jaminan_id = $luas->jenis_legalitas_jaminan_id;
                                         $details = json_decode($luas->details, true);
                                         $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 0;
                                         break;
@@ -25,6 +27,10 @@
                             }
                         @endphp
 
+                        <input type="hidden"
+                        id="jenis_legalistas_jaminan_bangunan_id"
+                        name="jenis_legalistas_jaminan_bangunan_id"
+                        class="input" value="{{ $jenis_legalitas_jaminan_id }}">
                         <input type="hidden" name="luas_bangunan_sesuai" class="input" value="{{ $luas_bangunan }}">
                         <p class="text-2sm text-gray-700">{{ $luas_bangunan }} m<sup>2</sup></p>
                     @endforeach
diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php
index 8d631fd..84409ec 100644
--- a/resources/views/surveyor/components/tanah.blade.php
+++ b/resources/views/surveyor/components/tanah.blade.php
@@ -14,9 +14,11 @@
                         @foreach ($permohonan->documents as $item)
                             @php
                                 $luas_tanah = 0;
+                                $jenis_legalitas_jaminan_id = 0;
                                 if ($item->detail) {
                                     foreach ($item->detail as $luas) {
                                         if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 1) {
+                                            $jenis_legalitas_jaminan_id = $luas->jenis_legalitas_jaminan_id;
                                             $details = json_decode($luas->details, true);
                                             $luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 0;
                                             break;
@@ -24,6 +26,10 @@
                                     }
                                 }
                             @endphp
+                            <input type="hidden"
+                            id="jenis_legalistas_jaminan_tanah_id"
+                            name="jenis_legalistas_jaminan_tanah_id"
+                            class="input" value="{{ $jenis_legalitas_jaminan_id }}">
                             <input type="hidden" name="luas_tanah_sesuai" class="input" value="{{ $luas_tanah }}">
                             <p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p>
                         @endforeach
diff --git a/resources/views/surveyor/js/utils.blade.php b/resources/views/surveyor/js/utils.blade.php
index ff4a2a7..ebcba62 100644
--- a/resources/views/surveyor/js/utils.blade.php
+++ b/resources/views/surveyor/js/utils.blade.php
@@ -27,39 +27,39 @@
 
 
     function formatNumber(input) {
-    // Ambil posisi kursor saat ini
-    const cursorPosition = input.selectionStart;
+        // Ambil posisi kursor saat ini
+        const cursorPosition = input.selectionStart;
 
-    // Ambil nilai input tanpa "m²" dan karakter non-angka
-    let value = input.value.replace(/[^\d]/g, '');
+        // Ambil nilai input tanpa "m²" dan karakter non-angka
+        let value = input.value.replace(/[^\d]/g, '');
 
-    // Update nilai input dengan format angka dan "m²"
-    input.value = value ? value + ' m²' : 'm²';
+        // Update nilai input dengan format angka dan "m²"
+        input.value = value ? value + ' m²' : 'm²';
 
-    // Atur posisi kursor di depan "m²"
-    input.setSelectionRange(cursorPosition, cursorPosition);
-}
+        // Atur posisi kursor di depan "m²"
+        input.setSelectionRange(cursorPosition, cursorPosition);
+    }
 
 
 
     function formatCurrency(value, isDiskon = false) {
-    // Ensure the value is a valid number
-    const numericValue = parseFloat(value);
-    if (isNaN(numericValue)) {
-        return 0;
+        // Ensure the value is a valid number
+        const numericValue = parseFloat(value);
+        if (isNaN(numericValue)) {
+            return 0;
+        }
+
+        // Format the number with commas for thousands separators
+        const formattedValue = numericValue.toLocaleString('id-ID', {
+            style: 'currency',
+            currency: 'IDR', // Indonesian Rupiah
+            minimumFractionDigits: isDiskon ? 2 : 0, // Include decimals for discounts
+            maximumFractionDigits: isDiskon ? 2 : 0,
+        });
+
+        return formattedValue;
     }
 
-    // Format the number with commas for thousands separators
-    const formattedValue = numericValue.toLocaleString('id-ID', {
-        style: 'currency',
-        currency: 'IDR', // Indonesian Rupiah
-        minimumFractionDigits: isDiskon ? 2 : 0, // Include decimals for discounts
-        maximumFractionDigits: isDiskon ? 2 : 0,
-    });
-
-    return formattedValue;
-}
-
     function previewImage(input, previewId) {
         if (input.files && input.files[0]) {
             var reader = new FileReader();
@@ -352,9 +352,24 @@
         const inputValue = document.getElementById(inputMap[params]).value;
         const data = {
             [params === 'jenis_asset' ? 'jenis_asset' : params.replace('analisa_', 'luas_')]: inputValue,
-            types: params
+            types: params,
+            ...(document.getElementById('jenis_legalistas_jaminan_bangunan_id') && {
+                jenis_legalistas_jaminan_bangunan_id: document.getElementById(
+                    'jenis_legalistas_jaminan_bangunan_id').value
+            }),
+            ...(document.getElementById('jenis_legalistas_jaminan_tanah_id') && {
+                jenis_legalistas_jaminan_tanah_id: document.getElementById('jenis_legalistas_jaminan_tanah_id')
+                    .value
+            }),
+            ...(document.getElementById('jenis_legalistas_jaminan_unit_id') && {
+                jenis_legalistas_jaminan_unit_id: document.getElementById('jenis_legalistas_jaminan_unit_id')
+                    .value
+            })
         };
 
+        console.log(data);
+
+
         $.ajax({
             url: '{{ route('surveyor.update_analisa', ['id' => $permohonan->id]) }}',
             type: 'POST',
@@ -505,9 +520,9 @@
 
 
     function handleCurrencyInput(input) {
-            const value = input.value.replace(/[^\d]/g, '');
-            input.value = formatCurrency(value);
-        }
+        const value = input.value.replace(/[^\d]/g, '');
+        input.value = formatCurrency(value);
+    }
 
     function cleanCurrencyValue(value) {
         return value.replace(/[^\d]/g, '');

From 107726efe78ff57adf7637e26dab5086301e7a8e Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Tue, 4 Mar 2025 10:40:07 +0700
Subject: [PATCH 07/13] fix(surveyor): perbaikkan print out surveyor

---
 .../surveyor/components/print-out/lingkungan.blade.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/surveyor/components/print-out/lingkungan.blade.php b/resources/views/surveyor/components/print-out/lingkungan.blade.php
index 6e9d200..a42207c 100644
--- a/resources/views/surveyor/components/print-out/lingkungan.blade.php
+++ b/resources/views/surveyor/components/print-out/lingkungan.blade.php
@@ -172,9 +172,9 @@
     <td>
         <div class="checkbox-item">
             <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="ya"
+                <input type="radio" name="disekitar_lokasi" value="Telah ada bangunan"
                     {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya' ? 'checked' : '' }}>
-                Ya
+                    Telah ada bangunan
                 @if (($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya')
                     - Kondisi Bangunan:
                     {{ $forminspeksi['lingkungan']['kondisi_bagunan_disekitar_lokasi'] ?? '' }}
@@ -183,9 +183,9 @@
                 @endif
             </label>
             <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="tidak"
+                <input type="radio" name="disekitar_lokasi" value="Belum ada bangunan"
                     {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'tidak' ? 'checked' : '' }}>
-                Tidak
+                    Belum ada bangunan
             </label>
         </div>
     </td>

From cf45ac7cbebe9115b0e4315965a7dd069953092b Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Tue, 4 Mar 2025 13:23:28 +0700
Subject: [PATCH 08/13] fix(penilai):perbaikkan laporan lpj, paparan so, call
 report

---
 app/Http/Controllers/PenilaiController.php    | 34 ++++++++++++++-
 app/Http/Controllers/PenilaianController.php  | 43 ++++++++++---------
 app/Http/Controllers/RegistrasiController.php |  2 +-
 .../penilai/components/call-report.blade.php  | 14 +++---
 .../lpj-sederhana-standard.blade.php          | 10 ++---
 .../views/penilai/components/memo.blade.php   |  2 +-
 .../print-out-call-report.blade.php           |  8 ++--
 .../penilai/components/rap-penilai.blade.php  | 10 ++---
 .../views/penilai/components/resume.blade.php |  2 +-
 resources/views/penilai/index.blade.php       |  2 +-
 resources/views/penilai/show.blade.php        |  8 +++-
 .../views/penilaian/otorisator/show.blade.php |  6 +--
 .../views/penilaian/paparan-so.blade.php      |  2 +-
 13 files changed, 92 insertions(+), 51 deletions(-)

diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index ddc280b..5587ab2 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -763,6 +763,22 @@ class PenilaiController extends Controller
 
 
             $permohonan = Permohonan::findOrFail($id);
+
+            if ($permohonan->status === 'proses-laporan') {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Masih proses laporan',
+                ], 400);
+            }
+
+            if ($permohonan->status === 'proses-paparan') {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Masih proses paparan',
+                ]);
+            }
+
+
             $permohonan->update([
                 'status' => 'proses-laporan',
             ]);
@@ -1322,7 +1338,7 @@ class PenilaiController extends Controller
 
     public function generateNoLaporan($permohonan, $documentId, $type)
     {
-        $typeMapping = ['lpj' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR'];
+        $typeMapping = ['sederhana' => 'LPJ', 'standard' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR'];
 
         // Cek apakah data sudah ada
         $laporan = Laporan::where([
@@ -1593,6 +1609,22 @@ class PenilaiController extends Controller
     public function revisiSurveyor(Request $request, $id)
     {
         $permohonan = Permohonan::findOrFail($id);
+
+        if ($permohonan->status === 'proses-laporan') {
+            return response()->json([
+                'success' => false,
+                'message' => 'Masih proses laporan',
+            ], 400);
+        }
+
+        if ($permohonan->status === 'proses-paparan') {
+            return response()->json([
+                'success' => false,
+                'message' => 'Masih proses paparan',
+            ], 400);
+        }
+
+
         $permohonan->update([
             'status' => 'revisi-survey',
             'keterangan' => $request->message,
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 03cc742..5e88202 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -482,14 +482,14 @@ class PenilaianController extends Controller
 
                 $permohonan->update([
                     'status_bayar' => $newStatus,
-                    'keterangan'   => $request->message,
+                    'keterangan'   => $request->keterangan,
                 ]);
                 break;
 
             case 'pembatalan':
                 $permohonan->update([
                     'status'     => 'batal',
-                    'keterangan' => $request->message,
+                    'keterangan' => $request->keterangan,
                 ]);
                 break;
 
@@ -509,7 +509,7 @@ class PenilaianController extends Controller
                 }
 
                 if ($approvalField) {
-                    $this->updatePermohonan($permohonan, $status, $approvalField, $request->message);
+                    $this->updatePermohonan($permohonan, $status, $approvalField, $request->keterangan);
                 }
                 break;
 
@@ -559,11 +559,12 @@ class PenilaianController extends Controller
                         'status_so' => '1',
                         'approve_so'    => Auth::user()->id,
                         'approve_so_at' => now(),
-                        'keterangan_so'     => $request->message,
+                        'keterangan_so'     => $request->keterangan,
                     ]);
 
                     $permohonan->update([
-                        'tanggal_paparan' => $request->tanggalPaparan
+                        'tanggal_paparan' => $request->tanggalPaparan,
+                        'keterangan'      => $request->keterangan
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
                     $status = '2';
@@ -578,7 +579,7 @@ class PenilaianController extends Controller
                         'status_eo' => '1',
                         'approve_eo'    => Auth::user()->id,
                         'approve_eo_at' => now(),
-                        'keterangan_eo'     => $request->message,
+                        'keterangan_eo'     => $request->keterangan,
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'DD Appraisal' || Auth::user()->roles[0]->name === 'administrator'  && $authorization->approve_so  && $authorization->approve_dd === null) {
                     $authorization->update([
@@ -586,7 +587,7 @@ class PenilaianController extends Controller
                         'status_dd' => '1',
                         'approve_dd'    => Auth::user()->id,
                         'approve_dd_at' => now(),
-                        'keterangan_dd'     => $request->message,
+                        'keterangan_dd'     => $request->keterangan,
                     ]);
 
                     $permohonan->update([
@@ -893,25 +894,27 @@ class PenilaianController extends Controller
         $permohonan = Permohonan::findOrFail($id);
         $userRole = Auth::user()->roles[0]->name;
 
-        if ($permohonan->status === 'proses-paparan' && in_array($userRole, ['EO Appraisal', 'DD Appraisal'])) {
-            Authorization::delete([
-                'permohonan_id' => $permohonan->id,
-                'jenis' => 'paparan',
-                'request' => 'paparan',
-            ]);
+        $authorization = Authorization::where('permohonan_id', $permohonan->id)
+            ->where('jenis', 'paparan')->first();
+
+        if ($permohonan->status === 'proses-paparan') {
+            if ($authorization) {
+                $authorization->delete();
+            }
+
             $status = 'revisi-paparan';
         } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
             $permohonan->update([
-                'approve_so'    => null,
-                'approve_so_at' => null,
+                'approval_so'    => 0,
+                'approval_so_at' => null,
             ]);
             $status = 'revisi-laporan';
         } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'DD Appraisal') {
             $permohonan->update([
-                'approve_so'    => null,
-                'approve_so_at' => null,
-                'approve_eo'    => null,
-                'approve_eo_at' => null,
+                'approval_so'    => 0,
+                'approval_so_at' => null,
+                'approval_eo'    => 0,
+                'approval_eo_at' => null,
 
             ]);
             $status = 'revisi-laporan';
@@ -925,7 +928,7 @@ class PenilaianController extends Controller
         // Perbarui status dan informasi lainnya
         $permohonan->update([
             'status' => $status,
-            'keterangan' => $request->message,
+            'keterangan' => $request->keterangan,
             'submitted_at' => now(),
         ]);
 
diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php
index a0fb3ba..42efcea 100644
--- a/app/Http/Controllers/RegistrasiController.php
+++ b/app/Http/Controllers/RegistrasiController.php
@@ -231,7 +231,7 @@ class RegistrasiController extends Controller
     {
         $permohonan = Permohonan::find($id);
         $debitur         = Debiture::find($permohonan->debiture_id);
-        $documents       = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get();
+        $documents       = DokumenJaminan::with('pemilik', 'detail')->where('permohonan_id', $id)->get();
         return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
     }
 
diff --git a/resources/views/penilai/components/call-report.blade.php b/resources/views/penilai/components/call-report.blade.php
index 8fcd909..0d48d5e 100644
--- a/resources/views/penilai/components/call-report.blade.php
+++ b/resources/views/penilai/components/call-report.blade.php
@@ -252,7 +252,7 @@
                 </div>
             </div>
 
-            <div class="w-full grid grid-cols-1 lg:grid-cols-2 gap-4">
+            <div class="w-full grid grid-cols-1 lg:grid-cols-1 gap-4">
 
                 <!-- Bagian Nilai KJPP -->
                 <div class="card border border-agi-100 w-full bg-white rounded-lg shadow-md">
@@ -293,7 +293,7 @@
                 </div>
 
                 <!-- Bagian Nilai Internal -->
-                <div class="card border border-agi-100 w-full bg-white rounded-lg shadow-md">
+                <div class="card border border-agi-100 w-full bg-white rounded-lg shadow-md hidden">
                     <div class="card-header bg-agi-50">
                         <h1 class="text-md font-medium text-gray-900 uppercase">Nilai Internal</h1>
                     </div>
@@ -505,23 +505,23 @@
 
             <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
                 @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
-                    <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()">
+                    <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
                         <i class="ki-filled ki-save-2"></i>
-                        <span id="saveButtonText">Save</span>
+                        <span id="saveButtonText">Simpan</span>
                     </button>
                 @endif
                 @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal']))
                     <a class="btn btn-info"
                         href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
-                        LAMPIRAN FOTO DAN DOKUMEN
+                        Lampiran Foto dan Dokument
                     </a>
                     <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}"
                         class="btn btn-light">
-                        <i class="ki-filled ki-printer"></i> Hasil Inspeksi
+                        <i class="ki-filled ki-printer"></i>Cetak Hasil Inspeksi
                     </a>
                     <a class="btn btn-primary"
                         onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )">
-                        <i class="ki-filled ki-printer"></i> Print Laporan
+                        <i class="ki-filled ki-printer"></i> Cetak Laporan
                     </a>
                 @endif
             </div>
diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php
index 2ac6cc5..bef8511 100644
--- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php
+++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php
@@ -45,23 +45,23 @@
         </div>
         <div class="flex card-footer  justify-end gap-5">
             @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
-            <button type="button" class="btn btn-primary" id="saveButton" onclick="saveLpjSederhanadanStandard()">
+            <button type="button" class="btn btn-primary" id="saveButton" onclick="saveLpjSederhanadanStandard()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
                 <i class="ki-filled ki-save-2"></i>
-                <span id="saveButtonText">Save</span>
+                <span id="saveButtonText">Simpan</span>
             </button>
             @endif
             @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
                 <a class="btn btn-info"
                     href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
-                    LAMPIRAN FOTO DAN DOKUMEN
+                    Lampiran Foto dan Dokument
                 </a>
                 <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
                     >
-                    <i class="ki-filled ki-printer"></i> Hasil Inspeksi
+                    <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
                 </a>
                 <a class="btn btn-success"
                     onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )">
-                    <i class="ki-filled ki-printer"></i> Print Laporan
+                    <i class="ki-filled ki-printer"></i> Cetak Laporan
                 </a>
             @endif
         </div>
diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php
index 62161ae..2aefa66 100644
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -293,7 +293,7 @@
 
             <div class="flex card-footer  justify-end gap-5">
                 @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
-                <a class="btn btn-primary" onclick="saveMemo()">
+                <a class="btn btn-primary" onclick="saveMemo()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
                     <i class="ki-filled ki-save-2"></i>
                     Simpan
                 </a>
diff --git a/resources/views/penilai/components/print-out-call-report.blade.php b/resources/views/penilai/components/print-out-call-report.blade.php
index de16208..4d806e3 100644
--- a/resources/views/penilai/components/print-out-call-report.blade.php
+++ b/resources/views/penilai/components/print-out-call-report.blade.php
@@ -161,21 +161,21 @@
             <tr>
                 <td style="width: 20%; padding: 2px;">Lelang ke</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
-                <td style="width: 79%;  padding: 2px;">{{ $report['lelang'] ?? '' }}</td>
+                <td style="width: 79%;  padding: 2px;">{{ $report['lelang_kjpp'] ?? '' }}</td>
             </tr>
             <tr>
                 <td style="width: 20%; padding: 2px;">Nilai Pasar Wajar (NPW)</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
-                <td style="width: 79%;  padding: 2px;">{{ isset($report['nilai_pasar']) ? formatRupiah($report['nilai_pasar']) : '-' }}</td>
+                <td style="width: 79%;  padding: 2px;">{{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}</td>
             </tr>
             <tr>
                 <td style="width: 20%; padding: 2px;">
                     Nilai Likuidasi
-                    {{ isset($report['persentase_likuidasi']) ? '(' . $report['persentase_likuidasi'] . '%)' : '-' }}
+                    {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
                 </td>
                 <td style="width: 1%; padding: 2px;">:</td>
                 <td style="width: 79%; padding: 2px;">
-                    {{ isset($report['hasil_nilai_likuidasi']) ? formatRupiah($report['hasil_nilai_likuidasi']) : '-' }}
+                    {{ isset($report['hasil_nilai_likuidasi_kjpp']) ? formatRupiah($report['hasil_nilai_likuidasi_kjpp']) : '-' }}
                 </td>
             </tr>
 
diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php
index 4d2f084..b7dc69b 100644
--- a/resources/views/penilai/components/rap-penilai.blade.php
+++ b/resources/views/penilai/components/rap-penilai.blade.php
@@ -66,9 +66,9 @@
             </div>
             <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
                 @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
-                <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()">
+                <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
                     <i class="ki-filled ki-save-2"></i>
-                    <span id="saveButtonText">Save</span>
+                    <span id="saveButtonText" >Save</span>
                     <div class="spinner-border spinner-border-sm text-light" role="status" style="display: none;"
                         id="saveButtonSpinner">
 
@@ -78,15 +78,15 @@
                 @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
                     <a class="btn btn-info"
                         href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
-                        LAMPIRAN FOTO DAN DOKUMEN
+                        Lampiran Foto dan Dokument
                     </a>
                     <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
                         >
-                        <i class="ki-filled ki-printer"></i> Hasil Inspeksi
+                        <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
                     </a>
                     <a class="btn btn-success"
                         onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )">
-                        <i class="ki-filled ki-printer"></i> Print Laporan
+                        <i class="ki-filled ki-printer"></i> Cetak Laporan
                     </a>
                 @endif
             </div>
diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php
index d6ee804..c819ca8 100644
--- a/resources/views/penilai/components/resume.blade.php
+++ b/resources/views/penilai/components/resume.blade.php
@@ -424,7 +424,7 @@
                     <div class="flex card-footer  justify-end gap-5">
 
                         @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
-                        <button type="button" class="btn btn-primary" onclick="saveResume()">
+                        <button type="button" class="btn btn-primary" onclick="saveResume()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
                             <i class="ki-filled ki-save-2"></i>
                             Simpan</button>
                         @endif
diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php
index 6d6f84a..caa6b0a 100644
--- a/resources/views/penilai/index.blade.php
+++ b/resources/views/penilai/index.blade.php
@@ -191,7 +191,7 @@
                 actions: {
                     title: 'Action',
                     render: (item, data) => {
-                        if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done') {
+                        if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan') {
                             return `
                         <div class="flex flex-nowrap justify-center gap-1.5">
                             <a class="btn btn-sm btn-outline btn-info" href="penilai/${data.id}/show">
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index baf2381..0e63e54 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -336,9 +336,12 @@
         @endforeach
         <div class="flex justify-start gap-5">
             <a class="btn btn-success" onclick="savePenilai()">
+                <i class="ki-filled ki-paper-plane"></i>
                 REPORT
             </a>
-            <a class="btn btn-warning" onclick="revisiSurveyor('{{ $permohonan->id }}', '{{$permohonan->debiture->name }}', '{{$permohonan->nomor_registrasi }}')">
+
+            <a class="btn btn-warning" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }} onclick="revisiSurveyor('{{ $permohonan->id }}', '{{$permohonan->debiture->name }}', '{{$permohonan->nomor_registrasi }}')">
+                <i class="ki-filled ki-arrow-circle-right"></i>
                 REVISI
             </a>
         </div>
@@ -630,6 +633,9 @@
                     // window.location.reload();
                     hideLoadingSwal();
                     toastrSuccessBuild(response.message);
+                }else{
+                    // hideLoadingSwal();
+                    Swal.fire('Perhatian!', response.message, 'warning');
                 }
             },
             error: function(xhr, status, error) {
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 74027bc..a2abdb1 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -268,7 +268,7 @@
                     if (rejectResult.isConfirmed) {
                         handleAjaxRequest(
                             `/otorisator/revisi/${dataId}`, {
-                                message: rejectResult.value
+                                keterangan: rejectResult.value
                             },
                             'Data berhasil ditolak.',
                             'Terjadi kesalahan saat melakukan penolakan.'
@@ -370,10 +370,10 @@
                 ).then((result) => {
                     if (result.isConfirmed) {
                         const requestData = isPaparanSO ? {
-                            message: result.value.message,
+                            keterangan: result.value.message,
                             tanggalPaparan: result.value.tanggalPaparan
                         } : {
-                            message: result.value.message
+                            keterangan: result.value.message
                         };
 
                         handleAjaxRequest(
diff --git a/resources/views/penilaian/paparan-so.blade.php b/resources/views/penilaian/paparan-so.blade.php
index 9a1d586..c36961e 100644
--- a/resources/views/penilaian/paparan-so.blade.php
+++ b/resources/views/penilaian/paparan-so.blade.php
@@ -240,7 +240,7 @@
                   title: 'Tanggal Paparan',
                   render: (item, data) => {
                         if(data.tanggal_paparan) {
-                            return ` ${data?.keterangan} | ${window.formatTanggalIndonesia(data.tanggal_paparan)}`;
+                            return ` ${data?.authorization?.keterangan_so} | ${window.formatTanggalIndonesia(data.tanggal_paparan)}`;
                         }
 
                         return "-";

From 0bca2e2bf2dbc5dc4bfb57471edf2024bcf72668 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 4 Mar 2025 21:34:55 +0700
Subject: [PATCH 09/13] fix(laporan): perbaikan format dan konten laporan

- Memperbaiki kesalahan dalam format laporan LPJ
- Menambahkan informasi yang hilang pada paparan SO
- Memperbaiki struktur call report untuk kejelasan
---
 resources/views/permohonan/form.blade.php | 391 +++++++---------------
 1 file changed, 121 insertions(+), 270 deletions(-)

diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index d26066e..3b7b6af 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -5,172 +5,31 @@
 @endsection
 
 @section('content')
-    @if(isset($permohonan))
-        <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-            <div class="card border border-agi-100 pb-2.5">
-                <div class="card-header bg-agi-50" id="basic_settings">
-                    <div class="card-title flex flex-row gap-1.5">
-                        <a href="{{ route('permohonan.edit',array_merge(request()->query(),['permohonan'=>$permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('permohonan.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Permohonan</a>
-                        <a href="{{ route('debitur.edit',array_merge(request()->query(),['debitur'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Debitur</a>
-                        <a href="{{ route('debitur.jaminan.index',array_merge(request()->query(),['id'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.jaminan.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Dokumen Jaminan</a>
-                        <a href="{{ route('debitur.pemilik.index',array_merge(request()->query(),['id'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.pemilik.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Pemilk Jaminan</a>
-                    </div>
-                    <div class="flex items-center gap-2">
-                        @if(isset($debitur->id) && !isset($permohonan->id))
-                            <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create.debitur', $debitur->id) }}"> Buat Permohonan </a>
-                        @endif
-
-                        @if(request()->get('from') == 'permohonan')
-                            <a href="{{ route('permohonan.create') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
-                        @elseif($permohonan->id)
-                            <a href="{{ route('permohonan.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
-                        @else
-                            <a href="{{ route('debitur.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
-                        @endif
-                    </div>
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <div class="card border border-agi-100 pb-2.5">
+            @if(isset($permohonan->id))
+            <div class="card-header bg-agi-50" id="basic_settings">
+                <div class="card-title flex flex-row gap-1.5">
+                    <a href="{{ route('permohonan.edit',array_merge(request()->query(),['permohonan'=>$permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('permohonan.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Permohonan</a>
+                    <a href="{{ route('debitur.edit',array_merge(request()->query(),['debitur'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Debitur</a>
+                    <a href="{{ route('debitur.jaminan.index',array_merge(request()->query(),['id'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.jaminan.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Dokumen Jaminan</a>
+                    <a href="{{ route('debitur.pemilik.index',array_merge(request()->query(),['id'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.pemilik.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Pemilk Jaminan</a>
                 </div>
-                <div class="card-body">
-                    @if(request()->routeIs('permohonan.edit', $permohonan))
-                        <form action="{{ isset($permohonan->id) ? route('permohonan.update', $permohonan) : route('permohonan.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
-                            @if(isset($permohonan->id))
-                                @method('PUT')
-                                <input type="hidden" name="id" value="{{ $permohonan->id }}">
-                            @endif
-                            @csrf
+                <div class="flex items-center gap-2">
+                    @if(isset($debitur->id) && !isset($permohonan->id))
+                        <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create.debitur', $debitur->id) }}"> Buat Permohonan </a>
+                    @endif
 
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">
-                                    Debitur
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input type="hidden" name="debiture_id" value="{{ $debitur->id }}">
-                                    <p class="text-base text-bold">{{ $debitur->name }}</p>
-                                </div>
-                            </div>
-
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">
-                                    Tujuan Penilaian
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                        <option value="">Pilih Tujuan Penilaian</option>
-                                        @if(isset($tujuanPenilaian))
-                                            @foreach($tujuanPenilaian as $row)
-                                                <option value="{{ $row->id }}"
-                                                    {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endforeach
-                                        @endif
-                                    </select>
-                                    @error('tujuan_penilaian_id')
-                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                    @enderror
-                                </div>
-                            </div>
-
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">
-                                    Fasilitas Kredit
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <select class="input tomselect w-full @error('jenis_fasilitas_kredit_id') border-danger bg-danger-light @enderror" name="jenis_fasilitas_kredit_id" id="jenis_fasilitas_kredit_id">
-                                        <option value="">Pilih Fasilitas Kredit</option>
-                                        @if(isset($fasilitasKredit))
-                                            @foreach($fasilitasKredit as $row)
-                                                <option value="{{ $row->id }}"
-                                                    {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endforeach
-                                        @endif
-                                    </select>
-                                    @error('jenis_fasilitas_kredit_id')
-                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                    @enderror
-                                </div>
-                            </div>
-
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">
-                                    Nilai Plafond
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                        <option value="">Pilih Nilai Plafond</option>
-                                        @if(isset($plafond))
-                                            @foreach($plafond as $row)
-                                                <option value="{{ $row->id }}"
-                                                    {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endforeach
-                                        @endif
-                                    </select>
-                                    @error('nilai_plafond_id')
-                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                    @enderror
-                                </div>
-                            </div>
-
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">
-                                    Status Bayar
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
-                                        <option value="">Pilih Status Bayar</option>
-                                        <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
-                                        <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
-                                    </select>
-                                    @error('status_bayar')
-                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                    @enderror
-                                </div>
-                            </div>
-
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">
-                                    Nilai NJOP
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
-                                           type="text"
-                                           name="nilai_njop"
-                                           value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
-                                    @error('nilai_njop')
-                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                    @enderror
-                                </div>
-                            </div>
-
-                            @if($permohonan->status=='revisi')
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    Catatan : <br>
-                                    <em class="text-red-500">{{ $permohonan->keterangan }}</em>
-                                </div>
-                            @endif
-                            <div class="flex justify-end">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ $permohonan->status=='revisi' ? 'Submit Ulang' : 'Save' }}
-                                </button>
-                            </div>
-                        </form>
-                    @elseif(request()->routeIs('debitur.edit', $debitur))
-                        @include('lpj::debitur.components.debitur')
-                    @elseif(request()->routeIs('debitur.pemilik.index', $debitur))
-                        @include('lpj::debitur.components.pemilik')
+                    @if(request()->get('from') == 'permohonan')
+                        <a href="{{ route('permohonan.create') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+                    @elseif($permohonan->id)
+                        <a href="{{ route('permohonan.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
                     @else
-                        @include('lpj::debitur.components.jaminan')
+                        <a href="{{ route('debitur.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
                     @endif
                 </div>
             </div>
-        </div>
-    @else
-        <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-
-            <div class="card border border-agi-100 pb-2.5">
+            @else
                 <div class="card-header bg-agi-50" id="basic_settings">
                     <h3 class="card-title">
                         {{ isset($permohonan->id) ? 'Edit' : 'Tambah' }} Permohonan
@@ -179,129 +38,121 @@
                         <a href="{{ route('permohonan.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
                     </div>
                 </div>
-                <div class="card-body">
-                    <form action="{{ isset($permohonan->id) ? route('permohonan.update', $permohonan) : route('permohonan.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
-                        @if(isset($permohonan->id))
-                            @method('PUT')
-                        @endif
-                        @csrf
+            @endif
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Debitur
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <input type="hidden" name="debiture_id" value="{{ $debitur->id }}">
-                                <p class="text-base text-bold">{{ $debitur->name }}</p>
-                            </div>
-                        </div>
+            <div class="card-body">
+                <form action="{{ isset($permohonan->id) ? route('permohonan.update', $permohonan) : route('permohonan.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
+                    @csrf
+                    @if(isset($permohonan->id))
+                        @method('PUT')
+                        <input type="hidden" name="id" value="{{ $permohonan->id }}">
+                    @endif
 
+                    <input type="hidden" name="debiture_id" value="{{ $debitur->id }}">
+
+                    @php
+                        $formFields = [
+                            'tujuan_penilaian_id' => ['label' => 'Tujuan Penilaian', 'type' => 'select', 'options' => $tujuanPenilaian],
+                            'jenis_fasilitas_kredit_id' => ['label' => 'Fasilitas Kredit', 'type' => 'select', 'options' => $fasilitasKredit],
+                            'nilai_plafond_id' => ['label' => 'Nilai Plafond', 'type' => 'select', 'options' => $plafond],
+                            'status_bayar' => ['label' => 'Status Bayar', 'type' => 'select', 'options' => [
+                                'sudah_bayar' => 'Sudah Bayar',
+                                'belum_bayar' => 'Belum Bayar'
+                            ]],
+                            'nilai_njop' => ['label' => 'Nilai NJOP', 'type' => 'text'],
+                        ];
+                    @endphp
+
+                    @foreach($formFields as $field => $config)
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Tujuan Penilaian
-                            </label>
+                            <label class="form-label max-w-56">{{ $config['label'] }}</label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                    <option value="">Pilih Tujuan Penilaian</option>
-                                    @if(isset($tujuanPenilaian))
-                                        @foreach($tujuanPenilaian as $row)
-                                            <option value="{{ $row->id }}"
-                                                {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
-                                                {{ $row->name }}
+                                @if($config['type'] === 'select')
+                                    <select class="input {{ $field != 'status_bayar' ? 'tomselect' : '' }} w-full @error($field) border-danger bg-danger-light @enderror" name="{{ $field }}" id="{{ $field }}">
+                                        <option value="">Pilih {{ $config['label'] }}</option>
+                                        @foreach($config['options'] as $key => $value)
+                                            <option value="{{ $value->id ?? $key }}"
+                                                {{ (old($field) == ($value->id ?? $key)) || (isset($permohonan) && $permohonan->$field == ($value->id ?? $key)) ? 'selected' : '' }}>
+                                                {{ $value->name ?? $value }}
                                             </option>
                                         @endforeach
-                                    @endif
-                                </select>
-                                @error('tujuan_penilaian_id')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    </select>
+                                @else
+                                    <input class="input @error($field) border-danger bg-danger-light @enderror"
+                                           type="{{ $config['type'] }}"
+                                           name="{{ $field }}"
+                                           value="{{ old($field, $permohonan->$field ?? '') }}">
+                                @endif
+                                @error($field)
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
                         </div>
+                    @endforeach
 
+                    @if(isset($permohonan) && $permohonan->status == 'revisi')
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Fasilitas Kredit
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('jenis_fasilitas_kredit_id') border-danger bg-danger-light @enderror" name="jenis_fasilitas_kredit_id" id="jenis_fasilitas_kredit_id">
-                                    <option value="">Pilih Fasilitas Kredit</option>
-                                    @if(isset($fasilitasKredit))
-                                        @foreach($fasilitasKredit as $row)
-                                            <option value="{{ $row->id }}"
-                                                {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
-                                                {{ $row->name }}
-                                            </option>
-                                        @endforeach
-                                    @endif
-                                </select>
-                                @error('jenis_fasilitas_kredit_id')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                                @enderror
-                            </div>
+                            Catatan : <br>
+                            <em class="text-red-500">{{ $permohonan->keterangan }}</em>
                         </div>
+                    @endif
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Nilai Plafond
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                    <option value="">Pilih Nilai Plafond</option>
-                                    @if(isset($plafond))
-                                        @foreach($plafond as $row)
-                                            <option value="{{ $row->id }}"
-                                                {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
-                                                {{ $row->name }}
-                                            </option>
-                                        @endforeach
-                                    @endif
-                                </select>
-                                @error('nilai_plafond_id')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                                @enderror
-                            </div>
-                        </div>
-
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Status Bayar
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
-                                    <option value="">Pilih Status Bayar</option>
-                                    <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
-                                    <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
-                                </select>
-                                @error('status_bayar')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                                @enderror
-                            </div>
-                        </div>
-
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Nilai NJOP
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
-                                       type="text"
-                                       name="nilai_njop"
-                                       value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
-                                @error('nilai_njop')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                                @enderror
-                            </div>
-                        </div>
-
-                        <div class="flex justify-end">
-                            <button type="submit" class="btn btn-primary">
-                                Save
-                            </button>
-                        </div>
-                    </form>
-
-                </div>
+                    <div class="flex justify-end">
+                        <button type="submit" class="btn btn-primary">
+                            {{ isset($permohonan) && $permohonan->status == 'revisi' ? 'Submit Ulang' : 'Save' }}
+                        </button>
+                    </div>
+                </form>
             </div>
         </div>
-    @endif
+    </div>
 @endsection
+
+@push('scripts')
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            const tujuanPenilaianSelect = document.getElementById('tujuan_penilaian_id');
+            const nilaiPlafondSelect = document.getElementById('nilai_plafond_id');
+            const statusBayarSelect = document.getElementById('status_bayar');
+
+            // Initialize TomSelect
+            const statusBayarTomSelect = new window.TomSelect(statusBayarSelect, {
+                create: false,
+                sortField: {
+                    field: "text",
+                    direction: "asc"
+                }
+            });
+
+            function updateStatusBayar() {
+                const tujuanPenilaianValue = tujuanPenilaianSelect.value;
+                const nilaiPlafondValue = nilaiPlafondSelect.value;
+                console.log('Tujuan Penilaian:', tujuanPenilaianValue, 'Nilai Plafond:', nilaiPlafondValue);
+
+                if (tujuanPenilaianValue === '2' && (nilaiPlafondValue === '2' || nilaiPlafondValue === '3')) {
+                    statusBayarTomSelect.setValue('sudah_bayar');
+                    statusBayarTomSelect.disable();
+                } else {
+                    @if(isset($permohonan))
+                    statusBayarTomSelect.setValue('{{$permohonan->status_bayar ?? ''}}');
+                    @else
+                    statusBayarTomSelect.setValue('');
+                    @endif
+                    statusBayarTomSelect.enable();
+                }
+
+                console.log('Status Bayar:', statusBayarTomSelect.getValue());
+            }
+
+            if (tujuanPenilaianSelect && nilaiPlafondSelect && statusBayarSelect) {
+                tujuanPenilaianSelect.addEventListener('change', updateStatusBayar);
+                nilaiPlafondSelect.addEventListener('change', updateStatusBayar);
+
+                // Call the function when the page loads to set the initial status
+                updateStatusBayar();
+            } else {
+                console.error('One or more required elements not found');
+            }
+        });
+    </script>
+@endpush

From 14d6052c4e35f3ef7b3b502aa7078fba4a26e8a0 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 09:33:11 +0700
Subject: [PATCH 10/13] fix(custom_fields): perbaikan opsi dropdown untuk jenis
 custom field

- Memperbaiki nilai opsi dropdown untuk jenis custom field.
- Menambahkan opsi 'Date' ke dalam dropdown.
- Memastikan opsi yang benar dipilih berdasarkan nilai yang ada.
---
 resources/views/custom_fields/create.blade.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/views/custom_fields/create.blade.php b/resources/views/custom_fields/create.blade.php
index 448cdb2..6a3100f 100644
--- a/resources/views/custom_fields/create.blade.php
+++ b/resources/views/custom_fields/create.blade.php
@@ -55,11 +55,12 @@
                                         Type
                                     </label>
                                     <div class="flex flex-wrap items-baseline w-full">
-                                        <select class="input @error('type') border-danger bg-danger-light @enderror" name="type">
+                                       <select class="input @error('type') border-danger bg-danger-light @enderror" name="type">
                                             <option value="text" {{ (isset($customField->type) && $customField->type == 'text') ? 'selected' : '' }}>Text</option>
                                             <option value="radio" {{ (isset($customField->type) && $customField->type == 'radio') ? 'selected' : '' }}>Radio</option>
-                                            <option value="number" {{ (isset($customField->type) && $customField->type == 'select') ? 'selected' : '' }}>Select</option>
-                                            <option value="option" {{ (isset($customField->type) && $customField->type == 'checkbox') ? 'selected' : '' }}>Checkbox</option>
+                                            <option value="select" {{ (isset($customField->type) && $customField->type == 'select') ? 'selected' : '' }}>Select</option>
+                                            <option value="checkbox" {{ (isset($customField->type) && $customField->type == 'checkbox') ? 'selected' : '' }}>Checkbox</option>
+                                            <option value="date" {{ (isset($customField->type) && $customField->type == 'date') ? 'selected' : '' }}>Date</option>
                                         </select>
                                         @error('type')
                                         <em class="alert text-danger text-sm">{{ $message }}</em>

From 1aeb96f8b5ebfffd5b779e1d4d3ca40d3aee1375 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 10:03:34 +0700
Subject: [PATCH 11/13] fix(custom_fields): tambahkan opsi tipe custom field
 baru

- Menambahkan opsi 'date' dan 'number' pada validasi tipe custom field.
- Memperbarui tampilan dropdown untuk mencakup opsi baru.
---
 app/Http/Requests/CustomFieldRequest.php       | 2 +-
 resources/views/custom_fields/create.blade.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/CustomFieldRequest.php b/app/Http/Requests/CustomFieldRequest.php
index 9c8730c..bc3d7fc 100644
--- a/app/Http/Requests/CustomFieldRequest.php
+++ b/app/Http/Requests/CustomFieldRequest.php
@@ -15,7 +15,7 @@ class CustomFieldRequest extends FormRequest
     {
         return [
             'name' => 'required|max:255',
-            'type' => 'required|in:text,select,radio,checkbox',
+            'type' => 'required|in:text,select,radio,checkbox,date,number',
             'label' => 'nullable|max:255',
             'urutan_prioritas' => [
                 'nullable',
diff --git a/resources/views/custom_fields/create.blade.php b/resources/views/custom_fields/create.blade.php
index 6a3100f..57b44b2 100644
--- a/resources/views/custom_fields/create.blade.php
+++ b/resources/views/custom_fields/create.blade.php
@@ -55,12 +55,13 @@
                                         Type
                                     </label>
                                     <div class="flex flex-wrap items-baseline w-full">
-                                       <select class="input @error('type') border-danger bg-danger-light @enderror" name="type">
+                                        <select class="input @error('type') border-danger bg-danger-light @enderror" name="type">
                                             <option value="text" {{ (isset($customField->type) && $customField->type == 'text') ? 'selected' : '' }}>Text</option>
                                             <option value="radio" {{ (isset($customField->type) && $customField->type == 'radio') ? 'selected' : '' }}>Radio</option>
                                             <option value="select" {{ (isset($customField->type) && $customField->type == 'select') ? 'selected' : '' }}>Select</option>
                                             <option value="checkbox" {{ (isset($customField->type) && $customField->type == 'checkbox') ? 'selected' : '' }}>Checkbox</option>
                                             <option value="date" {{ (isset($customField->type) && $customField->type == 'date') ? 'selected' : '' }}>Date</option>
+                                            <option value="number" {{ (isset($customField->type) && $customField->type == 'number') ? 'selected' : '' }}>Number</option>
                                         </select>
                                         @error('type')
                                         <em class="alert text-danger text-sm">{{ $message }}</em>

From e52fd8243fe20981770266459bc6eb37649d1234 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 10:03:46 +0700
Subject: [PATCH 12/13] fix(dokumen): perbaikan dan penambahan tipe custom
 field

- Menambahkan dukungan untuk berbagai tipe custom field: text, number, date, textarea, dan select.
- Memperbaiki cara pengambilan nilai custom field dari detail.
- Mengoptimalkan penggunaan variabel untuk meningkatkan keterbacaan kode.
---
 .../debitur/components/dokumen.blade.php      | 91 +++++++++++++++++--
 1 file changed, 84 insertions(+), 7 deletions(-)

diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 2a0d74c..9d3b3da 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -317,11 +317,38 @@
                     @if($detail->jenisLegalitasJaminan->custom_fields)
                         @foreach($detail->jenisLegalitasJaminan->custom_fields as $key)
                             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                @php
+                                    $customField = getCustomField($key);
+                                    $fieldValue = json_decode($detail->details)->{$customField->name} ?? '';
+                                @endphp
                                 <label class="form-label max-w-56 capitalize">
-                                    {{ getCustomField($key)->label ?? "" }}
+                                    {{ $customField->label ?? "" }}
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input" type="text" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{getCustomField($key)->name}}]" value="{{ json_decode($detail->details)->{getCustomField($key)->name} ?? '' }}">
+                                   @switch($customField->type)
+                                        @case('text')
+                                            <input class="input" type="text" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" value="{{ $fieldValue }}" placeholder="...">
+                                            @break
+                                        @case('number')
+                                            <input class="input" type="number" step="0.01" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" value="{{ $fieldValue }}" placeholder="...">
+                                            @break
+                                        @case('date')
+                                            <input class="input" type="date" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" value="{{ $fieldValue }}">
+                                            @break
+                                        @case('textarea')
+                                            <textarea class="textarea" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" placeholder="...">{{ $fieldValue }}</textarea>
+                                            @break
+                                        @case('select')
+                                            <select class="select" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]">
+                                                <option value="">Select an option</option>
+                                                @foreach($customField->options as $option)
+                                                    <option value="{{ $option }}" {{ $fieldValue == $option ? 'selected' : '' }}>{{ $option }}</option>
+                                                @endforeach
+                                            </select>
+                                            @break
+                                        @default
+                                            <input class="input" type="text" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" value="{{ $fieldValue }}" placeholder="...">
+                                    @endswitch
                                 </div>
                             </div>
                         @endforeach
@@ -330,11 +357,37 @@
                     @if($detail->jenisLegalitasJaminan->custom_fields)
                         @foreach($detail->jenisLegalitasJaminan->custom_fields as $key)
                             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                @php
+                                    $customField = getCustomField($key);
+                                @endphp
                                 <label class="form-label max-w-56 capitalize">
-                                    {{ getCustomField($key)->label }}
+                                    {{ $customField->label }}
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input" type="text" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{getCustomField($key)->name}}]" placeholder="...">
+                                    @switch($customField->type)
+                                        @case('text')
+                                            <input class="input" type="text" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" placeholder="...">
+                                            @break
+                                        @case('number')
+                                            <input class="input" type="number" step="0.01" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" placeholder="...">
+                                            @break
+                                        @case('date')
+                                            <input class="input" type="date" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]">
+                                            @break
+                                        @case('textarea')
+                                            <textarea class="textarea" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" placeholder="..."></textarea>
+                                            @break
+                                        @case('select')
+                                            <select class="select" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]">
+                                                <option value="">Select an option</option>
+                                                @foreach($customField->options as $option)
+                                                    <option value="{{ $option }}">{{ $option }}</option>
+                                                @endforeach
+                                            </select>
+                                            @break
+                                        @default
+                                            <input class="input" type="text" name="custom_field[{{$detail->jenisLegalitasJaminan->id}}][{{$customField->name}}]" placeholder="...">
+                                    @endswitch
                                 </div>
                             </div>
                         @endforeach
@@ -387,12 +440,36 @@
 
                     @if($item->custom_fields)
                         @foreach($item->custom_fields as $field)
+                            @php $custom_field = getCustomField($field) @endphp
                             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                 <label class="form-label max-w-56 capitalize">
-                                    {{ getCustomField($field)->label }}
+                                    {{ $custom_field->label }}
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input" type="text" name="custom_field[{{$item->id}}][{{getCustomField($field)->name}}]" placeholder="...">
+                                    @switch($custom_field->type)
+                                        @case('text')
+                                            <input class="input" type="text" name="custom_field[{{$item->id}}][{{$custom_field->name}}]" placeholder="...">
+                                            @break
+                                        @case('number')
+                                            <input class="input" type="number" step="0.01" name="custom_field[{{$item->id}}][{{$custom_field->name}}]" placeholder="...">
+                                            @break
+                                        @case('date')
+                                            <input class="input" type="date" name="custom_field[{{$item->id}}][{{$custom_field->name}}]">
+                                            @break
+                                        @case('textarea')
+                                            <textarea class="textarea" name="custom_field[{{$item->id}}][{{$custom_field->name}}]" placeholder="..."></textarea>
+                                            @break
+                                        @case('select')
+                                            <select class="select" name="custom_field[{{$item->id}}][{{$custom_field->name}}]">
+                                                <option value="">Select an option</option>
+                                                @foreach($custom_field->options as $option)
+                                                    <option value="{{ $option }}">{{ $option }}</option>
+                                                @endforeach
+                                            </select>
+                                            @break
+                                        @default
+                                            <input class="input" type="text" name="custom_field[{{$item->id}}][{{$custom_field->name}}]" placeholder="...">
+                                    @endswitch
                                 </div>
                             </div>
                         @endforeach
@@ -627,7 +704,7 @@
                 case "text":
                     return `<input class="input" type="text" name="custom_field[${itemId}][${fieldName}]" value="${value}">`;
                 case "number":
-                    return `<input class="input" type="number" name="custom_field[${itemId}][${fieldName}]" value="${value}">`;
+                    return `<input class="input" type="number" step="0.01"  name="custom_field[${itemId}][${fieldName}]" value="${value}">`;
                 case "date":
                     return `<input class="input" type="date" name="custom_field[${itemId}][${fieldName}]" value="${value}">`;
                 case "textarea":

From 05bf9e2af0cc20e78146e5c4424eb73dd3d8fc91 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 5 Mar 2025 13:33:02 +0700
Subject: [PATCH 13/13] fix(surveyor): perbaikan print out hasil inspeksi

---
 .../print-out/apartement-kantor.blade.php     |  13 +
 .../components/print-out/bangunan.blade.php   | 323 ++++---
 .../components/print-out/fakta.blade.php      | 111 +++
 .../components/print-out/informasi.blade.php  | 187 +---
 .../components/print-out/lingkungan.blade.php | 553 +++++------
 .../components/print-out/main.blade.php       | 869 +++++++++---------
 .../components/print-out/print.blade.php      | 704 ++++++++++++++
 .../components/print-out/rap.blade.php        |  25 +-
 .../components/print-out/tanah.blade.php      |  85 +-
 9 files changed, 1873 insertions(+), 997 deletions(-)
 create mode 100644 resources/views/surveyor/components/print-out/fakta.blade.php
 create mode 100644 resources/views/surveyor/components/print-out/print.blade.php

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 33ca5da..80663a2 100644
--- a/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
+++ b/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
@@ -1,3 +1,15 @@
+<div class="no-break" style="margin: 0; padding: 0">
+    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+
+        <tr>
+            <td style="text-align: center; margin-top: 5px;">
+                <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                    Analisa Unit
+                </h2>
+
+            </td>
+        </tr>
+    </table>
 <table>
     <tr>
         @php
@@ -99,3 +111,4 @@
 </table>
 @endif
 </table>
+</div>
diff --git a/resources/views/surveyor/components/print-out/bangunan.blade.php b/resources/views/surveyor/components/print-out/bangunan.blade.php
index adf3b95..0224431 100644
--- a/resources/views/surveyor/components/print-out/bangunan.blade.php
+++ b/resources/views/surveyor/components/print-out/bangunan.blade.php
@@ -1,24 +1,64 @@
-<table>
-    <!-- Luas Tanah Bangunan -->
-    <tr>
-        @php
-            $cekLuasBangunan = isset($forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'])
-                ? 'tidak sesuai'
-                : 'sesuai';
-            $luasBangunan = $forminspeksi['bangunan']['luas_tanah_bagunan'][$cekLuasBangunan] ?? null;
-        @endphp
-        <td width="25%"><strong>Luas Bangunan (IMB)</strong></td>
-        <td>{{ $luasBangunan }}</td>
+<div class="no-break" style="margin: 0; padding: 0">
+    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+
+        <tr>
+            <td style="text-align: center; margin-top: 5px;">
+                <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                    ANalisa Bangunan
+                </h2>
+
+            </td>
+        </tr>
+    </table>
+
+    <table>
+        <!-- Luas Tanah Bangunan -->
+        <tr>
+            @php
+                $cekLuasBangunan = isset($forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'])
+                    ? 'tidak sesuai'
+                    : 'sesuai';
+                $luasBangunan = $forminspeksi['bangunan']['luas_tanah_bagunan'][$cekLuasBangunan] ?? null;
+            @endphp
+            <td width="25%"><strong>Luas Bangunan (IMB)</strong></td>
+            <td>{{ $luasBangunan }}</td>
+        </tr>
+
+        <!-- Jenis Bangunan -->
+        <tr>
+            <td><strong>Jenis Bangunan</strong></td>
+            <td>
+                @if (isset($basicData['jenisBangunan']))
+                    <table class="checkbox-list">
+                        <tr>
+                            @foreach ($basicData['jenisBangunan'] 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['bangunan']['jenis_bangunan']) && in_array($item->name, $forminspeksi['bangunan']['jenis_bangunan']) ? 'checked' : '' }}>
+                    {{ $item->name }}
+
+                </label>
+            </td>
+            @endforeach
+        </tr>
+    </table>
+    @endif
+    </td>
     </tr>
 
-    <!-- Jenis Bangunan -->
+    <!-- Kondisi Bangunan -->
     <tr>
-        <td><strong>Jenis Bangunan</strong></td>
+        <td><strong>Kondisi Bangunan</strong></td>
         <td>
-            @if (isset($basicData['jenisBangunan']))
+            @if (isset($basicData['kondisiBangunan']))
                 <table class="checkbox-list">
                     <tr>
-                        @foreach ($basicData['jenisBangunan'] as $index => $item)
+                        @foreach ($basicData['kondisiBangunan'] as $index => $item)
                             @if ($index % 3 == 0 && $index > 0)
                     </tr>
                     <tr>
@@ -26,63 +66,36 @@
         <td class="checkbox-item">
             <label class="checkbox-label">
                 <input type="checkbox"
-                    {{ isset($forminspeksi['bangunan']['jenis_bangunan']) && in_array($item->name, $forminspeksi['bangunan']['jenis_bangunan']) ? 'checked' : '' }}>
+                    {{ isset($forminspeksi['bangunan']['kondisi_bangunan']) && in_array($item->name, $forminspeksi['bangunan']['kondisi_bangunan']) ? 'checked' : '' }}>
                 {{ $item->name }}
-                
             </label>
         </td>
         @endforeach
     </tr>
-</table>
-@endif
-</td>
-</tr>
-
-<!-- Kondisi Bangunan -->
-<tr>
-    <td><strong>Kondisi Bangunan</strong></td>
-    <td>
-        @if (isset($basicData['kondisiBangunan']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['kondisiBangunan'] 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['bangunan']['kondisi_bangunan']) && in_array($item->name, $forminspeksi['bangunan']['kondisi_bangunan']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
+    </table>
+    @endif
     </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
+    </tr>
 
-<!-- Sifat Bangunan -->
-<tr>
-    <td><strong>Sifat Bangunan</strong></td>
-    <td>
-        @if (isset($basicData['sifatBangunan']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['sifatBangunan'] as $index => $item)
-                        @if ($index % 3 == 0 && $index > 0)
-                </tr>
-                <tr>
-        @endif
-    <td class="checkbox-item">
-        <label class="checkbox-label">
-            <input type="checkbox" name="sifat_bangunan[]" value="{{ $item->name }}"
-                {{ isset($forminspeksi['bangunan']['sifat_bangunan']) && in_array($item->name, $forminspeksi['bangunan']['sifat_bangunan']) ? 'checked' : '' }}>
-            {{ $item->name }}
+    <!-- Sifat Bangunan -->
+    <tr>
+        <td><strong>Sifat Bangunan</strong></td>
+        <td>
+            @if (isset($basicData['sifatBangunan']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['sifatBangunan'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
+            <label class="checkbox-label">
+                <input type="checkbox" name="sifat_bangunan[]" value="{{ $item->name }}"
+                    {{ isset($forminspeksi['bangunan']['sifat_bangunan']) && in_array($item->name, $forminspeksi['bangunan']['sifat_bangunan']) ? 'checked' : '' }}>
+                {{ $item->name }}
 
-            @if (isset($forminspeksi['bangunan']['sifat_bangunan']) &&
+                @if (isset($forminspeksi['bangunan']['sifat_bangunan']) &&
                         in_array($item->name, $forminspeksi['bangunan']['sifat_bangunan']))
                     @php
                         $inputValues = isset($forminspeksi['bangunan']['sifat_bangunan_input'][$index])
@@ -93,80 +106,118 @@
                         <span class="label-checkbox"> - {{ $inputValues }}</span>
                     @endif
                 @endif
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
-
-
-@if (isset($forminspeksi['bangunan']['spesifikasi_bangunan']) &&
-        count($forminspeksi['bangunan']['spesifikasi_bangunan']) > 0)
-    @foreach ($forminspeksi['bangunan']['spesifikasi_bangunan'] as $bangunanIndex => $bangunan)
-        <tr>
-            <td colspan="2"><strong>Spesifikasi Bangunan {{ $bangunanIndex + 1 }}</strong></td>
-        </tr>
-        @if (isset($basicData['spekKategoriBangunan']))
-            @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi)
-                <tr>
-                    <td style="vertical-align: top;"><strong>{{ $spesifikasi->name }}</strong></td>
-                    <td>
-                        <table class="checkbox-list">
-                            @if (isset($basicData['spekBangunan']))
-                                @php $count = 0; @endphp
-                                <tr>
-                                    @foreach ($basicData['spekBangunan'] as $kategori)
-                                        @if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id)
-                                            @php
-                                                $selectedValues = [];
-                                                if (isset($bangunan['spek_kategori_bangunan'][$spesifikasi->name])) {
-                                                    $selectedValues = array_values(
-                                                        $bangunan['spek_kategori_bangunan'][$spesifikasi->name],
-                                                    );
-                                                }
-                                                $lainnyaValue =
-                                                    $bangunan['spek_kategori_bangunan'][$spesifikasi->name][
-                                                        'lainnya'
-                                                    ] ?? '';
-                                            @endphp
-
-                                            <td class="checkbox-item">
-                                                <label class="checkbox-label">
-                                                    <input type="checkbox" class="checkbox-lainnya"
-                                                        style="margin-right: 3px;"
-                                                        name="spesifikasi_bangunan[{{ $bangunanIndex }}][{{ $spesifikasi->name }}][]"
-                                                        value="{{ $kategori->name }}"
-                                                        @if (in_array($kategori->name, $selectedValues)) checked @endif>
-                                                    {{ $kategori->name }}
-
-                                                    @if ($kategori->name == 'Lainnya')
-                                                        <span class="text-lainnya"
-                                                            style="display: {{ in_array('Lainnya', $selectedValues) ? 'inline' : 'none' }};">
-                                                            : {{ $lainnyaValue }}
-                                                        </span>
-                                                    @endif
-                                                </label>
-                                            </td>
-
-                                            @php $count++; @endphp
-
-                                            @if ($count % 3 == 0)
-                                </tr>
-                                <tr>
-                            @endif
-            @endif
+            </label>
+        </td>
         @endforeach
-        </tr>
-    @endif
+    </tr>
     </table>
+    @endif
     </td>
     </tr>
-@endforeach
-@endif
-@endforeach
-@endif
 
-</table>
+
+    @if (isset($forminspeksi['bangunan']['spesifikasi_bangunan']) &&
+            count($forminspeksi['bangunan']['spesifikasi_bangunan']) > 0)
+        @foreach ($forminspeksi['bangunan']['spesifikasi_bangunan'] as $bangunanIndex => $bangunan)
+            <tr>
+                <td colspan="2"><strong>Spesifikasi Bangunan {{ $bangunanIndex + 1 }}</strong></td>
+            </tr>
+            @if (isset($basicData['spekKategoriBangunan']))
+                @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi)
+                    <tr>
+                        <td style="vertical-align: top;"><strong>{{ $spesifikasi->name }}</strong></td>
+                        <td>
+                            <table class="checkbox-list">
+                                @if (isset($basicData['spekBangunan']))
+                                    @php $count = 0; @endphp
+                                    <tr>
+                                        @foreach ($basicData['spekBangunan'] as $kategori)
+                                            @if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id)
+                                                @php
+                                                    $selectedValues = [];
+                                                    if (
+                                                        isset($bangunan['spek_kategori_bangunan'][$spesifikasi->name])
+                                                    ) {
+                                                        $selectedValues = array_values(
+                                                            $bangunan['spek_kategori_bangunan'][$spesifikasi->name],
+                                                        );
+                                                    }
+                                                    $lainnyaValue =
+                                                        $bangunan['spek_kategori_bangunan'][$spesifikasi->name][
+                                                            'lainnya'
+                                                        ] ?? '';
+                                                @endphp
+
+                                                <td class="checkbox-item">
+                                                    <label class="checkbox-label">
+                                                        <input type="checkbox" class="checkbox-lainnya"
+                                                            style="margin-right: 3px;"
+                                                            name="spesifikasi_bangunan[{{ $bangunanIndex }}][{{ $spesifikasi->name }}][]"
+                                                            value="{{ $kategori->name }}"
+                                                            @if (in_array($kategori->name, $selectedValues)) checked @endif>
+                                                        {{ $kategori->name }}
+
+                                                        @if ($kategori->name == 'Lainnya')
+                                                            <span class="text-lainnya"
+                                                                style="display: {{ in_array('Lainnya', $selectedValues) ? 'inline' : 'none' }};">
+                                                                : {{ $lainnyaValue }}
+                                                            </span>
+                                                        @endif
+                                                    </label>
+                                                </td>
+
+                                                @php $count++; @endphp
+
+                                                @if ($count % 3 == 0)
+                                    </tr>
+                                    <tr>
+                                @endif
+                @endif
+            @endforeach
+            </tr>
+        @endif
+        </table>
+        </td>
+        </tr>
+    @endforeach
+    @endif
+    @endforeach
+    @endif
+
+    <tr>
+        <td style="vertical-align: top;"><strong>Sarana Pelengkap</strong></td>
+        <td>
+            @if (isset($basicData['saranaPelengkap']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['saranaPelengkap'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
+            <label class="checkbox-label">
+                <input type="checkbox" name="sarana_pelengkap[]" value="{{ $item->name }}"
+                    {{ isset($forminspeksi['bangunan']['sarana_pelengkap']) && in_array($item->name, $forminspeksi['bangunan']['sarana_pelengkap']) ? 'checked' : '' }}>
+                {{ $item->name }}
+
+                @if (isset($forminspeksi['bangunan']['sarana_pelengkap']) &&
+                        in_array($item->name, $forminspeksi['bangunan']['sarana_pelengkap']))
+                    @php
+                        $inputValues = isset($forminspeksi['bangunan']['sarana_pelengkap_input'][$index])
+                            ? $forminspeksi['bangunan']['sarana_pelengkap_input'][$index]
+                            : null;
+                    @endphp
+                    @if ($inputValues)
+                        <span class="label-checkbox"> - {{ $inputValues }}</span>
+                    @endif
+                @endif
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    </td>
+    </tr>
+</div>
diff --git a/resources/views/surveyor/components/print-out/fakta.blade.php b/resources/views/surveyor/components/print-out/fakta.blade.php
new file mode 100644
index 0000000..480f15d
--- /dev/null
+++ b/resources/views/surveyor/components/print-out/fakta.blade.php
@@ -0,0 +1,111 @@
+<div class="no-break" style="margin: 0; padding: 0">
+    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+
+
+        <tr>
+            <td style="text-align: center; margin-top: 5px;">
+                <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                    ANalisa Fakta
+                </h2>
+
+            </td>
+        </tr>
+    </table>
+
+    <table>
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Faktor Positif</strong></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>{!! nl2br(e($item)) !!}</td>
+                            </tr>
+                        @endforeach
+                    </table>
+                @endisset
+            </td>
+        </tr>
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Faktor Negatif</strong></td>
+            <td>
+                @php
+                    $faktaNegatif = $forminspeksi['fakta']['fakta_negatif'] ?? [];
+                    $faktaNegatifFiltered = is_array($faktaNegatif)
+                        ? array_filter($faktaNegatif, function ($item) {
+                            return !empty(trim($item));
+                        })
+                        : [];
+                @endphp
+
+                @if (!empty($faktaNegatifFiltered))
+                    <table style="width: 100%; border-collapse: collapse;">
+                        @foreach ($faktaNegatifFiltered as $key => $item)
+                            <tr>
+                                <td>{!! nl2br(e($item)) !!}</td>
+                            </tr>
+                        @endforeach
+                    </table>
+                @else
+                    <p>Tidak ada faktor negatif yang teridentifikasi.</p>
+                @endif
+            </td>
+        </tr>
+
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Rute Munuju</strong></td>
+            <td>
+                <p>{{ $forminspeksi['fakta']['rute_menuju'] ?? '' }}</p>
+            </td>
+        </tr>
+
+
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Batas Batas </strong></td>
+            <td>
+
+
+                @foreach ($forminspeksi['fakta']['batas_batas_input'] ?? [] as $arah => $batas)
+                    @if ($batas)
+                        <p> - {{ $arah }} : {{ $batas }}</p>
+                    @endif
+                @endforeach
+            </td>
+        </tr>
+
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Kondisi lain terkait lingkungan </strong></td>
+            <td>
+
+
+                @foreach ($forminspeksi['fakta']['kondisi_lingkungan'] ?? [] as $kondisi)
+                    <p>{!! nl2br(e($kondisi)) !!}</p>
+                @endforeach
+            </td>
+        </tr>
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Kondisi lain terkait Bangunan </strong></td>
+            <td>
+
+                @foreach ($forminspeksi['fakta']['kondisi_lain_bangunan'] ?? [] as $kondisiLain)
+                    <p>{!! nl2br(e($kondisiLain)) !!}</p>
+                @endforeach
+            </td>
+        </tr>
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Informasi Terkait Dokumen </strong></td>
+            <td>
+
+                @foreach ($forminspeksi['fakta']['informasi_dokument'] ?? [] as $informasi)
+                <p>{!! nl2br(e($informasi)) !!}</p>
+            @endforeach
+
+            </td>
+        </tr>
+
+
+
+    </table>
+
+</div>
diff --git a/resources/views/surveyor/components/print-out/informasi.blade.php b/resources/views/surveyor/components/print-out/informasi.blade.php
index d8cb19c..90b845b 100644
--- a/resources/views/surveyor/components/print-out/informasi.blade.php
+++ b/resources/views/surveyor/components/print-out/informasi.blade.php
@@ -1,145 +1,58 @@
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        G
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        KESIMPULAN
-    </td>
-</tr>
+<div class="no-break" style="margin: 0; padding: 0">
+    <table
+        style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
 
-    </td>
-    <td>
-        <table>
-            <tr>
-                <td>
-                    1 KESIMPULAN PENILAI
-                </td>
-            </tr>
-            <tr>
-                <td width="25%" style="vertical-align: top;"><strong>Faktor Positif</strong></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>{!! nl2br(e($item)) !!}</td>
-                                </tr>
-                            @endforeach
-                        </table>
-                    @endisset
-                </td>
-            </tr>
-            <tr>
-                <td width="25%" style="vertical-align: top;"><strong>Faktor Negatif</strong></td>
-                <td>
-                    @php
-                        $faktaNegatif = $forminspeksi['fakta']['fakta_negatif'] ?? [];
-                        $faktaNegatifFiltered = is_array($faktaNegatif)
-                            ? array_filter($faktaNegatif, function ($item) {
-                                return !empty(trim($item));
-                            })
-                            : [];
-                    @endphp
+        <tr>
+            <td style="text-align: center; margin-top: 5px;">
+                <h2 style="text-transform: uppercase; text-align: center; margin: 0;">Informasi Dinas Tata Ruang</h2>
+            </td>
+        </tr>
+    </table>
+    <table>
 
-                    @if (!empty($faktaNegatifFiltered))
-                        <table style="width: 100%; border-collapse: collapse;">
-                            @foreach ($faktaNegatifFiltered as $key => $item)
-                                <tr>
-                                    <td>{!! nl2br(e($item)) !!}</td>
-                                </tr>
-                            @endforeach
-                        </table>
-                    @else
-                        <p>Tidak ada faktor negatif yang teridentifikasi.</p>
+
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Informasi Dinas Tata Ruang </strong></td>
+            <td>
+                @php
+                    $informasi = [
+                        'peruntukan',
+                        'kdb',
+                        'kdh',
+                        'gsb',
+                        'max_lantai',
+                        'klb',
+                        'gss',
+                        'pelebaran_jalan',
+                        'nama_petugas',
+                    ];
+                @endphp
+
+                @foreach ($informasi as $key)
+                    @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
+                        @php
+                            $displayKey = ucfirst(str_replace('_', ' ', $key));
+                            if (strlen($key) == 3) {
+                                $displayKey = strtoupper($key);
+                            }
+                        @endphp
+                        <p> - {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}</p>
                     @endif
-                </td>
-            </tr>
+                @endforeach
+            </td>
+        </tr>
 
-            <tr>
-                <td width="25%" style="vertical-align: top;"><strong>Lain - lain :</strong></td>
-                <td>
-                    @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
-                        <p>{!! nl2br(e($keterangan)) !!}</p>
-                    @endforeach
-                    <p>{{ $forminspeksi['fakta']['rute_menuju'] ?? '' }}</p>
+        <tr>
+            <td width="25%" style="vertical-align: top;"><strong>Catatan yang Perlu Diperhatikan </strong></td>
+            <td tyle="vertical-align: top;">
 
-                    @foreach ($forminspeksi['fakta']['informasi_dokument'] ?? [] as $informasi)
-                        <p>{!! nl2br(e($informasi)) !!}</p>
-                    @endforeach
+                @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $informasi)
+                    <p>{!! nl2br(e($informasi)) !!}</p>
+                @endforeach
 
-                    @foreach ($forminspeksi['fakta']['kondisi_lingkungan'] ?? [] as $kondisi)
-                        <p>{!! nl2br(e($kondisi)) !!}</p>
-                    @endforeach
+            </td>
+        </tr>
 
-                    @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
-                </td>
-            </tr>
-            <tr>
-
-                <td>
-                    2 CATATAN YANG PERLU DI PERHATIKAN
-                </td>
-            </tr>
-            <tr>
-                <td width="25%" style="vertical-align: top;"></td>
-                <td>
-                    <table>
-                        @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
-                            <tr>
-                                <td>
-                                    <p>{!! nl2br(e($keterangan)) !!}</p>
-                                </td>
-                            </tr>
-                        @endforeach
-                    </table>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    3 DINAS TATA KOTA
-                </td>
-            </tr>
-
-            <tr>
-                <td>
-                    @php
-                        $informasi = [
-                            'peruntukan',
-                            'kdb',
-                            'kdh',
-                            'gsb',
-                            'max_lantai',
-                            'klb',
-                            'gss',
-                            'pelebaran_jalan',
-                            'nama_petugas',
-                        ];
-                    @endphp
-
-                    @foreach ($informasi as $key)
-                        @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
-                            @php
-                                $displayKey = ucfirst(str_replace('_', ' ', $key));
-                                if (strlen($key) == 3) {
-                                    $displayKey = strtoupper($key);
-                                }
-                            @endphp
-                            <p> - {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}</p>
-                        @endif
-                    @endforeach
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+    </table>
+</div>
diff --git a/resources/views/surveyor/components/print-out/lingkungan.blade.php b/resources/views/surveyor/components/print-out/lingkungan.blade.php
index a42207c..d717e68 100644
--- a/resources/views/surveyor/components/print-out/lingkungan.blade.php
+++ b/resources/views/surveyor/components/print-out/lingkungan.blade.php
@@ -1,294 +1,295 @@
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        F
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        SARANA PELENGKAP DAN LINKUNGAN
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-    </td>
-    <td>
-        <table>
-            <tr>
-                <td width="25%">Jarak Jalan Utama</td>
-                <td>{{ $forminspeksi['lingkungan']['jarak_jalan_utama'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Jalan Lingkungan</td>
-                <td>{{ $forminspeksi['lingkungan']['jalan_linkungan'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Jarak CBD Point</td>
-                <td>{{ $forminspeksi['lingkungan']['jarak_cbd_point'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Nama CBD Point</td>
-                <td>{{ $forminspeksi['lingkungan']['nama_cbd_point'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Lebar Perkerasan Jalan</td>
-                <td>{{ $forminspeksi['lingkungan']['lebar_perkerasan_jalan'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td style="vertical-align: top;"><strong>Sarana Pelengkap</strong></td>
-                <td>
-                    @if (isset($basicData['saranaPelengkap']))
-                        <table class="checkbox-list">
-                            <tr>
-                                @foreach ($basicData['saranaPelengkap'] as $index => $item)
-                                    @if ($index % 3 == 0 && $index > 0)
-                            </tr>
-                            <tr>
-                    @endif
-                <td class="checkbox-item">
-                    <label class="checkbox-label">
-                        <input type="checkbox" name="sarana_pelengkap[]" value="{{ $item->name }}"
-                            {{ isset($forminspeksi['bangunan']['sarana_pelengkap']) && in_array($item->name, $forminspeksi['bangunan']['sarana_pelengkap']) ? 'checked' : '' }}>
-                        {{ $item->name }}
+<div class="no-break">
+    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-                        @if (isset($forminspeksi['bangunan']['sarana_pelengkap']) &&
-                                in_array($item->name, $forminspeksi['bangunan']['sarana_pelengkap']))
-                            @php
-                                $inputValues = isset($forminspeksi['bangunan']['sarana_pelengkap_input'][$index])
-                                    ? $forminspeksi['bangunan']['sarana_pelengkap_input'][$index]
-                                    : null;
-                            @endphp
-                            @if ($inputValues)
-                                <span class="label-checkbox"> - {{ $inputValues }}</span>
+        <tr>
+             <td style="text-align: center; margin-top: 5px;">
+                <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                Analisa Lingkungan
+            </td>
+        </tr>
+    </table>
+    <table>
+        <tr>
+            <td>
+                <table>
+                    <tr>
+                        <td width="25%">Jarak Jalan Utama</td>
+                        <td>{{ $forminspeksi['lingkungan']['jarak_jalan_utama'] ?? '' }}</td>
+                    </tr>
+                    <tr>
+                        <td>Jalan Lingkungan</td>
+                        <td>{{ $forminspeksi['lingkungan']['jalan_linkungan'] ?? '' }}</td>
+                    </tr>
+                    <tr>
+                        <td>Jarak CBD Point</td>
+                        <td>{{ $forminspeksi['lingkungan']['jarak_cbd_point'] ?? '' }}</td>
+                    </tr>
+                    <tr>
+                        <td>Nama CBD Point</td>
+                        <td>{{ $forminspeksi['lingkungan']['nama_cbd_point'] ?? '' }}</td>
+                    </tr>
+                    <tr>
+                        <td>Lebar Perkerasan Jalan</td>
+                        <td>{{ $forminspeksi['lingkungan']['lebar_perkerasan_jalan'] ?? '' }}</td>
+                    </tr>
+
+                    <tr>
+                        <td style="vertical-align: top;"><strong>Perkerasan Jalan</strong></td>
+                        <td>
+                            @if (isset($basicData['perkerasanJalan']))
+                                <table class="checkbox-list">
+                                    <tr>
+                                        @foreach ($basicData['perkerasanJalan'] as $index => $item)
+                                            @if ($index % 3 == 0 && $index > 0)
+                                    </tr>
+                                    <tr>
                             @endif
-                        @endif
-                    </label>
-                </td>
-                @endforeach
-            </tr>
-        </table>
-        @endif
-    </td>
-</tr>
-<tr>
-    <td style="vertical-align: top;"><strong>Lapisan Perkerasan Jalan</strong></td>
-    <td>
-        @if (isset($basicData['perkerasanJalan']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['perkerasanJalan'] 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['lingkungan']['perkerasan_jalan']['perkerasan_jalan']) && in_array($item->name, $forminspeksi['lingkungan']['perkerasan_jalan']['perkerasan_jalan']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
+                        <td class="checkbox-item">
+                            <label class="checkbox-label">
+                                <input type="checkbox"
+                                    {{ isset($forminspeksi['lingkungan']['perkerasan_jalan']['perkerasan_jalan']) && in_array($item->name, $forminspeksi['lingkungan']['perkerasan_jalan']['perkerasan_jalan']) ? 'checked' : '' }}>
+                                {{ $item->name }}
+                            </label>
+                        </td>
+                        @endforeach
+                    </tr>
+                </table>
+                @endif
+            </td>
+        </tr>
 
-<tr>
-    <td style="vertical-align: top;"><strong>Lapisan Perkerasan Jalan</strong></td>
-    <td>
-        @if (isset($basicData['laluLintasLokasi']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['laluLintasLokasi'] 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['lingkungan']['lalu_lintas']) && in_array($item->name, $forminspeksi['lingkungan']['lalu_lintas']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
+        <tr>
+            <td style="vertical-align: top;"><strong>Lalu Lintas Depan Lokasi</strong></td>
+            <td>
+                @if (isset($basicData['laluLintasLokasi']))
+                    <table class="checkbox-list">
+                        <tr>
+                            @foreach ($basicData['laluLintasLokasi'] 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['lingkungan']['lalu_lintas']) && in_array($item->name, $forminspeksi['lingkungan']['lalu_lintas']) ? 'checked' : '' }}>
+                    {{ $item->name }}
+                </label>
+            </td>
+            @endforeach
+        </tr>
+    </table>
+    @endif
     </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
+    </tr>
 
-<tr>
-    <td style="vertical-align: top;"><strong>Golongan Masyarakat Sekitar</strong></td>
-    <td>
-        @if (isset($basicData['golMasySekitar']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['golMasySekitar'] 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['lingkungan']['gol_mas_sekitar']) && in_array($item->name, $forminspeksi['lingkungan']['gol_mas_sekitar']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
-
-<tr>
-    <td style="vertical-align: top;"><strong>Terletak di Daerah</strong></td>
-    <td>
-        @if (isset($basicData['terletakDiArea']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['terletakDiArea'] 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['lingkungan']['terletak_diarea']) && in_array($item->name, $forminspeksi['lingkungan']['terletak_diarea']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
-
-<tr>
-    <td style="vertical-align: top;"><strong>Disekitar Lokasi</strong></td>
-    <td>
-        <div class="checkbox-item">
+    <tr>
+        <td style="vertical-align: top;"><strong>Golongan Masyarakat Sekitar</strong></td>
+        <td>
+            @if (isset($basicData['golMasySekitar']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['golMasySekitar'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
             <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="Telah ada bangunan"
-                    {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya' ? 'checked' : '' }}>
+                <input type="checkbox"
+                    {{ isset($forminspeksi['lingkungan']['gol_mas_sekitar']) && in_array($item->name, $forminspeksi['lingkungan']['gol_mas_sekitar']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    </td>
+    </tr>
+
+    <tr>
+        <td style="vertical-align: top;"><strong>Tingkat Keramaian</strong></td>
+        <td>
+            @if (isset($basicData['terletakDiArea']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['terletakDiArea'] 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['lingkungan']['terletak_diarea']) && in_array($item->name, $forminspeksi['lingkungan']['terletak_diarea']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    </td>
+    </tr>
+
+    <tr>
+        <td style="vertical-align: top;"><strong>Terletak di Daerah</strong></td>
+        <td>
+            @if (isset($basicData['terletakDiArea']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['terletakDiArea'] 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['lingkungan']['terletak_diarea']) && in_array($item->name, $forminspeksi['lingkungan']['terletak_diarea']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    </td>
+    </tr>
+
+    <tr>
+        <td style="vertical-align: top;"><strong>Disekitar Lokasi</strong></td>
+        <td>
+            <div class="checkbox-item">
+                <label class="checkbox-label">
+                    <input type="radio" name="disekitar_lokasi" value="Telah ada bangunan"
+                        {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya' ? 'checked' : '' }}>
                     Telah ada bangunan
-                @if (($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya')
-                    - Kondisi Bangunan:
-                    {{ $forminspeksi['lingkungan']['kondisi_bagunan_disekitar_lokasi'] ?? '' }}
-                    , Sifat Bangunan:
-                    {{ $forminspeksi['lingkungan']['sifat_bagunan_disekitar_lokasi'] ?? '' }}
-                @endif
-            </label>
-            <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="Belum ada bangunan"
-                    {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'tidak' ? 'checked' : '' }}>
+                    @if (($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya')
+                        - Kondisi Bangunan:
+                        {{ $forminspeksi['lingkungan']['kondisi_bagunan_disekitar_lokasi'] ?? '' }}
+                        , Sifat Bangunan:
+                        {{ $forminspeksi['lingkungan']['sifat_bagunan_disekitar_lokasi'] ?? '' }}
+                    @endif
+                </label>
+                <label class="checkbox-label">
+                    <input type="radio" name="disekitar_lokasi" value="Belum ada bangunan"
+                        {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'tidak' ? 'checked' : '' }}>
                     Belum ada bangunan
-            </label>
-        </div>
-    </td>
-</tr>
+                </label>
+            </div>
+        </td>
+    </tr>
 
 
-<tr>
-    <td style="vertical-align: top;"><strong>Dekat Makam</strong></td>
-    <td>
-        <div class="checkbox-item">
+    <tr>
+        <td style="vertical-align: top;"><strong>Dekat Makam</strong></td>
+        <td>
+            <div class="checkbox-item">
+                <label class="checkbox-label">
+                    <input type="radio" name="disekitar_lokasi" value="ya"
+                        {{ ($forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'ya' ? 'checked' : '' }}>
+                    Ya
+                    @if (($forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'ya')
+                        - Nama Makam:
+                        {{ $forminspeksi['lingkungan']['nama_makam'] ?? '' }}
+                        , Jarak Makam:
+                        {{ $forminspeksi['lingkungan']['jarak_makam'] ?? '' }}
+                    @endif
+                </label>
+                <label class="checkbox-label">
+                    <input type="radio" name="disekitar_lokasi" value="tidak"
+                        {{ ($forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'tidak' ? 'checked' : '' }}>
+                    Tidak
+                </label>
+            </div>
+        </td>
+    </tr>
+
+
+    <tr>
+        <td style="vertical-align: top;"><strong>Dekat TPS</strong></td>
+        <td>
+            <div class="checkbox-item">
+                <label class="checkbox-label">
+                    <input type="radio" name="disekitar_lokasi" value="ya"
+                        {{ ($forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya' ? 'checked' : '' }}>
+                    Ya
+                    @if (($forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya')
+                        - Nama TPS:
+                        {{ $forminspeksi['lingkungan']['nama_tps'] ?? '' }}
+                        , Jarak TPS:
+                        {{ $forminspeksi['lingkungan']['jarak_tps'] ?? '' }}
+                    @endif
+                </label>
+                <label class="checkbox-label">
+                    <input type="radio" name="disekitar_lokasi" value="tidak"
+                        {{ ($forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'tidak' ? 'checked' : '' }}>
+                    Tidak
+                </label>
+            </div>
+        </td>
+    </tr>
+
+
+    <tr>
+        <td style="vertical-align: top;"><strong>Dekat Lainnya</strong></td>
+    </tr>
+
+
+
+    <tr>
+        <td style="vertical-align: top;"><strong>Merupakan Daerah</strong></td>
+        <td>
+            @if (isset($basicData['merupakanDaerah']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['merupakanDaerah'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
             <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="ya"
-                    {{ ($forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'ya' ? 'checked' : '' }}>
-                Ya
-                @if (($forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'ya')
-                    - Nama Makam:
-                    {{ $forminspeksi['lingkungan']['nama_makam'] ?? '' }}
-                    , Jarak Makam:
-                    {{ $forminspeksi['lingkungan']['jarak_makam'] ?? '' }}
-                @endif
+                <input type="checkbox"
+                    {{ isset($forminspeksi['lingkungan']['merupakan_daerah']) && in_array($item->name, $forminspeksi['lingkungan']['merupakan_daerah']) ? 'checked' : '' }}>
+                {{ $item->name }}
             </label>
-            <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="tidak"
-                    {{ ($forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'tidak' ? 'checked' : '' }}>
-                Tidak
-            </label>
-        </div>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
     </td>
-</tr>
+    </tr>
 
-
-<tr>
-    <td style="vertical-align: top;"><strong>Dekat TPS</strong></td>
-    <td>
-        <div class="checkbox-item">
+    <tr>
+        <td style="vertical-align: top;"><strong>Fasilitas Umum Dekat Lokasi</strong></td>
+        <td>
+            @if (isset($basicData['fasilitasObjek']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['fasilitasObjek'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
             <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="ya"
-                    {{ ($forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya' ? 'checked' : '' }}>
-                Ya
-                @if (($forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya')
-                    - Nama TPS:
-                    {{ $forminspeksi['lingkungan']['nama_tps'] ?? '' }}
-                    , Jarak TPS:
-                    {{ $forminspeksi['lingkungan']['jarak_tps'] ?? '' }}
-                @endif
+                <input type="checkbox"
+                    {{ isset($forminspeksi['lingkungan']['fasilitas_dekat_object']) && in_array($item->name, $forminspeksi['lingkungan']['fasilitas_dekat_object']) ? 'checked' : '' }}>
+                {{ $item->name }}
             </label>
-            <label class="checkbox-label">
-                <input type="radio" name="disekitar_lokasi" value="tidak"
-                    {{ ($forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'tidak' ? 'checked' : '' }}>
-                Tidak
-            </label>
-        </div>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
     </td>
-</tr>
-<tr>
-    <td style="vertical-align: top;"><strong>Merupakan Daerah</strong></td>
-    <td>
-        @if (isset($basicData['merupakanDaerah']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['merupakanDaerah'] 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['lingkungan']['merupakan_daerah']) && in_array($item->name, $forminspeksi['lingkungan']['merupakan_daerah']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
+    </tr>
+    </table>
     </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
-
-<tr>
-    <td style="vertical-align: top;"><strong>Fasilitas Umum Dekat Lokasi</strong></td>
-    <td>
-        @if (isset($basicData['fasilitasObjek']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['fasilitasObjek'] 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['lingkungan']['fasilitas_dekat_object']) && in_array($item->name, $forminspeksi['lingkungan']['fasilitas_dekat_object']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-    @endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
-</table>
-</td>
-</tr>
+    </tr>
+    </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 a2d9ab2..8d4df95 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -195,10 +195,10 @@
         }
 
         .no-break {
-        page-break-inside: avoid;
-        page-break-before: auto;
-        page-break-after: auto;
-    }
+            page-break-inside: avoid;
+            page-break-before: auto;
+            page-break-after: auto;
+        }
     </style>
 
 </head>
@@ -255,483 +255,474 @@
             </tr>
         </table>
     </header>
-    <table style="width: 100%">
-        <tr>
-            <td style="text-align: center; margin-top: 5px;">
-                <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
-                    FORM INSPEKSI ATAS
-                    {{ $data }}
-                </h2>
 
-            </td>
-        </tr>
-    </table>
+    <div style="border: 1px solid #000;">
+        <table style="width: 100%; border-top: none; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
+            <tr>
+                <td style="text-align: center; margin-top: 5px; ">
+                    <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                        Tujuan Penilaian
+                    </h2>
+                </td>
+            </tr>
+        </table>
+        <table style="width: 100%;">
+            <tr>
+                <td style="vertical-align: top;">
+                    <table>
+                        <tr>
 
-    <table style="width: 100%; border: 1px solid #000; border-collapse: collapse; margin-bottom: 10px;">
-        <tr>
-            <td style="text-align: center; border: 1px solid #000;">
-                A
-            </td>
-            <td style="text-align: center; border: 1px solid #000;">
-                TUJUAN PENILAIAN
-            </td>
-        </tr>
-        <tr>
-            <td>
+                            <td style="width: 25%; padding: 2px;">Tujuan Penilai</td>
+                            <td style="width: 1%; padding: 2px;">:</td>
+                            <td style="vertical-align: top;  padding: 2px;">
+                                {{ $permohonan->tujuanPenilaian->name ?? '' }}</td>
+                        </tr>
+                        <tr>
+                            <td style="width: 25%; padding: 2px; vertical-align: top;">Cabang/Pemohon</td>
+                            <td style="width: 1%; vertical-align: top;">:</td>
+                            <td style="vertical-align: top;  vertical-align: top;">
+                                {{ $permohonan->debiture->branch->name ?? '' }} / {{ $permohonan->user->name ?? '' }}
+                            </td>
+                        </tr>
 
-            </td>
-            <td style="border: 1px solid #000;">
-                <table style="border: none;">
+                        <tr>
+                            <td style="width: 25%; padding: 2px;">Debitur/Perwakilan</td>
+                            <td style="width: 1%;  padding: 2px;">:</td>
+                            <td style="vertical-align: top;  padding: 2px;">
+                                @if (isset($forminspeksi['asset']['debitur_perwakilan']) && !empty($forminspeksi['asset']['debitur_perwakilan']))
+                                    @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item)
+                                        {{ $item }}
+                                    @endforeach
+                                @endif
+                            </td>
+                        </tr>
+                    </table>
+                </td>
 
-                    <tr>
-                        <td style="border: none;">
-                            @if (isset($basicData['tujuanPenilaian']))
-                                <table style="border: none;">
+                <td style="vertical-align: top;">
+                    <table>
+                        <tr>
+
+                            <td style="width: 25%; padding: 2px;">
+                                Tanggal Survey</td>
+                            <td style="width: 1%; padding: 2px;">:</td>
+                            <td style="vertical-align: top;  padding: 2px;">
+                                {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
+                        </tr>
+                        <tr>
+                            <td style="width: 25%; padding: 2px; vertical-align: top;">Pihak Bank</td>
+                            <td style="width: 1%; vertical-align: top;">:</td>
+                            <td style="vertical-align: top;  vertical-align: top;">
+                                {{ isset($forminspeksi['asset']['pihak_bank']) ? $forminspeksi['asset']['pihak_bank'] : '' }}
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+
+        <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+
+            <tr>
+                <td style="text-align: center; margin-top: 5px; ">
+                    <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                        Nama Cadeb/Debitur
+                    </h2>
+                </td>
+            </tr>
+        </table>
+        <table>
+            <tr>
+                <td>
+                    <table>
+                        <tr>
+                            <td style="width: 25%; padding: 2px; vertical-align: top;">Nama</td>
+                            <td style="width: 1%; vertical-align: top;">:</td>
+                            <td style="vertical-align: top; width: 79%;">{{ $permohonan->debiture->name ?? '' }}</td>
+                        </tr>
+
+                    </table>
+                </td>
+            </tr>
+        </table>
+
+        <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+
+            <tr>
+                <td style="text-align: center; margin-top: 5px; ">
+                    <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                        Deskripsi Aset jaminan
+                    </h2>
+                </td>
+            </tr>
+        </table>
+        <table>
+            <tr>
+                <td>
+                    <table>
+                        <tr>
+                            @php
+                                $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai'])
+                                    ? 'sesuai'
+                                    : 'tidak sesuai';
+                                $selectedData = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null;
+                            @endphp
+                            <td style="width: 25%; padding: 2px; vertical-align: top;">Jenis Aset</td>
+                            <td style="width: 1%; vertical-align: top;">:</td>
+                            <td style="vertical-align: top; width: 79%;">
+                                {{ $selectedData ?? '' }}
+                            </td>
+                        </tr>
+
+                    </table>
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    <table>
+                        <tr>
+                            <td style="width: 25%; padding: 2px; vertical-align: top;">Alamat</td>
+                            <td style="width: 1%; vertical-align: top;">:</td>
+                            <td style="vertical-align: top; width: 79%;">
+                                <table>
                                     <tr>
-                                        @foreach ($basicData['tujuanPenilaian'] as $index => $item)
-                                            @if ($index % 3 == 0 && $index > 0)
+                                        <td width="25%"><strong>Terletak di</strong></td>
+                                        <td> {{ $alamat['address'] ?? '' }}</td>
                                     </tr>
                                     <tr>
-                            @endif
-                        <td class="checkbox-item" style="border: none;">
-                            <label class="checkbox-label">
-                                <input type="checkbox"
-                                    {{ $item->name == $permohonan->tujuanPenilaian->name ? 'checked' : '' }}>
-                                {{ $item->name }}
-                            </label>
-                        </td>
-                        @endforeach
-                    </tr>
-                </table>
-                @endif
-                <table>
-                    <tr>
-                        <td><strong>Permintaan (A/O. Tlp/Hp)</strong></td>
-                        <td>{{ $permohonan->user->name }}</td>
-                        <td><strong>Tanggal</strong></td>
-                        <td>{{ formatTanggalIndonesia($permohonan->created_at) }}</td>
-                    </tr>
-                    <tr>
-                        <td><strong>Nama Debiture/ Wakil Debiture</strong></td>
-                        <td>{{ $permohonan->debiture->name ?? '' }}
-                            @if (isset($forminspeksi['asset']['debitur_perwakilan']) && !empty($forminspeksi['asset']['debitur_perwakilan']))
-                                @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item)
-                                  /  {{ $item }}
-                                @endforeach
-                            @endif
-                        </td>
-                        <td><strong>Kunjungan Tanggal</strong></td>
-                        <td>{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
+                                        <td>Kelurahan</td>
+                                        <td>{{ $alamat['village_code'] ?? '' }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td><strong>Kecamatan</strong></td>
+                                        <td>{{ $alamat['district_code'] ?? '' }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td><strong>Kotamadya</strong></td>
+                                        <td> {{ $alamat['city_code'] ?? '' }}</td>
+                                    </tr>
+                                    <tr>
+                                        <td><strong>Propinsi</strong></td>
+                                        <td>{{ $alamat['province_code'] ?? '' }}</td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
 
-    </table>
-    </td>
-    </tr>
+        <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-    <tr>
-        <td style="text-align: center; border: 1px solid #000;">
-            B
-        </td>
-        <td style="text-align: center; border: 1px solid #000;">
-            IDENTITAS DEBITURE
-        </td>
-    </tr>
-    <tr>
-        <td style="text-align: center; border: 1px solid #000;">
-        </td>
-        <td>
-            <table>
-                <tr>
-                    <td><strong>Nama Debitur</strong></td>
-                    <td style="text-align: start">{{ $permohonan->debiture->name ?? '' }}</td>
-                </tr>
+            <tr>
+                <td style="text-align: center; margin-top: 5px; ">
+                    <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                        Titik Koordinat Google Maps
+                    </h2>
+                </td>
+            </tr>
+        </table>
 
-            </table>
-        </td>
-    </tr>
+        <table>
+            <tr>
+                <td>
+                    <table>
+                        <tr>
+                            <td style="width: 25%; padding: 2px; vertical-align: top;">Titik Kordinat</td>
+                            <td style="width: 1%; vertical-align: top;">:</td>
+                            <td style="vertical-align: top; width: 79%;">
+                                {{ isset($forminspeksi['asset']['kordinat_lat']) ? $forminspeksi['asset']['kordinat_lat'] : '' }}
+                                ,
+                                {{ isset($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '' }}
+                            </td>
+                        </tr>
 
-    <tr>
-        <td style="text-align: center; border: 1px solid #000;">
-            C
-        </td>
-        <td style="text-align: center; border: 1px solid #000;">
-            JENIS DAN LOKASI JAMINAN + KORDINAT
-        </td>
-    </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
 
-    <tr>
-        <td style=" text-align: center; border: 1px solid #000;">
-        </td>
-        <td>
-            @if (isset($basicData['jenisJaminan']))
-                <table class="checkbox-list">
+        <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-                    <tr>
-                        @foreach ($basicData['jenisJaminan'] as $index => $item)
-                            @if ($index % 3 == 0 && $index > 0)
-                    </tr>
-                    <tr>
-            @endif
-        <td class="checkbox-item">
-            <label class="checkbox-label">
-                <input type="checkbox" {{ in_array($item->name, explode(',', $data)) ? 'checked' : '' }}>
-                {{ $item->name }}
-            </label>
-        </td>
-        @endforeach
-    </tr>
-    </table>
-    @endif
+            <tr>
+                <td style="text-align: center; margin-top: 5px; ">
+                    <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                        Jaminan
+                    </h2>
+                </td>
+            </tr>
+        </table>
 
-    <table>
-        <tr>
-            <td width="25%"><strong>Terletak di</strong></td>
-            <td> {{ $alamat['address'] ?? '' }}</td>
-        </tr>
-        <tr>
-            <td>Kelurahan</td>
-            <td>{{ $alamat['village_code'] ?? '' }}</td>
-        </tr>
-        <tr>
-            <td><strong>Kecamatan</strong></td>
-            <td>{{ $alamat['district_code'] ?? '' }}</td>
-        </tr>
-        <tr>
-            <td><strong>Kotamadya</strong></td>
-            <td> {{ $alamat['city_code'] ?? '' }}</td>
-        </tr>
-        <tr>
-            <td><strong>Propinsi</strong></td>
-            <td>{{ $alamat['province_code'] ?? '' }}</td>
-        </tr>
-    </table>
-    <table>
-        <tr>
-            <td>Titik Kordinat</td>
-            <td>{{ isset($forminspeksi['asset']['kordinat_lat']) ? $forminspeksi['asset']['kordinat_lat'] : '' }} ,
-                {{ isset($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '' }}</td>
-        </tr>
-    </table>
-    </td>
-    </tr>
+        <table>
+            <tr>
+                <td>
+                    <table>
+                        @if (@isset($dokumen))
+                            @foreach ($dokumen->detail as $detail)
+                                @if (isset($detail->dokumen_jaminan))
+                                    <tr>
+                                        <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
+                                        {{-- <td style="width:1%; padding: 2px; vertical-align: top;">:</td> --}}
+                                        <td>
+                                            @if (isset($detail->dokumen_jaminan))
+                                                @php
+                                                    $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
+                                                        ? json_decode($detail->dokumen_jaminan)
+                                                        : [$detail->dokumen_jaminan];
+                                                    $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
+                                                        ? json_decode($detail->dokumen_nomor)
+                                                        : ($detail->dokumen_nomor
+                                                            ? [$detail->dokumen_nomor]
+                                                            : []);
+                                                @endphp
 
-    <tr>
-        <td style="text-align: center; border: 1px solid #000;">
-            D
-        </td>
-        <td style="text-align: center; border: 1px solid #000;">
-            STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI
-        </td>
-    </tr>
+                                                @foreach ($dokumen_jaminan as $index => $dokumen)
+                                                    <div>
+                                                        @if (!empty($dokumen_nomor[$index]))
+                                                            <span>{{ $dokumen_nomor[$index] }}</span>
+                                                        @endif
+                                                    </div>
+                                                @endforeach
+                                            @endif
+                                        </td>
+                                    </tr>
+                                @endif
 
-    <tr>
-        <td style="text-align: center; border: 1px solid #000;">
-
-        </td>
-        <td>
-            <table>
-                @if (@isset($dokumen))
-                    @foreach ($dokumen->detail as $detail)
-                        @if (isset($detail->dokumen_jaminan))
-                            <tr>
-                                <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    @if (isset($detail->dokumen_jaminan))
-                                        @php
-                                            $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
-                                                ? json_decode($detail->dokumen_jaminan)
-                                                : [$detail->dokumen_jaminan];
-                                            $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
-                                                ? json_decode($detail->dokumen_nomor)
-                                                : ($detail->dokumen_nomor
-                                                    ? [$detail->dokumen_nomor]
-                                                    : []);
-                                        @endphp
-
-                                        @foreach ($dokumen_jaminan as $index => $dokumen)
-                                            <div>
-                                                @if (!empty($dokumen_nomor[$index]))
-                                                    <span>{{ $dokumen_nomor[$index] }}</span>
-                                                @endif
-                                            </div>
+                                @if (isset($detail->details))
+                                    @if (json_decode($detail->details))
+                                        @foreach (json_decode($detail->details) as $key => $value)
+                                            @if (!is_null($value) && $value !== '')
+                                                <tr>
+                                                    <td style="padding: 2px;">
+                                                        {{ ucwords(str_replace('_', ' ', $key)) ?? '' }}
+                                                    </td>
+                                                    {{-- <td style="width:1%; padding: 2px; vertical-align: top;">:</td> --}}
+                                                    <td style="padding: 2px;">
+                                                        {{ $value }}
+                                                        @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                                            <sup>m2</sup>
+                                                        @endif
+                                                    </td>
+                                                </tr>
+                                            @endif
                                         @endforeach
                                     @endif
-                                </td>
-                            </tr>
+                                @endif
+                            @endforeach
                         @endif
 
-                        @if (isset($detail->details))
-                            @if (json_decode($detail->details))
-                                @foreach (json_decode($detail->details) as $key => $value)
-                                    @if (!is_null($value) && $value !== '')
+                        <tr>
+                            @php
+                                // Ambil nilai hub_cadeb langsung
+                                $hubCadeb = isset($forminspeksi['asset']['hub_cadeb'])
+                                    ? $forminspeksi['asset']['hub_cadeb']
+                                    : null;
+
+                                // Jika nilai adalah array dengan key 'sesuai', ambil nilainya
+                                if (is_array($hubCadeb) && isset($hubCadeb['sesuai'])) {
+                                    $hubCadeb = $hubCadeb['sesuai'];
+                                }
+                            @endphp
+                            <td style="vertical-align: top;"><strong>Hubungan Pemilik Jaminan dengan Debitur</strong>
+                            </td>
+                            {{-- <td style="width:1%; padding: 2px; vertical-align: top;">:</td> --}}
+                            <td>
+                                @if (isset($basicData['hubCadeb']))
+                                    <table class="checkbox-table">
+                                        @php $count = 0; @endphp
                                         <tr>
-                                            <td style="padding: 2px;">
-                                                {{ ucwords(str_replace('_', ' ', $key)) ?? '' }}
-                                            </td>
-                                            <td style="padding: 2px;">
-                                                {{ $value }}
-                                                @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                                    <sup>m2</sup>
-                                                @endif
-                                            </td>
+                                            @foreach ($basicData['hubCadeb'] as $item)
+                                                <td>
+                                                    <label>
+                                                        <input type="checkbox"
+                                                            {{ $hubCadeb === $item->name ? 'checked' : '' }}>
+                                                        {{ $item->name }}
+                                                    </label>
+                                                </td>
+                                                @php $count++; @endphp
+
+                                                @if ($count % 3 === 0)
                                         </tr>
-                                    @endif
+                                        <tr>
+                                @endif
                                 @endforeach
+
+                                @if ($count % 3 !== 0)
+                                    @for ($i = 0; $i < 3 - ($count % 3); $i++)
+                            <td></td>
+                            @endfor
                             @endif
-                        @endif
+                        </tr>
+                    </table>
+        </table>
+        @endif
+        </td>
+        </tr>
+        {{-- end hub --}}
+
+        <tr>
+            @php
+                $statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']) ? 'sesuai' : 'tidak sesuai';
+                $selectedData = $forminspeksi['asset']['hub_cadeb_penghuni'][$statusKey] ?? null;
+            @endphp
+
+            <td style="vertical-align: top;"><strong>Hubungan Penghuni Jaminan dengan Debitur</strong></td>
+            <td>
+                @if (isset($selectedData))
+                    <table class="checkbox-table">
+                        <tr>
+                            <td>
+                                {{ $selectedData ?? '' }}
+                            </td>
+                        </tr>
+                    </table>
+                @endif
+            </td>
+        </tr>
+        </table>
+        </td>
+        </tr>
+        </table>
+
+        @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
+            @include('lpj::surveyor.components.print-out.rap')
+        @else
+            @foreach ($permohonan->documents as $dokumen)
+                @if ($dokumen->jenisJaminan)
+                    @php
+                        $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true);
+                    @endphp
+                    @if (isset($formKategori) && $formKategori)
+                        @php
+                            $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori];
+                            $kategoriUnik = array_unique($kategoriArray);
+                        @endphp
+                    @endif
+
+                    @foreach ($kategoriUnik as $kategori)
+                        {{-- Tampilkan komponen sesuai kategori jika file komponen ada --}}
+                        @includeIf('lpj::surveyor.components.print-out.' . str_replace('-', '-', $kategori), [
+                            'dokumen' => $dokumen,
+                        ])
                     @endforeach
                 @endif
-
-
-                <tr>
-                    <td><strong>Atas Nama</strong></td>
-                    <td>{{ $dokument->pemilik->name ?? '' }}</td>
-                </tr>
-
-                <tr>
-                    @php
-                        // Ambil nilai hub_cadeb langsung
-                        $hubCadeb = isset($forminspeksi['asset']['hub_cadeb'])
-                            ? $forminspeksi['asset']['hub_cadeb']
-                            : null;
-
-                        // Jika nilai adalah array dengan key 'sesuai', ambil nilainya
-                        if (is_array($hubCadeb) && isset($hubCadeb['sesuai'])) {
-                            $hubCadeb = $hubCadeb['sesuai'];
-                        }
-                    @endphp
-                    <td style="vertical-align: top;"><strong>Hubungan Pemilik Jaminan dengan Debitur</strong>
-                    </td>
-                    <td>
-                        @if (isset($basicData['hubCadeb']))
-                            <table class="checkbox-table">
-                                @php $count = 0; @endphp
-                                <tr>
-                                    @foreach ($basicData['hubCadeb'] as $item)
-                                        <td>
-                                            <label>
-                                                <input type="checkbox"
-                                                    {{ $hubCadeb === $item->name ? 'checked' : '' }}>
-                                                {{ $item->name }}
-                                            </label>
-                                        </td>
-                                        @php $count++; @endphp
-
-                                        @if ($count % 3 === 0)
-                                </tr>
-                                <tr>
-                        @endif
-                        @endforeach
-
-                        @if ($count % 3 !== 0)
-                            @for ($i = 0; $i < 3 - ($count % 3); $i++)
-                    <td></td>
-                    @endfor
-                    @endif
-                </tr>
-            </table>
-            @endif
-        </td>
-    </tr>
-
-    <tr>
-        @php
-              $statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'])
-                                        ? 'sesuai'
-                                        : 'tidak sesuai';
-                                    $selectedData = $forminspeksi['asset']['hub_cadeb_penghuni'][$statusKey] ?? null;
-        @endphp
-
-        <td><strong>Hubungan Penghuni Jaminan dengan Debitur</strong></td>
-        <td>
-            @if (isset($selectedData))
-                <table class="checkbox-table">
-                    <tr>
-                        <td>
-                            {{ $selectedData ?? '' }}
-                        </td>
-                    </tr>
-                </table>
-            @endif
-        </td>
-    </tr>
-    </table>
-    </td>
-    </tr>
-    
-    @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
-        @include('lpj::surveyor.components.print-out.rap')
-    @else
-        <tr>
-            
-            <td style="text-align: center; border: 1px solid #000;">
-                E
-            </td>
-            <td style="text-align: center; text-transform: uppercase; border: 1px solid #000;">
-                ANALISA {{ $data }}
-            </td>
-        </tr>
-
-        <tr>
-            <td style="text-align: center; border: 1px solid #000;">
-
-            </td>
-            <td style="">
-
-                @foreach ($permohonan->documents as $dokumen)
-                    @if ($dokumen->jenisJaminan)
-                        @php
-                            $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true);
-                        @endphp
-                        @if (isset($formKategori) && $formKategori)
-                            @php
-                                $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori];
-                                $kategoriUnik = array_unique($kategoriArray);
-                            @endphp
-                        @endif
-
-                        @foreach ($kategoriUnik as $kategori)
-                            {{-- Tampilkan komponen sesuai kategori jika file komponen ada --}}
-                            @includeIf(
-                                'lpj::surveyor.components.print-out.' . str_replace('-', '-', $kategori),
-                                [
-                                    'dokumen' => $dokumen,
-                                ]
-                            )
-                        @endforeach
-                    @endif
-                @endforeach
-            </td>
-        </tr>
-    @endIf
+            @endforeach
+        @endif
     </div>
-    {{-- <tr>
-        <td style="text-align: center; border: 1px solid #000;">
-            G
-        </td>
-        <td style="text-align: center; border: 1px solid #000;">
-            ASURANSI
-        </td>
-    </tr> --}}
 
-    <tr>
-        <td style="text-align: center;">
+    <div class="no-break">
+        <table style="width: 100%; border-collapse: collapse;" >
+            <tr>
+                <td style="border: 1px solid #000;">
+                    <table>
+                        <tr>
+                            <td>
+                                Jakarta {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
+                            </td>
+                        </tr>
 
-        </td>
-        <td style="border: 1px solid #000;">
-            <table>
-                <tr>
-                    <td>
-                        Jakarta {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
-                    </td>
-                </tr>
+                        <tr>
+                            <td>
+                                TTD
+                            </td>
+                        </tr>
+                    </table>
+                    <table style="width: 100%; border-collapse: collapse; text-align: center;">
+                        <tr>
+                            @if (isset($forminspeksi['signature']['penilai']['image']) && !empty($forminspeksi['signature']['penilai']['image']))
+                                @php
+                                    $imagePath = $forminspeksi['signature']['penilai']['image'];
 
-                <tr>
-                    <td>
-                        TTD
-                    </td>
-                </tr>
-            </table>
-            <table style="width: 100%; border-collapse: collapse; text-align: center;">
-                <tr>
-                    @if (isset($forminspeksi['signature']['penilai']['image']) && !empty($forminspeksi['signature']['penilai']['image']))
-                        @php
-                            $imagePath = $forminspeksi['signature']['penilai']['image'];
+                                    $isBase64 = str_starts_with($imagePath, 'data:image');
 
-                            $isBase64 = str_starts_with($imagePath, 'data:image');
+                                    if (!$isBase64) {
+                                        $relativePath = str_replace(url('storage') . '/', '', $imagePath);
+                                        $absolutePath = storage_path('app/public/' . $relativePath);
+                                    } else {
+                                        $absolutePath = $imagePath;
+                                    }
 
-                            if (!$isBase64) {
-                                $relativePath = str_replace(url('storage') . '/', '', $imagePath);
-                                $absolutePath = storage_path('app/public/' . $relativePath);
-                            } else {
-                                $absolutePath = $imagePath;
-                            }
+                                @endphp
+                                <td style="width: 100px;">
+                                    <img style="width: 100px;" src="{{ $absolutePath }}" alt="">
+                                </td>
+                            @endif
 
-                        @endphp
-                        <td style="width: 100px;">
-                            <img style="width: 100px;" src="{{ $absolutePath }}" alt="">
-                        </td>
-                    @endif
+                            @if (isset($forminspeksi['signature']['cabang']))
+                                @php
+                                    $imagePath = $forminspeksi['signature']['cabang']['image'];
 
-                    @if (isset($forminspeksi['signature']['cabang']))
-                        @php
-                            $imagePath = $forminspeksi['signature']['cabang']['image'];
+                                    $isBase64 = str_starts_with($imagePath, 'data:image');
 
-                            $isBase64 = str_starts_with($imagePath, 'data:image');
+                                    if (!$isBase64) {
+                                        $relativePath = str_replace(url('storage') . '/', '', $imagePath);
+                                        $absolutePath = storage_path('app/public/' . $relativePath);
+                                    } else {
+                                        $absolutePath = $imagePath;
+                                    }
 
-                            if (!$isBase64) {
-                                $relativePath = str_replace(url('storage') . '/', '', $imagePath);
-                                $absolutePath = storage_path('app/public/' . $relativePath);
-                            } else {
-                                $absolutePath = $imagePath;
-                            }
-
-                        @endphp
-                        <td style="width: 100px;">
-                            <img style="width: 100px;" src="{{ $absolutePath }}" alt="">
-                        </td>
-                    @endif
+                                @endphp
+                                <td style="width: 100px;">
+                                    <img style="width: 100px;" src="{{ $absolutePath }}" alt="">
+                                </td>
+                            @endif
 
 
-                    @if (isset($forminspeksi['signature']['debitur']))
-                        <td style="width: 100px;">
-                            <img style="width: 100px;" src="{{ $forminspeksi['signature']['debitur']['image'] }}"
-                                alt="Debitur/Perwakilan">
-                        </td>
-                    @endif
+                            @if (isset($forminspeksi['signature']['debitur']))
+                                <td style="width: 100px;">
+                                    <img style="width: 100px;" src="{{ $forminspeksi['signature']['debitur']['image'] }}"
+                                        alt="Debitur/Perwakilan">
+                                </td>
+                            @endif
 
-                    <!-- K.J.P.P -->
-                    @if (isset($forminspeksi['signature']['kjjp']))
-                        <td style="width: 100px;">
-                            <img style="width: 100px;" src="{{ $forminspeksi['signature']['kjjp']['image'] }}"
-                                alt="KJPP">
-                        </td>
-                    @endif
-                </tr>
+                            <!-- K.J.P.P -->
+                            @if (isset($forminspeksi['signature']['kjjp']))
+                                <td style="width: 100px;">
+                                    <img style="width: 100px;" src="{{ $forminspeksi['signature']['kjjp']['image'] }}"
+                                        alt="KJPP">
+                                </td>
+                            @endif
+                        </tr>
 
 
-                <tr>
-                    @if (isset($forminspeksi['signature']['penilai']['name']))
-                        <td style=" text-align: center">
-                            <span>{{ ucwords(strtolower($forminspeksi['signature']['penilai']['name'])) }}</span>
-                            <br />
-                            <span>{{ ucwords(strtolower('PENILAI')) }}</span>
-                        </td>
-                    @endif
-                    @if (isset($forminspeksi['signature']['cabang']['name']))
-                        <td style=" text-align: center">
-                            <span>{{ ucwords(strtolower($forminspeksi['signature']['cabang']['name'])) }}</span>
-                            <br />
-                            <span>{{ ucwords(strtolower('CABANG')) }}</span>
-                        </td>
-                    @endif
-                    @if (isset($forminspeksi['signature']['debitur']['name']))
-                        <td style=" text-align: center">
-                            <span>{{ ucwords(strtolower($forminspeksi['signature']['debitur']['name'])) }}</span>
-                            <br />
-                            <span>{{ ucwords(strtolower('DEBITUR/PERWAKILAN')) }}</span>
-                        </td>
-                    @endif
-                    @if (isset($forminspeksi['signature']['kjjp']['name']))
-                        <td style=" text-align: center">
-                            <span>{{ ucwords(strtolower($forminspeksi['signature']['kjjp']['name'])) }}</span>
-                            <br />
-                            <span>{{ strtoupper('K.J.P.P') }}</span>
-                        </td>
-                    @endif
-                </tr>
-            </table>
-        </td>
-    </tr>
-
-
-    </table>
+                        <tr>
+                            @if (isset($forminspeksi['signature']['penilai']['name']))
+                                <td style=" text-align: center">
+                                    <span>{{ ucwords(strtolower($forminspeksi['signature']['penilai']['name'])) }}</span>
+                                    <br />
+                                    <span>{{ ucwords(strtolower('PENILAI')) }}</span>
+                                </td>
+                            @endif
+                            @if (isset($forminspeksi['signature']['cabang']['name']))
+                                <td style=" text-align: center">
+                                    <span>{{ ucwords(strtolower($forminspeksi['signature']['cabang']['name'])) }}</span>
+                                    <br />
+                                    <span>{{ ucwords(strtolower('CABANG')) }}</span>
+                                </td>
+                            @endif
+                            @if (isset($forminspeksi['signature']['debitur']['name']))
+                                <td style=" text-align: center">
+                                    <span>{{ ucwords(strtolower($forminspeksi['signature']['debitur']['name'])) }}</span>
+                                    <br />
+                                    <span>{{ ucwords(strtolower('DEBITUR/PERWAKILAN')) }}</span>
+                                </td>
+                            @endif
+                            @if (isset($forminspeksi['signature']['kjjp']['name']))
+                                <td style=" text-align: center">
+                                    <span>{{ ucwords(strtolower($forminspeksi['signature']['kjjp']['name'])) }}</span>
+                                    <br />
+                                    <span>{{ strtoupper('K.J.P.P') }}</span>
+                                </td>
+                            @endif
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </div>
 
 
     <footer id="footer">
diff --git a/resources/views/surveyor/components/print-out/print.blade.php b/resources/views/surveyor/components/print-out/print.blade.php
new file mode 100644
index 0000000..a246b27
--- /dev/null
+++ b/resources/views/surveyor/components/print-out/print.blade.php
@@ -0,0 +1,704 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Laporan Penilai Jaminan</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+        }
+
+        * {
+            font-size: 8px;
+            font-weight: bold;
+        }
+
+        h1,
+        h2,
+        h3 {
+            text-align: center;
+            margin-bottom: 10px;
+            color: #000;
+        }
+
+
+        .container {
+            /* width: 100%; */
+            padding: 10px;
+            /* border: 1px solid #000; */
+            margin-bottom: 20px;
+        }
+
+        .header {
+
+            margin-bottom: 10px;
+        }
+
+        .judul {
+            font-weight: bold;
+            text-align: center;
+            margin-bottom: 10px;
+        }
+
+
+        .photo-item {
+            text-align: center;
+            margin-bottom: 20px;
+        }
+
+        .photo-image {
+            max-width: 80%;
+            height: auto;
+            display: block;
+            margin: 0 auto;
+        }
+
+
+
+        .judul-table {
+            width: 100%;
+            /* border-collapse: collapse; */
+            margin-bottom: 10px;
+        }
+
+        .judul-table td {
+            text-align: center;
+            vertical-align: middle;
+            padding: 5px;
+        }
+
+        .border1 {
+            /* border: 1px solid #000; */
+            width: 50px;
+        }
+
+        .border {
+            /* border: 1px solid #000; */
+        }
+
+        .judul h6 {
+            margin: 0;
+            /* Menghindari margin bawaan */
+            font-size: 12px;
+        }
+
+        .custom-dl-tujuan {
+            width: 100%;
+            /* border-collapse: collapse; */
+        }
+
+
+        .inner-table {
+            width: 100%;
+            /* border-collapse: collapse; */
+        }
+
+        .inner-table td {
+            padding: 5px;
+        }
+
+        .inner-table td:first-child {
+            font-weight: bold;
+
+            /* Lebar kolom keterangan */
+        }
+
+        .custom-table {
+            width: 100%;
+            border-collapse: collapse;
+            margin-bottom: 20px;
+        }
+
+        .custom-table td {
+            vertical-align: top;
+        }
+
+        .custom-table td:first-child {
+            font-weight: bold;
+            width: 30%;
+            /* Sesuaikan lebar kolom keterangan */
+        }
+
+        .grid-table {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        .grid-table td {
+            padding: 8px;
+            vertical-align: top;
+            text-align: left;
+            width: 33%;
+            /* Membagi kolom menjadi tiga */
+        }
+
+        .grid-table input[type="checkbox"] {
+            margin-right: 5px;
+        }
+
+        table {
+            width: 100%;
+            /* border: 1px solid #000; */
+            /* border-collapse: collapse; */
+        }
+
+        table.checkbox-list {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        td.checkbox-item {
+            width: 33.33%;
+            vertical-align: top;
+            text-align: left;
+        }
+
+        label.checkbox-label {
+            display: flex;
+            align-items: center;
+            font-size: 8px;
+        }
+
+        label.checkbox-label input[type="checkbox"] {
+            margin-right: 6px;
+            transform: scale(1.3);
+            /* Memperkecil ukuran checkbox */
+        }
+
+
+
+        #footer {
+            position: fixed;
+            bottom: -50px;
+            left: 0;
+            right: 0;
+            height: 50px;
+            text-align: right;
+            border-top: 1px solid #ddd;
+            padding-top: 10px;
+        }
+
+        .page-number:after {
+            content: counter(page) " dari " counter(pages);
+        }
+
+        .content {
+            margin-top: 20px;
+        }
+
+        .page-break {
+            page-break-after: always;
+        }
+
+        .no-break {
+        page-break-inside: avoid;
+        page-break-before: auto;
+        page-break-after: auto;
+    }
+    </style>
+
+</head>
+
+@php
+    $data = '';
+    $dokument = null;
+    foreach ($permohonan->documents as $dokumen) {
+        $data .= $dokumen->jenisJaminan->name . ', ';
+        $dokument = $dokumen;
+    }
+    $data = rtrim($data, ', ');
+
+    $senior_officer = null;
+    if ($permohonan->debiture && $permohonan->documents) {
+        foreach ($permohonan->documents as $dokumen) {
+            $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
+            $teams = $permohonan->region->teams;
+
+            if ($teams) {
+                foreach ($teams as $team) {
+                    $team_users = $team->teamsUsers;
+                    // print_r($team_users);
+                    if ($team_users) {
+                        foreach ($team_users as $team_user) {
+                            $user = $team_user->user;
+
+                            if ($user && $user->hasRole('senior-officer')) {
+                                $senior_officer = $user;
+                                break 3;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+@endphp
+
+<body style="width: 80%; margin: auto">
+    <header id="header">
+        <table style="width: 100%; border: none;">
+            <tr>
+                <td style="width: 20%; text-align: left;" class="header-left">
+                    @include('lpj::component.logo-bag')
+                </td>
+                <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>
+    </header>
+
+    <table style="width: 100%; border: 1px solid #000; border-collapse: collapse;">
+        <tr>
+            <td style="text-align: center; margin-top: 5px; ">
+                <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                    Tujuan Penilaian
+                </h2>
+            </td>
+        </tr>
+    </table>
+    <table style="width: 100%;">
+        <tr>
+            <td style="vertical-align: top;">
+                <table>
+                    <tr>
+                        <td style="width: 25%; padding: 2px; vertical-align: top;">Cabang/Pemohon</td>
+                        <td style="width: 1%; vertical-align: top;">:</td>
+                        <td style="vertical-align: top;  vertical-align: top;">
+                            {{ $permohonan->debiture->branch->name ?? '' }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="width: 25%; padding: 2px;">Tujuan Penilai</td>
+                        <td style="width: 1%; padding: 2px;">:</td>
+                        <td style="vertical-align: top;  padding: 2px;">
+                            {{ $permohonan->jenisFasilitasKredit->name ?? '' }}</td>
+                    </tr>
+                    <tr>
+                        <td style="width: 25%; padding: 2px;">Ao</td>
+                        <td style="width: 1%;  padding: 2px;">:</td>
+                        <td style="vertical-align: top;  padding: 2px;">{{ $permohonan->user->name ?? '' }}</td>
+                    </tr>
+                </table>
+            </td>
+
+            {{-- <td style="border: 1px solid #000;">
+                <table style="border: none;">
+                    <tr>
+                        <td style="border: none;">
+                            @if (isset($basicData['tujuanPenilaian']))
+                                <table style="border: none;">
+                                    <tr>
+                                        @foreach ($basicData['tujuanPenilaian'] as $index => $item)
+                                            @if ($index % 3 == 0 && $index > 0)
+                                    </tr>
+                                    <tr>
+                            @endif
+                        <td class="checkbox-item" style="border: none;">
+                            <label class="checkbox-label">
+                                <input type="checkbox"
+                                    {{ $item->name == $permohonan->tujuanPenilaian->name ? 'checked' : '' }}>
+                                {{ $item->name }}
+                            </label>
+                        </td>
+                        @endforeach
+                    </tr>
+                </table>
+                @endif
+                <table>
+                    <tr>
+                        <td><strong>Permintaan (A/O. Tlp/Hp)</strong></td>
+                        <td>{{ $permohonan->user->name }}</td>
+                        <td><strong>Tanggal</strong></td>
+                        <td>{{ formatTanggalIndonesia($permohonan->created_at) }}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>Nama Debitur/ Wakil Debitur</strong></td>
+                        <td>{{ $permohonan->debiture->name ?? '' }}
+                            @if (isset($forminspeksi['asset']['debitur_perwakilan']) && !empty($forminspeksi['asset']['debitur_perwakilan']))
+                                @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item)
+                                 {{ $item }}
+                                @endforeach
+                            @endif
+                        </td>
+                        <td><strong>Kunjungan Tanggal</strong></td>
+                        <td>{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
+                    </tr>
+                </table>
+            </td> --}}
+        </tr>
+
+    </table>
+
+
+    {{-- <tr>
+        <td style="text-align: center; border: 1px solid #000;">
+            B
+        </td>
+        <td style="text-align: center; border: 1px solid #000;">
+            IDENTITAS DEBITUR
+        </td>
+    </tr>
+    <tr>
+        <td style="text-align: center; border: 1px solid #000;">
+        </td>
+        <td>
+            <table>
+                <tr>
+                    <td><strong>Nama Debitur</strong></td>
+                    <td style="text-align: start">{{ $permohonan->debiture->name ?? '' }}</td>
+                </tr>
+
+            </table>
+        </td>
+    </tr> --}}
+
+    {{-- <tr>
+        <td style="text-align: center; border: 1px solid #000;">
+            C
+        </td>
+        <td style="text-align: center; border: 1px solid #000;">
+            JENIS DAN LOKASI JAMINAN + KORDINAT
+        </td>
+    </tr>
+
+    <tr>
+        <td style=" text-align: center; border: 1px solid #000;">
+        </td>
+        <td>
+            @if (isset($basicData['jenisJaminan']))
+                <table class="checkbox-list">
+
+                    <tr>
+                        @foreach ($basicData['jenisJaminan'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
+            @endif
+        <td class="checkbox-item">
+            <label class="checkbox-label">
+                <input type="checkbox" {{ in_array($item->name, explode(',', $data)) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+
+    <table>
+        <tr>
+            <td width="25%"><strong>Terletak di</strong></td>
+            <td> {{ $alamat['address'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Kelurahan</td>
+            <td>{{ $alamat['village_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td><strong>Kecamatan</strong></td>
+            <td>{{ $alamat['district_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td><strong>Kotamadya</strong></td>
+            <td> {{ $alamat['city_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td><strong>Propinsi</strong></td>
+            <td>{{ $alamat['province_code'] ?? '' }}</td>
+        </tr>
+    </table>
+    <table>
+        <tr>
+            <td>Titik Kordinat</td>
+            <td>{{ isset($forminspeksi['asset']['kordinat_lat']) ? $forminspeksi['asset']['kordinat_lat'] : '' }} ,
+                {{ isset($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '' }}</td>
+        </tr>
+    </table>
+    </td>
+    </tr>
+
+    <tr>
+        <td style="text-align: center; border: 1px solid #000;">
+            D
+        </td>
+        <td style="text-align: center; border: 1px solid #000;">
+            STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI
+        </td>
+    </tr>
+
+    <tr>
+        <td style="text-align: center; border: 1px solid #000;">
+
+        </td>
+        <td>
+            <table>
+                @if (@isset($dokumen))
+                    @foreach ($dokumen->detail as $detail)
+                        @if (isset($detail->dokumen_jaminan))
+                            <tr>
+                                <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    @if (isset($detail->dokumen_jaminan))
+                                        @php
+                                            $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
+                                                ? json_decode($detail->dokumen_jaminan)
+                                                : [$detail->dokumen_jaminan];
+                                            $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
+                                                ? json_decode($detail->dokumen_nomor)
+                                                : ($detail->dokumen_nomor
+                                                    ? [$detail->dokumen_nomor]
+                                                    : []);
+                                        @endphp
+
+                                        @foreach ($dokumen_jaminan as $index => $dokumen)
+                                            <div>
+                                                @if (!empty($dokumen_nomor[$index]))
+                                                    <span>{{ $dokumen_nomor[$index] }}</span>
+                                                @endif
+                                            </div>
+                                        @endforeach
+                                    @endif
+                                </td>
+                            </tr>
+                        @endif
+
+                        @if (isset($detail->details))
+                            @if (json_decode($detail->details))
+                                @foreach (json_decode($detail->details) as $key => $value)
+                                    @if (!is_null($value) && $value !== '')
+                                        <tr>
+                                            <td style="padding: 2px;">
+                                                {{ ucwords(str_replace('_', ' ', $key)) ?? '' }}
+                                            </td>
+                                            <td style="padding: 2px;">
+                                                {{ $value }}
+                                                @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                                    <sup>m2</sup>
+                                                @endif
+                                            </td>
+                                        </tr>
+                                    @endif
+                                @endforeach
+                            @endif
+                        @endif
+                    @endforeach
+                @endif
+
+
+                <tr>
+                    <td><strong>Atas Nama</strong></td>
+                    <td>{{ $dokument->pemilik->name ?? '' }}</td>
+                </tr>
+
+                <tr>
+                    @php
+                        // Ambil nilai hub_cadeb langsung
+                        $hubCadeb = isset($forminspeksi['asset']['hub_cadeb'])
+                            ? $forminspeksi['asset']['hub_cadeb']
+                            : null;
+
+                        // Jika nilai adalah array dengan key 'sesuai', ambil nilainya
+                        if (is_array($hubCadeb) && isset($hubCadeb['sesuai'])) {
+                            $hubCadeb = $hubCadeb['sesuai'];
+                        }
+                    @endphp
+                    <td style="vertical-align: top;"><strong>Hubungan Pemilik Jaminan dengan Debitur</strong>
+                    </td>
+                    <td>
+                        @if (isset($basicData['hubCadeb']))
+                            <table class="checkbox-table">
+                                @php $count = 0; @endphp
+                                <tr>
+                                    @foreach ($basicData['hubCadeb'] as $item)
+                                        <td>
+                                            <label>
+                                                <input type="checkbox"
+                                                    {{ $hubCadeb === $item->name ? 'checked' : '' }}>
+                                                {{ $item->name }}
+                                            </label>
+                                        </td>
+                                        @php $count++; @endphp
+
+                                        @if ($count % 3 === 0)
+                                </tr>
+                                <tr>
+                        @endif
+                        @endforeach
+
+                        @if ($count % 3 !== 0)
+                            @for ($i = 0; $i < 3 - ($count % 3); $i++)
+                    <td></td>
+                    @endfor
+                    @endif
+                </tr>
+            </table>
+            @endif
+        </td>
+    </tr>
+
+    <tr>
+        @php
+              $statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'])
+                                        ? 'sesuai'
+                                        : 'tidak sesuai';
+                                    $selectedData = $forminspeksi['asset']['hub_cadeb_penghuni'][$statusKey] ?? null;
+        @endphp
+
+        <td><strong>Hubungan Penghuni Jaminan dengan Debitur</strong></td>
+        <td>
+            @if (isset($selectedData))
+                <table class="checkbox-table">
+                    <tr>
+                        <td>
+                            {{ $selectedData ?? '' }}
+                        </td>
+                    </tr>
+                </table>
+            @endif
+        </td>
+    </tr>
+    </table>
+    </td>
+    </tr> --}}
+
+
+    {{-- <tr>
+        <td style="text-align: center; border: 1px solid #000;">
+            G
+        </td>
+        <td style="text-align: center; border: 1px solid #000;">
+            ASURANSI
+        </td>
+    </tr> --}}
+
+    <tr>
+        <td style="text-align: center;">
+
+        </td>
+        <td style="border: 1px solid #000;">
+            <table>
+                <tr>
+                    <td>
+                        Jakarta {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        TTD
+                    </td>
+                </tr>
+            </table>
+            <table style="width: 100%; border-collapse: collapse; text-align: center;">
+                <tr>
+                    @if (isset($forminspeksi['signature']['penilai']['image']) && !empty($forminspeksi['signature']['penilai']['image']))
+                        @php
+                            $imagePath = $forminspeksi['signature']['penilai']['image'];
+
+                            $isBase64 = str_starts_with($imagePath, 'data:image');
+
+                            if (!$isBase64) {
+                                $relativePath = str_replace(url('storage') . '/', '', $imagePath);
+                                $absolutePath = storage_path('app/public/' . $relativePath);
+                            } else {
+                                $absolutePath = $imagePath;
+                            }
+
+                        @endphp
+                        <td style="width: 100px;">
+                            <img style="width: 100px;" src="{{ $absolutePath }}" alt="">
+                        </td>
+                    @endif
+
+                    @if (isset($forminspeksi['signature']['cabang']))
+                        @php
+                            $imagePath = $forminspeksi['signature']['cabang']['image'];
+
+                            $isBase64 = str_starts_with($imagePath, 'data:image');
+
+                            if (!$isBase64) {
+                                $relativePath = str_replace(url('storage') . '/', '', $imagePath);
+                                $absolutePath = storage_path('app/public/' . $relativePath);
+                            } else {
+                                $absolutePath = $imagePath;
+                            }
+
+                        @endphp
+                        <td style="width: 100px;">
+                            <img style="width: 100px;" src="{{ $absolutePath }}" alt="">
+                        </td>
+                    @endif
+
+
+                    @if (isset($forminspeksi['signature']['debitur']))
+                        <td style="width: 100px;">
+                            <img style="width: 100px;" src="{{ $forminspeksi['signature']['debitur']['image'] }}"
+                                alt="Debitur/Perwakilan">
+                        </td>
+                    @endif
+
+                    <!-- K.J.P.P -->
+                    @if (isset($forminspeksi['signature']['kjjp']))
+                        <td style="width: 100px;">
+                            <img style="width: 100px;" src="{{ $forminspeksi['signature']['kjjp']['image'] }}"
+                                alt="KJPP">
+                        </td>
+                    @endif
+                </tr>
+
+
+                <tr>
+                    @if (isset($forminspeksi['signature']['penilai']['name']))
+                        <td style=" text-align: center">
+                            <span>{{ ucwords(strtolower($forminspeksi['signature']['penilai']['name'])) }}</span>
+                            <br />
+                            <span>{{ ucwords(strtolower('PENILAI')) }}</span>
+                        </td>
+                    @endif
+                    @if (isset($forminspeksi['signature']['cabang']['name']))
+                        <td style=" text-align: center">
+                            <span>{{ ucwords(strtolower($forminspeksi['signature']['cabang']['name'])) }}</span>
+                            <br />
+                            <span>{{ ucwords(strtolower('CABANG')) }}</span>
+                        </td>
+                    @endif
+                    @if (isset($forminspeksi['signature']['debitur']['name']))
+                        <td style=" text-align: center">
+                            <span>{{ ucwords(strtolower($forminspeksi['signature']['debitur']['name'])) }}</span>
+                            <br />
+                            <span>{{ ucwords(strtolower('DEBITUR/PERWAKILAN')) }}</span>
+                        </td>
+                    @endif
+                    @if (isset($forminspeksi['signature']['kjjp']['name']))
+                        <td style=" text-align: center">
+                            <span>{{ ucwords(strtolower($forminspeksi['signature']['kjjp']['name'])) }}</span>
+                            <br />
+                            <span>{{ strtoupper('K.J.P.P') }}</span>
+                        </td>
+                    @endif
+                </tr>
+            </table>
+        </td>
+    </tr>
+
+
+    {{-- </table> --}}
+
+
+    <footer id="footer">
+        Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
+    </footer>
+</body>
+
+</html>
diff --git a/resources/views/surveyor/components/print-out/rap.blade.php b/resources/views/surveyor/components/print-out/rap.blade.php
index 0ea156b..dc53a01 100644
--- a/resources/views/surveyor/components/print-out/rap.blade.php
+++ b/resources/views/surveyor/components/print-out/rap.blade.php
@@ -1,11 +1,18 @@
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        E
-    </td>
-    <td style="text-align: center; text-transform: uppercase; border: 1px solid #000;">
-        PERIZINAN
-    </td>
-</tr>
+
+<div class="no-break" style="margin: 0; padding: 0">
+    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+
+        <tr>
+            <td style="text-align: center; margin-top: 5px;">
+                <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                    PERIZINAN
+                </h2>
+
+            </td>
+        </tr>
+    </table>
+
+<table>
 
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
@@ -470,3 +477,5 @@
 </tr>
 
 @endisset
+</table>
+</div>
diff --git a/resources/views/surveyor/components/print-out/tanah.blade.php b/resources/views/surveyor/components/print-out/tanah.blade.php
index 002b5bc..250f47a 100644
--- a/resources/views/surveyor/components/print-out/tanah.blade.php
+++ b/resources/views/surveyor/components/print-out/tanah.blade.php
@@ -1,3 +1,17 @@
+
+<div class="no-break" style="margin: 0; padding: 0">
+    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+
+    <tr>
+        <td></td>
+        <td style="text-align: center; margin-top: 5px; ">
+            <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                ANalisa Tanah
+            </h2>
+        </td>
+    </tr>
+</table>
+
 <table>
     <tr>
         @php
@@ -13,6 +27,27 @@
         <td>{{ $luas }}</td>
     </tr>
 
+    <tr>
+        <td><strong>Hadap mata Angin</strong></td>
+        <td>
+            <label>
+                <input type="radio" name="tusuk_sate" value="Ya"
+                {{ isset($forminspeksi['tanah']['hadap_mata_angin']['sesuai']) &&  $forminspeksi['tanah']['hadap_mata_angin']['sesuai'] ? 'checked' : '' }}>
+                sesuai
+
+            </label>
+            <label>
+                <input type="radio" name="hadap_mata_angin" value="tidak sesuai"
+                    {{isset($forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai']) &&  $forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai'] ? 'checked' : '' }}>
+                Tidak
+
+                @if (isset($forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai']) && $forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai'])
+                {{ isset($forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai']) ? ' (' . $forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai'] . ')' : '' }}
+                @endif
+            </label>
+        </td>
+    </tr>
+
  <!-- Bentuk Tanah -->
     <tr>
         <td style="vertical-align: top;"><strong>Bentuk Tanah</strong></td>
@@ -69,7 +104,7 @@
 
   <!-- Ketinggian Tanah -->
   <tr>
-    <td style="vertical-align: top;"><strong>Ketinggian Tanah</strong></td>
+    <td style="vertical-align: top;"><strong>Beda Ketinggian Dengan Jalan</strong></td>
     <td>
         @if (isset($basicData['ketinggianTanah']))
             <table class="checkbox-list">
@@ -93,6 +128,53 @@
 </td>
 </tr>
 
+<tr>
+    <td><strong>Hadap mata Angin</strong></td>
+    <td>
+        <label class="form-label flex items-center gap-2.5 text-nowrap">
+            <input type="radio" class="radio" name="kontur_jalan" value="menurun"
+                {{ old('kontur_jalan', isset($forminspeksi['tanah']['kontur_jalan']) ? $forminspeksi['tanah']['kontur_jalan'] : '') == 'menurun' ? 'checked' : '' }}>
+            <span class="ml-2">Menurun</span>
+        </label>
+        <label class="form-label flex items-center gap-2.5 text-nowrap">
+            <input type="radio" class="radio" name="kontur_jalan" value="rata"
+                {{ old('kontur_jalan', isset($forminspeksi['tanah']['kontur_jalan']) ? $forminspeksi['tanah']['kontur_jalan'] : '') == 'rata' ? 'checked' : '' }}>
+            <span class="ml-2">Rata</span>
+        </label>
+        <label class="form-label flex items-center gap-2.5 text-nowrap">
+            <input type="radio" class="radio" name="kontur_jalan" value="Menanjak"
+                {{ old('kontur_jalan', isset($forminspeksi['tanah']['kontur_jalan']) ? $forminspeksi['tanah']['kontur_jalan'] : '') == 'Menanjak' ? 'checked' : '' }}>
+            <span class="ml-2">Menanjak</span>
+        </label>
+    </td>
+</tr>
+
+
+<tr>
+    <td style="vertical-align: top;"><strong>Posisi Kavling</strong></td>
+    <td>
+        @if (isset($basicData['posisiKavling']))
+            <table class="checkbox-list">
+                <tr>
+                    @foreach ($basicData['posisiKavling'] 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['tanah']['posisi_kavling']['posisi_kavling']) && in_array($item->name, $forminspeksi['tanah']['posisi_kavling']['posisi_kavling']) ? 'checked' : '' }}>
+            {{ $item->name }}
+        </label>
+    </td>
+@endforeach
+</tr>
+</table>
+@endif
+</td>
+</tr>
+
 <!-- Kondisi Fisik Tanah -->
 <tr>
 <td style="vertical-align: top;"><strong>Kondisi Fisik Tanah</strong></td>
@@ -154,3 +236,4 @@
 </tr>
 
 </table>
+</div>