diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 8cbdafe..2cc6438 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -766,9 +766,15 @@ class SurveyorController extends Controller
 
             $permohonan->update([
                 'status' => 'survey-completed',
-                'submitted_at' => now()
             ]);
 
+            $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first();
+
+            $penilaian->update([
+                'status' => 'survey-completed',
+            ]);
+
+
             if($permohonan->jenisPenilaian->name=="External") {
                 LaporanExternal::updateOrCreate(
                     ['permohonan_id' => $permohonan->id],
diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php
index e91d01d..5f521a1 100644
--- a/resources/views/penilai/components/footer.blade.php
+++ b/resources/views/penilai/components/footer.blade.php
@@ -43,7 +43,7 @@
                 'foto_gistaru' => 'Gistaru',
                 'foto_bhumi' => 'Bhumi',
                 'foto_argis_region' => 'Blad Tata Ruang ',
-                'foto_tempat' => 'Tempat',
+                'foto_tempat' => 'Peta Lokasi',
             ];
                 // Memindahkan foto_tempat ke depan jika ada
                 if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php
index b16c777..3d1829b 100644
--- a/resources/views/penilai/components/header.blade.php
+++ b/resources/views/penilai/components/header.blade.php
@@ -123,7 +123,7 @@
         }
     }
     use Modules\Usermanagement\Models\User;
-    $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first();
+    $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
 
     $data = rtrim($data, ', ');
 @endphp
@@ -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->waktu_penilaian)->format('d-m-Y') }}
+                        Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
                     </p>
                     <p style="margin: 0; padding:0; font-size:10px;">
-                        Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }}
+                        Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
                     </p>
-                    <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $surveyorUser->name }}</p>
+                    <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $penilaiUser->name }}</p>
                 </td>
             </tr>
         </table>
diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index 8dea9cd..a6e0aa2 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -35,32 +35,29 @@
             <td style="text-align: center; margin-top: 5px;">
                 <h2 style="text-decoration: underline; text-transform: uppercase; text-align: center; margin: 0;">
                     MEMO ANTAR KANTOR</h2>
+                    <p style="font-size: 12px;  margin: 0;">NO: {{ $nomorLaporan ?? '' }}</p>
             </td>
         </tr>
     </table>
+    <hr/>
     <table style="width: 100%">
         <tr>
-            <td style="width: 20%; padding: 2px;">Kepada</td>
+            <td style="width: 25%; padding: 2px;">Kepada</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $memo['kepada'] ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Dari</td>
+            <td style="width: 25%; padding: 2px;">Dari</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $memo['dari'] ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">No memo</td>
-            <td style="width: 1%;  padding: 2px;">:</td>
-            <td style="width: 79%;  padding: 2px;">{{ $nomorLaporan ?? '-' }}</td>
-        </tr>
-        <tr>
-            <td style="width: 20%; padding: 2px;">Tanggal</td>
+            <td style="width: 25%; padding: 2px;">Tanggal</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ formatTanggalIndonesia($memo['tanggal']) }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Perihal</td>
+            <td style="width: 25%; padding: 2px;">Perihal</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $memo['perihal'] ?? '' }}</td>
         </tr>
@@ -86,12 +83,12 @@
     <table style="width: 100%">
 
         <tr>
-            <td style="width: 20%; padding: 2px;">Nama Calon Debitur</td>
+            <td style="width: 25%; padding: 2px;">Nama Calon Debitur</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Jenis Aset</td>
+            <td style="width: 25%; padding: 2px;">Jenis Aset</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $data ?? '' }}</td>
         </tr>
@@ -99,7 +96,7 @@
         @include('lpj::component.print-out-dokument')
 
         <tr>
-            <td style="width: 20%; padding: 2px;">Atas Nama</td>
+            <td style="width: 25%; padding: 2px;">Atas Nama</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
         </tr>
@@ -118,7 +115,7 @@
             @foreach ($alamatFields as $label => $field)
                 @if (!empty($alamat[$field]))
                     <tr>
-                        <td width="20%">{{ $label }}</td>
+                        <td width="25%">{{ $label }}</td>
                         <td style="width: 1%; vertical-align: top;">:</td>
                         <td>{{ $alamat[$field] }}</td>
                     </tr>
@@ -139,25 +136,25 @@
 
     <table style="width: 100%">
         <tr>
-            <td style="width: 20%; padding: 2px;">Tanggal Kunjungan</td>
+            <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>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Surveyor</td>
+            <td style="width: 25%; padding: 2px;">Surveyor</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $surveyor->userPenilaiTeam->name ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Pihak Pemohon</td>
+            <td style="width: 25%; padding: 2px;">Pihak Pemohon</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->user->name ?? '' }} -
                 {{ $permohonan->debiture->branch->name ?? '' }}</td>
         </tr>
 
         <tr>
-            <td style="width: 20%; padding: 2px;">Pihak Cadeb/Debitur</td>
+            <td style="width: 25%; padding: 2px;">Pihak Cadeb/Debitur</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
         </tr>
diff --git a/resources/views/penilai/components/print-out-call-report.blade.php b/resources/views/penilai/components/print-out-call-report.blade.php
index 8a8fe03..00303af 100644
--- a/resources/views/penilai/components/print-out-call-report.blade.php
+++ b/resources/views/penilai/components/print-out-call-report.blade.php
@@ -39,25 +39,26 @@
                 </td>
             </tr>
         </table>
+        <hr />
         <table style="width: 100%">
             <tr>
-                <td style="width: 20%; padding: 2px;">Kepada</td>
+                <td style="width: 25%; padding: 2px;">Kepada</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['kepada'] ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Dari</td>
+                <td style="width: 25%; padding: 2px;">Dari</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['dari'] ?? '' }}</td>
             </tr>
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Tanggal</td>
+                <td style="width: 25%; padding: 2px;">Tanggal</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ formatTanggalIndonesia($report['tanggal']) }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Perihal</td>
+                <td style="width: 25%; padding: 2px;">Perihal</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['perihal'] ?? '' }}</td>
             </tr>
@@ -75,24 +76,24 @@
         <table style="width: 100%">
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Nama Debitur</td>
+                <td style="width: 25%; padding: 2px;">Nama Debitur</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">KJPP</td>
+                <td style="width: 25%; padding: 2px;">KJPP</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ preg_replace('/^K\\d+ - /', '', $permohonan->penawaran->nama_kjpp_sebelumnya ?? '-') }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Jenis Aset</td>
+                <td style="width: 25%; padding: 2px;">Jenis Aset</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $data ?? '' }}</td>
             </tr>
 
             @if (!empty($report['lokasi']['address']))
                 <tr>
-                    <td style="width: 20%; padding: 2px;">Lokasi Objek Penilaian</td>
+                    <td style="width: 25%; padding: 2px;">Lokasi Objek Penilaian</td>
                     <td style="width: 1%;  padding: 2px;">:</td>
                     <td style="width: 79%;  padding: 2px;">{{ $report['lokasi']['address'] ?? '' }},
                         {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }},
@@ -103,22 +104,22 @@
             @include('lpj::component.print-out-dokument')
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Tanggal Penilaian</td>
+                <td style="width: 25%; padding: 2px;">Tanggal Penilaian</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Lelang ke</td>
+                <td style="width: 25%; padding: 2px;">Lelang ke</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['lelang_kjpp'] ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Nilai Pasar Wajar (NPW)</td>
+                <td style="width: 25%; padding: 2px;">Nilai Pasar Wajar (NPW)</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">
+                <td style="width: 25%; padding: 2px;">
                     Nilai Likuidasi
                     {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
                 </td>
@@ -142,25 +143,25 @@
 
         <table style="width: 100%">
             <tr>
-                <td style="width: 20%; padding: 2px;">Staf Subdit Appraisal </td>
+                <td style="width: 25%; padding: 2px;">Staf Subdit Appraisal </td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">
                     {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Pihak KJPP</td>
+                <td style="width: 25%; padding: 2px;">Pihak KJPP</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $forminspeksi['signature']['kjjp']['name'] ?? $report['pihak_kjjpp'] ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Pihak BAGI Cab </td>
+                <td style="width: 25%; padding: 2px;">Pihak BAGI Cab </td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $permohonan->user->name ?? '' }} -
                     {{ $permohonan->debiture->branch->name ?? '' }}</td>
             </tr>
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Debitur/perwakilan debitur </td>
+                <td style="width: 25%; padding: 2px;">Debitur/perwakilan debitur </td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
             </tr>
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index 7f69ede..39e8bd2 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -203,10 +203,10 @@
                 <td style="text-align: right;">
                     <div style="">
                         <p style="margin: 0; padding:0; font-size:10px;">
-                            Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }}
+                            Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
                         </p>
                         <p style="margin: 0; padding:0; font-size:10px;">
-                            Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }}
+                            Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
                         </p>
                         <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $surveyorUser->name }}</p>
                     </div>