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/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 6b48f91..5e94681 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -5,8 +5,11 @@ namespace Modules\Lpj\Http\Controllers;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+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;
@@ -92,124 +95,77 @@ 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();
+            
+            // Get action specific rules and process data
+            $processedData = $this->getActionSpecificRules(
+                $validatedData, 
+                $request->input('type'),
+                $request
+            );
 
-            $action = $request->input('type');
-            $rules = $this->getActionSpecificRules($data, $action, $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 +240,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,7 +253,128 @@ 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',
@@ -316,164 +396,96 @@ 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);
-            $permohonan->update([
-                'status' => 'done',
-            ]);
-            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);
+{
+    try {
+        // 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 berhasil disubmit'
+        ], 200);
+
+    } catch (\Exception $e) {
+        return response()->json([
+            'success' => false,
+            'message' => 'Terjadi kesalahan',
+            'error' => $e->getMessage()
+        ], 500);
     }
+}
+
 
 
 
     public function checkButtonStatus($id)
     {
         try {
-
-            $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 {
+            // Get all inspeksi records for this permohonan
+            $inspeksiRecords = Inspeksi::where('permohonan_id', $id)->get();
+            
+            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);
         }
     }
+    
 
 
 
@@ -570,7 +582,7 @@ class SurveyorController extends Controller
             return response()->json(['success' => false, 'message' => 'Failed to save data: ' . $e->getMessage()], 500);
         }
     }
-    
+
     /**
      * Form inspeksi.
      */
@@ -583,9 +595,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();
@@ -793,13 +805,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 +818,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 +871,6 @@ class SurveyorController extends Controller
         $spekKategoriBagunan = null;
         if ($type == 'spek-bangunan') {
             $spekKategoriBagunan = SpekKategoritBangunan::all();
-
         }
 
 
@@ -877,7 +886,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 +922,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 +948,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 +959,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 +1044,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 +1195,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 +1238,7 @@ class SurveyorController extends Controller
         'fasilitas-objek' => FasilitasObjek::class,
         'merupakan-daerah' => MerupakanDaerah::class,
         'jenis-unit' => JenisUnit::class,
+        'perkerasan-jalan' => PerkerasanJalan::class,
     ];
 
 
@@ -1301,88 +1310,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_bagunan'] 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 +1449,27 @@ 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'] ?? 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,
             ]
         ];
     }
@@ -1420,24 +1478,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 +1522,7 @@ class SurveyorController extends Controller
                     $factData[$fotoType] = $dataForm[$fotoType] ?? null;
                 }
             }
-        }else{
+        } else {
             foreach ($fotoTypes as $fotoType) {
                 $factData[$fotoType] = $this->updateOrDeleteFile($data, $request, $fotoType);
             }
@@ -1852,8 +1912,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,
+            'luas_unit' => $this->getFieldData(
+                $data,
+                'luas_unit',
+                true
+            ),
             'jenis_unit' => $data['jenis_unit'] ?? null,
             'kondisi_unit' => $data['kondisi_unit'] ?? null,
             'posisi_unit' => $data['posisi_unit'] ?? null,
@@ -1865,9 +1928,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 +1953,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..3eeafe5 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,7 +97,9 @@ 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',
@@ -116,6 +120,7 @@ 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',
@@ -511,10 +516,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/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/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..284794c 100644
--- a/resources/views/surveyor/components/bangunan.blade.php
+++ b/resources/views/surveyor/components/bangunan.blade.php
@@ -7,7 +7,7 @@
             <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
@@ -15,9 +15,10 @@
                     $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">
@@ -60,20 +61,16 @@
                                 <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>
-                                @endif
+                                @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
                     </div>
@@ -153,7 +150,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>
diff --git a/resources/views/surveyor/components/card-tambah.blade.php b/resources/views/surveyor/components/card-tambah.blade.php
index 23370f9..a720d4a 100644
--- a/resources/views/surveyor/components/card-tambah.blade.php
+++ b/resources/views/surveyor/components/card-tambah.blade.php
@@ -1,78 +1,93 @@
 <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;
+            
+            $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT'];
+            
+            $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']),
+                ],
+            ];
 
-        @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
+            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']),
+                ];
+            }
 
-        <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">
-                        <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>
+            $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 code remains the same -->
                     </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..b90fed1 100644
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/resources/views/surveyor/components/data-pembanding.blade.php
@@ -1,40 +1,33 @@
 @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> Back
+                                </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
diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php
index 4e848de..c19ce4c 100644
--- a/resources/views/surveyor/components/denah.blade.php
+++ b/resources/views/surveyor/components/denah.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')
@@ -144,7 +144,7 @@
                                             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;' }}">
 
-                                       
+
 
                                         <div class="input-group w-full flex gap-2">
                                             <input type="file"
diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php
index 43e38cb..82ef211 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>
@@ -621,10 +621,12 @@
                 },
                 success: function(response) {
                     if (response.success) {
-                        window.location.href =
-                            '{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=foto';
+                        // window.location.href =
+                        //     '{{ route('surveyor.show', ['id' => $permohonan->id]) }}?form=foto';
                             toastrSuccessBuild(response.message);
                     }
+                    console.log(response);
+                    
 
                 },
                 error: function(xhr, status, error) {
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index bc3a953..4674a06 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>
@@ -129,10 +144,10 @@
                                 <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>
 
@@ -152,14 +167,14 @@
                                     <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' : '' }}>
+                                        {{ 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="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' : '' }}>
+                                        {{ old('jenis_asset', isset($forminspeksi['asset']['alamat']['tidak sesuai'])) ? 'checked' : '' }}>
                                     <span class="ml-2">Tidak</span>
                                 </label>
                             </div>
@@ -169,7 +184,7 @@
                     </div>
 
                     {{-- Alamat Sesuai --}}
-                    <div id="alamat_sesuai" class="grid gap-2 mt-5" style="display: none;">
+                    <div id="alamat_sesuai" class="grid gap-2 mt-5" style="{{ isset($forminspeksi['asset']['alamat']['sesuai']) ? '' : 'display: none;' }}">
                         @foreach ($permohonan->debiture->documents as $dokumen)
                             @php
                                 $fields = [
@@ -218,7 +233,7 @@
                     </div>
 
                     {{-- Alamat Tidak Sesuai --}}
-                    <div id="alamat_tidak_sesuai" class="grid gap-2 mt-5" style="display: none;">
+                    <div id="alamat_tidak_sesuai" class="grid gap-2 mt-5" style="{{ isset($forminspeksi['asset']['alamat']['tidak sesuai']) ? '' : 'display: none;' }}"">
                         @php
                             $inputDataLokasi = [
                                 ['label' => 'Jl.', 'id' => 'address', 'name' => 'address', 'type' => 'text'],
@@ -409,6 +424,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 +435,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 +478,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 +490,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..80b1324 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
@@ -65,8 +42,6 @@
                 </button>
             </div>
         </form>
-        {{-- </div>
-        </div> --}}
     </div>
 @endsection
 @push('scripts')
@@ -126,19 +101,19 @@
 
 
         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"
+            }
+        }
 
 
 
@@ -275,7 +250,11 @@
                     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');
+                    }
                 }
             });
         }
diff --git a/resources/views/surveyor/components/lingkungan.blade.php b/resources/views/surveyor/components/lingkungan.blade.php
index cc59d4b..d6d2e40 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>
@@ -246,53 +258,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 +325,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 +352,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 +374,3 @@
         </div>
     </div>
 </div>
-
diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php
index 90e490f..99eb4f0 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"
+                                    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>
+                                    <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,29 +56,40 @@
 
             <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)
@@ -94,6 +106,7 @@
                     <em id="error-hadap_mata_angin" class="alert text-danger text-sm"></em>
                 </div>
             </div>
+            </div>
 
 
             <!-- Bentuk Tanah -->
@@ -106,33 +119,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 +151,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 +229,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'])"
-                                        />
+                                            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..." />
                                     @endif
                                 </div>
                             @endforeach
@@ -319,7 +301,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 +312,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/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 65d1bdd..4e0c549 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -418,6 +418,10 @@
     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');
diff --git a/routes/web.php b/routes/web.php
index 7ace9a7..29a0477 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');
@@ -527,21 +529,21 @@
 
     });
 
-        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('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';