diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index e50cadc..fe20028 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -1054,26 +1054,33 @@ class PenilaiController extends Controller
             $validatedData = $request->all();
             $result = $this->inspeksiService->storeInspeksi($validatedData, $request->input('type'), $request);
 
+            $data = [];
 
-            $data = [
-                'luas_tanah' => $request->input('luas_tanah'),
-                'nilai_tanah_1' => $request->input('nilai_tanah_1'),
-                'nilai_tanah_2' => $request->input('nilai_tanah_2'),
-                'luas_bangunan' => $request->input('luas_bangunan'),
-                'nilai_bangunan_1' => $request->input('nilai_bangunan_1'),
-                'nilai_bangunan_2' => $request->input('nilai_bangunan_2'),
-                'sarana_pelengkap_penilai' => $request->input('sarana_pelengkap_penilai'),
-                'nilai_sarana_pelengkap_1' => $request->input('nilai_sarana_pelengkap_1'),
-                'nilai_sarana_pelengkap_2' => $request->input('nilai_sarana_pelengkap_2'),
-                'total_nilai_pasar_wajar' => $request->input('total_nilai_pasar_wajar'),
-                'likuidasi' => $request->input('likuidasi'),
-                'likuidasi_nilai_1' => $request->input('likuidasi_nilai_1'),
-                'likuidasi_nilai_2' => $request->input('likuidasi_nilai_2'),
-                'asuransi_luas_bangunan' => $request->input('asuransi_luas_bangunan'),
-                'asuransi_nilai_1' => $request->input('asuransi_nilai_1'),
-                'asuransi_nilai_2' => $request->input('asuransi_nilai_2'),
-                'keterangan_penilai' => $request->input('keterangan_penilai') ?? [],
-            ];
+            $kategoriUnik = ['tanah', 'bangunan', 'apartemen-kantor', 'alat-berat', 'mesin', 'kendaraan', 'pesawat', 'kapal', 'sarana_pelengkap_penilai']; 
+
+            foreach ($kategoriUnik as $kategori) {
+                // Dynamically generate keys
+                $luasKey = 'luas_' . $kategori;
+                $nilaiKey1 = 'nilai_' . $kategori . '_1';
+                $nilaiKey2 = 'nilai_' . $kategori . '_2';
+    
+                // Collect data if exists
+                if ($request->has($luasKey)) {
+                    $data[$luasKey] = $request->input($luasKey);
+                }
+                if ($request->has($nilaiKey1)) {
+                    $data[$nilaiKey1] = $request->input($nilaiKey1);
+                }
+                if ($request->has($nilaiKey2)) {
+                    $data[$nilaiKey2] = $request->input($nilaiKey2);
+                }
+            }
+            
+            $data['total_nilai_pasar_wajar'] = $request->input('total_nilai_pasar_wajar');
+            $data['likuidasi'] = $request->input('likuidasi');
+            $data['likuidasi_nilai_1'] = $request->input('likuidasi_nilai_1');
+            $data['likuidasi_nilai_2'] = $request->input('likuidasi_nilai_2');
+            $data['keterangan_penilai'] = $request->input('keterangan_penilai') ?? [];
 
             $npwData = [];
             $npwCounter = 1;
diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php
index 6934bab..12b2cee 100644
--- a/resources/views/component/form-penilai.blade.php
+++ b/resources/views/component/form-penilai.blade.php
@@ -91,37 +91,43 @@
                                 $luas = null;
                             }
                             $luas = old('luas_' . $item, $lpjData['luas_' . $item] ?? $luas);
+
+                            $luasKey = 'luas_' . $item;
+                            $nilaiKey1 = 'nilai_' . $item . '_1';
+                            $nilaiKey2 = 'nilai_' . $item . '_2';
                         @endphp
-                        @if (isset($labelNilai[$item]))
-                            <div class="flex grid-col-3 gap-2.5 w-full">
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
-                                    <label for="province" class="form-label max-w-56">
-                                        {{ $labelNilai[$item] }}
-                                    </label>
-                                    <input type="text" id="luas_{{ $item }}" class="input w-full"
-                                        name="luas_{{ $item }}" value="{{ $luas }}"
-                                        oninput="calculateTotal()">
-                                </div>
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
-                                    <label for="province" class="">X</label>
-                                    <label class="input">
-                                        <i class="">Rp</i>
-                                        <input type="text" id="nilai_{{ $item }}_1" class="w-full currency"
-                                            name="nilai_{{ $item }}_1"
-                                            value="{{ old('nilai_' . $item . '_1', $lpjData['nilai_' . $item . '_1'] ?? null) }}"
-                                            oninput="calculateTotal()">
-                                    </label>
-                                </div>
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
-                                    <label class="input">
-                                        <i class="">Rp</i>
-                                        <input id="nilai_{{ $item }}_2" type="text"
-                                            class="w-full currency-format" name="nilai_{{ $item }}_2"
-                                            value="{{ old('nilai_' . $item . '_2', $lpjData['nilai_' . $item . '_2'] ?? null) }}">
-                                    </label>
-                                </div>
-                            </div>
-                        @endif
+                         @if (isset($labelNilai[$item]))
+                         <div class="flex grid-col-3 gap-2.5 w-full">
+                             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                                 <label for="province" class="form-label max-w-56">
+                                     {{ $labelNilai[$item] }}
+                                 </label>
+                                 <input type="text" id="{{ $luasKey }}" class="input w-full"
+                                     name="{{ $luasKey }}"
+                                     value="{{ old($luasKey, $lpjData[$luasKey] ?? null) }}"
+                                     oninput="calculateTotal()">
+                             </div>
+                             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                                 <label for="province" class="">X</label>
+                                 <label class="input">
+                                     <i class="">Rp</i>
+                                     <input type="text" id="{{ $nilaiKey1 }}" class="w-full currency"
+                                         name="{{ $nilaiKey1 }}"
+                                         value="{{ old($nilaiKey1, $lpjData[$nilaiKey1] ?? null) }}"
+                                         oninput="calculateTotal()">
+                                 </label>
+                             </div>
+                             <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
+                                 <label class="input">
+                                     <i class="">Rp</i>
+                                     <input id="{{ $nilaiKey2 }}" type="text"
+                                         class="w-full currency-format"
+                                         name="{{ $nilaiKey2 }}"
+                                         value="{{ old($nilaiKey2, $lpjData[$nilaiKey2] ?? null) }}">
+                                 </label>
+                             </div>
+                         </div>
+                     @endif
                     @endforeach
 
                     <div>
@@ -460,7 +466,10 @@
         // Get all kategori unik elements dynamically
         const kategoriItems = document.querySelectorAll('[id^="luas_"]');
 
+
+
         kategoriItems.forEach(item => {
+            console.log(item);
 
             const kategori = item.id.replace('luas_', '');
             const luasInput = document.getElementById(`luas_${kategori}`);
diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php
index 18b976a..9f2b177 100644
--- a/resources/views/penilai/lampiran.blade.php
+++ b/resources/views/penilai/lampiran.blade.php
@@ -6,7 +6,7 @@
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        @if (Auth::user()->hasAnyRole(['senior-officer']))
+        @if (Auth::user()->hasAnyRole(['senior-officer', 'administrator','DD Appraisal', 'EO Appraisal']) && Request::is('penilai/lampiran'))
             @include('lpj::component.detail-jaminan', [
                 'backLink' => 'otorisator.view-laporan',
                 'queryParams' => [
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 384de20..38c23cc 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -182,7 +182,7 @@
                         @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
                                 $permohonan->approval_eo &&
                                 $permohonan->approval_dd == 0 &&
-                                in_array($permohonan->nilai_plafond_id, [1, 2, 4]))
+                                in_array($permohonan->nilai_plafond_id, [4]))
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
@@ -224,7 +224,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [1, 4]))
+                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]))
                             <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>