diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index cd69840..7b9cb9f 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -1090,7 +1090,7 @@ class SurveyorController extends Controller
                 'address', 'village_code', 'district_code', 'city_code', 'province_code',
                 'nama', 'type','warna','lokasi', 'total', 'diskon', 'harga_diskon',
                 'sumber_data', 'harga', 'tahun','transmisi','telepon',
-                'kordinat_lat', 'kordinat_lng', 'tahun_pembuatan','merek_buatan','kapasitas','power','kondisi'
+                'kordinat_lat', 'kordinat_lng', 'tahun_pembuatan','merek_buatan','kapasitas','power','kondisi','tanggal'
             ];
 
 
@@ -1100,7 +1100,7 @@ class SurveyorController extends Controller
                 'tahun', 'luas_tanah', 'luas_bangunan', 'tahun_bangunan',
                 'status_nara_sumber', 'harga', 'harga_diskon', 'diskon', 'total', 'nama_nara_sumber',
                 'peruntukan', 'penawaran', 'telepon','hak_properti',
-                'kordinat_lat', 'kordinat_lng', 'jenis_aset','foto_objek'
+                'kordinat_lat', 'kordinat_lng', 'jenis_aset','foto_objek','tanggal'
             ];
         }
 
@@ -1155,7 +1155,7 @@ class SurveyorController extends Controller
             'address', 'village_code', 'district_code', 'city_code', 'province_code',
             'luas_tanah', 'luas_tanah_bagunan', 'total', 'diskon', 'harga_diskon',
             'status_nara_sumber', 'harga', 'nama_nara_sumber','hak_properti','telepon',
-            'kordinat_lat', 'kordinat_lng', 'jenis_aset','penawaran',
+            'kordinat_lat', 'kordinat_lng', 'jenis_aset','penawaran',  'tanggal',
         ];
 
         $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))
@@ -2776,6 +2776,7 @@ class SurveyorController extends Controller
             'target_market' => $data['target_market'] ?? null,
             'kerjasama_dengan_bank' => $data['kerjasama_dengan_bank'] ?? null,
             'rute_menuju_lokasi' => $data['rute_menuju_lokasi'] ?? null,
+            'properti_sejenis' => $data['properti_sejenis'] ?? null,
         ];
 
         return $rapData;
diff --git a/module.json b/module.json
index 73e9455..d656031 100644
--- a/module.json
+++ b/module.json
@@ -333,6 +333,8 @@
                     "pemohon-ao",
                     "pemohon-eo",
                     "admin",
+                    "DD Appraisal",
+                    "EO Appraisal",
                     "senior-officer"
                 ]
             }
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index dd14775..770745e 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -416,6 +416,17 @@
 
         </table>
     @endisset
+    @isset($forminspeksi['properti_sejenis'])
+        <h2 style="text-transform: uppercase;">PROPERTI SEJENIS</h2>
+        <table>
+            <tr>
+                <td>
+                    {{ $forminspeksi['properti_sejenis'] ?? '' }}
+                </td>
+            </tr>
+
+        </table>
+    @endisset
     @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
         <h2 style="text-transform: uppercase;">ATURAN TATA KOTA</h2>
         <table>
@@ -434,12 +445,17 @@
             @endphp
 
             @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
-                @foreach ($informasi as $key)
-                    @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
-                        <p> - {{ ucfirst(str_replace('_', ' ', $key)) }}:
-                            {{ $forminspeksi['fakta'][$key] }}</p>
-                    @endif
-                @endforeach
+            @foreach ($informasi as $key)
+            @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
+                @php
+                    $displayKey = ucfirst(str_replace('_', ' ', $key));
+                    if (strlen($key) == 3) {
+                        $displayKey = strtoupper($key);
+                    }
+                @endphp
+                <p> - {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}</p>
+            @endif
+        @endforeach
             @endif
         </table>
     @endif
diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php
index 6f52b4a..cc63014 100644
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/resources/views/surveyor/components/data-pembanding.blade.php
@@ -190,7 +190,7 @@
                 'total_pembanding[]': currentData.total,
                 'diskon_pembanding[]': currentData.diskon,
                 'telepon_pembanding[]': currentData.telepon,
-                'penawaran_pembanding[]': currentData.penawaran,
+                'penawaran_pembanding[]': currentData.penawaran
             } : {
                 'jenis_aset_pembanding[]': currentData.jenis_aset,
                 'luas_tanah_pembanding[]': currentData.luas_tanah,
@@ -211,6 +211,8 @@
                 'hak_properti_pembanding[]': currentData.hak_properti,
                 'telepon_pembanding[]': currentData.telepon,
                 'penawaran_pembanding[]': currentData.penawaran,
+                'tanggal_pembanding[]': currentData.tanggal
+
             };
 
             Object.entries(inputs).forEach(([name, value]) => {
@@ -359,10 +361,10 @@
                             } else if (!input.id.includes('province')) {
                                 // Reset opsi untuk select lokasi
                                 input.innerHTML = `<option value="">Pilih ${
-                input.id.includes('city') ? 'Kota/Kabupaten' :
-                input.id.includes('district') ? 'Kecamatan' :
-                'Desa/Kelurahan'
-            }</option>`;
+                                input.id.includes('city') ? 'Kota/Kabupaten' :
+                                input.id.includes('district') ? 'Kecamatan' :
+                                'Desa/Kelurahan'
+                            }</option>`;
                             }
 
                             if (input.id.includes('province')) {
@@ -378,6 +380,8 @@
                                     handleDistrictChange(this);
                                 };
                             }
+
+
                         }
 
                         if (input.type !== 'file' && input.tagName !== 'SELECT') {
diff --git a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
index 0942687..b48debe 100644
--- a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
+++ b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
@@ -171,9 +171,20 @@
                     <td class="px-4 py-2">
                         <input type="text" name="penawaran" class="input"
                             value="{{ $inspectionData['asset']['penawaran'] ?? '' }}">
+                        {{-- <select class="input w-full" name="penawaran">
+                            <option value="">Pilih</option>
+                            <option value="Penawaran" {{ (isset($inspectionData['asset']['penawaran']) && $inspectionData['asset']['penawaran'] == 'Penawaran') ? 'selected' : '' }}>Penawaran</option>
+                            <option value="Transaksi" {{ (isset($inspectionData['asset']['penawaran']) && $inspectionData['asset']['penawaran'] == 'Transaksi') ? 'selected' : '' }}>Transaksi</option>
+                        </select> --}}
                     </td>
                     <td class="px-4 py-2">
                         <input type="text" name="penawaran_pembanding[]" class="input">
+                        {{-- <select class="input w-full" name="penawaran_pembanding[]">
+                            <option value="">Pilih</option>
+                            <option value="Penawaran" {{ (isset($inspectionData['penawaran']) && $inspectionData['penawaran'] == 'Penawaran') ? 'selected' : '' }}>Penawaran</option>
+                            <option value="Transaksi" {{ (isset($inspectionData['penawaran']) && $inspectionData['penawaran'] == 'Transaksi') ? 'selected' : '' }}>Transaksi</option>
+                        </select> --}}
+
                     </td>
                 </tr>
 
@@ -210,6 +221,16 @@
                     </td>
                 </tr>
 
+                <tr>
+                    <td class="px-4 py-2">Tanggal Data</td>
+                    <td class="px-4 py-2">
+                        <input type="date" name="tanggal" class="input"
+                            value="{{ $inspectionData['asset']['tanggal'] ?? '' }}">
+                    </td>
+                    <td class="px-4 py-2">
+                        <input type="date" name="tanggal_pembanding[]" class="input">
+                    </td>
+                </tr>
 
                 <!-- Lokasi -->
                 <tr class="bg-gray-100">
diff --git a/resources/views/surveyor/components/print-out/rap.blade.php b/resources/views/surveyor/components/print-out/rap.blade.php
index 80ccc22..0ea156b 100644
--- a/resources/views/surveyor/components/print-out/rap.blade.php
+++ b/resources/views/surveyor/components/print-out/rap.blade.php
@@ -174,7 +174,7 @@
 
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -201,7 +201,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -228,7 +228,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -254,7 +254,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -281,7 +281,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -307,7 +307,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -333,7 +333,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -347,7 +347,7 @@
         </table>
     </td>
 </tr>
-   
+
 @endisset
 @isset($forminspeksi['rute_menuju_lokasi'])
 <tr>
@@ -360,7 +360,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -373,12 +373,36 @@
         </table>
     </td>
 </tr>
- 
+@endisset
+@isset($forminspeksi['properti_sejenis'])
+<tr>
+    <td style="text-align: center; border: 1px solid #000;">
+        P
+    </td>
+    <td style="text-align: center; border: 1px solid #000;">
+        PROPERTI SEJENIS
+    </td>
+</tr>
+<tr>
+    <td style="text-align: center; border: 1px solid #000;">
+
+    </td>
+    <td style=" border: 1px solid #000;">
+        <table>
+            <tr>
+                <td>
+                    {{ $forminspeksi['properti_sejenis'] ?? '' }}
+                </td>
+            </tr>
+
+        </table>
+    </td>
+</tr>
 @endisset
 @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        P
+        Q
     </td>
     <td style="text-align: center; border: 1px solid #000;">
         ATURAN TATA KOTA
@@ -386,7 +410,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -403,7 +427,7 @@
                     'nama_petugas',
                 ];
             @endphp
-    
+
             @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
                 @foreach ($informasi as $key)
                     @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-')
@@ -415,14 +439,14 @@
         </table>
     </td>
 </tr>
-    
+
 @endif
 
 @isset($forminspeksi['fakta']['keterangan'])
 
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        P
+        R
     </td>
     <td style="text-align: center; border: 1px solid #000;">
         CATATAN LAINNYA
@@ -430,7 +454,7 @@
 </tr>
 <tr>
     <td style="text-align: center; border: 1px solid #000;">
-        
+
     </td>
     <td style=" border: 1px solid #000;">
         <table>
@@ -444,5 +468,5 @@
         </table>
     </td>
 </tr>
-   
+
 @endisset
diff --git a/resources/views/surveyor/components/rap.blade.php b/resources/views/surveyor/components/rap.blade.php
index adf2d1c..d58a4b4 100644
--- a/resources/views/surveyor/components/rap.blade.php
+++ b/resources/views/surveyor/components/rap.blade.php
@@ -693,4 +693,36 @@
 
     </div>
 </div>
+
+<div class="card border border-agi-100 w-full  rounded-lg shadow-md  overflow-hidden">
+    <div class="card-header bg-agi-50">
+        <h3 class="card-title uppercase">
+            Properti Sejenis
+        </h3>
+    </div>
+    <div class="card-body">
+        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+
+            <div id="fakta-positif-container" class="flex flex-wrap items-baseline w-full">
+                @if (!empty($forminspeksi['properti_sejenis']))
+                    <div class="properti_sejenis flex items-center gap-2 mt-2 textarea-group w-full">
+                        <textarea class="textarea mt-2" name="properti_sejenis" rows="10">{{ old('properti_sejenis', $forminspeksi['properti_sejenis']) }}</textarea>
+                        <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
+                            <i class="ki-outline ki-trash"></i>
+                        </button>
+                    </div>
+                @else
+                    <div class="properti_sejenis flex items-center gap-2 mt-2 textarea-group w-full">
+                        <textarea class="textarea mt-2" name="properti_sejenis" rows="10">{{ old('properti_sejenis') }}</textarea>
+                        <button class="btn btn-danger btn-sm remove-btn" type="button" style="display: none;">
+                            <i class="ki-outline ki-trash"></i>
+                        </button>
+                    </div>
+                @endif
+
+            </div>
+        </div>
+
+    </div>
+</div>
 @include('lpj::surveyor.components.informasi')