From 704f52392fd40f42f1fc7beb105d01565a03592a Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 08:01:41 +0700
Subject: [PATCH 1/8] fix(penilaian): perbaiki logika otorisasi dan penanganan
 dataHeader

- Memperbaiki logika untuk mendapatkan otorisasi berdasarkan jenis laporan.
- Menambahkan pengecekan untuk memastikan $permohonan->authorization->approve_so ada sebelum digunakan.
- Memperbarui fungsi handleRejection untuk menerima parameter dataHeader.
---
 app/Http/Controllers/PenilaianController.php        | 12 +++++++-----
 resources/views/penilaian/otorisator/show.blade.php |  9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 616f5b9..4655298 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -891,11 +891,13 @@ class PenilaianController extends Controller
 
     public function revisiLaporan(Request $request, $id)
     {
-        $permohonan = Permohonan::find($id);
-        $userRole = Auth::user()->roles[0]->name;
-
-        $authorization = Authorization::where('permohonan_id', $permohonan->id)
-            ->where('jenis', 'paparan')->first();
+        if($request->dataHeader=='Paparan'){
+            $authorization = Authorization::find($id);
+            $permohonan = Permohonan::find($authorization->permohonan_id);
+        } else {
+            $permohonan = Permohonan::find($id);
+            $userRole   = Auth::user()->roles[0]->name;
+        }
 
         if ($permohonan->status === 'proses-paparan') {
             if ($authorization) {
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 1865701..5a026cc 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -110,7 +110,7 @@
         @endif
 
 
-        @if ($permohonan->authorization->approve_so && $dataHeader == 'paparan' )
+        @if (isset($permohonan->authorization->approve_so) && $dataHeader == 'paparan' )
         <div class="card border border-agi-100 pb-2.5">
             <div class="card-header bg-agi-50" id="basic_settings">
                 <h3 class="card-title">
@@ -247,7 +247,7 @@
 
     @push('scripts')
         <script>
-            const handleRejection = (dataId) => {
+            const handleRejection = (dataId,dataHeader='') => {
                 Swal.fire({
                     title: 'Masukkan alasan penolakan:',
                     input: 'textarea',
@@ -268,7 +268,8 @@
                     if (rejectResult.isConfirmed) {
                         handleAjaxRequest(
                             `/otorisator/revisi-laporan/${dataId}`, {
-                                keterangan: rejectResult.value
+                                keterangan: rejectResult.value,
+                                dataHeader: dataHeader
                             },
                             'Data berhasil ditolak.',
                             'Terjadi kesalahan saat melakukan penolakan.'
@@ -383,7 +384,7 @@
                             'Terjadi kesalahan saat melakukan otorisasi.'
                         );
                     } else if (result.isDenied) {
-                        handleRejection(dataId);
+                        handleRejection(dataId,dataHeader);
                     }
                 });
             }

From 6a188e1983059f7407d6c7149d04360d7d0a5120 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Fri, 7 Mar 2025 07:37:16 +0700
Subject: [PATCH 2/8] fix(surveyor):perbaikkan print out form inspeksi dan
 penambahan helper nama detail jaminan, dan form penilaian lpj

---
 app/Helpers/Lpj.php                           |  19 +-
 .../views/component/detail-jaminan.blade.php  |   2 +-
 .../views/component/form-penilai.blade.php    |  32 +-
 resources/views/penilai/show.blade.php        |   5 +
 .../components/data-pembanding.blade.php      |   4 +-
 .../surveyor/components/header.blade.php      |   2 +-
 .../pembanding-tanah-bangunan-unit.blade.php  |  32 +-
 .../components/print-out/bangunan.blade.php   |  54 +-
 .../components/print-out/fakta.blade.php      |  37 +-
 .../components/print-out/informasi.blade.php  |  12 +-
 .../components/print-out/lingkungan.blade.php | 107 +--
 .../components/print-out/main.blade.php       | 535 +++++-------
 .../components/print-out/rap.blade.php        | 780 +++++++++---------
 .../components/print-out/tanah.blade.php      | 490 ++++++-----
 14 files changed, 1083 insertions(+), 1028 deletions(-)

diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index a479209..5262587 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -432,20 +432,15 @@ function getWilayahName($code, $type)
 
 function formatLabel($key) {
 
-    $customLabels = [
-        'shgb_no_kel_desa' => 'SHGB',
-        'nib' => 'NIB',
-        'img_pbg_no' =>'IMB/PBG NO',
-        'no_surat_ukur_gs' => 'No Surat Ukur/GS',
-    ];
-
-    // Jika ada dalam mapping, gunakan label custom
-    if (array_key_exists($key, $customLabels)) {
-        return $customLabels[$key];
+    static $labelCache = [];
+    if (isset($labelCache[$key])) {
+        return $labelCache[$key];
     }
 
-    // Default: Ubah underscore menjadi spasi dan kapitalisasi
-    return ucwords(str_replace('_', ' ', $key));
+    $customLabel = CustomField::where('name', $key)->first();
+    $labelCache[$key] = $customLabel->label ?? ucwords(str_replace('_', ' ', $key));
+
+    return $labelCache[$key];
 }
 
 function calculateSLA($permohonan, $type)
diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php
index 55b618a..edba9aa 100644
--- a/resources/views/component/detail-jaminan.blade.php
+++ b/resources/views/component/detail-jaminan.blade.php
@@ -283,7 +283,7 @@
                                             @foreach (json_decode($detail->details) as $key => $value)
                                                 <tr>
                                                     <td class="py-3 capitalize">
-                                                        {{ str_replace("_"," ",$key) ?? "" }}
+                                                        {{formatLabel($key)}}
                                                     </td>
                                                     <td class="py-2 text-gray-800 font-normal text-2sm">
                                                         {{ $value ?? "" }}
diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php
index 297423e..50824f6 100644
--- a/resources/views/component/form-penilai.blade.php
+++ b/resources/views/component/form-penilai.blade.php
@@ -1,4 +1,3 @@
-
 <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
 
     @foreach ($permohonan->documents as $dokumen)
@@ -17,8 +16,8 @@
 
 
                 @if (array_intersect($kategoriUnik, ['tanah', 'bangunan', 'apartemen-kantor']))
-                                @include('lpj::surveyor.components.header')
-                            @endif
+                    @include('lpj::surveyor.components.header')
+                @endif
 
                 @foreach ($kategoriUnik as $kategori)
                     {{-- Tampilkan komponen sesuai kategori --}}
@@ -37,7 +36,8 @@
                 Informasi dan pembanding
             </h3>
             <div class="card-tools">
-                <a href="{{ route('penilai.showDataPembanding', ['id' => $permohonan->id]) }}?dokument={{ request()->documentId }}&jenis_jaminan={{ request()->jaminanId }}" class="btn btn-primary" data-bs-toggle="modal" >
+                <a href="{{ route('penilai.showDataPembanding', ['id' => $permohonan->id]) }}?dokument={{ request()->documentId }}&jenis_jaminan={{ request()->jaminanId }}"
+                    class="btn btn-primary" data-bs-toggle="modal">
                     Edit Data Pembanding
                 </a>
             </div>
@@ -75,6 +75,21 @@
                     @endphp
 
                     @foreach ($kategoriUnik as $item)
+                        @php
+
+                            if ($item === 'bangunan') {
+                                $luas =
+                                    $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ??
+                                    ($forminspeksi['bangunan']['luas_tanah_bagunan']['sesuai'] ?? null);
+                            } elseif ($item === 'tanah') {
+                                $luas =
+                                    $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ??
+                                    ($forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null);
+                            } else {
+                                $luas = null;
+                            }
+                            $luas = old('luas_' . $item, $lpjData['luas_' . $item] ?? $luas);
+                        @endphp
                         @if (isset($labelNilai[$item]))
                             <div class="flex grid-col-3 gap-2.5 w-full">
                                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
@@ -82,16 +97,15 @@
                                         {{ $labelNilai[$item] }}
                                     </label>
                                     <input type="text" id="luas_{{ $item }}" class="input w-full"
-                                        name="luas_{{ $item }}"
-                                        value="{{ old('luas_' . $item, $lpjData['luas_' . $item] ?? null) }}"
+                                        name="luas_{{ $item }}" value="{{ $luas }}"
                                         oninput="calculateTotal()">
                                 </div>
                                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
                                     <label for="province" class="">X</label>
                                     <label class="input">
                                         <i class="">Rp</i>
-                                        <input type="text" id="nilai_{{ $item }}_1"
-                                            class="w-full currency" name="nilai_{{ $item }}_1"
+                                        <input type="text" id="nilai_{{ $item }}_1" class="w-full currency"
+                                            name="nilai_{{ $item }}_1"
                                             value="{{ old('nilai_' . $item . '_1', $lpjData['nilai_' . $item . '_1'] ?? null) }}"
                                             oninput="calculateTotal()">
                                     </label>
@@ -129,7 +143,7 @@
 
             </div>
 
-            <div class="tambah mb-10"  style="margin-bottom: 20px;">
+            <div class="tambah mb-10" style="margin-bottom: 20px;">
                 <button type="button" id="tambah-npw" class="btn btn-primary">
                     <i class="ki-filled ki-plus"></i>
                     Tambah NPW </button>
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index d2c1a37..b6eb0e0 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -319,6 +319,11 @@
 
                     <div class="flex justify-end gap-5">
 
+                        <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => $dokumen->id, 'jenis_jaminan_id' => $dokumen->jenis_jaminan_id]) }}" class="btn btn-light"
+                            >
+                            <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
+                        </a>
+
                         <a class="btn btn-outline btn-info "
                             onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 1 )">
                             <i class="ki-filled ki-eye"></i>
diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php
index 7275b64..786d568 100644
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/resources/views/surveyor/components/data-pembanding.blade.php
@@ -193,7 +193,7 @@
                 'total_pembanding[]': currentData.total,
                 'diskon_pembanding[]': currentData.diskon,
                 'telepon_pembanding[]': currentData.telepon,
-                'penawaran_pembanding[]': currentData.penawaran
+                // 'penawaran_pembanding[]': currentData.penawaran
             } : {
                 'jenis_aset_pembanding[]': currentData.jenis_aset,
                 'luas_tanah_pembanding[]': currentData.luas_tanah,
@@ -213,7 +213,7 @@
                 'diskon_pembanding[]': currentData.diskon,
                 'hak_properti_pembanding[]': currentData.hak_properti,
                 'telepon_pembanding[]': currentData.telepon,
-                'penawaran_pembanding[]': currentData.penawaran,
+                // 'penawaran_pembanding[]': currentData.penawaran,
                 'tanggal_pembanding[]': currentData.tanggal,
                 // 'harga_penawaran_pembanding[]':currentData.harga_penawaran
 
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 16c02ea..7ef39f7 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -187,7 +187,7 @@
                                     <option value="">Select Jenis asset</option>
                                     @if (isset($basicData['jenisJaminan']))
                                         @foreach ($basicData['jenisJaminan'] as $item)
-                                            <option value="{{ $item->id }}"
+                                            <option value="{{ $item->name }}"
                                                 {{ old('jenis_asset_tidak_sesuai', $forminspeksi['asset']['jenis_asset_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
                                                 {{ $item->name }}
                                             </option>
diff --git a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
index 8aa2d9b..d717730 100644
--- a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
+++ b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
@@ -92,12 +92,20 @@
                     <td class="px-4 py-2">
                         <select name="jenis_aset" class="select">
                             <option value="">Pilih Jenis Aset</option>
+                            @php
+                                $selectedKey =
+                                    old('jenis_aset') ??
+                                    ($inspectionData['asset']['jenis_asset']['sesuai'] ??
+                                        ($inspectionData['asset']['jenis_asset']['tidak sesuai'] ?? ''));
+                            @endphp
+
                             @foreach ($data['jenisJaminan'] as $item)
-                                <option value="{{ $item->name }}"
-                                    {{ ($inspectionData['asset']['jenis_asset']['sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
-                                    {{ $item->name }}</option>
+                                <option value="{{ $item->name }}" {{ $selectedKey == $item->name ? 'selected' : '' }}>
+                                    {{ $item->name }}
+                                </option>
                             @endforeach
 
+
                         </select>
                     </td>
                     <td class="px-4 py-2">
@@ -173,27 +181,27 @@
                         <input type="text" name="hak_properti_pembanding[]" class="input">
                     </td>
                 </tr>
-                <tr>
-                    <td class="px-4 py-2">Penawaran/ Transaksi</td>
+                {{-- <tr> --}}
+                {{-- <td class="px-4 py-2">Penawaran/ Transaksi</td>
                     <td class="px-4 py-2">
                         <input type="text" name="penawaran" class="input"
-                            value="{{ $inspectionData['asset']['penawaran'] ?? '' }}">
-                        {{-- <select class="input w-full" name="penawaran">
+                            value="{{ $inspectionData['asset']['penawaran'] ?? '' }}"> --}}
+                {{-- <select class="input w-full" name="penawaran">
                             <option value="">Pilih</option>
                             <option value="Penawaran" {{ (isset($inspectionData['asset']['penawaran']) && $inspectionData['asset']['penawaran'] == 'Penawaran') ? 'selected' : '' }}>Penawaran</option>
                             <option value="Transaksi" {{ (isset($inspectionData['asset']['penawaran']) && $inspectionData['asset']['penawaran'] == 'Transaksi') ? 'selected' : '' }}>Transaksi</option>
                         </select> --}}
-                    </td>
+                {{-- </td>
                     <td class="px-4 py-2">
-                        <input type="text" name="penawaran_pembanding[]" class="input">
-                        {{-- <select class="input w-full" name="penawaran_pembanding[]">
+                        <input type="text" name="penawaran_pembanding[]" class="input"> --}}
+                {{-- <select class="input w-full" name="penawaran_pembanding[]">
                             <option value="">Pilih</option>
                             <option value="Penawaran" {{ (isset($inspectionData['penawaran']) && $inspectionData['penawaran'] == 'Penawaran') ? 'selected' : '' }}>Penawaran</option>
                             <option value="Transaksi" {{ (isset($inspectionData['penawaran']) && $inspectionData['penawaran'] == 'Transaksi') ? 'selected' : '' }}>Transaksi</option>
                         </select> --}}
 
-                    </td>
-                </tr>
+                {{-- </td>
+                </tr> --}}
 
                 {{-- <tr>
                     <td class="px-4 py-2">Harga Penawaran/ Transaksi(Rp)</td>
diff --git a/resources/views/surveyor/components/print-out/bangunan.blade.php b/resources/views/surveyor/components/print-out/bangunan.blade.php
index 0224431..fdd9460 100644
--- a/resources/views/surveyor/components/print-out/bangunan.blade.php
+++ b/resources/views/surveyor/components/print-out/bangunan.blade.php
@@ -1,4 +1,4 @@
-<div class="no-break" style="margin: 0; padding: 0">
+<div class="no-break" style="border-bottom: 1px solid #000;">
     <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
         <tr>
@@ -15,18 +15,44 @@
         <!-- Luas Tanah Bangunan -->
         <tr>
             @php
-                $cekLuasBangunan = isset($forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'])
+                // Tentukan apakah sesuai atau tidak sesuai berdasarkan input lama atau data awal
+                $cekLuasBangunan = old('luas_bangunan') ?? (isset($forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'])
                     ? 'tidak sesuai'
-                    : 'sesuai';
-                $luasBangunan = $forminspeksi['bangunan']['luas_tanah_bagunan'][$cekLuasBangunan] ?? null;
+                    : 'sesuai');
+                // Ambil nilai dari key yang sesuai
+                $luasBangunanSesuai = $forminspeksi['bangunan']['luas_tanah_bagunan']['sesuai'] ?? null;
+                $luasBangunanTidakSesuai = $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? null;
             @endphp
-            <td width="25%"><strong>Luas Bangunan (IMB)</strong></td>
-            <td>{{ $luasBangunan }}</td>
+            <td width="25%" style="vertical-align: top;">Luas Bangunan (IMB)</td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td>
+                <table>
+                    <tr>
+                        <td>
+                            <label>
+                                <input type="radio" name="luas_bangunan_radio" value="sesuai" {{ $cekLuasBangunan == 'sesuai' ? 'checked' : '' }}>
+                                Sesuai {{ $luasBangunanSesuai ?  '- ' .$luasBangunanSesuai . ' m²' : '' }}
+                            </label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label>
+                                <input type="radio" name="luas_bangunan_radio" value="tidak sesuai" {{ $cekLuasBangunan == 'tidak sesuai' ? 'checked' : '' }}>
+                                Tidak Sesuai {{ $luasBangunanTidakSesuai ? '- '. $luasBangunanTidakSesuai . ' m²' : '' }}
+                            </label>
+                        </td>
+                    </tr>
+                </table>
+            </td>
         </tr>
 
+
+
         <!-- Jenis Bangunan -->
         <tr>
-            <td><strong>Jenis Bangunan</strong></td>
+            <td style="vertical-align: top;">Jenis Bangunan</td>
+            <td width="1%" style="vertical-align: top;">:</td>
             <td>
                 @if (isset($basicData['jenisBangunan']))
                     <table class="checkbox-list">
@@ -53,7 +79,8 @@
 
     <!-- Kondisi Bangunan -->
     <tr>
-        <td><strong>Kondisi Bangunan</strong></td>
+        <td style="vertical-align: top;">Kondisi Bangunan</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             @if (isset($basicData['kondisiBangunan']))
                 <table class="checkbox-list">
@@ -79,7 +106,8 @@
 
     <!-- Sifat Bangunan -->
     <tr>
-        <td><strong>Sifat Bangunan</strong></td>
+        <td style="vertical-align: top;">Sifat Bangunan</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             @if (isset($basicData['sifatBangunan']))
                 <table class="checkbox-list">
@@ -120,12 +148,13 @@
             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>
+                <td colspan="2">Spesifikasi Bangunan {{ $bangunanIndex + 1 }}</td>
             </tr>
             @if (isset($basicData['spekKategoriBangunan']))
                 @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi)
                     <tr>
-                        <td style="vertical-align: top;"><strong>{{ $spesifikasi->name }}</strong></td>
+                        <td style="vertical-align: top;">{{ $spesifikasi->name }}</td>
+                        <td width="1%" style="vertical-align: top;">:</td>
                         <td>
                             <table class="checkbox-list">
                                 @if (isset($basicData['spekBangunan']))
@@ -185,7 +214,8 @@
     @endif
 
     <tr>
-        <td style="vertical-align: top;"><strong>Sarana Pelengkap</strong></td>
+        <td style="vertical-align: top;">Sarana Pelengkap</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             @if (isset($basicData['saranaPelengkap']))
                 <table class="checkbox-list">
diff --git a/resources/views/surveyor/components/print-out/fakta.blade.php b/resources/views/surveyor/components/print-out/fakta.blade.php
index 480f15d..72216e8 100644
--- a/resources/views/surveyor/components/print-out/fakta.blade.php
+++ b/resources/views/surveyor/components/print-out/fakta.blade.php
@@ -1,4 +1,4 @@
-<div class="no-break" style="margin: 0; padding: 0">
+<div class="no-break" style="border-bottom: 1px solid #000;">
     <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
 
@@ -14,8 +14,9 @@
 
     <table>
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Faktor Positif</strong></td>
-            <td width="100%">
+            <td width="20%" style="vertical-align: top;">Faktor Positif</td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td width="100%" style="vertical-align: top;">
                 @isset($forminspeksi['fakta']['fakta_positif'])
                     <table style="width: 100%; border-collapse: collapse;">
                         @foreach ($forminspeksi['fakta']['fakta_positif'] as $key => $item)
@@ -28,8 +29,9 @@
             </td>
         </tr>
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Faktor Negatif</strong></td>
-            <td>
+            <td width="20%" style="vertical-align: top;">Faktor Negatif</td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td width="100%" style="vertical-align: top;">
                 @php
                     $faktaNegatif = $forminspeksi['fakta']['fakta_negatif'] ?? [];
                     $faktaNegatifFiltered = is_array($faktaNegatif)
@@ -54,16 +56,18 @@
         </tr>
 
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Rute Munuju</strong></td>
-            <td>
+            <td width="20%" style="vertical-align: top;">Rute Munuju</td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
                 <p>{{ $forminspeksi['fakta']['rute_menuju'] ?? '' }}</p>
             </td>
         </tr>
 
 
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Batas Batas </strong></td>
-            <td>
+            <td width="20%" style="vertical-align: top;">Batas Batas </td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
 
 
                 @foreach ($forminspeksi['fakta']['batas_batas_input'] ?? [] as $arah => $batas)
@@ -75,8 +79,9 @@
         </tr>
 
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Kondisi lain terkait lingkungan </strong></td>
-            <td>
+            <td width="20%" style="vertical-align: top;">Kondisi lain terkait lingkungan </td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
 
 
                 @foreach ($forminspeksi['fakta']['kondisi_lingkungan'] ?? [] as $kondisi)
@@ -85,8 +90,9 @@
             </td>
         </tr>
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Kondisi lain terkait Bangunan </strong></td>
-            <td>
+            <td width="20%" style="vertical-align: top;">Kondisi lain terkait Bangunan </td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
 
                 @foreach ($forminspeksi['fakta']['kondisi_lain_bangunan'] ?? [] as $kondisiLain)
                     <p>{!! nl2br(e($kondisiLain)) !!}</p>
@@ -94,8 +100,9 @@
             </td>
         </tr>
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Informasi Terkait Dokumen </strong></td>
-            <td>
+            <td width="20%" style="vertical-align: top;">Informasi Terkait Dokumen </td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
 
                 @foreach ($forminspeksi['fakta']['informasi_dokument'] ?? [] as $informasi)
                 <p>{!! nl2br(e($informasi)) !!}</p>
diff --git a/resources/views/surveyor/components/print-out/informasi.blade.php b/resources/views/surveyor/components/print-out/informasi.blade.php
index 90b845b..fe6a138 100644
--- a/resources/views/surveyor/components/print-out/informasi.blade.php
+++ b/resources/views/surveyor/components/print-out/informasi.blade.php
@@ -1,4 +1,4 @@
-<div class="no-break" style="margin: 0; padding: 0">
+<div class="no-break" style="border-bottom: 1px solid #000;">
     <table
         style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
@@ -13,8 +13,9 @@
 
 
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Informasi Dinas Tata Ruang </strong></td>
-            <td>
+            <td width="20%" style="vertical-align: top;">Informasi Dinas Tata Ruang </td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
                 @php
                     $informasi = [
                         'peruntukan',
@@ -44,8 +45,9 @@
         </tr>
 
         <tr>
-            <td width="25%" style="vertical-align: top;"><strong>Catatan yang Perlu Diperhatikan </strong></td>
-            <td tyle="vertical-align: top;">
+            <td width="20%" style="vertical-align: top;">Catatan yang Perlu Diperhatikan </td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td style="vertical-align: top;">
 
                 @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $informasi)
                     <p>{!! nl2br(e($informasi)) !!}</p>
diff --git a/resources/views/surveyor/components/print-out/lingkungan.blade.php b/resources/views/surveyor/components/print-out/lingkungan.blade.php
index d717e68..715cd1b 100644
--- a/resources/views/surveyor/components/print-out/lingkungan.blade.php
+++ b/resources/views/surveyor/components/print-out/lingkungan.blade.php
@@ -1,4 +1,4 @@
-<div class="no-break">
+<div class="no-break" style="border-bottom: 1px solid #000;">
     <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
         <tr>
@@ -14,27 +14,24 @@
                 <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>
+                        <td width="1%" style="vertical-align: top;">:</td>
+                        <td>{{ $forminspeksi['lingkungan']['jarak_jalan_utama'] ?? '' }}  {{ $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>
+                        <td width="1%" style="vertical-align: top;">:</td>
+                        <td>{{ $forminspeksi['lingkungan']['jarak_cbd_point'] ?? '' }} {{ $forminspeksi['lingkungan']['nama_cbd_point'] ?? '' }}</td>
                     </tr>
                     <tr>
                         <td>Lebar Perkerasan Jalan</td>
+                        <td width="1%" style="vertical-align: top;">:</td>
                         <td>{{ $forminspeksi['lingkungan']['lebar_perkerasan_jalan'] ?? '' }}</td>
                     </tr>
 
                     <tr>
-                        <td style="vertical-align: top;"><strong>Perkerasan Jalan</strong></td>
+                        <td style="vertical-align: top;">Perkerasan Jalan</td>
+                        <td width="1%" style="vertical-align: top;">:</td>
                         <td>
                             @if (isset($basicData['perkerasanJalan']))
                                 <table class="checkbox-list">
@@ -59,7 +56,8 @@
         </tr>
 
         <tr>
-            <td style="vertical-align: top;"><strong>Lalu Lintas Depan Lokasi</strong></td>
+            <td style="vertical-align: top;">Lalu Lintas Depan Lokasi</td>
+            <td width="1%" style="vertical-align: top;">:</td>
             <td>
                 @if (isset($basicData['laluLintasLokasi']))
                     <table class="checkbox-list">
@@ -84,7 +82,8 @@
     </tr>
 
     <tr>
-        <td style="vertical-align: top;"><strong>Golongan Masyarakat Sekitar</strong></td>
+        <td style="vertical-align: top;">Golongan Masyarakat Sekitar</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             @if (isset($basicData['golMasySekitar']))
                 <table class="checkbox-list">
@@ -109,7 +108,34 @@
     </tr>
 
     <tr>
-        <td style="vertical-align: top;"><strong>Tingkat Keramaian</strong></td>
+        <td style="vertical-align: top;">Tingkat Keramaian</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td>
+            @if (isset($basicData['tingkatKeramaian']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['tingkatKeramaian'] 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']['tingkat_keramaian']) && in_array($item->name, $forminspeksi['lingkungan']['tingkat_keramaian']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    </td>
+    </tr>
+
+    <tr>
+        <td style="vertical-align: top;">Terletak Di Area</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             @if (isset($basicData['terletakDiArea']))
                 <table class="checkbox-list">
@@ -122,7 +148,7 @@
         <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' : '' }}>
+                    {{ isset($forminspeksi['lingkungan']['terletak_diarea']['terletak_diarea']) && in_array($item->name, $forminspeksi['lingkungan']['terletak_diarea']['terletak_diarea'] ?? '') ? 'checked' : '' }}>
                 {{ $item->name }}
             </label>
         </td>
@@ -134,32 +160,8 @@
     </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 style="vertical-align: top;">Disekitar Lokasi</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             <div class="checkbox-item">
                 <label class="checkbox-label">
@@ -184,7 +186,8 @@
 
 
     <tr>
-        <td style="vertical-align: top;"><strong>Dekat Makam</strong></td>
+        <td style="vertical-align: top;">Dekat Makam</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             <div class="checkbox-item">
                 <label class="checkbox-label">
@@ -195,7 +198,7 @@
                         - Nama Makam:
                         {{ $forminspeksi['lingkungan']['nama_makam'] ?? '' }}
                         , Jarak Makam:
-                        {{ $forminspeksi['lingkungan']['jarak_makam'] ?? '' }}
+                        {{ $forminspeksi['lingkungan']['jarak_makam'] ?? '' }} Km
                     @endif
                 </label>
                 <label class="checkbox-label">
@@ -209,7 +212,8 @@
 
 
     <tr>
-        <td style="vertical-align: top;"><strong>Dekat TPS</strong></td>
+        <td style="vertical-align: top;">Dekat TPS</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             <div class="checkbox-item">
                 <label class="checkbox-label">
@@ -221,6 +225,7 @@
                         {{ $forminspeksi['lingkungan']['nama_tps'] ?? '' }}
                         , Jarak TPS:
                         {{ $forminspeksi['lingkungan']['jarak_tps'] ?? '' }}
+                        km
                     @endif
                 </label>
                 <label class="checkbox-label">
@@ -234,13 +239,16 @@
 
 
     <tr>
-        <td style="vertical-align: top;"><strong>Dekat Lainnya</strong></td>
+        <td style="vertical-align: top;">Dekat Lainnya</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td>{{ $forminspeksi['lingkungan']['dekat_lainnya'] ?? '' }}</td>
     </tr>
 
 
 
     <tr>
-        <td style="vertical-align: top;"><strong>Merupakan Daerah</strong></td>
+        <td style="vertical-align: top;">Merupakan Daerah</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
             @if (isset($basicData['merupakanDaerah']))
                 <table class="checkbox-list">
@@ -265,8 +273,9 @@
     </tr>
 
     <tr>
-        <td style="vertical-align: top;"><strong>Fasilitas Umum Dekat Lokasi</strong></td>
-        <td>
+        <td style="vertical-align: top;">Fasilitas Umum Dekat Lokasi</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td style="vertical-align: top;">
             @if (isset($basicData['fasilitasObjek']))
                 <table class="checkbox-list">
                     <tr>
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index 8d4df95..f006e40 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -6,105 +6,96 @@
     <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>
+    <title>Hasil Inspeksi</title>
     <style>
+        * {
+
+            font-size: 12px;
+        }
+
         body {
             font-family: Arial, sans-serif;
         }
 
-        * {
-            font-size: 8px;
-            font-weight: bold;
+        /** Define the header rules **/
+        @page {
+            margin-top: 100px;
+            margin-bottom: 50px;
+
         }
 
-        h1,
-        h2,
-        h3 {
+        #header {
+            position: fixed;
+            top: -80px;
+            left: 0;
+            right: 0;
+            height: 50px;
             text-align: center;
-            margin-bottom: 10px;
-            color: #000;
+            padding-bottom: 10px;
         }
 
-
-        .container {
-            /* width: 100%; */
-            padding: 10px;
-            /* border: 1px solid #000; */
-            margin-bottom: 20px;
+        .header-logo {
+            position: absolute;
+            left: 20px;
+            top: 10px;
+            max-height: 80px;
+            max-width: 150px;
         }
 
-        .header {
-
-            margin-bottom: 10px;
+        .header-title {
+            margin-top: 20px;
         }
 
-        .judul {
-            font-weight: bold;
+        #footer {
+            position: fixed;
+            bottom: -50px;
+            left: 0;
+            right: 0;
+            height: 50px;
             text-align: center;
-            margin-bottom: 10px;
+            border-top: 1px solid #ddd;
+            padding-top: 10px;
+            font-size: 9px;
         }
 
-
-        .photo-item {
-            text-align: center;
-            margin-bottom: 20px;
+        .page-number:after {
+            content: counter(page) " dari " counter(pages);
         }
 
-        .photo-image {
-            max-width: 80%;
-            height: auto;
-            display: block;
-            margin: 0 auto;
+        .content {
+            margin-top: 10px;
         }
 
-
-
-        .judul-table {
-            width: 100%;
-            /* border-collapse: collapse; */
-            margin-bottom: 10px;
+        .page-break {
+            page-break-after: always;
         }
 
-        .judul-table td {
-            text-align: center;
-            vertical-align: middle;
-            padding: 5px;
+        #footer {
+            position: fixed;
+            bottom: -50px;
+            left: 0;
+            right: 0;
+            height: 50px;
+            text-align: left;
+            border-top: 1px solid #ddd;
+            padding-top: 10px;
         }
 
-        .border1 {
-            /* border: 1px solid #000; */
-            width: 50px;
+        body {
+            margin-top: 3cm;
+            margin-bottom: 120px;
+            position: relative;
+            z-index: 1;
         }
 
         .border {
-            /* border: 1px solid #000; */
+            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 */
+        .no-break {
+            page-break-inside: avoid;
+            page-break-before: auto;
+            page-break-after: auto;
         }
 
         .custom-table {
@@ -123,29 +114,6 @@
             /* 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;
@@ -160,7 +128,7 @@
         label.checkbox-label {
             display: flex;
             align-items: center;
-            font-size: 8px;
+            font-size: 12px;
         }
 
         label.checkbox-label input[type="checkbox"] {
@@ -168,37 +136,6 @@
             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>
@@ -238,18 +175,18 @@
     }
 @endphp
 
-<body style="width: 80%; margin: auto">
+<body style="width: 90%; 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')
+                    @include('lpj::component.logo-bag', ['width' => 150, 'height' => 40])
                 </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>
+                        <p style="margin: 0; padding:0; font-size:10px;">Tanggal: {{ date('Y-m-d') }}</p>
+                        <p style="margin: 0; padding:0;  font-size:10px;">Waktu: {{ date('H:i:s') }}</p>
+                        <p style="margin: 0; padding:0;  font-size:10px;">User: {{ Auth::user()->name }}</p>
                     </div>
                 </td>
             </tr>
@@ -257,7 +194,8 @@
     </header>
 
     <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;">
+        <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; ">
@@ -322,7 +260,8 @@
             </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;">
+        <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; ">
@@ -332,22 +271,16 @@
                 </td>
             </tr>
         </table>
-        <table>
+        <table style="width: 100%">
             <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>
+                <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>
 
-        <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+        <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; ">
@@ -357,65 +290,53 @@
                 </td>
             </tr>
         </table>
-        <table>
+        <table style="width: 100%">
             <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>
+                @php
+                    $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai'])
+                        ? 'sesuai'
+                        : 'tidak sesuai';
+                    $selectedData = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null;
+                @endphp
+                <td width="25%" style="padding: 2px; vertical-align: top;">Jenis Aset</td>
+                <td width="1%" style=" vertical-align: top;">:</td>
+                <td style="vertical-align: top; width: %;">
+                    {{ $selectedData ?? '' }}
                 </td>
             </tr>
 
             <tr>
-                <td>
-                    <table>
+                <td style="width: 25%; padding: 2px; vertical-align: top;">Alamat</td>
+                <td style="width: 1%; vertical-align: top;">:</td>
+                <td style="vertical-align: top;">
+                    <table style="margin: 0">
                         <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>
-                                        <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>
-                            </td>
+                            <td width="25%">Terletak di</td>
+                            <td> {{ $alamat['address'] ?? '' }}</td>
+                        </tr>
+                        <tr>
+                            <td>Kelurahan</td>
+                            <td>{{ $alamat['village_code'] ?? '' }}</td>
+                        </tr>
+                        <tr>
+                            <td>Kecamatan</td>
+                            <td>{{ $alamat['district_code'] ?? '' }}</td>
+                        </tr>
+                        <tr>
+                            <td>Kotamadya</td>
+                            <td> {{ $alamat['city_code'] ?? '' }}</td>
+                        </tr>
+                        <tr>
+                            <td>Propinsi</td>
+                            <td>{{ $alamat['province_code'] ?? '' }}</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;">
+        <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; ">
@@ -426,26 +347,20 @@
             </tr>
         </table>
 
-        <table>
+        <table style="width: 100%">
             <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>
-
-                    </table>
+                <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>
         </table>
-
-        <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+        <div class="no-break" style="border-bottom: 1px solid #000;">
+        <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; ">
@@ -457,136 +372,117 @@
         </table>
 
         <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
 
-                                                @foreach ($dokumen_jaminan as $index => $dokumen)
-                                                    <div>
-                                                        @if (!empty($dokumen_nomor[$index]))
-                                                            <span>{{ $dokumen_nomor[$index] }}</span>
-                                                        @endif
-                                                    </div>
-                                                @endforeach
+            @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> --}}
+
+                        </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;">
+                                            {{ formatLabel($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
-
-                                @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
-                                @endif
                             @endforeach
                         @endif
+                    @endif
+                @endforeach
+            @endif
 
-                        <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>
-                                            @foreach ($basicData['hubCadeb'] as $item)
-                                                <td>
-                                                    <label>
-                                                        <input type="checkbox"
-                                                            {{ $hubCadeb === $item->name ? 'checked' : '' }}>
-                                                        {{ $item->name }}
-                                                    </label>
-                                                </td>
-                                                @php $count++; @endphp
+            <tr>
+                @php
+                    // Ambil nilai sesuai dan tidak sesuai
+                    $hubCadebSesuai = $forminspeksi['asset']['hub_cadeb']['sesuai'] ?? null;
+                    $hubCadebTidakSesuai = $forminspeksi['asset']['hub_cadeb']['tidak sesuai'] ?? null;
+                @endphp
+                <td style="vertical-align: top;">Hubungan Pemilik Jaminan dengan Debitur</td>
+                <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
+                <td>
+                    <div style="margin-bottom: 10px;">
+                        <label>
+                            <input type="radio" name="hubCadebStatus" value="sesuai"
+                                {{ $hubCadebSesuai ? 'checked' : '' }}> Sesuai
+                        </label>
+                        <label style="margin-left: 20px;">
+                            <input type="radio" name="hubCadebStatus" value="tidak sesuai"
+                                {{ $hubCadebTidakSesuai ? 'checked' : '' }}> Tidak Sesuai
+                        </label>
+                    </div>
 
-                                                @if ($count % 3 === 0)
-                                        </tr>
-                                        <tr>
-                                @endif
+                    @if (!empty($basicData['hubCadeb']))
+                        <table >
+                            <tr>
+                                @php $count = 0; @endphp
+                                @foreach ($basicData['hubCadeb'] as $item)
+                                    <td>
+                                        <label >
+                                            <input type="checkbox"
+                                                {{ isset($item->name) && ($hubCadebSesuai === $item->name || $hubCadebTidakSesuai === $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>
-        </table>
+                                        <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 style="vertical-align: top; width: 20%; padding: 2px;">Hubungan Penghuni Jaminan dengan Debitur</td>
+        <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
+        <td style="vertical-align: top;">
+            @if (isset($selectedData))
+                {{ $selectedData ?? '' }}
+        </td>
         @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>
 
+        </div>
+
+
+
         @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
             @include('lpj::surveyor.components.print-out.rap')
         @else
@@ -614,7 +510,7 @@
     </div>
 
     <div class="no-break">
-        <table style="width: 100%; border-collapse: collapse;" >
+        <table style="width: 100%; border-collapse: collapse;">
             <tr>
                 <td style="border: 1px solid #000;">
                     <table>
@@ -673,7 +569,8 @@
 
                             @if (isset($forminspeksi['signature']['debitur']))
                                 <td style="width: 100px;">
-                                    <img style="width: 100px;" src="{{ $forminspeksi['signature']['debitur']['image'] }}"
+                                    <img style="width: 100px;"
+                                        src="{{ $forminspeksi['signature']['debitur']['image'] }}"
                                         alt="Debitur/Perwakilan">
                                 </td>
                             @endif
diff --git a/resources/views/surveyor/components/print-out/rap.blade.php b/resources/views/surveyor/components/print-out/rap.blade.php
index dc53a01..63c12c7 100644
--- a/resources/views/surveyor/components/print-out/rap.blade.php
+++ b/resources/views/surveyor/components/print-out/rap.blade.php
@@ -1,23 +1,16 @@
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        <table
+            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-<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>
 
-        <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;">
-    </td>
-    <td>
+                </td>
+            </tr>
+        </table>
         <table>
             @if (isset($forminspeksi['perizinan']) && is_array($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0)
                 @foreach ($forminspeksi['perizinan'] as $perizinan)
@@ -40,27 +33,32 @@
             @endif
 
         </table>
-    </td>
-</tr>
+    </div>
 
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        F
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        DESKRIPSI DEVELOPER
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        <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 DEVELOPER
+                    </h2>
+
+                </td>
+            </tr>
+        </table>
 
-    </td>
-    <td style=" border: 1px solid #000;">
         <table style="width: 100%;">
             <tr>
-                <td>{!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}</td>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Pengalaman Developer & Proyek Yang Pernah
+                    Dibuat</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
+                <td style="width: 79%;">{!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Apakah Developer Anggota REI</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['developer_anggota'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
 
@@ -68,6 +66,8 @@
             @isset($forminspeksi['lainnya_developer'])
                 @foreach ($forminspeksi['lainnya_developer'] as $item)
                     <tr>
+                        <td style="vertical-align: top; width: 20%;  padding: 2px;">Lainnya</td>
+                        <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                         <td>
                             {!! nl2br(e($item)) !!}
                         </td>
@@ -75,45 +75,61 @@
                 @endforeach
             @endisset
         </table>
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        G
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN
-    </td>
-</tr>
+    </div>
 
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        <table
+            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-    </td>
-    <td style=" border: 1px solid #000;">
+            <tr>
+                <td style="text-align: center; margin-top: 5px;">
+                    <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                        KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN
+                    </h2>
+
+                </td>
+            </tr>
+        </table>
         <table style="width: 100%;">
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Kapan Mulai Dibangun & Target Penyelesaian
+                </td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['kapan_mulai_dibangun'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Kondisi Perumahan Saat Ini</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['kondisi_perumahan'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Progress Pembangunan</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['progres_pembangunan'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Kontraktor (internal/eksternal)</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['kontraktor'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Lingkungan Sekitar</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['lingkungan_sekitar'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Komplek Lain Disekitar Lokasi</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['komplek_disekitar'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Pusat Keramaian Dekat Lokasi</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['pusat_keramaian'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Transportasi Umum Yang Tersedia</td>
+                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['transportasi_umum'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
 
@@ -121,6 +137,8 @@
             @isset($forminspeksi['lainnya_kondisi'])
                 @foreach ($forminspeksi['lainnya_kondisi'] as $item)
                     <tr>
+                        <td style="vertical-align: top; width: 20%;  padding: 2px;">Lainnya</td>
+                        <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                         <td>
                             {!! nl2br(e($item)) !!}
                         </td>
@@ -128,354 +146,352 @@
                 @endforeach
             @endisset
         </table>
-    </td>
-</tr>
+    </div>
 
 
-@isset($forminspeksi['partisi'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        H
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        PARTISI BANGUNAN
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
 
-    </td>
-    <td style=" border: 1px solid #000;">
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['partisi'])
+            <table
+                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-    <table>
-        @if (is_array($forminspeksi['partisi']))
-            @foreach ($forminspeksi['partisi'] as $key => $item)
-                @if (is_array($item))
-                    <tr>
-                        <td>
-                            {{ $item['nama'] ?? '' }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            {{ $item['value'] ?? '' }}
-                        </td>
-                    </tr>
+                <tr>
+                    <td style="text-align: center; margin-top: 5px;">
+                        <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                            PARTISI BANGUNAN
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <table style="width: 100%;">
+                @if (is_array($forminspeksi['partisi']))
+                    @foreach ($forminspeksi['partisi'] as $key => $item)
+                        @if (is_array($item))
+                            <tr>
+                                <td style="vertical-align: top; width: 20%;  padding: 2px;">
+                                    {{ $item['nama'] ?? '' }}
+                                </td>
+                                <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
+                                <td>
+                                    {{ $item['value'] ?? '' }}
+                                </td>
+                            </tr>
+                        @endif
+                    @endforeach
                 @endif
-            @endforeach
-        @endif
-    </table>
-</td>
-</tr>
-@endisset
+            </table>
+        @endisset
+    </div>
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['jumlah_unit'])
 
-@isset($forminspeksi['jumlah_unit'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        I
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN
-    </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;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['jumlah_unit'] as $item)
                 <tr>
-                    <td>
-                        {!! nl2br(e($item)) !!}
+                    <td style="text-align: center; margin-top: 5px;">
+                        <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                            JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN
+                        </h2>
+
                     </td>
                 </tr>
-            @endforeach
-        </table>
-    </td>
-</tr>
-
-@endisset
-@isset($forminspeksi['batas_batas_perumahan'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        J
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        BATAS-BATAS PERUMAHAN
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['batas_batas_perumahan'] as $item)
-                <tr>
-                    <td>
-                        {!! nl2br(e($item)) !!}
-                    </td>
-                </tr>
-            @endforeach
-        </table>
-    </td>
-</tr>
-@endisset
-
-@isset($forminspeksi['fasus_fasum'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        J
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        FASOS/FASUM
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['fasus_fasum'] as $item)
-            <tr>
-                <td>
-                    {!! nl2br(e($item)) !!}
-                </td>
-            </tr>
-        @endforeach
-        </table>
-    </td>
-</tr>
-@endisset
-@isset($forminspeksi['progres_penjualan'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        K
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        PROGRES PENJUALAN SAAT INI
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['progres_penjualan'] as $item)
-            <tr>
-                <td>
-                    {!! nl2br(e($item)) !!}
-                </td>
-            </tr>
-        @endforeach
-        </table>
-    </td>
-</tr>
-@endisset
-@isset($forminspeksi['harga_unit'])
-
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        L
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        HARGA UNIT
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['harga_unit'] as $item)
-            <tr>
-                <td>
-                    {!! nl2br(e($item)) !!}
-                </td>
-            </tr>
-        @endforeach
-        </table>
-    </td>
-</tr>
-@endisset
-@isset($forminspeksi['target_market'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        M
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        TARGET MARKET
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['target_market'] as $item)
-            <tr>
-                <td>
-                    {!! nl2br(e($item)) !!}
-                </td>
-            </tr>
-        @endforeach
-        </table>
-    </td>
-</tr>
-@endisset
-@isset($forminspeksi['kerjasama_dengan_bank'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        N
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        KERJASAMA DENGAN BANK LAIN
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['kerjasama_dengan_bank'] as $item)
-            <tr>
-                <td>
-                    {!! nl2br(e($item)) !!}
-                </td>
-            </tr>
-        @endforeach
-        </table>
-    </td>
-</tr>
-
-@endisset
-@isset($forminspeksi['rute_menuju_lokasi'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        O
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        RUTE MENUJU LOKASI
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            <tr>
-                <td>
-                    {{ $forminspeksi['rute_menuju_lokasi'] ?? '' }}
-                </td>
-            </tr>
-
-        </table>
-    </td>
-</tr>
-@endisset
-@isset($forminspeksi['properti_sejenis'])
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        P
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        PROPERTI SEJENIS
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            <tr>
-                <td>
-                    {{ $forminspeksi['properti_sejenis'] ?? '' }}
-                </td>
-            </tr>
-
-        </table>
-    </td>
-</tr>
-@endisset
-@if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        Q
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        ATURAN TATA KOTA
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @php
-                $informasi = [
-                    'peruntukan',
-                    'kdb',
-                    'kdh',
-                    'gsb',
-                    'max_lantai',
-                    'klb',
-                    'gss',
-                    'pelebaran_jalan',
-                    'nama_petugas',
-                ];
-            @endphp
-
-            @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
-                @foreach ($informasi as $key)
-                    @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
-                        <p> - {{ ucfirst(str_replace('_', ' ', $key)) }}:
-                            {{ $forminspeksi['fakta'][$key] }}</p>
-                    @endif
+            </table>
+            <table>
+                @foreach ($forminspeksi['jumlah_unit'] as $item)
+                    <tr>
+                        <td>
+                            {!! nl2br(e($item)) !!}
+                        </td>
+                    </tr>
                 @endforeach
-            @endif
-        </table>
-    </td>
-</tr>
+            </table>
 
-@endif
+        @endisset
+    </div>
 
-@isset($forminspeksi['fakta']['keterangan'])
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['batas_batas_perumahan'])
 
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
-        R
-    </td>
-    <td style="text-align: center; border: 1px solid #000;">
-        CATATAN LAINNYA
-    </td>
-</tr>
-<tr>
-    <td style="text-align: center; border: 1px solid #000;">
+            <table
+                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-    </td>
-    <td style=" border: 1px solid #000;">
-        <table>
-            @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
-            <tr>
-                <td>
-                    <p>{!! nl2br(e($keterangan)) !!}</p>
-                </td>
-            </tr>
-        @endforeach
-        </table>
-    </td>
-</tr>
+                <tr>
+                    <td style="text-align: center; margin-top: 5px;">
+                        <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
+                            BATAS-BATAS PERUMAHAN
+                        </h2>
 
-@endisset
-</table>
-</div>
+                    </td>
+                </tr>
+            </table>
+            <table>
+                @foreach ($forminspeksi['batas_batas_perumahan'] as $item)
+                    <tr>
+                        <td>
+                            {!! nl2br(e($item)) !!}
+                        </td>
+                    </tr>
+                @endforeach
+            </table>
+        @endisset
+    </div>
+
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['fasus_fasum'])
+            <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;">
+                            FASOS/FASUM
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <table>
+                @foreach ($forminspeksi['fasus_fasum'] as $item)
+                    <tr>
+                        <td>
+                            {!! nl2br(e($item)) !!}
+                        </td>
+                    </tr>
+                @endforeach
+            </table>
+        @endisset
+    </div>
+
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['progres_penjualan'])
+            <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;">
+                            PROGRES PENJUALAN SAAT INI
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+
+            <table>
+                @foreach ($forminspeksi['progres_penjualan'] as $item)
+                    <tr>
+                        <td>
+                            {!! nl2br(e($item)) !!}
+                        </td>
+                    </tr>
+                @endforeach
+            </table>
+        @endisset
+    </div>
+
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['harga_unit'])
+            <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;">
+                            HARGA UNIT
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <<table>
+                @foreach ($forminspeksi['harga_unit'] as $item)
+                    <tr>
+                        <td>
+                            {!! nl2br(e($item)) !!}
+                        </td>
+                    </tr>
+                @endforeach
+                </table>
+            @endisset
+    </div>
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['target_market'])
+            <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;">
+                            TARGet market
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <table>
+                @foreach ($forminspeksi['target_market'] as $item)
+                    <tr>
+                        <td>
+                            {!! nl2br(e($item)) !!}
+                        </td>
+                    </tr>
+                @endforeach
+            </table>
+        @endisset
+    </div>
+
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['kerjasama_dengan_bank'])
+            <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;">
+                            Kerjasama dengan bank lain
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <table>
+                @foreach ($forminspeksi['kerjasama_dengan_bank'] as $item)
+                    <tr>
+                        <td>
+                            {!! nl2br(e($item)) !!}
+                        </td>
+                    </tr>
+                @endforeach
+            </table>
+
+        @endisset
+    </div>
+
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['rute_menuju_lokasi'])
+            <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;">
+                            rute menuju lokasi
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <table>
+                <tr>
+                    <td>
+                        {{ $forminspeksi['rute_menuju_lokasi'] ?? '' }}
+                    </td>
+                </tr>
+
+            </table>
+        @endisset
+    </div>
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['properti_sejenis'])
+            <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;">
+                            properti sejenis
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+
+            <table>
+                <tr>
+                    <td>
+                        {{ $forminspeksi['properti_sejenis'] ?? '' }}
+                    </td>
+                </tr>
+
+            </table>
+        @endisset
+    </div>
+
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
+
+            <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;">
+                            ATURAN TATA KOTA
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <table>
+                @php
+                    $informasi = [
+                        'peruntukan',
+                        'kdb',
+                        'kdh',
+                        'gsb',
+                        'max_lantai',
+                        'klb',
+                        'gss',
+                        'pelebaran_jalan',
+                        'nama_petugas',
+                    ];
+                @endphp
+
+                @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
+                    @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
+                @endif
+            </table>
+
+        @endif
+    </div>
+
+    <div class="no-break" style="border-bottom: 1px solid #000;">
+        @isset($forminspeksi['fakta']['keterangan'])
+
+
+            <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;">
+                            CATATAN LAINNYA
+                        </h2>
+
+                    </td>
+                </tr>
+            </table>
+            <table>
+                @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan)
+                    <tr>
+                        <td>
+                            <p>{!! nl2br(e($keterangan)) !!}</p>
+                        </td>
+                    </tr>
+                @endforeach
+            </table>
+
+        @endisset
+    </div>
diff --git a/resources/views/surveyor/components/print-out/tanah.blade.php b/resources/views/surveyor/components/print-out/tanah.blade.php
index 250f47a..7d789c8 100644
--- a/resources/views/surveyor/components/print-out/tanah.blade.php
+++ b/resources/views/surveyor/components/print-out/tanah.blade.php
@@ -1,61 +1,115 @@
+<div class="no-break" style="border-bottom: 1px solid #000;">
+    <table
+        style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
 
-<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>
 
-    <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 style="width: 100%">
+        <tr>
+            @php
 
-<table>
-    <tr>
-        @php
-            $cekLuas = isset(
-                $forminspeksi['tanah']['luas_tanah']['tidak sesuai'],
-            )
-                ? 'tidak sesuai'
-                : 'sesuai';
+                $cekLuas =
+                    old('luas_tanah_radio') ??
+                    (isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai']) ? 'tidak sesuai' : 'sesuai');
 
-            $luas = $forminspeksi['tanah']['luas_tanah'][$cekLuas] ?? null;
-        @endphp
-        <td width="25%"><strong>Luas Tanah</strong></td>
-        <td>{{ $luas }}</td>
-    </tr>
+                $luasSesuai = $forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null;
+                $luasTidakSesuai = $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? null;
+            @endphp
+            <td width="25%" style="vertical-align: top;">Luas Tanah</td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td width="" style="text-align: left">
+                <table>
+                    <tr>
+                        <td>
+                            <label>
+                                <input type="radio" name="luas_tanah_radio" value="sesuai"
+                                    {{ $cekLuas == 'sesuai' ? 'checked' : '' }}>
+                                Sesuai {{ $luasSesuai ? '- ' . $luasSesuai . ' m²' : '' }}
+                            </label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label>
+                                <input type="radio" name="luas_tanah_radio" value="tidak sesuai"
+                                    {{ $cekLuas == 'tidak sesuai' ? 'checked' : '' }}>
+                                Tidak Sesuai {{ $luasTidakSesuai ? '- ' . $luasTidakSesuai . ' m²' : '' }}
+                            </label>
+                        </td>
+                    </tr>
+                </table>
+            </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
+        <tr>
+            <td>Hadap mata Angin</td>
+            <td width="1%" style="vertical-align: top;">:</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
+                </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'] . ')' : '' }}
+                    @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;">Bentuk Tanah</td>
+            <td width="1%" style="vertical-align: top;">:</td>
+            <td>
+                @if (isset($basicData['bentukTanah']))
+                    <table class="checkbox-list">
+                        <tr>
+                            @foreach ($basicData['bentukTanah'] as $index => $item)
+                                @if ($index % 3 == 0 && $index > 0)
+                        </tr>
+                        <tr>
                 @endif
-            </label>
-        </td>
+            <td class="checkbox-item">
+                <label class="checkbox-label">
+                    <input type="checkbox"
+                        {{ isset($forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']) && in_array($item->name, $forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']) ? 'checked' : '' }}>
+                    {{ $item->name }}
+                </label>
+            </td>
+            @endforeach
+        </tr>
+    </table>
+    @endif
+    </td>
     </tr>
 
- <!-- Bentuk Tanah -->
+
+    <!-- Kontur Tanah -->
     <tr>
-        <td style="vertical-align: top;"><strong>Bentuk Tanah</strong></td>
+        <td style="vertical-align: top;">Kontur Tanah</td>
+        <td width="1%" style="vertical-align: top;">:</td>
         <td>
-            @if (isset($basicData['bentukTanah']))
+            @if (isset($basicData['konturTanah']))
                 <table class="checkbox-list">
                     <tr>
-                        @foreach ($basicData['bentukTanah'] as $index => $item)
+                        @foreach ($basicData['konturTanah'] as $index => $item)
                             @if ($index % 3 == 0 && $index > 0)
                     </tr>
                     <tr>
@@ -63,177 +117,195 @@
         <td class="checkbox-item">
             <label class="checkbox-label">
                 <input type="checkbox"
-                    {{ isset($forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']) && in_array($item->name, $forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']) ? 'checked' : '' }}>
+                    {{ isset($forminspeksi['tanah']['kontur_tanah']) && in_array($item->name, $forminspeksi['tanah']['kontur_tanah']) ? 'checked' : '' }}>
                 {{ $item->name }}
             </label>
         </td>
-@endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
-
-
-  <!-- Kontur Tanah -->
-  <tr>
-    <td style="vertical-align: top;"><strong>Kontur Tanah</strong></td>
-    <td>
-        @if (isset($basicData['konturTanah']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['konturTanah'] 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']['kontur_tanah']) && in_array($item->name, $forminspeksi['tanah']['kontur_tanah']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-@endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
-
-
-  <!-- Ketinggian Tanah -->
-  <tr>
-    <td style="vertical-align: top;"><strong>Beda Ketinggian Dengan Jalan</strong></td>
-    <td>
-        @if (isset($basicData['ketinggianTanah']))
-            <table class="checkbox-list">
-                <tr>
-                    @foreach ($basicData['ketinggianTanah'] 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']['ketinggian_tanah']['ketinggian']) && in_array($item->name, $forminspeksi['tanah']['ketinggian_tanah']['ketinggian']) ? 'checked' : '' }}>
-            {{ $item->name }}
-        </label>
-    </td>
-@endforeach
-</tr>
-</table>
-@endif
-</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>
-<td>
-    @if (isset($basicData['kondisiFisikTanah']))
-        <table class="checkbox-list">
-            <tr>
-                @foreach ($basicData['kondisiFisikTanah'] as $index => $item)
-                    @if ($index % 3 == 0 && $index > 0)
-            </tr>
-            <tr>
+        @endforeach
+    </tr>
+    </table>
     @endif
-<td class="checkbox-item">
-    <label class="checkbox-label">
-        <input type="checkbox"
-            {{ isset($forminspeksi['tanah']['kondisi_fisik_tanah']['kondisi_fisik_tanah']) && in_array($item->name, $forminspeksi['tanah']['kondisi_fisik_tanah']['kondisi_fisik_tanah']) ? 'checked' : '' }}>
-        {{ $item->name }}
-    </label>
-</td>
-@endforeach
-</tr>
-</table>
-@endif
-</td>
-</tr>
+    </td>
+    </tr>
 
-<tr>
-    <td><strong>Tusuk Sate</strong></td>
-    <td>
-        <label>
-            <input type="radio" name="tusuk_sate" value="Ya"
-            {{ isset($forminspeksi['tanah']['tusuk_sate']['Ya']) &&  $forminspeksi['tanah']['tusuk_sate']['Ya'] ? 'checked' : '' }}>
-            Ya
-            @if (isset($forminspeksi['tanah']['tusuk_sate']['Ya']) && $forminspeksi['tanah']['tusuk_sate']['Ya'])
-            {{ isset($forminspeksi['tanah']['tusuk_sate']['Ya']) ? ' (' . $forminspeksi['tanah']['tusuk_sate']['Ya'] . ')' : '' }}
+
+    <!-- Ketinggian Tanah -->
+    <tr>
+        <td style="vertical-align: top;">Beda Ketinggian Dengan Jalan</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td>
+            @if (isset($basicData['ketinggianTanah']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['ketinggianTanah'] as $index => $item)
+                            @if ($index % 3 == 0 && $index > 0)
+                    </tr>
+                    <tr>
             @endif
-        </label>
-        <label>
-            <input type="radio" name="tusuk_sate" value="Tidak"
-                {{isset($forminspeksi['tanah']['tusuk_sate']['Tidak']) &&  $forminspeksi['tanah']['tusuk_sate']['Tidak'] ? 'checked' : '' }}>
-            Tidak
-        </label>
+        <td class="checkbox-item">
+            <label class="checkbox-label">
+                <input type="checkbox"
+                    {{ isset($forminspeksi['tanah']['ketinggian_tanah']['ketinggian']) && in_array($item->name, $forminspeksi['tanah']['ketinggian_tanah']['ketinggian']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
     </td>
-</tr>
-<tr>
-    <td><strong>Lockland</strong></td>
-    <td>
-        <label>
-            <input type="radio" name="lockland" value="yes"
-                {{ isset($forminspeksi['tanah']['lockland']) && $forminspeksi['tanah']['lockland'] == 'yes' ? 'checked' : '' }}>
-            Ya
-        </label>
-        <label>
-            <input type="radio" name="lockland" value="no"
-                {{ isset($forminspeksi['tanah']['lockland']) && $forminspeksi['tanah']['lockland'] == 'no' ? 'checked' : '' }}>
-            Tidak
-        </label>
-    </td>
-</tr>
+    </tr>
 
-</table>
+    <tr>
+        <td style="vertical-align: top;">Kontur Jalan Depan Objek</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td>
+            <table>
+                <tr>
+                    <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>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <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>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <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>
+            </table>
+
+        </td>
+    </tr>
+
+
+    <tr>
+        <td style="vertical-align: top;">Posisi Kavling</td>
+        <td width="1%" style="vertical-align: top;">:</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;">Tusuk Sate</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td>
+            <table>
+                <tr>
+                    <td>
+                        <label>
+                            <input type="radio" name="tusuk_sate" value="Ya"
+                                {{ isset($forminspeksi['tanah']['tusuk_sate']['Ya']) && $forminspeksi['tanah']['tusuk_sate']['Ya'] ? 'checked' : '' }}>
+                            Ya
+                            @if (isset($forminspeksi['tanah']['tusuk_sate']['Ya']) && $forminspeksi['tanah']['tusuk_sate']['Ya'])
+                                {{ isset($forminspeksi['tanah']['tusuk_sate']['Ya']) ? ' (' . $forminspeksi['tanah']['tusuk_sate']['Ya'] . ')' : '' }}
+                            @endif
+                        </label>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label>
+                            <input type="radio" name="tusuk_sate" value="Tidak"
+                                {{ isset($forminspeksi['tanah']['tusuk_sate']['Tidak']) && $forminspeksi['tanah']['tusuk_sate']['Tidak'] ? 'checked' : '' }}>
+                            Tidak
+                        </label>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td style="vertical-align: top;">Lockland</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td>
+            <table>
+                <tr>
+                    <td>
+                        <label>
+                            <input type="radio" name="lockland" value="yes"
+                                {{ isset($forminspeksi['tanah']['lockland']) && $forminspeksi['tanah']['lockland'] == 'yes' ? 'checked' : '' }}>
+                            Ya
+                        </label>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label>
+                            <input type="radio" name="lockland" value="no"
+                                {{ isset($forminspeksi['tanah']['lockland']) && $forminspeksi['tanah']['lockland'] == 'no' ? 'checked' : '' }}>
+                            Tidak
+                        </label>
+                    </td>
+                </tr>
+
+            </table>
+
+
+        </td>
+    </tr>
+
+    <tr>
+        <td style="vertical-align: top;">Kondisi Fisik Tanah</td>
+        <td width="1%" style="vertical-align: top;">:</td>
+        <td>
+            @if (isset($basicData['kondisiFisikTanah']))
+                <table class="checkbox-list">
+                    <tr>
+                        @foreach ($basicData['kondisiFisikTanah'] 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']['kondisi_fisik_tanah']['kondisi_fisik_tanah']) && in_array($item->name, $forminspeksi['tanah']['kondisi_fisik_tanah']['kondisi_fisik_tanah']) ? 'checked' : '' }}>
+                {{ $item->name }}
+            </label>
+        </td>
+        @endforeach
+    </tr>
+    </table>
+    @endif
+    </td>
+    </tr>
+    </table>
 </div>

From a048bea26e24e408481f26b83653705a13889a51 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 09:21:14 +0700
Subject: [PATCH 3/8] fix(activity): perbaiki logika perhitungan tanggal SLA
 dan paparan

- Memperbaiki perhitungan tanggal selesai berdasarkan hari tambahan.
- Menambahkan logika untuk menghitung hari kerja berikutnya.
- Mengubah nama kolom pada tampilan dari "Due Date SLA" menjadi "SLA Laporan" dan "Paparan" menjadi "SLA Paparan".
- Menambahkan detail dokumen pada query di LaporanController.
---
 app/Http/Controllers/ActivityController.php   | 63 ++++++++++++++-----
 app/Http/Controllers/LaporanController.php    |  2 +-
 .../activity/progres_activity/index.blade.php | 15 ++++-
 3 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 8670fe3..35daf20 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -326,7 +326,7 @@ class ActivityController extends Controller
         $filteredRecords = $query->count();
 
         // Get data with necessary relationships
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan'])->get();
+        //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan','nilaiPlafond'])->get();
 
         // Calculate total pages
         $pageCount = ceil($totalRecords / $request->get('size', 10));
@@ -444,26 +444,40 @@ class ActivityController extends Controller
             $jeniAsset = null;
             $statusPembayaran = trim(strtolower($item->permohonan->status_bayar ?? ''));
             $tujuanPenilaian = $item->permohonan->tujuanPenilaian->name ?? null;
+            $plafond = $item->permohonan->nilaiPlafond->name ?? null;
+
             $now = Carbon::now();
+            $type_report = $item->permohonan->penilai->type ?? "";
 
-            // $plafond = $item->permohonan->nilaiPlafond->name ?? null;
-            // $type_report = $item->permohonan->penilai->type_penilai;
+            $hari = $hariPaparan = 0;
 
-            // $hari = 0;
-            // if ($plafond == '< 1M') {
-            //     $item->paparan = 'Tidak Ada';
-            // }else if($plafond == '2 M - 5 M'){
-            //     $hari = 2;
-            // }else if($plafond == '5 M - 10 M'){
-            //     $hari = 3;
-            // }
+            if($type_report == "sederhana"){
+                $hari = 2;
+                $item->paparan = 'Tidak Ada';
+            } else{
+                if ($plafond == '< 2M') {
+                    $item->paparan = 'Tidak Ada';
+                    $hari = 3;
+                }else if($plafond == '2 M - 5 M'){
+                    $hari = 3;
+                    $hariPaparan = 2;
+                }else {
+                    $hari = 5;
+                    $hariPaparan = 3;
+                }
+            }
+
+            if ($tujuanPenilaian == 'RAP') {
+                $hari = 2;
+                $hariPaparan = 2;
+            }
 
 
             if ($item->permohonan && $item->permohonan->debiture) {
                 $jeniAsset = $item->permohonan->debiture->documents->first() ?? null;
             }
 
-            $hariTambahan = 0;
+            /*$hariTambahan = 0;
 
             if ($tujuanPenilaian == 'RAP') {
                 $hariTambahan = 2;
@@ -473,33 +487,50 @@ class ActivityController extends Controller
                 } else {
                     $hariTambahan = 2; // H+2 untuk yang belum bayar
                 }
-            }
+            }*/
 
             $tanggalMulai = $item->waktu_penilaian;
 
             if ($tanggalMulai) {
+                if (!$tanggalMulai instanceof Carbon) {
+                    $tanggalMulai = Carbon::parse($tanggalMulai);
+                }
+                $hariKerjaBerikutnya = hitungHariKerja($tanggalMulai->toDateString(),$tanggalMulai->copy()->addDays(1));
+                $hariKerjaBerikutnya = max($hariKerjaBerikutnya, 1);
+                $tanggalMulai = $tanggalMulai->copy()->addDays($hariKerjaBerikutnya);
+
                 // Konversi string tanggal ke objek Carbon jika belum
                 if (!$tanggalMulai instanceof Carbon) {
                     $tanggalMulai = Carbon::parse($tanggalMulai);
                 }
 
                 // Hitung tanggal selesai berdasarkan hari tambahan
-                $tanggalSelesai = $tanggalMulai->copy()->addDays($hariTambahan);
+                $tanggalSelesai = $tanggalMulai->copy()->addDays($hari);
+                $tanggalPaparan = $tanggalMulai->copy()->addDays($hariPaparan);
 
                 // Hitung hari kerja
                 $hariKerja = hitungHariKerja($tanggalMulai->toDateString(), $tanggalSelesai->toDateString());
+                $hariKerja = max($hariKerja, $hari);
+
+                $hariKerjaPaparan = hitungHariKerja($tanggalMulai->toDateString(), $tanggalPaparan->toDateString());
+                $hariKerjaPaparan = max($hariKerjaPaparan, $hariPaparan);
 
                 // Set due date SLA
                 $dueDateSla = $tanggalMulai->copy()->addDays($hariKerja);
+                $dueDateSlaPaparan = $tanggalMulai->copy()->addDays($hariKerjaPaparan);
 
                 // Cek apakah sudah melewati due date
-                if ($now->greaterThan($dueDateSla)) {
+                /*if ($now->greaterThan($dueDateSla)) {
                     $item->due_date_sla = null;
                 } else {
                     $item->due_date_sla = $dueDateSla->toDateString();
-                }
+                }*/
+
+                $item->due_date_sla = $dueDateSla->toDateString();
+                $item->paparan = $dueDateSlaPaparan->toDateString();
             } else {
                 $item->due_date_sla = null;
+                $item->paparan = null;
 
             }
 
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 1fdbaa5..b457413 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -123,7 +123,7 @@ class LaporanController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai','documents.detail'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $size);
diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php
index 11c5fac..844fce5 100644
--- a/resources/views/activity/progres_activity/index.blade.php
+++ b/resources/views/activity/progres_activity/index.blade.php
@@ -120,8 +120,8 @@
                                                         <th class="min-w-[100px]">Tgl Assign</th>
                                                         <th class="min-w-[100px]">Tgl Kunjungan</th>
                                                         <th class="min-w-[100px]">Progress</th>
-                                                        <th class="min-w-[100px]">Due Date SLA</th>
-                                                        <th class="min-w-[100px]">Paparan</th>
+                                                        <th class="min-w-[100px]">SLA Laporan</th>
+                                                        <th class="min-w-[100px]">SLA Paparan</th>
                                                         <th class="min-w-[100px]">Approve</th>
                                                         <th class="min-w-[50px] text-center">Keterangan</th>
                                                         <th class="min-w-[50px] text-center">Action</th>
@@ -251,6 +251,15 @@
                                     return `${window.formatTanggalIndonesia(data.due_date_sla)}`;
                                 }
                             },
+                            due_date: {
+                                title: 'Due Date SLA',
+                                render: (item, data) => {
+                                    if (!data.due_date_sla) {
+                                        return `-`;
+                                    }
+                                    return `${window.formatTanggalIndonesia(data.due_date_sla)}`;
+                                },
+                            },
 
                             paparan: {
                                 title: 'Paparan',
@@ -258,7 +267,7 @@
                                     if (!data.due_date_sla) {
                                         return `-`;
                                     }
-                                    return `${window.formatTanggalIndonesia(data.due_date_sla)}`;
+                                    return `${window.formatTanggalIndonesia(data.paparan)}`;
                                 }
                             },
                             approve: {

From 5d380f1a6872be2d6d05c6ff64b46316e9906de1 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 09:39:30 +0700
Subject: [PATCH 4/8] fix(activity): perbaiki pengambilan data pada
 ActivityController

- Mengaktifkan kembali pengambilan data dengan relasi yang diperlukan.
- Memastikan data yang diambil mencakup relasi 'user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan', dan 'nilaiPlafond'.
---
 app/Http/Controllers/ActivityController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 35daf20..abc1505 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -326,7 +326,7 @@ class ActivityController extends Controller
         $filteredRecords = $query->count();
 
         // Get data with necessary relationships
-        //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan','nilaiPlafond'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan','nilaiPlafond'])->get();
 
         // Calculate total pages
         $pageCount = ceil($totalRecords / $request->get('size', 10));

From f7c85fc24edcdc95a6f711efdc6bc76d4f8f4d6a Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 09:53:55 +0700
Subject: [PATCH 5/8] feat(penilai): tambahkan fitur unggah foto dan simpan
 memo dengan foto

- Menambahkan metode `uploadTempPhoto` untuk mengunggah foto sementara.
- Menambahkan metode `storeMemoWithPhotos` untuk menyimpan memo beserta foto.
- Memperbarui rute untuk mendukung pengunggahan foto dan penyimpanan memo.
- Memperbarui tampilan untuk menampilkan foto yang sudah ada dan mengubah ID dropzone.
---
 app/Http/Controllers/PenilaiController.php    |  72 ++++++++++-
 .../views/penilai/components/memo.blade.php   | 116 +++++++++++++++---
 routes/web.php                                |   4 +
 3 files changed, 170 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index e7c8ef4..218ad3e 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -4,6 +4,7 @@ namespace Modules\Lpj\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Barryvdh\DomPDF\Facade\Pdf;  // https://github.com/barryvdh/laravel-dompdf
+use Illuminate\Support\Facades\Storage;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Inspeksi;
 use Modules\Lpj\Models\Penilai;
@@ -756,10 +757,10 @@ class PenilaiController extends Controller
 
 
             if (!$allComplete) {
-                $message = $rap 
-                    ? 'Harap Mengisi laporan terlebih dahulu' 
+                $message = $rap
+                    ? 'Harap Mengisi laporan terlebih dahulu'
                     : 'Harap Mengisi laporan terlebih dahulu atau kertas kerja';
-    
+
                 return response()->json([
                     'success' => false,
                     'message' => $message,
@@ -801,6 +802,18 @@ class PenilaiController extends Controller
         }
     }
 
+    public function uploadTempPhoto(Request $request)
+    {
+        if ($request->hasFile('file')) {
+            $file = $request->file('file');
+            $filename = time() . '_' . $file->getClientOriginalName();
+            $path = $file->storeAs('temp_photos', $filename, 'public');
+            return response()->json(['success' => true, 'id' => $path]);
+        }
+
+        return response()->json(['success' => false], 400);
+    }
+
     public function storeResume(Request $request)
     {
         try {
@@ -919,6 +932,59 @@ class PenilaiController extends Controller
         }
     }
 
+    public function storeMemoWithPhotos(Request $request)
+    {
+        try {
+            $validatedData = $request->validate([
+                'permohonan_id' => 'required|integer',
+                'document_id'   => 'required|integer',
+                'inspeksi_id'   => 'required|integer',
+                'memo'          => 'required',
+            ]);
+
+            $memoData = json_decode($validatedData['memo'], true);
+
+            $memo = Penilai::updateOrCreate(
+                [
+                    'permohonan_id' => $validatedData['permohonan_id'],
+                    'dokument_id'   => $validatedData['document_id'],
+                    'inspeksi_id'   => $validatedData['inspeksi_id'],
+                ],
+                [
+                    'memo' => json_encode($memoData),
+                ]
+            );
+
+            // Simpan foto-foto
+            if ($request->hasFile('foto_0')) {
+                $photoUrls = [];
+                $index     = 0;
+                while ($request->hasFile("foto_$index")) {
+                    $file        = $request->file("foto_$index");
+                    $fileName    = time() . '_' . $file->getClientOriginalName();
+                    $filePath    = $file->storeAs('public/memo_photos', $fileName);
+                    $photoUrls[] = Storage::url($filePath);
+                    $index++;
+                }
+
+                // Tambahkan URL foto ke data memo
+                $memoData['foto'] = $photoUrls;
+                $memo->memo       = json_encode($memoData);
+                $memo->save();
+            }
+
+            return response()->json([
+                'success' => true,
+                'message' => 'Memo dan foto berhasil disimpan',
+            ]);
+        } catch (Exception $e) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Terjadi kesalahan: ' . $e->getMessage(),
+            ], 500);
+        }
+    }
+
     public function storeLpjSederhanadanStandard(Request $request)
     {
         DB::beginTransaction();
diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php
index 8646e92..fb5db32 100644
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -295,7 +295,7 @@
                         <h1 class="text-md font-medium text-gray-900">Upload Foto</h1>
                     </div>
 
-                    <div class="dropzone" id="upload-dropzone">
+                    <div class="dropzone" id="dropzone-upload">
                         <div class="dz-message needsclick" data-foto-type="upload_foto">
                             <i class="ki-duotone ki-file-up  text-primary text-3xl"><span class="path1"></span><span
                                     class="path2"></span></i>
@@ -306,6 +306,9 @@
                         </div>
                     </div>
                 </div>
+                <div class="card-footer">
+                    <div id="existing-photos" class="flex gap-5"></div>
+                </div>
             </div>
 
             {{-- @include('lpj::penilai.components.foto-lampiran') --}}
@@ -337,7 +340,75 @@
     </div>
 @endsection
 @include('lpj::surveyor.js.utils')
-<script>
+@push('scripts')
+    <script>
+        Dropzone.autoDiscover = false;
+        let myDropzone;
+
+        document.addEventListener('DOMContentLoaded', function() {
+            myDropzone = new Dropzone("#dropzone-upload", {
+                url: "{{ route('penilai.uploadTempPhoto') }}", // Temporary upload route
+                paramName: "file",
+                maxFilesize: 5, // MB
+                acceptedFiles: "image/*",
+                addRemoveLinks: true,
+                headers: {
+                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                },
+                init: function() {
+                    this.on("success", function(file, response) {
+                        file.serverId = response.id; // Store the server's file ID
+                    });
+
+                    // Load existing photos
+                    loadExistingPhotos();
+                }
+            });
+        });
+
+        function loadExistingPhotos() {
+            const existingPhotosContainer = document.getElementById('existing-photos');
+            if (!existingPhotosContainer) return;
+
+            @if(isset($memo) && isset($memo->foto))
+            let existingPhotos;
+            try {
+                existingPhotos = @json($memo->foto);
+            } catch (e) {
+                console.error('Error parsing existing photos:', e);
+                return;
+            }
+
+            if (Array.isArray(existingPhotos)) {
+                existingPhotos.forEach(function(photoPath) {
+                    if (typeof photoPath === 'string') {
+                        const photoDiv = document.createElement('div');
+                        photoDiv.className = 'col-md-3 mb-3';
+
+                        const img = document.createElement('img');
+                        img.src = photoPath;
+                        img.className = 'img-fluid';
+                        img.style.maxHeight = '150px';
+
+                        photoDiv.appendChild(img);
+                        existingPhotosContainer.appendChild(photoDiv);
+
+                        if (myDropzone) {
+                            let mockFile = { name: photoPath.split('/').pop(), size: 12345 };
+                            myDropzone.emit("addedfile", mockFile);
+                            myDropzone.emit("thumbnail", mockFile, photoPath);
+                            myDropzone.emit("complete", mockFile);
+                            mockFile.previewElement.classList.add("dz-success");
+                            mockFile.previewElement.classList.add("dz-complete");
+                        }
+                    }
+                });
+            } else {
+                console.error('Existing photos is not an array:', existingPhotos);
+            }
+            @endif
+        }
+
     function saveMemo() {
         const form = document.getElementById('form-memo');
         const formData = new FormData(form);
@@ -371,17 +442,26 @@
         const documentId = urlParams.get('documentId');
         const inspeksiId = urlParams.get('inspeksiId');
 
-        const requestUrl = `{{ route('penilai.storeMemo') }}`;
+        // Create a new FormData object to send both JSON and files
+        const sendFormData = new FormData();
+        sendFormData.append('permohonan_id', permohonanId);
+        sendFormData.append('document_id', documentId);
+        sendFormData.append('inspeksi_id', inspeksiId);
+        sendFormData.append('memo', JSON.stringify(jsonData));
+
+        // Append all files from Dropzone
+        myDropzone.getAcceptedFiles().forEach((file, index) => {
+            sendFormData.append(`foto_${index}`, file);
+        });
+
+        const requestUrl = `{{ route('penilai.storeMemoWithPhotos') }}`;
+
         $.ajax({
             url: requestUrl,
             type: 'POST',
-            data: JSON.stringify({
-                permohonan_id: permohonanId,
-                document_id: documentId,
-                inspeksi_id: inspeksiId,
-                memo: jsonData,
-            }),
-            contentType: 'application/json',
+            data: sendFormData,
+            processData: false,
+            contentType: false,
             headers: {
                 'X-CSRF-TOKEN': '{{ csrf_token() }}'
             },
@@ -409,17 +489,15 @@
                 console.log(response);
             },
             error: function(xhr, status, error) {
-                let errors = xhr.responseJSON?.errors;
-                $('.alert').text('');
-                if (errors) {
-                    $.each(errors, function(key, value) {
-                        $(`#error-${key}`).text(value[0]);
-                        toastrErrorBuild(value[0]);
-                    });
-                }
                 hideLoadingSwal();
-                console.log(errors);
+                Swal.fire({
+                    title: 'Error!',
+                    text: 'Terjadi kesalahan saat mengirim data',
+                    icon: 'error',
+                    confirmButtonText: 'OK'
+                });
             }
         });
     }
 </script>
+    @endpush
diff --git a/routes/web.php b/routes/web.php
index 3ad1790..2a52e40 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -616,7 +616,11 @@ Route::middleware(['auth'])->group(function () {
         Route::post('/preoses-laporan/{id}', [PenilaiController::class, 'storePenilaian'])->name('proses.laporan');
 
         Route::post('storeResume', [PenilaiController::class, 'storeResume'])->name('storeResume');
+
         Route::post('storeMemo', [PenilaiController::class, 'storeMemo'])->name('storeMemo');
+        Route::post('store-memo-with-photos', [PenilaiController::class, 'storeMemoWithPhotos'])->name('storeMemoWithPhotos');
+        Route::post('upload-temp-photo', [PenilaiController::class, 'uploadTempPhoto'])->name('uploadTempPhoto');
+
         Route::post('storeRap', [PenilaiController::class, 'storeRap'])->name('storeRap');
         Route::post('storeLpjSederhanadanStandard', [PenilaiController::class, 'storeLpjSederhanadanStandard'])->name('storeLpjSederhanadanStandard');
         Route::put('revisi-surveyor/{id}', [PenilaiController::class, 'revisiSurveyor'])->name('revisiSurveyor');

From d089419cfb8d165c74a0ae7b8f84aad1b01ea02d Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 09:55:00 +0700
Subject: [PATCH 6/8] feat(registrasi): tambahkan pilihan jenis laporan pada
 halaman registrasi

- Menambahkan dropdown untuk memilih jenis laporan.
- Opsi yang tersedia: Sederhana dan Standar.
- Memperbaiki struktur HTML untuk meningkatkan keterbacaan.
---
 resources/views/registrasi/show.blade.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/resources/views/registrasi/show.blade.php b/resources/views/registrasi/show.blade.php
index ccc4608..1c6e081 100644
--- a/resources/views/registrasi/show.blade.php
+++ b/resources/views/registrasi/show.blade.php
@@ -81,7 +81,19 @@
                                 </select>
                                 <em id="{{ $route[0] }}_region_msg" class="alert text-danger text-sm"></em>
                             </div>
-                        </div><br />
+                        </div>
+                        <div id="{{ $route[0] }}_div_jenis_laporan" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Jenis Laporan
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select class="inputku select" id="jenis_laporan" name="jenis_laporan">
+                                    <option value="sederhana">Sederhana</option>
+                                    <option value="standar">Standar</option>
+                                </select>
+                                <em id="jenis_laporan_msg" class="alert text-danger text-sm"></em>
+                            </div>
+                        </div>
                         <div id="{{ $route[0] }}_div_catatan2"
                             class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">

From e830ededf2a4f460b5d81ab8d6ff8e6d046c4f17 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 10:00:45 +0700
Subject: [PATCH 7/8] fix(spk): perbaiki margin pada tampilan KJPP

- Menghapus margin-left pada elemen KJPP di file documentSPK.blade.php
- Menghapus margin-left pada elemen KJPP di file edit.blade.php
---
 resources/views/spk/documentSPK.blade.php | 4 ++--
 resources/views/spk/edit.blade.php        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index 5b90e7a..0f75797 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -60,8 +60,8 @@
             </center>
             <br>
             <h3>Kepada</h3>
-            <p style="color: red; margin-left:25px">KJPP {{ $penawaran->kjpp_name }}</p>
-            <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
+            <p style="color: red;">KJPP {{ $penawaran->kjpp_name }}</p>
+            <p style="color: red;">{{ $penawaran->kjpp_address }}</p>
             <br/>
             <br/>
             <p style="text-align: justify;">
diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php
index 9309506..c814429 100644
--- a/resources/views/spk/edit.blade.php
+++ b/resources/views/spk/edit.blade.php
@@ -76,8 +76,8 @@
                         </center>
                         <br>
                         <h3>Kepada</h3>
-                        <p style="color: red; margin-left:25px">KJPP {{ $penawaran->kjpp_name }}</p>
-                        <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
+                        <p style="color: red;">KJPP {{ $penawaran->kjpp_name }}</p>
+                        <p style="color: red;">{{ $penawaran->kjpp_address }}</p>
                         <br/>
                         <br/>
                         <h3>Perihal: <b>Penunjukan sebagai Penyedia Jasa Penilaian Agunan</b></h3>

From b319abbabb5212279b22de3abc89bb5b44534178 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 7 Mar 2025 11:06:20 +0700
Subject: [PATCH 8/8] fix(permohonan): perbaiki tampilan keterangan pada form
 dan index

- Menambahkan registrasi_catatan ke dalam tampilan keterangan pada form permohonan.
- Memperbarui logika render keterangan di index untuk menyertakan registrasi_catatan jika ada.
---
 resources/views/permohonan/form.blade.php  |  2 +-
 resources/views/permohonan/index.blade.php | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index f5e8371..3d02dc9 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -93,7 +93,7 @@
                     @if(isset($permohonan) && $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>
+                            <em class="text-red-500">{{ $permohonan->keterangan }} {{ $permohonan->registrasi_catatan }}</em>
                         </div>
                     @endif
 
diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index 8e7a11a..82bc3cd 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -197,7 +197,17 @@
                     }
                 },
                 keterangan: {
-                    title: 'Keterangan'
+                    title: 'Keterangan',
+                    render : (item, data) => {
+
+                        let keterangan = data.keterangan ?? ""
+                        if(data.registrasi_catatan){
+                            if(keterangan) keterangan += "\n";
+                            keterangan += data.registrasi_catatan;
+                        }
+
+                        return keterangan
+                    }
                 },
                 actions: {
                     title: 'Actions',