diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index c42bd71..587dec6 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -289,5 +289,10 @@
     {
         return Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
             $query->where('user_id', $userId);
-        })->count();
+        })
+        ->whereHas('permohonan', function ($query) {
+            $query->where('status', 'assign');
+        })
+        ->count();
+
     }
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index f1d79d8..d1df552 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -250,6 +250,8 @@ class ActivityController extends Controller
         ])
         ->whereHas('userPenilai', function ($q) use ($id) {
             $q->where('user_id', $id);
+        })->whereHas('permohonan', function ($q) {
+            $q->where('status', 'assign');
         });
 
 
diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 968d631..84fc00b 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -54,6 +54,25 @@ class PenilaiController extends Controller
         //
     }
 
+    public function sederhana()
+    {
+        return view('lpj::laporan.sederhana_index');
+    }
+
+    public function standard()
+    {
+        return view('lpj::laporan.standard_index');
+    }
+
+    public function resume(){
+        return view('lpj::resume.index');
+    }
+
+    public function memo(){
+        return view('lpj::resume.index');
+     }
+
+
     /**
      * Show the specified resource.
      */
diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 3142aa8..32aca66 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -12,12 +12,16 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Http\Response;
+use Modules\Lpj\Models\Debiture;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Branch;
 use Modules\Lpj\Models\Surveyor;
 use Modules\Lpj\Models\BentukTanah;
 use Modules\Lpj\Models\KonturTanah;
 use Modules\Location\Models\Province;
+use Modules\Location\Models\City;
+use Modules\Location\Models\District;
+use Modules\Location\Models\Village;
 use Modules\Lpj\Models\PosisiKavling;
 use Modules\Lpj\Models\KondisiFisikTanah;
 use Modules\Lpj\Models\KetinggianTanah;
@@ -709,10 +713,14 @@ class SurveyorController extends Controller
 
         $branches  = Branch::all();
         $provinces = Province::all();
+        $debitur         = Debiture::find($permohonan->debiture_id);
+        $cities          = City::where('province_code', $debitur->province_code)->get();
+        $districts       = District::where('city_code', $debitur->city_code)->get();
+        $villages        = Village::where('district_code', $debitur->district_code)->get();
 
         $surveyor = $id;
         $branches  = Branch::all();
-        $provinces = Province::all();
+
         $bentukTanah = BentukTanah::all();
         $konturTanah = KonturTanah::all();
         $posisiKavling = PosisiKavling::all();
@@ -755,6 +763,10 @@ class SurveyorController extends Controller
             'surveyor',
             'branches',
             'provinces',
+            'debitur',
+            'cities',
+            'districts',
+            'villages',
             'bentukTanah',
             'konturTanah',
             'posisiKavling',
@@ -1460,11 +1472,11 @@ class SurveyorController extends Controller
     private function getAssetData(array $data): array
     {
         $alamatData = [
-            'nama_jalan' => $data['nama_jalan'] ?? null,
-            'desa_kelurahan' => $data['desa_kelurahan'] ?? null,
-            'kecamatan' => $data['kecamatan'] ?? null,
-            'kota_kabupaten' => $data['kota_kabupaten'] ?? null,
-            'provinsi' => $data['provinsi'] ?? null,
+            'address' => $data['address'] ?? null,
+            'village_code' => $data['village_code'] ?? null,
+            'district_code' => $data['district_code'] ?? null,
+            'city_code' => $data['city_code'] ?? null,
+            'province_code' => $data['province_code'] ?? null,
         ];
 
         return [
diff --git a/app/Http/Requests/FormSurveyorRequest.php b/app/Http/Requests/FormSurveyorRequest.php
index 25f32c2..9bf82e3 100644
--- a/app/Http/Requests/FormSurveyorRequest.php
+++ b/app/Http/Requests/FormSurveyorRequest.php
@@ -528,11 +528,11 @@ class FormSurveyorRequest extends FormRequest
             'hub_cadeb_penghuni_sesuai' => 'nullable',
             'hub_cadeb_penghuni_tidak_sesuai' => 'nullable',
 
-            'nama_jalan' => 'nullable',
-            'desa_kelurahan' => 'nullable',
-            'kecamatan' => 'nullable',
-            'kota_kabupaten' => 'nullable',
-            'provinsi' => 'nullable',
+            'address' => 'nullable',
+            'village_code' => 'nullable',
+            'district_code' => 'nullable',
+            'city_code' => 'nullable',
+            'province_code' => 'nullable',
             'kordinat_lng' => 'nullable',
             'kordinat_lat' => 'nullable',
         ];
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index 7648592..a3f02c5 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -32,11 +32,6 @@ class Penilaian extends Model
         return $this->belongsTo(Teams::class, 'teams_id', 'id');
     }
 
-    public function users()
-    {
-        return $this->belongsTo(User::class, 'user_id', 'id');
-    }
-
     public function userPenilai()
     {
         return $this->hasMany(PenilaianTeam::class, 'penilaian_id', 'id');
diff --git a/app/Models/TeamsUsers.php b/app/Models/TeamsUsers.php
index b94df81..1eca705 100644
--- a/app/Models/TeamsUsers.php
+++ b/app/Models/TeamsUsers.php
@@ -32,9 +32,9 @@ class TeamsUsers extends Model
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-    public function penilaian()
+    public function penilaianTeam()
     {
-        return $this->belongsTo(Penilaian::class, 'teams_id', 'id');
+        return $this->belongsTo(PenilaianTeam::class, 'team_id', 'id');
     }
 
 }
diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php
index 29cbb0a..116c354 100644
--- a/resources/views/activity/progres_activity/index.blade.php
+++ b/resources/views/activity/progres_activity/index.blade.php
@@ -49,11 +49,11 @@
             <div data-accordion="true">
 
                 @php
-
                     $sortedTeamsActivity = $teamsActivity->sortBy(function ($item) {
                         return $item->team->regions->penilaiTeam
-                            ->filter(function ($penilaiTeam) use ($item) {
-                                return $penilaiTeam->user_id == $item->user->id;
+                            ->filter(function ($penilaiTeam) {
+                                $permohonan = optional($penilaiTeam->penilaian)->permohonan;
+                                return $permohonan !== null;
                             })
                             ->count();
                     });
diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php
index 59fdfa7..2fd7be2 100644
--- a/resources/views/penilai/lampiran.blade.php
+++ b/resources/views/penilai/lampiran.blade.php
@@ -155,12 +155,12 @@
                         <div class="flex items-center justify-between mt-5">
                             <div class="grid gap-5">
                                 <h2 class=" font-semibold text-xl">
-                                    {{ $item['nama_objek'] }}
+                                    {{ $item['name_objek'] }}
                                 </h2>
                                 <div class="flex items-center">
 
 
-                                    <img src="{{ Storage::url($item['foto_object']) }}" alt="">
+                                    <img src="{{ Storage::url($item['foto_objek']) }}" alt="">
 
                                 </div>
                             </div>
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index f88589f..4f5a6cf 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -22,13 +22,15 @@
                         Nomor Registrasi
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->nomor_registrasi }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->nomor_registrasi) ? $permohonan->nomor_registrasi : '' }}</p>
                     </div>
                     <label class="form-label max-w-56">
                         Nama Debitur
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->debiture->name }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->debiture->name) ? $permohonan->debiture->name : '' }}</p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -36,16 +38,16 @@
                         Cabang
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->branch->name }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->branch->name) ? $permohonan->branch->name : '' }}</p>
                     </div>
                     <label class="form-label max-w-56">
                         Alamat Jaminan
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->debiture->address }}, Kel.
-                            {{ $permohonan->debiture->village->name }}, Kec. {{ $permohonan->debiture->district->name }},
-                            {{ ucwords(strtolower($permohonan->debiture->city->name)) }}, Kode Pos.
-                            {{ $permohonan->debiture->postal_code }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ formatAlamat($permohonan->debiture) }}
+                        </p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -53,14 +55,16 @@
                         Nama AO/Pemohon
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->user->name }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->user->name) ? $permohonan->user->name : '' }}</p>
                     </div>
                     <label class="form-label max-w-56">
                         Fasilitas Kredit
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $permohonan->jenisFasilitasKredit->name }}</p>
+                            {{ isset($permohonan->jenisFasilitasKredit->name) ? $permohonan->jenisFasilitasKredit->name : '' }}
+                        </p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -76,7 +80,7 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $permohonan->debiture->cif }}</p>
+                            {{ isset($permohonan->debiture->cif) ? $permohonan->debiture->cif : '' }}</p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -91,173 +95,179 @@
 
             </div>
         </div>
-        @foreach ($permohonan->debiture->documents as $dokumen)
-            <div class="card">
-                <div class="card-body grid gap-5">
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        @php
-                            $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
-                            $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
 
-                        @endphp
-                        <label class="form-label max-w-56">
-                            Surveyor
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">{{ $surveyor->userPenilaiTeam->name }}
-                            </p>
+            @foreach ($permohonan->debiture->documents as $dokumen)
+                <div class="card">
+                    <div class="card-body grid gap-5">
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            @php
+                                $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
+                                $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}</p>
+                            @endphp
+                            <label class="form-label max-w-56">
+                                Surveyor
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $surveyor->userPenilaiTeam->name }}
+                                </p>
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}
+                                </p>
+                            </div>
+                            <label class="form-label max-w-56">
+                                Penilai
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $penilai->userPenilaiTeam->name }}
+                                </p>
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $permohonan->region->name }}
+                                </p>
+                            </div>
                         </div>
-                        <label class="form-label max-w-56">
-                            Penilai
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-
-                            <p class="flex w-full text-gray-600 font-medium text-sm">{{ $penilai->userPenilaiTeam->name }}
-                            </p>
-
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ $permohonan->region->name }}
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tujuan Penilaian
+                            </label>
+                            <p class="flex text-gray-600 font-medium text-sm w-full">
+                                {{ $permohonan->tujuanPenilaian->name }}</p>
+                            <label class="form-label max-w-56">
+                                Jenis Jaminan
+                            </label>
+                            <p class="flex text-gray-600 font-medium text-sm w-full">
+                                @foreach ($permohonan->debiture->documents as $document)
+                                    {{ $document->jenisjaminan->name }}
+                                @endforeach
                             </p>
                         </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Tujuan Penilaian
-                        </label>
-                        <p class="flex text-gray-600 font-medium text-sm w-full">
-                            {{ $permohonan->tujuanPenilaian->name }}</p>
-                        <label class="form-label max-w-56">
-                            Jenis Jaminan
-                        </label>
-                        <p class="flex text-gray-600 font-medium text-sm w-full">
-                            @foreach ($permohonan->debiture->documents as $document)
-                                {{ $document->jenisjaminan->name }}
-                            @endforeach
-                        </p>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Tanggal Survei
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tanggal Survei
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                            </div>
                         </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Tanggal Laporan
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tanggal Laporan
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                            </div>
                         </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            No. Laporan
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                PJ/001/001</p>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                No. Laporan
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                </p>
+                            </div>
                         </div>
+
+
                     </div>
 
 
-                </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full  card-footer mt-2 ">
+                        <div class="flex  gap-5">
+                            <a class="btn btn-primary" href="{{ route('penilai.lampiran', $permohonan->id) }}">
+                                LAMPIRAN FOTO DAN DOKUMEN
+                            </a>
 
+                            <a class="btn btn-primary" data-modal-toggle="#modal_2">
+                                KERTAS KERJA
+                            </a>
+                            <a class="btn btn-primary" href="#">
+                                PAPARAN
+                            </a>
 
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full  card-footer mt-2 ">
-                    <div class="flex  gap-5">
-                        <a class="btn btn-primary" href="{{ route('penilai.lampiran', $permohonan->id) }}">
-                            LAMPIRAN FOTO DAN DOKUMEN
-                        </a>
+                            <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
+                                <button class="dropdown-toggle btn btn-primary">
+                                    WORKSHEET
+                                </button>
+                                <div class="dropdown-content w-full max-w-56 py-2">
+                                    <div class="menu menu-default flex flex-col w-full">
+                                        <div class="menu-item">
+                                            <a class="menu-link" href="{{ route('penilai.memo', $permohonan->id) }}">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-badge">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    MEMO
+                                                </span>
+                                            </a>
+                                        </div>
+                                        <div class="menu-item">
+                                            <a class="menu-link" href="{{ route('penilai.resume', $permohonan->id) }}">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-profile-circle">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    RESUME
+                                                </span>
+                                            </a>
+                                        </div>
+                                        <div class="menu-item">
+                                            <a class="menu-link" onclick="seletSederhanaStandart()">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-setting-2">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    LPJ
+                                                </span>
 
-                        <a class="btn btn-primary" data-modal-toggle="#modal_2">
-                            KERTAS KERJA
-                        </a>
-                        <a class="btn btn-primary" href="#">
-                            PAPARAN
-                        </a>
-
-                        <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
-                            <button class="dropdown-toggle btn btn-primary">
-                                WORKSHEET
-                            </button>
-                            <div class="dropdown-content w-full max-w-56 py-2">
-                                <div class="menu menu-default flex flex-col w-full">
-                                    <div class="menu-item">
-                                        <a class="menu-link" href="#">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-badge">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                MEMO
-                                            </span>
-                                        </a>
-                                    </div>
-                                    <div class="menu-item">
-                                        <a class="menu-link" href="#">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-profile-circle">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                RESUME
-                                            </span>
-                                        </a>
-                                    </div>
-                                    <div class="menu-item">
-                                        <a class="menu-link" onclick="seletSederhanaStandart()">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-setting-2">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                LPJ
-                                            </span>
-
-                                        </a>
-                                    </div>
-                                    <div class="menu-item">
-                                        <a class="menu-link" href="#">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-message-programming">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                RAP
-                                            </span>
-                                        </a>
+                                            </a>
+                                        </div>
+                                        <div class="menu-item">
+                                            <a class="menu-link" href="#">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-message-programming">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    RAP
+                                                </span>
+                                            </a>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
 
-                    <div class="flex justify-end gap-5">
-                        <a class="btn btn-success" href="#">
-                            SAVE
-                        </a>
+                        <div class="flex justify-end gap-5">
+                            <a class="btn btn-success" href="#">
+                                SAVE
+                            </a>
 
-                        <a class="btn btn-success" href="#">
-                            REPORT
-                        </a>
+                            <a class="btn btn-success" href="#">
+                                REPORT
+                            </a>
 
 
-                        <a class="btn btn-success" href="#">
-                            PRINT OUT
-                        </a>
+                            <a class="btn btn-success" href="#">
+                                PRINT OUT
+                            </a>
+                        </div>
+
                     </div>
 
                 </div>
+            @endforeach
 
-            </div>
-        @endforeach
     </div>
 
 
@@ -308,9 +318,9 @@
             denyButtonText: 'No',
         }).then((result) => {
             if (result.isConfirmed) {
-                
+                window.location.href = "{{ route('penilai.standard', $permohonan->id) }}";
             } else if (result.isDenied) {
-                Swal.fire('Changes are not saved', '', 'info')
+                window.location.href = "{{ route('penilai.sederhana', $permohonan->id) }}";
             }
         })
     }
diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php
index 046e426..1b1571d 100644
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/resources/views/surveyor/components/data-pembanding.blade.php
@@ -65,11 +65,8 @@
                                                         src="{{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? asset('storage/' . $fotoForm['object_jaminan'][0]['foto_objek']) : '' }}"
                                                         class="max-w-[200px] {{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? '' : 'hidden' }}"
                                                         alt="Uploaded Image">
-                                                    <input type="file"
-                                                        name="foto_objek"
-                                                        class="file-input"
-                                                        accept="image/*"
-                                                        onchange="previewImage(this, 'uploadedImage1')">
+                                                    <input type="file" name="foto_objek" class="file-input"
+                                                        accept="image/*" onchange="previewImage(this, 'uploadedImage1')">
                                                 </div>
                                             </td>
 
@@ -95,7 +92,9 @@
                                                 <select name="jenis_aset" class="select">
                                                     <option value="">Pilih Jenis Aset</option>
                                                     @foreach ($data['jenisJaminan'] as $item)
-                                                    <option value="{{ $item->name }}" {{ ($inspectionData['asset']['jenis_asset']['sesuai'] ?? '') == $item->name ? 'selected' : '' }}>{{ $item->name }}</option>
+                                                        <option value="{{ $item->name }}"
+                                                            {{ ($inspectionData['asset']['jenis_asset']['sesuai'] ?? '') == $item->name ? 'selected' : '' }}>
+                                                            {{ $item->name }}</option>
                                                     @endforeach
 
                                                 </select>
@@ -104,7 +103,9 @@
                                                 <select name="jenis_aset_pembanding[]" class="select">
                                                     <option value="">Pilih Jenis Aset</option>
                                                     @foreach ($data['jenisJaminan'] as $item)
-                                                    <option value="{{ $item->name }}" {{ ($inspectionData['jenis_aset'] ?? '') == $item->name ? 'selected' : '' }}>{{ $item->name }}</option>
+                                                        <option value="{{ $item->name }}"
+                                                            {{ ($inspectionData['jenis_aset'] ?? '') == $item->name ? 'selected' : '' }}>
+                                                            {{ $item->name }}</option>
                                                     @endforeach
                                                 </select>
                                             </td>
@@ -375,7 +376,8 @@
         document.addEventListener('DOMContentLoaded', function() {
             try {
                 const inspectionData = {!! isset($inspectionData) ? json_encode($inspectionData) : 'null' !!};
-                const comparisons = {!! isset($comparisons) ? json_encode($comparisons) : '' !!};
+                const comparisons = {!! isset($comparisons) ? json_encode($comparisons) : 'null' !!};
+
 
                 console.log('Inspection Data:', inspectionData); // Debug
                 console.log('Comparisons:', comparisons); // Debug
diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php
index 1d714fd..b531821 100644
--- a/resources/views/surveyor/components/foto.blade.php
+++ b/resources/views/surveyor/components/foto.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('content')
-@include('lpj::assetsku.includenya')
+    @include('lpj::assetsku.includenya')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
         <div class="card min-w-full">
             <div class="card min-w-full">
@@ -14,8 +14,7 @@
                         Data Jaminan
                     </h3>
                     <div class="flex items-center gap-2">
-                        <a href="{{ route('surveyor.show', ['id' => request('foto')]) }}"
-                            class="btn btn-xs btn-info">
+                        <a href="{{ route('surveyor.show', ['id' => request('foto')]) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
                     </div>
@@ -334,32 +333,35 @@
 
                                             @if (count($objekViews) > 0)
                                                 @foreach ($objekViews as $view)
-                                                    <div class="flex flex-wrap gap-4 {{ !$loop->first ? 'mt-2' : '' }}">
-                                                        <div class="flex w-full gap-4">
-                                                            <label class="form-label max-w-56"><span
-                                                                    class="form-label">{{ $view['label'] }}</span></label>
-                                                            <input type="hidden" class="form-control"
-                                                                name="name_objek[]" value="{{ $view['label'] }}" />
-                                                            <div class="w-full grid gap-5">
-                                                                <img id="foto_object_jaminan_preview_{{ $view['index'] }}"
-                                                                    src="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_object']) ? asset('storage/' . $formFoto['object_jaminan'][$view['index']]['foto_object']) : '' }}"
-                                                                    alt="{{ $view['label'] }}" class="mb-2 w-48 h-auto"
-                                                                    style="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_object']) ? '' : 'display: none;' }} width: 30rem;">
-                                                                <div class="input-group w-full flex gap-2">
-                                                                    <input type="file" name="foto_objek[]"
-                                                                        class="file-input file-input-bordered w-full"
-                                                                        accept="image/*" capture="camera">
-                                                                    <button type="button" id="btnCamera"
-                                                                        class="btn btn-light"
-                                                                        data-modal-toggle="#cameraModal">
-                                                                        <i class="ki-outline ki-abstract-33"></i> Camera
-                                                                    </button>
-                                                                </div>
-                                                                <textarea name="deskripsi_objek[]" class="textarea" rows="3" placeholder="Deskripsi">{{ isset($formFoto['object_jaminan'][$view['index']]) ? str_replace($view['label'] . ': ', '', $formFoto['object_jaminan'][$view['index']]['deskripsi_objek']) : '' }}</textarea>
+                                                <div class="flex flex-wrap gap-4 {{ !$loop->first ? 'mt-2' : '' }}">
+                                                    <div class="flex w-full gap-4">
+                                                        <label class="form-label max-w-56"><span
+                                                                class="form-label">{{ $view['label'] }}</span></label>
+                                                        <input type="hidden" class="form-control"
+                                                            name="name_objek[]" value="{{ $view['label'] }}" />
+                                                        <div class="w-full grid gap-5">
+                                                            <img id="foto_object_jaminan_preview_{{ $view['index'] }}"
+                                                                src="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_objek']) ? asset('storage/' . $formFoto['object_jaminan'][$view['index']]['foto_objek']) : '' }}"
+                                                                alt="{{ $view['label'] }}" class="mb-2 h-auto"
+
+                                                                style="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_objek']) ? 'width: 30rem;' : 'display: none;' }}"
+                                                                onerror="this.style.display='none';" />
+                                                            <div class="input-group w-full flex gap-2">
+                                                                <input type="file" name="foto_objek[]"
+                                                                    class="file-input file-input-bordered w-full"
+                                                                    accept="image/*" capture="camera"
+                                                                    onchange="previewImage(this, 'foto_object_jaminan_preview_{{ $view['index'] }}')">
+                                                                <button type="button" id="btnCamera"
+                                                                    class="btn btn-light"
+                                                                    data-modal-toggle="#cameraModal">
+                                                                    <i class="ki-outline ki-abstract-33"></i> Camera
+                                                                </button>
                                                             </div>
+                                                            <textarea name="deskripsi_objek[]" class="textarea" rows="3" placeholder="Deskripsi">{{ isset($formFoto['object_jaminan'][$view['index']]) ? str_replace($view['label'] . ': ', '', $formFoto['object_jaminan'][$view['index']]['deskripsi_objek']) : '' }}</textarea>
                                                         </div>
-                                                        <span class="alert text-danger text-sm"></span>
                                                     </div>
+                                                    <span class="alert text-danger text-sm"></span>
+                                                </div>
                                                 @endforeach
                                             @endif
 
@@ -391,7 +393,7 @@
                                             <label class="form-label max-w-56">
                                                 <span class="form-label">Foto Lantai 1</span>
                                             </label>
-                                            <div class="w-full grid gap-5">
+                                            <div class="input-group w-full grid gap-5">
                                                 <img src="{{ asset('storage/' . old('foto_lantai_unit', $item['foto_lantai_unit'])) }}"
                                                     alt="Gambar Pendamping" style="width: 30rem;">
                                                 <input type="hidden" name="name_lantai_unit[]" value="lantai">
@@ -436,30 +438,33 @@
 
                             <div id="inputContainerBasement" class="w-full" style="margin-top: 10px">
                                 <div class="flex w-full items-center justify-center gap-4">
-                                  <label class="form-label max-w-56">
-                                    <span class="form-label">Basement</span>
-                                  </label>
-                                  <div class="input-group w-full flex flex-col gap-2">
-                                    <input type="hidden" name="name_basement" value="basement">
-                                    <img id="foto_basement_preview"
-                                         src="{{ isset($formFoto['foto_basement']) ? asset('storage/' . old('foto_basement', $formFoto['foto_basement'])) : '#' }}"
-                                         alt="Gambar foto_basement" style="width: 30rem;"
-                                         onerror="this.style.display='none';"
-                                         onchange="previewImage(this, 'foto_basement_preview')">
-                                    <div class="input-group w-full flex gap-2">
-                                      <input id="inputBasement" type="file" name="foto_basement"
-                                             class="file-input file-input-bordered w-full" accept="image/*" capture="camera">
-                                      <button type="button" id="btnCamera" class="btn btn-light" data-modal-toggle="#cameraModal">
-                                        <i class="ki-outline ki-abstract-33"></i> Camera
-                                      </button>
+                                    <label class="form-label max-w-56">
+                                        <span class="form-label">Basement</span>
+                                    </label>
+                                    <div class="input-group w-full flex flex-col gap-2">
+                                        <input type="hidden" name="name_basement" value="basement">
+                                        <img id="foto_basement_preview"
+                                            src="{{ isset($formFoto['foto_basement']) ? asset('storage/' . old('foto_basement', $formFoto['foto_basement'])) : '#' }}"
+                                            alt="Gambar foto_basement" style="width: 30rem;"
+                                            onerror="this.style.display='none';"
+                                            onchange="previewImage(this, 'foto_basement_preview')">
+                                        <div class="input-group w-full flex gap-2">
+                                            <input id="inputBasement" type="file" name="foto_basement"
+                                                class="file-input file-input-bordered w-full" accept="image/*"
+                                                capture="camera">
+                                            <button type="button" id="btnCamera" class="btn btn-light"
+                                                data-modal-toggle="#cameraModal">
+                                                <i class="ki-outline ki-abstract-33"></i> Camera
+                                            </button>
+                                        </div>
                                     </div>
-                                  </div>
-                                  <button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;" id="btnDelete">
-                                    <i class="ki-filled ki-trash"></i>
-                                  </button>
+                                    <button type="button" class="btn btn-danger btn-sm delete-btn"
+                                        style="display: none;" id="btnDelete">
+                                        <i class="ki-filled ki-trash"></i>
+                                    </button>
                                 </div>
                                 <span id="alertBasement" class="alert text-danger text-sm"></span>
-                              </div>
+                            </div>
 
                             <div id="lantaiLainnya" style="margin-top: 10px"></div>
 
@@ -475,63 +480,69 @@
 
             <div class="card bg-white rounded-lg shadow-md">
                 <div class="card-body">
-                  <div class="text-white py-4 flex items-center justify-between">
-                    <h1 class="text-md font-medium text-gray-900">Lingkungan</h1>
-                    <button id="btnLingkungan" type="button" class="btn btn-primary btn-sm">
-                      <i class="ki-filled ki-plus text-lg"></i>
-                    </button>
-                  </div>
-
-                  @if (isset($formFoto['lingkungan']) && is_array($formFoto['lingkungan']) && count($formFoto['lingkungan']) > 0)
-                    @foreach ($formFoto['lingkungan'] as $key => $item)
-                      <div id="inputContainerLingkungan_{{ $key }}" style="margin-top: 10px">
-                        <div class="flex w-full items-center justify-center gap-4 mb-4">
-                          <label class="form-label max-w-56">
-                            <span class="form-label">Lingkungan</span>
-                          </label>
-                          <div class="w-full grid gap-5">
-                            <img id="foto_lingkungan_preview_{{ $key }}"
-                                 src="{{ asset('storage/' . old('foto_lingkungan.' . $key, $item['foto_lingkungan'])) }}"
-                                 alt="Gambar Lingkungan" style="width: 30rem;">
-                            <input type="hidden" name="name_lingkungan[]" value="lingkungan">
-                            <div class="input-group w-full flex gap-2">
-                              <input id="inputLingkungan_{{ $key }}" type="file" name="foto_lingkungan[]"
-                                     class="file-input file-input-bordered w-full" accept="image/*" capture="camera">
-                              <button type="button" id="btnCamera" class="btn btn-light" data-modal-toggle="#cameraModal">
-                                <i class="ki-outline ki-abstract-33"></i> Camera
-                              </button>
-                            </div>
-                            <button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;" id="btnDelete">
-                              <i class="ki-filled ki-trash"></i>
-                            </button>
-                          </div>
-                        </div>
-                        <span class="alert text-danger text-sm"></span>
-                      </div>
-                    @endforeach
-                  @else
-                    <div id="inputContainerLingkungan_0" style="margin-top: 10px">
-                      <div class="flex w-full items-center justify-center gap-4 mb-4">
-                        <label class="form-label max-w-56">
-                          <span class="form-label">Lingkungan</span>
-                        </label>
-                        <div class="input-group w-full flex gap-2">
-                          <input type="hidden" name="name_lingkungan[]" value="lingkungan">
-                          <input id="inputLingkungan_0" type="file" name="foto_lingkungan[]"
-                                 class="file-input file-input-bordered w-full" accept="image/*" capture="camera">
-                          <button type="button" id="btnCamera" class="btn btn-light" data-modal-toggle="#cameraModal">
-                            <i class="ki-outline ki-abstract-33"></i> Camera
-                          </button>
-                        </div>
-                        <button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;" id="btnDelete">
-                          <i class="ki-filled ki-trash"></i>
+                    <div class="text-white py-4 flex items-center justify-between">
+                        <h1 class="text-md font-medium text-gray-900">Lingkungan</h1>
+                        <button id="btnLingkungan" type="button" class="btn btn-primary btn-sm">
+                            <i class="ki-filled ki-plus text-lg"></i>
                         </button>
-                      </div>
-                      <span class="alert text-danger text-sm"></span>
                     </div>
-                  @endif
+
+                    @if (isset($formFoto['lingkungan']) && is_array($formFoto['lingkungan']) && count($formFoto['lingkungan']) > 0)
+                        @foreach ($formFoto['lingkungan'] as $key => $item)
+                            <div id="inputContainerLingkungan" style="margin-top: 10px">
+                                <div class="flex w-full items-center justify-center gap-4 mb-4">
+                                    <label class="form-label max-w-56">
+                                        <span class="form-label">Lingkungan</span>
+                                    </label>
+                                    <div class="w-full grid gap-5">
+                                        <img id="foto_lingkungan_preview_{{ $key }}"
+                                            src="{{ asset('storage/' . old('foto_lingkungan.' . $key, $item['foto_lingkungan'])) }}"
+                                            alt="Gambar Lingkungan" style="width: 30rem;">
+                                        <input type="hidden" name="name_lingkungan[]" value="lingkungan">
+                                        <div class="input-group w-full flex gap-2">
+                                            <input id="inputLingkungan_{{ $key }}" type="file"
+                                                name="foto_lingkungan[]" class="file-input file-input-bordered w-full"
+                                                accept="image/*" capture="camera">
+                                            <button type="button" id="btnCamera" class="btn btn-light"
+                                                data-modal-toggle="#cameraModal">
+                                                <i class="ki-outline ki-abstract-33"></i> Camera
+                                            </button>
+                                        </div>
+                                        <button type="button" class="btn btn-danger btn-sm delete-btn"
+                                            style="display: none;" id="btnDelete">
+                                            <i class="ki-filled ki-trash"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                                <span class="alert text-danger text-sm"></span>
+                            </div>
+                        @endforeach
+                    @else
+                        <div id="inputContainerLingkungan" style="margin-top: 10px">
+                            <div class="flex w-full items-center justify-center gap-4 mb-4">
+                                <label class="form-label max-w-56">
+                                    <span class="form-label">Lingkungan</span>
+                                </label>
+                                <div class="input-group w-full flex gap-2">
+                                    <input type="hidden" name="name_lingkungan[]" value="lingkungan">
+                                    <input id="inputLingkungan_0" type="file" name="foto_lingkungan[]"
+                                        class="file-input file-input-bordered w-full" accept="image/*" capture="camera">
+                                    <button type="button" id="btnCamera" class="btn btn-light"
+                                        data-modal-toggle="#cameraModal">
+                                        <i class="ki-outline ki-abstract-33"></i> Camera
+                                    </button>
+                                </div>
+                                <button type="button" class="btn btn-danger btn-sm delete-btn" style="display: none;"
+                                    id="btnDelete">
+                                    <i class="ki-filled ki-trash"></i>
+                                </button>
+                            </div>
+                            <span class="alert text-danger text-sm"></span>
+                        </div>
+                    @endif
                 </div>
-              </div>
+            </div>
+
             <div class="card bg-white rounded-lg shadow-md">
                 <div class="card-body">
                     <div class=" text-white py-4 flex items-center justify-between">
@@ -594,7 +605,7 @@
     </div>
 
     <!-- Modal Kamera -->
-   @include('lpj::surveyor.components.modal-kamera')
+    @include('lpj::surveyor.components.modal-kamera')
 @endsection
 
 
@@ -693,7 +704,3 @@
         }
     }
 </style>
-
-
-
-
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 3b669f8..617209d 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -100,7 +100,7 @@
             <h1 class="text-md font-medium text-gray-900">Deskripsi Aset jaminan</h1>
         </div>
 
-        <div class="grid gap-5">
+        <div class="grid gap-5 w-full">
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Jenis Aset</label>
                 <div>
@@ -153,7 +153,7 @@
 
             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                 <label class="form-label max-w-56">Alamat</label>
-                <div>
+                <div class="w-full">
                     @foreach ($permohonan->debiture->documents as $dokumen)
                         <span class="text-2sm text-gray-700">
                             {{ formatAlamat($dokumen) }}
@@ -186,69 +186,117 @@
                         <em id="error-alamat" class="alert text-danger text-sm"></em>
                     </div>
 
-                    <div id="alamat_form" class="grid gap-2 mt-5">
-                        @php
-                            $fields = [
-                                [
-                                    'label' => 'Jl.',
-                                    'name' => 'nama_jalan',
-                                    'id' => 'nama_jalan',
-                                    'readonly' => false,
-                                ],
-                                [
-                                    'label' => 'Provinsi',
-                                    'name' => 'provinsi',
-                                    'id' => 'provinsi',
-                                    'type' => 'select',
-                                    'options' => $provinces,
-                                ],
-                                [
-                                    'label' => 'Kota/Kabupaten',
-                                    'name' => 'kota_kabupaten',
-                                    'id' => 'kota_kabupaten',
-                                    'type' => 'select',
-                                    'options' => $provinces,
-                                ],
-                                [
-                                    'label' => 'Kecamatan',
-                                    'name' => 'kecamatan',
-                                    'id' => 'kecamatan',
-                                    'type' => 'select',
-                                    'options' => $provinces,
-                                ],
-                                [
-                                    'label' => 'Kelurahan',
-                                    'name' => 'desa_kelurahan',
-                                    'id' => 'desa_kelurahan',
-                                    'type' => 'select',
-                                    'options' => $provinces,
-                                ],
-                            ];
-                        @endphp
-
-                        @foreach ($fields as $field)
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-56">{{ $field['label'] }}</label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    @if (isset($field['type']) && $field['type'] === 'select')
-                                        <select id="{{ $field['id'] }}" name="{{ $field['name'] }}" class="select w-full">
-                                            <option value="">{{ $field['label'] }}</option>
-                                            @foreach ($field['options'] as $option)
-                                                <option value="{{ $option->code }}">{{ $option->name }}</option>
-                                            @endforeach
-                                        </select>
-                                    @else
-                                        <input type="text" id="{{ $field['id'] }}" name="{{ $field['name'] }}" class="input"
-                                            {{ $field['readonly'] ? 'readonly' : '' }}>
-                                    @endif
-                                </div>
+                    <div id="alamat_form" class="grid gap-2 mt-5" style="{{ isset($forminspeksi['asset']['alamat']['tidak sesuai']) ? '' : 'display: none;' }}">
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                            <label for="address" class="form-label max-w-56">Jl.</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input type="text" id="address" name="address" class="input w-full"
+                                    placeholder="Masukkan Jl."
+                                    value="{{ isset($forminspeksi['asset']['alamat']['tidak sesuai']['address'])
+                                        ? $forminspeksi['asset']['alamat']['tidak sesuai']['address']
+                                        : (isset($forminspeksi['asset']['alamat']['sesuai']['address'])
+                                            ? $forminspeksi['asset']['alamat']['sesuai']['address']
+                                            : old('address')) }}">
                             </div>
-                        @endforeach
-                    </div>
+                        </div>
 
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                            <label for="province_code" class="form-label max-w-56">Provinsi</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select id="province_code" name="province_code" class="input w-full"  >
+                                    <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>
+                            </div>
+                        </div>
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                            <label for="city_code" class="form-label max-w-56">Kota/Kabupaten</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select id="city_code" name="city_code" class="select w-full">
+                                    <option value="">Pilih Kota/Kabupaten</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>
+                            </div>
+                        </div>
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                            <label for="district_code" class="form-label max-w-56">Kecamatan</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select id="district_code" name="district_code" class="select w-full">
+                                    <option value="">Pilih Kecamatan</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>
+                            </div>
+                        </div>
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                            <label for="village_code" class="form-label max-w-56">Kelurahan</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select id="village_code" name="village_code" class="select w-full">
+                                    <option value="">Pilih Kelurahan</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>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
 
+
         </div>
     </div>
 </div>
@@ -399,7 +447,7 @@
                                 <input
                                     onclick="toggleFieldVisibility('hub_cadeb','hub_cadeb_tidak_sesuai', ['tidak sesuai'])"
                                     type="radio" class="radio" name="hub_cadeb" value="tidak sesuai"
-                                    {{ old('hub_cadeb', isset($forminspeksi['asset']['hub_cadeb']['tidak sesuai']))? 'checked' : '' }}>
+                                    {{ old('hub_cadeb', isset($forminspeksi['asset']['hub_cadeb']['tidak sesuai'])) ? 'checked' : '' }}>
                                 <span class="ml-2">Tidak</span>
                             </label>
                             <!-- Select dropdown untuk "Tidak Sesuai" -->
diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php
index 11f728d..b06eea7 100644
--- a/resources/views/surveyor/components/inspeksi.blade.php
+++ b/resources/views/surveyor/components/inspeksi.blade.php
@@ -52,27 +52,60 @@
         </div>
     </div>
 @endsection
+
 @push('scripts')
     <script type="text/javascript">
-        function updateAlamatFields(type) {
-            if (type === 'sesuai') {
-                // Update nilai form dengan data sesuai
-                document.getElementById('nama_jalan').value = "{{ $dokumen->address ?? '' }}";
-                document.getElementById('provinsi').value = "{{ $dokumen->province->code ?? '' }}";
-                document.getElementById('kota_kabupaten').value = "{{ $dokumen->city->code ?? '' }}";
-                document.getElementById('kecamatan').value = "{{ $dokumen->district->code ?? '' }}";
-                document.getElementById('desa_kelurahan').value = "{{ $dokumen->village->code ?? '' }}";
-            } else if (type === 'tidak sesuai') {
-                // Reset nilai form untuk input manual
-                document.getElementById('nama_jalan').value = '';
-                document.getElementById('provinsi').value = '';
-                document.getElementById('kota_kabupaten').value = '';
-                document.getElementById('kecamatan').value = '';
-                document.getElementById('desa_kelurahan').value = '';
+        function updateAlamatFields(status) {
+            // Ambil elemen formulir
+            const addressForm = document.getElementById('alamat_form');
+            const inputs = addressForm.querySelectorAll('input, select');
+            const addressInput = document.getElementById('address');
+
+            if (status === 'sesuai') {
+                addressInput.value = "{{ $dokumen->address ?? '' }}";
+                inputs.forEach(element => {
+                    if (element.tagName === 'INPUT') {
+                        element.setAttribute('readonly', true);
+                    } else if (element.tagName === 'SELECT') {
+                        element.setAttribute('disabled', true);
+                        element.classList.add('disabled-input')
+                    }
+                });
+
+                addressForm.style.display = 'grid';
+                addressForm.disabled = true;
+                addressForm.classList.add('disabled-input')
+
+
+            } else if (status === 'tidak sesuai') {
+                addressForm.style.display = 'grid';
+
+                addressForm.removeAttribute('disabled');
+                addressForm.classList.remove('disabled-input')
+                const formInspeksi = @json($forminspeksi);
+                const addressInput = document.getElementById('address');
+
+                if (formInspeksi && formInspeksi.asset && formInspeksi.asset.alamat) {
+                    if (formInspeksi.asset.alamat['tidak sesuai'] && formInspeksi.asset.alamat['tidak sesuai'].address) {
+                        addressInput.value = formInspeksi.asset.alamat['tidak sesuai'].address;
+                    } else if (formInspeksi.asset.alamat['sesuai'] && formInspeksi.asset.alamat['sesuai'].address) {
+                        addressInput.value = formInspeksi.asset.alamat['sesuai'].address;
+                    } else {
+                        addressInput.value = "";
+                    }
+                }
+
+                inputs.forEach(element => {
+                    if (element.tagName === 'INPUT') {
+                        element.removeAttribute('readonly');
+                    } else if (element.tagName === 'SELECT') {
+                        element.removeAttribute('disabled');
+                        element.classList.remove('disabled-input')
+                    }
+                });
             }
         }
 
-
         function toggleFieldVisibility(fieldName, inputId, visibleValues = []) {
             const selectedValue = $(`[name="${fieldName}"]:checked`).val();
             const inputField = $(`#${inputId}`);
@@ -319,12 +352,21 @@
         }
     }
 
-    .scrollable-x-auto {
-        overflow-x: auto;
-        max-width: 100%;
+    div[disabled] {
+        background-color: #f5f5f5;
+        color: #a0a0a0;
+        border: 1px solid #d1d1d1;
+        cursor: not-allowed;
+
+        pointer-events: none;
+
+    }
+    div[disabled]:hover {
+        background-color: #e8e8e8;
     }
 
-    .table {
-        min-width: 100%;
+    div.disabled-input {
+        opacity: 0.6;
+        transition: opacity 0.3s ease;
     }
 </style>
diff --git a/resources/views/surveyor/js/camera-editor.blade.php b/resources/views/surveyor/js/camera-editor.blade.php
index f37caf5..6c2a6e7 100644
--- a/resources/views/surveyor/js/camera-editor.blade.php
+++ b/resources/views/surveyor/js/camera-editor.blade.php
@@ -202,94 +202,132 @@
 
 
             function setupInputHandlers(containerId, buttonId, labelText, inputDataClass, buttonDeleteClass) {
-                const inputContainer = document.getElementById(containerId);
-                const addButton = document.getElementById(buttonId);
+    const addButton = document.getElementById(buttonId);
+    const inputContainer = document.getElementById(containerId);
 
-                function updateLabels() {
-                    const labels = inputContainer.querySelectorAll('.form-label span');
-                    labels.forEach((label, index) => {
-                        label.textContent = `${labelText} ${index + 1}`;
-                    });
+    if (!addButton || !inputContainer) {
+        console.error(`Element with ID ${containerId} or ${buttonId} not found.`);
+        return;
+    }
+
+    function updateLabels() {
+        const labels = inputContainer.querySelectorAll('.form-label span');
+        labels.forEach((label, index) => {
+            label.textContent = `${labelText} ${index + 1}`;
+        });
+    }
+
+    function handleDeleteButtons() {
+        const deleteBtns = inputContainer.querySelectorAll(`.${buttonDeleteClass}`);
+        deleteBtns.forEach(btn => {
+            btn.style.display = inputContainer.children.length > 1 ? 'block' : 'none';
+        });
+    }
+
+    function createNewInput() {
+        const newDiv = inputContainer.children[0].cloneNode(true);
+
+        // Reset semua input dalam elemen baru
+        const inputFile = newDiv.querySelector(`.${inputDataClass}`);
+        if (inputFile) {
+            inputFile.id = `inputLingkungan-${inputContainer.children.length}`;
+            inputFile.value = ''; // Reset input file
+
+            // Tambahkan event listener untuk preview
+            inputFile.addEventListener('change', function () {
+                const file = this.files[0];
+                if (file) {
+                    const reader = new FileReader();
+                    reader.onload = function (e) {
+                        const img = document.getElementById(
+                            `foto_lingkungan_preview_${inputFile.id}`
+                        );
+                        img.src = e.target.result;
+                        img.style.display = 'block';
+                    };
+                    reader.readAsDataURL(file);
                 }
+            });
+        }
 
-                function handleDeleteButtons() {
-                    const deleteBtns = inputContainer.querySelectorAll(`.${buttonDeleteClass}`);
-                    deleteBtns.forEach(btn => {
-                        btn.style.display = inputContainer.children.length > 1 ? 'block' : 'none';
-                    });
-                }
-
-                function createNewInput() {
-                    const newDiv = inputContainer.children[0].cloneNode(true);
-                    const inputFile = newDiv.querySelector(`.${inputDataClass}`);
-                    inputFile.id = `inputRute-${inputContainer.children.length}`;
-
-                    // Reset input file value
-                    if (inputFile) {
-                        inputFile.value = '';
-                    }
-
-                    // Update the camera button to set currentInputField
-                    const cameraButton = newDiv.querySelector('#btnCamera');
-                    if (cameraButton) {
-                        cameraButton.addEventListener('click', function(e) {
-                            e.preventDefault();
-                            currentInputField = inputFile; // Set current input field to the new input
-                            modal.classList.remove('hidden');
-                            modal.classList.add('modal-open');
-                            editor.startCamera();
-                        });
-                    }
-
-                    // Add delete button functionality
-                    const deleteBtn = newDiv.querySelector(`.${buttonDeleteClass}`);
-                    if (deleteBtn) {
-                        deleteBtn.addEventListener('click', function() {
-                            inputContainer.removeChild(newDiv);
-                            handleDeleteButtons();
-                            updateLabels();
-                        });
-                    }
-
-                    // Update preview container
-                    const previewContainer = document.createElement('div');
-                    previewContainer.className = 'preview-container';
-
-                    const img = document.createElement('img');
-                    img.id = `foto_rute-preview-${inputFile.id}`;
-                    img.src = '';
-                    img.className = 'mt-2 h-auto';
-                    img.style.display = 'none';
-                    img.style.width = '30rem';
-                    previewContainer.appendChild(img);
-
-                    // Append preview container to the new input group
-                    const inputGroup = newDiv.querySelector('.input-group');
-                    inputGroup.appendChild(previewContainer);
-
-                    newDiv.style.marginTop = '10px';
-                    inputContainer.appendChild(newDiv);
-                    updateLabels();
-                    handleDeleteButtons();
-                }
-
-                if (addButton) {
-                    addButton.addEventListener('click', createNewInput);
-                }
-
-                const firstDeleteBtn = inputContainer.children[0].querySelector(`.${buttonDeleteClass}`);
-                if (firstDeleteBtn) {
-                    firstDeleteBtn.addEventListener('click', function() {
-                        if (inputContainer.children.length > 1) {
-                            inputContainer.removeChild(this.closest('.flex'));
-                            handleDeleteButtons();
-                            updateLabels();
-                        }
-                    });
-                }
+        // Tambahkan logika reset untuk elemen preview
+        const imgPreview = newDiv.querySelector('img');
+        if (imgPreview) {
+            imgPreview.src = '';
+            imgPreview.style.display = 'none';
+        }
 
+        const deleteBtn = newDiv.querySelector(`.${buttonDeleteClass}`);
+        if (deleteBtn) {
+            deleteBtn.addEventListener('click', function () {
+                inputContainer.removeChild(newDiv);
+                handleDeleteButtons();
                 updateLabels();
+            });
+        }
+
+        // Tambahkan container preview jika tidak ada
+        let previewContainer = newDiv.querySelector('.preview-container');
+        if (!previewContainer) {
+            previewContainer = document.createElement('div');
+            previewContainer.className = 'preview-container';
+
+            const img = document.createElement('img');
+            img.id = `foto_lingkungan_preview_${inputFile.id}`;
+            img.src = '';
+            img.className = 'mt-2 h-auto';
+            img.style.display = 'none';
+            img.style.width = '30rem';
+            previewContainer.appendChild(img);
+
+            const inputGroup = newDiv.querySelector('.input-group');
+            inputGroup.appendChild(previewContainer);
+        }
+
+        newDiv.style.marginTop = '10px';
+        inputContainer.appendChild(newDiv);
+        updateLabels();
+        handleDeleteButtons();
+    }
+
+    addButton.addEventListener('click', createNewInput);
+
+    // Terapkan event listener pada elemen yang sudah ada
+    const existingInputs = inputContainer.querySelectorAll(`.${inputDataClass}`);
+    existingInputs.forEach((input, index) => {
+        const deleteBtn = input.closest('.flex').querySelector(`.${buttonDeleteClass}`);
+        if (deleteBtn) {
+            deleteBtn.addEventListener('click', function () {
+                if (inputContainer.children.length > 1) {
+                    inputContainer.removeChild(this.closest('.flex'));
+                    handleDeleteButtons();
+                    updateLabels();
+                }
+            });
+        }
+
+        input.addEventListener('change', function () {
+            const file = this.files[0];
+            if (file) {
+                const reader = new FileReader();
+                reader.onload = function (e) {
+                    const img = document.getElementById(
+                        `foto_lingkungan_preview_${index}`
+                    );
+                    img.src = e.target.result;
+                    img.style.display = 'block';
+                };
+                reader.readAsDataURL(file);
             }
+        });
+    });
+
+    updateLabels();
+    handleDeleteButtons();
+}
+
+
+
 
             setupInputHandlers('inputContainerRute', 'btnRute', 'Foto Rute Menuju Lokasi', 'file-input',
                 'delete-btn');
diff --git a/routes/web.php b/routes/web.php
index 9ded839..011dbc1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -537,8 +537,13 @@ Route::middleware(['auth'])->group(function () {
 
         Route::get('lampiran/{id}', [PenilaiController::class, 'lampiran'])->name('lampiran');
         Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja');
+        Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja');
+        Route::get('export/kertas-kerja', [PenilaiController::class, 'kertas_kerja'])->name('export.kertas-kerja');
 
-
+        Route::get('sederhana/{id}', [PenilaiController::class, 'sederhana'])->name('sederhana');
+        Route::get('standard/{id}', [PenilaiController::class, 'standard'])->name('standard');
+        Route::get('resume/{id}', [PenilaiController::class, 'standard'])->name('resume');
+        Route::get('memo/{id}', [PenilaiController::class, 'standard'])->name('memo');
 
     });