diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index b66021b..791de97 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -968,8 +968,8 @@ class PenilaiController extends Controller
                 ]
             );
 
-            $existingPhotos = isset($memo->memo) ? json_decode($memo->memo)->foto : [];
-            dd($existingPhotos);
+            // $existingPhotos = isset($memo->memo) ? json_decode($memo->memo) : [];
+            // dd($existingPhotos);
             // Simpan foto-foto
             if ($request->hasFile('foto_0')) {
                 $photoUrls = [];
@@ -982,15 +982,15 @@ class PenilaiController extends Controller
                     $index++;
                 }
 
-                $memoData['foto'] = array_merge($existingPhotos, $photoUrls);
+                // $memoData['foto'] = array_merge($existingPhotos, $photoUrls);
 
-            }else{
-                $memoData['foto'] = $existingPhotos;
-            }
+            // }else{
+            //     $memoData['foto'] = $existingPhotos;
             // Tambahkan URL foto ke data memo
             $memoData['foto'] = $photoUrls;
             $memo->memo       = json_encode($memoData);
             $memo->save();
+        }
 
             return response()->json([
                 'success' => true,
diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php
index 5f521a1..d1fa89e 100644
--- a/resources/views/penilai/components/footer.blade.php
+++ b/resources/views/penilai/components/footer.blade.php
@@ -47,14 +47,17 @@
             ];
                 // Memindahkan foto_tempat ke depan jika ada
                 if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
-                    unset($fotoTypes[$key]);
-                    array_unshift($fotoTypes, 'upload_gs');
-                }
-                // Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid
-                $validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) {
-                    return isset($forminspeksi[$type]) &&
-                        file_exists(storage_path('app/public/' . $forminspeksi[$type]));
-                });
+            unset($fotoTypes[$key]);
+            array_unshift($fotoTypes, 'upload_gs');
+        }
+
+        // Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid
+        $validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) {
+            // Check if value is a string (not an array) and file exists
+            return isset($forminspeksi[$type]) &&
+                   is_string($forminspeksi[$type]) &&
+                   file_exists(storage_path('app/public/' . $forminspeksi[$type]));
+        });
             @endphp
 
             <table width="100%" border="0">
diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php
index 3d1829b..bf37584 100644
--- a/resources/views/penilai/components/header.blade.php
+++ b/resources/views/penilai/components/header.blade.php
@@ -138,12 +138,12 @@
                 </td>
                 <td style="text-align: right;">
                     <p style="margin: 0; padding:0; font-size:10px;">
-                        Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
+                        Tanggal: {{ \Carbon\Carbon::parse(date('Y-m-d'))->format('d-m-Y') }}
                     </p>
                     <p style="margin: 0; padding:0; font-size:10px;">
-                        Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
+                        Waktu: {{ \Carbon\Carbon::parse(date('H:i:s'))->format('H:i:s') }}
                     </p>
-                    <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $penilaiUser->name }}</p>
+                    <p style="margin: 0; padding:0;  font-size:10px;">User: {{ Auth::user()->name }}</p>
                 </td>
             </tr>
         </table>
diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php
index b7e9e56..6fa599a 100644
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -184,9 +184,9 @@
                                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
                                     <label for="tanggal_survey" class="form-label max-w-56">Tanggal Survey</label>
                                     <div class="flex flex-wrap items-baseline w-full">
-                                        <input type="date" id="tanggal_survey" name="tanggal_survey"
+                                        <input type="date-time" id="tanggal_survey" name="tanggal_survey"
                                             class="input w-full" placeholder="Masukkan Tanggal Survey"
-                                            value="{{ $memo->lokasi->tanggal_survey ?? old('tanggal_survey') }}">
+                                            value="{{ $permohonan->penilaian->updated_at ?? old('tanggal_survey') }}" @readonly(true)>
                                     </div>
                                 </div>
 
diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index a6e0aa2..9a1e7cd 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -66,9 +66,9 @@
     <table>
         <tr>
             <td>
-                Menindak lanjuti permintann penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang
+                Menindak lanjuti permintan penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang
                 {{ $permohonan->debiture->branch->name ?? '' }}
-                tanggal {{ formatTanggalIndonesia($memo['tanggal']) ?? '' }}, dapat di sampaikan sebagai berikut:
+                tanggal {{ formatTanggalIndonesia($permohonan->created_at) ?? '' }}, dapat di sampaikan sebagai berikut:
             </td>
         </tr>
     </table>
@@ -139,7 +139,7 @@
             <td style="width: 25%; padding: 2px;">Tanggal Kunjungan</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">
-                {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
+                {{ formatTanggalIndonesia($permohonan->penilaian->updated_at) }}</td>
         </tr>
         <tr>
             <td style="width: 25%; padding: 2px;">Surveyor</td>
diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php
index 8cc5671..0712744 100644
--- a/resources/views/surveyor/index.blade.php
+++ b/resources/views/surveyor/index.blade.php
@@ -613,8 +613,7 @@
                 </button>
             `;
                         } else {
-                            if (data.penilaian.waktu_penilaian == null ||
-                                (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) {
+                            if (!data.penilaian.waktu_penilaian) {
                                 actionHtml += `
                     <a class="btn btn-sm btn-icon btn-clear btn-primary"
                        onclick="prosesJadwalSurvey(${data.penilaian.id})"