diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 86eaa95..2844358 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -51,6 +51,7 @@ use Modules\Lpj\Models\JenisPesawat;
 use Modules\Lpj\Models\JenisKapal;
 use Modules\Lpj\Models\JenisKendaraan;
 use Modules\Lpj\Models\RuteJaminan;
+use Modules\Lpj\Models\JenisJaminan;
 use Modules\Lpj\Models\HubunganPemilikJaminan;
 use Modules\Lpj\Models\AnalisaUnit;
 use Modules\Lpj\Models\GolonganMasySekitar;
@@ -112,8 +113,6 @@ class SurveyorController extends Controller
         $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')
@@ -188,6 +187,7 @@ class SurveyorController extends Controller
             $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->update(['data_form' => json_encode($rules)]);
             } else {
@@ -422,11 +422,11 @@ class SurveyorController extends Controller
         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);
+            $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);
             // }
@@ -573,13 +573,13 @@ class SurveyorController extends Controller
         $jenisKapal = JenisKapal::all();
         $jenisPesawat = JenisPesawat::all();
         $modelAlatBerat = ModelAlatBerat::all();
-        $hubCadeb =HubunganPemilikJaminan::all();
-
-
-        // return response()->json([
-        //     'per'=>
-        //     $permohonan]);
-
+        $hubCadeb = HubunganPemilikJaminan::all();
+        $jenisJaminan = JenisJaminan::all();
+        $fasilitasObjek = FasilitasObjek::all();
+        $merupakanDaerah = MerupakanDaerah::all();
+        $terletakDiArea = TerletakArea::all();
+        $posisiUnit = PosisiUnit::all();
+        $bentukUnit = BentukUnit::all();
 
 
         $inpeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first();
@@ -616,7 +616,13 @@ class SurveyorController extends Controller
             'jenisKapal',
             'jenisPesawat',
             'modelAlatBerat',
-            'hubCadeb'
+            'hubCadeb',
+            'jenisJaminan',
+            'fasilitasObjek',
+            'merupakanDaerah',
+            'terletakDiArea',
+            'posisiUnit',
+            'bentukUnit'
         ));
     }
 
@@ -700,7 +706,7 @@ class SurveyorController extends Controller
         }
 
         // return response()->json($forminspeksi);
-        return view('lpj::surveyor.components.data-pembanding', compact('permohonan', 'surveyor', 'branches', 'provinces','forminspeksi'));
+        return view('lpj::surveyor.components.data-pembanding', compact('permohonan', 'surveyor', 'branches', 'provinces', 'forminspeksi'));
     }
 
 
@@ -1164,6 +1170,7 @@ class SurveyorController extends Controller
     private function getAssetData($data)
     {
         return [
+            'asset' =>[
             'debitur_perwakilan' => $data['debitur_perwakilan'] ?? [],
             'jenis_asset' => $data['jenis_asset'] ?? null,
             'jenis_asset_tidak_sesuai' => $data['jenis_asset_tidak_sesuai'] ?? null,
@@ -1176,13 +1183,15 @@ class SurveyorController extends Controller
             'provinsi' => $data['provinsi'] ?? null,
             'kordinat_lng' => $data['kordinat_lng'] ?? null,
             'kordinat_lat' => $data['kordinat_lat'] ?? null,
-        ];
+        ]];
     }
 
 
     private function getTanahData($data, $request): 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,
@@ -1200,6 +1209,7 @@ class SurveyorController extends Controller
             'lockland' => $data['lockland'] ?? null,
             'kondisi_fisik_tanah' => $data['kondisi_fisik_tanah'] ?? [],
             'kondisi_fisik_tanah_lainnya' => $data['kondisi_fisik_tanah_lainnya'] ?? null,
+            ],
         ];
     }
 
@@ -1217,6 +1227,7 @@ class SurveyorController extends Controller
         // }
 
         return [
+            'bangunan' => [
             'luas_tanah_bagunan' => $data['luas_tanah_bagunan'] ?? null,
             'jenis_bangunan' => $data['jenis_bangunan'] ?? null,
             'kondisi_bangunan' => $data['kondisi_bangunan'] ?? null,
@@ -1226,12 +1237,14 @@ class SurveyorController extends Controller
             'spek_bangunan' => $data['spek_bangunan'] ?? [],
             'sarana_pelengkap' => $data['sarana_pelengkap'] ?? [],
             'sarana_pelengkap_input' => $data['sarana_pelengkap_input'] ?? null,
+            ],
         ];
     }
 
     private function getLingkunganData($data, $request): array
     {
         return [
+            'lingkungan' => [
             'jarak_jalan_utama' => $data['jarak_jalan_utama'] ?? null,
             'jalan_linkungan' => $data['jalan_linkungan'] ?? null,
             'jarak_cbd_point' => $data['jarak_cbd_point'] ?? null,
@@ -1253,12 +1266,14 @@ class SurveyorController extends Controller
             'nama_tps' => $data['nama_tps'] ?? null,
             'merupakan_daerah' => $data['merupakan_daerah'] ?? null,
             'fasilitas_dekat_object' => $data['fasilitas_dekat_object'] ?? null,
+            ]
         ];
     }
 
     private function getFactData($data, $request): array
     {
         $factData = [
+            'fakta' => [
             'fakta_positif' => $data['fakta_positif'] ?? null,
             'fakta_negatif' => $data['fakta_negatif'] ?? null,
             'rute_menuju' => $data['rute_menuju'] ?? null,
@@ -1276,16 +1291,36 @@ class SurveyorController extends Controller
             'gss' => $data['gss'] ?? null,
             'pelebaran_jalan' => $data['pelebaran_jalan'] ?? null,
             'nama_petugas' => $data['nama_petugas'] ?? null,
-            'lat' => $data['lat'] ?? null,
-            'lng' => $data['lng'] ?? null,
             'keterangan' => $data['keterangan'] ?? null,
+            ]
         ];
 
-        $factData['foto_gistaru'] = $this->updateOrDeleteFile($data, $request, 'foto_gistaru');
-        $factData['foto_bhumi'] = $this->updateOrDeleteFile($data, $request, 'foto_bhumi');
-        $factData['foto_argis_region'] = $this->updateOrDeleteFile($data, $request, 'foto_argis_region');
-        $factData['foto_tempat'] = $this->updateOrDeleteFile($data, $request, 'foto_tempat');
 
+        $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first();
+
+
+        $fotoTypes = [
+            'foto_gistaru',
+            'foto_bhumi',
+            'foto_argis_region',
+            'foto_tempat'
+        ];
+
+        if ($inspeksi) {
+            $dataForm = json_decode($inspeksi->data_form, true);
+            foreach ($fotoTypes as $fotoType) {
+                // Jika ada file baru diupload
+                if ($request->hasFile($fotoType)) {
+                    $factData[$fotoType] = $this->updateOrDeleteFile($dataForm, $request, $fotoType);
+                } else {
+                    $factData[$fotoType] = $dataForm[$fotoType] ?? null;
+                }
+            }
+        }else{
+            foreach ($fotoTypes as $fotoType) {
+                $factData[$fotoType] = $this->updateOrDeleteFile($data, $request, $fotoType);
+            }
+        }
         return $factData;
     }
 
@@ -1296,6 +1331,7 @@ class SurveyorController extends Controller
             if ($file->isValid()) {
                 $fileName = time() . '_' . $file->getClientOriginalName();
                 $path = $file->storeAs("public/surveyor/{$request->type}", $fileName);
+
                 if ($path === false) {
                     throw new Exception("Failed to store file for {$fileKey}");
                 }
@@ -1325,6 +1361,7 @@ class SurveyorController extends Controller
     private function getKapalData($data, $request): array
     {
         return [
+
             'action' => $data['action'] ?? null,
             'nama_wakil_debitur' => $data['nama_wakil_debitur'] ?? null,
             'hub_calon_debitur' => $data['hub_calon_debitur'] ?? null,
@@ -1358,6 +1395,7 @@ class SurveyorController extends Controller
             'depth' => $data['depth'] ?? null,
             'draft' => $data['draft'] ?? null,
 
+
             'lambung_kapal' => $data['lambung_kapal'] ?? null,
             'dek' => $data['dek'] ?? null,
             'struktur_rangka' => $data['struktur_rangka'] ?? null,
@@ -1411,6 +1449,7 @@ class SurveyorController extends Controller
             'analisa_makro' => $data['analisa_makro'] ?? null,
             'kesimpulan' => $data['kesimpulan'] ?? null,
             'catatan' => $data['catatan'] ?? null,
+
         ];
     }
     public function getKendaraanData($data, $request): array
@@ -1700,3 +1739,7 @@ class SurveyorController extends Controller
     }
 
 }
+
+
+
+
diff --git a/module.json b/module.json
index e39f112..194247f 100644
--- a/module.json
+++ b/module.json
@@ -634,6 +634,14 @@
             "attributes": [],
             "permission": "",
             "roles": ["administrator","surveyor"]
+        },
+        {
+            "title": "Terletak Di Area",
+            "path": "basicdata.terletak-area",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["administrator","surveyor"]
         }
         ]
       }
diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php
index 231bad9..b5493cd 100644
--- a/resources/views/surveyor/components/apartemen-kantor.blade.php
+++ b/resources/views/surveyor/components/apartemen-kantor.blade.php
@@ -1,165 +1,156 @@
-
-
 @include('lpj::surveyor.components.header')
 
 <div class="card w-full bg-white rounded-lg shadow-md overflow-hidden">
     <div class="card-body">
 
 
-    <div class=" py-4 ">
-        <h1 class="text-md font-medium text-gray-900">Analisa Unit</h1>
-    </div>
-    <div class="grid gap-5">
+        <div class=" py-4 ">
+            <h1 class="text-md font-medium text-gray-900">Analisa Unit</h1>
+        </div>
+        <div class="grid gap-5">
 
-        <!-- 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>
-            <div class="flex flex-wrap items-baseline w-full">
-                <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
-                    <label class="form-label flex items-center gap-3 text-nowrap">
-                        <input type="radio" 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 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>
+            <!-- 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>
+                <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"
+                                {{ 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"
+                                {{ 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 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">Save</button>
+                                </div>
+                    </div>
                     <em id="error-luas_unit" class="alert text-danger text-sm"></em>
-
-            </div>
-        </div>
-
-        <!-- Jenis Unit -->
-        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-            <label class="form-label max-w-56">Jenis Unit</label>
-            <div class="flex flex-wrap items-baseline w-full">
-                <div class="flex-wrap items-stretch">
-                <div class="flex flex-col items-start gap-2">
-                    @if (isset($jenisUnit))
-                        @foreach ($jenisUnit as $item)
-                            <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                <input class="checkbox" name="jenis_unit[]" type="checkbox"
-                                    value="{{ $item->name }}" {{ in_array($item->name, old('jenis_unit', $forminspeksi['jenis_unit'] ?? [])) ? 'checked' : '' }} />
-                                {{ $item->name }}
-                            </label>
-                        @endforeach
-                    @endif
-                </div>
-                <em id="error-jenis_unit" class="alert text-danger text-sm"></em>
-            </div>
-            </div>
-        </div>
-
-        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-            <label class="form-label max-w-56">Kondisi Unit</label>
-            <div class="flex flex-wrap items-baseline w-full">
-                <div class="flex-wrap items-stretch">
-                <div class="flex flex-col items-start gap-2">
-                    @if (isset($kondisiBangunan))
-                        @foreach ($kondisiBangunan as $item)
-                            <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                <input class="checkbox" name="kondisi_unit[]" type="checkbox"
-                                    value="{{ $item->name }}" {{ in_array($item->name, old('kondisi_unit', $forminspeksi['kondisi_unit'] ?? [])) ? 'checked' : '' }} />
-                                {{ $item->name }}
-                            </label>
-                        @endforeach
-                    @endif
-                </div>
-                <em id="error-kondisi_unit" class="alert text-danger text-sm"></em>
                 </div>
             </div>
-        </div>
 
-        <!-- Posisi Unit -->
-        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-            <label class="form-label max-w-56">Posisi Unit</label>
-            <div class="flex flex-wrap items-baseline w-full">
-                <div class="flex-wrap items-stretch">
-                <div class="flex flex-col items-start gap-2">
-                    @if (isset($posisiUnit))
-                        @foreach ($posisiUnit as $item)
-                            <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                <input class="checkbox" name="posisi_unit[]" type="checkbox"
-                                    value="{{ $item->name }}" {{ in_array($item->name, old('posisi_unit', $forminspeksi['posisi_unit'] ?? [])) ? 'checked' : '' }} />
-                                {{ $item->name }}
-                            </label>
-                        @endforeach
-                    @endif
-                </div>
-                <em id="error-posisi_unit" class="alert text-danger text-sm"></em>
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                <label class="form-label max-w-56">Kondisi Unit</label>
+                <div class="flex flex-wrap items-baseline w-full">
+                    <div class="flex-wrap items-stretch">
+                        <div class="flex flex-col items-start gap-2">
+                            @if (isset($kondisiBangunan))
+                                @foreach ($kondisiBangunan as $item)
+                                    <label class="form-label flex items-center gap-2.5 text-nowrap">
+                                        <input class="checkbox" name="kondisi_unit[]" type="checkbox"
+                                            value="{{ $item->name }}"
+                                            {{ in_array($item->name, old('kondisi_unit', $forminspeksi['kondisi_unit'] ?? [])) ? 'checked' : '' }} />
+                                        {{ $item->name }}
+                                    </label>
+                                @endforeach
+                            @endif
+                        </div>
+                        <em id="error-kondisi_unit" class="alert text-danger text-sm"></em>
+                    </div>
                 </div>
             </div>
-        </div>
 
-
-
-
-        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-            <label class="form-label max-w-56">Lantai</label>
-            <div class="flex flex-wrap items-baseline w-full">
-                <div class="flex-wrap items-stretch">
-
-                <div class="flex flex-col items-start gap-2">
-                    @if (isset($lantai))
-                        @foreach ($lantai as $item)
-                            <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                <input class="checkbox" name="lantai[]" type="checkbox"
-                                    value="{{ $item->name }}" {{ in_array($item->name, old('lantai', $forminspeksi['lantai'] ?? [])) ? 'checked' : '' }} />
-                                {{ $item->name }}
-                            </label>
-                        @endforeach
-                    @endif
+            <!-- Posisi Unit -->
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                <label class="form-label max-w-56">Posisi Unit</label>
+                <div class="flex flex-wrap items-baseline w-full">
+                    <div class="flex-wrap items-stretch">
+                        <div class="flex flex-col items-start gap-2">
+                            @if (isset($posisiUnit))
+                                @foreach ($posisiUnit as $item)
+                                    <label class="form-label flex items-center gap-2.5 text-nowrap">
+                                        <input class="checkbox" name="posisi_unit[]" type="checkbox"
+                                            value="{{ $item->name }}"
+                                            {{ in_array($item->name, old('posisi_unit', $forminspeksi['posisi_unit'] ?? [])) ? 'checked' : '' }} />
+                                        {{ $item->name }}
+                                    </label>
+                                @endforeach
+                            @endif
+                        </div>
+                        <em id="error-posisi_unit" class="alert text-danger text-sm"></em>
+                    </div>
                 </div>
-                <em id="error-lantai" class="alert text-danger text-sm"></em>
             </div>
-            </div>
-        </div>
 
-        <!-- Kondisi Fisik Tanah -->
 
-        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-            <label class="form-label max-w-56">View</label>
-            <div class="flex flex-wrap items-baseline w-full">
-                <div class="flex-wrap items-stretch">
-                <div class="flex flex-col items-start gap-2">
-                    @if (isset($viewUnit))
-                        @foreach ($viewUnit as $item)
-                            <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                <input class="checkbox" name="view[]" type="checkbox"
-                                    value="{{ $item->name }}" {{ in_array($item->name, old('view', $forminspeksi['view'] ?? [])) ? 'checked' : '' }} />
-                                {{ $item->name }}
-                            </label>
-                        @endforeach
-                    @endif
+
+
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                <label class="form-label max-w-56">Lantai</label>
+                <div class="flex flex-wrap items-baseline w-full">
+
+                    <div class="flex flex-col items-start gap-4">
+                        @if (isset($lantai))
+                            @foreach ($lantai as $item)
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56 gap-2.5" style="width: 500px">
+                                        <input class="checkbox" name="lantai[]" type="checkbox"
+                                            value="{{ $item->name }}"
+                                            {{ 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 }}..."
+                                        value="{{ old('lantai_input.' . $loop->index, $forminspeksi['lantai_input'][$loop->index] ?? '') }}">
+                                </div>
+                            @endforeach
+                        @endif
+                    </div>
+                    <em id="error-lantai" class="alert text-danger text-sm"></em>
                 </div>
-                <em id="error-view" class="alert text-danger text-sm"></em>
             </div>
-            </div>
-        </div>
 
-        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-            <label class="form-label max-w-56">Bentuk Unit</label>
-            <div class="flex flex-wrap items-baseline w-full">
-                <div class="flex-wrap items-stretch">
-                <div class="flex flex-col items-start gap-2">
-                    @if (isset($bentukUnit))
-                        @foreach ($bentukUnit as $item)
-                            <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                <input class="checkbox" name="bentuk_unit[]" type="checkbox"
-                                    value="{{ $item->name }}" {{ in_array($item->name, old('bentuk_unit', $forminspeksi['bentuk_unit'] ?? [])) ? 'checked' : '' }} />
-                                {{ $item->name }}
-                            </label>
-                        @endforeach
-                    @endif
+            <!-- Kondisi Fisik Tanah -->
+
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                <label class="form-label max-w-56">View</label>
+                <div class="flex flex-wrap items-baseline w-full">
+                    <div class="flex-wrap items-stretch">
+                        <div class="flex flex-col items-start gap-2">
+                            @if (isset($viewUnit))
+                                @foreach ($viewUnit as $item)
+                                    <label class="form-label flex items-center gap-2.5 text-nowrap">
+                                        <input class="checkbox" name="view[]" type="checkbox"
+                                            value="{{ $item->name }}"
+                                            {{ in_array($item->name, old('view', $forminspeksi['view'] ?? [])) ? 'checked' : '' }} />
+                                        {{ $item->name }}
+                                    </label>
+                                @endforeach
+                            @endif
+                        </div>
+                        <em id="error-view" class="alert text-danger text-sm"></em>
+                    </div>
                 </div>
-                <em id="error-bentuk_unit" class="alert text-danger text-sm"></em>
             </div>
+
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                <label class="form-label max-w-56">Bentuk Unit</label>
+                <div class="flex flex-wrap items-baseline w-full">
+                    <div class="flex-wrap items-stretch">
+                        <div class="flex flex-col items-start gap-2">
+                            @if (isset($bentukUnit))
+                                @foreach ($bentukUnit as $item)
+                                    <label class="form-label flex items-center gap-2.5 text-nowrap">
+                                        <input class="checkbox" name="bentuk_unit[]" type="checkbox"
+                                            value="{{ $item->name }}"
+                                            {{ in_array($item->name, old('bentuk_unit', $forminspeksi['bentuk_unit'] ?? [])) ? 'checked' : '' }} />
+                                        {{ $item->name }}
+                                    </label>
+                                @endforeach
+                            @endif
+                        </div>
+                        <em id="error-bentuk_unit" class="alert text-danger text-sm"></em>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
 </div>
-</div>
diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php
index aef9988..7dee989 100644
--- a/resources/views/surveyor/components/bangunan.blade.php
+++ b/resources/views/surveyor/components/bangunan.blade.php
@@ -9,20 +9,27 @@
                 <div class="flex flex-wrap items-baseline w-full">
                     <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
                         <label class="form-label flex items-center gap-3 text-nowrap">
-                            <input type="radio"  onclick="toggleTidakSesuai('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai')" class="radio" name="luas_tanah_bagunan" value="sesuai"
-                                {{ old('luas_tanah_bagunan', $forminspeksi['luas_tanah_bagunan'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                            <input type="radio"
+                                onclick="toggleFieldVisibility('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai', ['tidak sesuai'])"
+                                class="radio" name="luas_tanah_bagunan" value="sesuai"
+                                {{ old('luas_tanah_bagunan', $forminspeksi['bangunan']['luas_tanah_bagunan'] ?? '') == 'sesuai' ? 'checked' : '' }}>
                             <span class="ml-2">Sesuai</span>
                         </label>
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input type="radio" class="radio" name="luas_tanah_bagunan"  onclick="toggleTidakSesuai('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai')" value="tidak sesuai"
-                                {{ old('luas_tanah_bagunan', $forminspeksi['luas_tanah_bagunan'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                            <input type="radio" class="radio" name="luas_tanah_bagunan"
+                                onclick="toggleFieldVisibility('luas_tanah_bagunan', 'luas_tanah_bagunan_tidak_sesuai',  ['tidak sesuai'])"
+                                value="tidak sesuai"
+                                {{ old('luas_tanah_bagunan', $forminspeksi['bangunan']['luas_tanah_bagunan'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
                             <span class="ml-2">Tidak Sesuai</span>
                         </label>
 
-                        <input type="text" name="luas_tanah_bagunan_tidak_sesuai" id="luas_tanah_bagunan_tidak_sesuai"
-                        class="input w-full" placeholder="Masukan Luas Bangunan Tidak Sesuai..."
-                        value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['luas_tanah_bagunan_tidak_sesuai'] ?? '') }}"
-                        style="{{ old('luas_tanah_bagunan_bagunan', $forminspeksi['luas_tanah_bagunan_bagunan'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                        <div id="luas_tanah_bagunan_tidak_sesuai" class="flex items-baseline gap-2"
+                            style="{{ old('luas_tanah_bagunan_bagunan', $forminspeksi['bangunan']['luas_tanah_bagunan_bagunan'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                            <input type="text" name="luas_tanah_bagunan_tidak_sesuai" class="input w-full"
+                                placeholder="Masukan Luas Bangunan Tidak Sesuai..."
+                                value="{{ old('luas_tanah_bagunan_tidak_sesuai', $forminspeksi['bangunan']['luas_tanah_bagunan_tidak_sesuai'] ?? '') }}">
+                            <button type="button" class="btn btn-md btn-primary">Save</button>
+                        </div>
                     </div>
                     <em id="error-luas_tanah_bagunan" class="alert text-danger text-sm"></em>
                 </div>
@@ -39,7 +46,7 @@
                                 <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['jenis_bangunan']) == $item->name ? 'checked' : '' }} />
+                                        {{ old('jenis_bangunan') == $item->name || isset($forminspeksi['bangunan']['jenis_bangunan']) == $item->name ? 'checked' : '' }} />
                                     {{ $item->name }}
                                 </label>
                                 @if (strcasecmp($item->name, 'lainnya') == 0)
@@ -72,7 +79,7 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="kondisi_bangunan[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ in_array($item->name, old('kondisi_bangunan', $forminspeksi['kondisi_bangunan'] ?? [])) ? 'checked' : '' }} />
+                                        {{ in_array($item->name, old('kondisi_bangunan', $forminspeksi['bangunan']['kondisi_bangunan'] ?? [])) ? 'checked' : '' }} />
                                     {{ $item->name }}
                                 </label>
                                 @if (strcasecmp($item->name, 'lainnya') == 0)
@@ -80,12 +87,12 @@
                                         <label class="form-label flex items-center gap-2.5 text-nowrap">
                                             <input class="checkbox" name="kondisi_bangunan[]" type="checkbox"
                                                 value="{{ $item->name }}"
-                                                {{ in_array($item->name, old('kondisi_bangunan', $forminspeksi['kondisi_bangunan'] ?? [])) ? 'checked' : '' }} />
+                                                {{ in_array($item->name, old('kondisi_bangunan', $forminspeksi['bangunan']['kondisi_bangunan'] ?? [])) ? 'checked' : '' }} />
                                             {{ $item->name }}
                                         </label>
                                         <input type="text" name="kondisi_bangunan_lainnya" class="input mt-2"
                                             id="bentukTanahInput" placeholder="Masukkan Kondisi Bangunan..."
-                                            value="{{ old('kondisi_bangunan_lainnya', $forminspeksi['kondisi_bangunan_lainnya'] ?? '') }}">
+                                            value="{{ old('kondisi_bangunan_lainnya', $forminspeksi['bangunan']['kondisi_bangunan_lainnya'] ?? '') }}">
                                     </div>
                                 @endif
                             @endforeach
@@ -106,12 +113,12 @@
                                     <label class="form-label max-w-56 gap-2.5" style="width: 500px">
                                         <input class="checkbox" name="sifat_bangunan[]" type="checkbox"
                                             value="{{ $item->name }}"
-                                            {{ in_array($item->name, old('sifat_bangunan', $forminspeksi['sifat_bangunan'] ?? [])) ? 'checked' : '' }} />
+                                            {{ in_array($item->name, old('sifat_bangunan', $forminspeksi['bangunan']['sifat_bangunan'] ?? [])) ? 'checked' : '' }} />
                                         {{ $item->name }}
                                     </label>
                                     <input type="text" name="sifat_bangunan_input[]" class="input w-full"
                                         id="sifat_bangunan" placeholder="Masukkan {{ $item->name }}..."
-                                        value="{{ old('sifat_bangunan_input.' . $loop->index, $forminspeksi['sifat_bangunan_input'][$loop->index] ?? '') }}">
+                                        value="{{ old('sifat_bangunan_input.' . $loop->index, $forminspeksi['bangunan']['sifat_bangunan_input'][$loop->index] ?? '') }}">
                                 </div>
                             @endforeach
                         @endif
@@ -125,8 +132,9 @@
                 <div class="flex items-stretch flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Spek Bangunan</label>
                     <div class="flex flex-wrap items-baseline w-full" id="spek-bangunan-container">
-                        <div class="spek-bangunan w-full gap-4">
+                        <div class="spek-bangunan w-full gap-4 mt-5">
                             <input type="hidden" name="nama_bagunan[]" value="Bangunan">
+                            <label class="building-label form-label">Bangunan 1</label>
                             <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2 w-full">
                                 @if (@isset($spekKategoriBagunan))
                                     @foreach ($spekKategoriBagunan as $item)
@@ -155,14 +163,14 @@
                                     @endforeach
                                 @endif
                             </div>
-                            <button type="button"
-                                class="mt-2 btn btn-danger btn-outline btn-xs remove-btn" style="display: none;">Hapus</button>
+                            <button type="button" class="mt-2 btn btn-danger btn-outline btn-xs delete-button"
+                                style="display: none;">Hapus</button>
                         </div>
                     </div>
                 </div>
 
                 <div class="flex justify-end">
-                    <button class="btn  btn-xs btn-primary" type="button" onclick="addClonableItem('spek-bangunan-container', 'spek-bangunan')">
+                    <button class="btn  btn-xs btn-primary" type="button" id="addBagunan">
                         tambah bangunan
                         <i class="ki-filled ki-plus"></i>
                     </button>
@@ -181,12 +189,12 @@
                                     <label class="form-label max-w-56 gap-2.5" style="width: 500px">
                                         <input class="checkbox" name="sarana_pelengkap[]" type="checkbox"
                                             value="{{ $item->name }}"
-                                            {{ in_array($item->name, old('sarana_pelengkap', $forminspeksi['sarana_pelengkap'] ?? [])) ? 'checked' : '' }} />
+                                            {{ in_array($item->name, old('sarana_pelengkap', $forminspeksi['bangunan']['sarana_pelengkap'] ?? [])) ? 'checked' : '' }} />
                                         {{ $item->name }}
                                     </label>
                                     <input type="text" name="sarana_pelengkap_input[]" class="input w-full"
                                         id="bentukTanahInput" placeholder="Masukkan {{ $item->name }}..."
-                                        value="{{ old('sarana_pelengkap_input.' . $loop->index, $forminspeksi['sarana_pelengkap_input'][$loop->index] ?? '') }}">
+                                        value="{{ old('sarana_pelengkap_input.' . $loop->index, $forminspeksi['bangunan']['sarana_pelengkap_input'][$loop->index] ?? '') }}">
                                 </div>
                             @endforeach
                         @endif
@@ -197,13 +205,15 @@
         </div>
     </div>
 </div>
+
+
+
 @push('scripts')
     <script>
         const spekBangunanContainer = document.getElementById('spek-bangunan-container');
 
         function updateDeleteButtonsVisibility() {
             const allDeleteButtons = spekBangunanContainer.querySelectorAll('.delete-button');
-            // Only show the delete buttons if there are more than one form
             allDeleteButtons.forEach(button => {
                 if (spekBangunanContainer.querySelectorAll('.spek-bangunan').length > 1) {
                     button.style.display = 'inline-block';
@@ -213,12 +223,26 @@
             });
         }
 
+        function updateBuildingLabels() {
+            const allSpekBangunan = spekBangunanContainer.querySelectorAll('.spek-bangunan');
+            allSpekBangunan.forEach((div, index) => {
+                const label = div.querySelector('.building-label');
+                if (label) {
+                    label.textContent = `Bangunan ${index + 1}`;
+                }
+            });
+        }
+
         document.getElementById('addBagunan').addEventListener('click', function() {
             const newDiv = spekBangunanContainer.querySelector('.spek-bangunan').cloneNode(true);
-
-            // Clear the selected values of the cloned input fields
-            newDiv.querySelectorAll('select').forEach(select => {
-                select.value = '';
+            console.log('Building label');
+            // Clear the selected values and input fields of the cloned input fields
+            newDiv.querySelectorAll('select, input').forEach(input => {
+                if (input.type === 'checkbox' || input.type === 'radio') {
+                    input.checked = false;
+                } else {
+                    input.value = '';
+                }
             });
 
             // Append the cloned div to the container
@@ -228,14 +252,21 @@
             newDiv.querySelector('.delete-button').addEventListener('click', function() {
                 spekBangunanContainer.removeChild(newDiv);
                 updateDeleteButtonsVisibility();
+                updateBuildingLabels(); // Update the labels after removing
+                console.log('Building label');
             });
 
-            // Update delete buttons visibility
+            // Update delete buttons visibility and labels
             updateDeleteButtonsVisibility();
+            updateBuildingLabels();
+            console.log('Building label');
         });
 
-        // Initial delete button visibility
-        updateDeleteButtonsVisibility();
+        // Initial setup: Ensure "Bangunan 1" is labeled
+        document.addEventListener('DOMContentLoaded', () => {
+            updateDeleteButtonsVisibility();
+            updateBuildingLabels(); // Ensure the first label is set
+        });
 
         // Add delete functionality to the initial form
         spekBangunanContainer.querySelectorAll('.delete-button').forEach(button => {
@@ -246,6 +277,7 @@
                 if (spekBangunanContainer.querySelectorAll('.spek-bangunan').length > 1) {
                     spekBangunan.remove();
                     updateDeleteButtonsVisibility();
+                    updateBuildingLabels(); // Update the labels after removing
                 }
             });
         });
diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php
index 5c1d8a0..b86f5dc 100644
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/resources/views/surveyor/components/data-pembanding.blade.php
@@ -352,7 +352,6 @@
                                     <tr>
                                         <td>
                                             <p>Posisi kavling</p>
-
                                         </td>
                                         <td>
                                             <input type="text" class="input mt-2" placeholder="Objek Penilaian"
@@ -482,21 +481,84 @@
                                             <input type="text" class="input" placeholder="Data Pembanding 1" />
                                         </td>
                                     </tr>
+                                    <tr>
+                                        <td colspan="3">Pengunaan</td>
+                                    </tr>
+
                                     <tr>
                                         <td>
-                                            <p>Pengunaan</p>
-                                            <p>Zonasi/Tata Kota</p>
-                                            <p> KDB, KLB, KTB, KDH & Peraturan Lainnya</p>
+                                            Zonasi/Tata Kota
                                         </td>
                                         <td>
                                             <input type="text" class="input" placeholder="Objek Penilaian" />
-                                            <input type="text" class="input mt-2" placeholder="Objek Penilaian" />
-                                            <input type="text" class="input mt-2" placeholder="Objek Penilaian" />
                                         </td>
                                         <td>
                                             <input type="text" class="input" placeholder="Data Pembanding 1" />
-                                            <input type="text" class="input mt-2" placeholder="Data Pembanding 1" />
-                                            <input type="text" class="input mt-2" placeholder="Objek Penilaian" />
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                             KDB
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Objek Penilaian" />
+
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Data Pembanding 1" />
+
+                                        </td>
+                                    </tr>
+
+
+                                    <tr>
+                                        <td>
+                                            KLB
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Objek Penilaian" />
+
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Data Pembanding 1" />
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <td>
+                                            KTB
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Objek Penilaian" />
+
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Data Pembanding 1" />
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <td>
+                                            KDH
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Objek Penilaian" />
+
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Data Pembanding 1" />
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            Peraturan
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Objek Penilaian" />
+
+                                        </td>
+                                        <td>
+                                            <input type="text" class="input" placeholder="Data Pembanding 1" />
                                         </td>
                                     </tr>
                                 </tbody>
diff --git a/resources/views/surveyor/components/fakta.blade.php b/resources/views/surveyor/components/fakta.blade.php
index 3d60243..2dd1e4a 100644
--- a/resources/views/surveyor/components/fakta.blade.php
+++ b/resources/views/surveyor/components/fakta.blade.php
@@ -8,13 +8,23 @@
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Faktor Positif</label>
                     <div id="fakta-positif-container" class="flex flex-wrap items-baseline w-full">
-                        <div class="fakta_positif flex items-center gap-2 mt-2 textarea-group w-full">
-                            <textarea class="textarea mt-2" name="fakta_positif[]" rows="3">{{ old('fakta_positif.0', $forminspeksi['fakta_positif'][0] ?? '') }}</textarea>
-                            <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
-                                <i class="ki-outline ki-trash"></i>
-                            </button>
-                            <em id="error-fakta_positif" class="alert text-danger text-sm"></em>
-                        </div>
+                        @if (!empty($forminspeksi['fakta']['fakta_positif']))
+                            @foreach ($forminspeksi['fakta']['fakta_positif'] as $index => $positif)
+                                <div class="fakta_positif flex items-center gap-2 mt-2 textarea-group w-full">
+                                    <textarea class="textarea mt-2" name="fakta_positif[]" rows="3">{{ old("fakta_positif.$index", $positif) }}</textarea>
+                                    <button class="btn btn-danger btn-sm remove-btn" type="button">
+                                        <i class="ki-outline ki-trash"></i>
+                                    </button>
+                                </div>
+                            @endforeach
+                        @else
+                            <div class="fakta_positif flex items-center gap-2 mt-2 textarea-group w-full">
+                                <textarea class="textarea mt-2" name="fakta_positif[]" rows="3">{{ old('fakta_positif.0', '') }}</textarea>
+                                <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
+                                    <i class="ki-outline ki-trash"></i>
+                                </button>
+                            </div>
+                        @endif
                         <button type="button" class="btn btn-primary btn-sm mt-5"
                             onclick="addClonableItem('fakta-positif-container', 'fakta_positif')">
                             <i class="ki-outline ki-plus"></i>
@@ -22,16 +32,30 @@
                     </div>
                 </div>
 
+
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Faktor Negatif</label>
                     <div id="fakta-negatif-container" class="flex flex-wrap items-baseline w-full">
-                        <div class="fakta_negatif flex items-center gap-2 mt-2 textarea-group w-full">
-                            <textarea class="textarea mt-2" name="fakta_negatif[]" rows="3">{{ old('fakta_negatif.0', $forminspeksi['fakta_negatif'][0] ?? '') }}</textarea>
-                            <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
-                                <i class="ki-outline ki-trash"></i>
-                            </button>
-                            <em id="error-fakta_negatif" class="alert text-danger text-sm"></em>
-                        </div>
+
+                        @if (!empty($forminspeksi['fakta']['fakta_negatif']))
+                            @foreach ($forminspeksi['fakta']['fakta_negatif'] as $index => $negatif)
+                                <div class="fakta_negatif flex items-center gap-2 mt-2 textarea-group w-full">
+                                    <textarea class="textarea mt-2" name="fakta_negatif[]" rows="3">{{ old("fakta_negatif.$index", $negatif) }}</textarea>
+                                    <button class="btn btn-danger btn-sm remove-btn" type="button"
+                                        style="display: none;">
+                                        <i class="ki-outline ki-trash"></i>
+                                    </button>
+                                </div>
+                            @endforeach
+                        @else
+                            <div class="fakta_negatif flex items-center gap-2 mt-2 textarea-group w-full">
+                                <textarea class="textarea mt-2" name="fakta_negatif[]" rows="3">{{ old('fakta_negatif.0', $forminspeksi['fakta']['fakta_negatif'][0] ?? '') }}</textarea>
+                                <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
+                                    <i class="ki-outline ki-trash"></i>
+                                </button>
+                                <em id="error-fakta_negatif" class="alert text-danger text-sm"></em>
+                            </div>
+                        @endif
                         <button type="button" class="btn btn-primary btn-sm mt-5"
                             onclick="addClonableItem('fakta-negatif-container', 'fakta_negatif')">
                             <i class="ki-outline ki-plus"></i>
@@ -43,7 +67,7 @@
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Rute Menuju</label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <textarea class="textarea mt-2" name="rute_menuju" rows="3">{{ old('rute_menuju.0', $forminspeksi['rute_menuju'][0] ?? '') }}</textarea>
+                        <textarea class="textarea mt-2" name="rute_menuju" rows="3">{{ old('rute_menuju.0', $forminspeksi['fakta']['rute_menuju'][0] ?? '') }}</textarea>
                         <em id="error-rute_menuju" class="alert text-danger text-sm"></em>
                     </div>
                 </div>
@@ -59,12 +83,12 @@
                                         <label class="form-label max-w-56 gap-2.5" style="width: 500px">
                                             <input class="checkbox" name="batas_batas[]" type="checkbox"
                                                 value="{{ $item->name }}"
-                                                {{ in_array($item->name, old('batas_batas', $forminspeksi['batas_batas'] ?? [])) ? 'checked' : '' }} />
+                                                {{ in_array($item->name, old('batas_batas', $forminspeksi['fakta']['batas_batas'] ?? [])) ? 'checked' : '' }} />
                                             {{ $item->name }}
                                         </label>
                                         <input type="text" name="batas_batas_input[]" class="input w-full"
                                             id="bentukTanahInput" placeholder="Masukkan Batas {{ $item->name }}..."
-                                            value="{{ old('batas_batas_input.' . $loop->index, $forminspeksi['batas_batas_input'][$loop->index] ?? '') }}">
+                                            value="{{ old('batas_batas_input.' . $loop->index, $forminspeksi['fakta']['batas_batas_input'][$loop->index] ?? '') }}">
                                     </div>
                                 @endforeach
                             @endif
@@ -77,14 +101,29 @@
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Kondisi lain terkait lingkungan</label>
                     <div class="flex flex-wrap items-baseline w-full" id="kondisi-lingkungan-container">
-                        <div class="kondisi_lingkungan flex items-center gap-2 mt-2 textarea-group w-full">
-                            <textarea class="textarea mt-2" name="kondisi_lingkungan[]" rows="3" placeholder="Tambahkan keterangan"></textarea>
-                            <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
-                                <i class="ki-outline ki-trash"></i>
-                            </button>
-                            <em id="error-kondisi_lingkungan" class="alert text-danger text-sm"></em>
-                        </div>
 
+
+                        @if (!empty($forminspeksi['fakta']['kondisi_lingkungan']))
+                            @foreach ($forminspeksi['fakta']['kondisi_lingkungan'] as $index => $kondisi_lingkungan)
+                                <div class="kondisi_lingkungan flex items-center gap-2 mt-2 textarea-group w-full">
+                                    <textarea class="textarea mt-2" name="kondisi_lingkungan[]" rows="3">{{ old("kondisi_lingkungan.$index", $kondisi_lingkungan) }}</textarea>
+                                    <button class="btn btn-danger btn-sm remove-btn" type="button"
+                                        style="display: none;">
+                                        <i class="ki-outline ki-trash"></i>
+                                    </button>
+                                </div>
+                            @endforeach
+                        @else
+                            <div class="kondisi_lingkungan flex items-center gap-2 mt-2 textarea-group w-full">
+                                <textarea class="textarea mt-2" name="kondisi_lingkungan[]" rows="3" placeholder="Tambahkan keterangan">
+                                {{ old('kondisi_lingkungan.0', $forminspeksi['fakta']['kondisi_lingkungan'][0] ?? '') }}
+                            </textarea>
+                                <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
+                                    <i class="ki-outline ki-trash"></i>
+                                </button>
+                                <em id="error-kondisi_lingkungan" class="alert text-danger text-sm"></em>
+                            </div>
+                        @endif
                         <button class="btn btn-primary btn-sm mt-5" type="button"
                             onclick="addClonableItem('kondisi-lingkungan-container', 'kondisi_lingkungan')">
                             <i class="ki-outline ki-plus"></i>
@@ -97,14 +136,26 @@
                     <label class="form-label max-w-56">Kondisi lain terkait Bangunan</label>
                     <div id="kondisi-lain-bangunan-container" class="flex flex-wrap items-baseline w-full">
 
-
-                        <div class="kondisi_lain_bangunan flex items-center gap-2 mt-2 textarea-group w-full">
-                            <textarea class="textarea mt-2" name="kondisi_lain_bangunan[]" rows="3">{{ old('kondisi_lain_bangunan.0', $forminspeksi['kondisi_lain_bangunan'][0] ?? '') }}</textarea>
-                            <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
-                                <i class="ki-outline ki-trash"></i>
-                            </button>
-                            <em id="error-kondisi_lain_bangunan" class="alert text-danger text-sm"></em>
-                        </div>
+                        @if (!empty($forminspeksi['fakta']['kondisi_lain_bangunan']))
+                            @foreach ($forminspeksi['fakta']['kondisi_lain_bangunan'] as $index => $kondisi_lain_bangunan)
+                                <div class="kondisi_lain_bangunan flex items-center gap-2 mt-2 textarea-group w-full">
+                                    <textarea class="textarea mt-2" name="kondisi_lain_bangunan[]" rows="3">{{ old("kondisi_lain_bangunan.$index", $kondisi_lain_bangunan) }}</textarea>
+                                    <button class="btn btn-danger btn-sm remove-btn" type="button"
+                                        style="display: none;">
+                                        <i class="ki-outline ki-trash"></i>
+                                    </button>
+                                </div>
+                            @endforeach
+                        @else
+                            <div class="kondisi_lain_bangunan flex items-center gap-2 mt-2 textarea-group w-full">
+                                <textarea class="textarea mt-2" name="kondisi_lain_bangunan[]" rows="3">{{ old('kondisi_lain_bangunan.0', $forminspeksi['fakta']['kondisi_lain_bangunan'][0] ?? '') }}</textarea>
+                                <button class="btn btn-danger btn-sm remove-btn" type="button"
+                                    style="display: none;">
+                                    <i class="ki-outline ki-trash"></i>
+                                </button>
+                                <em id="error-kondisi_lain_bangunan" class="alert text-danger text-sm"></em>
+                            </div>
+                        @endif
                         <button type="button"
                             onclick="addClonableItem('kondisi-lain-bangunan-container', 'kondisi_lain_bangunan')"
                             class="btn btn-primary btn-sm mt-5 ">
@@ -117,24 +168,37 @@
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Informasi Terkait Dokumen</label>
                     <div id="informasi-dokument-container" class="flex flex-wrap items-baseline w-full">
+                        @php
+                            // Ensure $forminspeksi['fakta']['informasi_dokument'] is an array
+                            $informasi_dokument = isset($forminspeksi['fakta']['informasi_dokument']) ? (array) $forminspeksi['fakta']['informasi_dokument'] : [];
+                        @endphp
+
+                        @foreach ($informasi_dokument as $index => $document)
+                            <div class="informasi_dokument flex items-center gap-2 mt-2 textarea-group w-full">
+                                <textarea class="textarea mt-2" name="informasi_dokument[]" rows="3">{{ old("informasi_dokument.$index", $document) }}</textarea>
+                                <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
+                                    <i class="ki-outline ki-trash"></i>
+                                </button>
+                            </div>
+                        @endforeach
+
                         <div class="informasi_dokument flex items-center gap-2 mt-2 textarea-group w-full">
-                            <textarea class="textarea mt-2" name="informasi_dokument" rows="3">{{ old('informasi_dokument.0', $forminspeksi['informasi_dokument'][0] ?? '') }}</textarea>
+                            <textarea class="textarea mt-2" name="informasi_dokument" rows="3">
+                                {{ old('informasi_dokument.0', isset($forminspeksi['fakta']['informasi_dokument'][0]) ? $forminspeksi['fakta']['informasi_dokument'][0] : '') }}
+                            </textarea>
                             <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
                                 <i class="ki-outline ki-trash"></i>
                             </button>
                             <em id="error-informasi_dokument" class="alert text-danger text-sm"></em>
                         </div>
-                        <button class="btn btn-primary btn-sm mt-5 " type="button"
-                            onclick="addClonableItem('informasi-dokument-container', 'informasi_dokument')">
+
+                        <button class="btn btn-primary btn-sm mt-5" type="button" onclick="addClonableItem('informasi-dokument-container', 'informasi_dokument')">
                             <i class="ki-outline ki-plus"></i>
                         </button>
                     </div>
                 </div>
+
+
             </div>
         </div>
     </div>
-
-
-
-
-
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index fc7b90d..ea20501 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -43,7 +43,7 @@
             <div id="perwakilan" class="flex  flex-wrap  items-baseline w-full gap-5">
                 <div class="perwakilan flex flex-wrap  w-full items-baseline gap-2 ">
                     <input type="text" class="input form-control" name="debitur_perwakilan[]"
-                        value="{{ old('debitur_perwakilan', isset($forminspeksi['debitur_perwakilan']) ? implode(', ', $forminspeksi['debitur_perwakilan']) : '') }}"
+                        value="{{ old('debitur_perwakilan', isset($forminspeksi['asset']['debitur_perwakilan']) ? implode(', ', $forminspeksi['asset']['debitur_perwakilan']) : '') }}"
                         placeholder="Masukkan Debitur/Perwakilan" />
                     <button type="button" class="btn btn-danger btn-outline btn-xs remove-btn"
                         style="display: none">Hapus</button>
@@ -99,32 +99,37 @@
                     <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 onclick="toggleJenisAsset('jenis_asset')" type="radio" class="radio"
+                                <input onclick="toggleFieldVisibility('jenis_asset', 'jenis_asset', ['tidak sesuai'])" type="radio" class="radio"
                                     name="jenis_asset" value="sesuai"
-                                    {{ old('jenis_asset', $forminspeksi['jenis_asset'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                    {{ old('jenis_asset', $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="toggleJenisAsset('jenis_asset')" type="radio" class="radio"
+                                <input onclick="toggleFieldVisibility('jenis_asset', 'jenis_asset', ['tidak sesuai'])" type="radio" class="radio"
                                     name="jenis_asset" value="tidak sesuai"
-                                    {{ old('jenis_asset', $forminspeksi['jenis_asset'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                    {{ old('jenis_asset', $forminspeksi['asset']['jenis_asset'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
                                 <span class="ml-2">Tidak</span>
                             </label>
                             <!-- Select dropdown untuk "Tidak Sesuai" -->
-                            <select id="jenis_asset"
-                                class="input w-full @error('jenis_asset_tidak_sesuai') border-danger bg-danger-light @enderror"
+
+                            <div id="jenis_asset" class="flex items-baseline gap-2" style="{{ old('jenis_asset', $forminspeksi['asset']['jenis_asset'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                                <select
+                                class="input w-full"
                                 name="jenis_asset_tidak_sesuai"
-                                style="{{ old('jenis_asset', $forminspeksi['jenis_asset'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                                >
                                 <option value="">Select Jenis asset</option>
-                                @if (isset($arahMataAngin))
-                                    @foreach ($arahMataAngin as $item)
+                                @if (isset($jenisJaminan))
+                                    @foreach ($jenisJaminan as $item)
                                         <option value="{{ $item->name }}"
-                                            {{ old('jenis_asset_tidak_sesuai', $forminspeksi['jenis_asset_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
+                                            {{ old('jenis_asset_tidak_sesuai', $forminspeksi['asset']['jenis_asset_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
                                             {{ $item->name }}
                                         </option>
                                     @endforeach
                                 @endif
                             </select>
+                            <button type="button" class="btn btn-md btn-primary">Save</button>
+                        </div>
+
                         </div>
                         <em id="error-jenis_asset" class="alert text-danger text-sm"></em>
                     </div>
@@ -146,24 +151,130 @@
                             <label class="form-label flex items-center gap-3 text-nowrap">
                                 <input onclick="toggleTidakSesuai('alamat_sesuai','alamat_tidak_sesuai')" type="radio"
                                     class="radio" name="alamat_sesuai" value="sesuai"
-                                    {{ old('alamat_sesuai', $forminspeksi['alamat_sesuai'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                    {{ old('alamat_sesuai', $forminspeksi['asset']['alamat_sesuai'] ?? '') == 'sesuai' ? 'checked' : '' }}>
                                 <span class="ml-2">Ya</span>
                             </label>
                             <label class="form-label flex items-center gap-2.5 text-nowrap">
                                 <input onclick="toggleTidakSesuai('alamat_sesuai','alamat_tidak_sesuai')" type="radio"
                                     class="radio" name="alamat_sesuai" value="tidak sesuai"
-                                    {{ old('alamat_sesuai', $forminspeksi['alamat_sesuai'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                    {{ old('alamat_sesuai', $forminspeksi['asset']['alamat_sesuai'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
                                 <span class="ml-2">Tidak</span>
                             </label>
-
-                            <input type="text" name="alamat_tidak_sesuai" id="alamat_tidak_sesuai"
-                                class="input w-full" placeholder="Masukan jenis asset Tanah"
-                                value="{{ old('alamat_tidak_sesuai', $forminspeksi['alamat_tidak_sesuai'] ?? '') }}"
-                                style="{{ old('alamat_sesuai', $forminspeksi['alamat_sesuai'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
                         </div>
                         <em id="error-alamat" class="alert text-danger text-sm"></em>
                     </div>
-                    <div class="grid gap-2 mt-5">
+
+
+                    <div id="alamat_tidak_sesuai" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5" style="display: none;">
+                        <label class="form-label max-w-56">
+                            Address
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <div class="flex flex-col lg:flex-row gap-2 w-full">
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <select id="province_code" name="province_code" class="select w-full @error('province_code') border-danger bg-danger-light @enderror">
+                                        <option value="">Select Province</option>
+                                        @foreach($provinces as $province)
+                                            @if(isset($debitur))
+                                                <option value="{{ $province->code }}" {{ isset($debitur->province_code) && $debitur->province_code == $province->code?'selected' : '' }}>
+                                                    {{ $province->name }}
+                                                </option>
+                                            @else
+                                                <option value="{{ $province->code }}">
+                                                    {{ $province->name }}
+                                                </option>
+                                            @endif
+                                        @endforeach
+                                    </select>
+                                    @error('province_code')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <select id="city_code" name="city_code" class="select w-full @error('city_code') border-danger bg-danger-light @enderror">
+                                        <option value="">Select City</option>
+                                        @if(isset($cities))
+                                            @foreach($cities as $city)
+                                                @if(isset($debitur))
+                                                    <option value="{{ $city->code }}" {{ isset($debitur->city_code) && $debitur->city_code == $city->code?'selected' : '' }}>
+                                                        {{ $city->name }}
+                                                    </option>
+                                                @else
+                                                    <option value="{{ $city->code }}">
+                                                        {{ $city->name }}
+                                                    </option>
+                                                @endif
+                                            @endforeach
+
+                                        @endif
+                                    </select>
+                                    @error('city_code')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="flex flex-col lg:flex-row gap-2 w-full mt-2 lg:mt-5">
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <select id="district_code" name="district_code" class="select w-full @error('district_code') border-danger bg-danger-light @enderror">
+                                        <option value="">Select District</option>
+                                        @if(isset($districts))
+                                            @foreach($districts as $district)
+                                                @if(isset($debitur))
+                                                    <option value="{{ $district->code }}" {{ isset($debitur->district_code) && $debitur->district_code == $district->code?'selected' : '' }}>
+                                                        {{ $district->name }}
+                                                    </option>
+                                                @else
+                                                    <option value="{{ $district->code }}">
+                                                        {{ $district->name }}
+                                                    </option>
+                                                @endif
+                                            @endforeach
+
+                                        @endif
+                                    </select>
+                                    @error('district_code')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <select id="village_code" name="village_code" class="select w-full @error('district_code') border-danger bg-danger-light @enderror">
+                                        <option value="">Select Village</option>
+                                        @if(isset($villages))
+                                            @foreach($villages as $village)
+                                                @if(isset($debitur))
+                                                    <option value="{{ $village->code }}" {{ isset($debitur->village_code) && $debitur->village_code == $village->code?'selected' : '' }}>
+                                                        {{ $village->name }}
+                                                    </option>
+                                                @else
+                                                    <option value="{{ $village->code }}">
+                                                        {{ $village->name }}
+                                                    </option>
+                                                @endif
+                                            @endforeach
+
+                                        @endif
+                                    </select>
+                                    @error('district_code')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('postal_code') border-danger bg-danger-light @enderror" type="number" id="postal_code" name="postal_code" value="{{ $debitur->postal_code ?? '' }}" placeholder="Postal Code">
+                                    @error('postal_code')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                            </div>
+                            <div class="flex flex-row w-full mt-2 lg:mt-5">
+                                <textarea class="textarea  @error('address') border-danger bg-danger-light @enderror" rows="3" type="number" id="address" name="address">{{ $debitur->address ?? '' }}</textarea>
+                                @error('address')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
+                            </div>
+                        </div>
+                    </div>
+
+                    <div id="alamat_tidak_sesuai" class="grid gap-2 mt-5" style="display: none;">
                         @php
 
                             $inputDataLoaksi = [];
@@ -174,7 +285,7 @@
                                     'name' => 'nama_jalan',
                                     'value' => old(
                                         'nama_jalan',
-                                        isset($forminspeksi['nama_jalan']) ? $forminspeksi['nama_jalan'] : '',
+                                        isset($forminspeksi['asset']['nama_jalan']) ? $forminspeksi['asset']['nama_jalan'] : '',
                                     ),
                                 ],
 
@@ -184,7 +295,7 @@
                                     'name' => 'desa_kelurahan',
                                     'value' => old(
                                         'desa_kelurahan',
-                                        isset($forminspeksi['desa_kelurahan']) ? $forminspeksi['desa_kelurahan'] : '',
+                                        isset($forminspeksi['asset']['desa_kelurahan']) ? $forminspeksi['asset']['desa_kelurahan'] : '',
                                     ),
                                 ],
                                 [
@@ -193,7 +304,7 @@
                                     'name' => 'kecamatan',
                                     'value' => old(
                                         'kecamatan',
-                                        isset($forminspeksi['kecamatan']) ? $forminspeksi['kecamatan'] : '',
+                                        isset($forminspeksi['asset']['kecamatan']) ? $forminspeksi['asset']['kecamatan'] : '',
                                     ),
                                 ],
                                 [
@@ -202,7 +313,7 @@
                                     'name' => 'kota_kabupaten',
                                     'value' => old(
                                         'kota_kabupaten',
-                                        isset($forminspeksi['kota_kabupaten']) ? $forminspeksi['kota_kabupaten'] : '',
+                                        isset($forminspeksi['asset']['kota_kabupaten']) ? $forminspeksi['asset']['kota_kabupaten'] : '',
                                     ),
                                 ],
                                 [
@@ -211,7 +322,7 @@
                                     'name' => 'provinsi',
                                     'value' => old(
                                         'provinsi',
-                                        isset($forminspeksi['provinsi']) ? $forminspeksi['provinsi'] : '',
+                                        isset($forminspeksi['asset']['provinsi']) ? $forminspeksi['asset']['provinsi'] : '',
                                     ),
                                 ],
                             ];
@@ -249,13 +360,13 @@
             <h1 class="text-md font-medium text-gray-900">Titik Koordinat Google Maps</h1>
         </div>
         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-            <label class="form-label max-w-56">Koordinat</label>
+            <label class="form-label max-w-56">Kordinat</label>
             <div id="perwakilan" class="flex  items-baseline w-full gap-5">
                 <div class="grid grid-cols-2 gap-4 items-center w-full">
                     <input class="input" type="text" placeholder="Masukan Koordinat Latitude" type="text" name="kordinat_lat" id="lat"
-                        value="{{ old('kordinat_lat') }}">
+                        value="{{ old('kordinat_lat', isset($forminspeksi['asset']['kordinat_lat']) ? $forminspeksi['asset']['kordinat_lat'] : '') }}">
                     <input class="input" type="text" placeholder="Masukan Koordinat Longitude" name="kordinat_lng" id="lng"
-                        value="{{ old('kordinat_lng') }}" >
+                        value="{{ old('kordinat_lng', isset($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '') }}" >
                 </div>
                 <a target="_blank" href="https://www.google.com/maps"type="button" class="btn btn-md btn-outline btn-primary" >
                     <i class="ki-filled ki-map"></i>Ambil
@@ -373,27 +484,27 @@
                     <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 onclick="toggleTidakSesuai('hub_cadeb','hub_cadeb_tidak_sesuai')" type="radio" class="radio"
+                                <input onclick="toggleFieldVisibility('hub_cadeb','hub_cadeb_tidak_sesuai', ['tidak sesuai'])" type="radio" class="radio"
                                     name="hub_cadeb" value="sesuai"
-                                    {{ old('hub_cadeb', $forminspeksi['hub_cadeb'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                    {{ old('hub_cadeb', $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="toggleTidakSesuai('hub_cadeb', 'hub_cadeb_tidak_sesuai')" type="radio" class="radio"
+                                <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['hub_cadeb'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                    {{ old('hub_cadeb', $forminspeksi['asset']['hub_cadeb'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
                                 <span class="ml-2">Tidak</span>
                             </label>
                             <!-- Select dropdown untuk "Tidak Sesuai" -->
                             <select id="hub_cadeb_tidak_sesuai"
-                                class="input w-full 
+                                class="input w-full
                                 name="hub_cadeb_tidak_sesuai"
-                                style="{{ old('hub_cadeb', $forminspeksi['hub_cadeb'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                                style="{{ old('hub_cadeb', $forminspeksi['asset']['hub_cadeb'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
                                 <option value="">Select Hubungan Cadeb</option>
                                 @if (isset($hubCadeb))
                                     @foreach ($hubCadeb as $item)
                                         <option value="{{ $item->name }}"
-                                            {{ old('hub_cadeb_tidak_sesuai', $forminspeksi['hub_cadeb_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
+                                            {{ old('hub_cadeb_tidak_sesuai', $forminspeksi['asset']['hub_cadeb_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
                                             {{ $item->name }}
                                         </option>
                                     @endforeach
@@ -412,38 +523,38 @@
                 <h1 class="text-md font-medium text-gray-900">Hubungan Cadeb/Debitur dengan Penghuni Jaminan</h1>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">Penghuni Jaminan</label>
-                 
+
                     <div>
                         <div class="flex flex-wrap items-baseline w-full">
                             @foreach ($permohonan->debiture->documents as $dokumen)
                             {{ $dokumen->penghuni->hubungan_penghuni->name?? "" }}
                             @endforeach
                         </div>
-    
+
                         <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 onclick="toggleTidakSesuai('hub_cadeb_penghuni','hub_cadeb_Penghuni_tidak_sesuai')" type="radio" class="radio"
+                                    <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['hub_cadeb_penghuni'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                        {{ old('hub_cadeb_penghuni', $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="toggleTidakSesuai('hub_cadeb_penghuni', 'hub_cadeb_Penghuni_tidak_sesuai')" type="radio" class="radio"
+                                    <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['hub_cadeb_penghuni'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                        {{ old('hub_cadeb_penghuni', $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 
+                                    class="input w-full
                                     name="hub_cadeb_Penghuni_tidak_sesuai"
-                                    style="{{ old('hub_cadeb', $forminspeksi['hub_cadeb'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                                    style="{{ old('hub_cadeb', $forminspeksi['asset']['hub_cadeb'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
                                     <option value="">Select Hubungan Cadeb</option>
                                     @if (isset($hubCadeb))
                                         @foreach ($hubCadeb as $item)
                                             <option value="{{ $item->name }}"
-                                                {{ old('hub_cadeb_Penghuni_tidak_sesuai', $forminspeksi['hub_cadeb_Penghuni_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
+                                                {{ old('hub_cadeb_Penghuni_tidak_sesuai', $forminspeksi['asset']['hub_cadeb_Penghuni_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
                                                 {{ $item->name }}
                                             </option>
                                         @endforeach
@@ -459,3 +570,5 @@
 
     </div>
 </div>
+
+
diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php
index 83bba40..0b986ec 100644
--- a/resources/views/surveyor/components/informasi.blade.php
+++ b/resources/views/surveyor/components/informasi.blade.php
@@ -16,26 +16,26 @@
                         'index' => 0,
                         'value' => old(
                             'peruntukan',
-                            isset($forminspeksi['peruntukan']) ? $forminspeksi['peruntukan'] : '',
+                            isset($forminspeksi['fakta']['peruntukan']) ? $forminspeksi['fakta']['peruntukan'] : '',
                         ),
                     ],
                     [
                         'label' => 'KDB',
                         'name' => 'kdb',
                         'index' => 1,
-                        'value' => old('kdb', isset($forminspeksi['kdb']) ? $forminspeksi['kdb'] : ''),
+                        'value' => old('kdb', isset($forminspeksi['fakta']['kdb']) ? $forminspeksi['fakta']['kdb'] : ''),
                     ],
                     [
                         'label' => 'KDH',
                         'name' => 'kdh',
                         'index' => 2,
-                        'value' => old('kdh', isset($forminspeksi['kdh']) ? $forminspeksi['kdh'] : ''),
+                        'value' => old('kdh', isset($forminspeksi['fakta']['kdh']) ? $forminspeksi['fakta']['kdh'] : ''),
                     ],
                     [
-                        'label' => 'gsb',
+                        'label' => 'GSB',
                         'name' => 'gsb',
                         'index' => 3,
-                        'value' => old('gsb', isset($forminspeksi['gsb']) ? $forminspeksi['gsb'] : ''),
+                        'value' => old('gsb', isset($forminspeksi['fakta']['gsb']) ? $forminspeksi['fakta']['gsb'] : ''),
                     ],
                     [
                         'label' => 'Max Lantai',
@@ -43,20 +43,20 @@
                         'index' => 4,
                         'value' => old(
                             'max_lantai',
-                            isset($forminspeksi['max_lantai']) ? $forminspeksi['max_lantai'] : '',
+                            isset($forminspeksi['fakta']['max_lantai']) ? $forminspeksi['fakta']['max_lantai'] : '',
                         ),
                     ],
                     [
                         'label' => 'KLB',
                         'name' => 'klb',
                         'index' => 5,
-                        'value' => old('klb', isset($forminspeksi['klb']) ? $forminspeksi['klb'] : ''),
+                        'value' => old('klb', isset($forminspeksi['fakta']['klb']) ? $forminspeksi['fakta']['klb'] : ''),
                     ],
                     [
                         'label' => 'GSS',
                         'name' => 'gss',
                         'index' => 6,
-                        'value' => old('gss', isset($forminspeksi['gss']) ? $forminspeksi['gss'] : ''),
+                        'value' => old('gss', isset($forminspeksi['fakta']['gss']) ? $forminspeksi['fakta']['gss'] : ''),
                     ],
                     [
                         'label' => 'Pelebaran Jalan',
@@ -64,7 +64,7 @@
                         'index' => 7,
                         'value' => old(
                             'pelebaran_jalan',
-                            isset($forminspeksi['pelebaran_jalan']) ? $forminspeksi['pelebaran_jalan'] : '',
+                            isset($forminspeksi['fakta']['pelebaran_jalan']) ? $forminspeksi['fakta']['pelebaran_jalan'] : '',
                         ),
                     ],
                     [
@@ -73,7 +73,7 @@
                         'index' => 8,
                         'value' => old(
                             'nama_petugas',
-                            isset($forminspeksi['nama_petugas']) ? $forminspeksi['nama_petugas'] : '',
+                            isset($forminspeksi['fakta']['nama_petugas']) ? $forminspeksi['fakta']['nama_petugas'] : '',
                         ),
                     ],
                 ];
@@ -112,7 +112,7 @@
                     </div>
                     <a href="https://gistaru.atrbpn.go.id/rtronline" type="button" class="btn btn-light"
                         target="_blank">
-                        <i class="ki-outline ki-abstract-33"></i> Gistaru
+                         <i class="ki-filled ki-map"></i> Gistaru
                     </a>
                 </div>
             </div>
@@ -134,7 +134,7 @@
                     </div>
                     <a href="https://bhumi.atrbpn.go.id/peta" type="button" class="btn btn-light"
                         target="_blank">
-                        <i class="ki-outline ki-abstract-33"></i> Bhumi
+                         <i class="ki-filled ki-map"></i> Bhumi
                     </a>
                 </div>
             </div>
@@ -157,7 +157,7 @@
                         </div>
                         <a href="{{ $link_url_region->regions->url }}" type="button" class="btn btn-light"
                             target="_blank">
-                            <i class="ki-outline ki-abstract-33"></i>
+                             <i class="ki-filled ki-map"></i>
                             {{ $link_url_region->regions->name_url }}
                         </a>
                     </div>
@@ -181,14 +181,13 @@
                         style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }}">
                 </div>
             </div>
-        </div>
-
+        </div>77r7777
         <!-- Notes Section -->
         <div class="mt-2" >
             <div class="bg-white rounded-lg">
                 <h4 class="block text-sm font-medium text-gray-700 mt-2">Catatan yang Perlu Diperhatikan
                 </h4>
-                <textarea name="keterangan" class="textarea mt-2" placeholder="Masukkan catatan penting" rows="3">{{ old('keterangan', $forminspeksi['keterangan'] ?? '') }}</textarea>
+                <textarea name="keterangan" class="textarea mt-2" placeholder="Masukkan catatan penting" rows="3">{{ old('keterangan', $forminspeksi['fakta']['keterangan'] ?? '') }}</textarea>
             </div>
         </div>
     </div>
diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php
index eb02636..41d17e0 100644
--- a/resources/views/surveyor/components/inspeksi.blade.php
+++ b/resources/views/surveyor/components/inspeksi.blade.php
@@ -70,17 +70,61 @@
 @endsection
 @push('scripts')
     <script type="text/javascript">
-        function toggleTidakSesuai(field, inputId) {
-            const selectedValue = $(`[name="${field}"]:checked, [name="${field}"]:checked`).val();
+        function toggleFieldVisibility(fieldName, inputId, visibleValues = []) {
+            const selectedValue = $(`[name="${fieldName}"]:checked`).val();
             const inputField = $(`#${inputId}`);
 
-            if (selectedValue === 'tidak sesuai' || selectedValue === 'lainnya') {
+            if (visibleValues.includes(selectedValue)) {
                 inputField.show();
             } else {
                 inputField.hide().val('');
             }
         }
 
+
+        function toggleCheckboxVisibility(fieldName, inputId, visibleValues = []) {
+            const selectedValues = $(`[name="${fieldName}[]"]:checked`)
+                .map(function() {
+                    return $(this).val().toLowerCase(); // Konversi nilai ke huruf kecil
+                })
+                .get();
+
+            const inputField = $(`#${inputId}`);
+
+            // Cek apakah salah satu nilai yang dipilih cocok dengan visibleValues
+            const shouldShow = visibleValues.some(value => selectedValues.includes(value.toLowerCase()));
+
+            if (shouldShow) {
+                inputField.show();
+            } else {
+                inputField.hide().val('');
+            }
+        }
+
+
+        function toggleMultipleFields(fieldName, mappings) {
+            // Ambil semua nilai checkbox yang dicentang
+            const selectedValues = $(`[name="${fieldName}[]"]:checked`)
+                .map(function() {
+                    return $(this).val().toLowerCase(); // Konversi nilai ke huruf kecil
+                })
+                .get();
+
+            // Iterasi melalui setiap mapping
+            for (const [key, inputId] of Object.entries(mappings)) {
+                const inputField = $(`#${inputId}`);
+
+                // Tampilkan input jika nilai yang relevan dipilih
+                if (selectedValues.includes(key.toLowerCase())) {
+                    inputField.show();
+                } else {
+                    inputField.hide().val(''); // Sembunyikan dan reset nilai
+                }
+            }
+        }
+
+
+
         function submitData() {
             const formElement = $('#formInspeksi')[0];
             const formData = new FormData(formElement);
@@ -154,8 +198,10 @@
             }
 
             const newElement = template.cloneNode(true);
-            const inputs = newElement.querySelectorAll('input, textarea');
-            inputs.forEach(input => (input.value = ''));
+            const textarea = newElement.querySelector('textarea');
+            if (textarea) {
+                textarea.value = '';
+            }
 
             const deleteButton = newElement.querySelector('.remove-btn');
             if (deleteButton) {
@@ -167,3 +213,6 @@
         }
     </script>
 @endpush
+
+
+
diff --git a/resources/views/surveyor/components/lingkungan.blade.php b/resources/views/surveyor/components/lingkungan.blade.php
index 2a5a562..cc59d4b 100644
--- a/resources/views/surveyor/components/lingkungan.blade.php
+++ b/resources/views/surveyor/components/lingkungan.blade.php
@@ -14,43 +14,43 @@
                         <label class="block text-sm font-medium text-gray-700">Jarak Dari Jalan
                             Utama</label>
                         <input type="text" class="input mt-2" name="jarak_jalan_utama" placeholder="Km"
-                            value="{{ old('jarak_jalan_utama', isset($forminspeksi['jarak_jalan_utama']) ? $forminspeksi['jarak_jalan_utama'] : '') }}">
+                            value="{{ old('jarak_jalan_utama', isset($forminspeksi['lingkungan']['jarak_jalan_utama']) ? $forminspeksi['lingkungan']['jarak_jalan_utama'] : '') }}">
                     </div>
                     <div>
                         <label class="block text-sm font-medium text-gray-700">Jalan</label>
                         <input type="text" name="jalan_linkungan" class="input mt-2"
                             placeholder="Masukkan Nama Jalan"
-                            value="{{ old('jalan_linkungan', isset($forminspeksi['jalan_linkungan']) ? $forminspeksi['jalan_linkungan'] : '') }}">
+                            value="{{ old('jalan_linkungan', isset($forminspeksi['lingkungan']['jalan_linkungan']) ? $forminspeksi['lingkungan']['jalan_linkungan'] : '') }}">
                     </div>
                     <div>
                         <label class="block text-sm font-medium text-gray-700">Jarak ke CBD Point</label>
                         <input type="text" class="input mt-2" name="jarak_cbd_point" placeholder="Km"
-                            value="{{ old('jarak_cbd_point', isset($forminspeksi['jarak_cbd_point']) ? $forminspeksi['jarak_cbd_point'] : '') }}">
+                            value="{{ old('jarak_cbd_point', isset($forminspeksi['lingkungan']['jarak_cbd_point']) ? $forminspeksi['lingkungan']['jarak_cbd_point'] : '') }}">
                     </div>
                     <div>
                         <label class="block text-sm font-medium text-gray-700">Nama CBD Point</label>
                         <input type="text" class="input mt-2" name="nama_cbd_point" placeholder="Km"
-                            value="{{ old('nama_cbd_point', isset($forminspeksi['nama_cbd_point']) ? $forminspeksi['nama_cbd_point'] : '') }}">
+                            value="{{ old('nama_cbd_point', isset($forminspeksi['lingkungan']['nama_cbd_point']) ? $forminspeksi['lingkungan']['nama_cbd_point'] : '') }}">
                     </div>
                 </div>
                 <div class="w-full mt-4">
                     <label class="block text-sm font-medium text-gray-700">Lebar Perkerasan Jalan Depan
                         objek</label>
                     <input type="text" name="lebar_perkerasan_jalan" class="input mt-2" placeholder="Meter"
-                        value="{{ old('lebar_perkerasan_jalan', isset($forminspeksi['lebar_perkerasan_jalan']) ? $forminspeksi['lebar_perkerasan_jalan'] : '') }}">
+                        value="{{ old('lebar_perkerasan_jalan', isset($forminspeksi['lingkungan']['lebar_perkerasan_jalan']) ? $forminspeksi['lingkungan']['lebar_perkerasan_jalan'] : '') }}">
                 </div>
             </div>
 
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Perkerasan Jalan</label>
                 <div class="flex flex-wrap items-baseline w-full">
-                    <div class="flex gap-12">
+                    <div class="flex flex-col items-start gap-4">
                         @if (isset($perkerasanJalan))
                             @foreach ($perkerasanJalan as $item)
                                 <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['perkerasan_jalan']) ? $forminspeksi['perkerasan_jalan'] : []) ? 'checked' : '' }} />
+                                        {{ in_array($item->name, isset($forminspeksi['lingkungan']['perkerasan_jalan']) ? $forminspeksi['lingkungan']['perkerasan_jalan'] : []) ? 'checked' : '' }} />
                                     {{ $item->name }}
                                 </label>
                             @endforeach
@@ -70,7 +70,7 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="lalu_lintas[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ isset($forminspeksi['lalu_lintas']) && in_array($item->name, explode(',', is_array(old('lalu_lintas', $forminspeksi['lalu_lintas'] ?? '')) ? implode(',', old('lalu_lintas', $forminspeksi['lalu_lintas'] ?? '')) : old('lalu_lintas', $forminspeksi['lalu_lintas'] ?? ''))) ? 'checked' : '' }} />
+                                        {{ isset($forminspeksi['lingkungan']['lalu_lintas']) && in_array($item->name, explode(',', is_array(old('lalu_lintas', $forminspeksi['lingkungan']['lalu_lintas'] ?? '')) ? implode(',', old('lalu_lintas', $forminspeksi['lingkungan']['lalu_lintas'] ?? '')) : old('lalu_lintas', $forminspeksi['lingkungan']['lalu_lintas'] ?? ''))) ? 'checked' : '' }} />
 
 
                                     {{ $item->name }}
@@ -91,7 +91,7 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="gol_mas_sekitar[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ isset($forminspeksi['gol_mas_sekitar']) && in_array($item->name, explode(',', is_array(old('gol_mas_sekitar', $forminspeksi['gol_mas_sekitar'] ?? '')) ? implode(',', old('gol_mas_sekitar', $forminspeksi['gol_mas_sekitar'] ?? '')) : old('gol_mas_sekitar', $forminspeksi['gol_mas_sekitar'] ?? ''))) ? 'checked' : '' }} />
+                                        {{ isset($forminspeksi['lingkungan']['gol_mas_sekitar']) && in_array($item->name, explode(',', is_array(old('gol_mas_sekitar', $forminspeksi['lingkungan']['gol_mas_sekitar'] ?? '')) ? implode(',', old('gol_mas_sekitar', $forminspeksi['lingkungan']['gol_mas_sekitar'] ?? '')) : old('gol_mas_sekitar', $forminspeksi['lingkungan']['gol_mas_sekitar'] ?? ''))) ? 'checked' : '' }} />
 
                                     {{ $item->name }}
                                 </label>
@@ -112,7 +112,7 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="tingkat_keramaian[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ isset($forminspeksi['tingkat_keramaian']) && in_array($item->name, explode(',', is_array(old('tingkat_keramaian', $forminspeksi['tingkat_keramaian'] ?? '')) ? implode(',', old('tingkat_keramaian', $forminspeksi['tingkat_keramaian'] ?? '')) : old('tingkat_keramaian', $forminspeksi['tingkat_keramaian'] ?? ''))) ? 'checked' : '' }} />
+                                        {{ isset($forminspeksi['lingkungan']['tingkat_keramaian']) && in_array($item->name, explode(',', is_array(old('tingkat_keramaian', $forminspeksi['lingkungan']['tingkat_keramaian'] ?? '')) ? implode(',', old('tingkat_keramaian', $forminspeksi['lingkungan']['tingkat_keramaian'] ?? '')) : old('tingkat_keramaian', $forminspeksi['lingkungan']['tingkat_keramaian'] ?? ''))) ? 'checked' : '' }} />
 
                                     {{ $item->name }}
                                 </label>
@@ -133,7 +133,7 @@
                                 <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['terletak_diarea']) && in_array($item->name, explode(',', is_array(old('terletak_diarea', $forminspeksi['terletak_diarea'] ?? '')) ? implode(',', old('terletak_diarea', $forminspeksi['terletak_diarea'] ?? '')) : old('terletak_diarea', $forminspeksi['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' : '' }} />
 
                                     {{ $item->name }}
                                 </label>
@@ -150,35 +150,43 @@
                 <div class="flex flex-wrap items-baseline w-full">
                     <div class="flex flex-col gap-2 mt-2">
                         <label class="text-sm flex items-center gap-2.5 text-nowrap">
-                            <input onclick="toggledekatMakam(true)" type="radio" class="radio"
-                                name="dekat_makam" value="ya"
-                                {{ old('dekat_makam', $forminspeksi['dekat_makam'] ?? '') == 'ya' ? 'checked' : '' }} />
+                            <input
+                                onclick="toggleFieldVisibility('disekitar_lokasi', 'disekitar_lokasi_sesuai', ['ya'])"
+                                type="radio" class="radio" name="disekitar_lokasi" value="ya"
+                                {{ old('disekitar_lokasi', $forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya' ? 'checked' : '' }} />
                             <span class="ml-2">Telah ada bangunan</span>
                         </label>
                         <div class="flex w-full items-center gap-4">
 
-                            <div id="dekat-makam" class="grid grid-cols-2 gap-4"
-                                style="{{ old('dekat_makam', $forminspeksi['dekat_makam'] ?? '') == 'ya' ? 'visibility: visible; height: auto;' : 'visibility: hidden; height: 0;' }}">
+                            <div id="disekitar_lokasi_sesuai" class="grid grid-cols-2 gap-4 mt-5 mb-5"
+                                style="display: none;">
                                 <div class="flex items-center gap-2">
                                     <label for="" class="text-sm text-gray-700">Kondisi bangunan</label>
-                                    <input type="text" class="input mt-2" name="jarak_makam"
-                                        value="{{ old('jarak_makam', $forminspeksi['jarak_makam'] ?? '') }}"
-                                        placeholder="Km">
+                                    <select class="select" name="kondisi_bagunan_disekitar_lokasi" id="">
+                                        <option value="">pilih kondisi</option>
+                                        <option value="Cukup">Cukup</option>
+                                        <option value="Baik">Baik</option>
+                                        <option value="Kurang">Kurang</option>
+                                    </select>
                                 </div>
                                 <div class="flex items-center gap-2">
                                     <label for="" class="text-sm text-gray-700">Sifat bangunan</label>
-                                    <input type="text" class="input mt-2" name="nama_makam"
-                                    value="{{ old('nama_makam', $forminspeksi['nama_makam'] ?? '') }}"
-                                    placeholder="Nama TPU">
+                                    <select class="select" name="sifat_bagunan_disekitar_lokasi" id="">
+                                        <option value="">pilih sifat bagunan</option>
+                                        <option value="Permanen">Permanen</option>
+                                        <option value="Semi Permanen">Semi Permanen</option>
+                                        <option value="Tidak Permanen">Tidak Permanen</option>
+                                    </select>
                                 </div>
 
                             </div>
                         </div>
 
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input onclick="toggledekatMakam(false)" type="radio" class="radio"
-                                name="dekat_makam" value="tidak"
-                                {{ old('dekat_makam', $forminspeksi['dekat_makam'] ?? '') == 'tidak' ? 'checked' : '' }} />
+                            <input
+                                onclick="toggleFieldVisibility('disekitar_lokasi', 'disekitar_lokasi_sesuai', ['ya'])"
+                                type="radio" class="radio" name="disekitar_lokasi" value="tidak sesuai"
+                                {{ old('disekitar_lokasi', $forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'tidak sesuai' ? 'checked' : '' }} />
                             <span class="ml-2">Belum ada bangunan</span>
                         </label>
                     </div>
@@ -191,31 +199,37 @@
                 <label class="form-label max-w-56">Dekat Makam</label>
                 <div class="flex flex-wrap items-baseline w-full">
                     <div class="flex flex-col gap-2 mt-2">
+                        <!-- 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="toggledekatMakam(true)" type="radio" class="radio"
-                                    name="dekat_makam" value="ya"
-                                    {{ old('dekat_makam', $forminspeksi['dekat_makam'] ?? '') == 'ya' ? 'checked' : '' }} />
+                                <input onclick="toggleFieldVisibility('dekat_makam', 'dekat-makam', ['ya'])"
+                                    type="radio" class="radio" name="dekat_makam" value="ya"
+                                    {{ old('dekat_makam', $forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'ya' ? 'checked' : '' }} />
                                 <span class="ml-2">Ya</span>
                             </label>
-                            <div id="dekat-makam" class="grid grid-cols-2 gap-4"
-                                style="{{ old('dekat_makam', $forminspeksi['dekat_makam'] ?? '') == 'ya' ? 'visibility: visible; height: auto;' : 'visibility: hidden; height: 0;' }}">
+                            <div id="dekat-makam" class="flex items-baseline gap-4 w-full"
+                                style="{{ old('dekat_makam', $forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'ya' ? 'display:block;' : 'display:none;' }}">
+
                                 <div class="flex items-center gap-2">
-                                    <label for="">Jarak</label>
-                                    <input type="text" class="input mt-2" name="jarak_makam"
-                                        value="{{ old('jarak_makam', $forminspeksi['jarak_makam'] ?? '') }}"
-                                        placeholder="Km">
+                                    <label for="jarak_makam" class="form-label max-w-56">Jarak</label>
+                                    <input type="number" class="input mt-2" name="jarak_makam"
+                                        value="{{ old('jarak_makam', $forminspeksi['lingkungan']['jarak_makam'] ?? '') }}"
+                                        placeholder="Km" />
+                                </div>
+                                <div class="flex items-center gap-2">
+                                    <label for="nama_makam" class="form-label max-w-56">Nama TPU</label>
+                                    <input type="text" class="input mt-2 w-full" name="nama_makam"
+                                        value="{{ old('nama_makam', $forminspeksi['lingkungan']['nama_makam'] ?? '') }}"
+                                        placeholder="Nama TPU" />
                                 </div>
-                                <input type="text" class="input mt-2" name="nama_makam"
-                                    value="{{ old('nama_makam', $forminspeksi['nama_makam'] ?? '') }}"
-                                    placeholder="Nama TPU">
                             </div>
                         </div>
 
+                        <!-- Opsi Tidak -->
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input onclick="toggledekatMakam(false)" type="radio" class="radio"
-                                name="dekat_makam" value="tidak"
-                                {{ old('dekat_makam', $forminspeksi['dekat_makam'] ?? '') == 'tidak' ? 'checked' : '' }} />
+                            <input onclick="toggleFieldVisibility('dekat_makam', 'dekat-makam', ['ya'])"
+                                type="radio" class="radio" name="dekat_makam" value="tidak"
+                                {{ old('dekat_makam', $forminspeksi['lingkungan']['dekat_makam'] ?? '') == 'tidak' ? 'checked' : '' }} />
                             <span class="ml-2">Tidak</span>
                         </label>
                     </div>
@@ -223,36 +237,62 @@
                 </div>
             </div>
 
+
             <!-- Dekat Tps -->
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                <label class="form-label max-w-56">Dekat Tps</label>
+                <label class="form-label max-w-56">Dekat TPS</label>
                 <div class="flex flex-wrap items-baseline w-full">
                     <div class="flex flex-col gap-2 mt-2">
+                        <!-- Opsi Ya -->
                         <div class="flex w-full items-center gap-4">
-                            <label onclick="toggledekatTps(true)"
-                                class="text-sm flex items-center gap-2.5 text-nowrap">
-                                <input type="radio" class="radio" name="dekat_tps" value="ya"
-                                    {{ old('dekat_tps', $forminspeksi['dekat_tps'] ?? '') == 'ya' ? 'checked' : '' }} />
+                            <label class="text-sm flex items-center gap-2.5 text-nowrap">
+                                <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' : '' }}
+                                />
                                 <span class="ml-2">Ya</span>
                             </label>
-                            <div id="dekat-tps" class="grid grid-cols-2 gap-4"
-                                style="{{ old('dekat_tps', $forminspeksi['dekat_tps'] ?? '') == 'ya' ? 'visibility: visible; height: auto;' : 'visibility: hidden; height: 0;' }}">
+                            <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</label>
-                                    <input type="text" class="input mt-2" name="jarak_tps"
-                                        value="{{ old('jarak_tps', $forminspeksi['jarak_tps'] ?? '') }}"
-                                        placeholder="Km">
+                                    <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"
+                                        value="{{ old('jarak_tps', $forminspeksi['lingkungan']['jarak_tps'] ?? '') }}"
+                                        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"
+                                        value="{{ old('nama_tps', $forminspeksi['lingkungan']['nama_tps'] ?? '') }}"
+                                        placeholder="Nama TPS"
+                                    />
                                 </div>
-                                <input type="text" class="input mt-2" name="nama_tps"
-                                    value="{{ old('nama_tps', $forminspeksi['nama_tps'] ?? '') }}"
-                                    placeholder="Nama TPS">
                             </div>
                         </div>
 
+                        <!-- Opsi Tidak -->
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
-                            <input onclick="toggledekatTps(false)" type="radio" class="radio" name="dekat_tps"
+                            <input
+                                onclick="toggleFieldVisibility('dekat_tps', 'dekat-tps', ['ya'])"
+                                type="radio" class="radio"
+                                name="dekat_tps"
                                 value="tidak"
-                                {{ old('dekat_tps', $forminspeksi['dekat_tps'] ?? '') == 'tidak' ? 'checked' : '' }} />
+                                {{ old('dekat_tps', $forminspeksi['lingkungan']['dekat_tps'] ?? '') == 'tidak' ? 'checked' : '' }}
+                            />
                             <span class="ml-2">Tidak</span>
                         </label>
                     </div>
@@ -260,6 +300,7 @@
                 </div>
             </div>
 
+
             <!-- Merupakan daerah -->
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Merupakan daerah</label>
@@ -270,7 +311,7 @@
                                 <label class="form-label flex items-center gap-2.5 text-nowrap">
                                     <input class="checkbox" name="merupakan_daerah[]" type="checkbox"
                                         value="{{ $item->name }}"
-                                        {{ in_array($item->name, isset($forminspeksi['merupakan_daerah']) ? $forminspeksi['merupakan_daerah'] : []) ? 'checked' : '' }} />
+                                        {{ in_array($item->name, isset($forminspeksi['lingkungan']['merupakan_daerah']) ? $forminspeksi['lingkungan']['merupakan_daerah'] : []) ? 'checked' : '' }} />
                                     {{ $item->name }}
                                 </label>
                             @endforeach
@@ -291,14 +332,14 @@
                                 @php
 
                                     $selectedFasilitas = is_array(
-                                        old('fasilitas_dekat_object', $forminspeksi['fasilitas_dekat_object'] ?? []),
+                                        old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? []),
                                     )
-                                        ? old('fasilitas_dekat_object', $forminspeksi['fasilitas_dekat_object'] ?? [])
+                                        ? old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? [])
                                         : explode(
                                             ',',
                                             old(
                                                 'fasilitas_dekat_object',
-                                                $forminspeksi['fasilitas_dekat_object'] ?? '',
+                                                $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? '',
                                             ),
                                         );
                                 @endphp
@@ -307,9 +348,9 @@
                                         value="{{ $item->name }}"
                                         {{ in_array(
                                             $item->name,
-                                            is_array(old('fasilitas_dekat_object', $forminspeksi['fasilitas_dekat_object'] ?? ''))
-                                                ? old('fasilitas_dekat_object', $forminspeksi['fasilitas_dekat_object'] ?? [])
-                                                : explode(',', old('fasilitas_dekat_object', $forminspeksi['fasilitas_dekat_object'] ?? '')),
+                                            is_array(old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? ''))
+                                                ? old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? [])
+                                                : explode(',', old('fasilitas_dekat_object', $forminspeksi['lingkungan']['fasilitas_dekat_object'] ?? '')),
                                         )
                                             ? 'checked'
                                             : '' }} />
@@ -327,40 +368,3 @@
     </div>
 </div>
 
-
-@push('scripts')
-    <script>
-        function toggledekatMakam(value) {
-            const selectElement = document.getElementById('dekat-makam');
-            if (value) {
-                selectElement.style.visibility = 'visible';
-                selectElement.style.height = 'auto';
-            } else {
-                selectElement.style.visibility = 'hidden';
-                selectElement.style.height = '0';
-            }
-        }
-
-        function toggledekatTps(value) {
-            const selectElement = document.getElementById('dekat-tps');
-            if (value) {
-                selectElement.style.visibility = 'visible';
-                selectElement.style.height = 'auto';
-            } else {
-                selectElement.style.visibility = 'hidden';
-                selectElement.style.height = '0';
-            }
-        }
-
-        function toggledisekitarLokasi(value) {
-            const selectElement = document.getElementById('disekitarLokasi');
-            if (value) {
-                selectElement.style.visibility = 'visible';
-                selectElement.style.height = 'auto';
-            } else {
-                selectElement.style.visibility = 'hidden';
-                selectElement.style.height = '0';
-            }
-        }
-    </script>
-@endpush
diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php
index 324f94e..63d76d7 100644
--- a/resources/views/surveyor/components/tanah.blade.php
+++ b/resources/views/surveyor/components/tanah.blade.php
@@ -26,20 +26,23 @@
                             <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="luas_tanah" value="sesuai"
-                                        onclick="toggleTidakSesuai('luas_tanah', 'luas_tanah_tidak_sesuai')"
-                                        {{ old('luas_tanah', $forminspeksi['luas_tanah'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                        onclick="toggleFieldVisibility('luas_tanah', 'luas_tanah_tidak_sesuai', ['tidak sesuai'])"
+                                        {{ old('luas_tanah', $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="toggleTidakSesuai('luas_tanah', 'luas_tanah_tidak_sesuai')"
-                                        {{ old('luas_tanah', $forminspeksi['luas_tanah'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                        onclick="toggleFieldVisibility('luas_tanah', 'luas_tanah_tidak_sesuai', ['tidak sesuai'])"
+                                        {{ old('luas_tanah', $forminspeksi['tanah']['luas_tanah'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
                                     <span class="ml-2">Tidak Sesuai</span>
                                 </label>
-                                <input type="text" name="luas_tanah_tidak_sesuai" id="luas_tanah_tidak_sesuai"
-                                    class="input w-full" placeholder="Masukan Luas Tanah"
-                                    value="{{ old('luas_tanah_tidak_sesuai', $forminspeksi['luas_tanah_tidak_sesuai'] ?? '') }}"
-                                    style="{{ old('luas_tanah', $forminspeksi['luas_tanah'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
+                                <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 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">Save</button>
+                                </div>
                             </div>
                             <em id="error-luas_tanah" class="alert text-danger text-sm"></em>
                         </div>
@@ -54,33 +57,36 @@
                     <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="toggleTidakSesuai('hadap_mata_angin', 'hadap_mata_angin_tidak_sesuai')"
-                                {{ old('hadap_mata_angin', $forminspeksi['hadap_mata_angin'] ?? '') == 'sesuai' ? 'checked' : '' }}>
+                                onclick="toggleFieldVisibility('hadap_mata_angin', 'hadap_mata_angin_tidak_sesuai' ,['tidak sesuai'])"
+                                {{ old('hadap_mata_angin', $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"
-                                onclick="toggleTidakSesuai('hadap_mata_angin', 'hadap_mata_angin_tidak_sesuai')"
-                                {{ old('hadap_mata_angin', $forminspeksi['hadap_mata_angin'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
+                                onclick="toggleFieldVisibility('hadap_mata_angin', 'hadap_mata_angin_tidak_sesuai' ,['tidak sesuai'])"
+                                {{ old('hadap_mata_angin', $forminspeksi['tanah']['hadap_mata_angin'] ?? '') == 'tidak sesuai' ? 'checked' : '' }}>
                             <span class="ml-2">Tidak Sesuai</span>
                         </label>
 
                         <!-- Select dropdown untuk "Tidak Sesuai" -->
-                        <select id="hadap_mata_angin_tidak_sesuai"
-                            class="input w-full @error('hadap_mata_angin_tidak_sesuai') border-danger bg-danger-light @enderror"
-                            name="hadap_mata_angin_tidak_sesuai"
-                            style="{{ old('hadap_mata_angin', $forminspeksi['hadap_mata_angin'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
-                            <option value="">Select Hadap Mata Angin</option>
-                            @if (isset($arahMataAngin))
-                                @foreach ($arahMataAngin as $item)
-                                    <option value="{{ $item->name }}"
-                                        {{ old('hadap_mata_angin_tidak_sesuai', $forminspeksi['hadap_mata_angin_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
-                                        {{ $item->name }}
-                                    </option>
-                                @endforeach
-                            @endif
-                        </select>
+                        <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
+                            name="hadap_mata_angin_tidak_sesuai">
+                                <option value="">Select Hadap Mata Angin</option>
+                                @if (isset($arahMataAngin))
+                                    @foreach ($arahMataAngin as $item)
+                                        <option value="{{ $item->name }}"
+                                            {{ old('hadap_mata_angin_tidak_sesuai', $forminspeksi['tanah']['hadap_mata_angin_tidak_sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
+                                            {{ $item->name }}
+                                        </option>
+                                    @endforeach
+                                @endif
+                            </select>
+                            <button type="button" class="btn btn-md btn-primary">Save</button>
+                        </div>
                     </div>
                     <em id="error-hadap_mata_angin" class="alert text-danger text-sm"></em>
                 </div>
@@ -88,34 +94,44 @@
 
 
             <!-- Bentuk Tanah -->
+
             <div class="flex items-stretch flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Bentuk Tanah</label>
                 <div class="flex-wrap items-stretch">
                     <div class="flex flex-col items-start gap-4">
                         @if (isset($bentukTanah))
                             @foreach ($bentukTanah as $item)
-                                @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="bentuk_tanah[]" type="checkbox"
-                                                value="{{ $item->name }}"
-                                                {{ in_array($item->name, old('bentuk_tanah', [])) || (isset($forminspeksi['bentuk_tanah']) && in_array($item->name, $forminspeksi['bentuk_tanah'])) ? 'checked' : '' }}
-                                                onclick="toggleTidakSesuai('bentuk_tanah', 'bentuk_tanah_lainnya')" />
-                                            {{ $item->name }}
-                                        </label>
-                                        <input id="bentuk_tanah_lainnya" type="text" name="bentuk_tanah_lainnya"
-                                            class="input w-full mt-2" placeholder="Masukkan bentuk tanah..."
-                                            onclick="toggleTidakSesuai('bentuk_tanah', 'bentuk_tanah_lainnya')">
-                                    </div>
-                                @else
+                                <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['bentuk_tanah']) && in_array($item->name, $forminspeksi['bentuk_tanah'])) ? 'checked' : '' }}
-                                            onclick="toggleTidakSesuai('bentuk_tanah', 'bentuk_tanah_lainnya')" />
+                                            {{
+                                                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']))
+                                                ? 'checked'
+                                                : ''
+                                            }}
+                                            onclick="toggleCheckboxVisibility('bentuk_tanah', 'bentuk_tanah_lainnya', ['lainnya'])"
+                                        />
                                         {{ $item->name }}
                                     </label>
-                                @endif
+                                    @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"
+                                            placeholder="Masukkan bentuk tanah..."
+                                            value="{{ old('bentuk_tanah_lainnya', $forminspeksi['tanah']['bentuk_tanah_lainnya'] ?? '') }}"
+                                        />
+                                    @endif
+                                </div>
                             @endforeach
                         @endif
                     </div>
@@ -123,19 +139,27 @@
                 </div>
             </div>
 
-
-
             <div class="flex items-stretch flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Kontur Tanah</label>
                 <div class="flex-wrap items-stretch">
-
                     <div class="flex flex-col items-start gap-4">
                         @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"
-                                    value="{{ $item->name }}"
-                                    {{ in_array($item->name, old('kontur_tanah', isset($forminspeksi['kontur_tanah']) ? $forminspeksi['kontur_tanah'] : [])) ? 'checked' : '' }} />
+                                    <input
+                                        class="checkbox"
+                                        name="kontur_tanah[]"
+                                        type="checkbox"
+                                        value="{{ $item->name }}"
+                                        {{
+                                            in_array(
+                                                $item->name,
+                                                old('kontur_tanah', $forminspeksi['tanah']['kontur_tanah'] ?? [])
+                                            )
+                                            ? 'checked'
+                                            : ''
+                                        }}
+                                    />
                                     {{ $item->name }}
                                 </label>
                             @endforeach
@@ -146,22 +170,34 @@
             </div>
 
 
-
             <!-- Beda Ketinggian Dengan Jalan -->
             <div class="flex items-stretch flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Beda Ketinggian Dengan Jalan</label>
                 <div class="flex-wrap items-stretch">
-
-
                     <div class="flex flex-col items-start gap-4">
                         @if (isset($ketinggianTanah))
                             @foreach ($ketinggianTanah as $item)
-                                <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                    <input class="checkbox" name="ketinggian_jalan[]" type="checkbox"
-                                        value="{{ $item->name }}"
-                                        {{ in_array($item->name, old('ketinggian_jalan', $forminspeksi['ketinggian_jalan'] ?? [])) ? 'checked' : '' }} />
-                                    {{ $item->name }}
-                                </label>
+                                <div class="flex flex-col gap-2">
+                                    <label class="form-label flex items-center gap-2.5 text-nowrap">
+                                        <input class="checkbox" name="ketinggian_jalan[]" type="checkbox"
+                                            value="{{ $item->name }}"
+                                            {{ in_array($item->name, old('ketinggian_jalan', $forminspeksi['tanah']['ketinggian_jalan'] ?? [])) ? 'checked' : '' }}
+                                            onclick="toggleMultipleFields('ketinggian_jalan', {
+                                                'Lebih Tinggi': 'input-lebih-tinggi',
+                                                'Lebih Rendah': 'input-lebih-rendah'
+                                            })" />
+                                        {{ $item->name }}
+                                    </label>
+                                    @if (strcasecmp($item->name, 'Lebih Tinggi') == 0)
+                                        <input id="input-lebih-tinggi" type="text" style="display: none;"
+                                            name="ketinggian_lebih_tinggi" class="input w-full mt-2"
+                                            placeholder="m2" />
+                                    @elseif (strcasecmp($item->name, 'Lebih Rendah') == 0)
+                                        <input id="input-lebih-rendah" type="text" style="display: none;"
+                                            name="ketinggian_lebih_rendah" class="input w-full mt-2"
+                                            placeholder="m2" />
+                                    @endif
+                                </div>
                             @endforeach
                         @endif
                     </div>
@@ -170,6 +206,8 @@
             </div>
 
 
+
+
             <!-- Kontur Jalan Depan Objek -->
             <div class="flex items-stretch flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Kontur Jalan Depan Objek</label>
@@ -177,12 +215,12 @@
                     <div class="grid grid-cols-2 md:grid-cols-3 gap-4">
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
                             <input type="radio" class="radio" name="kontur_jalan" value="menurun"
-                                {{ old('kontur_jalan', $forminspeksi['kontur_jalan'] ?? '') == 'menurun' ? 'checked' : '' }}>
+                                {{ old('kontur_jalan', $forminspeksi['tanah']['kontur_jalan'] ?? '') == 'menurun' ? 'checked' : '' }}>
                             <span class="ml-2">Menurun</span>
                         </label>
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
                             <input type="radio" class="radio" name="kontur_jalan" value="rata"
-                                {{ old('kontur_jalan', $forminspeksi['kontur_jalan'] ?? '') == 'rata' ? 'checked' : '' }}>
+                                {{ old('kontur_jalan', $forminspeksi['tanah']['kontur_jalan'] ?? '') == 'rata' ? 'checked' : '' }}>
                             <span class="ml-2">Rata</span>
                         </label>
                     </div>
@@ -190,29 +228,36 @@
                 </div>
             </div>
 
+
             <div class="flex items-stretch flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Posisi Kavling</label>
                 <div class="flex-wrap items-stretch">
                     <div class="flex flex-col items-start gap-4">
                         @if (isset($posisiKavling))
                             @foreach ($posisiKavling as $item)
-                                <label class="form-label flex items-center gap-2.5 text-nowrap">
-                                    <input class="checkbox" name="posisi_kavling[]" type="checkbox"
-                                        value="{{ $item->name }}"
-                                        {{ in_array($item->name, old('posisi_kavling', [])) || (isset($forminspeksi['posisi_kavling']) && in_array($item->name, $forminspeksi['posisi_kavling'])) ? 'checked' : '' }} />
-                                    {{ $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="posisi_kavling[]" type="checkbox"
-                                                value="{{ $item->name }}" />
-                                            {{ $item->name }}
-                                        </label>
-                                        <input type="text" name="posisi_kavling_lainnya" class="input mt-2"
-                                            id="bentukTanahInput" placeholder="Masukkan Posisi Kavling">
-                                    </div>
-                                @endif
+                            <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"
+                                            value="{{ $item->name }}"
+                                            {{ in_array($item->name, old('posisi_kavling', $forminspeksi['tanah']['posisi_kavling'] ?? [])) ? 'checked' : '' }}
+                                            onclick="toggleCheckboxVisibility('posisi_kavling', 'posisi_kavling_lainnya', ['Lainnya'])"
+                                        />
+                                        {{ $item->name }}
+                                    </label>
+                                    @if (strcasecmp($item->name, 'Lainnya') == 0)
+                                        <input
+                                            id="posisi_kavling_lainnya"
+                                            type="text"
+                                            style="display: none;"
+                                            name="posisi_kavling_lainnya"
+                                            class="input w-full mt-2"
+                                            placeholder="Masukkan Posisi Kavling lainnya..."
+                                        />
+                                    @endif
+                                </div>
                             @endforeach
                         @endif
                     </div>
@@ -228,12 +273,12 @@
                     <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
                             <input type="radio" class="radio" name="tusuk_sate" value="yes"
-                                {{ old('tusuk_sate') == 'yes' || (isset($forminspeksi['tusuk_sate']) && $forminspeksi['tusuk_sate'] == 'yes') ? 'checked' : '' }}>
+                                {{ old('tusuk_sate') == 'yes' || (isset($forminspeksi['tanah']['tusuk_sate']) && $forminspeksi['tanah']['tusuk_sate'] == 'yes') ? 'checked' : '' }}>
                             <span class="ml-2">Ya</span>
                         </label>
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
                             <input type="radio" class="radio" name="tusuk_sate" value="no"
-                                {{ old('tusuk_sate') == 'no' || (isset($forminspeksi['tusuk_sate']) && $forminspeksi['tusuk_sate'] == 'no') ? 'checked' : '' }}>
+                                {{ old('tusuk_sate') == 'no' || (isset($forminspeksi['tanah']['tusuk_sate']) && $forminspeksi['tanah']['tusuk_sate'] == 'no') ? 'checked' : '' }}>
                             <span class="ml-2">Tidak</span>
                         </label>
                     </div>
@@ -248,12 +293,12 @@
                     <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
                             <input type="radio" class="radio" name="lockland" value="yes"
-                                {{ old('lockland') == 'yes' || (isset($forminspeksi['lockland']) && $forminspeksi['lockland'] == 'yes') ? 'checked' : '' }}>
+                                {{ old('lockland') == 'yes' || (isset($forminspeksi['tanah']['lockland']) && $forminspeksi['tanah']['lockland'] == 'yes') ? 'checked' : '' }}>
                             <span class="ml-2">Ya</span>
                         </label>
                         <label class="form-label flex items-center gap-2.5 text-nowrap">
                             <input type="radio" class="radio" name="lockland" value="no"
-                                {{ old('lockland') == 'no' || (isset($forminspeksi['lockland']) && $forminspeksi['lockland'] == 'no') ? 'checked' : '' }}>
+                                {{ old('lockland') == 'no' || (isset($forminspeksi['tanah']['lockland']) && $forminspeksi['tanah']['lockland'] == 'no') ? 'checked' : '' }}>
                             <span class="ml-2">Tidak</span>
                         </label>
                     </div>
@@ -262,7 +307,6 @@
             </div>
 
             <!-- Kondisi Fisik Tanah -->
-
             <div class="flex items-stretch flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Kondisi Fisik Tanah</label>
                 <div class="flex-wrap items-stretch">
@@ -272,7 +316,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['kondisi_fisik_tanah']) && in_array($item->name, $forminspeksi['kondisi_fisik_tanah'])) ? 'checked' : '' }}
+                                        {{ in_array($item->name, old('kondisi_fisik_tanah', [])) || (isset($forminspeksi['tanah']['kondisi_fisik_tanah']) && in_array($item->name, $forminspeksi['tanah']['kondisi_fisik_tanah'])) ? 'checked' : '' }}
                                         onclick="toggleInputLainnya(this, 'kondisi_fisik_tanah_lainnya', '{{ $item->name }}')" />
                                     {{ $item->name }}
                                 </label>
@@ -295,54 +339,3 @@
         </div>
     </div>
 </div>
-
-
-@push('scripts')
-    <script>
-        function handleSelectionChange() {
-            const select = document.getElementById('bentukTanahSelect');
-            const input = document.getElementById('bentukTanahInput');
-
-            if (select.value === 'lainnya') {
-                input.style.display = 'block';
-                input.value = ''; // Kosongkan input
-                input.focus(); // Fokus pada input
-            } else {
-                input.style.display = 'none';
-                input.value = select.value; // Isi input dengan nilai yang dipilih
-            }
-        }
-
-
-
-
-        function toggleJenisAsset(params) {
-            const inputData = document.querySelector(`input[name="${params}"]:checked`);
-            const luasTanah = document.getElementById('jenis_asset');
-
-            if (inputData && inputData.value === 'tidak sesuai') {
-                luasTanah.style.display = 'block';
-            } else {
-                luasTanah.style.display = 'none';
-            }
-        }
-
-
-        function toggleAlamat(params) {
-            const inputData = document.querySelector(`input[name="${params}"]:checked`);
-            const luasTanah = document.getElementById('alamat');
-
-            if (inputData && inputData.value === 'tidak sesuai') {
-                luasTanah.style.display = 'block';
-            } else {
-                luasTanah.style.display = 'none';
-            }
-        }
-
-
-        function toggleTidakSesuaiHadap(showSelect) {
-            const selectElement = document.getElementById('selectTidakSesuai');
-            selectElement.style.display = showSelect ? 'block' : 'none';
-        }
-    </script>
-@endpush