diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index 569f067..b51161f 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -28,7 +28,7 @@ function formatTanggalIndonesia($date, $time = false)
     } catch (\Throwable $e) {
         return $date;
     }
-    
+
 }
 
 
@@ -562,3 +562,31 @@ function ubahNomorHp($nomorHp) {
         return "Nomor HP tidak valid";
     }
 }
+
+function parsePembandingMigration($keterangan) {
+
+   $keterangan = preg_replace('/[-]{5,}/', '',$keterangan);   // Hapus ------
+   $keterangan = preg_replace('/[.]{5,}/', '',$keterangan);   // Hapus .....
+
+   $keterangan = preg_replace('/\s+/', ' ',$keterangan);
+   $keterangan = preg_replace('/\s*\n\s*/', "\n",$keterangan);
+
+    // Pecah teks per baris untuk diproses
+    $lines = explode("\n",$keterangan);
+    $cleaned = [];
+
+    foreach ($lines as $line) {
+        $line = trim($line);
+        if (!empty($line)) {
+            // Format angka dalam format Rp. 123.456.789
+            $line = preg_replace_callback('/Rp\.\s*([\d.,]+)/', function($matches) {
+                $angka = str_replace(['.', ','], '', $matches[1]);
+                return 'Rp. ' . number_format((int)$angka, 0, ',', '.');
+            }, $line);
+
+            $cleaned[] = $line;
+        }
+    }
+
+    return implode("\n", $cleaned);
+}
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 8c04b89..34138c0 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -306,6 +306,7 @@ class ActivityController extends Controller
         $query = Permohonan::query();
 
         // Apply search filter if provided
+        $query = $query->orderBy('nomor_registrasi', 'desc');
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
             $query->where(function ($q) use ($search) {
@@ -324,7 +325,9 @@ class ActivityController extends Controller
             });
         }
 
-        // Default sorting if no sort provided
+
+
+        // Apply sorting if provided
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
@@ -333,20 +336,13 @@ class ActivityController extends Controller
             $query->orderBy('nomor_registrasi', 'asc');
         }
 
-        // Get total count of records before pagination
+        // Get the total count of records
         $totalRecords = $query->count();
-
-        // Pagination
-        if ($request->has('page') && $request->has('size')) {
-            $page = (int) $request->get('page', 1);
-            $size = (int) $request->get('size', 10);
-            $offset = ($page - 1) * $size;
-            $query->skip($offset)->take($size);
+        $size         = $request->get('size', 10);
+        if ($size == 0) {
+            $size = 10;
         }
 
-        // Get filtered count
-        $filteredRecords = $query->count();
-
         // Filter by region if user is senior-officer
         if ($regionId) {
             $query->whereHas('region', function ($q) use ($regionId) {
@@ -361,37 +357,36 @@ class ActivityController extends Controller
             });
         }
 
-        $totalRecords = $query->count();
 
-        // Pagination
+
+        // Apply pagination if provided
         if ($request->has('page') && $request->has('size')) {
-            $page = (int) $request->get('page', 1);
-            $size = (int) $request->get('size', 10);
-            $offset = ($page - 1) * $size;
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
             $query->skip($offset)->take($size);
         }
 
-        // Get filtered count
+        // Get the filtered count of records
         $filteredRecords = $query->count();
 
         // Get data with necessary relationships
         $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan','nilaiPlafond'])->get();
 
-        // Calculate total pages
-        $pageCount = ceil($totalRecords / $request->get('size', 10));
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $size);
 
+        // Calculate the current page number
+        $currentPage = max(1, $request->get('page', 1));
 
-
-
-        // Calculate total pages
-        $pageCount = ceil($totalRecords / $request->get('size', 10));
-
+        // Return the response data as a JSON object
         return response()->json([
             'draw'            => $request->get('draw'),
             'recordsTotal'    => $totalRecords,
             'recordsFiltered' => $filteredRecords,
             'pageCount'       => $pageCount,
-            'page'            => $request->get('page', 1),
+            'page'            => $currentPage,
             'totalCount'      => $totalRecords,
             'data'            => $data,
         ]);
diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php
index 44fbcc9..2bfc381 100644
--- a/app/Http/Controllers/DokumenJaminanController.php
+++ b/app/Http/Controllers/DokumenJaminanController.php
@@ -406,7 +406,9 @@
 
 
                 // Remove values from $legalitasJaminan that are in $currentLegalitasJaminan
-                $legalitasJaminan = array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray());
+                $legalitasJaminan = is_array($legalitasJaminan)
+                ? array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray())
+                : [];
 
                 $legalitas = JenisLegalitasJaminan::whereIn('code', $legalitasJaminan)->get();
             }
diff --git a/app/Http/Controllers/LaporanPenilaiJaminanController.php b/app/Http/Controllers/LaporanPenilaiJaminanController.php
index 1832dd1..6af0f1e 100644
--- a/app/Http/Controllers/LaporanPenilaiJaminanController.php
+++ b/app/Http/Controllers/LaporanPenilaiJaminanController.php
@@ -93,7 +93,7 @@ class LaporanPenilaiJaminanController extends Controller
         // dd($startDate);
         // Retrieve data from the database
         $query = Permohonan::query();
-
+        $query = $query->orderBy('nomor_registrasi', 'desc');
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
@@ -107,7 +107,7 @@ class LaporanPenilaiJaminanController extends Controller
                   ->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%')
                   ->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
 
-                  if (!empty($paramsSearch->tanggal_awal) && !empty($paramsSearch->tanggal_akhir)) {
+                if (!empty($paramsSearch->tanggal_awal) && !empty($paramsSearch->tanggal_akhir)) {
                     $q->whereBetween('tanggal_permohonan', [$paramsSearch->tanggal_awal, $paramsSearch->tanggal_akhir]);
                 }
 
@@ -122,62 +122,50 @@ class LaporanPenilaiJaminanController extends Controller
 
 
 
-        // Default sorting if no sort provided
+        // Apply sorting if provided
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
             $query->orderBy($column, $order);
-        } else {
-            $query->orderBy('nomor_registrasi', 'asc');
         }
 
-        // Get total count of records before pagination
-        $totalRecords = $query->count();
 
-        // Pagination
+        // Get the total count of records
+        $totalRecords = $query->count();
+        $size         = $request->get('size', 10);
+        if ($size == 0) {
+            $size = 10;
+        }
+
+        // Apply pagination if provided
         if ($request->has('page') && $request->has('size')) {
-            $page = (int) $request->get('page', 1);
-            $size = (int) $request->get('size', 10);
-            $offset = ($page - 1) * $size;
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
             $query->skip($offset)->take($size);
         }
 
-        // Get filtered count
+        // Get the filtered count of records
         $filteredRecords = $query->count();
 
 
-
-        $totalRecords = $query->count();
-
-        // Pagination
-        if ($request->has('page') && $request->has('size')) {
-            $page = (int) $request->get('page', 1);
-            $size = (int) $request->get('size', 10);
-            $offset = ($page - 1) * $size;
-            $query->skip($offset)->take($size);
-        }
-
-        // Get filtered count
-        $filteredRecords = $query->count();
-
         // Get data with necessary relationships
         $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan','nilaiPlafond', 'penilai'])->get();
 
-        // Calculate total pages
-        $pageCount = ceil($totalRecords / $request->get('size', 10));
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $size);
 
+        // Calculate the current page number
+        $currentPage = max(1, $request->get('page', 1));
 
-
-
-        // Calculate total pages
-        $pageCount = ceil($totalRecords / $request->get('size', 10));
-
+        // Return the response data as a JSON object
         return response()->json([
             'draw'            => $request->get('draw'),
             'recordsTotal'    => $totalRecords,
             'recordsFiltered' => $filteredRecords,
             'pageCount'       => $pageCount,
-            'page'            => $request->get('page', 1),
+            'page'            => $currentPage,
             'totalCount'      => $totalRecords,
             'data'            => $data,
         ]);
diff --git a/database/seeders/MasterDataSurveyorSeeder.php b/database/seeders/MasterDataSurveyorSeeder.php
index 2552be0..c0cc080 100644
--- a/database/seeders/MasterDataSurveyorSeeder.php
+++ b/database/seeders/MasterDataSurveyorSeeder.php
@@ -12,10 +12,34 @@ class MasterDataSurveyorSeeder extends Seeder
     public function run(): void
     {
 
-        $nameTable =[
-            'faasilitas'
-        ]
+        $nameTable = [
+            'fasilitas_objek',
+            'gol_mas_sekitar',
+            'jenis_bangunan',
+            'jenis_kapal',
+            'jenis_kendaraan',
+            'jenis_pesawat',
+            'kondisi_bangunan',
+            'kondisi_fisik_tanah',
+            'kontur_tanah',
+            'lalu_lintas_lokasi',
+            'lantai',
+            'merupakan_daerah',
+            'perkerasan_jalan',
+            'sifat_bangunan',
+            'model_alat_berat',
+            'posisi_kavling',
+            'posisi_unit',
+            'tingkat_keramaian',
+            'sarana_pelengkap',
+            'spek_kategori_bangunan',
+            'spek_bangunan',
+            'terletak_diarea',
+            'view_unit'
+        ];
 
-        DB::unprepared(file_get_contents(__DIR__ . '/sql/teams.sql'));
+        foreach ($nameTable as $table) {
+            DB::unprepared(file_get_contents(__DIR__ . '/sql/' . $table . '.sql'));
+        }
     }
 }
diff --git a/database/seeders/MigrationPembandingSeeder.php b/database/seeders/MigrationPembandingSeeder.php
index 89df7c7..690b51d 100644
--- a/database/seeders/MigrationPembandingSeeder.php
+++ b/database/seeders/MigrationPembandingSeeder.php
@@ -12,17 +12,17 @@ use Modules\Lpj\Models\Permohonan;
 
 class MigrationPembandingSeeder extends Seeder
 {
-    protected $errorLogFile = __DIR__ . '/csv/inspeksi/mig_penilai_pembanding_error_2.csv';
+    protected $errorLogFile = __DIR__ . '/csv/inspeksi/mig_penilai_pembanding_error.csv';
     /**
      * Run the database seeds.
      */
     public function run()
     {
         // Path ke file csv
-        $filePath = realpath(__DIR__ . '/csv/inspeksi/mig_penilai_pembanding_2.csv');
+        $filePath = realpath(__DIR__ . '/csv/inspeksi/mig_penilai_pembanding.csv');
 
         if (!$filePath) {
-            Log::error('File csv tidak ditemukan: ' . __DIR__ . '/csv/inspeksi/mig_penilai_pembanding_2.csv');
+            Log::error('File csv tidak ditemukan: ' . __DIR__ . '/csv/inspeksi/mig_penilai_pembanding.csv');
             $this->command->error('File csv tidak ditemukan.');
             return;
         }
@@ -141,9 +141,10 @@ class MigrationPembandingSeeder extends Seeder
             // Pastikan kolom penting tersedia
             $urutan = (int)($row['mig_urutan'] ?? 999);
             $sumber = trim($row['mig_keterangan'] ?? '');
+            $pembanding = trim($row['mig_pembanding'] ?? '');
             $linkGambar = trim($row['mig_path'] ?? '');
 
-            if (empty($sumber) || empty($linkGambar)) {
+            if (empty($pembanding) || empty($linkGambar)) {
                 continue;
             }
 
@@ -151,6 +152,7 @@ class MigrationPembandingSeeder extends Seeder
             $pembandingList[] = [
                 'urutan' => $urutan,
                 'sumber' => $sumber,
+                'keterangan' => $pembanding,
                 'foto_objek' => $linkGambar
             ];
         }
diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php
index 220c55f..f47b286 100644
--- a/resources/views/activity/activitydetail.blade.php
+++ b/resources/views/activity/activitydetail.blade.php
@@ -38,7 +38,7 @@
                         Pemohon:
                     </h3>
                     <span class="text-2sm text-gray-700">
-                        {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+                        {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }}
                     </span>
                 </div>
 
diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php
index e42982d..3a68810 100644
--- a/resources/views/component/detail-jaminan.blade.php
+++ b/resources/views/component/detail-jaminan.blade.php
@@ -46,7 +46,7 @@
                     Pemohon:
                 </h3>
                 <span class="text-2sm text-gray-700">
-                    {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+                    {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }}
                 </span>
             </div>
 
@@ -84,7 +84,7 @@
                         Nilai Plafond:
                     </h3>
                     <span class="text-2sm text-gray-700">
-                    {{ $permohonan->nilaiPlafond->name }}
+                    {{ $permohonan->nilaiPlafond->name ?? '' }}
                 </span>
                 </div>
 
@@ -293,7 +293,7 @@
                                             <tr>
                                                 <td>
                                                     <span class="text-2xs text-gray-600 uppercase pl-3">
-                                                        {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] }}
+                                                        {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] ?? '' }}
                                                     </span>
                                                 </td>
                                                 <td class="text-left">
diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 8cb86f0..1b7848a 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -17,7 +17,7 @@
                         @foreach ($value as $key => $item)
                             @if (!empty($item))
                                 <tr>
-                                    <td style="padding: 2px;">
+                                    <td style="padding: 2px;" style="width:25%;">
                                         {{ formatLabel($key) }}
                                     </td>
                                     <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php
index 9853fbf..c1985d6 100644
--- a/resources/views/debitur/components/jaminan.blade.php
+++ b/resources/views/debitur/components/jaminan.blade.php
@@ -95,7 +95,7 @@
                         @foreach($dokumen_jaminan as $index => $dokumen)
                             <div class="flex items-center justify-between flex-wrap my-2.5 gap-2">
                                 <span class="text-2xs text-gray-600 uppercase pl-3">
-                                          {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] }}
+                                          {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] ?? '' }}
                                     </span>
                                 <div>
                                     @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
diff --git a/resources/views/laporan-penilai-jaminan/index.blade.php b/resources/views/laporan-penilai-jaminan/index.blade.php
index 7d29a7c..c378220 100644
--- a/resources/views/laporan-penilai-jaminan/index.blade.php
+++ b/resources/views/laporan-penilai-jaminan/index.blade.php
@@ -157,11 +157,7 @@
                                         <span class="sort-icon"></span>
                                     </span>
                                 </th>
-                                <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_id">
-                                    <span class="sort"><span class="sort-label">Jenis Jaminan</span>
-                                        <span class="sort-icon"></span>
-                                    </span>
-                                </th>
+
                                 <th class="min-w-[150px]" data-datatable-column="laporan">
                                     <span class="sort"><span class="sort-label">Laporan</span>
                                         <span class="sort-icon"></span>
@@ -265,13 +261,7 @@
                             `${data.tujuan_penilaian.name}` : '-';
                     },
                 },
-                jenis_jaminan_id: {
-                    title: 'Jenis Jaminan',
-                    render: (item, data) => {
-                        const jenisJaminan = data.dokumenjaminan.map(d => d.jenis_jaminan.name).join(', ');
-                        return jenisJaminan || '-';
-                    }
-                },
+
                 laporan: {
                     title: 'Status',
                     render: (item, data) => {
diff --git a/resources/views/pemilik_jaminan/form.blade.php b/resources/views/pemilik_jaminan/form.blade.php
index 12f9ffe..2ce0a27 100644
--- a/resources/views/pemilik_jaminan/form.blade.php
+++ b/resources/views/pemilik_jaminan/form.blade.php
@@ -37,7 +37,15 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <input type="hidden" name="debiture_id" value="{{ $debitur->id ?? '' }}">
-                            <p class="text-base text-gray-700">{{ $debitur->name }} | {{ $debitur->address.', '.$debitur->village->name.', '.$debitur->city->name.', '.$debitur->province->name.', '.$debitur->postal_code }}</p>
+                            <p class="text-base text-gray-700">
+                                {{ $debitur->name ?? '' }} | {{ $debitur->address ?? '' }}
+                                {{ $debitur->village?->name ?? '' }}
+                                {{ $debitur->city?->name ?? '' }}
+                                {{ $debitur->province?->name ?? '' }}
+                                {{ $debitur->country?->name ?? '' }},
+                                {{ $debitur->postal_code ?? '' }}
+                            </p>
+
                         </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
diff --git a/resources/views/penilai/components/analisa/informasi.blade.php b/resources/views/penilai/components/analisa/informasi.blade.php
index bc711cf..ef95741 100644
--- a/resources/views/penilai/components/analisa/informasi.blade.php
+++ b/resources/views/penilai/components/analisa/informasi.blade.php
@@ -34,6 +34,7 @@
         </td>
     </tr>
 
+
     @if (!empty($forminspeksi['fakta']['keterangan']))
         <tr>
             <td width="25%" style="vertical-align: top;">Catatan yang Perlu
@@ -56,6 +57,7 @@
                     </table>
                 @endif
             </td>
+
         </tr>
     @endif
 </table>
diff --git a/resources/views/penilai/components/analisa/lingkungan.blade.php b/resources/views/penilai/components/analisa/lingkungan.blade.php
index cd37bdb..e2a2eef 100644
--- a/resources/views/penilai/components/analisa/lingkungan.blade.php
+++ b/resources/views/penilai/components/analisa/lingkungan.blade.php
@@ -35,41 +35,50 @@
         <td style="padding: 2px; vertical-align: top;">:</td>
         <td style="padding: 2px; vertical-align: top;">{{ $lingkungan['lebar_perkerasan_jalan'] ?? '-' }} m</td>
     </tr>
+    {{-- mulai --}}
     <tr>
         <td style="padding: 2px; vertical-align: top;">Perkerasan Jalan</td>
         <td style="padding: 2px; vertical-align: top;">:
         </td>
         <td style="padding: 2px; vertical-align: top;">
-            {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? ['-']) }}
+            {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? $lingkungan['perkerasan_jalan'] ?? ['-']) }}
         </td>
     </tr>
 
     <tr>
         <td style="padding: 2px; vertical-align: top;">Lalu Lintas</td>
         <td style="padding: 2px; vertical-align: top;">:</td>
-        <td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['lalu_lintas'] ?? ['-']) }}
+        <td style="padding: 2px; vertical-align: top;">{{
+            $lingkungan['lalu_lintas']
+                ? (is_array($lingkungan['lalu_lintas'])
+                    ? implode(', ', $lingkungan['lalu_lintas'])
+                    : $lingkungan['lalu_lintas'])
+                : '-'
+        }}
         </td>
     </tr>
     <tr>
         <td style="padding: 2px; vertical-align: top;">Golongan Masyarakat Sekitar</td>
         <td style="padding: 2px; vertical-align: top;">:</td>
-        <td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ['-']) }}
+        <td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? $lingkungan['gol_mas_sekitar'] ?? ['-']) }}
         </td>
     </tr>
     <tr>
         <td style="padding: 2px; vertical-align: top;">Tingkat Keramaian</td>
         <td style="padding: 2px; vertical-align: top;">:</td>
         <td style="padding: 2px; vertical-align: top;">
-            {{ implode(', ', $lingkungan['tingkat_keramaian'] ?? ['-']) }}
+            {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? $lingkungan['tingkat_keramaian'] ?? ['-']) }}
         </td>
     </tr>
     <tr>
         <td style="padding: 2px; vertical-align: top;">Terletak di Area</td>
         <td style="padding: 2px; vertical-align: top;">:</td>
         <td style="padding: 2px; vertical-align: top;">
-            {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? ['-']) }}
+            {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? $lingkungan['terletak_diarea'] ?? ['-']) }}
         </td>
     </tr>
+
+    {{-- batas --}}
     <tr>
         <td style="padding: 2px; vertical-align: top;">Kondisi Bangunan Sekitar</td>
         <td style="padding: 2px; vertical-align: top;">:</td>
diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php
index bf37584..4bd01bf 100644
--- a/resources/views/penilai/components/header.blade.php
+++ b/resources/views/penilai/components/header.blade.php
@@ -84,7 +84,10 @@
             position: relative;
             z-index: 1;
         }
-
+        .break-before {
+        page-break-before: always;
+        break-before: page;
+    }
         .border {
             border: 1px solid #000;
         }
@@ -93,10 +96,11 @@
         page-break-inside: avoid;
         page-break-before: auto;
         page-break-after: auto;
+
     }
     </style>
 </head>
-@php
+{{-- @php
     $data = '';
     foreach ($permohonan->documents as $dokumen) {
         $data .= $dokumen->jenisJaminan->name . ', ';
@@ -126,7 +130,7 @@
     $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
 
     $data = rtrim($data, ', ');
-@endphp
+@endphp --}}
 
 <body style="width: 90%; margin: auto;">
 
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 3ebc2f9..656e7d8 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -11,7 +11,8 @@
 <main class="content">
     <div style="text-align: center; margin-top: 5px;">
         <h4 style="text-transform: uppercase; font-size: 16px; margin: 0;">LAPORAN PENILAIAN ATAS
-            {{ $data }}</h4>
+            {{ $data }}
+        </h4>
         <p style="font-size: 12px; margin: 5px 0;">NO: {{ $nomorLaporan }}</p>
     </div>
     <hr />
@@ -35,13 +36,14 @@
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Permintaan Cabang</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->debiture->branch->name ?? '' }}
+                        <td style="padding: 2px; vertical-align: top;">
+                            {{ $permohonan->debiture->branch->name ?? '' }}
                         </td>
                     </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Permintaan (AO)</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name }}</td>
+                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name ?? '-' }}</td>
                     </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">No Order</td>
@@ -597,35 +599,41 @@
                         <td style="padding: 2px; vertical-align: top;">:
                         </td>
                         <td style="padding: 2px; vertical-align: top;">
-                            {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? ['-']) }}
+                            {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? $lingkungan['perkerasan_jalan'] ?? ['-']) }}
                         </td>
                     </tr>
 
-                    <tr>
-                        <td style="padding: 2px; vertical-align: top;">Lalu Lintas</td>
-                        <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">
-                            {{ implode(', ', $lingkungan['lalu_lintas'] ?? ['-']) }}</td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 2px; vertical-align: top;">Golongan Masyarakat Sekitar</td>
-                        <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">
-                            {{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ['-']) }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 2px; vertical-align: top;">Tingkat Keramaian</td>
-                        <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">
-                            {{ implode(', ', $lingkungan['tingkat_keramaian'] ?? ['-']) }}
-                        </td>
-                    </tr>
-                    <tr>
+
+    <tr>
+        <td style="padding: 2px; vertical-align: top;">Lalu Lintas</td>
+        <td style="padding: 2px; vertical-align: top;">:</td>
+        <td style="padding: 2px; vertical-align: top;">{{
+            $lingkungan['lalu_lintas']
+                ? (is_array($lingkungan['lalu_lintas'])
+                    ? implode(', ', $lingkungan['lalu_lintas'])
+                    : $lingkungan['lalu_lintas'])
+                : '-'
+        }}
+        </td>
+    </tr>
+    <tr>
+        <td style="padding: 2px; vertical-align: top;">Golongan Masyarakat Sekitar</td>
+        <td style="padding: 2px; vertical-align: top;">:</td>
+        <td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? $lingkungan['gol_mas_sekitar'] ?? ['-']) }}
+        </td>
+    </tr>
+    <tr>
+        <td style="padding: 2px; vertical-align: top;">Tingkat Keramaian</td>
+        <td style="padding: 2px; vertical-align: top;">:</td>
+        <td style="padding: 2px; vertical-align: top;">
+            {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? $lingkungan['tingkat_keramaian'] ?? ['-']) }}
+        </td>
+    </tr>
+                    <   <tr>
                         <td style="padding: 2px; vertical-align: top;">Terletak di Area</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">
-                            {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? ['-']) }}
+                            {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? $lingkungan['terletak_diarea'] ?? ['-']) }}
                         </td>
                     </tr>
                     <tr>
@@ -779,6 +787,10 @@
                                 </div>
                             </td>
                         </tr>
+
+                        @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
+
+
                         <tr>
                             <td colspan="3" style="padding: 8px; text-align: left; font-weight: bold;">
                                 b. Total Nilai Likuidasi
@@ -796,6 +808,7 @@
                                 {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
                             </td>
                         </tr>
+                        @endif
                     </table>
                 </td>
             </tr>
@@ -810,6 +823,7 @@
             </tr>
             <tr>
                 <table>
+                    @if (isset($forminspeksi['fakta']['fakta_positif']) && count($forminspeksi['fakta']['fakta_positif']) > 0)
                     <tr>
                         <td width="25%" style="vertical-align: top;"><strong>Faktor Positif</strong></td>
                         <td>
@@ -824,6 +838,8 @@
                             @endisset
                         </td>
                     </tr>
+                    @endif
+                    @if (isset($forminspeksi['fakta']['fakta_negatif']) && count($forminspeksi['fakta']['fakta_negatif']) > 0)
                     <tr>
                         <td width="25%" style="vertical-align: top;"><strong>Faktor Negatif</strong></td>
                         <td>
@@ -838,6 +854,8 @@
                             @endisset
                         </td>
                     </tr>
+                    @endif
+                    @if (isset($forminspeksi['fakta']['batas_batas_input']) && count($forminspeksi['fakta']['batas_batas_input']) > 0)
                     <tr>
                         <td width="25%" style="vertical-align: top;"><strong>Batas batas</strong></td>
                         <td>
@@ -848,6 +866,7 @@
                             @endforeach
                         </td>
                     </tr>
+                    @endif
                     <tr>
                         <td width="25%" style="vertical-align: top;"><strong>Informasi Dinas Tata Ruang</strong>
                         </td>
@@ -940,29 +959,32 @@
             <tr>
                 <table style="width: 100%; border-collapse: collapse; text-align: center;">
                     @php
-                        use Modules\Usermanagement\Models\User;
-                        $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
-                        $imagePathPenilai = storage_path(
-                            'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign,
-                        );
+                use Modules\Usermanagement\Models\User;
 
-                        $soUser = User::where('id', $senior_officer->id)->first();
-                        $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
+                // Penilai
+                $penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null;
+                $imagePathPenilai = $penilaiUser && $penilaiUser->sign
+                    ? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign)
+                    : null;
 
-                        $imagePathEO = storage_path(
-                            'app/public/signatures/' .
-                                User::role('EO Appraisal')->first()->id .
-                                '/' .
-                                User::role('EO Appraisal')->first()->sign,
-                        );
+                // Senior Officer
+                $soUser = $permohonan->approval_so ? User::find($permohonan->approval_so) : null;
+                $imagePathSo = $soUser && $soUser->sign
+                    ? storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign)
+                    : null;
 
-                        $imagePathDD = storage_path(
-                            'app/public/signatures/' .
-                                User::role('DD Appraisal')->first()->id .
-                                '/' .
-                                User::role('DD Appraisal')->first()->sign,
-                        );
-                    @endphp
+                // Executive Officer
+                $eoUser = $permohonan->approval_eo ? User::find($permohonan->approval_eo) : null;
+                $imagePathEO = $eoUser && $eoUser->sign
+                    ? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign)
+                    : null;
+
+                // Deputy Director
+                $ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null;
+                $imagePathDD = $ddUser && $ddUser->sign
+                    ? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign)
+                    : null;
+            @endphp
                     <tr>
                         <td style=" padding: 4px;height: 50px">
                             @if (file_exists($imagePathPenilai))
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php
index 791fdf8..0e4172c 100644
--- a/resources/views/penilai/components/print-out-standar.blade.php
+++ b/resources/views/penilai/components/print-out-standar.blade.php
@@ -324,6 +324,7 @@
             </tr>
 
             <!-- Total Nilai Likuidasi -->
+            @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
             <tr>
                 <td colspan="3" style="padding: 8px; text-align: left">
                     2. Total Nilai Likuidasi
@@ -341,6 +342,7 @@
                     {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
                 </td>
             </tr>
+            @endif
         </table>
     </div>
     @php
@@ -375,27 +377,29 @@
             @php
                 use Modules\Usermanagement\Models\User;
 
-                $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
-                $imagePathPenilai = storage_path(
-                    'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign,
-                );
+                // Penilai
+                $penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null;
+                $imagePathPenilai = $penilaiUser && $penilaiUser->sign
+                    ? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign)
+                    : null;
 
-                $soUser = User::where('id', $senior_officer->id)->first();
-                $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
+                // Senior Officer
+                $soUser = $permohonan->approval_so ? User::find($permohonan->approval_so) : null;
+                $imagePathSo = $soUser && $soUser->sign
+                    ? storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign)
+                    : null;
 
-                $imagePathEO = storage_path(
-                    'app/public/signatures/' .
-                        User::role('EO Appraisal')->first()->id .
-                        '/' .
-                        User::role('EO Appraisal')->first()->sign,
-                );
+                // Executive Officer
+                $eoUser = $permohonan->approval_eo ? User::find($permohonan->approval_eo) : null;
+                $imagePathEO = $eoUser && $eoUser->sign
+                    ? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign)
+                    : null;
 
-                $imagePathDD = storage_path(
-                    'app/public/signatures/' .
-                        User::role('DD Appraisal')->first()->id .
-                        '/' .
-                        User::role('DD Appraisal')->first()->sign,
-                );
+                // Deputy Director
+                $ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null;
+                $imagePathDD = $ddUser && $ddUser->sign
+                    ? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign)
+                    : null;
             @endphp
             <tr>
                 <td style=" padding: 4px;height: 50px">
diff --git a/resources/views/penilai/components/print-pembanding.blade.php b/resources/views/penilai/components/print-pembanding.blade.php
index 3458fbf..3457f2c 100644
--- a/resources/views/penilai/components/print-pembanding.blade.php
+++ b/resources/views/penilai/components/print-pembanding.blade.php
@@ -11,7 +11,8 @@
                     }
                 }
 
-                $fields = [
+                if ($inspeksi->is_mig != 1) {
+                    $fields = [
                     'jenis_aset' => 'Jenis properti',
                     'hak_properti' => 'Status Hak Tanah',
                     'address' => 'Alamat Lokasi',
@@ -22,16 +23,28 @@
                     'luas_bangunan' => 'Luas Bangunan',
                     'tanggal' => 'Tanggal Data',
                     'kordinat' => 'Titik Kordinat',
-                ];
+                    ];
+                }
+
             @endphp
 
-            @foreach ($exportData as $index => $data)
+            @foreach (array_slice($exportData, 0, 3) as $index => $data)
                 <table style="width: 100%; margin-bottom: 15px; border-bottom: 1px solid #ddd;">
                     <tr>
                         <td style="font-weight: bold; padding-bottom: 8px;">
                             Pembanding {{ substr($index, -1) }}
                         </td>
                     </tr>
+
+                    @if ($inspeksi->is_mig == 1)
+                    <tr>
+                        <td style="width: 33%; vertical-align: top;">Keterangan</td>
+                        <td style="width: 5%; vertical-align: top;">:</td>
+                        <td style="width: 62%;">
+                            {{isset($data['keterangan']) ? parsePembandingMigration($data['keterangan']) : '' }}
+                        </td>
+                    </tr>
+                    @else
                     @foreach ($fields as $key => $label)
                         <tr>
                             <td style="width: 33%;">{{ $label }}</td>
@@ -63,6 +76,7 @@
                             </td>
                         </tr>
                     @endforeach
+                    @endif
                 </table>
             @endforeach
         </td>
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index 853834f..d0730bc 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -321,7 +321,7 @@
                             </div>
                         </div>
 
-                        @if($permohonan->jenisPenilaian->name=="Eksternal")
+                        {{-- @if($permohonan->jenisPenilaian->name=="Eksternal")
                             @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
                                 <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
                                     <button class="dropdown-toggle btn btn-primary">
@@ -358,7 +358,7 @@
                                     </div>
                                 </div>
                             @endif
-                        @endif
+                        @endif --}}
                         @endif
                     </div>
 
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index cf027b1..bfc3038 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -216,7 +216,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,3,4]) && $permohonan->status === 'proses-paparan')
+                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2, 3, 4]) && $permohonan->status === 'proses-paparan')
                             <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
@@ -224,7 +224,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]) &&$permohonan->status === 'proses-paparan')
+                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [2, 4]) &&$permohonan->status === 'proses-paparan')
                             <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index a0d8dec..11e7dfa 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -150,13 +150,13 @@
                 user_id: {
                     title: 'User Pemohon',
                     render: (item, data) => {
-                        return `${data.user.name}`;
+                        return `${data?.user?.name || '-'}`;
                     },
                 },
                 branch_id: {
                     title: 'Cabang Pemohon',
                     render: (item, data) => {
-                        return `${data.branch.name}`;
+                        return `${data?.branch?.name || '-'}`;
                     },
                 },
                 debitur_id: {
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 032bbb1..6cc802c 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -51,7 +51,7 @@
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Tanggal Survey</label>
                 <div class="flex flex-wrap items-base line w-full">
-                    <p class="text-2sm text-gray-700">{{ $permohonan->created_at->format('d/m/Y') }}</p>
+                    <p class="text-2sm text-gray-700"> {{ $permohonan->created_at ? $permohonan->created_at->format('d/m/Y') : '' }}</p>
                 </div>
             </div>
 
diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php
index ddc0603..a7d9272 100644
--- a/resources/views/surveyor/components/inspeksi.blade.php
+++ b/resources/views/surveyor/components/inspeksi.blade.php
@@ -81,10 +81,12 @@
     </div>
     @php
         use Modules\Usermanagement\Models\User;
-        $cabangUser = User::where('id', $permohonan->user->id)->first();
+        $cabangUser = null;
 
+        if ($permohonan->user) {
+            $cabangUser = User::where('id', $permohonan->user->id)->first();
+        }
         // print_r($cabangUser->sign);
-
     @endphp
 @endsection
 
@@ -95,122 +97,122 @@
         console.log(datas);
         document.addEventListener('DOMContentLoaded', function() {
             const signaturePads = {};
-    const types = ['penilai', 'cabang', 'debitur', 'kjpp'];
+            const types = ['penilai', 'cabang', 'debitur', 'kjpp'];
 
-    // Initialize all signature pads
-    types.forEach(type => initSignaturePad(type));
+            // Initialize all signature pads
+            types.forEach(type => initSignaturePad(type));
 
-    function initSignaturePad(type) {
-        const canvas = document.getElementById(`signature-pad-${type}`);
-        if (!canvas) return;
+            function initSignaturePad(type) {
+                const canvas = document.getElementById(`signature-pad-${type}`);
+                if (!canvas) return;
 
-        // Improved canvas sizing with strict boundary control
-        function resizeCanvas() {
-            const container = canvas.closest('.signature-pad-container');
-            const containerWidth = container.clientWidth;
+                // Improved canvas sizing with strict boundary control
+                function resizeCanvas() {
+                    const container = canvas.closest('.signature-pad-container');
+                    const containerWidth = container.clientWidth;
 
-            // Set canvas style dimensions
-            canvas.style.width = '100%';
-            canvas.style.height = `${containerWidth * 0.5}px`; // 2:1 aspect ratio
+                    // Set canvas style dimensions
+                    canvas.style.width = '100%';
+                    canvas.style.height = `${containerWidth * 0.5}px`; // 2:1 aspect ratio
 
-            // Set actual canvas dimensions with high DPI support
-            const ratio = window.devicePixelRatio || 1;
-            canvas.width = containerWidth * ratio;
-            canvas.height = (containerWidth * 0.5) * ratio;
+                    // Set actual canvas dimensions with high DPI support
+                    const ratio = window.devicePixelRatio || 1;
+                    canvas.width = containerWidth * ratio;
+                    canvas.height = (containerWidth * 0.5) * ratio;
 
-            // Scale canvas context
-            const ctx = canvas.getContext('2d');
-            ctx.scale(ratio, ratio);
+                    // Scale canvas context
+                    const ctx = canvas.getContext('2d');
+                    ctx.scale(ratio, ratio);
 
-            // Clear and redraw existing signature if any
-            if (signaturePads[type] && !signaturePads[type].isEmpty()) {
-                const signaturePad = signaturePads[type];
-                const imageData = signaturePad.toData();
-                signaturePad.clear();
-                signaturePad.fromData(imageData);
-            }
-        }
-
-        // Create signature pad with boundary and scaling control
-        const signaturePad = new SignaturePad(canvas, {
-            backgroundColor: 'rgba(255, 255, 255, 0)',
-            penColor: 'rgb(0, 0, 0)',
-            minWidth: 0.5,
-            maxWidth: 2.5,
-            throttle: 16,
-            dotSize: 2,
-
-            // Custom function to control signature drawing
-            onBegin: (event) => {
-                const ctx = canvas.getContext('2d');
-                const rect = canvas.getBoundingClientRect();
-                const scaleX = canvas.width / rect.width;
-                const scaleY = canvas.height / rect.height;
-
-                // Ensure drawing stays within canvas
-                if (
-                    event.clientX < rect.left ||
-                    event.clientX > rect.right ||
-                    event.clientY < rect.top ||
-                    event.clientY > rect.bottom
-                ) {
-                    return false;
+                    // Clear and redraw existing signature if any
+                    if (signaturePads[type] && !signaturePads[type].isEmpty()) {
+                        const signaturePad = signaturePads[type];
+                        const imageData = signaturePad.toData();
+                        signaturePad.clear();
+                        signaturePad.fromData(imageData);
+                    }
                 }
+
+                // Create signature pad with boundary and scaling control
+                const signaturePad = new SignaturePad(canvas, {
+                    backgroundColor: 'rgba(255, 255, 255, 0)',
+                    penColor: 'rgb(0, 0, 0)',
+                    minWidth: 0.5,
+                    maxWidth: 2.5,
+                    throttle: 16,
+                    dotSize: 2,
+
+                    // Custom function to control signature drawing
+                    onBegin: (event) => {
+                        const ctx = canvas.getContext('2d');
+                        const rect = canvas.getBoundingClientRect();
+                        const scaleX = canvas.width / rect.width;
+                        const scaleY = canvas.height / rect.height;
+
+                        // Ensure drawing stays within canvas
+                        if (
+                            event.clientX < rect.left ||
+                            event.clientX > rect.right ||
+                            event.clientY < rect.top ||
+                            event.clientY > rect.bottom
+                        ) {
+                            return false;
+                        }
+                    }
+                });
+                signaturePads[type] = signaturePad;
+
+                // Initial resize
+                resizeCanvas();
+
+                // Load existing signature
+                if (type === 'penilai' || type === 'cabang') {
+                    loadPenilaiAndCabangSignature(type, signaturePad);
+                } else {
+                    loadSignature(type, signaturePad);
+                }
+
+                // Add event listeners
+                addEventListeners(type, signaturePad);
+
+                // Add resize listener
+                window.addEventListener('resize', () => {
+                    resizeCanvas();
+                });
             }
-        });
-        signaturePads[type] = signaturePad;
 
-        // Initial resize
-        resizeCanvas();
+            function drawSignature(signaturePad, imageUrl) {
+                const image = new Image();
+                image.crossOrigin = 'Anonymous';
+                image.onload = function() {
+                    const ctx = signaturePad.canvas.getContext('2d');
+                    const canvasWidth = signaturePad.canvas.width;
+                    const canvasHeight = signaturePad.canvas.height;
 
-        // Load existing signature
-        if (type === 'penilai' || type === 'cabang') {
-            loadPenilaiAndCabangSignature(type, signaturePad);
-        } else {
-            loadSignature(type, signaturePad);
-        }
+                    // Clear previous content
+                    ctx.clearRect(0, 0, canvasWidth, canvasHeight);
 
-        // Add event listeners
-        addEventListeners(type, signaturePad);
+                    // Calculate scaling to fit within canvas while maintaining aspect ratio
+                    const scale = Math.min(
+                        canvasWidth / image.width,
+                        canvasHeight / image.height
+                    );
 
-        // Add resize listener
-        window.addEventListener('resize', () => {
-            resizeCanvas();
-        });
-    }
+                    const scaledWidth = image.width * scale;
+                    const scaledHeight = image.height * scale;
 
-    function drawSignature(signaturePad, imageUrl) {
-        const image = new Image();
-        image.crossOrigin = 'Anonymous';
-        image.onload = function() {
-            const ctx = signaturePad.canvas.getContext('2d');
-            const canvasWidth = signaturePad.canvas.width;
-            const canvasHeight = signaturePad.canvas.height;
+                    // Center the image
+                    const x = (canvasWidth - scaledWidth) / 2;
+                    const y = (canvasHeight - scaledHeight) / 2;
 
-            // Clear previous content
-            ctx.clearRect(0, 0, canvasWidth, canvasHeight);
-
-            // Calculate scaling to fit within canvas while maintaining aspect ratio
-            const scale = Math.min(
-                canvasWidth / image.width,
-                canvasHeight / image.height
-            );
-
-            const scaledWidth = image.width * scale;
-            const scaledHeight = image.height * scale;
-
-            // Center the image
-            const x = (canvasWidth - scaledWidth) / 2;
-            const y = (canvasHeight - scaledHeight) / 2;
-
-            // Draw the scaled and centered image
-            ctx.drawImage(image, x, y, scaledWidth, scaledHeight);
-        };
-        image.onerror = function() {
-            console.error('Error loading signature image');
-        };
-        image.src = imageUrl;
-    }
+                    // Draw the scaled and centered image
+                    ctx.drawImage(image, x, y, scaledWidth, scaledHeight);
+                };
+                image.onerror = function() {
+                    console.error('Error loading signature image');
+                };
+                image.src = imageUrl;
+            }
 
             function addEventListeners(type, signaturePad) {
                 document.getElementById(`save-${type}`)?.addEventListener('click', () => saveSignature(type,
@@ -237,7 +239,7 @@
                     (type === 'penilai' ?
                         `{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}` :
                         (type === 'cabang' ?
-                            `{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}` :
+                            `{{ asset('storage/signatures/' . $cabangUser?->id . '/' . $cabangUser?->sign) }}` :
                             '')) :
                     signaturePad.toDataURL('image/png', 1.0); // Use full quality
 
@@ -332,13 +334,13 @@
                         } else {
                             const signUrl = type === 'penilai' ?
                                 `{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}` :
-                                `{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}`;
+                                `{{ asset('storage/signatures/' . $cabangUser?->id . '/' . $cabangUser?->sign) }}`;
 
                             drawSignature(signaturePad, signUrl);
 
                             const defaultName = type === 'penilai' ?
                                 `{{ Auth::user()->name }}` :
-                                `{{ $cabangUser->name }}`;
+                                `{{ $cabangUser?->name }}`;
                             if (nameInputElement) {
                                 nameInputElement.value = defaultName;
                             }
@@ -362,7 +364,7 @@
                     (type === 'penilai' ?
                         `{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}` :
                         (type === 'cabang' ?
-                            `{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}` :
+                            `{{ asset('storage/signatures/' . $cabangUser?->id . '/' . $cabangUser?->sign) }}` :
                             '')) :
                     signaturePad.toDataURL('image/png');
 
@@ -519,17 +521,17 @@
             const formData = new FormData(form);
 
             const fotoFields = [
-        'foto_gistaru',
-        'foto_bhumi',
-        'foto_argis_region',
-        'foto_tempat',
-        'foto_sentuh_tanahku',
-        'upload_gs'
-    ];
+                'foto_gistaru',
+                'foto_bhumi',
+                'foto_argis_region',
+                'foto_tempat',
+                'foto_sentuh_tanahku',
+                'upload_gs'
+            ];
 
-    fotoFields.forEach((field) => {
-        formData.delete(field);
-    });
+            fotoFields.forEach((field) => {
+                formData.delete(field);
+            });
             $.ajax({
                 url: '{{ route('surveyor.store') }}',
                 type: 'POST',
diff --git a/resources/views/surveyor/components/print-out/fakta.blade.php b/resources/views/surveyor/components/print-out/fakta.blade.php
index 164e81f..c20b391 100644
--- a/resources/views/surveyor/components/print-out/fakta.blade.php
+++ b/resources/views/surveyor/components/print-out/fakta.blade.php
@@ -54,7 +54,7 @@
                 @endif
             </td>
         </tr>
-
+        @if (!empty($forminspeksi['fakta']['rute_menuju']))
         <tr>
             <td width="20%" style="vertical-align: top;">Rute Munuju</td>
             <td width="1%" style="vertical-align: top;">:</td>
@@ -62,8 +62,11 @@
                 <p>{{ $forminspeksi['fakta']['rute_menuju'] ?? '' }}</p>
             </td>
         </tr>
+        @endif
 
 
+        @if (!empty($forminspeksi['fakta']['batas_batas_input']))
+
         <tr>
             <td width="20%" style="vertical-align: top;">Batas Batas </td>
             <td width="1%" style="vertical-align: top;">:</td>
@@ -71,13 +74,15 @@
 
 
                 @foreach ($forminspeksi['fakta']['batas_batas_input'] ?? [] as $arah => $batas)
-                    @if ($batas)
-                        <p> - {{ $arah }} : {{ $batas }}</p>
-                    @endif
+                @if ($batas)
+                <p> - {{ $arah }} : {{ $batas }}</p>
+                @endif
                 @endforeach
             </td>
         </tr>
+        @endif
 
+        @if (!empty($forminspeksi['fakta']['kondisi_lingkungan']))
         <tr>
             <td width="20%" style="vertical-align: top;">Kondisi lain terkait lingkungan </td>
             <td width="1%" style="vertical-align: top;">:</td>
@@ -89,6 +94,9 @@
                 @endforeach
             </td>
         </tr>
+        @endif
+
+        @if (!empty($forminspeksi['fakta']['kondisi_lain_bangunan']))
         <tr>
             <td width="20%" style="vertical-align: top;">Kondisi lain terkait Bangunan </td>
             <td width="1%" style="vertical-align: top;">:</td>
@@ -99,6 +107,8 @@
                 @endforeach
             </td>
         </tr>
+        @endif
+        @if (!empty($forminspeksi['fakta']['informasi_dokument']))
         <tr>
             <td width="20%" style="vertical-align: top;">Informasi Terkait Dokumen </td>
             <td width="1%" style="vertical-align: top;">:</td>
@@ -110,7 +120,7 @@
 
             </td>
         </tr>
-
+        @endif
 
 
     </table>
diff --git a/resources/views/surveyor/components/print-out/footer.blade.php b/resources/views/surveyor/components/print-out/footer.blade.php
index f5faf72..33473fc 100644
--- a/resources/views/surveyor/components/print-out/footer.blade.php
+++ b/resources/views/surveyor/components/print-out/footer.blade.php
@@ -5,7 +5,7 @@
                 <table>
                     <tr>
                         <td>
-                            Jakarta {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
+                            {{ $permohonan->debiture->branch->name ?? '' }} {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
                         </td>
                     </tr>
 
diff --git a/resources/views/surveyor/components/print-out/informasi.blade.php b/resources/views/surveyor/components/print-out/informasi.blade.php
index 7e529ba..98b7a98 100644
--- a/resources/views/surveyor/components/print-out/informasi.blade.php
+++ b/resources/views/surveyor/components/print-out/informasi.blade.php
@@ -1,103 +1,108 @@
-<div class="no-break" >
-    <table
-        style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
-        <tr>
-            <td style="text-align: center; margin-top: 5px;">
-                <h2 style="text-transform: uppercase; text-align: center; margin: 0;">Informasi Dinas Tata Ruang</h2>
-            </td>
-        </tr>
-    </table>
-    <table>
+@php
+    $informasi = [
+        'peruntukan',
+        'kdb',
+        'kdh',
+        'gsb',
+        'max_lantai',
+        'klb',
+        'gss',
+        'pelebaran_jalan',
+        'nama_petugas',
+    ];
 
+    $fotoTypes = [
+        'upload_gs',
+        'foto_sentuh_tanahku',
+        'foto_gistaru',
+        'foto_bhumi',
+        'foto_argis_region',
+        'foto_tempat',
+    ];
 
-        <tr>
-            <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',
-                        'kdb',
-                        'kdh',
-                        'gsb',
-                        'max_lantai',
-                        'klb',
-                        'gss',
-                        'pelebaran_jalan',
-                        'nama_petugas',
-                    ];
-                @endphp
+    $customLabels = [
+        'upload_gs' => 'Gambar Situasi',
+        'foto_sentuh_tanahku' => 'Sentuh Tanahku',
+        'foto_gistaru' => 'Gistaru',
+        'foto_bhumi' => 'Bhumi',
+        'foto_argis_region' => 'Blad Tata Ruang ',
+        'foto_tempat' => 'Peta Lokasi',
+    ];
 
-                @foreach ($informasi as $key)
-                    @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
-                        @php
-                            $displayKey = ucfirst(str_replace('_', ' ', $key));
-                            if (strlen($key) == 3) {
-                                $displayKey = strtoupper($key);
-                            }
-                        @endphp
-                        <p> - {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}</p>
-                    @endif
-                @endforeach
-            </td>
-        </tr>
+    // Periksa apakah ada informasi dinas tata ruang yang valid
+    $hasInformasi = collect($informasi)->some(fn($key) => isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-');
 
-        @php
-            $fotoTypes = [
-                'upload_gs',
-                'foto_sentuh_tanahku',
-                'foto_gistaru',
-                'foto_bhumi',
-                'foto_argis_region',
-                'foto_tempat',
-            ];
+    // Periksa apakah ada foto yang valid
+    $hasValidPhotos = collect($fotoTypes)->some(function ($type) use ($forminspeksi) {
+        $imagePath = $forminspeksi[$type] ?? null;
+        return $imagePath && file_exists(storage_path('app/public/' . $imagePath));
+    });
 
-            $customLabels = [
-                'upload_gs' => 'Gambar Situasi',
-                'foto_sentuh_tanahku' => 'Sentuh Tanahku',
-                'foto_gistaru' => 'Gistaru',
-                'foto_bhumi' => 'Bhumi',
-                'foto_argis_region' => 'Blad Tata Ruang ',
-                'foto_tempat' => 'Peta Lokasi',
-            ];
-            // Memindahkan foto_tempat ke depan jika ada
-            if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
-                unset($fotoTypes[$key]);
-                array_unshift($fotoTypes, 'upload_gs');
-            }
-            // Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid
-            $validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) {
-                return isset($forminspeksi[$type]) && !empty($forminspeksi[$type]) && is_string($forminspeksi[$type]);
-            });
-        @endphp
-        @foreach ($validPhotoTypes as $type)
-            @php
-                $imagePath = $forminspeksi[$type] ?? null;
-                $imageUrl = is_string($imagePath) ? asset('storage/' . $imagePath) : null;
+    // Periksa apakah ada catatan yang perlu diperhatikan
+    $hasNotes = !empty($forminspeksi['fakta']['keterangan'] ?? []);
+@endphp
 
-            @endphp
-            @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
+@if ($hasInformasi || $hasValidPhotos || $hasNotes)
+    <div class="no-break">
+        <table style="width: 100%; border: 1px solid #000; border-collapse: collapse;">
+            <tr>
+                <td style="text-align: center; margin-top: 5px;">
+                    <h2 style="text-transform: uppercase; text-align: center; margin: 0;">Informasi Dinas Tata Ruang</h2>
+                </td>
+            </tr>
+        </table>
+
+        <table>
+            @if ($hasInformasi)
                 <tr>
-                    <td style="20%"> {{ $customLabels[$type] ?? '' }}</td>
-                    <td width="1%" style="vertical-align: top;"></td>
-                    <td style="width: 79%">
-                        <img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $imageUrl }}"
-                            style="max-height: 400px; height: auto; max-width: 100%;">
+                    <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;">
+                        @foreach ($informasi as $key)
+                            @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
+                                @php
+                                    $displayKey = ucfirst(str_replace('_', ' ', $key));
+                                    if (strlen($key) == 3) {
+                                        $displayKey = strtoupper($key);
+                                    }
+                                @endphp
+                                <p>- {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}</p>
+                            @endif
+                        @endforeach
                     </td>
                 </tr>
             @endif
-        @endforeach
-        <tr>
-            <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>
+            @if ($hasValidPhotos)
+                @foreach ($fotoTypes as $type)
+                    @php
+                        $imagePath = $forminspeksi[$type] ?? null;
+                        $imageUrl = is_string($imagePath) ? asset('storage/' . $imagePath) : null;
+                    @endphp
+                    @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
+                        <tr>
+                            <td style="20%"> {{ $customLabels[$type] ?? '' }}</td>
+                            <td width="1%" style="vertical-align: top;"></td>
+                            <td style="width: 79%">
+                                <img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $imageUrl }}"
+                                    style="max-height: 400px; height: auto; max-width: 100%;">
+                            </td>
+                        </tr>
+                    @endif
                 @endforeach
+            @endif
 
-            </td>
-        </tr>
-
-    </table>
-</div>
+            @if ($hasNotes)
+                <tr>
+                    <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>
+                        @endforeach
+                    </td>
+                </tr>
+            @endif
+        </table>
+    </div>
+@endif
diff --git a/resources/views/surveyor/components/print-out/lingkungan.blade.php b/resources/views/surveyor/components/print-out/lingkungan.blade.php
index 2c1dd76..db55945 100644
--- a/resources/views/surveyor/components/print-out/lingkungan.blade.php
+++ b/resources/views/surveyor/components/print-out/lingkungan.blade.php
@@ -69,22 +69,26 @@
                         <tr>
                             @foreach ($basicData['laluLintasLokasi'] as $index => $item)
                                 @if ($index % 3 == 0 && $index > 0)
+                                    </tr>
+                                    <tr>
+                                @endif
+                                <td class="checkbox-item">
+                                    <label class="checkbox-label">
+                                        <input type="checkbox"
+                                            {{ isset($forminspeksi['lingkungan']['lalu_lintas']) 
+                                                && is_array($forminspeksi['lingkungan']['lalu_lintas']) 
+                                                && in_array($item->name, $forminspeksi['lingkungan']['lalu_lintas']) 
+                                                ? 'checked' : '' }}>
+                                        {{ $item->name }}
+                                    </label>
+                                </td>
+                            @endforeach
                         </tr>
-                        <tr>
+                    </table>
                 @endif
-            <td class="checkbox-item">
-                <label class="checkbox-label">
-                    <input type="checkbox"
-                        {{ isset($forminspeksi['lingkungan']['lalu_lintas']) && in_array($item->name, $forminspeksi['lingkungan']['lalu_lintas']) ? 'checked' : '' }}>
-                    {{ $item->name }}
-                </label>
             </td>
-            @endforeach
         </tr>
-    </table>
-    @endif
-    </td>
-    </tr>
+        
 
     <tr>
         <td style="vertical-align: top;">Golongan Masyarakat Sekitar</td>
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index 96109a1..d224a9f 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -255,12 +255,19 @@
                             <td style="width: 1%;  padding: 2px; vertical-align: top;">:</td>
                             <td style="vertical-align: top;  padding: 2px;">
                                 @if (isset($forminspeksi['asset']['debitur_perwakilan']) && !empty($forminspeksi['asset']['debitur_perwakilan']))
-                                    @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item)
-                                    <p style="margin: 0; padding:0;">
-                                        {{ $item }}
-                                    </p>
-                                    @endforeach
-                                @endif
+    @if (is_array($forminspeksi['asset']['debitur_perwakilan']))
+        @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item)
+            <p style="margin: 0; padding:0;">
+                {{ $item }}
+            </p>
+        @endforeach
+    @else
+        <p style="margin: 0; padding:0;">
+            {{ $forminspeksi['asset']['debitur_perwakilan'] }}
+        </p>
+    @endif
+@endif
+
                             </td>
                         </tr>
                     </table>
@@ -383,12 +390,13 @@
                 <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_lat']) && !empty($forminspeksi['asset']['kordinat_lat']) ? $forminspeksi['asset']['kordinat_lat'] : '-' }}
                     ,
-                    {{ isset($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '' }}
+                    {{ isset($forminspeksi['asset']['kordinat_lng']) && !empty($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '-' }}
                 </td>
             </tr>
         </table>
+
         <div class="no-break" >
             <table
                 style="width: 100%;  border: 1px solid #000; border-collapse: collapse; ">