diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 6faedd7..a840ef2 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -1,32 +1,38 @@
+@if (@isset($dokumen))
+    @foreach ($dokumen->detail as $detail)
+        @if (!empty($detail->name) && !empty($detail->details) )
+            <tr>
+                <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
+            </tr>
+        @endif
 
-    @if (@isset($dokumen))
-        @foreach ($dokumen->detail as $detail)
-            @if (isset($detail->dokumen_jaminan))
-                <tr>
-                    <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
-                </tr>
-            @endif
+        @if (isset($detail->details))
+            @php
+                $details = json_decode($detail->details, true);
+            @endphp
 
-            @if (isset($detail->details))
-                @if (json_decode($detail->details))
-                    @foreach (json_decode($detail->details) as $value)
+            @if (is_array($details) && count($details) > 0)
+                @foreach ($details as $value)
+                    @if (is_array($value))
                         @foreach ($value as $key => $item)
-                            <tr>
-                                <td style="padding: 2px;">
-                                    {{ formatLabel($key) }}
-                                </td>
-                                <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
-                                <td style="padding: 2px;">
-                                    {{ $item }}
-                                    @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                        <sup>m2</sup>
-                                    @endif
-                                </td>
-                            </tr>
+                            @if (!empty($item))
+                                <tr>
+                                    <td style="padding: 2px;">
+                                        {{ formatLabel($key) }}
+                                    </td>
+                                    <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
+                                    <td style="padding: 2px;">
+                                        {{ $item }}
+                                        @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                            <sup>m2</sup>
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endif
                         @endforeach
-                    @endforeach
-                @endif
+                    @endif
+                @endforeach
             @endif
-        @endforeach
-    @endif
-
+        @endif
+    @endforeach
+@endif
diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php
index 1ded708..e91d01d 100644
--- a/resources/views/penilai/components/footer.blade.php
+++ b/resources/views/penilai/components/footer.blade.php
@@ -91,7 +91,7 @@
     </div>
 
 <footer id="footer">
-    Cabang : {{ $permohonan->debiture->branch->name ?? '' }}
+    {{-- Cabang : {{ $permohonan->debiture->branch->name ?? '' }} --}}
 </footer>
 <script type="text/php">
     if (isset($pdf)) {
diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php
index 606b807..b16c777 100644
--- a/resources/views/penilai/components/header.blade.php
+++ b/resources/views/penilai/components/header.blade.php
@@ -96,8 +96,40 @@
     }
     </style>
 </head>
+@php
+    $data = '';
+    foreach ($permohonan->documents as $dokumen) {
+        $data .= $dokumen->jenisJaminan->name . ', ';
+
+        $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
+        $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
+        $teams = $permohonan->region->teams;
+
+        if ($teams) {
+            foreach ($teams as $team) {
+                $team_users = $team->teamsUsers;
+                // print_r($team_users);
+                if ($team_users) {
+                    foreach ($team_users as $team_user) {
+                        $user = $team_user->user;
+
+                        if ($user && $user->hasRole('senior-officer')) {
+                            $senior_officer = $user;
+                            break 3;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    use Modules\Usermanagement\Models\User;
+    $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first();
+
+    $data = rtrim($data, ', ');
+@endphp
 
 <body style="width: 90%; margin: auto;">
+
     <header id="header">
         <table style="width: 100%; border: none;">
             <tr>
@@ -105,11 +137,13 @@
                     @include('lpj::component.logo-bag', ['width' => 150, 'height' => 40])
                 </td>
                 <td style="text-align: right;">
-                    <div style="">
-                        <p style="margin: 0; padding:0; font-size:10px;">Tanggal: {{ date('Y-m-d') }}</p>
-                        <p style="margin: 0; padding:0;  font-size:10px;">Waktu: {{ date('H:i:s') }}</p>
-                        <p style="margin: 0; padding:0;  font-size:10px;">User: {{ Auth::user()->name }}</p>
-                    </div>
+                    <p style="margin: 0; padding:0; font-size:10px;">
+                        Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->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') }}
+                    </p>
+                    <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $surveyorUser->name }}</p>
                 </td>
             </tr>
         </table>
diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php
index bef8511..b6f184c 100644
--- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php
+++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php
@@ -53,7 +53,7 @@
             @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
                 <a class="btn btn-info"
                     href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
-                    Lampiran Foto dan Dokument
+                    Lampiran Foto dan Dokumen
                 </a>
                 <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
                     >
diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php
index fb5db32..42e304f 100644
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -211,7 +211,7 @@
             <div class="card">
                 <div class="card-header bg-agi-50">
                     <h3 class="card-title uppercase">
-                        Dokument
+                        Dokumen
                     </h3>
                 </div>
                 <div class="card-body grid gap-5">
@@ -323,7 +323,7 @@
                 @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']))
                     <a class="btn btn-info"
                         href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
-                        Lampiran Foto dan Dokument
+                        Lampiran Foto dan Dokumen
                     </a>
                     <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}"
                         class="btn btn-light">
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 98b142d..acce9e1 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -45,7 +45,7 @@
                         <td style="padding: 2px; vertical-align: top;">Tanggal Order</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">
-                            {{ formatTanggalIndonesia($permohonan->created_at) }}</td>
+                            {{ formatTanggalIndonesia($permohonan->tanggal_permohonan) }}</td>
                     </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Tanggal Survey</td>
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php
index b8f1e2c..60fee0e 100644
--- a/resources/views/penilai/components/print-out-standard.blade.php
+++ b/resources/views/penilai/components/print-out-standard.blade.php
@@ -73,13 +73,13 @@
                         <td style="width: 25%; padding: 2px;">Tanggal Order</td>
                         <td style="width: 1%;  padding: 2px;">:</td>
                         <td style="vertical-align: top;  padding: 2px;">
-                            {{ formatTanggalIndonesia($permohonan->create_at) }}</td>
+                            {{ formatTanggalIndonesia($permohonan->tanggal_permohonan) }}</td>
                     </tr>
                     <tr>
-                        <td style="width: 25%; padding: 2px;">Tannggal Survey</td>
+                        <td style="width: 25%; padding: 2px;">Tanggal Survey</td>
                         <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                         <td style="vertical-align: top; width: 79%;">
-                            {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
+                            {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
                         </td>
                     </tr>
                 </table>
@@ -154,7 +154,7 @@
         </table>
     </div>
 
-    <div class="no-break">
+    {{-- <div class="no-break"> --}}
         <table style="width: 100%; ">
             <tr>
                 <td style="width: 100%; border: 1px solid #000; text-align: center;">
@@ -165,7 +165,7 @@
         <table style="width: 100%; ">
         @include('lpj::component.print-out-dokument')
     </table>
-    </div>
+    {{-- </div> --}}
 
     <div class="no-break">
         <table style="width: 100%; ">
diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php
index e339c48..de2290a 100644
--- a/resources/views/penilai/components/print-resume.blade.php
+++ b/resources/views/penilai/components/print-resume.blade.php
@@ -1,32 +1,5 @@
 @include('lpj::penilai.components.header')
-@php
-    $data = '';
-    foreach ($permohonan->documents as $dokumen) {
-        $data .= $dokumen->jenisJaminan->name . ', ';
 
-        $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
-        $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
-        $teams = $permohonan->region->teams;
-
-        if ($teams) {
-            foreach ($teams as $team) {
-                $team_users = $team->teamsUsers;
-                // print_r($team_users);
-                if ($team_users) {
-                    foreach ($team_users as $team_user) {
-                        $user = $team_user->user;
-
-                        if ($user && $user->hasRole('senior-officer')) {
-                            $senior_officer = $user;
-                            break 3;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    $data = rtrim($data, ', ');
-@endphp
 
 <main class="content">
     <table style="width: 100%">
diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php
index b7dc69b..1f3b622 100644
--- a/resources/views/penilai/components/rap-penilai.blade.php
+++ b/resources/views/penilai/components/rap-penilai.blade.php
@@ -78,7 +78,7 @@
                 @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
                     <a class="btn btn-info"
                         href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
-                        Lampiran Foto dan Dokument
+                        Lampiran Foto dan Dokumen
                     </a>
                     <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
                         >
diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php
index c819ca8..e8010fd 100644
--- a/resources/views/penilai/components/resume.blade.php
+++ b/resources/views/penilai/components/resume.blade.php
@@ -432,7 +432,7 @@
                         @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
                             <a class="btn btn-info"
                                 href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
-                                Lampiran Foto dan Dokument
+                                Lampiran Foto dan Dokumen
                             </a>
                             <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}"
                                 class="btn btn-light">