diff --git a/app/Exports/BasicDataSurveyorExport.php b/app/Exports/BasicDataSurveyorExport.php
new file mode 100644
index 0000000..3137429
--- /dev/null
+++ b/app/Exports/BasicDataSurveyorExport.php
@@ -0,0 +1,58 @@
+<?php
+
+    namespace Modules\Lpj\Exports;
+
+    use Maatwebsite\Excel\Concerns\FromCollection;
+    use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+    use Maatwebsite\Excel\Concerns\WithHeadings;
+    use Maatwebsite\Excel\Concerns\WithMapping;
+    use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+    class BasicDataSurveyorExport implements WithColumnFormatting, WithHeadings, FromCollection, withMapping
+    {
+
+
+        protected $model;
+
+
+        public function __construct($model)
+        {
+            $this->model = $model;
+        }
+
+        public function collection()
+        {
+            return $this->model::all();
+        }
+
+        public function map($row)
+        : array
+        {
+            return [
+                $row->id,
+                $row->code,
+                $row->name,
+                $row->created_at
+            ];
+        }
+
+        public function headings()
+        : array
+        {
+            return [
+                'ID',
+                'Code',
+                'Name',
+                'Created At'
+            ];
+        }
+
+        public function columnFormats()
+        : array
+        {
+            return [
+                'A' => NumberFormat::FORMAT_NUMBER,
+                'D' => NumberFormat::FORMAT_DATE_DATETIME
+            ];
+        }
+    }
diff --git a/app/Exports/KertasKerjaExport.php b/app/Exports/KertasKerjaExport.php
new file mode 100644
index 0000000..c931d47
--- /dev/null
+++ b/app/Exports/KertasKerjaExport.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class KertasKerjaExport implements WithColumnFormatting, WithHeadings, FromCollection, WithMapping
+{
+    protected $data;
+
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    public function collection()
+    {
+        return collect([
+            [
+                'Pendekatan pasar',
+                'Nama Pemilik Aset',
+                '',
+            ],
+            [
+                'Metode Perbandingan Data Pasar',
+                'Nama Pemberi Tugas: ',
+                '',
+                '',
+            ],
+            [
+                'Tanggal Penilaian: ',
+                'Lokasi: ',
+                '',
+                '',
+            ],
+            [
+                'No.',
+                'Objek Penilaian',
+                'Data Pembanding 1',
+                'Data Pembanding 2',
+                'Data Pembanding 3'
+            ],
+        ]);
+    }
+
+    // Tambahkan method map()
+    public function map($row): array
+    {
+        return $row;
+
+    }
+
+    public function headings(): array
+    {
+        return [];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A' => NumberFormat::FORMAT_NUMBER,
+            'C' => NumberFormat::FORMAT_NUMBER,
+            'D' => NumberFormat::FORMAT_NUMBER,
+            'F' => NumberFormat::FORMAT_NUMBER,
+            'G' => NumberFormat::FORMAT_NUMBER,
+            'P' => NumberFormat::FORMAT_DATE_DATETIME,
+            'Q' => NumberFormat::FORMAT_DATE_DATETIME
+        ];
+    }
+}
diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index ed09be5..c42bd71 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -5,6 +5,7 @@
     use Modules\Lpj\Models\HolidayCalendar;
     use Modules\Lpj\Models\PenawaranDetailTender;
     use Modules\Lpj\Models\PenawaranTender;
+    use Modules\Lpj\Models\Penilaian;
 
     function formatTanggalIndonesia($date, $time = false)
     {
@@ -118,22 +119,33 @@
         $noUrutAkhirString = sprintf("%04s", 1);
         if($penawaran)
         {
-            $code_penawaran_last = substr ($maxCode, -4);
-            $year_penawaran_last = Carbon::parse($penawaran->created_at)->year;
-            $year_now            = Carbon::now()->year;
-            if ($year_now == $year_penawaran_last) {
-                $noUrutAkhirString = sprintf("%04s", abs($code_penawaran_last + 1));
+            $isNum = substr($maxCode, 2); // memastikan string ke 3 s/d 8 adalan numiric
+            $isNP = substr($maxCode, 0, 2);
+            if((8 == strlen($maxCode)) && ("NP"==$isNP) && (isNumeric($isNum)))
+            {
+                $code_penawaran_last = substr ($maxCode, -4);
+                $year_penawaran_last = Carbon::parse($penawaran->created_at)->year;
+                $year_now            = Carbon::now()->year;
+                if ($year_now == $year_penawaran_last) {
+                    $noUrutAkhirString = sprintf("%04s", abs($code_penawaran_last + 1));
+                }
+                 // jika ternyata tahun tdk sama (kurang dari tahun sekarang), maka nomor di set 0001
             }
-            // jika ternyata tahun tdk sama (kurang dari tahun sekarang), maka nomor di set 0001
+
         }
 
         return 'NP' . Carbon::now()->format('y') . $noUrutAkhirString;
     }
 
-    // generate last penawaran.no_spk 
+    function isNumeric($str)
+    {
+        return ctype_digit($str);
+    }
+
+    // generate last penawaran.no_spk
     function onLastnumberCodePenawaranSPK($jenis_laporan_code): string
     {
-        
+
         // 20241124_001 ==> spk_no_core
         // XXX / PJ / JKT / MONTH-ROM / FR|SR / 2024
         // 001 / PJ / JKT / XI / FR / 2024
@@ -148,18 +160,18 @@
         {
             $no_spk_penawaran_last = substr ($maxCode, -3);
             $year_penawaran_last = substr ($maxCode, 0, 4);
-            
+
             if($year_now == $year_penawaran_last)
             {
-                $noUrutAkhirString = sprintf("%03s", abs($no_spk_penawaran_last + 1));  
+                $noUrutAkhirString = sprintf("%03s", abs($no_spk_penawaran_last + 1));
             }
             // jika ternyata tahun tdk sama (kurang dari tahun sekarang), maka nomor di set 001
         }
-        
+
         $month = onRomawi(Carbon::now()->month);
-        
+
         $lastSPK = $noUrutAkhirString.' / PJ / JKT / '. $month .' / ' .$jenis_laporan_code.' / '.$year_now;
-        return $lastSPK;    
+        return $lastSPK;
     }
 
     function onRomawi(int $bln): string
@@ -203,7 +215,7 @@
                 break;
 
         }
-        
+
     }
 
     function penyebut($nilai) {
@@ -230,16 +242,16 @@
 			$temp = penyebut($nilai/1000000000) . " milyar" . penyebut(fmod($nilai,1000000000));
 		} else if ($nilai < 1000000000000000) {
 			$temp = penyebut($nilai/1000000000000) . " trilyun" . penyebut(fmod($nilai,1000000000000));
-		}     
+		}
 		return $temp;
 	}
- 
+
 	function terbilang($nilai) {
 		if($nilai<0) {
 			$hasil = "minus ". trim(penyebut($nilai));
 		} else {
 			$hasil = trim(penyebut($nilai));
-		}     		
+		}
 		return $hasil;
 	}
     // andy add
@@ -272,3 +284,10 @@
             },
         )->toArray();
     }
+
+    function countPermohonanForUser($userId)
+    {
+        return Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
+            $query->where('user_id', $userId);
+        })->count();
+    }
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index bfb447f..f1d79d8 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -33,48 +33,33 @@ class ActivityController extends Controller
 
     public function progres_activity()
     {
-        // Ambil user yang sedang login
-        $user = auth()->user();
-        $roles = $user->load('roles');
+        // Ambil user yang sedang login dengan roles
+        $user = auth()->user()->load('roles');
 
-        // Inisialisasi regionId dan teamId sebagai null agar bisa dinamis
-        $regionId = null;
-        $teamId = null;
+        // Inisialisasi regionId dan teamId
+        $regionId = $teamId = null;
 
-        if ($roles->roles->pluck('name')->contains('senior-officer')) {
-            $userTeam = TeamsUsers::with('team')
-                ->where('user_id', $user->id)
-                ->first();
+        if ($user->roles->pluck('name')->contains('senior-officer')) {
+            $userTeam = TeamsUsers::with('team')->firstWhere('user_id', $user->id);
             $regionId = $userTeam?->team->regions_id;
             $teamId = $userTeam?->teams_id;
-
         }
 
         $teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles'])
             ->whereHas('team', function ($q) use ($regionId, $teamId) {
-                if ($regionId) {
-                    $q->where('regions_id', $regionId);
-                }
-                if ($teamId) {
-                    $q->where('id', $teamId); // Hanya tim yang sama
-                }
+                $q->when($regionId, fn($q) => $q->where('regions_id', $regionId))
+                  ->when($teamId, fn($q) => $q->where('id', $teamId));
             })
             ->where('user_id', '!=', $user->id)
-            ->whereHas('user.roles', function ($query) {
-                // Filter hanya peran 'surveyor' atau 'surveyor-penilai'
-                $query->whereIn('name', ['surveyor', 'surveyor-penilai']);
-            })
+            ->whereHas('user.roles', fn($q) => $q->whereIn('name', ['surveyor', 'surveyor-penilai']))
             ->get();
 
-
-
-
         return view('lpj::activity.progres_activity.index', compact('teamsActivity'));
     }
 
 
     function updateTeamAssingment(Request $request) {
-    
+
         try {
             $id = $request->input('id');
             $user = PenilaianTeam::where('penilaian_id', $id)->get();
@@ -86,7 +71,7 @@ class ActivityController extends Controller
                 }
                 return redirect()->route('activity.progres.index')->with('success', 'Surveyor berhasil diganti');
             }
-        
+
         } catch (\Throwable $th) {
             return redirect()->route('activity.progres.index')->with('success', $th->getMessage());
         }
diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 357d984..968d631 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -6,7 +6,9 @@ use Illuminate\Http\Request;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Inspeksi;
 use App\Http\Controllers\Controller;
-
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\KertasKerjaExport;
 class PenilaiController extends Controller
 {
     public $user;
@@ -22,7 +24,8 @@ class PenilaiController extends Controller
     /**
      * Show the form for creating a new resource.
      */
-     public function lampiran($id){
+    public function lampiran($id)
+    {
         $permohonan = Permohonan::with('debiture.documents')->find($id);
 
         $jaminanId = $permohonan->debiture->documents->first()->jenis_jaminan_id;
@@ -36,7 +39,7 @@ class PenilaiController extends Controller
 
 
         return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto'));
-     }
+    }
 
     public function create()
     {
@@ -93,21 +96,26 @@ class PenilaiController extends Controller
         }
 
         // Retrieve data from the database
-        $query = Permohonan::query()->where('status', '=', 'done');
+        $query = Permohonan::query();
 
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('jenisfasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+            $columns = ['nomor_registrasi', 'debiture.name', 'branch.name', 'user.name', 'tujuanPenilaian.name', 'jenisfasilitasKredit.name'];
+
+            $query->where(function ($q) use ($search, $columns) {
+                foreach ($columns as $column) {
+                    $q->orWhereRelation(explode('.', $column)[0], explode('.', $column)[1], 'LIKE', '%' . $search . '%');
+                }
             });
         }
 
+        // Apply whereHas to check penilai_id, role, and user_id specifically for 'penilai' role
+        $query->whereHas('penilaian.userPenilai', function ($q) {
+            $q->where('role', 'penilai')  // Ensure the role is 'penilai'
+              ->where('user_id', 12); // Ganti dengan Auth::user()->id jika dinamis
+        });
+
         // Apply sorting if provided
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
@@ -122,7 +130,7 @@ class PenilaiController extends Controller
         if ($request->has('page') && $request->has('size')) {
             $page   = $request->get('page');
             $size   = $request->get('size');
-            $offset = ($page - 1) * $size; // Calculate the offset
+            $offset = ($page - 1) * $size;
 
             $query->skip($offset)->take($size);
         }
@@ -131,13 +139,20 @@ class PenilaiController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'jenisfasilitasKredit'])->get();
+        $data = $query->with([
+            'user',
+            'debiture',
+            'branch',
+            'tujuanPenilaian',
+            'jenisfasilitasKredit',
+            'penilaian.userPenilai' // Ensure this relation is included
+        ])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
 
         // Calculate the current page number
-        $currentPage = 0 + 1;
+        $currentPage = $request->get('page', 1);
 
         // Return the response data as a JSON object
         return response()->json([
@@ -150,4 +165,134 @@ class PenilaiController extends Controller
             'data'            => $data,
         ]);
     }
+
+    public function kertas_kerja()
+    {
+        $data = [
+            [
+                'Pendekatan pasar',
+                'Nama Pemilik Aset',
+                '',
+            ],
+            [
+                'Metode Perbandingan Data Pasar',
+                'Nama Pemberi Tugas: ',
+                '',
+                '',
+            ],
+            [
+                'Tanggal Penilaian: ',
+                'Lokasi: ',
+                '',
+                '',
+            ],
+            [
+                'No.',
+                'Objek Penilaian',
+                'Data Pembanding 1',
+                'Data Pembanding 2',
+                'Data Pembanding 3'
+            ],[
+                '1',
+                'Jenis Aset',
+                'Pembanding 1',
+                'Pembanding 1',
+                'Pembanding 1'
+            ],
+            [
+                '2',
+                'Luas Tanah',
+                'Pembanding 2',
+                'Pembanding 2',
+                'Pembanding 2'
+            ],
+            [
+                '3',
+                'Penawaran/Transaksi',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '4',
+                'Harga penawaran/Transaksi',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],[
+                '5',
+                'Nomor Telepon',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '6',
+                'Estimasi Harga Transaksi',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '7',
+                'Nama Nara sumber',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '8',
+                'Status Nara sumber',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '9',
+                'Waktu Penawaran/Transaksi',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '10',
+                'Titik GPS',
+                '',
+                'Pembanding 3',
+            ],
+            [
+                '11',
+                'Alamat',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '12',
+                'Jarak Pembanding dengan Objek (m)',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '13',
+                'Estimasi Rangking  Tanah',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ],
+            [
+                '14',
+                'Estimasi Rangking  Bangunan',
+                '',
+                'Pembanding 3',
+                'Pembanding 3'
+            ]
+
+        ];
+        return Excel::download(new KertasKerjaExport($data), 'kertas-kerja.xlsx');
+    }
+
+
+
 }
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index e0ebfa8..0d4c94a 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -298,10 +298,15 @@ class PenilaianController extends Controller
                 $q->orWhere('status', 'LIKE', '%' . $search . '%');
             });
         }
+
         $query->whereIn('status', ['registered', 'registrasi-final']);
-        $query->whereHas('region.teams.teamsUsers.user', function ($q) {
-            $q->where('id', Auth::user()->id);
-        });
+
+        // Filter berdasarkan role
+        if (Auth::user()->roles[0]->name !== 'administrator') {
+            $query->whereHas('region.teams.teamsUsers.user', function ($q) {
+                $q->where('id', Auth::user()->id);
+            });
+        }
 
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index 35faa19..9074567 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -84,7 +84,7 @@ use Illuminate\Support\Facades\Auth;
                 if ($obj->tanggal_permohonan) {
                     $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y');
                 }
-                
+
                 if($obj->penawaran->tanggal_penilaian_sebelumnya)
                 {
                     $data[$i]->penawaran->tanggal_penilaian_sebelumnya = Carbon::parse($obj->penawaran->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s');
@@ -146,7 +146,7 @@ use Illuminate\Support\Facades\Auth;
         }
 
         public function edit($id)
-        {   
+        {
             // dd(Carbon::now()->addDays(1)->format('d F Y'));
             // dd(Carbon::now()->subDays(1)->format('d F Y')); jenis_laporan_name
             $penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id')
@@ -178,7 +178,7 @@ use Illuminate\Support\Facades\Auth;
 
             if($penawaran->detail_penawaran_tgl_proposal)
                 $penawaran->detail_penawaran_tgl_proposal = Carbon::parse($penawaran->detail_penawaran_tgl_proposal)->format('d F Y');
-            
+
             // generate no spk
             $spk_no_last=$penawaran->spk_no;
             if(!$spk_no_last)
@@ -196,7 +196,7 @@ use Illuminate\Support\Facades\Auth;
             }
             // pengecekan perubahan jenis report
             // generate no spk
-            
+
             // Jangka Waktu
             // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
             $jangka_waktu='';
@@ -207,17 +207,17 @@ use Illuminate\Support\Facades\Auth;
             $persetujuan_sla_final = '...';
             if(null !==$penawaran->persetujuan)
             {
-                $sla_resume_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_resume);
-                $sla_final_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_final);
+                $sla_resume_text = $penawaran->persetujuan->sla_resume;
+                $sla_final_text = $penawaran->persetujuan->sla_final;
 
                 $sla_resume_text_terbilang = ucfirst(terbilang($sla_resume_text));
                 $sla_final_text_terbilang = ucfirst(terbilang($sla_final_text));
-                
+
                 $persetujuan_no_proposal = $penawaran->persetujuan->nomor_proposal_penawaran;
                 $persetujuan_tgl_proposal = Carbon::parse($penawaran->persetujuan->tanggal_proposal_penawaran)->format('d F Y');
                 $persetujuan_sla_resume = $sla_resume_text.' ('.$sla_resume_text_terbilang.')';
                 $persetujuan_sla_final = $sla_final_text.' ('.$sla_final_text_terbilang.')';
-                
+
                 if($penawaran->penilaian_waktu_penilain)
                 {
                     $jangka_waktu_date_start=Carbon::parse($penawaran->penilaian_waktu_penilain)->addDays(1)->format('d F Y');
@@ -226,10 +226,10 @@ use Illuminate\Support\Facades\Auth;
                     // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
                     $jangka_waktu=$jangka_waktu_date_start.' - '.$jangka_waktu_date_end;
                     // Jangka Waktu
-                
-                }   
+
+                }
             }
-                        
+
             return view('lpj::spk.edit', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final', 'jangka_waktu'));
         }
 
@@ -264,7 +264,7 @@ use Illuminate\Support\Facades\Auth;
                                         ->select('permohonan.*', 'jenis_jaminan.name as jenis_jaminan_name');
 
             $data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan'])->first();
-            
+
             // Jangka Waktu
             // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
             $jangka_waktu='';
@@ -282,7 +282,7 @@ use Illuminate\Support\Facades\Auth;
             // $dataPermohonan=['dokumen' => $newFileNameWithPath];
             // $data->update($dataPermohonan);
             // update table permohonan
-            
+
             // update table penawaran
             $dataPenawaran['spk_dokumen_path'] = $newFileNameWithPath;
             // $spk_no_last=$penawaran->spk_no;
@@ -296,7 +296,7 @@ use Illuminate\Support\Facades\Auth;
                 $dataPenawaran['spk_no_core'] = $date_now.'_'.$spk_number;
 
                 $penawaran->spk_no = $spk_no_last;
-                
+
             }
 
             // pengecekan perubahan jenis report
@@ -314,7 +314,7 @@ use Illuminate\Support\Facades\Auth;
             $penawaranM = PenawaranTender::find($penawaran->id);
             $penawaranM->update($dataPenawaran);
             // update table penawaran
-            
+
             // pdf path
             $spkpenawaran_path = Storage::url($newFileNameWithPath);
 
@@ -324,12 +324,12 @@ use Illuminate\Support\Facades\Auth;
             $persetujuan_sla_final = '...';
             if(null !==$penawaran->persetujuan)
             {
-                $sla_resume_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_resume);
-                $sla_final_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_final);
+                $sla_resume_text = $penawaran->persetujuan->sla_resume;
+                $sla_final_text = $penawaran->persetujuan->sla_final;
 
                 $sla_resume_text_terbilang = ucfirst(terbilang($sla_resume_text));
                 $sla_final_text_terbilang = ucfirst(terbilang($sla_final_text));
-                
+
                 $persetujuan_no_proposal = $penawaran->persetujuan->nomor_proposal_penawaran;
                 $persetujuan_tgl_proposal = Carbon::parse($penawaran->persetujuan->tanggal_proposal_penawaran)->format('d F Y');
                 $persetujuan_sla_resume = $sla_resume_text.' ('.$sla_resume_text_terbilang.')';
@@ -343,9 +343,9 @@ use Illuminate\Support\Facades\Auth;
                     // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
                     $jangka_waktu=$jangka_waktu_date_start.' - '.$jangka_waktu_date_end;
                     // Jangka Waktu
-                
-                }  
-                
+
+                }
+
 
             }
 
@@ -392,7 +392,7 @@ use Illuminate\Support\Facades\Auth;
             // dokumen pdf diambil dari penawaran.spk_dokumen_path
             $permohonan = Permohonan::find($id);
             $document = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();
-            
+
             return response()->download(storage_path('app/public/' .$document->spk_dokumen_path));
         }
     }
diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 6b48f91..3142aa8 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -5,8 +5,12 @@ namespace Modules\Lpj\Http\Controllers;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\BasicDataSurveyorExport;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Http\Response;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Branch;
@@ -18,6 +22,7 @@ use Modules\Lpj\Models\PosisiKavling;
 use Modules\Lpj\Models\KondisiFisikTanah;
 use Modules\Lpj\Models\KetinggianTanah;
 use Modules\Lpj\Models\SifatBangunan;
+use Modules\Lpj\Models\JenisJaminan;
 use Modules\Lpj\Models\JenisBangunan;
 use Modules\Lpj\Models\KondisiBangunan;
 use Modules\Lpj\Models\SpekBangunan;
@@ -53,7 +58,7 @@ use Modules\Lpj\Models\DetailDokumenJaminan;
 use Modules\Lpj\Models\JenisKapal;
 use Modules\Lpj\Models\JenisKendaraan;
 use Modules\Lpj\Models\RuteJaminan;
-use Modules\Lpj\Models\JenisJaminan;
+
 use Modules\Lpj\Models\HubunganPemilikJaminan;
 use Modules\Lpj\Models\HubunganPenghuniJaminan;
 use Modules\Lpj\Models\AnalisaUnit;
@@ -92,124 +97,78 @@ class SurveyorController extends Controller
             'branch',
             'tujuanPenilaian',
             'penilaian',
-            'documents',
+            'documents.jenisJaminan',
         ])->findOrFail($id);
 
         $surveyor = $id;
         $branches = Branch::all();
         $provinces = Province::all();
         $bentukTanah = BentukTanah::all();
-        $konturTanah = KonturTanah::all();
-        $posisiKavling = PosisiKavling::all();
-        $ketinggianTanah = KetinggianTanah::all();
-        $kondisiFisikTanah = KondisiFisikTanah::all();
-        $jenisBangunan = JenisBangunan::all();
-        $kondisiBangunan = KondisiBangunan::all();
-        $sifatBangunan = SifatBangunan::all();
-        $spekKategoriBagunan = SpekKategoritBangunan::all();
-        $spekBangunan = SpekBangunan::all();
-        $saranaPelengkap = SaranaPelengkap::all();
-        $arahMataAngin = ArahMataAngin::all();
-        $jenisKendaraan = JenisKendaraan::all();
-        $jenisKapal = JenisKapal::all();
-        $jenisPesawat = JenisPesawat::all();
-        $modelAlatBerat = ModelAlatBerat::all();
-
-
-        $denah = Denah::where('permohonan_id', $id)->get();
-        $fotojaminan = FotoJaminan::where('permohonan_id', $id)->get();
-        $analisa = Analisa::with('analisaUnit', 'analisaTanahBangunan', 'analisaLingkungan', 'analisaFakta', 'jenisJaminan')
-            ->where('permohonan_id', $id)
-            ->get();
-
-
-
-        $jenisJaminanIds = $permohonan->debiture->documents->pluck('jenisJaminan.id')->toArray(); // Convert to array
-
-        $jaminanId = $jenisJaminanIds[0];
-        $inpeksi = Inspeksi::where('permohonan_id', $id)
-                            ->whereIn('jenis_jaminan_id', $jenisJaminanIds)
-                            ->first();
-
-        if ($inpeksi) {
-            $forminspeksi = json_decode($inpeksi->data_form, true);
-            $formFoto = json_decode($inpeksi->foto_form, true);
-            $formDenah = json_decode($inpeksi->denah_form, true);
-        } else {
-            $forminspeksi = null;
-            $formFoto = null;
-            $formDenah = null;
-        }
 
+        // Get all inspeksi data for this permohonan
+        $inspeksiData = Inspeksi::where('permohonan_id', $id)
+            ->get()
+            ->keyBy('jenis_jaminan_id')
+            ->map(function ($item) {
+                return [
+                    'data_form' => json_decode($item->data_form, true),
+                    'foto_form' => json_decode($item->foto_form, true),
+                    'denah_form' => json_decode($item->denah_form, true),
+                    'data_pembanding' => json_decode($item->data_pembanding, true),
+                ];
+            });
 
 
         return view('lpj::surveyor.detail', compact(
-            'denah',
-            'analisa',
             'permohonan',
             'surveyor',
             'branches',
             'provinces',
             'bentukTanah',
-            'konturTanah',
-            'posisiKavling',
-            'kondisiFisikTanah',
-            'ketinggianTanah',
-            'kondisiBangunan',
-            'jenisBangunan',
-            'sifatBangunan',
-            'spekKategoriBagunan',
-            'spekBangunan',
-            'saranaPelengkap',
-            'arahMataAngin',
-            'forminspeksi',
-            'formDenah',
-            'formFoto',
-            'jaminanId',
-            'jenisKendaraan',
-            'jenisKapal',
-            'jenisPesawat',
-            'modelAlatBerat'
+            'inspeksiData'
         ));
     }
+
     /**
      * Store form inspeksi.
      */
     public function store(FormSurveyorRequest $request)
     {
-        $data = $request->validated();
-
-  
-
-        if (!$data) {
-            return response()->json(['success' => false, 'message' => 'Invalid data'], 400);
-        }
-
         try {
-            DB::beginTransaction();
+            // Validate request data
+            $validatedData = $request->validated();
 
-            $action = $request->input('type');
-            $rules = $this->getActionSpecificRules($data, $action, $request);
+            // Get action specific rules and process data
+            $processedData = $this->getActionSpecificRules(
+                $validatedData,
+                $request->input('type'),
+                $request
+            );
 
-            $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first();
-
-            if (!$inspeksi) {
-                Inspeksi::create([
+            // Find or create inspeksi record
+            $inspeksi = Inspeksi::updateOrCreate(
+                [
                     'permohonan_id' => $request->input('permohonan_id'),
-                    'data_form' => json_encode($rules),
-                    'name' => $request->input('type'),
-                    'jenis_jaminan_id' =>  $request->input('jenis_jaminan_id'),
-                ]);
-            } else {
-                $inspeksi->update(['data_form' => json_encode($rules)]);
-            }
+                    'jenis_jaminan_id' => $request->input('jenis_jaminan_id')
+                ],
+                [
+                    'data_form' => json_encode($processedData),
+                    'name' => $request->input('type')
+                ]
+            );
 
-            DB::commit();
+            return response()->json([
+                'success' => true,
+                'message' => 'Data berhasil disimpan',
+                'data' => $processedData
+            ], 200);
 
-            return response()->json(['success' => true, 'message' => 'Data saved successfully', 'data' => $data], 200);
-        } catch (Exception $e) {
-            DB::rollBack();
-            return response()->json(['success' => false, 'message' => 'Failed to save data: ' . $e->getMessage()], 500);
+        } catch (\Exception $e) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Gagal menyimpan data',
+                'error' => $e->getMessage()
+            ], 500);
         }
     }
 
@@ -284,8 +243,11 @@ class SurveyorController extends Controller
                 ]);
             }
 
-            return response()->json(['success' => true, 'message' => 'Data berhasil disimpan',
-                'data' => $formatJsonDenah], 200);
+            return response()->json([
+                'success' => true,
+                'message' => 'Data berhasil disimpan',
+                'data' => $formatJsonDenah
+            ], 200);
         } catch (Exception $e) {
             return response()->json(['success' => false, 'message' => 'Data gagal disimpan: ' . $e->getMessage()], 500);
         }
@@ -294,10 +256,131 @@ class SurveyorController extends Controller
 
     public function storeFoto(Request $request)
     {
-        $validatedData = $request->validate([
+        $validatedData = $this->validateFotoRequest($request);
+        try {
+
+            $photoCategories = [
+                'rute_menuju_lokasi' => ['foto_rute', 'name_rute'],
+                'object_jaminan' => ['foto_objek', 'name_objek', 'deskripsi_objek'],
+                'lingkungan' => ['foto_lingkungan', 'name_lingkungan'],
+                'foto_lantai_unit' => ['foto_lantai_unit', 'name_lantai_unit'],
+                'foto_lantai_lainnya' => ['foto_lantai_lainnya', 'name_lantai_lainnya'],
+                'foto_rute_lainnya' => ['foto_rute_lainnya', 'name_rute_lainnya'],
+            ];
+
+            $inspeksi = Inspeksi::firstOrNew([
+                'permohonan_id' => $request->input('permohonan_id'),
+                'jenis_jaminan_id' => $request->input('jenis_jaminan_id')
+            ]);
+
+            // Get existing foto_form data if it exists
+            $existingData = $inspeksi->exists && $inspeksi->foto_form
+                ? json_decode($inspeksi->foto_form, true)
+                : [];
+
+            $formatFotojson = $existingData; // Start with existing data
+
+            // Process each photo category
+            foreach ($photoCategories as $category => $fields) {
+                // Only update if new files are provided
+                if ($this->categoryHasNewFiles($request, $fields)) {
+                    // Delete old files for this category only
+                    if (isset($existingData[$category])) {
+                        $this->deleteFilesForCategory($existingData[$category]);
+                    }
+                    $formatFotojson[$category] = $this->processPhotoCategory($request, $fields);
+                }
+            }
+
+            // Process single files
+            $singleFiles = ['foto_basement', 'foto_gerbang', 'pendamping'];
+            foreach ($singleFiles as $file) {
+                if ($request->hasFile($file)) {
+                    // Delete old file if exists
+                    if (isset($existingData[$file])) {
+                        $this->deleteFile($existingData[$file]);
+                    }
+                    $formatFotojson[$file] = $this->uploadFile($request->file($file), $file);
+                }
+            }
+
+            // Update record
+            $inspeksi->foto_form = json_encode($formatFotojson);
+            $inspeksi->save();
+
+
+
+            return response()->json(['success' => true, 'message' => 'Data berhasil disimpan', 'data' => $formatFotojson], 200);
+        } catch (Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Failed to upload: ' . $e->getMessage()], 500);
+        }
+    }
+
+    /**
+     * Process a photo category and its subcategories
+     */
+
+    private function processPhotoCategory(Request $request, array $fields)
+    {
+        $result = [];
+        $photoField = $fields[0];
+
+        if ($request->hasFile($photoField)) {
+            foreach ($request->file($photoField, []) as $key => $value) {
+                $item = [];
+                $item[$fields[1]] = $request->input($fields[1] . '.' . $key);
+                $item[$photoField] = $this->uploadFile($value, $photoField . '.' . $key);
+
+                if (isset($fields[2])) {
+                    $item[$fields[2]] = $request->input($fields[2] . '.' . $key);
+                }
+
+                $result[] = $item;
+            }
+        }
+
+        return $result;
+    }
+
+    private function categoryHasNewFiles(Request $request, array $fields): bool
+    {
+        $photoField = $fields[0]; // First element is usually the photo field
+        return $request->hasFile($photoField) ||
+               (is_array($request->file($photoField)) && count($request->file($photoField)) > 0);
+    }
+
+    private function deleteFilesForCategory($categoryData)
+    {
+        if (!is_array($categoryData)) {
+            return;
+        }
+
+        foreach ($categoryData as $item) {
+            if (isset($item['foto'])) {
+                $this->deleteOfFile($item['foto']);
+            }
+        }
+    }
+
+    private function deleteOfFile($filePath)
+    {
+        if ($filePath && Storage::exists($filePath)) {
+            Storage::delete($filePath);
+        }
+    }
+
+
+
+
+    /**
+     * Custom validation request for foto
+     */
+    public function validateFotoRequest(Request $request)
+    {
+        return $request->validate([
             'permohonan_id' => 'required',
             'jenis_jaminan_id' => 'required',
-            'pendamping' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
+            'pendamping' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
             'foto_objek.*' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
             'name_objek.*' => 'required|string|max:255',
             'foto_lingkungan.*' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
@@ -316,167 +399,99 @@ class SurveyorController extends Controller
             'foto_gerbang' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
             'name_gerbang' => 'nullable|string|max:255',
         ]);
-
-        try {
-
-            $rute_menuju_lokasi = [];
-            $object_jaminan = [];
-            $lingkungan = [];
-            $foto_lantai_unit = [];
-            $foto_lantai_lainnya = [];
-            $foto_rute_lainnya = [];
-
-
-            foreach ($request->file('foto_rute', []) as $key => $value) {
-                $fotoRutePath = $this->uploadFile($request->file('foto_rute.' . $key), 'foto_rute.' . $key);
-
-                $rute_menuju_lokasi[] = [
-                    'name_rute' => $request->input('name_rute.' . $key),
-                    'foto_rute' => $fotoRutePath,
-                ];
-            }
-
-            foreach ($request->file('foto_objek', []) as $key => $value) {
-                $fotoObjekPath = $this->uploadFile($request->file('foto_objek.' . $key), 'foto_objek.' . $key);
-                $object_jaminan[] = [
-                    'nama_objek' => $request->input('name_objek.' . $key),
-                    'foto_object' => $fotoObjekPath,
-                    'deskripsi_objek' => $request->input('deskripsi_objek.' . $key),
-                ];
-            }
-
-            foreach ($request->file('foto_lingkungan', []) as $key => $value) {
-                $fotoLingkunganPath = $this->uploadFile($request->file('foto_lingkungan.' . $key), 'foto_lingkungan.' . $key);
-                $lingkungan[] = [
-                    'name_lingkungan' => $request->input('name_lingkungan.' . $key),
-                    'foto_lingkungan' => $fotoLingkunganPath,
-
-                ];
-            }
-
-            foreach ($request->file('foto_lantai_unit', []) as $key => $value) {
-                $foto_lantai_unit_Path = $this->uploadFile($request->file('foto_lantai_unit.' . $key), 'foto_lantai_unit.' . $key);
-                $foto_lantai_unit[] = [
-                    'name_lantai_unit' => $request->input('name_lantai_unit.' . $key),
-                    'foto_lantai_unit' => $foto_lantai_unit_Path,
-
-                ];
-            }
-
-            foreach ($request->file('foto_rute_lainnya', []) as $key => $value) {
-                $foto_rute_lainnya_path = $this->uploadFile($request->file('foto_rute_lainnya.' . $key), 'foto_rute_lainnya.' . $key);
-                $foto_rute_lainnya[] = [
-                    'name_rute_lainnya' => $request->input('name_rute_lainnya.' . $key),
-                    'foto_rute_lainnya' => $foto_rute_lainnya_path,
-
-                ];
-            }
-
-
-            foreach ($request->file('foto_lantai_lainnya', []) as $key => $value) {
-                $foto_lantai_lainnya_path = $this->uploadFile($request->file('foto_lantai_lainnya.' . $key), 'foto_lantai_lainnya.' . $key);
-                $foto_lantai_lainnya[] = [
-                    'name_lantai_lainnya' => $request->input('name_lantai_lainnya.' . $key),
-                    'foto_lantai_lainnya' => $foto_lantai_lainnya_path,
-
-                ];
-            }
-
-
-            $basement = $this->uploadFile($request->file('foto_basement'), 'foto_basement');
-            $gerbang = $this->uploadFile($request->file('foto_gerbang'), 'foto_gerbang');
-            $pendamping = $this->uploadFile($request->file('pendamping'), 'pendamping');
-
-
-            $formatFotojson = [
-                'rute_menuju_lokasi' => $rute_menuju_lokasi,
-                'object_jaminan' => $object_jaminan,
-                'lingkungan' => $lingkungan
-                ,'foto_lantai_unit' => $foto_lantai_unit,
-                'foto_lantai_lainnya' => $foto_lantai_lainnya,
-                'foto_rute_lainnya' => $foto_rute_lainnya,
-                'foto_basement' => $basement,
-                'foto_gerbang' => $gerbang,
-                'pendamping' => $pendamping
-            ];
-
-            $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first();
-
-            if ($inspeksi) {
-                $inspeksi->update([
-                    'foto_form' => json_encode($formatFotojson)
-                ]);
-            } else {
-                Inspeksi::create([
-                    'permohonan_id' => $request->input('permohonan_id'),
-                    'foto_form' => json_encode($formatFotojson),
-                    'jenis_jaminan_id' => $request->input('jenis_jaminan_id')
-                ]);
-            }
-
-            return response()->json(['success' => true, 'message' => 'Data berhasil disimpan', 'data' => $formatFotojson], 200);
-        } catch (Exception $e) {
-            return response()->json(['success' => false, 'message' => 'Failed to upload: ' . $e->getMessage()], 500);
-        }
     }
 
-
-
     public function submitSurveyor($id)
     {
         try {
-            // $cekButton = $this->checkButtonStatus($id);
-            // if (!$cekButton->buttonDisable) {
-            $permohonan = Permohonan::find($id);
+            // Get button status check result
+            $buttonStatusCheck = $this->checkButtonStatus($id);
+            $buttonStatus = json_decode($buttonStatusCheck->getContent(), true);
+
+            // Check if button should be disabled
+            if ($buttonStatus['buttonDisable']) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Form belum lengkap. Pastikan semua data telah diisi dengan benar.',
+                ], 422);
+            }
+
+            // If validation passes, update permohonan status
+            $permohonan = Permohonan::findOrFail($id);
             $permohonan->update([
                 'status' => 'done',
+                'submitted_at' => now()
             ]);
-            return response()->json(['success' => true, 'message' => 'Form surveyor submitted successfully'], 200);
-            // } else {
-            //     return response()->json(['error' => 'Something went wrong'], 400);
-            // }
-        } catch (Exception $e) {
-            return response()->json(['error' => 'Something went wrong', 'message' => $e->getMessage()], 500);
+
+            return response()->json([
+                'success' => true,
+                'message' => 'Form surveyor berhasil disubmit'
+            ], 200);
+
+        } catch (\Exception $e) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Terjadi kesalahan',
+                'error' => $e->getMessage()
+            ], 500);
         }
     }
 
 
 
+
     public function checkButtonStatus($id)
     {
         try {
+            // Get all inspeksi records for this permohonan
+            $inspeksiRecords = Inspeksi::where('permohonan_id', $id)->get();
 
-            $inpeksi = Inspeksi::where('permohonan_id', $id)->first();
-
-            if ($inpeksi) {
-                $forminspeksi = json_decode($inpeksi->data_form, true);
-                $formFoto = json_decode($inpeksi->foto_form, true);
-
-                $buttonDisable = false;
-                if (
-                    $formFoto && count($formFoto) > 0 &&
-                    $forminspeksi
-                ) {
-                    $buttonDisable = false;
-                } else {
-                    $buttonDisable = true;
-                }
-
-                return response()->json(['buttonDisable' => $buttonDisable]);
-            } else {
+            if ($inspeksiRecords->isEmpty()) {
                 return response()->json(['buttonDisable' => true]);
             }
+
+            foreach ($inspeksiRecords as $inspeksi) {
+                $dataForm = json_decode($inspeksi->data_form, true);
+                $fotoForm = json_decode($inspeksi->foto_form, true);
+                $denahForm = json_decode($inspeksi->denah_form, true);
+                $dataPembanding = json_decode($inspeksi->data_pembanding, true);
+
+                // Get jenis jaminan to check if it needs denah
+                $jenisJaminan = JenisJaminan::find($inspeksi->jenis_jaminan_id);
+                $isTanahBangunan = !in_array(
+                    strtoupper($jenisJaminan->name ?? ''),
+                    ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT']
+                );
+
+                // Check if required forms are empty or incomplete
+                if (empty($dataForm) || empty($fotoForm)) {
+                    return response()->json(['buttonDisable' => true]);
+                }
+
+                if ($isTanahBangunan && empty($denahForm)) {
+                    return response()->json(['buttonDisable' => true]);
+                }
+
+                if (empty($dataPembanding)) {
+                    return response()->json(['buttonDisable' => true]);
+                }
+            }
+
+            // If we get here, all checks passed
+            return response()->json(['buttonDisable' => false]);
+
         } catch (\Exception $e) {
-            // return response()->json(['buttonDisable' => true]);
             return response()->json([
                 'error' => 'Something went wrong',
-                'message' => $e->getMessage()
+                'message' => $e->getMessage(),
+                'buttonDisable' => true
             ], 500);
         }
     }
 
 
 
+
     public function storeJadwal(Request $request)
     {
         try {
@@ -536,41 +551,146 @@ class SurveyorController extends Controller
     }
 
 
-    public function storeDataPembanding(Request $request)
+    public function storeFreeze() {
+
+    }
+
+
+    private function formatDataPembanding($request)
     {
-        $data = $request->all();
-        if (!$data) {
-            return response()->json(['success' => false, 'message' => 'Invalid data'], 400);
+        $dataPembanding = [];
+        $pembandingCount = count($request->input('alamat_pembanding', []));
+
+        for ($i = 0; $i < $pembandingCount; $i++) {
+            $pembanding = $this->formatSinglePembanding($request, $i);
+
+            // Perbaikan penanganan foto pembanding
+            $fotoKey = "foto_objek_pembanding_{$i}"; // Sesuaikan dengan nama field di form
+            if ($request->hasFile($fotoKey)) {
+                $pembanding['foto_objek'] = $this->handleFileUpload(
+                    $request->file($fotoKey),
+                    'pembanding',
+                    "pembanding_{$i}"
+                );
+            }
+
+            $dataPembanding[] = $pembanding;
+        }
+
+        return $dataPembanding;
+    }
+
+    private function handleFileUpload($file, $folder, $prefix)
+    {
+        if (!$file) {
+            return null;
         }
 
+        try {
+            // Buat nama file yang unik
+            $extension = $file->getClientOriginalExtension();
+            $fileName = $prefix . '_' . time() . '_' . uniqid() . '.' . $extension;
+
+            // Pastikan folder exists
+            $path = storage_path("app/public/{$folder}");
+            if (!File::exists($path)) {
+                File::makeDirectory($path, 0777, true);
+            }
+
+            // Simpan file
+            $file->storeAs("public/{$folder}", $fileName);
+
+            // Log untuk debugging
+            \Log::info("File berhasil disimpan: {$folder}/{$fileName}");
+
+            return $fileName;
+        } catch (\Exception $e) {
+            \Log::error("Error saat upload file: " . $e->getMessage());
+            throw $e;
+        }
+    }
+
+    private function formatSinglePembanding($request, $index)
+    {
+        $fields = [
+            'alamat', 'desa', 'kecamatan', 'kabupaten', 'provinsi',
+            'tahun', 'luas_tanah', 'luas_bangunan', 'tahun_bangunan',
+            'status_nara_sumber', 'harga', 'nama_nara_sumber',
+            'peruntukan', 'penawaran_transaksi', 'nomor_tlp',
+            'kordinat_lat', 'kordinat_lng', 'jenis_aset',
+        ];
+
+        $pembanding = [];
+        foreach ($fields as $field) {
+            $inputName = "{$field}_pembanding";
+            $pembanding[$field] = $request->input($inputName)[$index] ?? null;
+        }
+
+        // Inisialisasi foto_objek sebagai null
+        $pembanding['foto_objek'] = null;
+
+        return $pembanding;
+    }
+
+    public function storeDataPembanding(Request $request)
+    {
         try {
             DB::beginTransaction();
 
-            // $action = $request->input('type');
-            // $rules = $this->getActionSpecificRules($data, $action, $request);
+            $validator = $request->validate([
+                'permohonan_id' => 'required|exists:permohonan,id',
+                'type' => 'required|string',
+                'jenis_jaminan_id' => 'required',
+                'foto_objek' => 'nullable|image|max:2048',
+                'foto_objek_pembanding_*' => 'nullable|image|max:2048',
+            ]);
 
-            $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first();
-
-            if (!$inspeksi) {
-                Inspeksi::create([
-                    'permohonan_id' => $request->input('permohonan_id'),
-                    'data_pembanding' => json_encode($data),
-                    'name' => $request->input('type'),
-                    'jenis_jaminan_id' => $request->input('jenis_jaminan_id'),
-                ]);
-            } else {
-                $inspeksi->update(['data_pembanding' => json_encode($data)]);
+            if ($validator->fails()) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Validasi gagal',
+                    'errors' => $validator->errors()
+                ], 422);
             }
 
+            $objekPenilaian = $this->formatObjekPenilaian($request);
+            if ($request->hasFile('foto_objek')) {
+                $objekPenilaian['foto_objek'] = $this->handleFileUpload(
+                    $request->file('foto_objek'),
+                    'pembanding',
+                    'objek_penilaian'
+                );
+            }
+
+            $formattedData = [
+                'permohonan_id' => $request->input('permohonan_id'),
+                'type' => $request->input('type'),
+                'jenis_jaminan_id' => $request->input('jenis_jaminan_id'),
+                'objek_penilaian' => $objekPenilaian,
+                'data_pembanding' => $this->formatDataPembanding($request)
+            ];
+
+            $inspeksi = $this->saveInspeksi($formattedData);
+
             DB::commit();
 
-            return response()->json(['success' => true, 'message' => 'Data saved successfully', 'data' => json_encode($data)], 200);
-        } catch (Exception $e) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Data berhasil disimpan',
+                'data' => $formattedData
+            ], 200);
+
+        } catch (\Exception $e) {
             DB::rollBack();
-            return response()->json(['success' => false, 'message' => 'Failed to save data: ' . $e->getMessage()], 500);
+            return response()->json([
+                'success' => false,
+                'message' => 'Gagal menyimpan data: ' . $e->getMessage()
+            ], 500);
         }
     }
-    
+
+
+
     /**
      * Form inspeksi.
      */
@@ -583,9 +703,9 @@ class SurveyorController extends Controller
 
 
         $link_url_region = Teams::with('regions', 'teamsUsers')
-        ->whereHas('teamsUsers', function ($query) {
-            $query->where('user_id', Auth::user()->id);
-        })->first();
+            ->whereHas('teamsUsers', function ($query) {
+                $query->where('user_id', Auth::user()->id);
+            })->first();
 
         $branches  = Branch::all();
         $provinces = Province::all();
@@ -725,8 +845,9 @@ class SurveyorController extends Controller
 
     public function dataPembanding($id, $jaminanId)
     {
-        $permohonan = Permohonan::with(
-            [
+        try {
+            // Ambil data permohonan dengan eager loading
+            $permohonan = Permohonan::with([
                 'user',
                 'debiture.province',
                 'debiture.city',
@@ -735,28 +856,65 @@ class SurveyorController extends Controller
                 'branch',
                 'tujuanPenilaian',
                 'penilaian'
-            ],
-        )->findOrFail($id);
-        $surveyor = $id;
-        $branches  = Branch::all();
-        $provinces = Province::all();
+            ])->findOrFail($id);
 
-        $data = $this->getCommonData();
+            // Ambil data inspeksi
+            $inspeksi = Inspeksi::where([
+                'permohonan_id' => $id,
+                'jenis_jaminan_id' => $jaminanId
+            ])->first();
 
-        $inpeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first();
-        $forminspeksi = null;
-        if ($inpeksi) {
-            $forminspeksi = $inpeksi;
-            // $forminspeksi = json_decode($inpeksi->data_form, true);
+            // Inisialisasi variabel
+            $inspectionData = null;
+            $comparisons = null;
+            $fotoForm = null;
+
+
+            if ($inspeksi) {
+
+                $inspectionData = json_decode($inspeksi->data_form, true);
+                if (json_last_error() !== JSON_ERROR_NONE) {
+                    throw new \Exception('Error decoding inspection data: ' . json_last_error_msg());
+                }
+
+                if ($inspeksi->data_pembanding) {
+                    $comparisons = json_decode($inspeksi->data_pembanding, true);
+                    if (json_last_error() !== JSON_ERROR_NONE) {
+                        throw new \Exception('Error decoding comparison data: ' . json_last_error_msg());
+                    }
+
+
+                }
+                $fotoForm = json_decode($inspeksi->foto_form, true);
+
+            }
+
+            // Ambil data pendukung
+            $data = $this->getCommonData();
+            $branches = Branch::all();
+            $provinces = Province::all();
+
+            return view('lpj::surveyor.components.data-pembanding', compact(
+                'permohonan',
+                'id',
+                'branches',
+                'provinces',
+                'inspectionData',
+                'comparisons',
+                'data',
+                'jaminanId',
+                'fotoForm'
+            ));
+
+        } catch (\Exception $e) {
+            return redirect()
+                ->back()
+                ->with('error', 'Terjadi kesalahan saat memuat data: ' . $e->getMessage());
         }
-
-        // return response()->json($forminspeksi);
-        return view('lpj::surveyor.components.data-pembanding', compact('permohonan', 'surveyor', 'branches', 'provinces', 'forminspeksi', 'data'));
     }
 
 
 
-
     private function getHeader(string $type): array
     {
         return self::HEADERS[$type] ?? [];
@@ -793,13 +951,12 @@ class SurveyorController extends Controller
 
                 if (!$modelClass) {
                     return redirect()
-                        ->route('basicdata.'. $type .'.index')
+                        ->route('basicdata.' . $type . '.index')
                         ->with('error', 'Invalid type specified.');
                 }
 
                 if ($type == 'spek-bangunan') {
                     $validate['spek_kategori_bagunan_id'] = $request->spek_kategori_bagunan_id;
-
                 }
 
 
@@ -807,12 +964,11 @@ class SurveyorController extends Controller
                 $modelClass::create($data);
 
                 return redirect()
-                    ->route('basicdata.' . $type .'.index')
+                    ->route('basicdata.' . $type . '.index')
                     ->with('success', 'created successfully');
-
             } catch (Exeception $e) {
                 return redirect()
-                    ->route('basicdata.' . $type .'.index')
+                    ->route('basicdata.' . $type . '.index')
                     ->with('error', $th->getMessage());
             }
         }
@@ -861,7 +1017,6 @@ class SurveyorController extends Controller
         $spekKategoriBagunan = null;
         if ($type == 'spek-bangunan') {
             $spekKategoriBagunan = SpekKategoritBangunan::all();
-
         }
 
 
@@ -877,7 +1032,6 @@ class SurveyorController extends Controller
 
             if ($type == 'spek-bangunan') {
                 $validate['spek_kategori_bagunan_id'] = $request->spek_kategori_bagunan_id;
-
             }
 
             // Check if the provided type exists in the modelClasses
@@ -914,23 +1068,23 @@ class SurveyorController extends Controller
                 'penilaian',
                 'documents',
             ])->findOrFail($id);
-    
+
             $jenisAssetUpdated = false;
             if ($request->input('types') == 'jenis_asset') {
                 $this->updateJenisAsset($permohonan, $request);
                 $jenisAssetUpdated = true;
             }
-    
+
             if (in_array($request->input('types'), ['analisa_tanah', 'analisa_bangunan', 'analisa_unit'])) {
                 $key = match ($request->input('types')) {
                     'analisa_tanah' => 'luas_tanah',
                     'analisa_bangunan' => 'luas_bangunan',
                     'analisa_unit' => 'luas_unit',
                 };
-    
+
                 $this->updateDetails($permohonan, $key, $request->input($key));
             }
-    
+
             return response()->json([
                 'success' => true,
                 'message' => 'Data berhasil disimpan',
@@ -940,8 +1094,8 @@ class SurveyorController extends Controller
             return response()->json(['error' => 'Something went wrong', 'message' => $e->getMessage()], 500);
         }
     }
-    
-    
+
+
     private function updateJenisAsset($permohonan, $request)
     {
         $jenis_jaminan_id = $permohonan->debiture->documents->first()->jenis_jaminan_id;
@@ -951,35 +1105,35 @@ class SurveyorController extends Controller
                 'jenis_jaminan_id' => $request->input('jenis_asset'),
             ]);
     }
-    
+
     private function updateDetails($permohonan, $key, $newValue)
     {
         $document = $permohonan->debiture->documents->first();
-    
+
         if (!$document) {
             throw new \Exception("Document not found");
         }
-    
+
         $detailsUpdate = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->first();
-    
+
         if (!$detailsUpdate) {
             throw new \Exception("DetailDokumenJaminan not found");
         }
-    
+
         $datas = json_decode($detailsUpdate->details, true) ?? [];
-    
+
         if (is_numeric($newValue)) {
             $newValue = [$key => $newValue];
         }
-    
+
         if (!is_array($newValue)) {
             throw new \InvalidArgumentException("'{$key}' must be an array or valid JSON string");
         }
-    
+
         foreach ($newValue as $subKey => $value) {
             $datas[$subKey] = $value; // Update atau tambahkan key baru
         }
-    
+
         $detailsUpdate->update([
             'details' => json_encode($datas),
         ]);
@@ -1036,7 +1190,7 @@ class SurveyorController extends Controller
         }
 
         $filteredRecords = $query->count();
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'jenisFasilitasKredit','penilaian'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'jenisFasilitasKredit', 'penilaian'])->get();
 
         $pageCount = ceil($totalRecords / $size);
 
@@ -1187,10 +1341,10 @@ class SurveyorController extends Controller
                 $query->where('jenis_jaminan_id', $jaminanId);
             }
         ])
-        ->whereHas('debiture.documents', function ($query) use ($jaminanId) {
-            $query->where('jenis_jaminan_id', $jaminanId);
-        })
-        ->findOrFail($id);
+            ->whereHas('debiture.documents', function ($query) use ($jaminanId) {
+                $query->where('jenis_jaminan_id', $jaminanId);
+            })
+            ->findOrFail($id);
     }
 
 
@@ -1230,6 +1384,7 @@ class SurveyorController extends Controller
         'fasilitas-objek' => FasilitasObjek::class,
         'merupakan-daerah' => MerupakanDaerah::class,
         'jenis-unit' => JenisUnit::class,
+        'perkerasan-jalan' => PerkerasanJalan::class,
     ];
 
 
@@ -1267,8 +1422,7 @@ class SurveyorController extends Controller
             'fasilitasObjek' => FasilitasObjek::all(),
             'merupakanDaerah' => MerupakanDaerah::all(),
             'jenisUnit' => JenisUnit::all(),
-
-
+            'jenisJaminan' => JenisJaminan::all(),
         ];
     }
 
@@ -1301,88 +1455,137 @@ class SurveyorController extends Controller
         'posisi-unit' => ['Posisi unit', 'posisi-unit'],
         'bentuk-unit' => ['Bentuk unit', 'bentuk-unit'],
         'fasilitas-objek' => ['Fasilitas Umum Dekat Objek', 'fasilitas-objek'],
-     ];
+    ];
 
-    private function getAssetData($data)
+    private function getAssetData(array $data): array
     {
-        return [
-            'asset' =>[
-            'debitur_perwakilan' => $data['debitur_perwakilan'] ?? [],
-            'jenis_asset' => $data['jenis_asset'] ?? null,
-            'jenis_asset_tidak_sesuai' => $data['jenis_asset_tidak_sesuai'] ?? null,
-            'alamat_sesuai' => $data['alamat_sesuai'] ?? null,
-            'alamat_tidak_sesuai' => $data['alamat_tidak_sesuai'] ?? null,
+        $alamatData = [
             'nama_jalan' => $data['nama_jalan'] ?? null,
             'desa_kelurahan' => $data['desa_kelurahan'] ?? null,
             'kecamatan' => $data['kecamatan'] ?? null,
             'kota_kabupaten' => $data['kota_kabupaten'] ?? null,
             'provinsi' => $data['provinsi'] ?? null,
-            'kordinat_lng' => $data['kordinat_lng'] ?? null,
-            'kordinat_lat' => $data['kordinat_lat'] ?? null,
-        ]];
+        ];
+
+        return [
+            'asset' => [
+                'debitur_perwakilan' => $data['debitur_perwakilan'] ?? [],
+                'jenis_asset' => [
+                    $data['jenis_asset'] => ($data['jenis_asset'] === 'sesuai')
+                        ? $data['jenis_asset_name']
+                        : ($data['jenis_asset_tidak_sesuai'] ?? null)
+                ],
+                'alamat' => [
+                    $data['alamat_sesuai'] => $alamatData
+                ],
+                'hub_cadeb' => [
+                    $data['hub_cadeb'] => $this->getFieldData(
+                        $data,
+                        'hub_cadeb',
+                        true
+                    )
+                ],
+                'hub_cadeb_penghuni' => [
+                    $data['hub_cadeb_penghuni'] => $this->getFieldData(
+                        $data,
+                        'hub_cadeb_penghuni',
+                        true
+                    )
+                ],
+
+                'kordinat_lng' => $data['kordinat_lng'] ?? null,
+                'kordinat_lat' => $data['kordinat_lat'] ?? null,
+            ]
+        ];
     }
 
 
-    private function getTanahData($data, $request): array
+    private function getTanahData(array $data): array
     {
         return [
             'tanah' => [
-
-            'luas_tanah' => $data['luas_tanah'] ?? null,
-            'luas_tanah_tidak_sesuai' => $data['luas_tanah_tidak_sesuai'] ?? null,
-            'hadap_mata_angin' => $data['hadap_mata_angin'] ?? null,
-            'hadap_mata_angin_tidak_sesuai' => $data['hadap_mata_angin_tidak_sesuai'] ?? null,
-            'bentuk_tanah' => $data['bentuk_tanah'] ?? null,
-            'bentuk_tanah_lainnya' => $data['bentuk_tanah_lainnya'] ?? null,
-            'kontur_tanah' => $data['kontur_tanah'] ?? [],
-            'ketinggian_tanah' => $data['ketinggian_tanah'] ?? [],
-            'ketinggian_tanah_tidak_sesuai' => $data['ketinggian_tanah_tidak_sesuai'] ?? [],
-            'kontur_jalan' => $data['kontur_jalan'] ?? null,
-            'ketinggian_jalan' => $data['ketinggian_jalan'] ?? [],
-            'posisi_kavling' => $data['posisi_kavling'] ?? [],
-            'posisi_kavling_lainnya' => $data['posisi_kavling_lainnya'] ?? null,
-            'tusuk_sate' => $data['tusuk_sate'] ?? null,
-            'lockland' => $data['lockland'] ?? null,
-            'kondisi_fisik_tanah' => $data['kondisi_fisik_tanah'] ?? [],
-            'kondisi_fisik_tanah_lainnya' => $data['kondisi_fisik_tanah_lainnya'] ?? null,
-            ],
+                'luas_tanah' => $this->getFieldData(
+                    $data,
+                    'luas_tanah',
+                    true
+                ),
+                'hadap_mata_angin' => $this->getFieldData(
+                    $data,
+                    'hadap_mata_angin',
+                    true
+                ),
+                'bentuk_tanah' => $this->getFieldData(
+                    $data,
+                    'bentuk_tanah',
+                    false,
+                    'lainnya'
+                ),
+                'kontur_tanah' => $data['kontur_tanah'] ?? [],
+                'ketinggian_tanah' => [
+                    'ketinggian' => $data['kontur_tanah'] ?? null,
+                    'lebih_tinggi' => $data['ketinggian_lebih_tinggi'] ?? null,
+                    'lebih_rendah' => $data['ketinggian_lebih_rendah'] ?? null
+                ],
+                'kontur_jalan' => $data['kontur_jalan'] ?? null,
+                'ketinggian_jalan' => $data['ketinggian_jalan'] ?? [],
+                'posisi_kavling' => $this->getFieldData(
+                    $data,
+                    'posisi_kavling',
+                    false,
+                    'lainnya'
+                ),
+                'tusuk_sate' => $data['tusuk_sate'] ?? null,
+                'lockland' => $data['lockland'] ?? null,
+                'kondisi_fisik_tanah' => $this->getFieldData(
+                    $data,
+                    'kondisi_fisik_tanah',
+                    false,
+                    'lainnya'
+                )
+            ]
         ];
     }
 
+
     private function getBangunanData($data, $request): array
     {
         $data = $request->all();
         $result = [];
 
-    // foreach ($data['nama_bagunan'] as $index => $bangunan) {
-    //     $bangunanData = [
-    //         'bangunan' => $bangunan,
-    //         'kategori' => []
-    //     ];
+        // foreach ($data['nama_bangunan'] as $index => $bangunan) {
+        //     $bangunanData = [
+        //         'bangunan' => $bangunan,
+        //         'kategori' => []
+        //     ];
 
-    //     foreach ($data['spek_kategori_bangunan'] as $kategoriIndex => $kategori) {
-    //         if (isset($data['spek_bangunan'][$kategori])) {
-    //             $bangunanData['kategori'][] = [
-    //                 'kategori' => $kategori,
-    //                 'spesifikasi' => $data['spek_bangunan'][$kategori]
-    //             ];
-    //         }
-    //     }
+        //     foreach ($data['spek_kategori_bangunan'] as $kategoriIndex => $kategori) {
+        //         if (isset($data['spek_bangunan'][$kategori])) {
+        //             $bangunanData['kategori'][] = [
+        //                 'kategori' => $kategori,
+        //                 'spesifikasi' => $data['spek_bangunan'][$kategori]
+        //             ];
+        //         }
+        //     }
 
-    //     $result[] = $bangunanData;
-    // }
+        //     $result[] = $bangunanData;
+        // }
 
         return [
             'bangunan' => [
-            'luas_tanah_bagunan' => $data['luas_tanah_bagunan'] ?? null,
-            'jenis_bangunan' => $data['jenis_bangunan'] ?? null,
-            'kondisi_bangunan' => $data['kondisi_bangunan'] ?? null,
-            'sifat_bangunan' => $data['sifat_bangunan'] ?? null,
-            'sifat_bangunan_input' => $data['sifat_bangunan_input'] ?? null,
-            'spesifikasi_bangunan' => $result ?? null,
-            // 'spek_bangunan' => $data['spek_bangunan'] ?? [],
-            'sarana_pelengkap' => $data['sarana_pelengkap'] ?? [],
-            'sarana_pelengkap_input' => $data['sarana_pelengkap_input'] ?? null,
+                'luas_tanah_bagunan' => $this->getFieldData(
+                    $data,
+                    'luas_tanah_bagunan',
+                    true
+                ),
+                'jenis_bangunan' => $data['jenis_bangunan'] ?? null,
+                'kondisi_bangunan' => $data['kondisi_bangunan'] ?? null,
+                'sifat_bangunan' => $data['sifat_bangunan'] ?? null,
+                'sifat_bangunan_input' => $data['sifat_bangunan_input'] ?? null,
+                'spesifikasi_bangunan' => $result ?? null,
+                'sarana_pelengkap' => $this->mapArrayWithInputs(
+                    $data['sarana_pelengkap'] ?? [],
+                    $data['sarana_pelengkap_input'] ?? []
+                ),
             ],
         ];
     }
@@ -1391,27 +1594,30 @@ class SurveyorController extends Controller
     {
         return [
             'lingkungan' => [
-            'jarak_jalan_utama' => $data['jarak_jalan_utama'] ?? null,
-            'jalan_linkungan' => $data['jalan_linkungan'] ?? null,
-            'jarak_cbd_point' => $data['jarak_cbd_point'] ?? null,
-            'nama_cbd_point' => $data['nama_cbd_point'] ?? null,
-            'lebar_perkerasan_jalan' => $data['lebar_perkerasan_jalan'] ?? null,
-            'perkerasan_jalan' => $data['perkerasan_jalan'] ?? null,
-            'lalu_lintas' => $data['lalu_lintas'] ?? null,
-            'gol_mas_sekitar' => $data['gol_mas_sekitar'] ?? null,
-            'tingkat_keramaian' => $data['tingkat_keramaian'] ?? null,
-            'terletak_diarea' => $data['terletak_diarea'] ?? null,
-            'disekitar_lokasi' => $data['disekitar_lokasi'] ?? null,
-            'kondisi_bangunan_sekitar' => $data['kondisi_bangunan_sekitar'] ?? null,
-            'sifat_bangunan_sekitar' => $data['sifat_bangunan_sekitar'] ?? null,
-            'dekat_makam' => $data['dekat_makam'] ?? null,
-            'jarak_makam' => $data['jarak_makam'] ?? null,
-            'nama_makam' => $data['nama_makam'] ?? null,
-            'dekat_tps' => $data['dekat_tps'] ?? null,
-            'jarak_tps' => $data['jarak_tps'] ?? null,
-            'nama_tps' => $data['nama_tps'] ?? null,
-            'merupakan_daerah' => $data['merupakan_daerah'] ?? null,
-            'fasilitas_dekat_object' => $data['fasilitas_dekat_object'] ?? null,
+                'jarak_jalan_utama' => $data['jarak_jalan_utama'] ?? null,
+                'jalan_linkungan' => $data['jalan_linkungan'] ?? null,
+                'jarak_cbd_point' => $data['jarak_cbd_point'] ?? null,
+                'nama_cbd_point' => $data['nama_cbd_point'] ?? null,
+                'lebar_perkerasan_jalan' => $data['lebar_perkerasan_jalan'] ?? null,
+                'perkerasan_jalan' => $data['perkerasan_jalan'] ?? null,
+                'lalu_lintas' => $data['lalu_lintas'] ?? null,
+                'gol_mas_sekitar' => $data['gol_mas_sekitar'] ?? null,
+                'tingkat_keramaian' => $data['tingkat_keramaian'] ?? null,
+                'terletak_diarea' => $data['terletak_diarea'] ?? null,
+                'disekitar_lokasi' => $data['disekitar_lokasi'] === 'yes' ? [
+                        'kondisi' => $data['kondisi_bagunan_disekitar_lokasi'] ?? null,
+                        'sifat' => $data['sifat_bagunan_disekitar_lokasi'] ?? null,
+                    ] : $data['disekitar_lokasi'],
+                'kondisi_bangunan_sekitar' => $data['kondisi_bangunan_sekitar'] ?? null,
+                'sifat_bangunan_sekitar' => $data['sifat_bangunan_sekitar'] ?? null,
+                'dekat_makam' => $data['dekat_makam'] ?? null,
+                'jarak_makam' => $data['jarak_makam'] ?? null,
+                'nama_makam' => $data['nama_makam'] ?? null,
+                'dekat_tps' => $data['dekat_tps'] ?? null,
+                'jarak_tps' => $data['jarak_tps'] ?? null,
+                'nama_tps' => $data['nama_tps'] ?? null,
+                'merupakan_daerah' => $data['merupakan_daerah'] ?? null,
+                'fasilitas_dekat_object' => $data['fasilitas_dekat_object'] ?? null,
             ]
         ];
     }
@@ -1420,24 +1626,26 @@ class SurveyorController extends Controller
     {
         $factData = [
             'fakta' => [
-            'fakta_positif' => $data['fakta_positif'] ?? null,
-            'fakta_negatif' => $data['fakta_negatif'] ?? null,
-            'rute_menuju' => $data['rute_menuju'] ?? null,
-            'batas_batas' => $data['batas_batas'] ?? null,
-            'batas_batas_input' => $data['batas_batas_input'] ?? null,
-            'kondisi_lingkungan' => $data['kondisi_lingkungan'] ?? null,
-            'kondisi_lain_bangunan' => $data['kondisi_lain_bangunan'] ?? null,
-            'informasi_dokument' => $data['informasi_dokument'] ?? null,
-            'peruntukan' => $data['peruntukan'] ?? null,
-            'kdb' => $data['kdb'] ?? null,
-            'kdh' => $data['kdh'] ?? null,
-            'gsb' => $data['gsb'] ?? null,
-            'max_lantai' => $data['max_lantai'] ?? null,
-            'klb' => $data['klb'] ?? null,
-            'gss' => $data['gss'] ?? null,
-            'pelebaran_jalan' => $data['pelebaran_jalan'] ?? null,
-            'nama_petugas' => $data['nama_petugas'] ?? null,
-            'keterangan' => $data['keterangan'] ?? null,
+                'fakta_positif' => $data['fakta_positif'] ?? null,
+                'fakta_negatif' => $data['fakta_negatif'] ?? null,
+                'rute_menuju' => $data['rute_menuju'] ?? null,
+                'batas_batas' => $this->mapArrayWithInputs(
+                    $data['batas_batas'] ?? null,
+                    $data['batas_batas_input'] ?? null
+                ),
+                'kondisi_lingkungan' => $data['kondisi_lingkungan'] ?? null,
+                'kondisi_lain_bangunan' => $data['kondisi_lain_bangunan'] ?? null,
+                'informasi_dokument' => $data['informasi_dokument'] ?? null,
+                'peruntukan' => $data['peruntukan'] ?? null,
+                'kdb' => $data['kdb'] ?? null,
+                'kdh' => $data['kdh'] ?? null,
+                'gsb' => $data['gsb'] ?? null,
+                'max_lantai' => $data['max_lantai'] ?? null,
+                'klb' => $data['klb'] ?? null,
+                'gss' => $data['gss'] ?? null,
+                'pelebaran_jalan' => $data['pelebaran_jalan'] ?? null,
+                'nama_petugas' => $data['nama_petugas'] ?? null,
+                'keterangan' => $data['keterangan'] ?? null,
             ]
         ];
 
@@ -1462,7 +1670,7 @@ class SurveyorController extends Controller
                     $factData[$fotoType] = $dataForm[$fotoType] ?? null;
                 }
             }
-        }else{
+        } else {
             foreach ($fotoTypes as $fotoType) {
                 $factData[$fotoType] = $this->updateOrDeleteFile($data, $request, $fotoType);
             }
@@ -1852,9 +2060,11 @@ class SurveyorController extends Controller
     {
         return [
             'action' => $data['action'] ?? null,
-            'luas_unit' => $data['luas_unit'] ?? null,
-            'luas_unit_tidak_sesuai' => $data['luas_unit_tidak_sesuai'] ?? null,
-            'jenis_unit' => $data['jenis_unit'] ?? null,
+            'luas_unit' => $this->getFieldData(
+                $data,
+                'luas_unit',
+                true
+            ),
             'kondisi_unit' => $data['kondisi_unit'] ?? null,
             'posisi_unit' => $data['posisi_unit'] ?? null,
             'lantai' => $data['lantai'] ?? null,
@@ -1865,9 +2075,15 @@ class SurveyorController extends Controller
 
 
 
+    /**
+     * Helper untuk upload file
+     *
+     * @param $file
+     * @param $type
+     * @return path name
+     */
 
 
-    // function upload file to storage
     private function uploadFile($file, $type)
     {
         if (!$file->isValid()) {
@@ -1884,5 +2100,75 @@ class SurveyorController extends Controller
         return str_replace('public/', '', $path);
     }
 
-}
 
+    /**
+     * Helper untuk memetakan array dengan inputannya
+     *
+     * @param array $keys Array kunci
+     * @param array $values Array nilai/input
+     * @return array
+     */
+    private function mapArrayWithInputs(array $keys, array $values): array
+    {
+        $result = [];
+
+        foreach ($keys as $index => $key) {
+            $result[$key] = $values[$index] ?? null;
+        }
+
+        return $result;
+    }
+
+
+
+    /**
+     * Helper method generic untuk mengambil data field
+     *
+     * @param array $data Array sumber data
+     * @param string $fieldName Nama field
+     * @param bool $checkKesesuaian Apakah perlu cek kesesuaian
+     * @param string|null $extraField Field tambahan (misal 'lainnya')
+     * @return array
+     */
+    private function getFieldData(
+        array $data,
+        string $fieldName,
+        bool $checkKesesuaian = false,
+        ?string $extraField = null
+    ): array {
+        if ($checkKesesuaian) {
+            return [
+                $data[$fieldName] ?? '' => ($data[$fieldName] ?? '') === 'sesuai'
+                    ? ($data["{$fieldName}_sesuai"] ?? '')
+                    : ($data["{$fieldName}_tidak_sesuai"] ?? '')
+            ];
+        }
+
+        $result = [
+            $fieldName => $data[$fieldName] ?? null
+        ];
+
+        if ($extraField) {
+            $result[$extraField] = $data["{$fieldName}_{$extraField}"] ?? null;
+        }
+
+        return $result;
+    }
+
+
+    public function export(string $type)
+    {
+        $modelClass = $this->getModelClass($type);
+
+        if (!$modelClass) {
+
+            return response()->json([
+                'message' => 'Invalid type provided.',
+                'available_types' => array_keys($this->modelClasses),
+            ], 400);
+        }
+
+        // Return Excel download
+        return Excel::download(new BasicDataSurveyorExport($modelClass), $type . '.xlsx');
+    }
+}
diff --git a/app/Http/Requests/FormSurveyorRequest.php b/app/Http/Requests/FormSurveyorRequest.php
index 0a3245b..25f32c2 100644
--- a/app/Http/Requests/FormSurveyorRequest.php
+++ b/app/Http/Requests/FormSurveyorRequest.php
@@ -71,8 +71,10 @@ class FormSurveyorRequest extends FormRequest
     {
         return  [
             'luas_tanah' => 'required',
+            'luas_tanah_sesuai' => 'nullable',
             'luas_tanah_tidak_sesuai' => 'nullable',
             'hadap_mata_angin' => 'required',
+            'hadap_mata_angin_sesuai' => 'nullable',
             'hadap_mata_angin_tidak_sesuai' => 'nullable',
             'bentuk_tanah' => 'nullable|array',
             'bentuk_tanah_lainnya' => 'nullable',
@@ -95,12 +97,14 @@ class FormSurveyorRequest extends FormRequest
     {
         return  [
             'action' => 'required',
+            'luas_tanah_bangunan_sesuai' => 'nullable',
             'luas_tanah_bagunan' => 'required',
+            'luas_tanah_bangunan_tidak_sesuai' => 'nullable',
             'jenis_bangunan' => 'required',
             'kondisi_bangunan' => 'nullable',
             'sifat_bangunan' => 'required|array',
             'sifat_bangunan_input' => 'nullable|array',
-            'nama_bagunan' => 'required',
+            'nama_bagunan' => 'required|nullable',
             'spek_kategori_bangunan.*' => 'required',
             'spek_bangunan.*' => 'required',
             'sarana_pelengkap' => 'required',
@@ -116,8 +120,8 @@ class FormSurveyorRequest extends FormRequest
         return  [
             'action' => 'required',
             'luas_unit' => 'required',
+            'luas_unit_sesuai' => 'nullable',
             'luas_unit_tidak_sesuai' => 'nullable',
-            'jenis_unit' => 'required|array',
             'kondisi_unit' => 'required|array',
             'posisi_unit' => 'required|array',
             'lantai' => 'required|array',
@@ -145,8 +149,8 @@ class FormSurveyorRequest extends FormRequest
             'tingkat_keramaian' => 'nullable',
             'terletak_diarea' => 'nullable',
             'disekitar_lokasi' => 'nullable',
-            'kondisi_bangunan_sekitar' => 'nullable',
-            'sifat_bangunan_sekitar' => 'nullable',
+            'kondisi_bagunan_disekitar_lokasi' => 'nullable',
+            'sifat_bagunan_disekitar_lokasi' => 'nullable',
             'dekat_makam' => 'nullable',
             'jarak_makam' => 'nullable',
             'nama_makam' => 'nullable',
@@ -511,10 +515,19 @@ class FormSurveyorRequest extends FormRequest
             'permohonan_id' => 'required',
             'type' => 'required',
             'debitur_perwakilan' => 'required|array',
+            'jenis_asset_name' => 'nullable',
             'jenis_asset' => 'required',
             'jenis_asset_tidak_sesuai' => 'nullable',
             'alamat_sesuai' => 'required',
             'alamat_tidak_sesuai' => 'nullable',
+
+            'hub_cadeb' => 'required',
+            'hub_cadeb_sesuai' => 'nullable',
+            'hub_cadeb_tidak_sesuai' => 'nullable',
+            'hub_cadeb_penghuni' => 'required',
+            'hub_cadeb_penghuni_sesuai' => 'nullable',
+            'hub_cadeb_penghuni_tidak_sesuai' => 'nullable',
+
             'nama_jalan' => 'nullable',
             'desa_kelurahan' => 'nullable',
             'kecamatan' => 'nullable',
diff --git a/app/Http/Requests/JenisJaminanRequest.php b/app/Http/Requests/JenisJaminanRequest.php
index 96d9653..9f4d076 100644
--- a/app/Http/Requests/JenisJaminanRequest.php
+++ b/app/Http/Requests/JenisJaminanRequest.php
@@ -19,7 +19,7 @@
                 'name'                       => 'required|max:255',
                 'slug'                       => 'required|max:255',
                 'jenis_legalitas_jaminan_id' => 'nullable',
-                'form_kategori.*'             => 'required',
+                'form_kategori'              => 'required',
             ];
         }
 
@@ -39,13 +39,14 @@
                 $this->merge([
                     'code' => IdGenerator::generate(
                         ['table' => 'jenis_jaminan', 'length' => 5, 'prefix' => 'JJ', 'field' => 'code'],
-                    )
+                    ),
                 ]);
             }
 
             $this->merge([
                 'jenis_legalitas_jaminan_id' => json_encode($this->jenis_legalitas_jaminan_id),
-                'slug' => Str::slug($this->name),
+                'form_kategori'              => json_encode($this->form_kategori),
+                'slug'                       => Str::slug($this->name),
             ]);
         }
     }
diff --git a/app/Http/Requests/PersetujuanPenawaranRequest.php b/app/Http/Requests/PersetujuanPenawaranRequest.php
index 53315db..5f85f6e 100644
--- a/app/Http/Requests/PersetujuanPenawaranRequest.php
+++ b/app/Http/Requests/PersetujuanPenawaranRequest.php
@@ -18,8 +18,8 @@
                 'nomor_proposal_penawaran'   => 'nullable|string|max:255',
                 'tanggal_proposal_penawaran' => 'nullable|date',
                 'biaya_final'                => 'nullable|numeric|min:0',
-                'sla_resume'                 => 'nullable|date',
-                'sla_final'                  => 'nullable|date|after_or_equal:sla_resume',
+                'sla_resume'                 => 'nullable|numeric|min:0',
+                'sla_final'                  => 'nullable|numeric|min:0',
                 'file_persetujuan_penawaran' => 'nullable|file|mimes:pdf,doc,docx|max:10240',
                 'surat_representasi'         => 'nullable|file|mimes:pdf,doc,docx|max:10240',
                 'bukti_bayar'                => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240',
@@ -43,10 +43,7 @@
                 'biaya_final.numeric'                 => 'Biaya final harus berupa angka.',
                 'biaya_final.min'                     => 'Biaya final tidak boleh kurang dari 0.',
                 'sla_resume.required'                 => 'SLA Resume wajib diisi.',
-                'sla_resume.date'                     => 'SLA Resume harus berupa tanggal yang valid.',
                 'sla_final.required'                  => 'SLA Final wajib diisi.',
-                'sla_final.date'                      => 'SLA Final harus berupa tanggal yang valid.',
-                'sla_final.after_or_equal'            => 'SLA Final harus sama dengan atau setelah SLA Resume.',
                 'file_persetujuan_penawaran.file'     => 'File Persetujuan Penawaran harus berupa file.',
                 'file_persetujuan_penawaran.mimes'    => 'File Persetujuan Penawaran harus berupa file PDF, DOC, atau DOCX.',
                 'file_persetujuan_penawaran.max'      => 'Ukuran File Persetujuan Penawaran tidak boleh lebih dari 10MB.',
diff --git a/app/Http/Requests/SurveyorRequest.php b/app/Http/Requests/SurveyorRequest.php
index 379d24b..ec41731 100644
--- a/app/Http/Requests/SurveyorRequest.php
+++ b/app/Http/Requests/SurveyorRequest.php
@@ -37,6 +37,7 @@ class SurveyorRequest extends FormRequest
         'posisi-unit' => 'posisi_unit',
         'bentuk-unit' => 'bentuk_unit',
         'fasilitas-objek' => 'fasilitas_objek',
+        'perkerasan-jalan' => 'perkerasan_jalan',
     ];
 
     /**
diff --git a/app/Models/Inspeksi.php b/app/Models/Inspeksi.php
index ebbe399..47e042a 100644
--- a/app/Models/Inspeksi.php
+++ b/app/Models/Inspeksi.php
@@ -14,7 +14,7 @@ class Inspeksi extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','jenis_jaminan_id'];
+    protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','jenis_jaminan_id','data_pembanding'];
 
     public function permohonan()
     {
diff --git a/app/Models/PersetujuanPenawaran.php b/app/Models/PersetujuanPenawaran.php
index 15176de..6a58bc2 100644
--- a/app/Models/PersetujuanPenawaran.php
+++ b/app/Models/PersetujuanPenawaran.php
@@ -29,8 +29,6 @@
 
         protected $casts = [
             'tanggal_proposal_penawaran' => 'date',
-            'sla_resume'                 => 'date',
-            'sla_final'                  => 'date',
             'biaya_final'                => 'decimal:2',
             'status'                     => 'boolean',
             'authorized_status'          => 'boolean',
diff --git a/app/Models/Regions.php b/app/Models/Regions.php
index 7b5519c..f5aef83 100644
--- a/app/Models/Regions.php
+++ b/app/Models/Regions.php
@@ -23,4 +23,8 @@ class Regions extends Model
     public function teams(){
         return $this->hasMany(Teams::class, 'regions_id', 'id');
     }
+
+    public function penilaiTeam(){
+        return $this->hasMany(PenilaianTeam::class, 'team_id', 'id');
+    }
 }
diff --git a/database/migrations/2024_12_03_021006_update_persetujuan_penawaran_table.php b/database/migrations/2024_12_03_021006_update_persetujuan_penawaran_table.php
new file mode 100644
index 0000000..c48ca41
--- /dev/null
+++ b/database/migrations/2024_12_03_021006_update_persetujuan_penawaran_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('persetujuan_penawaran', function (Blueprint $table) {
+            $table->string('sla_resume')->nullable()->change();
+            $table->string('sla_final')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('persetujuan_penawaran', function (Blueprint $table) {
+            $table->datetime('sls_resume')->nullable(false)->change();
+            $table->datetime('sla_final')->nullable(false)->change();
+        });
+    }
+};
diff --git a/database/migrations/2024_12_04_041852_update_name_inspeksi_table.php b/database/migrations/2024_12_04_041852_update_name_inspeksi_table.php
new file mode 100644
index 0000000..424957e
--- /dev/null
+++ b/database/migrations/2024_12_04_041852_update_name_inspeksi_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('inspeksi', function (Blueprint $table) {
+            $table->string('name')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('inspeksi', function (Blueprint $table) {
+            $table->string('name')->nullable(false)->change();
+        });
+    }
+};
diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php
index 2e4189f..29cbb0a 100644
--- a/resources/views/activity/progres_activity/index.blade.php
+++ b/resources/views/activity/progres_activity/index.blade.php
@@ -51,13 +51,12 @@
                 @php
 
                     $sortedTeamsActivity = $teamsActivity->sortBy(function ($item) {
-                        return $item->team->penilaianTeam
-                            ->filter(function ($penilaianTeam) use ($item) {
-                                return $penilaianTeam->user_id == $item->user->id;
+                        return $item->team->regions->penilaiTeam
+                            ->filter(function ($penilaiTeam) use ($item) {
+                                return $penilaiTeam->user_id == $item->user->id;
                             })
                             ->count();
                     });
-
                 @endphp
 
                 @foreach ($sortedTeamsActivity as $index => $item)
@@ -74,14 +73,7 @@
                                     </th>
                                     <th class="min-w-[150px]">
                                         <span class="text-base text-gray-900 font-normal">
-                                            @php
-                                                $totalTasks = $item->team->penilaianTeam
-                                                    ->filter(function ($penilaianTeam) use ($item) {
-                                                        return $penilaianTeam->user_id == $item->user->id;
-                                                    })
-                                                    ->count();
-                                            @endphp
-                                            <p>Total Task: {{ $totalTasks }}</p>
+                                            <p>Total Task: {{ countPermohonanForUser($item->user->id) }}</p>
                                         </span>
                                     </th>
                                     <th>
@@ -208,7 +200,7 @@
                             tanggal_kunjungan: {
                                 title: 'Tgl Kunjungan',
                                 render: (item, data) =>
-                                    `${formatDateFromISO(data.tanggal_kunjungan) || ''}`,
+                                    `${formatDateFromISO(data.waktu_penilaian) || ''}`,
                             },
                             progress: {
                                 title: 'Progress',
@@ -222,6 +214,7 @@
                                     return `${mulai.getDate()}-${mulai.getMonth() + 1}-${mulai.getFullYear()} - ${selesai.getDate()}-${selesai.getMonth() + 1}-${selesai.getFullYear()}`
                                 },
                             },
+
                             paparan: {
                                 title: 'Paparan',
                                 render: (item, data) => `${data.paparan || ''}`,
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index ef1e068..f88589f 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -176,16 +176,67 @@
                             LAMPIRAN FOTO DAN DOKUMEN
                         </a>
 
-                        <a class="btn btn-primary"  data-modal-toggle="#modal_2">
+                        <a class="btn btn-primary" data-modal-toggle="#modal_2">
                             KERTAS KERJA
                         </a>
                         <a class="btn btn-primary" href="#">
                             PAPARAN
                         </a>
 
-                        <a class="btn btn-primary" href="#">
-                            WORKSHEET
-                        </a>
+                        <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
+                            <button class="dropdown-toggle btn btn-primary">
+                                WORKSHEET
+                            </button>
+                            <div class="dropdown-content w-full max-w-56 py-2">
+                                <div class="menu menu-default flex flex-col w-full">
+                                    <div class="menu-item">
+                                        <a class="menu-link" href="#">
+                                            <span class="menu-icon">
+                                                <i class="ki-outline ki-badge">
+                                                </i>
+                                            </span>
+                                            <span class="menu-title">
+                                                MEMO
+                                            </span>
+                                        </a>
+                                    </div>
+                                    <div class="menu-item">
+                                        <a class="menu-link" href="#">
+                                            <span class="menu-icon">
+                                                <i class="ki-outline ki-profile-circle">
+                                                </i>
+                                            </span>
+                                            <span class="menu-title">
+                                                RESUME
+                                            </span>
+                                        </a>
+                                    </div>
+                                    <div class="menu-item">
+                                        <a class="menu-link" onclick="seletSederhanaStandart()">
+                                            <span class="menu-icon">
+                                                <i class="ki-outline ki-setting-2">
+                                                </i>
+                                            </span>
+                                            <span class="menu-title">
+                                                LPJ
+                                            </span>
+
+                                        </a>
+                                    </div>
+                                    <div class="menu-item">
+                                        <a class="menu-link" href="#">
+                                            <span class="menu-icon">
+                                                <i class="ki-outline ki-message-programming">
+                                                </i>
+                                            </span>
+                                            <span class="menu-title">
+                                                RAP
+                                            </span>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
 
                     <div class="flex justify-end gap-5">
@@ -211,6 +262,7 @@
 
 
 
+
     <div class="modal" data-modal="true" id="modal_2">
         <div class="modal-content modal-center-y max-w-[600px]">
             <div class="modal-header">
@@ -232,13 +284,34 @@
                     </div>
                 </div>
                 <div class="form-group flex items-baseline flex-wrap">
-                
-                    <a class="btn btn-outline btn-primary w-full" href="#">Export Kertas Kerja</a>
+
+                    <a class="btn btn-outline btn-primary w-full"
+                        href="{{ route('penilai.export.kertas-kerja', $permohonan->id) }}">Export Kertas Kerja</a>
                 </div>
             </div>
             <div class="modal-footer">
-             
+
             </div>
         </div>
     </div>
 @endsection
+
+
+<script>
+    function seletSederhanaStandart() {
+        Swal.fire({
+            title: 'Apakah kamu akan memilih lpj standar?',
+            icon: 'warning',
+            showDenyButton: true,
+            showCancelButton: false,
+            confirmButtonText: 'Yes',
+            denyButtonText: 'No',
+        }).then((result) => {
+            if (result.isConfirmed) {
+                
+            } else if (result.isDenied) {
+                Swal.fire('Changes are not saved', '', 'info')
+            }
+        })
+    }
+</script>
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index ef62489..88e0105 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -254,7 +254,7 @@
 
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">
-                                Jadwal Kunjungan
+                                Tanggal assign
                             </label>
 
                             <div class="flex flex-wrap items-baseline w-full">
diff --git a/resources/views/persetujuan_penawaran/form.blade.php b/resources/views/persetujuan_penawaran/form.blade.php
index 5506a39..6d56cb2 100644
--- a/resources/views/persetujuan_penawaran/form.blade.php
+++ b/resources/views/persetujuan_penawaran/form.blade.php
@@ -46,7 +46,7 @@
                             SLA Resume
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="date" name="sla_resume" id="sla_resume" class="input w-full @error('sla_resume') border-danger bg-danger-light @enderror" value="{{ old('sla_resume', $persetujuanPenawaran->sla_resume ?? '') }}">
+                            <input type="number" name="sla_resume" id="sla_resume" class="input w-full @error('sla_resume') border-danger bg-danger-light @enderror" value="{{ old('sla_resume', $persetujuanPenawaran->sla_resume ?? '') }}">
                             @error('sla_resume')
                             <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
@@ -58,7 +58,7 @@
                             SLA Final
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="date" name="sla_final" id="sla_final" class="input w-full @error('sla_final') border-danger bg-danger-light @enderror" value="{{ old('sla_final', $persetujuanPenawaran->sla_final ?? '') }}">
+                            <input type="number" name="sla_final" id="sla_final" class="input w-full @error('sla_final') border-danger bg-danger-light @enderror" value="{{ old('sla_final', $persetujuanPenawaran->sla_final ?? '') }}">
                             @error('sla_final')
                             <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
diff --git a/resources/views/persetujuan_penawaran/index.blade.php b/resources/views/persetujuan_penawaran/index.blade.php
index 6a31257..c2e6c49 100644
--- a/resources/views/persetujuan_penawaran/index.blade.php
+++ b/resources/views/persetujuan_penawaran/index.blade.php
@@ -176,26 +176,10 @@
                             },
                         },
                         sla_resume: {
-                            title: 'SLA Resume',
-                            render: (item, data) => {
-                                if(data.penawaran_tender.persetujuan) {
-                                    if (data.penawaran_tender.persetujuan.sla_resume) {
-                                        return window.formatTanggalIndonesia(`${data.penawaran_tender.persetujuan.sla_resume}`);
-                                    }
-                                }
-                                return '-';
-                            },
+                            title: 'SLA Resume'
                         },
                         sla_final: {
-                            title: 'SLA Final',
-                            render: (item, data) => {
-                                if(data.penawaran_tender.persetujuan) {
-                                    if (data.penawaran_tender.persetujuan.sla_final) {
-                                        return window.formatTanggalIndonesia(`${data.penawaran_tender.persetujuan.sla_final}`);
-                                    }
-                                }
-                                return '-';
-                            }
+                            title: 'SLA Final'
                         },
                         catatan: {
                             title: 'Catatan',
diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php
index 654f2d0..c965938 100644
--- a/resources/views/surveyor/components/apartemen-kantor.blade.php
+++ b/resources/views/surveyor/components/apartemen-kantor.blade.php
@@ -12,26 +12,44 @@
             <!-- Luas tanah -->
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Luas Unit</label>
+                @if (isset($permohonan->debiture->documents))
+                    @foreach ($permohonan->debiture->documents as $item)
+                        @php
+                            $luas = $item->detail;
+                            $details = json_decode($luas[0]->details, true);
+                            $luas_unit = isset($details['luas_unit']) ? $details['luas_unit'] : 'N/A';
+                        @endphp
+                        <input type="hidden" name="luas_unit_sesuai" class="input" value="{{ $luas_unit }}">
+                        <p class="text-2sm text-gray-700">{{ $luas_unit }} m<sup>2</sup></p>
+                    @endforeach
+
+                @endif
+
                 <div class="flex flex-wrap items-baseline w-full">
                     <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
                         <label class="form-label flex items-center gap-3 text-nowrap">
-                            <input onclick="toggleFieldVisibility('luas_unit','luas_unit_tidak_sesuai', ['tidak sesuai'])" type="radio" class="radio" name="luas_unit" value="sesuai"
+                            <input
+                                onclick="toggleFieldVisibility('luas_unit','luas_unit_tidak_sesuai', ['tidak sesuai'])"
+                                type="radio" class="radio" name="luas_unit" value="sesuai"
                                 {{ old('luas_unit', $forminspeksi['luas_unit'] ?? '') == 'sesuai' ? 'checked' : '' }}>
                             <span class="ml-2">Sesuai</span>
                         </label>
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input onclick="toggleFieldVisibility('luas_unit','luas_unit_tidak_sesuai', ['tidak sesuai'])" type="radio" class="radio" name="luas_unit" value="tidak sesuai"
+                            <input
+                                onclick="toggleFieldVisibility('luas_unit','luas_unit_tidak_sesuai', ['tidak sesuai'])"
+                                type="radio" class="radio" name="luas_unit" value="tidak sesuai"
                                 {{ old('luas_unit', $forminspeksi['luas_unit'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
                             <span class="ml-2">Tidak Sesuai</span>
                         </label>
 
                         <div id="luas_unit_tidak_sesuai" class="flex items-baseline gap-2"
-                                    style="{{ old('luas_unit', $forminspeksi['luas_unit'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
-                                    <input id="analisa_luas_unit_tidak_sesuai" type="text" name="luas_unit_tidak_sesuai" class="input w-full"
-                                        placeholder="Masukan Luas Tanah"
-                                        value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}">
-                                    <button type="button" class="btn btn-md btn-primary" onclick="updateAnalisa('analisa_unit')">Save</button>
-                                </div>
+                            style="{{ old('luas_unit', $forminspeksi['luas_unit'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                            <input id="analisa_luas_unit_tidak_sesuai" type="text" name="luas_unit_tidak_sesuai"
+                                class="input w-full" placeholder="Masukan Luas Tanah"
+                                value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}">
+                            <button type="button" class="btn btn-md btn-primary"
+                                onclick="updateAnalisa('analisa_unit')">Save</button>
+                        </div>
                     </div>
                     <em id="error-luas_unit" class="alert text-danger text-sm"></em>
                 </div>
@@ -94,8 +112,8 @@
                                             {{ in_array($item->name, old('lantai', $forminspeksi['lantai'] ?? [])) ? 'checked' : '' }} />
                                         {{ $item->name }}
                                     </label>
-                                    <input type="text" name="lantai_input[]" class="input w-full"
-                                        id="lantaiInput" placeholder="Masukkan {{ $item->name }}..."
+                                    <input type="text" name="lantai_input[]" class="input w-full" id="lantaiInput"
+                                        placeholder="Masukkan {{ $item->name }}..."
                                         value="{{ old('lantai_input.' . $loop->index, $forminspeksi['lantai_input'][$loop->index] ?? '') }}">
                                 </div>
                             @endforeach
diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php
index b78b11b..474bfd6 100644
--- a/resources/views/surveyor/components/bangunan.blade.php
+++ b/resources/views/surveyor/components/bangunan.blade.php
@@ -7,47 +7,53 @@
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Luas Bagunan</label>
                 <div class="mt-2">
-            
-                @if (isset($permohonan->debiture->documents))
-                @foreach ($permohonan->debiture->documents as $item)
-                @php
-                    $luas = $item->detail;
-                    $details = json_decode($luas[0]->details, true);
-                    $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 'N/A';
-                @endphp
-                <p class="text-2sm text-gray-700">{{ $luas_bangunan }} m<sup>2</sup></p>
-            @endforeach
-            
-                @endif
-                <div class="flex flex-wrap items-baseline w-full">
-                    <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
-                        <label class="form-label flex items-center gap-3 text-nowrap">
-                            <input type="radio"
-                                onclick="toggleFieldVisibility('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai', ['tidak sesuai'])"
-                                class="radio" name="luas_tanah_bagunan" value="sesuai"
-                                {{ old('luas_tanah_bagunan', $forminspeksi['bangunan']['luas_tanah_bagunan'] ?? '') == 'sesuai' ? 'checked' : '' }}>
-                            <span class="ml-2">Sesuai</span>
-                        </label>
-                        <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input type="radio" class="radio" name="luas_tanah_bagunan"
-                                onclick="toggleFieldVisibility('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai',  ['tidak sesuai'])"
-                                value="tidak sesuai"
-                                {{ old('luas_tanah_bagunan', $forminspeksi['bangunan']['luas_tanah_bagunan'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
-                            <span class="ml-2">Tidak Sesuai</span>
-                        </label>
 
-                        <div id="luas_tanah_bagunan_tidak_sesuai" class="flex items-baseline gap-2"
-                            style="{{ old('luas_tanah_bagunan_bagunan', $forminspeksi['bangunan']['luas_tanah_bagunan_bagunan'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
-                            <input type="text"id="analisa_bangunan_tidak_sesuai"  name="luas_tanah_bagunan_tidak_sesuai" class="input w-full"
-                                placeholder="Masukan Luas Bangunan Tidak Sesuai..."
-                                value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan_tidak_sesuai'] ?? '') }}">
-                            <button type="button" class="btn btn-md btn-primary" onclick="updateAnalisa('analisa_bangunan')">Save</button>
+                    @if (isset($permohonan->debiture->documents))
+                        @foreach ($permohonan->debiture->documents as $item)
+                            @php
+                                $luas = $item->detail;
+                                $details = json_decode($luas[0]->details, true);
+                                $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 'N/A';
+                            @endphp
+                            <input type="hidden" name="luas_bangunan_sesuai" class="input" value="{{ $luas_bangunan }}">
+                            <p class="text-2sm text-gray-700">{{ $luas_bangunan }} m<sup>2</sup></p>
+                        @endforeach
+
+                    @endif
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
+                            <label class="form-label flex items-center gap-3 text-nowrap">
+                                <input type="radio"
+                                    onclick="toggleFieldVisibility('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai', ['tidak sesuai'])"
+                                    class="radio" name="luas_tanah_bagunan" value="sesuai"
+                                    {{ old('luas_tanah_bagunan', isset($forminspeksi['bangunan']['luas_tanah_bagunan']['sesuai'])) ? 'checked' : '' }}>
+                                <span class="ml-2">Sesuai</span>
+                            </label>
+                            <label class="form-label flex items-center gap-2.5 text-nowrap">
+                                <input type="radio" class="radio" name="luas_tanah_bagunan"
+                                    onclick="toggleFieldVisibility('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai',  ['tidak sesuai'])"
+                                    value="tidak sesuai"
+                                    {{ old('luas_tanah_bagunan', isset($forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'])) ? 'checked' : '' }}>
+                                <span class="ml-2">Tidak Sesuai</span>
+                            </label>
+
+                            <div id="luas_tanah_bagunan_tidak_sesuai" class="flex items-baseline gap-2"
+                                style="{{ isset($forminspeksi['bangunan']['luas_tanah_bagunan']['tidak_sesuai']) ? '' : 'display: none;' }}">
+                                <input type="text" id="analisa_bangunan_tidak_sesuai"
+                                    name="luas_tanah_bagunan_tidak_sesuai" class="input w-full"
+                                    placeholder="Masukan Luas Bangunan Tidak Sesuai..."
+                                    value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak_sesuai'] ?? '') }}">
+                                <button type="button" class="btn btn-md btn-primary"
+                                    onclick="updateAnalisa('analisa_bangunan')">
+                                    Save
+                                </button>
+                            </div>
+
                         </div>
+                        <em id="error-luas_tanah_bagunan" class="alert text-danger text-sm"></em>
                     </div>
-                    <em id="error-luas_tanah_bagunan" class="alert text-danger text-sm"></em>
                 </div>
             </div>
-            </div>
 
 
             <!-- Jenis Bangunan -->
@@ -60,19 +66,14 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="jenis_bangunan[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ old('jenis_bangunan') == $item->name || isset($forminspeksi['bangunan']['jenis_bangunan']) == $item->name ? 'checked' : '' }} />
+                                        {{ old('jenis_bangunan') == $item->name || isset($forminspeksi['bangunan']['jenis_bangunan']) == $item->name ? 'checked' : '' }}
+                                        onclick="toggleCheckboxVisibility('jenis_bangunan', 'jenis_bangunan_lainnya', ['lainnya'])" />
                                     {{ $item->name }}
                                 </label>
-                                @if (strcasecmp($item->name, 'lainnya') == 0)
-                                    <div class="flex items-center">
-                                        <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                            <input class="checkbox" name="jenis_bangunan[]" type="checkbox"
-                                                value="{{ $item->name }}" />
-                                            {{ $item->name }}
-                                        </label>
-                                        <input type="text" name="jenis_bangunan" class="input mt-2"
-                                            id="bentukTanahInput" placeholder="Masukkan Jenis Bangunan...">
-                                    </div>
+                                @if (strcasecmp($item->name, 'Lainnya') == 0)
+                                    <input id="jenis_bangunan_lainnya" type="text" style="display: none;"
+                                        name="jenis_bangunan_lainnya" class="input w-full mt-2"
+                                        placeholder="Masukkan lainnya..." />
                                 @endif
                             @endforeach
                         @endif
@@ -153,7 +154,7 @@
                                 @if (@isset($spekKategoriBagunan))
                                     @foreach ($spekKategoriBagunan as $item)
                                         <div>
-                                            <input type="hidden" name="spek_kategori_bangunan.[]"
+                                            <input type="hidden" name="spek_kategori_bangunan[]"
                                                 value="{{ $item->name }}">
                                             <label
                                                 class="form-label flex items-center gap-3 text-nowrap">{{ $item->name }}</label>
@@ -163,7 +164,7 @@
                                                         @if ($spek->spek_kategori_bangunan_id == $item->id)
                                                             <label class="form-label flex items-center gap-2.5">
                                                                 <input class="checkbox"
-                                                                name="spek_bangunan[{{ $item->name }}][]"
+                                                                    name="spek_bangunan[{{ $item->name }}][]"
                                                                     type="checkbox" value="{{ $spek->name }}" />
                                                                 {{ $spek->name }}
                                                             </label>
@@ -199,16 +200,28 @@
                     <div class="flex flex-col items-start gap-4">
                         @if (isset($saranaPelengkap))
                             @foreach ($saranaPelengkap as $item)
+                                @php
+                                    $isChecked = false;
+                                    $inputValue = '';
+
+                                    if (isset($forminspeksi['bangunan']['sarana_pelengkap'])) {
+                                        foreach ($forminspeksi['bangunan']['sarana_pelengkap'] as $key => $value) {
+                                            if ($key === $item->name) {
+                                                $isChecked = true;
+                                                $inputValue = $value;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                @endphp
                                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                     <label class="form-label max-w-56 gap-2.5" style="width: 500px">
                                         <input class="checkbox" name="sarana_pelengkap[]" type="checkbox"
-                                            value="{{ $item->name }}"
-                                            {{ in_array($item->name, old('sarana_pelengkap', $forminspeksi['bangunan']['sarana_pelengkap'] ?? [])) ? 'checked' : '' }} />
+                                            value="{{ $item->name }}" {{ $isChecked ? 'checked' : '' }} />
                                         {{ $item->name }}
                                     </label>
                                     <input type="text" name="sarana_pelengkap_input[]" class="input w-full"
-                                        id="bentukTanahInput" placeholder="Masukkan {{ $item->name }}..."
-                                        value="{{ old('sarana_pelengkap_input.' . $loop->index, $forminspeksi['bangunan']['sarana_pelengkap_input'][$loop->index] ?? '') }}">
+                                        placeholder="Masukkan {{ $item->name }}..." value="{{ $inputValue }}">
                                 </div>
                             @endforeach
                         @endif
@@ -216,6 +229,7 @@
                     <em id="error-sarana_pelengkap" class="alert text-danger text-sm"></em>
                 </div>
             </div>
+
         </div>
     </div>
 </div>
diff --git a/resources/views/surveyor/components/card-tambah.blade.php b/resources/views/surveyor/components/card-tambah.blade.php
index 23370f9..510c28a 100644
--- a/resources/views/surveyor/components/card-tambah.blade.php
+++ b/resources/views/surveyor/components/card-tambah.blade.php
@@ -1,78 +1,100 @@
 <div class="grid grid-cols-1 lg:grid-cols-2 gap-5 lg:gap-7.5">
     @foreach ($permohonan->debiture->documents as $dokumen)
-        @if (request()->has('form') && request('form') === 'denah')
-            <a class="card border-2 border-dashed border-brand-clarity bg-center bg-[length:600px] bg-no-repeat add-new-bg"
-                href="{{ route('surveyor.denah', ['id' => $permohonan->id, 'jaminanId' => $dokumen->jenisJaminan->id]) }}?form=create-denah&denah={{ $permohonan->id }}&jenis_jaminan={{ $dokumen->jenisJaminan->id }}">
-            @elseif(request()->has('form') && request('form') === 'foto')
-                <a class="card border-2 border-dashed border-brand-clarity bg-center bg-[length:600px] bg-no-repeat add-new-bg"
-                    href="{{ route('surveyor.foto', ['id' => $permohonan->id, 'jaminanId' => $dokumen->jenisJaminan->id]) }}?form=create-foto&foto={{ $permohonan->id }}&jenis_jaminan={{ $dokumen->jenisJaminan->id }}">
-            @elseif(request()->has('form') && request('form') === 'inspeksi')
-                    <a class="card border-2 border-dashed border-brand-clarity bg-center bg-[length:600px] bg-no-repeat add-new-bg"
-                        href="{{ route('surveyor.inspeksi', ['id' => $permohonan->id, 'jaminanId' => $dokumen->jenisJaminan->id]) }}?form=create-inspeksi&inspeksi={{ $permohonan->id }}&jenis_jaminan={{ $dokumen->jenisJaminan->id }}">
+        @php
+            $jaminanId = $dokumen->jenisJaminan->id;
+            $currentInspeksi = $inspeksiData[$jaminanId] ?? null;
 
-        @elseif(request()->has('form') && request('form') === 'data-pembanding')
-                        <a class="card border-2 border-dashed border-brand-clarity bg-center bg-[length:600px] bg-no-repeat add-new-bg"
-                            href="{{ route('surveyor.data-pembanding', ['id' => $permohonan->id, 'jaminanId' => $dokumen->jenisJaminan->id]) }}?form=data-pembanding&pembanding={{ $permohonan->id }}&jenis_jaminan={{ $dokumen->jenisJaminan->id }}">
-        @endif
+            $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT'];
 
-        <div class="card-body grid items-center">
-            <div class="flex flex-col gap-3">
-                <div class="flex justify-center pt-5">
-                    <div class="relative size-[60px] shrink-0">
+            $href = [
+                [
+                    'label' => 'form inspeksi',
+                    'url' => route('surveyor.inspeksi', [
+                        'id' => $permohonan->id,
+                        'jaminanId' => $jaminanId,
+                    ]) . "?form=create-inspeksi&inspeksi={$permohonan->id}&jenis_jaminan={$jaminanId}",
+                    'show' => true,
+                    'icon' => !empty($currentInspeksi['data_form']),
+                ],
+            ];
+
+            if (!in_array(strtoupper($dokumen->jenisJaminan->name), $tanahBangunanTypes)) {
+                $href[] = [
+                    'label' => 'denah tanah dan bangunan',
+                    'url' => route('surveyor.denah', [
+                        'id' => $permohonan->id,
+                        'jaminanId' => $jaminanId,
+                    ]) . "?form=create-denah&denah={$permohonan->id}&jenis_jaminan={$jaminanId}",
+                    'show' => true,
+                    'icon' => !empty($currentInspeksi['denah_form']),
+                ];
+            }
+
+            $href = array_merge($href, [
+                [
+                    'label' => 'foto',
+                    'url' => route('surveyor.foto', [
+                        'id' => $permohonan->id,
+                        'jaminanId' => $jaminanId,
+                    ]) . "?form=create-foto&foto={$permohonan->id}&jenis_jaminan={$jaminanId}",
+                    'show' => true,
+                    'icon' => !empty($currentInspeksi['foto_form']),
+                ],
+                [
+                    'label' => 'data pembanding',
+                    'url' => route('surveyor.data-pembanding', [
+                        'id' => $permohonan->id,
+                        'jaminanId' => $jaminanId,
+                    ]) . "?form=data-pembanding&pembanding={$permohonan->id}&jenis_jaminan={$jaminanId}",
+                    'show' => true,
+                    'icon' => !empty($currentInspeksi['data_pembanding']),
+                ],
+            ]);
+        @endphp
+
+        <div class="card border-2 border-dashed border-brand-clarity bg-center bg-[length:600px] bg-no-repeat add-new-bg grid gap-5"
+            style="padding: 20px">
+            <div class="card-group flex items-center flex-wrap sm:flex-nowrap justify-between py-4 gap-2.5">
+                <div class="flex items-center gap-3.5">
+                    <div class="relative size-[50px] shrink-0">
                         <svg class="w-full h-full stroke-brand-clarity fill-light" fill="none" height="48"
-                            viewBox="0 0 44 48" width="44" xmlns="http://www.w3.org/2000/svg">
-                            <path
-                                d="M16 2.4641C19.7128 0.320509 24.2872 0.320508 28 2.4641L37.6506 8.0359C41.3634 10.1795 43.6506 14.141 43.6506 18.4282V29.5718C43.6506 33.859 41.3634 37.8205 37.6506 39.9641L28 45.5359C24.2872 47.6795 19.7128 47.6795 16 45.5359L6.34937 39.9641C2.63655 37.8205 0.349365 33.859 0.349365 29.5718V18.4282C0.349365 14.141 2.63655 10.1795 6.34937 8.0359L16 2.4641Z"
-                                fill=""></path>
-                            <path
-                                d="M16.25 2.89711C19.8081 0.842838 24.1919 0.842837 27.75 2.89711L37.4006 8.46891C40.9587 10.5232 43.1506 14.3196 43.1506 18.4282V29.5718C43.1506 33.6804 40.9587 37.4768 37.4006 39.5311L27.75 45.1029C24.1919 47.1572 19.8081 47.1572 16.25 45.1029L6.59937 39.5311C3.04125 37.4768 0.849365 33.6803 0.849365 29.5718V18.4282C0.849365 14.3196 3.04125 10.5232 6.59937 8.46891L16.25 2.89711Z"
-                                stroke=""></path>
-                        </svg>
-                        <div class="absolute leading-none left-2/4 top-2/4 -translate-y-2/4 -translate-x-2/4">
-                            <i class="ki-filled ki-additem text-2xl text-brand"></i>
-                        </div>
+                        viewBox="0 0 44 48" width="44" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M16 2.4641C19.7128 0.320509 24.2872 0.320508 28 2.4641L37.6506 8.0359C41.3634 10.1795 43.6506 14.141 43.6506 18.4282V29.5718C43.6506 33.859 41.3634 37.8205 37.6506 39.9641L28 45.5359C24.2872 47.6795 19.7128 47.6795 16 45.5359L6.34937 39.9641C2.63655 37.8205 0.349365 33.859 0.349365 29.5718V18.4282C0.349365 14.141 2.63655 10.1795 6.34937 8.0359L16 2.4641Z" fill=""></path>
+                        <path d="M16.25 2.89711C19.8081 0.842838 24.1919 0.842837 27.75 2.89711L37.4006 8.46891C40.9587 10.5232 43.1506 14.3196 43.1506 18.4282V29.5718C43.1506 33.6804 40.9587 37.4768 37.4006 39.5311L27.75 45.1029C24.1919 47.1572 19.8081 47.1572 16.25 45.1029L6.59937 39.5311C3.04125 37.4768 0.849365 33.6803 0.849365 29.5718V18.4282C0.849365 14.3196 3.04125 10.5232 6.59937 8.46891L16.25 2.89711Z" stroke=""></path>
+                    </svg>
+                    <div class="absolute leading-none left-2/4 top-2/4 -translate-y-2/4 -translate-x-2/4">
+                        <i class="ki-filled ki-additem text-2xl text-brand"></i>
+                    </div>
                     </div>
                 </div>
-                <div class="flex flex-col text-center">
-                    <span class="text-lg font-semibold text-gray-900 hover:text-primary-active mb-px">
-                        @php
-                            $formType = request()->input('form');
-                            $formData = null;
-                            $formAction = 'Tambah';
-                        @endphp
-
-                        @if ($formType === 'inspeksi')
-                            @php
-                                $formData = $forminspeksi ?? null;
-                            @endphp
-                        @elseif ($formType === 'foto')
-                            @php
-                                $formData = $formFoto ?? null;
-                            @endphp
-                        @elseif ($formType === 'denah')
-                            @php
-                                $formData = $formDenah ?? null;
-                            @endphp
-                        @endif
-
-                        @if ($formData)
-                            @php
-                                $formAction = 'Update';
-                            @endphp
-                        @endif
-
-                        {{ $formAction }}
-
-
-                        {{ request('form') }}
-                    </span>
-                    <span class="text-2sm font-normal text-gray-600">
+                <div class="flex items-center gap-2.5">
+                    <span class="flex items-center gap-1.5 leading-none font-medium text-sm text-gray-900">
                         {{ $dokumen->jenisJaminan->name ?? '' }}
                     </span>
                 </div>
-
             </div>
+
+            @foreach ($href as $item)
+                @if ($item['show'])
+                    <a href="{{ $item['url'] }}"
+                        class="flex items-center justify-between border border-gray-200 rounded-xl gap-2 px-4 py-4 btn-outline {{ $item['icon'] ? 'btn-success' : 'btn-primary' }} hover:btn-light">
+                        <div class="flex items-center gap-3.5">
+                            <div class="flex flex-col">
+                                <h1 class="text-sm font-medium text-gray-900 mb-px uppercase">
+                                    {{ $item['label'] }}
+                                </h1>
+                            </div>
+                        </div>
+                        <div class="flex items-center gap-5">
+                            <div class="flex gap-0.5">
+                                <div class="btn btn-sm btn-icon btn-clear {{ $item['icon'] ? '' : 'btn-light' }}">
+                                    <i class="ki-filled {{ $item['icon'] ? 'ki-check-circle' : 'ki-notepad-edit'}}"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                @endif
+            @endforeach
         </div>
-        </a>
     @endforeach
 </div>
diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php
index 28b7f41..046e426 100644
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/resources/views/surveyor/components/data-pembanding.blade.php
@@ -1,829 +1,633 @@
 @extends('layouts.main')
 
-{{-- @section('breadcrumbs')
+@section('breadcrumbs')
     {{ Breadcrumbs::render(request()->route()->getName()) }}
-@endsection --}}
+@endsection
 
 @section('content')
-    @include('lpj::assetsku.includenya')
     <div class="w-full grid gap-5 lg:gap-7.5">
-        <div class="card min-w-full">
-            <div class="card min-w-full">
-                <div class="card-header">
-                    <h3 class="card-title">
-                        Data Pembanding
-                    </h3>
-                    <div class="flex items-center gap-2">
-                        <a href="{
-                        { route('surveyor.show', ['id' => request('pembanding')]) }}?form=data-pembanding
-                         "
-                            class="btn btn-xs btn-info">
-                            <i class="ki-filled ki-exit-left"></i> Back
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
         <div class="grid gap-5">
             <div class="card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
                 data-datatable-state-save="false" id="data-table" data-api-url="">
+
                 <form id="dataPembandingForm" method="POST" enctype="multipart/form-data">
                     @csrf
                     <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
                     <input type="hidden" name="type" value="tanah">
                     <input type="hidden" name="jenis_jaminan_id" value="{{ request('jenis_jaminan') }}">
-        
+
                     <div class="card">
+                        <div class="card-header">
+                            <h3 class="card-title">Data Pembanding</h3>
+                            <div class="flex items-center gap-2">
+                                <a href="{{ route('surveyor.show', ['id' => request('pembanding')]) }}"
+                                    class="btn btn-xs btn-info">
+                                    <i class="ki-filled ki-exit-left"></i> Kembali
+                                </a>
+                            </div>
+                        </div>
+
                         <div class="card-header py-5 flex-wrap flex justify-end">
                             <button type="button" id="addColumnBtn" class="btn btn-primary btn-sm">
-                                <i class="ki-filled ki-plus"></i> Tambah Kolom
+                                <i class="ki-filled ki-plus"></i> Tambah Pembanding
                             </button>
                             <button type="button" id="removeColumnBtn" class="btn btn-danger btn-sm ml-2"
                                 style="display: none;">
-                                <i class="ki-filled ki-minus"></i> Hapus Kolom
+                                <i class="ki-filled ki-minus"></i> Hapus Pembanding
                             </button>
                         </div>
-                        <div class="card-body">
 
+                        {{-- @php
+                            print_r($inspectionData);
+                        @endphp --}}
+
+                        <div class="card-body">
                             <div class="scrollable-x-auto">
                                 <table id="dataTable"
-                                    class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
-                                    data-datatable-table="true">
-                                    <thead>
+                                    class="table table-auto table-border align-middle text-gray-700 font-medium text-sm">
+                                    <thead class="bg-gray-50 sticky top-0">
                                         <tr>
-                                            <th class="min-w-[250px]" data-datatable-column="code" style="min-width: 350px">
-                                                <span class="sort"> <span class="sort-label"> Nama </span>
-                                                    <span class="sort-icon"> </span> </span>
-                                            </th>
-                                            <th class="min-w-[250px]" data-datatable-column="name" style="min-width: 350px">
-                                                <span class="sort"> <span class="sort-label"> Objek Penilaian </span>
-                                                    <span class="sort-icon"> </span> </span>
-                                            </th>
-                                            <th class="min-w-[50px]" data-datatable-column="actions"
-                                                style="min-width: 350px"id="dataPembanding2Header">
-                                                Data Pembanding 1
-                                            </th>
+                                            <th class="px-4 py-3 min-w-[200px]">Parameter</th>
+                                            <th class="px-4 py-3 min-w-[250px]">Objek Penilaian</th>
+                                            <th class="px-4 py-3 min-w-[250px]">Data Pembanding 1</th>
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        <tr>
-                                            <td>
-                                                Foto
-                                            </td>
-                                            <td>
-                                                @php
-                                                    $formFoto = json_decode($forminspeksi['foto_form'], true);
-                                                    $formIns = json_decode($forminspeksi['data_form'], true);
-                                                @endphp
-
-                                                @if (isset($formFoto['object_jaminan']) &&
-                                                        count($formFoto['object_jaminan']) > 0 &&
-                                                        isset($formFoto['object_jaminan'][0]['foto_object']))
-                                                    <img src="{{ asset('storage/' . $formFoto['object_jaminan'][0]['foto_object']) }}"
-                                                        class="img-responsive" alt="Gambar Pendamping"
-                                                        style="width: 10rem; height: 10rem;" id="uploadedImage1">
-                                                @else
-                                                    <img src="#" class="img-responsive" alt="Gambar Pendamping"
-                                                        style="width: 10rem; height: 10rem; display: none;"
-                                                        id="uploadedImage1">
-                                                @endif
-
-                                                <input type="file" class="file-input mt-2" placeholder=""
-                                                    onchange="previewImage(event, 'uploadedImage1')" name="foto_objek[]" />
-                                            </td>
-                                            <td class="text-center">
-                                                <img src="" class="img-responsive" alt="Gambar Pendamping"
-                                                    style="width: 10rem; height: 10rem; display: none;" id="uploadedImage2">
-                                                <input type="file" class="file-input" placeholder=""
-                                                    onchange="previewImage(event, 'uploadedImage2')"
-                                                    name="foto_pembanding[]" />
-                                            </td>
+                                        <!-- Informasi Dasar -->
+                                        <tr class="bg-gray-100">
+                                            <td colspan="3" class="px-4 py-2 font-semibold">Informasi Dasar</td>
                                         </tr>
                                         <tr>
-                                            <td>
-                                                <p>Alamat</p>
-
+                                            <td class="px-4 py-2">Foto</td>
+                                            <td class="px-4 py-2">
+                                                <div class="flex flex-col gap-2">
+                                                    <img id="uploadedImage1"
+                                                        src="{{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? asset('storage/' . $fotoForm['object_jaminan'][0]['foto_objek']) : '' }}"
+                                                        class="max-w-[200px] {{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? '' : 'hidden' }}"
+                                                        alt="Uploaded Image">
+                                                    <input type="file"
+                                                        name="foto_objek"
+                                                        class="file-input"
+                                                        accept="image/*"
+                                                        onchange="previewImage(this, 'uploadedImage1')">
+                                                </div>
                                             </td>
 
-                                            <td>
-                                                <input type="text" class="input"
-                                                    value="{{ isset($formIns['asset']['nama_jalan']) ? $formIns['asset']['nama_jalan'] . ' ' . $formIns['desa_kelurahan'] : '' }}"
-                                                    name="alamat" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="alamat_pembanding[]" />
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>Desa</td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['asset']['kecamatan']) ? $formIns['asset']['desa'] : '' }}"
-                                                    name="desa" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="desa_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>Kecamatan</td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['asset']['kecamatan']) ? $formIns['asset']['kecamatan'] : '' }}"
-                                                    name="kecamatan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="kecamatan_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>Kabupaten</td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['asset']['kota_kabupaten']) ? $formIns['asset']['kota_kabupaten'] : '' }}"
-                                                    name="kabupaten" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="kabupaten_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>Provinsi</td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['asset']['provinsi']) ? $formIns['asset']['provinsi'] : '' }}"
-                                                    name="provinsi" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="provinsi_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Tahun Penilaian
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="tahun" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="tahun_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                Luas Tanah
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="luas_tanah" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="luas_tanah_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                Luas Bangunan
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="luas_bangunan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="luas_bangunan_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                Tahun Bangunan
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="tahun_bangunan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="tahun_bangunan_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Estimasi Tahun Visual
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="estimasi_tahun_visual" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="estimasi_tahun_visual_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Kepemilikan
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="kepemilikan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="kepemilikan_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Harga
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="harga" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="harga_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                Tinggi Lantai
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="tinggi_lantai" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="tinggi_lantai_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Lebar Depan
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="lebar_depan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="lebar_depan_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Lebar Jalan
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="lebar_jalan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="lebar_jalan_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                Sumber
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="sumber" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="sumber_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                Nomor tlp
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="nomor_tlp" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="nomor_tlp_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td colspan="3">
-                                                Titik Lokasi
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Koordinat Lat
-                                            </td>
-                                            <td>
-
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['asset']['kordinat_lat']) ? $formIns['asset']['kordinat_lat'] : '' }}"
-                                                    name="kordinat_lat" />
-
-
-                                            </td>
-                                            <td class="text-center">
-
-                                                <input type="text" class="input" placeholder="Data pembanding"
-                                                    name="kordinat_lat_pembanding[]" />
-
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Koordinat Lng
-                                            </td>
-                                            <td>
-
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['asset']['kordinat_lng']) ? $formIns['asset']['kordinat_lng'] : '' }}"
-                                                    name="kordinat_lng" />
-
-                                            </td>
-                                            <td class="text-center">
-
-
-                                                <input type="text" class="input" placeholder="Data pembanding"
-                                                    name="kordinat_lng_pembanding[]" />
-
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                Link Internet
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="link_internet" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="link_internet_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td colspan="3">Lokasi</td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                <p>Jarak Ke jalan utama</p>
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['lingkungan']['jarak_jalan_utama']) ? $formIns['lingkungan']['jarak_jalan_utama'] : '' }}"
-                                                    name="jarak_jalan_utama" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="jarak_jalan_utama_pembanding[]" />
-
+                                            <td class="px-4 py-2">
+                                                <div class="flex flex-col gap-2">
+                                                    <img id="uploadedImage2" class="max-w-[200px] hidden"
+                                                        alt="Pembanding Image">
+                                                    <input type="file" name="foto_objek_pembanding[]" class="file-input"
+                                                        accept="image/*" onchange="previewImage(this, 'uploadedImage2')">
+                                                </div>
                                             </td>
                                         </tr>
 
 
-                                        <tr>
-                                            <td>
-                                                <p>Lebar jalan depan aset (m)</p>
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['lingkungan']['jarak_cbd_point']) ? $formIns['lingkungan']['jarak_cbd_point'] : '' }}"
-                                                    name="jarak_cbd_point" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="jarak_cbd_point_pembanding[]" />
 
-                                            </td>
+                                        <!-- Data Properti -->
+                                        <tr class="bg-gray-100">
+                                            <td colspan="3" class="px-4 py-2 font-semibold">Data Properti</td>
                                         </tr>
-
                                         <tr>
-                                            <td>
-                                                <p>Posisi kavling</p>
+                                            <td class="px-4 py-2">Jenis Aset</td>
+                                            <td class="px-4 py-2">
+                                                <select name="jenis_aset" class="select">
+                                                    <option value="">Pilih Jenis Aset</option>
+                                                    @foreach ($data['jenisJaminan'] as $item)
+                                                    <option value="{{ $item->name }}" {{ ($inspectionData['asset']['jenis_asset']['sesuai'] ?? '') == $item->name ? 'selected' : '' }}>{{ $item->name }}</option>
+                                                    @endforeach
+
+                                                </select>
                                             </td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['tanah']['posisi_kavling']) ? $formIns['tanah']['posisi_kavling'][0] : '' }}"
-                                                    name="posisi_kavling" />
-
-                                            </td>
-                                            <td class="text-center">
-
-
-
-
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="posisi_kavling_pembanding[]" />
-
-                                                {{-- <in/put type="text" class="input" placeholder="Data Pembanding 1" /> --}}
-
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-
-                                                <p>Tingkat Keramaian (Occupancy)</p>
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['tanah']['tingkat_keramaian']) ? $formIns['tanah']['tingkat_keramaian'][0] : '' }}"
-                                                    name="tingkat_keramaian" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="tingkat_keramaian_pembanding[]" />
+                                            <td class="px-4 py-2">
+                                                <select name="jenis_aset_pembanding[]" class="select">
+                                                    <option value="">Pilih Jenis Aset</option>
+                                                    @foreach ($data['jenisJaminan'] as $item)
+                                                    <option value="{{ $item->name }}" {{ ($inspectionData['jenis_aset'] ?? '') == $item->name ? 'selected' : '' }}>{{ $item->name }}</option>
+                                                    @endforeach
+                                                </select>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan="3">Karakteristik Fisik</td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p>Kondisi Fisik Tanah</p>
-
+                                            <td class="px-4 py-2">Luas Tanah (m²)</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="luas_tanah" class="input number-format"
+                                                    value="{{ $inspectionData['tanah']['luas_tanah']['tidak sesuai'] ?? ($inspectionData['tanah']['luas_tanah']['sesuai'] ?? '') }}">
                                             </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['tanah']['kondisi_fisik_tanah']) ? $formIns['tanah']['kondisi_fisik_tanah'][0] : '' }}"
-                                                    name="kondisi_fisik_tanah" />
-
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="kondisi_fisik_tanah_pembanding[]" />
-
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="luas_tanah_pembanding[]"
+                                                    class="input number-format">
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td>
-                                                <p>Beda Ketinggian dengan Jalan</p>
+                                            <td class="px-4 py-2">Luas Bangunan (m²)</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="luas_tanah_bagunan" class="input number-format"
+                                                    value="{{ $inspectionData['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? ($inspectionData['bangunan']['luas_tanah_bagunan']['sesuai'] ?? '') }}">
                                             </td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['tanah']['ketinggian_jalan']) ? $formIns['tanah']['ketinggian_jalan'][0] : '' }}"
-                                                    name="ketinggian_jalan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="ketinggian_jalan_pembanding[]" />
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="luas_bangunan_pembanding[]"
+                                                    class="input number-format">
                                             </td>
                                         </tr>
 
-                                        <tr>
-                                            <td>
-                                                <p>Bentuk Tanah</p>
-                                            </td>
-                                            <td>
-
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['tanah']['bentuk_tanah']) ? $formIns['tanah']['bentuk_tanah'][0] : '' }}"
-                                                    name="bentuk_tanah" />
-
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="bentuk_tanah_pembanding[]" />
-                                            </td>
+                                        <!-- Informasi Harga -->
+                                        <tr class="bg-gray-100">
+                                            <td colspan="3" class="px-4 py-2 font-semibold">Informasi</td>
                                         </tr>
 
                                         <tr>
-                                            <td>
-                                                <p>Lebar Depan</p>
+                                            <td class="px-4 py-2">Status Narasumber</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="nama_nara_sumber" class="input"
+                                                    value="{{ $inspectionData['nama_nara_sumber'] ?? '' }}">
                                             </td>
-                                            <td>
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['tanah']['bentuk_tanah']) ? $formIns['tanah']['bentuk_tanah'][0] : '' }}"
-                                                    name="lebar_depan" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="lebar_depan_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-
-                                                <p>Fasos Fasum</p>
-
-                                            </td>
-                                            <td>
-
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    name="fasos_fasum" />
-
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="fasos_fasum_pembanding[]" />
-
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="status_nara_sumber_pembanding[]"
+                                                    class="input">
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td>
-
-                                                <p>Lain-lain</p>
+                                            <td class="px-4 py-2">Nama Narasumber</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="nama_nara_sumber" class="input"
+                                                    value="{{ $inspectionData['nama_nara_sumber'] ?? '' }}">
                                             </td>
-                                            <td>
-
-                                                <input type="text" class="input mt-2" placeholder="Objek Penilaian"
-                                                    name="lain_lain" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="lain_lain_pembanding[]" />
-
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Karakteristik Ekonomi
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="karakteristik_ekonomi" />
-                                            </td>
-                                            <td class="text-center">
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="karakteristik_ekonomi_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td colspan="3">Pengunaan</td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                Zonasi/Tata Kota
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="zonasi_tata_kota" />
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="zonasi_tata_kota_pembanding[]" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                KDB
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['fakta']['kdb']) ? $formIns['fakta']['kdb'] : '' }}"
-                                                    name="kdb" />
-
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="kdb_pembanding[]" />
-
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="nama_nara_sumber_pembanding[]"
+                                                    class="input">
                                             </td>
                                         </tr>
 
 
-                                        <tr>
-                                            <td>
-                                                KLB
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['fakta']['klb']) ? $formIns['fakta']['klb'] : '' }}"
-                                                    name="klb" />
-
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="klb_pembanding[]" />
-                                            </td>
+                                        <!-- Lokasi -->
+                                        <tr class="bg-gray-100">
+                                            <td colspan="3" class="px-4 py-2 font-semibold">Lokasi</td>
                                         </tr>
-
                                         <tr>
-                                            <td>
-                                                KTB
+                                            <td class="px-4 py-2">Koordinat</td>
+                                            <td class="px-4 py-2">
+                                                <div class="grid grid-cols-2 gap-2">
+                                                    <input type="text" name="kordinat_lat" class="input"
+                                                        placeholder="Latitude"
+                                                        value="{{ $inspectionData['asset']['kordinat_lat'] ?? '' }}">
+                                                    <input type="text" name="kordinat_lng" class="input"
+                                                        placeholder="Longitude"
+                                                        value="{{ $inspectionData['asset']['kordinat_lng'] ?? '' }}">
+                                                </div>
                                             </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['fakta']['ktb']) ? $formIns['fakta']['ktb'] : '' }}"
-                                                    name="ktb" />
-
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="ktb_pembanding[]" />
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>
-                                                KDH
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    value="{{ isset($formIns['fakta']['kdh']) ? $formIns['fakta']['kdh'] : '' }}"
-                                                    name="kdh" />
-
-                                            </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="kdh_pembanding[]" />
+                                            <td class="px-4 py-2">
+                                                <div class="grid grid-cols-2 gap-2">
+                                                    <input type="text" name="kordinat_lat_pembanding[]" class="input"
+                                                        placeholder="Latitude">
+                                                    <input type="text" name="kordinat_lng_pembanding[]" class="input"
+                                                        placeholder="Longitude">
+                                                </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td>
-                                                Peraturan
+                                            <td class="px-4 py-2">Alamat</td>
+                                            <td class="px-4 py-2">
+                                                <textarea name="alamat" class="input" rows="2">{{ $inspectionData['alamat'] ?? '' }}</textarea>
                                             </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Objek Penilaian"
-                                                    name="peraturan" />
-
+                                            <td class="px-4 py-2">
+                                                <textarea name="alamat_pembanding[]" class="input" rows="2"></textarea>
                                             </td>
-                                            <td>
-                                                <input type="text" class="input" placeholder="Data Pembanding 1"
-                                                    name="peraturan_pembanding[]" />
+                                        </tr>
+                                        <tr>
+                                            <td class="px-4 py-2">Desa/Kelurahan</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="desa" class="input"
+                                                    value="{{ $inspectionData['desa'] ?? '' }}">
+                                            </td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="desa_pembanding[]" class="input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="px-4 py-2">Kecamatan</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="kecamatan" class="input"
+                                                    value="{{ $inspectionData['kecamatan'] ?? '' }}">
+                                            </td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="kecamatan_pembanding[]" class="input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="px-4 py-2">Kabupaten/Kota</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="kabupaten" class="input"
+                                                    value="{{ $inspectionData['kabupaten'] ?? '' }}">
+                                            </td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="kabupaten_pembanding[]" class="input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="px-4 py-2">Provinsi</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="provinsi" class="input"
+                                                    value="{{ $inspectionData['provinsi'] ?? '' }}">
+                                            </td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="provinsi_pembanding[]" class="input">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="px-4 py-2">Harga (Rp)</td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="harga" class="input currency-format"
+                                                    value="{{ $inspectionData['harga'] ?? '' }}">
+                                            </td>
+                                            <td class="px-4 py-2">
+                                                <input type="text" name="harga_pembanding[]"
+                                                    class="input currency-format">
                                             </td>
                                         </tr>
                                     </tbody>
                                 </table>
                             </div>
-
                         </div>
-                    </div>
 
-                    <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
-                        <button type="button" class="btn btn-success" id="saveButton" onclick="submitDataPembanding()">
-                            <span id="saveButtonText">Save</span>
-                            <div class="spinner-border spinner-border-sm text-light" role="status"
-                                style="display: none;" id="saveButtonSpinner">
-                                <span class="visually-hidden">Loading...</span>
+                        <div class="card-footer">
+                            <div class="flex justify-end gap-2">
+                                <button type="submit" class="btn btn-primary">
+                                    <i class="ki-duotone ki-save-2 fs-2"></i>
+                                    Simpan
+                                </button>
                             </div>
-                        </button>
+                        </div>
                     </div>
                 </form>
             </div>
+        </div </div>
+    </div>
 
+    <!-- Loading Overlay -->
+    <div id="loadingOverlay" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
+        <div class="bg-white p-4 rounded-lg">
+            <div class="loader"></div>
+            <p class="mt-2 text-center">Sedang memproses...</p>
         </div>
+    </div>
+@endsection
 
-        <script>
-            let columnCount = 1;
+@push('scripts')
+    <script>
+        let columnCount = 1;
 
-            document.getElementById('addColumnBtn').addEventListener('click', function() {
-                columnCount++;
+        function fillObjekPenilaian(data) {
+            if (!data) return;
 
-                // Create new header cell
-                const headerRow = document.querySelector('#dataTable thead tr');
-                const newHeader = document.createElement('th');
-                newHeader.className = 'min-w-[350px] text-center';
-                newHeader.textContent = `Data Pembanding ${columnCount}`;
-                headerRow.appendChild(newHeader);
+            // Helper function untuk mengisi nilai input dengan aman
+            function setInputValue(selector, value) {
+                const element = document.querySelector(selector);
+                if (element) {
+                    element.value = value || '';
+                }
+            }
 
-                // Show remove column button
-                document.getElementById('removeColumnBtn').style.display = 'inline-block';
+            // Isi data koordinat
+            if (data.asset) {
+                setInputValue('input[name="kordinat_lat"]', data.asset.kordinat_lat);
+                setInputValue('input[name="kordinat_lng"]', data.asset.kordinat_lng);
+            }
 
-                const tableBody = document.querySelector('#dataTable tbody');
-                const rows = tableBody.querySelectorAll('tr');
+            // Isi data tanah
+            if (data.tanah) {
+                const luasTanah = data.tanah.luas_tanah?.sesuai ||
+                    data.tanah.luas_tanah?.['tidak sesuai'] || '';
+                setInputValue('input[name="luas_tanah"]', luasTanah);
+            }
 
-                rows.forEach((row) => {
-                    // Check if this is a colspan row
-                    const colspanCell = row.querySelector('td[colspan]');
-                    if (colspanCell) {
-                        // Update colspan value
-                        const currentColspan = parseInt(colspanCell.getAttribute('colspan'));
-                        colspanCell.setAttribute('colspan', currentColspan + 1);
-                        return; // Skip adding new cell for colspan rows
-                    }
+            // Isi data bangunan
+            if (data.bangunan) {
+                const luasBangunan = data.bangunan.luas_tanah_bagunan?.sesuai ||
+                    data.bangunan.luas_tanah_bagunan?.['tidak sesuai'] || '';
+                setInputValue('input[name="luas_tanah_bagunan"]', luasBangunan);
+            }
 
-                    const newCell = document.createElement('td');
-                    newCell.className = 'text-center';
+            console.log("tee", data.asset.alamat.sesuai.nama_jalan);
 
-                    // Check if the row contains an image upload field
-                    const hasImageUpload = row.querySelector('.file-input');
+            // Isi data umum
+            setInputValue('input[name="alamat"]', data.asset.alamat.sesuai.nama_jalan);
+            setInputValue('input[name="desa"]', data.desa);
+            setInputValue('input[name="kecamatan"]', data.kecamatan);
+            setInputValue('input[name="kabupaten"]', data.kabupaten);
+            setInputValue('input[name="provinsi"]', data.provinsi);
+            setInputValue('input[name="nama_nara_sumber"]', data.nama_nara_sumber);
+            setInputValue('input[name="harga"]', data.harga);
 
-                    if (hasImageUpload) {
-                        // Create image upload structure
-                        const imgContainer = document.createElement('div');
-                        imgContainer.className = 'flex flex-col items-center';
+            // Set jenis aset dengan pengecekan
+            const jenisAsetSelect = document.querySelector('select[name="jenis_aset"]');
+            if (jenisAsetSelect && data.jenis_aset) {
+                jenisAsetSelect.value = data.jenis_aset;
+            }
+        }
 
-                        const imgElement = document.createElement('img');
-                        imgElement.src = '';
-                        imgElement.className = 'img-responsive';
-                        imgElement.alt = 'Gambar Pendamping';
-                        imgElement.style.width = '10rem';
-                        imgElement.style.height = '10rem';
-                        imgElement.style.display = 'none';
-                        imgElement.id = `uploadedImage${columnCount + 1}`;
+        function fillPembandingData(data, index) {
+            if (!data) return;
 
-                        const fileInput = document.createElement('input');
-                        fileInput.type = 'file';
-                        fileInput.className = 'file-input mt-2';
-                        fileInput.name = `foto_pembanding[]`; // Add name attribute for file inputs
-                        fileInput.onchange = function(event) {
-                            previewImage(event, imgElement.id);
-                        };
+            // Helper function untuk mengisi nilai input array dengan aman
+            function setArrayInputValue(name, value, index) {
+                const element = document.getElementsByName(name)[index];
+                if (element) {
+                    element.value = value || '';
+                }
+            }
 
-                        imgContainer.appendChild(imgElement);
-                        imgContainer.appendChild(fileInput);
-                        newCell.appendChild(imgContainer);
-                    } else {
-                        // Create text input for non-image cells
-                        const textInput = document.createElement('input');
-                        textInput.type = 'text';
-                        textInput.className = 'input';
-                        textInput.placeholder = `Data Pembanding ${columnCount}`;
+            // Isi data pembanding
+            const inputs = {
+                'jenis_aset_pembanding[]': data.jenis_aset,
+                'luas_tanah_pembanding[]': data.luas_tanah,
+                'luas_bangunan_pembanding[]': data.luas_bangunan,
+                'status_nara_sumber_pembanding[]': data.status_nara_sumber,
+                'nama_nara_sumber_pembanding[]': data.nama_nara_sumber,
+                'kordinat_lat_pembanding[]': data.kordinat_lat,
+                'kordinat_lng_pembanding[]': data.kordinat_lng,
+                'alamat_pembanding[]': data.alamat,
+                'desa_pembanding[]': data.desa,
+                'kecamatan_pembanding[]': data.kecamatan,
+                'kabupaten_pembanding[]': data.kabupaten,
+                'provinsi_pembanding[]': data.provinsi,
+                'harga_pembanding[]': data.harga
+            };
 
-                        // Get the name from the first column's input
-                        const firstColumnInput = row.querySelector('input[name]');
-                        if (firstColumnInput) {
-                            const baseFieldName = firstColumnInput.name.replace('[]', '');
-                            if (baseFieldName.includes('_pembanding')) {
-                                textInput.name = baseFieldName + '[]';
-                            } else {
-                                textInput.name = baseFieldName + '_pembanding[]';
+            // Isi semua input fields
+            Object.entries(inputs).forEach(([name, value]) => {
+                setArrayInputValue(name, value, index);
+            });
+
+            // Handle foto pembanding jika ada
+            if (data.foto_objek) {
+                const imageId = `uploadedImage${index + 2}`;
+                const preview = document.getElementById(imageId);
+                if (preview) {
+                    preview.src = `/storage/pembanding/${data.foto_objek}`;
+                    preview.classList.remove('hidden');
+                }
+            }
+        }
+
+        // Event listener dengan pengecekan data
+        document.addEventListener('DOMContentLoaded', function() {
+            try {
+                const inspectionData = {!! isset($inspectionData) ? json_encode($inspectionData) : 'null' !!};
+                const comparisons = {!! isset($comparisons) ? json_encode($comparisons) : '' !!};
+
+                console.log('Inspection Data:', inspectionData); // Debug
+                console.log('Comparisons:', comparisons); // Debug
+
+                if (inspectionData) {
+                    fillObjekPenilaian(inspectionData);
+                }
+
+                if (comparisons) {
+                    console.log("comparisons", comparisons);
+
+                    comparisons.data_pembanding.forEach((comparison, index) => {
+                        if (index > 0) { // Skip kolom pertama karena sudah ada di template
+                            addColumn();
+                        }
+                        fillPembandingData(comparison, index);
+                    });
+                }
+
+                updateRemoveButtonVisibility();
+                initializeEventListeners();
+            } catch (error) {
+                console.error('Error initializing form:', error);
+            }
+        });
+
+
+        function addColumn() {
+            columnCount++;
+            const table = document.getElementById('dataTable');
+            const headerRow = table.querySelector('thead tr');
+            const bodyRows = table.querySelectorAll('tbody tr');
+
+            // Add header
+            const newHeader = document.createElement('th');
+            newHeader.className = 'px-4 py-3 min-w-[250px]';
+            newHeader.textContent = `Data Pembanding ${columnCount}`;
+            headerRow.appendChild(newHeader);
+
+            // Add cells to each row
+            bodyRows.forEach(row => {
+                const newCell = document.createElement('td');
+                newCell.className = 'px-4 py-2';
+
+                // Clone the last input cell
+                const lastInputCell = row.querySelector('td:last-child');
+                if (lastInputCell) {
+                    const clonedContent = lastInputCell.innerHTML;
+                    newCell.innerHTML = clonedContent;
+
+                    // Update IDs and names for the new cell
+                    const inputs = newCell.querySelectorAll('input, select, textarea');
+                    inputs.forEach(input => {
+                        if (input.type === 'file') {
+                            const newImageId = `uploadedImage${columnCount + 1}`;
+                            const preview = newCell.querySelector('img');
+                            if (preview) {
+                                preview.id = newImageId;
+                                preview.src = '';
+                                preview.classList.add('hidden');
+                                input.onchange = function() {
+                                    previewImage(this, newImageId);
+                                };
                             }
                         }
+                        // Clear values
+                        if (input.type !== 'file') {
+                            input.value = '';
+                        }
+                    });
+                }
+                row.appendChild(newCell);
+            });
 
-                        newCell.appendChild(textInput);
+            updateRemoveButtonVisibility();
+            reinitializeEventListeners();
+        }
+
+        function removeColumn() {
+            if (columnCount > 1) {
+                const table = document.getElementById('dataTable');
+                const rows = table.querySelectorAll('tr');
+
+                rows.forEach(row => {
+                    row.deleteCell(-1);
+                });
+
+                columnCount--;
+                updateRemoveButtonVisibility();
+            }
+        }
+
+        function updateRemoveButtonVisibility() {
+            const removeBtn = document.getElementById('removeColumnBtn');
+            if (removeBtn) {
+                removeBtn.style.display = columnCount > 1 ? 'inline-flex' : 'none';
+            }
+        }
+
+        function fillComparisonData(comparison, index) {
+            Object.entries(comparison).forEach(([key, value]) => {
+                if (key === 'foto_objek') {
+                    const imageId = `uploadedImage${index + 1}`;
+                    const preview = document.getElementById(imageId);
+                    if (preview && value) {
+                        preview.src = `{{ asset('storage/pembanding/') }}/${value}`;
+                        preview.classList.remove('hidden');
                     }
+                } else {
+                    const input = document.querySelector(`[name="${key}_pembanding[]"]:nth-of-type(${index})`);
+                    if (input) {
+                        input.value = value;
+                    }
+                }
+            });
+        }
 
-                    row.appendChild(newCell);
+        function previewImage(input, imageId) {
+            const preview = document.getElementById(imageId);
+            if (input.files && input.files[0]) {
+                const reader = new FileReader();
+                reader.onload = function(e) {
+                    preview.src = e.target.result;
+                    preview.classList.remove('hidden');
+                }
+                reader.readAsDataURL(input.files[0]);
+            }
+        }
+
+        function formatCurrency(input) {
+            let value = input.value.replace(/[^\d]/g, '');
+            value = new Intl.NumberFormat('id-ID').format(value);
+            input.value = value;
+        }
+
+        function formatNumber(input) {
+            let value = input.value.replace(/[^\d.]/g, '');
+            input.value = value;
+        }
+
+        function initializeEventListeners() {
+            // Button event listeners
+            document.getElementById('addColumnBtn').addEventListener('click', addColumn);
+            document.getElementById('removeColumnBtn').addEventListener('click', removeColumn);
+
+            // Form submission
+            document.getElementById('dataPembandingForm').addEventListener('submit', handleSubmit);
+
+            reinitializeEventListeners();
+        }
+
+        function reinitializeEventListeners() {
+            // Currency format
+            document.querySelectorAll('.currency-format').forEach(input => {
+                input.addEventListener('input', function() {
+                    formatCurrency(this);
                 });
             });
 
-            // Modified submit function to collect all data
-            function submitDataPembanding() {
-                const formElement = $('#dataPembandingForm')[0];
-                const formData = new FormData(formElement);
-
-                $('#saveButton').prop('disabled', true);
-                $('#saveButtonText').hide();
-                $('#saveButtonSpinner').show();
-
-                // Log form data for debugging
-                for (let pair of formData.entries()) {
-                    console.log(pair[0] + ': ' + pair[1]);
-                }
-
-                $.ajax({
-                    url: '{{ route('surveyor.storeDataPembanding') }}',
-                    type: 'POST',
-                    data: formData,
-                    processData: false,
-                    contentType: false,
-                    headers: {
-                        'X-CSRF-TOKEN': '{{ csrf_token() }}'
-                    },
-                    success: function(response) {
-                        if (response.success) {
-                            window.location.href =
-                                '{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=form-inspeksi';
-                            toastrSuccessBuild(response.message);
-                        }
-                        console.log(response);
-                    },
-                    error: function(xhr, status, error) {
-                        console.error('Terjadi error:', error);
-                        console.log('Status:', status);
-                        console.log('Response:', xhr.responseText);
-                        toastrErrorBuild(error);
-                    },
-                    complete: function() {
-                        $('#saveButton').prop('disabled', false);
-                        $('#saveButtonText').show();
-                        $('#saveButtonSpinner').hide();
-                    }
+            // Number format
+            document.querySelectorAll('.number-format').forEach(input => {
+                input.addEventListener('input', function() {
+                    formatNumber(this);
                 });
+            });
+        }
+
+        function handleSubmit(e) {
+            e.preventDefault();
+
+            const loadingOverlay = document.getElementById('loadingOverlay');
+            loadingOverlay.classList.remove('hidden');
+            loadingOverlay.classList.add('flex');
+
+            const formData = new FormData(e.target);
+
+            $.ajax({
+                url: '{{ route('surveyor.storeDataPembanding') }}',
+                type: 'POST',
+                data: formData,
+                processData: false,
+                contentType: false,
+                headers: {
+                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                },
+                success: function(result) {
+                    if (result.success) {
+                        Swal.fire({
+                            title: 'Berhasil!',
+                            text: result.message,
+                            icon: 'success',
+                            confirmButtonText: 'OK'
+                        }).then((result) => {
+                            if (result.isConfirmed) {
+                                window.location.href =
+                                    '{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
+                            }
+                        });
+                    } else {
+                        Swal.fire({
+                            title: 'Error!',
+                            text: result.message || 'Terjadi kesalahan',
+                            icon: 'error',
+                            confirmButtonText: 'OK'
+                        });
+                    }
+                },
+                error: function(xhr, status, error) {
+                    console.error('Error:', error);
+                    Swal.fire({
+                        title: 'Error!',
+                        text: 'Terjadi kesalahan pada server',
+                        icon: 'error',
+                        confirmButtonText: 'OK'
+                    });
+                },
+                complete: function() {
+                    loadingOverlay.classList.add('hidden');
+                    loadingOverlay.classList.remove('flex');
+                }
+            });
+        }
+    </script>
+
+    <style>
+        .loader {
+            border: 4px solid #f3f3f3;
+            border-radius: 50%;
+            border-top: 4px solid #3498db;
+            width: 40px;
+            height: 40px;
+            animation: spin 1s linear infinite;
+            margin: 0 auto;
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
             }
-        </script>
-    </div>
-@endsection
+
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+
+        .scrollable-x-auto {
+            overflow-x: auto;
+            max-width: 100%;
+        }
+
+        .table {
+            min-width: 100%;
+        }
+    </style>
+@endpush
diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php
index 4e848de..fb21f36 100644
--- a/resources/views/surveyor/components/denah.blade.php
+++ b/resources/views/surveyor/components/denah.blade.php
@@ -1,11 +1,11 @@
 @extends('layouts.main')
 
-{{-- @section('breadcrumbs')
+@section('breadcrumbs')
     {{ Breadcrumbs::render(request()->route()->getName()) }}
-@endsection --}}
+@endsection
 
 @section('content')
-@include('lpj::assetsku.includenya')
+    @include('lpj::assetsku.includenya')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
         <div class="card min-w-full">
             <div class="card min-w-full">
@@ -142,17 +142,16 @@
                                     <div class="w-full grid gap-5">
                                         <img id="foto_denah-preview"
                                             src="{{ isset($formDenah['foto_denah']) ? asset('storage/' . old('foto_denah', $formDenah['foto_denah'])) : '' }}"
-                                            alt="Gambar foto_denah"  style="{{ isset($formDenah['foto_denah']) ? 'width: 30rem;' : 'display: none;' }}">
+                                            alt="Gambar foto_denah"
+                                            style="{{ isset($formDenah['foto_denah']) ? 'width: 30rem;' : 'display: none;' }}">
+
 
-                                       
 
                                         <div class="input-group w-full flex gap-2">
                                             <input type="file"
                                                 value="{{ old('foto_denah', isset($formDenah['foto_denah']) ? $formDenah['foto_denah'] : '') }}"
                                                 name="foto_denah" class="file-input file-input-bordered w-full "
-                                                accept="image/*"
-                                                onchange="previewImage(this, 'foto_denah-preview')"
-                                                >
+                                                accept="image/*" onchange="previewImage(this, 'foto_denah-preview')">
                                         </div>
                                     </div>
                                 </div>
@@ -178,29 +177,32 @@
 
                             </div>
 
-                                <em id="error-luas" class="alert text-danger text-sm"></em>
+                            <em id="error-luas" class="alert text-danger text-sm"></em>
 
                         </div>
                     </div>
                     <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
                         <button type="button" class="btn btn-success" id="saveButton" onclick="submitDenah()">
                             <span id="saveButtonText">Save</span>
-                            <div class="spinner-border spinner-border-sm text-light" role="status" style="display: none;"
-                                id="saveButtonSpinner">
-                                <span class="visually-hidden">Loading...</span>
-                            </div>
                         </button>
                     </div>
                 </form>
             </div>
         </div>
     </div>
+
+    <div id="loadingOverlay" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
+        <div class="bg-white p-4 rounded-lg">
+            <div class="loader"></div>
+            <p class="mt-2 text-center">Sedang memproses...</p>
+        </div>
+    </div>
 @endsection
 
 
 @push('scripts')
     <script>
-         function previewImage(input, previewId) {
+        function previewImage(input, previewId) {
             if (input.files && input.files[0]) {
                 var reader = new FileReader();
                 reader.onload = function(e) {
@@ -213,15 +215,13 @@
         }
 
         function submitDenah() {
+            const loadingOverlay = document.getElementById('loadingOverlay');
+            loadingOverlay.classList.remove('hidden');
+            loadingOverlay.classList.add('flex');
 
             const formElement = $('#formDenah')[0];
             const formData = new FormData(formElement);
 
-            // Disable the button and show the spinner
-            $('#saveButton').prop('disabled', true);
-            $('#saveButtonText').hide();
-            $('#saveButtonSpinner').show();
-
             $.ajax({
                 url: '{{ route('surveyor.storeDenah') }}',
                 type: 'POST',
@@ -233,9 +233,24 @@
                 },
                 success: function(response) {
                     if (response.success) {
-                        window.location.href =
-                            '{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=denah';
-                            toastrSuccessBuild(response.message);
+                        Swal.fire({
+                            title: 'Berhasil!',
+                            text: response.message,
+                            icon: 'success',
+                            confirmButtonText: 'OK'
+                        }).then((response) => {
+                            if (response.isConfirmed) {
+                                window.location.href =
+                                    '{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
+                            }
+                        });
+                    } else {
+                        Swal.fire({
+                            title: 'Error!',
+                            text: response.message || 'Terjadi kesalahan',
+                            icon: 'error',
+                            confirmButtonText: 'OK'
+                        });
                     }
                     console.log(response);
                 },
@@ -255,13 +270,32 @@
 
                 },
                 complete: function() {
-                    // Re-enable the button and hide the spinner
-                    $('#saveButton').prop('disabled', false);
-                    $('#saveButtonText').show();
-                    $('#saveButtonSpinner').hide();
+                    loadingOverlay.classList.add('hidden');
+                    loadingOverlay.classList.remove('flex');
                 }
             });
 
         }
     </script>
 @endpush
+<style>
+    .loader {
+        border: 4px solid #f3f3f3;
+        border-radius: 50%;
+        border-top: 4px solid #3498db;
+        width: 40px;
+        height: 40px;
+        animation: spin 1s linear infinite;
+        margin: 0 auto;
+    }
+
+    @keyframes spin {
+        0% {
+            transform: rotate(0deg);
+        }
+
+        100% {
+            transform: rotate(360deg);
+        }
+    }
+</style>
diff --git a/resources/views/surveyor/components/fakta.blade.php b/resources/views/surveyor/components/fakta.blade.php
index 2dd1e4a..46378f0 100644
--- a/resources/views/surveyor/components/fakta.blade.php
+++ b/resources/views/surveyor/components/fakta.blade.php
@@ -76,19 +76,32 @@
                     <label class="form-label max-w-56">Batas batas</label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <div class="grid grid-cols-1 gap-4 items-center w-full">
-
                             @if (isset($arahMataAngin))
                                 @foreach ($arahMataAngin as $item)
+                                    @php
+                                        $isChecked = false;
+                                        $inputValue = '';
+
+                                        if (isset($forminspeksi['fakta']['batas_batas'])) {
+                                            foreach ($forminspeksi['fakta']['batas_batas'] as $key => $value) {
+                                                if ($key === $item->name) {
+                                                    $isChecked = true;
+                                                    $inputValue = $value;
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    @endphp
                                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                         <label class="form-label max-w-56 gap-2.5" style="width: 500px">
                                             <input class="checkbox" name="batas_batas[]" type="checkbox"
                                                 value="{{ $item->name }}"
-                                                {{ in_array($item->name, old('batas_batas', $forminspeksi['fakta']['batas_batas'] ?? [])) ? 'checked' : '' }} />
+                                                {{ $isChecked ? 'checked' : '' }} />
                                             {{ $item->name }}
                                         </label>
                                         <input type="text" name="batas_batas_input[]" class="input w-full"
-                                            id="bentukTanahInput" placeholder="Masukkan Batas {{ $item->name }}..."
-                                            value="{{ old('batas_batas_input.' . $loop->index, $forminspeksi['fakta']['batas_batas_input'][$loop->index] ?? '') }}">
+                                            placeholder="Masukkan Batas {{ $item->name }}..."
+                                            value="{{ $inputValue }}">
                                     </div>
                                 @endforeach
                             @endif
@@ -98,6 +111,7 @@
                 </div>
 
 
+
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Kondisi lain terkait lingkungan</label>
                     <div class="flex flex-wrap items-baseline w-full" id="kondisi-lingkungan-container">
diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php
index 43e38cb..1d714fd 100644
--- a/resources/views/surveyor/components/foto.blade.php
+++ b/resources/views/surveyor/components/foto.blade.php
@@ -1,8 +1,8 @@
 @extends('layouts.main')
 
-{{-- @section('breadcrumbs')
+@section('breadcrumbs')
     {{ Breadcrumbs::render(request()->route()->getName()) }}
-@endsection --}}
+@endsection
 
 @section('content')
 @include('lpj::assetsku.includenya')
@@ -14,7 +14,7 @@
                         Data Jaminan
                     </h3>
                     <div class="flex items-center gap-2">
-                        <a href="{{ route('surveyor.show', ['id' => request('foto')]) }}?form=foto"
+                        <a href="{{ route('surveyor.show', ['id' => request('foto')]) }}"
                             class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
@@ -585,8 +585,12 @@
             </div>
 
         </form>
-
-
+    </div>
+    <div id="loadingOverlay" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
+        <div class="bg-white p-4 rounded-lg">
+            <div class="loader"></div>
+            <p class="mt-2 text-center">Sedang memproses...</p>
+        </div>
     </div>
 
     <!-- Modal Kamera -->
@@ -598,17 +602,16 @@
 @push('scripts')
     <script>
         function submitFoto() {
+            const loadingOverlay = document.getElementById('loadingOverlay');
+            loadingOverlay.classList.remove('hidden');
+            loadingOverlay.classList.add('flex');
+
             const formElement = $('#formFoto')[0];
             const formData = new FormData(formElement);
             // for (const [key, value] of formData.entries()) {
             //     console.log(`Key: ${key}, Value: ${value}`);
             // }
 
-            // Disable the button and show the spinner
-            $('#saveButtonFoto').prop('disabled', true);
-            $('#saveButtonFotoText').hide();
-            $('#saveButtonSpinner').show();
-
             $.ajax({
                 url: '{{ route('surveyor.storeFoto') }}',
                 type: 'POST',
@@ -621,10 +624,27 @@
                 },
                 success: function(response) {
                     if (response.success) {
-                        window.location.href =
-                            '{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=foto';
-                            toastrSuccessBuild(response.message);
+                        Swal.fire({
+                            title: 'Berhasil!',
+                            text: response.message,
+                            icon: 'success',
+                            confirmButtonText: 'OK'
+                        }).then((response) => {
+                            if (response.isConfirmed) {
+                                window.location.href =
+                                    '{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
+                            }
+                        });
+                    } else {
+                        Swal.fire({
+                            title: 'Error!',
+                            text: response.message || 'Terjadi kesalahan',
+                            icon: 'error',
+                            confirmButtonText: 'OK'
+                        });
                     }
+                    console.log(response);
+
 
                 },
                 error: function(xhr, status, error) {
@@ -643,9 +663,8 @@
                 },
                 complete: function() {
                     // Re-enable the button and hide the spinner
-                    $('#saveButtonFoto').prop('disabled', false);
-                    $('#saveButtonFotoText').show();
-                    $('#saveButtonSpinner').hide();
+                    loadingOverlay.classList.add('hidden');
+                    loadingOverlay.classList.remove('flex');
                 }
             });
         }
@@ -653,6 +672,28 @@
     @include('lpj::surveyor.js.camera-editor')
 @endpush
 
+<style>
+    .loader {
+        border: 4px solid #f3f3f3;
+        border-radius: 50%;
+        border-top: 4px solid #3498db;
+        width: 40px;
+        height: 40px;
+        animation: spin 1s linear infinite;
+        margin: 0 auto;
+    }
+
+    @keyframes spin {
+        0% {
+            transform: rotate(0deg);
+        }
+
+        100% {
+            transform: rotate(360deg);
+        }
+    }
+</style>
+
 
 
 
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index bc3a953..3b669f8 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -1,4 +1,19 @@
 <div class=" card w-full bg-white rounded-lg shadow-md ">
+
+
+    <div class="card-header">
+        <h3 class="card-title">
+            Form Inspeksi
+        </h3>
+        <div class="flex items-center gap-2">
+            <a href="{{ route('surveyor.show', ['id' => request('inspeksi')]) }}" class="btn btn-xs btn-info">
+                <i class="ki-filled ki-exit-left"></i> Back
+            </a>
+        </div>
+    </div>
+
+
+
     <div class="card-body">
         <div class="py-4">
             <h1 class="text-md font-medium text-gray-900">Order Penilaian</h1>
@@ -93,6 +108,7 @@
                         @if (isset($permohonan->debiture->documents))
                             @foreach ($permohonan->debiture->documents as $item)
                                 <p class="text-2sm text-gray-700">{{ $item->jenisJaminan->name }}</p>
+                                <input type="hidden" name="jenis_asset_name" value="{{ $item->jenisJaminan->name }}">
                             @endforeach
                         @endif
                     </div>
@@ -101,19 +117,18 @@
                             <label class="form-label flex items-center gap-3 text-nowrap">
                                 <input onclick="toggleFieldVisibility('jenis_asset', 'jenis_asset', ['tidak sesuai'])"
                                     type="radio" class="radio" name="jenis_asset" value="sesuai"
-                                    {{ old('jenis_asset', $forminspeksi['asset']['jenis_asset'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                    {{ isset($forminspeksi['asset']['jenis_asset']['sesuai']) ? 'checked' : '' }}>
                                 <span class="ml-2">Ya</span>
                             </label>
                             <label class="form-label flex items-center gap-2.5 text-nowrap">
                                 <input onclick="toggleFieldVisibility('jenis_asset', 'jenis_asset', ['tidak sesuai'])"
                                     type="radio" class="radio" name="jenis_asset" value="tidak sesuai"
-                                    {{ old('jenis_asset', $forminspeksi['asset']['jenis_asset'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                    {{ isset($forminspeksi['asset']['jenis_asset']['tidak sesuai']) ? 'checked' : '' }}>
                                 <span class="ml-2">Tidak</span>
                             </label>
                             <!-- Select dropdown untuk "Tidak Sesuai" -->
-
                             <div id="jenis_asset" class="flex items-baseline gap-2"
-                                style="{{ old('jenis_asset', $forminspeksi['asset']['jenis_asset'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                                style="{{ isset($forminspeksi['asset']['jenis_asset']['tidak sesuai']) ? '' : 'display: none;' }}">
                                 <select id="jenis_asset_tidak_sesuai" class="input w-full"
                                     name="jenis_asset_tidak_sesuai">
                                     <option value="">Select Jenis asset</option>
@@ -126,13 +141,13 @@
                                         @endforeach
                                     @endif
                                 </select>
-                                <button type="button" class="btn btn-md btn-primary"
-                                    onclick="updateAnalisa('jenis_asset')">Save</button>
+                                {{-- <button type="button" class="btn btn-md btn-primary"
+                                    onclick="updateAnalisa('jenis_asset')">Save</button> --}}
                             </div>
-
                         </div>
                         <em id="error-jenis_asset" class="alert text-danger text-sm"></em>
                     </div>
+
                 </div>
             </div>
 
@@ -147,133 +162,90 @@
 
                     <div class="flex-wrap items-stretch">
                         <div class="grid grid-cols-3 md:grid-cols-3 gap-4 mt-2">
-                            <div class="grid grid-cols-3 md:grid-cols-3 gap-4 mt-2">
-                                <label class="form-label flex items-center gap-3 text-nowrap">
-                                    <input
-                                        onclick="toggleAlamatVisibility('alamat_sesuai', 'alamat_tidak_sesuai', 'sesuai')"
-                                        type="radio" class="radio" name="alamat_sesuai" value="sesuai"
-                                        {{ old('jenis_asset', $forminspeksi['asset']['jenis_asset'] ?? '') == 'sesuai' ? 'checked' : '' }}>
-                                    <span class="ml-2">Ya</span>
-                                </label>
-                                <label class="form-label flex items-center gap-3 text-nowrap">
-                                    <input
-                                        onclick="toggleAlamatVisibility('alamat_sesuai', 'alamat_tidak_sesuai', 'tidak sesuai')"
-                                        type="radio" class="radio" name="alamat_sesuai" value="tidak sesuai"
-                                        {{ old('jenis_asset', $forminspeksi['asset']['jenis_asset'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
-                                    <span class="ml-2">Tidak</span>
-                                </label>
-                            </div>
-
+                            <label class="form-label flex items-center gap-3 text-nowrap">
+                                <input
+                                    onclick="updateAlamatFields('sesuai')"
+                                    type="radio"
+                                    class="radio"
+                                    name="alamat_sesuai"
+                                    value="sesuai"
+                                    {{ old('jenis_asset', isset($forminspeksi['asset']['alamat']['sesuai'])) ? 'checked' : '' }}>
+                                <span class="ml-2">Ya</span>
+                            </label>
+                            <label class="form-label flex items-center gap-3 text-nowrap">
+                                <input
+                                    onclick="updateAlamatFields('tidak sesuai')"
+                                    type="radio"
+                                    class="radio"
+                                    name="alamat_sesuai"
+                                    value="tidak sesuai"
+                                    {{ old('jenis_asset', isset($forminspeksi['asset']['alamat']['tidak sesuai'])) ? 'checked' : '' }}>
+                                <span class="ml-2">Tidak</span>
+                            </label>
                         </div>
                         <em id="error-alamat" class="alert text-danger text-sm"></em>
                     </div>
 
-                    {{-- Alamat Sesuai --}}
-                    <div id="alamat_sesuai" class="grid gap-2 mt-5" style="display: none;">
-                        @foreach ($permohonan->debiture->documents as $dokumen)
-                            @php
-                                $fields = [
-                                    [
-                                        'label' => 'Jl.',
-                                        'value' => $dokumen->address ?? '',
-                                        'name' => 'nama_jalan',
-                                        'readonly' => false,
-                                    ],
-                                    [
-                                        'label' => 'Provinsi',
-                                        'value' => $dokumen->province->name ?? '',
-                                        'name' => 'provinsi',
-                                        'readonly' => true,
-                                    ],
-                                    [
-                                        'label' => 'Kota/Kabupaten',
-                                        'value' => $dokumen->city->name ?? '',
-                                        'name' => 'kota_kabupaten',
-                                        'readonly' => true,
-                                    ],
-                                    [
-                                        'label' => 'Kecamatan',
-                                        'value' => $dokumen->district->name ?? '',
-                                        'name' => 'kecamatan',
-                                        'readonly' => true,
-                                    ],
-                                    [
-                                        'label' => 'Kelurahan',
-                                        'value' => $dokumen->village->name ?? '',
-                                        'name' => 'desa_kelurahan',
-                                        'readonly' => true,
-                                    ],
-                                ];
-                            @endphp
-                            @foreach ($fields as $field)
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">{{ $field['label'] }}</label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input type="text" class="input" name="{{ $field['name'] }}"
-                                            value="{{ $field['value'] }}" {{ $field['readonly'] ? 'readonly' : '' }}>
-                                    </div>
-                                </div>
-                            @endforeach
-                        @endforeach
-                    </div>
-
-                    {{-- Alamat Tidak Sesuai --}}
-                    <div id="alamat_tidak_sesuai" class="grid gap-2 mt-5" style="display: none;">
+                    <div id="alamat_form" class="grid gap-2 mt-5">
                         @php
-                            $inputDataLokasi = [
-                                ['label' => 'Jl.', 'id' => 'address', 'name' => 'address', 'type' => 'text'],
+                            $fields = [
+                                [
+                                    'label' => 'Jl.',
+                                    'name' => 'nama_jalan',
+                                    'id' => 'nama_jalan',
+                                    'readonly' => false,
+                                ],
                                 [
                                     'label' => 'Provinsi',
-                                    'id' => 'province_code',
                                     'name' => 'provinsi',
+                                    'id' => 'provinsi',
                                     'type' => 'select',
                                     'options' => $provinces,
                                 ],
                                 [
                                     'label' => 'Kota/Kabupaten',
-                                    'id' => 'city_code',
                                     'name' => 'kota_kabupaten',
+                                    'id' => 'kota_kabupaten',
                                     'type' => 'select',
                                     'options' => $provinces,
                                 ],
                                 [
                                     'label' => 'Kecamatan',
-                                    'id' => 'district_code',
                                     'name' => 'kecamatan',
+                                    'id' => 'kecamatan',
                                     'type' => 'select',
                                     'options' => $provinces,
                                 ],
                                 [
-                                    'label' => 'Desa/Kelurahan',
-                                    'id' => 'village_code',
+                                    'label' => 'Kelurahan',
                                     'name' => 'desa_kelurahan',
+                                    'id' => 'desa_kelurahan',
                                     'type' => 'select',
                                     'options' => $provinces,
                                 ],
                             ];
                         @endphp
 
-                        @foreach ($inputDataLokasi as $item)
+                        @foreach ($fields as $field)
                             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">{{ $item['label'] }}</label>
+                                <label class="form-label max-w-56">{{ $field['label'] }}</label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    @if ($item['type'] === 'text')
-                                        <input id="{{ $item['id'] }}" name="{{ $item['name'] }}" class="input">
-                                    @else
-                                        <select id="{{ $item['id'] }}" name="{{ $item['name'] }}"
-                                            class="select w-full">
-                                            <option value="">{{ $item['label'] }}</option>
-                                            @if ($item['id'] === 'province_code')
-                                                @foreach ($item['options'] as $option)
-                                                    <option value="{{ $option->code }}">{{ $option->name }}</option>
-                                                @endforeach
-                                            @endif
+                                    @if (isset($field['type']) && $field['type'] === 'select')
+                                        <select id="{{ $field['id'] }}" name="{{ $field['name'] }}" class="select w-full">
+                                            <option value="">{{ $field['label'] }}</option>
+                                            @foreach ($field['options'] as $option)
+                                                <option value="{{ $option->code }}">{{ $option->name }}</option>
+                                            @endforeach
                                         </select>
+                                    @else
+                                        <input type="text" id="{{ $field['id'] }}" name="{{ $field['name'] }}" class="input"
+                                            {{ $field['readonly'] ? 'readonly' : '' }}>
                                     @endif
                                 </div>
                             </div>
                         @endforeach
                     </div>
+
                 </div>
             </div>
 
@@ -409,6 +381,8 @@
                     <div class="flex flex-wrap items-baseline w-full">
                         @foreach ($permohonan->debiture->documents as $dokumen)
                             {{ $dokumen->pemilik->hubungan_pemilik->name ?? '' }}
+                            <input type="hidden" name="hub_cadeb_sesuai"
+                                value="{{ $dokumen->pemilik->hubungan_pemilik->name }}" id="">
                         @endforeach
                     </div>
 
@@ -418,14 +392,14 @@
                                 <input
                                     onclick="toggleFieldVisibility('hub_cadeb','hub_cadeb_tidak_sesuai', ['tidak sesuai'])"
                                     type="radio" class="radio" name="hub_cadeb" value="sesuai"
-                                    {{ old('hub_cadeb', $forminspeksi['asset']['hub_cadeb'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                    {{ old('hub_cadeb', isset($forminspeksi['asset']['hub_cadeb']['sesuai'])) ? 'checked' : '' }}>
                                 <span class="ml-2">Ya</span>
                             </label>
                             <label class="form-label flex items-center gap-2.5 text-nowrap">
                                 <input
                                     onclick="toggleFieldVisibility('hub_cadeb','hub_cadeb_tidak_sesuai', ['tidak sesuai'])"
                                     type="radio" class="radio" name="hub_cadeb" value="tidak sesuai"
-                                    {{ old('hub_cadeb', $forminspeksi['asset']['hub_cadeb'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                    {{ old('hub_cadeb', isset($forminspeksi['asset']['hub_cadeb']['tidak sesuai']))? 'checked' : '' }}>
                                 <span class="ml-2">Tidak</span>
                             </label>
                             <!-- Select dropdown untuk "Tidak Sesuai" -->
@@ -461,6 +435,9 @@
                         <div class="flex flex-wrap items-baseline w-full text-sm">
                             @foreach ($permohonan->debiture->documents as $dokumen)
                                 {{ $dokumen->penghuni->hubungan_penghuni->name ?? 'N/A' }}
+                                <input type="hidden" name="hub_cadeb_penguhuni_sesuai"
+                                    value="{{ isset($dokumen->penghuni->hubungan_penghuni->name) ?? '' }}"
+                                    id="">
                             @endforeach
                         </div>
 
@@ -470,21 +447,21 @@
                                     <input
                                         onclick="toggleFieldVisibility('hub_cadeb_penghuni','hub_cadeb_Penghuni_tidak_sesuai', ['tidak sesuai'])"
                                         type="radio" class="radio" name="hub_cadeb_penghuni" value="sesuai"
-                                        {{ old('hub_cadeb_penghuni', $forminspeksi['asset']['hub_cadeb_penghuni'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                        {{ old('hub_cadeb_penghuni', isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'])) ? 'checked' : '' }}>
                                     <span class="ml-2">Ya</span>
                                 </label>
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input
                                         onclick="toggleFieldVisibility('hub_cadeb_penghuni', 'hub_cadeb_Penghuni_tidak_sesuai', ['tidak sesuai'])"
                                         type="radio" class="radio" name="hub_cadeb_penghuni" value="tidak sesuai"
-                                        {{ old('hub_cadeb_penghuni', $forminspeksi['asset']['hub_cadeb_penghuni'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                        {{ old('hub_cadeb_penghuni', isset($forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai'])) ? 'checked' : '' }}>
                                     <span class="ml-2">Tidak</span>
                                 </label>
                                 <!-- Select dropdown untuk "Tidak Sesuai" -->
                                 <select id="hub_cadeb_Penghuni_tidak_sesuai"
                                     class="input w-full
                                     name="hub_cadeb_Penghuni_tidak_sesuai"
-                                    style="{{ old('hub_cadeb', $forminspeksi['asset']['hub_cadeb'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                                    style="{{ old('hub_cadeb', isset($forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai'])) ? '' : 'display: none;' }}">
                                     <option value="">Select Hubungan Cadeb</option>
                                     @if (isset($hubPenghuni))
                                         @foreach ($hubPenghuni as $item)
diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php
index 2074d39..11f728d 100644
--- a/resources/views/surveyor/components/inspeksi.blade.php
+++ b/resources/views/surveyor/components/inspeksi.blade.php
@@ -1,39 +1,16 @@
 @extends('layouts.main')
 
-{{-- @section('breadcrumbs')
+@section('breadcrumbs')
     {{ Breadcrumbs::render(request()->route()->getName()) }}
-@endsection --}}
+@endsection
 
 @section('content')
     @include('lpj::assetsku.includenya')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <div class="card min-w-full">
-            <div class="card min-w-full">
-                <div class="card-header">
-                    <h3 class="card-title">
-                        Form Inspeksi
-                    </h3>
-                    <div class="flex items-center gap-2">
-                        <a href="{{ route('surveyor.show', ['id' => request('inspeksi')]) }}?form=inspeksi"
-                            class="btn btn-xs btn-info">
-                            <i class="ki-filled ki-exit-left"></i> Back
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-
-        {{-- <div class="card">
-            <div class="card-body"> --}}
         <form id="formInspeksi" method="POST" enctype="multipart/form-data" class="grid gap-5">
             @csrf
-
             <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
             <input type="hidden" name="jenis_jaminan_id" value="{{ request('jenis_jaminan') }}">
-
-
             @foreach ($permohonan->debiture->documents as $dokumen)
                 @if ($dokumen->jenisJaminan)
                     @php
@@ -60,17 +37,42 @@
                     <span id="saveButtonText">Save</span>
                     <div class="spinner-border spinner-border-sm text-light" role="status" style="display: none;"
                         id="saveButtonSpinner">
-                        <span class="visually-hidden">Loading...</span>
+
                     </div>
                 </button>
             </div>
         </form>
-        {{-- </div>
-        </div> --}}
+    </div>
+
+    <!-- Loading Overlay -->
+    <div id="loadingOverlay" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
+        <div class="bg-white p-4 rounded-lg">
+            <div class="loader"></div>
+            <p class="mt-2 text-center">Sedang memproses...</p>
+        </div>
     </div>
 @endsection
 @push('scripts')
     <script type="text/javascript">
+        function updateAlamatFields(type) {
+            if (type === 'sesuai') {
+                // Update nilai form dengan data sesuai
+                document.getElementById('nama_jalan').value = "{{ $dokumen->address ?? '' }}";
+                document.getElementById('provinsi').value = "{{ $dokumen->province->code ?? '' }}";
+                document.getElementById('kota_kabupaten').value = "{{ $dokumen->city->code ?? '' }}";
+                document.getElementById('kecamatan').value = "{{ $dokumen->district->code ?? '' }}";
+                document.getElementById('desa_kelurahan').value = "{{ $dokumen->village->code ?? '' }}";
+            } else if (type === 'tidak sesuai') {
+                // Reset nilai form untuk input manual
+                document.getElementById('nama_jalan').value = '';
+                document.getElementById('provinsi').value = '';
+                document.getElementById('kota_kabupaten').value = '';
+                document.getElementById('kecamatan').value = '';
+                document.getElementById('desa_kelurahan').value = '';
+            }
+        }
+
+
         function toggleFieldVisibility(fieldName, inputId, visibleValues = []) {
             const selectedValue = $(`[name="${fieldName}"]:checked`).val();
             const inputField = $(`#${inputId}`);
@@ -126,31 +128,30 @@
 
 
         function toggleAlamatVisibility(idSesuai, idTidakSesuai, selectedValue) {
-    // Ambil elemen berdasarkan ID
-    const alamatSesuai = document.getElementById(idSesuai);
-    const alamatTidakSesuai = document.getElementById(idTidakSesuai);
+            // Ambil elemen berdasarkan ID
+            const alamatSesuai = document.getElementById(idSesuai);
+            const alamatTidakSesuai = document.getElementById(idTidakSesuai);
 
-    // Periksa nilai yang dipilih dan tampilkan elemen yang sesuai
-    if (selectedValue === 'sesuai') {
-        alamatSesuai.style.display = 'grid'; // Tampilkan "Alamat Sesuai"
-        alamatTidakSesuai.style.display = 'none'; // Sembunyikan "Alamat Tidak Sesuai"
-    } else if (selectedValue === 'tidak sesuai') {
-        alamatSesuai.style.display = 'none'; // Sembunyikan "Alamat Sesuai"
-        alamatTidakSesuai.style.display = 'grid'; // Tampilkan "Alamat Tidak Sesuai"
-    }
-}
+            // Periksa nilai yang dipilih dan tampilkan elemen yang sesuai
+            if (selectedValue === 'sesuai') {
+                alamatSesuai.style.display = 'grid'; // Tampilkan "Alamat Sesuai"
+                alamatTidakSesuai.style.display = 'none'; // Sembunyikan "Alamat Tidak Sesuai"
+            } else if (selectedValue === 'tidak sesuai') {
+                alamatSesuai.style.display = 'none'; // Sembunyikan "Alamat Sesuai"
+                alamatTidakSesuai.style.display = 'grid'; // Tampilkan "Alamat Tidak Sesuai"
+            }
+        }
 
 
 
         function submitData() {
+            const loadingOverlay = document.getElementById('loadingOverlay');
+            loadingOverlay.classList.remove('hidden');
+            loadingOverlay.classList.add('flex');
+
             const formElement = $('#formInspeksi')[0];
             const formData = new FormData(formElement);
 
-            // Disable the button and show the spinner
-            $('#saveButton').prop('disabled', true);
-            $('#saveButtonText').hide();
-            $('#saveButtonSpinner').show();
-
             $.ajax({
                 url: '{{ route('surveyor.store') }}',
                 type: 'POST',
@@ -161,12 +162,26 @@
                     'X-CSRF-TOKEN': '{{ csrf_token() }}'
                 },
                 success: function(response) {
-                    // if (response.success) {
-                    //     toastrSuccessBuild(response.message)
-                    //     window.location.href =
-                    //         '{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=inspeksi';
-                    // }
-
+                    if (response.success) {
+                        Swal.fire({
+                            title: 'Berhasil!',
+                            text: response.message,
+                            icon: 'success',
+                            confirmButtonText: 'OK'
+                        }).then((response) => {
+                            if (response.isConfirmed) {
+                                window.location.href =
+                                    '{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
+                            }
+                        });
+                    } else {
+                        Swal.fire({
+                            title: 'Error!',
+                            text: response.message || 'Terjadi kesalahan',
+                            icon: 'error',
+                            confirmButtonText: 'OK'
+                        });
+                    }
                     console.log(response);
                 },
                 error: function(xhr, status, error) {
@@ -185,9 +200,8 @@
                 },
                 complete: function() {
                     // Re-enable the button and hide the spinner
-                    $('#saveButton').prop('disabled', false);
-                    $('#saveButtonText').show();
-                    $('#saveButtonSpinner').hide();
+                    loadingOverlay.classList.add('hidden');
+                    loadingOverlay.classList.remove('flex');
                 }
             });
         }
@@ -264,10 +278,8 @@
                 success: function(response) {
                     console.log(response);
                     if (response.success) {
-                        if (response.jenis_asset) {
-                            window.location.href =
-                                '{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=inspeksi';
-                        }
+                        // window.location.href =
+                        //     '{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
                         toastrSuccessBuild(response.message);
                     }
                 },
@@ -275,9 +287,44 @@
                     console.error('Terjadi error:', error);
                     console.log('Status:', status);
                     console.log('Response:', xhr.responseText);
-                    toastrErrorBuild(error);
+                    if (xhr.responseJSON.message) {
+                        toastrErrorBuild(xhr.responseJSON.message);
+                    } else {
+                        toastrErrorBuild('Terjadi kesalahan');
+                    }
                 }
             });
         }
     </script>
 @endpush
+
+<style>
+    .loader {
+        border: 4px solid #f3f3f3;
+        border-radius: 50%;
+        border-top: 4px solid #3498db;
+        width: 40px;
+        height: 40px;
+        animation: spin 1s linear infinite;
+        margin: 0 auto;
+    }
+
+    @keyframes spin {
+        0% {
+            transform: rotate(0deg);
+        }
+
+        100% {
+            transform: rotate(360deg);
+        }
+    }
+
+    .scrollable-x-auto {
+        overflow-x: auto;
+        max-width: 100%;
+    }
+
+    .table {
+        min-width: 100%;
+    }
+</style>
diff --git a/resources/views/surveyor/components/lingkungan.blade.php b/resources/views/surveyor/components/lingkungan.blade.php
index cc59d4b..0cf769f 100644
--- a/resources/views/surveyor/components/lingkungan.blade.php
+++ b/resources/views/surveyor/components/lingkungan.blade.php
@@ -50,9 +50,15 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="perkerasan_jalan[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ in_array($item->name, isset($forminspeksi['lingkungan']['perkerasan_jalan']) ? $forminspeksi['lingkungan']['perkerasan_jalan'] : []) ? 'checked' : '' }} />
+                                        {{ in_array($item->name, isset($forminspeksi['lingkungan']['perkerasan_jalan']) ? $forminspeksi['lingkungan']['perkerasan_jalan'] : []) ? 'checked' : '' }}
+                                        onclick="toggleCheckboxVisibility('perkerasan_jalan', 'perkerasan_jalan_lainnya', ['lainnya'])"/>
                                     {{ $item->name }}
                                 </label>
+                                @if (strcasecmp($item->name, 'Lainnya') == 0)
+                                <input id="perkerasan_jalan_lainnya" type="text" style="display: none;"
+                                    name="perkerasan_jalan_lainnya" class="input w-full mt-2"
+                                    placeholder="Masukkan lainnya..." />
+                            @endif
                             @endforeach
                         @endif
                     </div>
@@ -133,10 +139,16 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="terletak_diarea[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ isset($forminspeksi['lingkungan']['terletak_diarea']) && in_array($item->name, explode(',', is_array(old('terletak_diarea', $forminspeksi['lingkungan']['terletak_diarea'] ?? '')) ? implode(',', old('terletak_diarea', $forminspeksi['lingkungan']['terletak_diarea'] ?? '')) : old('terletak_diarea', $forminspeksi['lingkungan']['terletak_diarea'] ?? ''))) ? 'checked' : '' }} />
+                                        {{ isset($forminspeksi['lingkungan']['terletak_diarea']) && in_array($item->name, explode(',', is_array(old('terletak_diarea', $forminspeksi['lingkungan']['terletak_diarea'] ?? '')) ? implode(',', old('terletak_diarea', $forminspeksi['lingkungan']['terletak_diarea'] ?? '')) : old('terletak_diarea', $forminspeksi['lingkungan']['terletak_diarea'] ?? ''))) ? 'checked' : '' }}
+                                        onclick="toggleCheckboxVisibility('terletak_diarea', 'terletak_diarea_lainnya', ['Lainnya'])" />
 
                                     {{ $item->name }}
                                 </label>
+                                @if (strcasecmp($item->name, 'Lainnya') == 0)
+                                    <input id="terletak_diarea_lainnya" type="text" style="display: none;"
+                                        name="terletak_diarea_lainnya" class="input w-full mt-2"
+                                        placeholder="Masukkan lainnya..." />
+                                @endif
                             @endforeach
                         @endif
                     </div>
@@ -157,25 +169,38 @@
                             <span class="ml-2">Telah ada bangunan</span>
                         </label>
                         <div class="flex w-full items-center gap-4">
-
                             <div id="disekitar_lokasi_sesuai" class="grid grid-cols-2 gap-4 mt-5 mb-5"
-                                style="display: none;">
+                                style="{{ old('disekitar_lokasi', $forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya' ? '' : 'display: none;' }}">
                                 <div class="flex items-center gap-2">
                                     <label for="" class="text-sm text-gray-700">Kondisi bangunan</label>
+
+                                    @php
+                                        $kondisi = ['Cukup', 'Baik', 'Kurang'];
+                                    @endphp
+
                                     <select class="select" name="kondisi_bagunan_disekitar_lokasi" id="">
                                         <option value="">pilih kondisi</option>
-                                        <option value="Cukup">Cukup</option>
-                                        <option value="Baik">Baik</option>
-                                        <option value="Kurang">Kurang</option>
+                                        @foreach ($kondisi as $item)
+                                            <option value="{{ $item }}"
+                                                {{ old('kondisi_bagunan_disekitar_lokasi', $forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == $item ? 'selected' : '' }}>
+                                                {{ $item }}
+                                            </option>
+                                        @endforeach
                                     </select>
                                 </div>
                                 <div class="flex items-center gap-2">
                                     <label for="" class="text-sm text-gray-700">Sifat bangunan</label>
+                                    @php
+                                        $sifat = ['Permanen', 'Semi Permanen', 'Tidak Permanen'];
+                                    @endphp
                                     <select class="select" name="sifat_bagunan_disekitar_lokasi" id="">
                                         <option value="">pilih sifat bagunan</option>
-                                        <option value="Permanen">Permanen</option>
-                                        <option value="Semi Permanen">Semi Permanen</option>
-                                        <option value="Tidak Permanen">Tidak Permanen</option>
+                                        @foreach ($sifat as $item)
+                                            <option value="{{ $item }}"
+                                                {{ old('sifat_bagunan_disekitar_lokasi', $forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == $item ? 'selected' : '' }}>
+                                                {{ $item }}
+                                            </option>
+                                        @endforeach
                                     </select>
                                 </div>
 
@@ -246,53 +271,34 @@
                         <!-- Opsi Ya -->
                         <div class="flex w-full items-center gap-4">
                             <label class="text-sm flex items-center gap-2.5 text-nowrap">
-                                <input
-                                    onclick="toggleFieldVisibility('dekat_tps', 'dekat-tps', ['ya'])"
+                                <input onclick="toggleFieldVisibility('dekat_tps', 'dekat-tps', ['ya'])"
                                     type="radio" class="radio" name="dekat_tps" value="ya"
-                                    {{ old('dekat_tps', $forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya' ? 'checked' : '' }}
-                                />
+                                    {{ old('dekat_tps', $forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya' ? 'checked' : '' }} />
                                 <span class="ml-2">Ya</span>
                             </label>
-                            <div
-                                id="dekat-tps"
-                                class="flex flex-wrap gap-4 w-full"
-                                style="{{ old('dekat_tps', $forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya' ? 'display:flex;' : 'display:none;' }}"
-                            >
+                            <div id="dekat-tps" class="flex flex-wrap gap-4 w-full"
+                                style="{{ old('dekat_tps', $forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'ya' ? 'display:flex;' : 'display:none;' }}">
                                 <div class="flex items-center gap-2">
                                     <label for="jarak_tps" class="form-label max-w-56">Jarak</label>
-                                    <input
-                                        type="number"
-                                        id="jarak_tps"
-                                        class="input mt-2"
-                                        name="jarak_tps"
+                                    <input type="number" id="jarak_tps" class="input mt-2" name="jarak_tps"
                                         value="{{ old('jarak_tps', $forminspeksi['lingkungan']['jarak_tps'] ?? '') }}"
-                                        placeholder="Km"
-                                    />
+                                        placeholder="Km" />
                                 </div>
 
                                 <div class="flex items-center gap-2">
                                     <label for="nama_tps" class="form-label max-w-56">Nama TPS</label>
-                                    <input
-                                        type="text"
-                                        id="nama_tps"
-                                        class="input mt-2"
-                                        name="nama_tps"
+                                    <input type="text" id="nama_tps" class="input mt-2" name="nama_tps"
                                         value="{{ old('nama_tps', $forminspeksi['lingkungan']['nama_tps'] ?? '') }}"
-                                        placeholder="Nama TPS"
-                                    />
+                                        placeholder="Nama TPS" />
                                 </div>
                             </div>
                         </div>
 
                         <!-- Opsi Tidak -->
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input
-                                onclick="toggleFieldVisibility('dekat_tps', 'dekat-tps', ['ya'])"
-                                type="radio" class="radio"
-                                name="dekat_tps"
-                                value="tidak"
-                                {{ old('dekat_tps', $forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'tidak' ? 'checked' : '' }}
-                            />
+                            <input onclick="toggleFieldVisibility('dekat_tps', 'dekat-tps', ['ya'])" type="radio"
+                                class="radio" name="dekat_tps" value="tidak"
+                                {{ old('dekat_tps', $forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'tidak' ? 'checked' : '' }} />
                             <span class="ml-2">Tidak</span>
                         </label>
                     </div>
@@ -332,9 +338,15 @@
                                 @php
 
                                     $selectedFasilitas = is_array(
-                                        old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? []),
+                                        old(
+                                            'fasilitas_dekat_object',
+                                            $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? [],
+                                        ),
                                     )
-                                        ? old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? [])
+                                        ? old(
+                                            'fasilitas_dekat_object',
+                                            $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? [],
+                                        )
                                         : explode(
                                             ',',
                                             old(
@@ -353,10 +365,18 @@
                                                 : explode(',', old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? '')),
                                         )
                                             ? 'checked'
-                                            : '' }} />
+                                            : '' }}
+                                              onclick="toggleCheckboxVisibility('fasilitas_dekat_object', 'fasilitas_dekat_object_lainnya', ['Lainnya'])"
+                                            />
 
                                     {{ $item->name }}
                                 </label>
+
+                            @if (strcasecmp($item->name, 'Lainnya') == 0)
+                                <input id="fasilitas_dekat_object_lainnya" type="text" style="display: none;"
+                                    name="fasilitas_dekat_object_lainnya" class="input w-full mt-2"
+                                    placeholder="Masukkan lainnya..." />
+                            @endif
                             @endforeach
                         @endif
                     </div>
@@ -367,4 +387,3 @@
         </div>
     </div>
 </div>
-
diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php
index 90e490f..57e155d 100644
--- a/resources/views/surveyor/components/tanah.blade.php
+++ b/resources/views/surveyor/components/tanah.blade.php
@@ -13,15 +13,15 @@
                 <label class="form-label max-w-56">Luas Tanah</label>
                 <div class="mt-2">
                     @if (isset($permohonan->debiture->documents))
-                    @foreach ($permohonan->debiture->documents as $item)
-                    @php
-                        $luas = $item->detail;
-                        $details = json_decode($luas[0]->details, true);
-                        $luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A';
-                    @endphp
-                    <p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p>
-                @endforeach
-                
+                        @foreach ($permohonan->debiture->documents as $item)
+                            @php
+                                $luas = $item->detail;
+                                $details = json_decode($luas[0]->details, true);
+                                $luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A';
+                            @endphp
+                            <input type="hidden" name="luas_tanah_sesuai" class="input" value="{{ $luas_tanah }}">
+                            <p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p>
+                        @endforeach
                     @endif
                     <div class="flex-wrap items-stretch">
                         <div class="flex flex-wrap items-baseline w-full">
@@ -29,21 +29,22 @@
                                 <label class="form-label flex items-center gap-3 text-nowrap">
                                     <input type="radio" class="radio" name="luas_tanah" value="sesuai"
                                         onclick="toggleFieldVisibility('luas_tanah', 'luas_tanah_tidak_sesuai', ['tidak sesuai'])"
-                                        {{ old('luas_tanah', $forminspeksi['tanah']['luas_tanah'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                        {{ old('luas_tanah', isset($forminspeksi['tanah']['luas_tanah']['sesuai'])) ? 'checked' : '' }}>
                                     <span class="ml-2">Sesuai</span>
                                 </label>
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input type="radio" class="radio" name="luas_tanah" value="tidak sesuai"
                                         onclick="toggleFieldVisibility('luas_tanah', 'luas_tanah_tidak_sesuai', ['tidak sesuai'])"
-                                        {{ old('luas_tanah', $forminspeksi['tanah']['luas_tanah'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                        {{ old('luas_tanah', isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai'])) ? 'checked' : '' }}>
                                     <span class="ml-2">Tidak Sesuai</span>
                                 </label>
                                 <div id="luas_tanah_tidak_sesuai" class="flex items-baseline gap-2"
-                                    style="{{ old('luas_tanah', $forminspeksi['tanah']['luas_tanah'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
-                                    <input id="analisa_tanah_tidak_sesuai" type="text" name="luas_tanah_tidak_sesuai" class="input w-full"
-                                        placeholder="Masukan Luas Tanah"
-                                        value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah_tidak_sesuai'] ?? '') }}">
-                                    <button type="button" class="btn btn-md btn-primary" onclick="updateAnalisa('analisa_tanah')">Save</button>
+                                    style="{{ old('luas_tanah', isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai'])) ? '' : 'display: none;' }}">
+                                    <input id="analisa_tanah_tidak_sesuai" type="text" name="luas_tanah_tidak_sesuai"
+                                        class="input w-full" placeholder="Masukan Luas Tanah"
+                                        value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
+                                    <button type="button" class="btn btn-md btn-primary"
+                                        onclick="updateAnalisa('analisa_tanah')">Save</button>
                                 </div>
                             </div>
                             <em id="error-luas_tanah" class="alert text-danger text-sm"></em>
@@ -55,34 +56,46 @@
 
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Hadap Mata Angin</label>
+                <div class="mt-2">
+                @if (isset($permohonan->debiture->documents))
+                        @foreach ($permohonan->debiture->documents as $item)
+                            @php
+                                $luas = $item->detail;
+                                $details = json_decode($luas[0]->details, true);
+                                $hadap_mata_angin = isset($details['hadap_mata_angin']) ? $details['hadap_mata_angin'] : 'N/A';
+                            @endphp
+                            <input type="hidden" name="hadap_mata_angin_sesuai" class="input" value="{{ $hadap_mata_angin }}">
+                            <p class="text-2sm text-gray-700">{{ $hadap_mata_angin }} m<sup>2</sup></p>
+                        @endforeach
+                    @endif
                 <div class="flex-wrap items-stretch">
                     <div class="grid grid-cols-3 md:grid-cols-3 gap-4 mt-2">
                         <label class="form-label flex items-center gap-3 text-nowrap">
                             <input type="radio" class="radio" name="hadap_mata_angin" value="sesuai"
                                 onclick="toggleFieldVisibility('hadap_mata_angin', 'hadap_mata_angin_tidak_sesuai' ,['tidak sesuai'])"
-                                {{ old('hadap_mata_angin', $forminspeksi['tanah']['hadap_mata_angin'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                {{ old('hadap_mata_angin', isset($forminspeksi['tanah']['hadap_mata_angin']['sesuai'])) ? 'checked' : '' }}>
                             <span class="ml-2">Sesuai</span>
                         </label>
 
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input type="radio"  class="radio" name="hadap_mata_angin" value="tidak sesuai"
+                            <input type="radio" class="radio" name="hadap_mata_angin" value="tidak sesuai"
                                 onclick="toggleFieldVisibility('hadap_mata_angin', 'hadap_mata_angin_tidak_sesuai' ,['tidak sesuai'])"
-                                {{ old('hadap_mata_angin', $forminspeksi['tanah']['hadap_mata_angin'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                {{ old('hadap_mata_angin', isset($forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai'])) ? 'checked' : '' }}>
                             <span class="ml-2">Tidak Sesuai</span>
                         </label>
 
                         <!-- Select dropdown untuk "Tidak Sesuai" -->
+
                         <div id="hadap_mata_angin_tidak_sesuai" class="flex items-baseline gap-2"
-                            style="{{ old('hadap_mata_angin', $forminspeksi['tanah']['hadap_mata_angin'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
-                            <select
-                                class="input w-full
+                            style="{{ old('hadap_mata_angin', isset($forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai'])) ? '' : 'display: none;' }}">
+                            <select class="input w-full
                                 id="hadap_matangin_tidak_sesuai"
-                            name="analisa_tanah_hadap_mata_angin_tidak_sesuai">
+                                name="analisa_tanah_hadap_mata_angin_tidak_sesuai">
                                 <option value="">Select Hadap Mata Angin</option>
                                 @if (isset($arahMataAngin))
                                     @foreach ($arahMataAngin as $item)
                                         <option value="{{ $item->name }}"
-                                            {{ old('hadap_mata_angin_tidak_sesuai', $forminspeksi['tanah']['hadap_mata_angin_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
+                                            {{ old('hadap_mata_angin_tidak_sesuai', $forminspeksi['tanah']['hadap_mata_angin']['tidak sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
                                             {{ $item->name }}
                                         </option>
                                     @endforeach
@@ -94,6 +107,7 @@
                     <em id="error-hadap_mata_angin" class="alert text-danger text-sm"></em>
                 </div>
             </div>
+            </div>
 
 
             <!-- Bentuk Tanah -->
@@ -106,33 +120,22 @@
                             @foreach ($bentukTanah as $item)
                                 <div class="flex items-center">
                                     <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                        <input
-                                            class="checkbox"
-                                            name="bentuk_tanah[]"
-                                            type="checkbox"
+                                        <input class="checkbox" name="bentuk_tanah[]" type="checkbox"
                                             value="{{ $item->name }}"
-                                            {{
-                                                in_array($item->name, old('bentuk_tanah', [])) ||
-                                                (isset($forminspeksi['tanah']['bentuk_tanah']) &&
-                                                 is_array($forminspeksi['tanah']['bentuk_tanah']) &&
-                                                 in_array($item->name, $forminspeksi['tanah']['bentuk_tanah']))
+                                            {{ in_array($item->name, old('bentuk_tanah', [])) ||
+                                            (isset($forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']) &&
+                                                is_array($forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']) &&
+                                                in_array($item->name, $forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah']))
                                                 ? 'checked'
-                                                : ''
-                                            }}
-                                            onclick="toggleCheckboxVisibility('bentuk_tanah', 'bentuk_tanah_lainnya', ['lainnya'])"
-                                        />
+                                                : '' }}
+                                            onclick="toggleCheckboxVisibility('bentuk_tanah', 'bentuk_tanah_lainnya', ['lainnya'])" />
                                         {{ $item->name }}
                                     </label>
                                     @if (strcasecmp($item->name, 'lainnya') == 0)
-                                        <input
-                                            id="bentuk_tanah_lainnya"
-                                            type="text"
-                                            style="display: none;"
-                                            name="bentuk_tanah_lainnya"
-                                            class="input w-full mt-2"
+                                        <input id="bentuk_tanah_lainnya" type="text" style="display: none;"
+                                            name="bentuk_tanah_lainnya" class="input w-full mt-2"
                                             placeholder="Masukkan bentuk tanah..."
-                                            value="{{ old('bentuk_tanah_lainnya', $forminspeksi['tanah']['bentuk_tanah_lainnya'] ?? '') }}"
-                                        />
+                                            value="{{ old('bentuk_tanah_lainnya', $forminspeksi['tanah']['bentuk_tanah']['lainnya'] ?? '') }}" />
                                     @endif
                                 </div>
                             @endforeach
@@ -149,20 +152,9 @@
                         @if (isset($konturTanah))
                             @foreach ($konturTanah as $item)
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                    <input
-                                        class="checkbox"
-                                        name="kontur_tanah[]"
-                                        type="checkbox"
+                                    <input class="checkbox" name="kontur_tanah[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{
-                                            in_array(
-                                                $item->name,
-                                                old('kontur_tanah', $forminspeksi['tanah']['kontur_tanah'] ?? [])
-                                            )
-                                            ? 'checked'
-                                            : ''
-                                        }}
-                                    />
+                                        {{ in_array($item->name, old('kontur_tanah', $forminspeksi['tanah']['kontur_tanah'] ?? [])) ? 'checked' : '' }} />
                                     {{ $item->name }}
                                 </label>
                             @endforeach
@@ -238,27 +230,18 @@
                     <div class="flex flex-col items-start gap-4">
                         @if (isset($posisiKavling))
                             @foreach ($posisiKavling as $item)
-                            <div class="flex items-center">
+                                <div class="flex items-center">
                                     <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                        <input
-                                            class="checkbox"
-                                            name="posisi_kavling[]"
-                                            type="checkbox"
+                                        <input class="checkbox" name="posisi_kavling[]" type="checkbox"
                                             value="{{ $item->name }}"
-                                            {{ in_array($item->name, old('posisi_kavling', $forminspeksi['tanah']['posisi_kavling'] ?? [])) ? 'checked' : '' }}
-                                            onclick="toggleCheckboxVisibility('posisi_kavling', 'posisi_kavling_lainnya', ['Lainnya'])"
-                                        />
+                                            {{ in_array($item->name, old('posisi_kavling', $forminspeksi['tanah']['posisi_kavling']['posisi_kavling'] ?? [])) ? 'checked' : '' }}
+                                            onclick="toggleCheckboxVisibility('posisi_kavling', 'posisi_kavling_lainnya', ['Lainnya'])" />
                                         {{ $item->name }}
                                     </label>
                                     @if (strcasecmp($item->name, 'Lainnya') == 0)
-                                        <input
-                                            id="posisi_kavling_lainnya"
-                                            type="text"
-                                            style="display: none;"
-                                            name="posisi_kavling_lainnya"
-                                            class="input w-full mt-2"
-                                            placeholder="Masukkan Posisi Kavling lainnya..."
-                                        />
+                                        <input id="posisi_kavling_lainnya" type="text" style="display: none;"
+                                            name="posisi_kavling_lainnya" class="input w-full mt-2"
+                                            placeholder="Masukkan Posisi Kavling lainnya..."  value="{{ old('posisi_kavling_lainnya', $forminspeksi['tanah']['posisi_kavling']['lainnya'] ?? '') }}" />
                                     @endif
                                 </div>
                             @endforeach
@@ -319,7 +302,7 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="kondisi_fisik_tanah[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ in_array($item->name, old('kondisi_fisik_tanah', [])) || (isset($forminspeksi['tanah']['kondisi_fisik_tanah']) && in_array($item->name, $forminspeksi['tanah']['kondisi_fisik_tanah'])) ? 'checked' : '' }}
+                                        {{ in_array($item->name, old('kondisi_fisik_tanah', [])) || (isset($forminspeksi['tanah']['kondisi_fisik_tanah']['kondisi_fisik_tanah']) && in_array($item->name, $forminspeksi['tanah']['kondisi_fisik_tanah']['kondisi_fisik_tanah'])) ? 'checked' : '' }}
                                         onclick="toggleInputLainnya(this, 'kondisi_fisik_tanah_lainnya', '{{ $item->name }}')" />
                                     {{ $item->name }}
                                 </label>
@@ -330,7 +313,7 @@
                                         <input type="text" name="kondisi_fisik_tanah_lainnya"
                                             id="kondisi_fisik_tanah_lainnya" class="input mt-2"
                                             placeholder="Masukkan Kondisi Fisik Tanah..." style="display: none;"
-                                            value="{{ old('kondisi_fisik_tanah_lainnya') }}">
+                                            value="{{ old('kondisi_fisik_tanah_lainnya', isset($forminspeksi['tanah']['kondisi_fisik_tanah']['lainnya'])) }}">
                                     </div>
                                 @endif
                             @endforeach
diff --git a/resources/views/surveyor/data/index.blade.php b/resources/views/surveyor/data/index.blade.php
index fc436c7..ecae761 100644
--- a/resources/views/surveyor/data/index.blade.php
+++ b/resources/views/surveyor/data/index.blade.php
@@ -19,7 +19,7 @@
                     </div>
                     <div class="flex flex-wrap gap-2.5">
                         <div class="h-[24px] border border-r-gray-200"></div>
-                        <a class="btn btn-sm btn-light" href=""> Export to Excel </a>
+                        <a class="btn btn-sm btn-light" href="{{ route('basicdata.export',  $header[1] ) }}"> Export to Excel </a>
 
                         @php
                             $href = route('basicdata.createData', ['type' => $header[1]]);
@@ -42,7 +42,7 @@
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[250px]" data-datatable-column="name">
-                                <span class="sort"> <span class="sort-label"> Jenis Aset </span>
+                                <span class="sort"> <span class="sort-label">{{ isset($header[0]) ? $header[0] : '' }}</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
diff --git a/resources/views/surveyor/detail.blade.php b/resources/views/surveyor/detail.blade.php
index 6a28dac..9b1896a 100644
--- a/resources/views/surveyor/detail.blade.php
+++ b/resources/views/surveyor/detail.blade.php
@@ -16,7 +16,7 @@
             }
         </style>
     @endpush
-
+    @include('lpj::assetsku.includenya')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
 
 
@@ -25,33 +25,12 @@
         <div class="card min-w-full py-2 px-2">
             <div class="card-header" id="basic_settings">
                 <div class="card-title flex flex-row gap-1.5">
-                    <a href="{{ route('surveyor.show', array_merge(request()->query(), ['id' => $surveyor, 'form' => 'inspeksi'])) }}"
-                        class="btn btn-xs {{ request()->has('form') && request('form') == 'inspeksi' ? 'btn-outline btn-primary' : 'btn-light' }}">FORM
-                        INSPEKSI</a>
-
-                    <a href="{{ route('surveyor.show', array_merge(request()->query(), ['id' => $surveyor, 'form' => 'denah'])) }}"
-                        class="btn btn-xs {{ request()->has('form') && request('form') == 'denah' ? 'btn-outline btn-primary' : 'btn-light' }}">DENAH
-                        TANAH DAN BANGUNAN</a>
-
-                    <a href="{{ route('surveyor.show', array_merge(request()->query(), ['id' => $surveyor, 'form' => 'foto'])) }}"
-                        class="btn btn-xs {{ request()->has('form') && request('form') == 'foto' ? 'btn-outline btn-primary' : 'btn-light' }}">FOTO</a>
-
-                    <a href="{{ route('surveyor.show', array_merge(request()->query(), ['id' => $surveyor, 'form' => 'data-pembanding'])) }}"
-                        class="btn btn-xs {{ request()->has('form') && request('form') == 'data-pembanding' ? 'btn-outline btn-primary' : 'btn-light' }}">DATA
-                        PEMBANDING</a>
+                   Form Jaminan
                 </div>
             </div>
 
             <div class="card-body">
-                @if (request()->has('form') && request('form') == 'denah')
                     @include('lpj::surveyor.components.card-tambah')
-                    @elseif(request()->has('form') && request('form') == 'data-pembanding')
-                    @include('lpj::surveyor.components.card-tambah')
-                @elseif(request()->has('form') && request('form') == 'foto')
-                    @include('lpj::surveyor.components.card-tambah')
-                @else
-                    @include('lpj::surveyor.components.card-tambah')
-                @endIf
             </div>
 
             <div class="card-footer ">
@@ -107,11 +86,19 @@
                 },
                 success: function(response) {
                     if (response.success) {
-                        window.location.href = "{{ route('surveyor.index') }}";
+                        // window.location.href = "{{ route('surveyor.index') }}";
+                        toastrSuccessBuild(response.message);
                     }
                 },
                 error: function(xhr, status, error) {
                     console.log('Error checking button status:', error, status, xhr);
+                    if (xhr.responseJSON.message) {
+                        toastrErrorBuild(xhr.responseJSON.message);
+                    }else{
+                        toastrErrorBuild('Terjadi kesalahan');
+                    }
+
+                    
                 }
             });
         }
diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php
index b95b630..873c5c0 100644
--- a/resources/views/surveyor/index.blade.php
+++ b/resources/views/surveyor/index.blade.php
@@ -5,206 +5,213 @@
 @endsection
 @section('content')
     @push('styles')
-
     @endpush
 
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-            <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
-                data-datatable-state-save="false" id="permohonan-table" data-api-url="{{ route('surveyor.datatables') }}">
-                <div class="card-header py-5 flex-wrap">
-                    <h3 class="card-title">
-                        Surveyor
-                    </h3>
-                    <div class="flex flex-wrap gap-2 lg:gap-5">
-                        <div class="flex">
-                            <label class="input input-sm">
-                                <i class="ki-filled ki-magnifier"></i>
-                                <input placeholder="Search Penilaian" id="search" type="text" value="">
-                            </label>
-                        </div>
-
-                        <div class="flex flex-wrap gap-2.5">
-                            <div class="h-[24px] border border-r-gray-200"></div>
-                            <a class="btn btn-sm btn-light" href="{{ route('activity.export') }}"> Export to Excel </a>
-                        </div>
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
+            data-datatable-state-save="false" id="permohonan-table" data-api-url="{{ route('surveyor.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Surveyor
+                </h3>
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex">
+                        <label class="input input-sm">
+                            <i class="ki-filled ki-magnifier"></i>
+                            <input placeholder="Search Penilaian" id="search" type="text" value="">
+                        </label>
                     </div>
-                </div>
 
-                <div class="card-body">
-                    <div class="scrollable-x-auto">
-                        <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
-                            data-datatable-table="true">
-                            <thead>
-                                <tr>
-                                    <th class="w-14">
-                                        <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
-                                    </th>
-                                    <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
-                                        <span class="sort"><span class="sort-label">Nomor Registrasi</span>
-                                            <span class="sort-icon"></span>
-                                        </span>
-                                    </th>
-                                    <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                        <span class="sort"><span class="sort-label">Tanggal Assigned</span>
-                                            <span class="sort-icon"></span>
-                                        </span>
-                                    </th>
-                                    <th class="min-w-[150px]" data-datatable-column="user_id">
-                                        <span class="sort"><span class="sort-label">User Pemohon</span>
-                                            <span class="sort-icon"></span>
-                                        </span>
-                                    </th>
-                                    <th class="min-w-[150px]" data-datatable-column="branch_id">
-                                        <span class="sort"><span class="sort-label">Cabang Pemohon</span>
-                                            <span class="sort-icon"></span>
-                                        </span>
-                                    </th>
-                                    <th class="min-w-[150px]" data-datatable-column="debitur_id">
-                                        <span class="sort"><span class="sort-label">Debitur</span>
-                                            <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">Tujuan Penilaian</span>
-                                            <span class="sort-icon"></span>
-                                        </span>
-                                    </th>
-                                    <th class="min-w-[150px]" data-datatable-column="status">
-                                        <span class="sort"><span class="sort-label">Fasilitas Kredit</span>
-                                            <span class="sort-icon"></span>
-                                        </span>
-                                    </th>
-
-                                    <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
-                                </tr>
-                            </thead>
-                        </table>
-                    </div>
-                    <div
-                        class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
-                        <div class="flex items-center gap-2">
-                            Show
-                            <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
-                            page
-                        </div>
-                        <div class="flex items-center gap-4">
-                            <span data-datatable-info="true"></span>
-                            <div class="pagination" data-datatable-pagination="true"></div>
-                        </div>
+                    <div class="flex flex-wrap gap-2.5">
+                        <div class="h-[24px] border border-r-gray-200"></div>
+                        <a class="btn btn-sm btn-light" href="{{ route('activity.export') }}"> Export to Excel </a>
                     </div>
                 </div>
             </div>
 
+            <div class="card-body">
+                <div class="scrollable-x-auto">
+                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
+                        data-datatable-table="true">
+                        <thead>
+                            <tr>
+                                <th class="w-14">
+                                    <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                    <span class="sort"><span class="sort-label">Nomor Registrasi</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                    <span class="sort"><span class="sort-label">Tanggal Assigned</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="user_id">
+                                    <span class="sort"><span class="sort-label">User Pemohon</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                    <span class="sort"><span class="sort-label">Cabang Pemohon</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                    <span class="sort"><span class="sort-label">Debitur</span>
+                                        <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">Tujuan Penilaian</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="status">
+                                    <span class="sort"><span class="sort-label">Fasilitas Kredit</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+
+                                <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div
+                    class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
+                        page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"></span>
+                        <div class="pagination" data-datatable-pagination="true"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </div>
-
-
 @endsection
 
 @push('scripts')
-<script>
-function jadwal(id){
-        document.getElementById('ids').value = id ;
-    }
-</script>
-<script type="module">
+    <script>
+        function jadwal(id) {
+            document.getElementById('ids').value = id;
+        }
 
-    const element = document.querySelector('#permohonan-table');
-    const searchInput = document.getElementById('search');
-    const statusFilter = document.getElementById('status-filter');
-    const apiUrl = element.getAttribute('data-api-url');
-    const dataTableOptions = {
-        apiEndpoint: apiUrl,
-        pageSize: 5,
-        order: [{
-            column: 'nomor_registrasi',
-            dir: 'asc'
-        }], // Default order by 'nomor_registrasi' ascending
-        columns: {
-            select: {
-                render: (item, data, context) => {
-                    const checkbox = document.createElement('input');
-                    checkbox.className = 'checkbox checkbox-sm';
-                    checkbox.type = 'checkbox';
-                    checkbox.value = data.id.toString();
-                    checkbox.setAttribute('data-datatable-row-check', 'true');
-                    return checkbox.outerHTML.trim();
+        function freezeInputSurveyor(data) {
+
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#permohonan-table');
+        const searchInput = document.getElementById('search');
+        const statusFilter = document.getElementById('status-filter');
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            order: [{
+                column: 'nomor_registrasi',
+                dir: 'asc'
+            }], // Default order by 'nomor_registrasi' ascending
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
                 },
-            },
-            nomor_registrasi: {
-                title: 'Nomor Registrasi',
-            },
-            tanggal_permohonan: {
-                title: 'Tanggal Assigned',
-            },
-            user_id: {
-                title: 'User Pemohon',
-                render: (item, data) => `${data.user.name}`,
-            },
-            branch_id: {
-                title: 'Cabang Pemohon',
-                render: (item, data) => `${data.branch.name}`,
-            },
-            debitur_id: {
-                title: 'Debitur',
-                render: (item, data) => `${data.debiture.name}`,
-            },
-            tujuan_penilaian_id: {
-                title: 'Tujuan Penilaian',
-                render: (item, data) => `${data.tujuan_penilaian.name}`,
-            },
-            jenis_fasilitas_kredit_id: {
-                title: 'Fasilitas Kredit',
-                render: (item, data) => `${data.jenis_fasilitas_kredit.name}`,
-            },
-            actions: {
-                title: 'Action',
-                render: (item, data) => {
-                    let actionHtml = '';
+                nomor_registrasi: {
+                    title: 'Nomor Registrasi',
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Assigned',
+                },
+                user_id: {
+                    title: 'User Pemohon',
+                    render: (item, data) => `${data.user.name}`,
+                },
+                branch_id: {
+                    title: 'Cabang Pemohon',
+                    render: (item, data) => `${data.branch.name}`,
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => `${data.debiture.name}`,
+                },
+                tujuan_penilaian_id: {
+                    title: 'Tujuan Penilaian',
+                    render: (item, data) => `${data.tujuan_penilaian.name}`,
+                },
+                jenis_fasilitas_kredit_id: {
+                    title: 'Fasilitas Kredit',
+                    render: (item, data) => `${data.jenis_fasilitas_kredit.name}`,
+                },
+                actions: {
+                    title: 'Action',
+                    render: (item, data) => {
+                        let actionHtml = '';
 
-                    if (data.penilaian.waktu_penilaian == null && data.penilaian.authorized_status == null) {
-                        actionHtml += `
+                        if (data.penilaian.waktu_penilaian == null && data.penilaian.authorized_status == null) {
+                            actionHtml += `
                              <a class="btn btn-sm btn-icon btn-clear btn-primary" data-modal-toggle="#modal_jadwal" onclick="jadwal(${data.penilaian.id})">
                                 <i class="ki-filled ki-calendar-edit"></i>
                             </a>
                         `;
-                    } else {
-                        actionHtml += `
+                        } else {
+                            actionHtml += `
                             <a class="btn btn-sm btn-icon btn-clear btn-warning" href="surveyor/${data.id}/show?form=inspeksi">
                                 <i class="ki-outline ki-eye"></i>
                             </a>
+                            <button type="button" class="btn btn-sm btn-icon btn-clear btn-info" onclick="freezeInputSurveyor(${data.id})" data-modal-toggle="#modal_freeze">
+                                <i class="ki-filled ki-arrow-circle-right"></i>
+                            </button>
+
+
                         `;
+                        }
+                        return actionHtml;
                     }
-                    return actionHtml;
                 }
             }
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+
+        searchInput.addEventListener('input', function() {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+        });
+
+        // statusFilter.addEventListener('change', function() {
+        //     const selectedStatus = this.value;
+        //     dataTable.search(selectedStatus);
+        // });
+
+        function convertDate(date) {
+            const createdAt = new Date(date);
+            const day = String(createdAt.getDate()).padStart(2, '0');
+            const month = String(createdAt.getMonth() + 1).padStart(2, '0');
+            const year = createdAt.getFullYear();
+            return `${day}-${month}-${year}`;
         }
-    };
 
-    let dataTable = new KTDataTable(element, dataTableOptions);
 
-    searchInput.addEventListener('input', function() {
-        const searchValue = this.value.trim();
-        dataTable.search(searchValue, true);
-    });
 
-    // statusFilter.addEventListener('change', function() {
-    //     const selectedStatus = this.value;
-    //     dataTable.search(selectedStatus);
-    // });
-
-    function convertDate(date) {
-        const createdAt = new Date(date);
-        const day = String(createdAt.getDate()).padStart(2, '0');
-        const month = String(createdAt.getMonth() + 1).padStart(2, '0');
-        const year = createdAt.getFullYear();
-        return `${day}-${month}-${year}`;
-    }
-
-</script>
+    </script>
 @endpush
 
-<div class="modal" data-modal="true" id="modal_jadwal" >
-    <div class="modal-content max-w-[600px] top-[10%]">
+<div class="modal" data-modal="true" id="modal_jadwal">
+    <div class="modal-content modal-center-y max-w-[600px]">
         <div class="modal-header">
             <h3 class="modal-title">Kunjungan</h3>
             <button class="btn btn-xs btn-icon btn-light" data-modal-dismiss="true">
@@ -212,7 +219,8 @@ function jadwal(id){
             </button>
         </div>
         <div class="modal-body">
-            <form action="{{ route('surveyor.storeJadwal')}}" method="POST" enctype="multipart/form-data" id="revisiForm">
+            <form action="{{ route('surveyor.storeJadwal') }}" method="POST" enctype="multipart/form-data"
+                id="revisiForm">
                 @method('put')
                 @csrf
                 <input id="ids" type="hidden" name="id">
@@ -231,8 +239,51 @@ function jadwal(id){
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">Catatan</label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <textarea id="deskripsi_penilaian" class="textarea @error('deskripsi_penilaian') border-danger bg-danger-light @enderror"
-                                rows="3" name="deskripsi_penilaian"></textarea>
+                            <textarea id="deskripsi_penilaian"
+                                class="textarea @error('deskripsi_penilaian') border-danger bg-danger-light @enderror" rows="3"
+                                name="deskripsi_penilaian"></textarea>
+                            @error('deskripsi_penilaian')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-footer justify-end mt-2">
+                    <div class="flex gap-4">
+                        <button type="button" class="btn btn-light" data-modal-dismiss="true">Cancel</button>
+                        <button id="btnSubmit" type="submit" class="btn btn-primary">Submit</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+
+
+<div class="modal" data-modal="true" id="modal_freeze">
+    <div class="modal-content modal-center-y max-w-[600px]">
+        <div class="modal-header">
+            <h3 class="modal-title">Freeze Surveyor</h3>
+            <button class="btn btn-xs btn-icon btn-light" data-modal-dismiss="true">
+                <i class="ki-outline ki-cross"></i>
+            </button>
+        </div>
+        <div class="modal-body">
+            <form action="{{ route('surveyor.storeFreeze') }}" method="POST" enctype="multipart/form-data"
+                id="freezeSurveyor">
+                @method('put')
+                @csrf
+                <input id="ids" type="hidden" name="id">
+
+                <div class="pl-1 grid gap-2.5">
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">Catatan</label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <textarea id="deskripsi_penilaian"
+                                class="textarea @error('deskripsi_penilaian') border-danger bg-danger-light @enderror" rows="3"
+                                name="deskripsi_penilaian"></textarea>
                             @error('deskripsi_penilaian')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 8dd6980..c0ea961 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -380,7 +380,7 @@ Breadcrumbs::for('tender.penawaran', function (BreadcrumbTrail $trail) {
 });
 
 Breadcrumbs::for('tender.penawaran.show', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
+    $trail->parent('tender');
     $trail->push('Detail Penawaran', route('tender.penawaran.show', $noreg));
 });
 
@@ -390,23 +390,22 @@ Breadcrumbs::for('tender.penawaran.createPenawaran', function (BreadcrumbTrail $
 });
 
 Breadcrumbs::for('tender.penawaran.editPenawaran', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
+    $trail->parent('tender.penawaran');
     $trail->push('Penawaran Ulang', route('tender.penawaran.editPenawaran', $noreg));
 });
 
 Breadcrumbs::for('tender.penawaran.showSuratTender', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
-    $trail->push('Penawaran Ulang', route('tender.penawaran.editPenawaran', $noreg));
+    $trail->parent('tender.penawaran');
     $trail->push('Surat Tender', route('tender.penawaran.showSuratTender', $noreg));
 });
 
 Breadcrumbs::for('tender.penawaran.suratTenderKJPP', function (BreadcrumbTrail $trail, $noreg, $id) {
-    $trail->parent('tender.penawaran.showKirimEmail', ['noreg' => $noreg]);
+    $trail->parent('tender.penawaran');
     $trail->push('Surat Tender KJPP', route('tender.penawaran.suratTenderKJPP', ['noreg' => $noreg, 'id' => $id]));
 });
 
 Breadcrumbs::for('tender.penawaran.showKirimEmail', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
+    $trail->parent('tender.penawaran');
     $trail->push('Show Kirim Email Penawaran', route('tender.penawaran.showKirimEmail', $noreg));
 });
 
@@ -419,6 +418,10 @@ Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
 Breadcrumbs::for('surveyor', function (BreadcrumbTrail $trail) {
     $trail->push('Surveyor', route('surveyor.index'));
 });
+Breadcrumbs::for('surveyor.inspeksi', function (BreadcrumbTrail $trail) {
+    $trail->parent('surveyor');
+    $trail->push('Form Inspeksi');
+});
 
 Breadcrumbs::for('surveyor.show', function (BreadcrumbTrail $trail) {
     $trail->parent('surveyor');
@@ -475,6 +478,12 @@ $basicDataRoutes = [
     'model-alat-berat'       => 'Model Alat Berat',
     'jenis-kapal'            => 'Jenis kapal',
     'jenis-kendaraan'        => 'Jenis kendaraan',
+    'jenis-unit'             => 'Jenis unit',
+    'terletak-area'          => 'Terletak di Area',
+    'merupakan-daerah'       => 'Merupakan Daerah',
+    'posisi-unit'            => 'Posisi unit',
+    'bentuk-unit'            => 'Bentuk unit',
+    'fasilitas-objek'        => 'Fasilitas Umum Dekat Objek',
 ];
 
 
@@ -556,6 +565,12 @@ Breadcrumbs::for('penilai.show', function (BreadcrumbTrail $trail) {
     $trail->push('Detail Penilai');
 });
 
+Breadcrumbs::for('penilai.lampiran', function (BreadcrumbTrail $trail) {
+    $trail->parent('penilai');
+    $trail->push('Lampiran Foto dan Dokument');
+});
+
+
 Breadcrumbs::for('sla', function (BreadcrumbTrail $trail) {
     $trail->parent('basicdata');
     $trail->push('SLA', route('basicdata.sla.index'));
diff --git a/routes/web.php b/routes/web.php
index 7ace9a7..9ded839 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,468 +1,470 @@
 <?php
 
-    use Illuminate\Support\Facades\Route;
-    use Modules\Lpj\Http\Controllers\ActivityController;
-    use Modules\Lpj\Http\Controllers\ArahMataAnginController;
-    use Modules\Lpj\Http\Controllers\DebitureController;
-    use Modules\Lpj\Http\Controllers\DokumenJaminanController;
-    use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
-    use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
-    use Modules\Lpj\Http\Controllers\IjinUsahaController;
-    use Modules\Lpj\Http\Controllers\JenisDokumenController;
-    use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
-    use Modules\Lpj\Http\Controllers\JenisJaminanController;
-    use Modules\Lpj\Http\Controllers\JenisLaporanController;
-    use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
-    use Modules\Lpj\Http\Controllers\JenisPenilaianController;
-    use Modules\Lpj\Http\Controllers\KJPPController;
-    use Modules\Lpj\Http\Controllers\LaporanController;
-    use Modules\Lpj\Http\Controllers\NilaiPlafondController;
-    use Modules\Lpj\Http\Controllers\PemilikJaminanController;
-    use Modules\Lpj\Http\Controllers\PenilaianController;
-    use Modules\Lpj\Http\Controllers\PenilaiController;
-    use Modules\Lpj\Http\Controllers\PermohonanController;
-    use Modules\Lpj\Http\Controllers\PersetujuanPenawaranController;
-    use Modules\Lpj\Http\Controllers\RegionController;
-    use Modules\Lpj\Http\Controllers\ResumeController;
-    use Modules\Lpj\Http\Controllers\SLAController;
-    use Modules\Lpj\Http\Controllers\StatusPermohonanController;
-    use Modules\Lpj\Http\Controllers\SurveyorController;
-    use Modules\Lpj\Http\Controllers\TeamsController;
-    use Modules\Lpj\Http\Controllers\TenderController;
-    use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
-    use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController;
+use Illuminate\Support\Facades\Route;
+use Modules\Lpj\Http\Controllers\ActivityController;
+use Modules\Lpj\Http\Controllers\ArahMataAnginController;
+use Modules\Lpj\Http\Controllers\DebitureController;
+use Modules\Lpj\Http\Controllers\DokumenJaminanController;
+use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
+use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
+use Modules\Lpj\Http\Controllers\IjinUsahaController;
+use Modules\Lpj\Http\Controllers\JenisDokumenController;
+use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
+use Modules\Lpj\Http\Controllers\JenisJaminanController;
+use Modules\Lpj\Http\Controllers\JenisLaporanController;
+use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
+use Modules\Lpj\Http\Controllers\JenisPenilaianController;
+use Modules\Lpj\Http\Controllers\KJPPController;
+use Modules\Lpj\Http\Controllers\LaporanController;
+use Modules\Lpj\Http\Controllers\NilaiPlafondController;
+use Modules\Lpj\Http\Controllers\PemilikJaminanController;
+use Modules\Lpj\Http\Controllers\PenilaianController;
+use Modules\Lpj\Http\Controllers\PenilaiController;
+use Modules\Lpj\Http\Controllers\PermohonanController;
+use Modules\Lpj\Http\Controllers\PersetujuanPenawaranController;
+use Modules\Lpj\Http\Controllers\RegionController;
+use Modules\Lpj\Http\Controllers\ResumeController;
+use Modules\Lpj\Http\Controllers\SLAController;
+use Modules\Lpj\Http\Controllers\StatusPermohonanController;
+use Modules\Lpj\Http\Controllers\SurveyorController;
+use Modules\Lpj\Http\Controllers\TeamsController;
+use Modules\Lpj\Http\Controllers\TenderController;
+use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
+use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController;
 
-    // use Modules\Lpj\Http\Controllers\ActivityController;
+// use Modules\Lpj\Http\Controllers\ActivityController;
 
-    /*
-        |--------------------------------------------------------------------------
-        | Web Routes
-        |--------------------------------------------------------------------------
-        |
-        | Here is where you can register web routes for your application. These
-        | routes are loaded by the RouteServiceProvider within a group which
-        | contains the "web" middleware group. Now create something great!
-        |
-        */
+/*
+    |--------------------------------------------------------------------------
+    | Web Routes
+    |--------------------------------------------------------------------------
+    |
+    | Here is where you can register web routes for your application. These
+    | routes are loaded by the RouteServiceProvider within a group which
+    | contains the "web" middleware group. Now create something great!
+    |
+    */
 
-    Route::middleware(['auth'])->group(function () {
-        Route::get('api/check-penawaran/{nomor_registrasi}', [TenderController::class, 'checkPenawaranExistence']);
+Route::middleware(['auth'])->group(function () {
+    Route::get('api/check-penawaran/{nomor_registrasi}', [TenderController::class, 'checkPenawaranExistence']);
 
-        Route::name('basicdata.')->prefix('basic-data')->group(function () {
-            Route::name('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
-                Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])->name(
-                    'datatables',
-                );
-                Route::get('export', [JenisFasilitasKreditController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-fasilitas-kredit', JenisFasilitasKreditController::class);
-
-            Route::name('jenis-legalitas-jaminan.')->prefix('jenis-legalitas-jaminan')->group(function () {
-                Route::get('restore/{id}', [JenisLegalitasJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisLegalitasJaminanController::class, 'dataForDatatables'])->name(
-                    'datatables',
-                );
-                Route::get('export', [JenisLegalitasJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class);
-
-            Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () {
-                Route::get('legalitas/{id}/{jenisJaminanId}', [DokumenJaminanController::class, 'getLegalitasJaminan'])
-                     ->name('legalitas');
-                Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-jaminan', JenisJaminanController::class);
-
-            Route::name('tujuan-penilaian.')->prefix('tujuan-penilaian')->group(function () {
-                Route::get('restore/{id}', [TujuanPenilaianController::class, 'restore'])->name('restore');
-                Route::get('datatables', [TujuanPenilaianController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [TujuanPenilaianController::class, 'export'])->name('export');
-            });
-            Route::resource('tujuan-penilaian', TujuanPenilaianController::class);
-
-            Route::name('tujuan_penilaian_kjpp.')->prefix('tujuan_penilaian_kjpp')->group(function () {
-                Route::get('datatables', [TujuanPenilaianKJPPController::class, 'dataForDatatables'])->name(
-                    'datatables',
-                );
-                Route::get('export', [TujuanPenilaianKJPPController::class, 'export'])->name('export');
-            });
-            Route::resource('tujuan_penilaian_kjpp', TujuanPenilaianKJPPController::class);
-
-            Route::name('jenis-dokumen.')->prefix('jenis-dokumen')->group(function () {
-                Route::get('restore/{id}', [JenisDokumenController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisDokumenController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisDokumenController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-dokumen', JenisDokumenController::class);
-
-
-            Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
-                Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
-                Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
-            });
-            Route::resource('nilai-plafond', NilaiPlafondController::class);
-
-            Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
-                    'datatables',
-                );
-                Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
-
-            Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
-                    'datatables',
-                );
-                Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
-
-            Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
-                Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
-                Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
-            });
-            Route::resource('arah-mata-angin', ArahMataAnginController::class);
-
-
-            Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
-                Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
-            });
-            Route::resource('status-permohonan', StatusPermohonanController::class);
-
-            Route::name('region.')->prefix('region')->group(function () {
-                Route::get('restore/{id}', [RegionController::class, 'restore'])->name('restore');
-                Route::get('datatables', [RegionController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [RegionController::class, 'export'])->name('export');
-            });
-
-
-            Route::resource('region', RegionController::class, [
-                'names' => [
-                    'index'   => 'region.index',
-                    'show'    => 'region.show',
-                    'create'  => 'region.create',
-                    'store'   => 'region.store',
-                    'edit'    => 'region.edit',
-                    'update'  => 'region.update',
-                    'destroy' => 'region.destroy',
-                ],
-            ]);
-
-            Route::resource('region', RegionController::class);
-
-
-            Route::name('teams.')->prefix('teams')->group(function () {
-                Route::get('restore/{id}', [TeamsController::class, 'restore'])->name('restore');
-                Route::get('datatables', [TeamsController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [TeamsController::class, 'export'])->name('export');
-            });
-
-            Route::resource('teams', TeamsController::class, [
-                'names' => [
-                    'index'   => 'teams.index',
-                    'show'    => 'teams.show',
-                    'create'  => 'teams.create',
-                    'store'   => 'teams.store',
-                    'edit'    => 'teams.edit',
-                    'update'  => 'teams.update',
-                    'destroy' => 'teams.destroy',
-                ],
-            ]);
-
-            Route::name('jenis-penilaian.')->prefix('jenis-penilaian')->group(function () {
-                Route::get('restore/{id}', [JenisPenilaianController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisPenilaianController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisPenilaianController::class, 'export'])->name('export');
-            });
-
-            Route::resource('jenis-penilaian', JenisPenilaianController::class, [
-                'names' => [
-                    'index'   => 'jenis-penilaian.index',
-                    'show'    => 'jenis-penilaian.show',
-                    'create'  => 'jenis-penilaian.create',
-                    'store'   => 'jenis-penilaian.store',
-                    'edit'    => 'jenis-penilaian.edit',
-                    'update'  => 'jenis-penilaian.update',
-                    'destroy' => 'jenis-penilaian.destroy',
-                ],
-            ]);
-
-
-            Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
-                Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
-                Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
-            });
-            Route::resource('nilai-plafond', NilaiPlafondController::class);
-
-            Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
-                    'datatables',
-                );
-                Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
-
-            Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
-                    'datatables',
-                );
-                Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
-
-            Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
-                Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
-                Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
-            });
-            Route::resource('arah-mata-angin', ArahMataAnginController::class);
-            Route::resource('arah-mata-angin', ArahMataAnginController::class);
-
-            Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
-                Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
-            });
-            Route::resource('status-permohonan', StatusPermohonanController::class);
-
-            // Start Activity KJPP route
-            Route::name('kjpp.')->prefix('kjpp')->group(function () {
-                Route::get('datatables', [KJPPController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [KJPPController::class, 'export'])->name('export');
-            });
-
-            Route::resource('kjpp', KJPPController::class);
-            // End Activity KJPP route
-
-            // Start Activity Ijin Usaha route
-            Route::name('ijin_usaha.')->prefix('ijin_usaha')->group(function () {
-                Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [IjinUsahaController::class, 'export'])->name('export');
-            });
-
-            Route::resource('ijin_usaha', IjinUsahaController::class);
-            // End Activity Ijin Usaha route
-
-            // Start Activity Jenis Laporan route
-            Route::name('jenis_laporan.')->prefix('jenis_laporan')->group(function () {
-                Route::get('datatables', [JenisLaporanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisLaporanController::class, 'export'])->name('export');
-            });
-
-            Route::resource('jenis_laporan', JenisLaporanController::class);
-            // End Activity Jenis Laporan route
-
-            // basic data surveyor
-            Route::get('datatablesSurveyory/{type}', [SurveyorController::class, 'dataForDatatablesData'])->name(
-                'datatablesSurveyory',
+    Route::name('basicdata.')->prefix('basic-data')->group(function () {
+        Route::name('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
+            Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])->name(
+                'datatables',
             );
-            Route::get('createData/{type}', [SurveyorController::class, 'createData'])->name('createData');
-            Route::get('/{type}/{id}', [SurveyorController::class, 'editData'])->name('editData');
-            Route::post('storeData/{type}', [SurveyorController::class, 'storeData'])->name('storeData');
-            Route::put('updateData/{type}/{id}', [SurveyorController::class, 'updateData'])->name('updateData');
-            Route::delete('deleteData/{id}/{type}', [SurveyorController::class, 'destroy'])->name('deleteData');
+            Route::get('export', [JenisFasilitasKreditController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-fasilitas-kredit', JenisFasilitasKreditController::class);
 
-            // Start Activity SLA route
-            Route::name('sla.')->prefix('sla')->group(function () {
-                Route::get('/', [SLAController::class, 'index'])->name('index');
-            });
-            // End Activity SLA route
+        Route::name('jenis-legalitas-jaminan.')->prefix('jenis-legalitas-jaminan')->group(function () {
+            Route::get('restore/{id}', [JenisLegalitasJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisLegalitasJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [JenisLegalitasJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class);
 
-            $headers = [
-                'bentuk-tanah'           => 'Bentuk Tanah',
-                'kontur-tanah'           => 'Kontur Tanah',
-                'posisi-kavling'         => 'Posisi Kavling',
-                'ketinggian-tanah'       => 'Ketinggian Tanah',
-                'kondisi-fisik-tanah'    => 'Kondisi Fisik Tanah',
-                'jenis-bangunan'         => 'Jenis Bangunan',
-                'kondisi-bangunan'       => 'Kondisi Bangunan',
-                'sifat-bangunan'         => 'Sifat Bangunan',
-                'spek-bangunan'          => 'Speksifikasi Bangunan',
-                'spek-kategori-bangunan' => 'Speksifikasi Kategori Bangunan',
-                'sarana-pelengkap'       => 'Sarana Pelengkap',
-                'lalu-lintas-lokasi'     => 'Lalu Lintas',
-                'tingkat-keramaian'      => 'Tingkat Keramaian',
-                'gol-mas-sekitar'        => 'Golongan Masyarakat Sekitar',
-                'lantai-unit'            => 'Lantai Unit',
-                'view-unit'              => 'View Unit',
-                'bentuk-unit'            => 'Bentuk unit',
-                'perkerasan-jalan'       => 'Perkerasan jalan',
-                'jenis-pesawat'          => 'Jenis pesawat',
-                'model-alat-berat'       => 'Model Alat Berat',
-                'jenis-kapal'            => 'Jenis kapal',
-                'jenis-kendaraan'        => 'Jenis kendaraan',
-                'jenis-unit' => 'Jenis unit',
-        'terletak-area' => 'Terletak di Area',
-        'merupakan-daerah' => 'Merupakan Daerah',
-        'posisi-unit' => 'Posisi unit',
-        'bentuk-unit' => 'Bentuk unit',
-        'fasilitas-objek' => 'Fasilitas Umum Dekat Objek',
+        Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () {
+            Route::get('legalitas/{id}/{jenisJaminanId}', [DokumenJaminanController::class, 'getLegalitasJaminan'])
+                 ->name('legalitas');
+            Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-jaminan', JenisJaminanController::class);
+
+        Route::name('tujuan-penilaian.')->prefix('tujuan-penilaian')->group(function () {
+            Route::get('restore/{id}', [TujuanPenilaianController::class, 'restore'])->name('restore');
+            Route::get('datatables', [TujuanPenilaianController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [TujuanPenilaianController::class, 'export'])->name('export');
+        });
+        Route::resource('tujuan-penilaian', TujuanPenilaianController::class);
+
+        Route::name('tujuan_penilaian_kjpp.')->prefix('tujuan_penilaian_kjpp')->group(function () {
+            Route::get('datatables', [TujuanPenilaianKJPPController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [TujuanPenilaianKJPPController::class, 'export'])->name('export');
+        });
+        Route::resource('tujuan_penilaian_kjpp', TujuanPenilaianKJPPController::class);
+
+        Route::name('jenis-dokumen.')->prefix('jenis-dokumen')->group(function () {
+            Route::get('restore/{id}', [JenisDokumenController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisDokumenController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisDokumenController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-dokumen', JenisDokumenController::class);
+
+
+        Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
+            Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
+            Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
+        });
+        Route::resource('nilai-plafond', NilaiPlafondController::class);
+
+        Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
+
+        Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
+
+        Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
+            Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
+            Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
+        });
+        Route::resource('arah-mata-angin', ArahMataAnginController::class);
+
+
+        Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
+            Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
+        });
+        Route::resource('status-permohonan', StatusPermohonanController::class);
+
+        Route::name('region.')->prefix('region')->group(function () {
+            Route::get('restore/{id}', [RegionController::class, 'restore'])->name('restore');
+            Route::get('datatables', [RegionController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [RegionController::class, 'export'])->name('export');
+        });
+
+
+        Route::resource('region', RegionController::class, [
+            'names' => [
+                'index'   => 'region.index',
+                'show'    => 'region.show',
+                'create'  => 'region.create',
+                'store'   => 'region.store',
+                'edit'    => 'region.edit',
+                'update'  => 'region.update',
+                'destroy' => 'region.destroy',
+            ],
+        ]);
+
+        Route::resource('region', RegionController::class);
+
+
+        Route::name('teams.')->prefix('teams')->group(function () {
+            Route::get('restore/{id}', [TeamsController::class, 'restore'])->name('restore');
+            Route::get('datatables', [TeamsController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [TeamsController::class, 'export'])->name('export');
+        });
+
+        Route::resource('teams', TeamsController::class, [
+            'names' => [
+                'index'   => 'teams.index',
+                'show'    => 'teams.show',
+                'create'  => 'teams.create',
+                'store'   => 'teams.store',
+                'edit'    => 'teams.edit',
+                'update'  => 'teams.update',
+                'destroy' => 'teams.destroy',
+            ],
+        ]);
+
+        Route::name('jenis-penilaian.')->prefix('jenis-penilaian')->group(function () {
+            Route::get('restore/{id}', [JenisPenilaianController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisPenilaianController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisPenilaianController::class, 'export'])->name('export');
+        });
+
+        Route::resource('jenis-penilaian', JenisPenilaianController::class, [
+            'names' => [
+                'index'   => 'jenis-penilaian.index',
+                'show'    => 'jenis-penilaian.show',
+                'create'  => 'jenis-penilaian.create',
+                'store'   => 'jenis-penilaian.store',
+                'edit'    => 'jenis-penilaian.edit',
+                'update'  => 'jenis-penilaian.update',
+                'destroy' => 'jenis-penilaian.destroy',
+            ],
+        ]);
+
+
+        Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
+            Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
+            Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
+        });
+        Route::resource('nilai-plafond', NilaiPlafondController::class);
+
+        Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
+
+        Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
+
+        Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
+            Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
+            Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
+        });
+        Route::resource('arah-mata-angin', ArahMataAnginController::class);
+        Route::resource('arah-mata-angin', ArahMataAnginController::class);
+
+        Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
+            Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
+        });
+        Route::resource('status-permohonan', StatusPermohonanController::class);
+
+        // Start Activity KJPP route
+        Route::name('kjpp.')->prefix('kjpp')->group(function () {
+            Route::get('datatables', [KJPPController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [KJPPController::class, 'export'])->name('export');
+        });
+
+        Route::resource('kjpp', KJPPController::class);
+        // End Activity KJPP route
+
+        // Start Activity Ijin Usaha route
+        Route::name('ijin_usaha.')->prefix('ijin_usaha')->group(function () {
+            Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [IjinUsahaController::class, 'export'])->name('export');
+        });
+
+        Route::resource('ijin_usaha', IjinUsahaController::class);
+        // End Activity Ijin Usaha route
+
+        // Start Activity Jenis Laporan route
+        Route::name('jenis_laporan.')->prefix('jenis_laporan')->group(function () {
+            Route::get('datatables', [JenisLaporanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisLaporanController::class, 'export'])->name('export');
+        });
+
+        Route::resource('jenis_laporan', JenisLaporanController::class);
+        // End Activity Jenis Laporan route
+
+        // basic data surveyor
+        Route::get('datatablesSurveyory/{type}', [SurveyorController::class, 'dataForDatatablesData'])->name(
+            'datatablesSurveyory',
+        );
+        Route::get('createData/{type}', [SurveyorController::class, 'createData'])->name('createData');
+        Route::get('/{type}/{id}', [SurveyorController::class, 'editData'])->name('editData');
+        Route::post('storeData/{type}', [SurveyorController::class, 'storeData'])->name('storeData');
+        Route::put('updateData/{type}/{id}', [SurveyorController::class, 'updateData'])->name('updateData');
+        Route::delete('deleteData/{id}/{type}', [SurveyorController::class, 'destroy'])->name('deleteData');
+
+        // Start Activity SLA route
+        Route::name('sla.')->prefix('sla')->group(function () {
+            Route::get('/', [SLAController::class, 'index'])->name('index');
+        });
+        // End Activity SLA route
+
+        $headers = [
+            'bentuk-tanah'           => 'Bentuk Tanah',
+            'kontur-tanah'           => 'Kontur Tanah',
+            'posisi-kavling'         => 'Posisi Kavling',
+            'ketinggian-tanah'       => 'Ketinggian Tanah',
+            'kondisi-fisik-tanah'    => 'Kondisi Fisik Tanah',
+            'jenis-bangunan'         => 'Jenis Bangunan',
+            'kondisi-bangunan'       => 'Kondisi Bangunan',
+            'sifat-bangunan'         => 'Sifat Bangunan',
+            'spek-bangunan'          => 'Speksifikasi Bangunan',
+            'spek-kategori-bangunan' => 'Speksifikasi Kategori Bangunan',
+            'sarana-pelengkap'       => 'Sarana Pelengkap',
+            'lalu-lintas-lokasi'     => 'Lalu Lintas',
+            'tingkat-keramaian'      => 'Tingkat Keramaian',
+            'gol-mas-sekitar'        => 'Golongan Masyarakat Sekitar',
+            'lantai-unit'            => 'Lantai Unit',
+            'view-unit'              => 'View Unit',
+            'bentuk-unit'            => 'Bentuk unit',
+            'perkerasan-jalan'       => 'Perkerasan jalan',
+            'jenis-pesawat'          => 'Jenis pesawat',
+            'model-alat-berat'       => 'Model Alat Berat',
+            'jenis-kapal'            => 'Jenis kapal',
+            'jenis-kendaraan'        => 'Jenis kendaraan',
+            'jenis-unit' => 'Jenis unit',
+            'terletak-area' => 'Terletak di Area',
+            'merupakan-daerah' => 'Merupakan Daerah',
+            'posisi-unit' => 'Posisi unit',
+            'bentuk-unit' => 'Bentuk unit',
+            'fasilitas-objek' => 'Fasilitas Umum Dekat Objek',
 
         ];
 
-            foreach ($headers as $type => $header) {
-                Route::get($type, [SurveyorController::class, 'data'])->name($type . '.index')->defaults('type', $type);
-            }
+        foreach ($headers as $type => $header) {
+            Route::get($type, [SurveyorController::class, 'data'])->name($type . '.index')->defaults('type', $type);
+        }
+
+        Route::get('export/{type}', [SurveyorController::class, 'export'])->name('export');
+    });
+
+    Route::name('debitur.')->prefix('debitur')->group(function () {
+        Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
+        Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [DebitureController::class, 'export'])->name('export');
+
+        Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
+            Route::get('download', [DokumenJaminanController::class, 'download'])->name('download');
+            Route::get('bulk-download', [DokumenJaminanController::class, 'bulkDownload'])->name('bulk.download');
+            Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
+            Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
+            Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
+            Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
+            Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
+            Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
         });
 
-        Route::name('debitur.')->prefix('debitur')->group(function () {
-            Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
-            Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
-            Route::get('export', [DebitureController::class, 'export'])->name('export');
-
-            Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
-                Route::get('download', [DokumenJaminanController::class, 'download'])->name('download');
-                Route::get('bulk-download', [DokumenJaminanController::class, 'bulkDownload'])->name('bulk.download');
-                Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
-                Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
-                Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
-                Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
-                Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
-                Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
-            });
-
-            Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
-                Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
-                Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
-                Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
-                Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
-                Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
-                Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
-            });
+        Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
+            Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
+            Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
+            Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
+            Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
+            Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
+            Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
         });
+    });
 
-        Route::resource('debitur', DebitureController::class);
+    Route::resource('debitur', DebitureController::class);
 
-        Route::name('laporan.')->prefix('laporan')->group(function () {
-            Route::get('sederhana', [LaporanController::class, 'sederhana_index'])->name('sederhana.index');
-            Route::get('standard', [LaporanController::class, 'standard_index'])->name('standard.index');
-        });
+    Route::name('laporan.')->prefix('laporan')->group(function () {
+        Route::get('sederhana', [LaporanController::class, 'sederhana_index'])->name('sederhana.index');
+        Route::get('standard', [LaporanController::class, 'standard_index'])->name('standard.index');
+    });
 
-        Route::name('resume.')->prefix('resume')->group(function () {
-            Route::get('/', [ResumeController::class, 'index'])->name('index');
-            Route::get('{id}/show', [ResumeController::class, 'show'])->name('show');
-            Route::post('store', [ResumeController::class, 'store'])->name('store');
-            Route::get('datatables', [ResumeController::class, 'dataForDatatables'])->name('datatables');
-        });
+    Route::name('resume.')->prefix('resume')->group(function () {
+        Route::get('/', [ResumeController::class, 'index'])->name('index');
+        Route::get('{id}/show', [ResumeController::class, 'show'])->name('show');
+        Route::post('store', [ResumeController::class, 'store'])->name('store');
+        Route::get('datatables', [ResumeController::class, 'dataForDatatables'])->name('datatables');
+    });
 
-        Route::name('permohonan.')->prefix('permohonan')->group(function () {
-            Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
-            Route::get('restore/{id}', [PermohonanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])->name('datatables');
-            Route::get('export', [PermohonanController::class, 'export'])->name('export');
-            Route::get('print/{id}', [PermohonanController::class, 'print'])->name('print');
-        });
+    Route::name('permohonan.')->prefix('permohonan')->group(function () {
+        Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
+        Route::get('restore/{id}', [PermohonanController::class, 'restore'])->name('restore');
+        Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [PermohonanController::class, 'export'])->name('export');
+        Route::get('print/{id}', [PermohonanController::class, 'print'])->name('print');
+    });
 
-        Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
+    Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
 
-        Route::resource('permohonan', PermohonanController::class);
+    Route::resource('permohonan', PermohonanController::class);
 
-        Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
-        Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization'])->name(
-            'authorization.datatables',
+    Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
+    Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization'])->name(
+        'authorization.datatables',
+    );
+    Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name(
+        'authorization.show',
+    );
+    Route::put('authorization/{id}', [PermohonanController::class, 'updateAuthorization'])->name(
+        'authorization.update',
+    );
+
+    Route::name('tender.')->prefix('tender')->group(function () {
+        // Penawaran
+        Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');
+        Route::get('penawaran/{noreg}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
+        Route::get('penawaran/{noreg}/create', [TenderController::class, 'penawaran_create'])->name(
+            'penawaran.createPenawaran',
         );
-        Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name(
-            'authorization.show',
+        Route::post('penawaran/{noreg}/store', [TenderController::class, 'penawaran_store'])->name(
+            'penawaran.storePenawaran',
         );
-        Route::put('authorization/{id}', [PermohonanController::class, 'updateAuthorization'])->name(
-            'authorization.update',
+        Route::get('penawaran/{noreg}/edit', [TenderController::class, 'penawaran_edit'])->name(
+            'penawaran.editPenawaran',
         );
+        Route::put('penawaran/{noreg}/update', [TenderController::class, 'penawaran_update'])->name(
+            'penawaran.updatePenawaran',
+        );
+        Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name(
+            'penawaran.exportPenawaran',
+        );
+        Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran'])->name(
+            'penawaran.datatables',
+        );
+        Route::get('penawaran/{noreg}/suratTender', [TenderController::class, 'showSuratTender'])->name(
+            'penawaran.showSuratTender',
+        );
+        Route::get('penawaran/{noreg}/suratTender/downloadpdf', [TenderController::class, 'downloadSuratTender'])
+             ->name('penawaran.downloadSuratTender');
+        // Kirim Email Penawaran
+        Route::get('penawaran/{noreg}/showKirimEmail', [TenderController::class, 'showKirimEmail'])->name(
+            'penawaran.showKirimEmail',
+        );
+        Route::get('penawaran/{noreg}/kirimEmailAll', [TenderController::class, 'kirimEmailAll'])->name(
+            'penawaran.kirimEmailAll',
+        );
+        Route::get('penawaran/{noreg}/suratTenderKJPP/{id}', [TenderController::class, 'suratTenderKJPP'])->name(
+            'penawaran.suratTenderKJPP',
+        );
+        Route::get(
+            'penawaran/{noreg}/suratTenderKJPP/{id}/kirimEmailKJPP',
+            [TenderController::class, 'kirimEmailKJPP'],
+        )->name('penawaran.kirimEmailKJPP');
+        Route::get(
+            'penawaran/suratTenderShow/{noreg}/datatables',
+            [TenderController::class, 'dataTablesShowKirimSurat'],
+        )->name('penawaran.showKirimSurat.datatables');
+        // Download Surat Tender KJPP
+        Route::get(
+            'penawaran/{noreg}/suratTenderKJPP/{id}/downloadSuratTenderKJPP',
+            [TenderController::class, 'downloadSuratTenderKJPP'],
+        )->name('penawaran.downloadSuratTenderKJPP');
 
-        Route::name('tender.')->prefix('tender')->group(function () {
-            // Penawaran
-            Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');
-            Route::get('penawaran/{noreg}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
-            Route::get('penawaran/{noreg}/create', [TenderController::class, 'penawaran_create'])->name(
-                'penawaran.createPenawaran',
-            );
-            Route::post('penawaran/{noreg}/store', [TenderController::class, 'penawaran_store'])->name(
-                'penawaran.storePenawaran',
-            );
-            Route::get('penawaran/{noreg}/edit', [TenderController::class, 'penawaran_edit'])->name(
-                'penawaran.editPenawaran',
-            );
-            Route::put('penawaran/{noreg}/update', [TenderController::class, 'penawaran_update'])->name(
-                'penawaran.updatePenawaran',
-            );
-            Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name(
-                'penawaran.exportPenawaran',
-            );
-            Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran'])->name(
-                'penawaran.datatables',
-            );
-            Route::get('penawaran/{noreg}/suratTender', [TenderController::class, 'showSuratTender'])->name(
-                'penawaran.showSuratTender',
-            );
-            Route::get('penawaran/{noreg}/suratTender/downloadpdf', [TenderController::class, 'downloadSuratTender'])
-                 ->name('penawaran.downloadSuratTender');
-            // Kirim Email Penawaran
-            Route::get('penawaran/{noreg}/showKirimEmail', [TenderController::class, 'showKirimEmail'])->name(
-                'penawaran.showKirimEmail',
-            );
-            Route::get('penawaran/{noreg}/kirimEmailAll', [TenderController::class, 'kirimEmailAll'])->name(
-                'penawaran.kirimEmailAll',
-            );
-            Route::get('penawaran/{noreg}/suratTenderKJPP/{id}', [TenderController::class, 'suratTenderKJPP'])->name(
-                'penawaran.suratTenderKJPP',
-            );
-            Route::get(
-                'penawaran/{noreg}/suratTenderKJPP/{id}/kirimEmailKJPP',
-                [TenderController::class, 'kirimEmailKJPP'],
-            )->name('penawaran.kirimEmailKJPP');
-            Route::get(
-                'penawaran/suratTenderShow/{noreg}/datatables',
-                [TenderController::class, 'dataTablesShowKirimSurat'],
-            )->name('penawaran.showKirimSurat.datatables');
-            // Download Surat Tender KJPP
-            Route::get(
-                'penawaran/{noreg}/suratTenderKJPP/{id}/downloadSuratTenderKJPP',
-                [TenderController::class, 'downloadSuratTenderKJPP'],
-            )->name('penawaran.downloadSuratTenderKJPP');
+        // Penawaran Ulang
+        Route::get('penawaran/ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
+            'penawaran.ulang.index',
+        );
+        Route::get('penawaran/ulang/datatables', [TenderController::class, 'datatablesPenawaranUlang'])->name(
+            'penawaran.ulang.datatables',
+        );
+    });
 
-            // Penawaran Ulang
-            Route::get('penawaran/ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
-                'penawaran.ulang.index',
-            );
-            Route::get('penawaran/ulang/datatables', [TenderController::class, 'datatablesPenawaranUlang'])->name(
-                'penawaran.ulang.datatables',
-            );
-        });
+    Route::name('penilaian.')->prefix('penilaian')->group(function () {
+        Route::get('restore/{id}', [PenilaianController::class, 'restore'])->name('restore');
+        Route::get('datatables', [PenilaianController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [PenilaianController::class, 'export'])->name('export');
+        Route::get('/getUserTeams/{id}', [PenilaianController::class, 'getUserTeams']);
 
-        Route::name('penilaian.')->prefix('penilaian')->group(function () {
-            Route::get('restore/{id}', [PenilaianController::class, 'restore'])->name('restore');
-            Route::get('datatables', [PenilaianController::class, 'dataForDatatables'])->name('datatables');
-            Route::get('export', [PenilaianController::class, 'export'])->name('export');
-            Route::get('/getUserTeams/{id}', [PenilaianController::class, 'getUserTeams']);
+        Route::get('/', [PenilaianController::class, 'index'])->name('index');
+        Route::get('{id}/assignment', [PenilaianController::class, 'assignment'])->name('assignment');
+        Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
+        Route::put('revisi/{nomor_registrasi}', [PenilaianController::class, 'revisi'])->name('revisi');
+        Route::post('create', [PenilaianController::class, 'create'])->name('create');
+        Route::post('store', [PenilaianController::class, 'store'])->name('store');
+    });
 
-            Route::get('/', [PenilaianController::class, 'index'])->name('index');
-            Route::get('{id}/assignment', [PenilaianController::class, 'assignment'])->name('assignment');
-            Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
-            Route::put('revisi/{nomor_registrasi}', [PenilaianController::class, 'revisi'])->name('revisi');
-            Route::post('create', [PenilaianController::class, 'create'])->name('create');
-            Route::post('store', [PenilaianController::class, 'store'])->name('store');
-        });
+    /**
+     * Route start activity
+     */
 
-        /**
-         * Route start activity
-         */
-
-        Route::name('activity.')->prefix('activity')->group(function () {
-            Route::get('restore/{id}', [ActivityController::class, 'restore'])->name('restore');
-            Route::get('datatables', [ActivityController::class, 'dataForDatatables'])->name('datatables');
-            Route::get('export', [ActivityController::class, 'export'])->name('export');
+    Route::name('activity.')->prefix('activity')->group(function () {
+        Route::get('restore/{id}', [ActivityController::class, 'restore'])->name('restore');
+        Route::get('datatables', [ActivityController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [ActivityController::class, 'export'])->name('export');
 
         Route::get('/', [ActivityController::class, 'index'])->name('index');
         Route::put('update-team', [ActivityController::class, 'updateTeamAssingment'])->name('update-team');
@@ -470,41 +472,41 @@
         Route::get('download/{id}', [ActivityController::class, 'download'])->name('download');
         Route::get('senior', [ActivityController::class, 'senior'])->name('senior');
 
-            Route::name('progres.')->prefix('progres')->group(function () {
-                Route::get('/', [ActivityController::class, 'progres_activity'])->name('index');
-                Route::get('/datatables/{id}', [ActivityController::class, 'dataTablesForActivity'])->name(
-                    'datatables',
-                );
-            });
-
-            Route::get('/teams/{regionId}', [ActivityController::class, 'dataTablesForActivity']);
-        });
-
-        /**
-         * Route end activity
-         */
-
-
-        Route::name('otorisator.')->prefix('otorisator')->group(function () {
-            Route::get('pelaporan', [PenilaianController::class, 'otorisator'])->name('pelaporan.index')->defaults(
-                'type',
-                'pelaporan',
-            );
-            Route::get('pembayaran', [PenilaianController::class, 'otorisator'])->name('pembayaran.index')->defaults(
-                'type',
-                'pembayaran',
-            );
-            Route::get('pembatalan', [PenilaianController::class, 'otorisator'])->name('pembatalan.index')->defaults(
-                'type',
-                'pembatalan',
-            );
-            Route::get('sla', [PenilaianController::class, 'otorisator'])->name('sla.index')->defaults('type', 'sla');
-            Route::get('/datatables/{otorisator}', [PenilaianController::class, 'dataForAuthorization'])->name(
+        Route::name('progres.')->prefix('progres')->group(function () {
+            Route::get('/', [ActivityController::class, 'progres_activity'])->name('index');
+            Route::get('/datatables/{id}', [ActivityController::class, 'dataTablesForActivity'])->name(
                 'datatables',
             );
-            Route::get('show/{id}', [PenilaianController::class, 'show'])->name('show');
         });
 
+        Route::get('/teams/{regionId}', [ActivityController::class, 'dataTablesForActivity']);
+    });
+
+    /**
+     * Route end activity
+     */
+
+
+    Route::name('otorisator.')->prefix('otorisator')->group(function () {
+        Route::get('pelaporan', [PenilaianController::class, 'otorisator'])->name('pelaporan.index')->defaults(
+            'type',
+            'pelaporan',
+        );
+        Route::get('pembayaran', [PenilaianController::class, 'otorisator'])->name('pembayaran.index')->defaults(
+            'type',
+            'pembayaran',
+        );
+        Route::get('pembatalan', [PenilaianController::class, 'otorisator'])->name('pembatalan.index')->defaults(
+            'type',
+            'pembatalan',
+        );
+        Route::get('sla', [PenilaianController::class, 'otorisator'])->name('sla.index')->defaults('type', 'sla');
+        Route::get('/datatables/{otorisator}', [PenilaianController::class, 'dataForAuthorization'])->name(
+            'datatables',
+        );
+        Route::get('show/{id}', [PenilaianController::class, 'show'])->name('show');
+    });
+
 
     Route::name('surveyor.')->prefix('surveyor')->group(function () {
         Route::get('/', [SurveyorController::class, 'index'])->name('index');
@@ -512,7 +514,8 @@
         Route::post('store', [SurveyorController::class, 'store'])->name('store');
         Route::post('storeDenah', [SurveyorController::class, 'storeDenah'])->name('storeDenah');
         Route::put('storeJadwal', [SurveyorController::class, 'storeJadwal'])->name('storeJadwal');
-        Route::put('storeAproved/{id}', [SurveyorController::class, 'storeAproved'])->name('storeAproved');
+        Route::get('storeAproved/{id}', [SurveyorController::class, 'storeAproved'])->name('storeAproved');
+        Route::put('storeFreeze', [SurveyorController::class, 'storeFreeze'])->name('storeFreeze');
         Route::post('storeFoto', [SurveyorController::class, 'storeFoto'])->name('storeFoto');
         Route::post('storeDataPembanding', [SurveyorController::class, 'storeDataPembanding'])->name('storeDataPembanding');
         Route::get('checkButtonStatus/{id}', [SurveyorController::class, 'checkButtonStatus'])->name('checkButtonStatus');
@@ -527,21 +530,22 @@
 
     });
 
-        Route::name('penilai.')->prefix('penilai')->group(function () {
-            Route::get('/', [PenilaiController::class, 'index'])->name('index');
-            Route::get('/{id}/show', [PenilaiController::class, 'show'])->name('show');
-            Route::get('datatables', [PenilaiController::class, 'dataForDatatables'])->name('dataForTables');
-    
+    Route::name('penilai.')->prefix('penilai')->group(function () {
+        Route::get('/', [PenilaiController::class, 'index'])->name('index');
+        Route::get('/{id}/show', [PenilaiController::class, 'show'])->name('show');
+        Route::get('datatables', [PenilaiController::class, 'dataForDatatables'])->name('dataForTables');
+
         Route::get('lampiran/{id}', [PenilaiController::class, 'lampiran'])->name('lampiran');
+        Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja');
 
 
 
     });
 
-        Route::get('persetujuan-penawaran/datatables', [PersetujuanPenawaranController::class, 'dataForDatatables'])
-             ->name('persetujuan-penawaran.datatables');
+    Route::get('persetujuan-penawaran/datatables', [PersetujuanPenawaranController::class, 'dataForDatatables'])
+         ->name('persetujuan-penawaran.datatables');
 
-        Route::resource('persetujuan-penawaran', PersetujuanPenawaranController::class);
-    });
+    Route::resource('persetujuan-penawaran', PersetujuanPenawaranController::class);
+});
 
-    require __DIR__ . '/registrasi.php';
+require __DIR__ . '/registrasi.php';