diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index a77cc4e..19179a9 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -142,6 +142,13 @@
                 <td style="width: 20%; text-align: left;" class="header-left">
                     @include('lpj::component.logo-bag')
                 </td>
+                <td style="text-align: right;">
+                    <div style="">
+                        <p>Tanggal: {{ date('Y-m-d') }}</p>
+                        <p>Waktu: {{ date('H:i:s') }}</p>
+                        <p>User: {{ Auth::user()->name }}</p>
+                    </div>
+                </td>
             </tr>
         </table>
     </header>
@@ -150,7 +157,8 @@
         <table style="width: 100%">
             <tr>
                 <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>
+                    <h2 style="text-decoration: underline; text-transform: uppercase; text-align: center; margin: 0;">
+                        MEMO ANTAR KANTOR</h2>
                 </td>
             </tr>
         </table>
@@ -185,8 +193,9 @@
         <table>
             <tr>
                 <td>
-                    Menindak lanjuti permintann penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang  {{ $permohonan->debiture->branch->name ?? '' }}
-                    tanggal {{formatTanggalIndonesia($memo['tanggal']) ?? ''}}, dapat di sampaikan sebagai berikut:
+                    Menindak lanjuti permintann penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang
+                    {{ $permohonan->debiture->branch->name ?? '' }}
+                    tanggal {{ formatTanggalIndonesia($memo['tanggal']) ?? '' }}, dapat di sampaikan sebagai berikut:
                 </td>
             </tr>
         </table>
@@ -262,7 +271,9 @@
             <tr>
                 <td style="width: 20%; padding: 2px;">Lokasi Jaminan</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
-                <td style="width: 79%;  padding: 2px;">{{ $memo['lokasi']['address'] ?? '' }}, {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }}, {{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }} </td>
+                <td style="width: 79%;  padding: 2px;">{{ $memo['lokasi']['address'] ?? '' }},
+                    {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }},
+                    {{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }} </td>
             </tr>
         </table>
 
@@ -276,11 +287,12 @@
             </tr>
         </table>
 
-        <table  style="width: 100%">
+        <table style="width: 100%">
             <tr>
                 <td style="width: 20%; padding: 2px;">Tanggal Kunjungan</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
-                <td style="width: 79%;  padding: 2px;">{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
+                <td style="width: 79%;  padding: 2px;">
+                    {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
             </tr>
             <tr>
                 <td style="width: 20%; padding: 2px;">Surveyor</td>
@@ -343,32 +355,39 @@
                         <td style="height: 50px"></td>
                     </tr>
                     @php
-
                         use Modules\Usermanagement\Models\User;
                     @endphp
                     <tr>
-                        <td   >{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                            <span style="text-transform: uppercase; margin: 0; ">
+                        <td>{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
+                            <span style=" margin: 0; ">
 
-                                PENILAI
+                                {{ ucwords(strtolower('PENILAI')) }}
                             </span>
                         </td>
-                        <td  > {{ $senior_officer->name ?? '' }}</br>
-                            <span style="text-transform: uppercase; margin: 0; ">
-                                SENIOR OFFICER
-                            </span>
+                        <td>
+                            @if ($permohonan->approval_so != null)
+                                {{ $senior_officer->name ?? '' }}</br>
+                                <span style=" margin: 0; ">
+                                    {{ ucwords(strtolower('SENIOR OFFICER')) }}
+                                </span>
+                            @endif
                         </td>
-                        <td  > {{ $senior_officer->name ?? '' }}</br>
-                            <span style="text-transform: uppercase; margin: 0; ">
+                        <td>
+                            @if ($permohonan->approval_eo != null)
+                                {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                                <span style=" margin: 0; ">
 
-                                EXECUTIVE OFFICER
-                            </span>
+                                    {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+                                </span>
+                            @endif
                         </td>
-                        <td  > {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                            <span style="text-transform: uppercase; margin: 0; ">
-                                Deputy Director
-
-                            </span>
+                        <td>
+                            @if ($permohonan->approval_dd != null)
+                                {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                                <span style=" margin: 0; ">
+                                    {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
+                                </span>
+                            @endif
                         </td>
                     </tr>
                 </table>
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index 9ec7a7d..5e564a4 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -363,15 +363,21 @@
 
             <tr>
                 <td></td>
-                <td>{{ User::role('DD Appraisal')->first()->name ?? '' }}
-                    <br>DEPUTY DIRECTOR
+                <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
+                    <br>{{ ucwords(strtolower('PENILAI'))}}
                 </td>
                 <td>
+                    @if ($permohonan->approval_eo != null)
                     {{ $senior_officer->name ?? '' }}
-                    <br> SENIOR OFFICER
+                    <br> {{ ucwords(strtolower('SENIOR OFFICER'))}}
+                    @endif
                 </td>
-                <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
-                    <br>PENILAI
+               
+                <td>
+                    @if ($permohonan->approval_dd != null)
+                    {{ User::role('DD Appraisal')->first()->name ?? '' }}
+                    <br>{{ ucwords(strtolower('DEPUTY DIRECTOR'))}}
+                    @endif
                 </td>
             </tr>
         </table>
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 8321009..2545e7b 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -1064,52 +1064,80 @@
                     maupun extern</td>
             </tr>
             <tr>
-                <table style="width: 100%; border-collapse: collapse; text-align: center;" border="1">
+                <table style="width: 100%; border-collapse: collapse; text-align: center;" >
                     @php
                         use Modules\Usermanagement\Models\User;
+                        $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
+                    $imagePathPenilai = storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign);
+
+                    $soUser = User::where('id', $senior_officer->id)->first();
+                    $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
+
+
+                    $imagePathEO = storage_path('app/public/signatures/' . User::role('EO Appraisal')->first()->id . '/'. User::role('EO Appraisal')->first()->sign);
+
+                    $imagePathDD = storage_path('app/public/signatures/' . User::role('DD Appraisal')->first()->id . '/'. User::role('DD Appraisal')->first()->sign);
                     @endphp
-                    <tr>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px">
-
-                        </td>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px"></td>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px"></td>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px">
-                            @php
-                                $imagePath = storage_path('app/public/signature/' . User::role('EO Appraisal')->first()->id . '/'. User::role('EO Appraisal')->first()->sign);
-
-                            @endphp
-                            @if (file_exists($imagePath))
-                                <img src="{{ $imagePath }}" alt="{{ $imagePath }}" class="photo-image">
+                     <tr>
+                        <td style=" padding: 4px;height: 50px">
+                            @if (file_exists($imagePathPenilai))
+                                <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
                             @endif
                         </td>
+                        @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;height: 50px">
+                            @if (file_exists($imagePathSo))
+                                <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
+                            @endif
+                        </td>
+                        @endif
+                        @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;height: 50px">
+                            @if (file_exists($imagePathEO))
+                                <img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
+                            @endif
+                        </td>
+                        @endif
+                        @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;height: 50px">
+                            @if (file_exists($imagePathDD))
+                                <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
+                            @endif
+                        </td>
+                        @endif
                     </tr>
                     <tr>
-                        <td style="border: 1px solid #000; padding: 4px;">
-                            {{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                PENILAI
-                            </strong>
+                        <td style=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
+                            <span >
+                                {{ ucwords(strtolower('PENILAI'))}}
+                            </span>
                         </td>
-                        <td style="border: 1px solid #000; padding: 4px;"> {{ $senior_officer->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                SENIOR OFFICER
-                            </strong>
-
+                        @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;">  
+                         {{ $senior_officer->name ?? '' }}</br>
+                            <span >
+                                {{ ucwords(strtolower('SENIOR OFFICER'))}}
+                            </span>
+                            
                         </td>
+                        @endif
 
-                        <td style="border: 1px solid #000; padding: 4px;">
+                        @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;">
                             {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                EXECUTIVE OFFICER
-                            </strong>
+                            <span >
+                                {{ ucwords(strtolower('EXECUTIVE OFFICER'))}}
+                            </span>
                         </td>
-                        <td style="border: 1px solid #000; padding: 4px;">
+                        @endif
+                        @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;">
                             {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                DEPUTY DIRECTOR
-                            </strong>
+                            <span >
+                                {{ ucwords(strtolower('DEPUTY DIRECTOR'))}}
+                            </span>
                         </td>
+                        @endif
                     </tr>
                 </table>
             </tr>
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php
index 1066e31..e755eaf 100644
--- a/resources/views/penilai/components/print-out-standard.blade.php
+++ b/resources/views/penilai/components/print-out-standard.blade.php
@@ -1547,7 +1547,7 @@
                         </table>
 
 
-                <table style="width: 100%; border-collapse: collapse; text-align: center;" border="1">
+                <table style="width: 100%; border-collapse: collapse; text-align: center;" >
                     @php
                     use Modules\Usermanagement\Models\User;
 
@@ -1563,52 +1563,65 @@
                     $imagePathDD = storage_path('app/public/signatures/' . User::role('DD Appraisal')->first()->id . '/'. User::role('DD Appraisal')->first()->sign);
                 @endphp
                     <tr>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px">
+                        <td style=" padding: 4px;height: 50px">
                             @if (file_exists($imagePathPenilai))
                                 <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
                             @endif
                         </td>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px">
+                        @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;height: 50px">
                             @if (file_exists($imagePathSo))
                                 <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
                             @endif
                         </td>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px">
+                        @endif
+                        @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;height: 50px">
                             @if (file_exists($imagePathEO))
                                 <img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
                             @endif
                         </td>
-                        <td style="border: 1px solid #000; padding: 4px;height: 50px">
+                        @endif
+                        @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;height: 50px">
                             @if (file_exists($imagePathDD))
                                 <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
                             @endif
                         </td>
+                        @endif
                     </tr>
                     <tr>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                PENILAI
-                            </strong>
+                        <td style=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
+                            <span >
+                                {{ ucwords(strtolower('PENILAI'))}}
+                            </span>
                         </td>
-                        <td style="border: 1px solid #000; padding: 4px;"> {{ $senior_officer->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                SENIOR OFFICER
-                            </strong>
-
+                        @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;">  
+                         {{ $senior_officer->name ?? '' }}</br>
+                            <span >
+                                {{ ucwords(strtolower('SENIOR OFFICER'))}}
+                            </span>
+                            
                         </td>
+                        @endif
 
-                        <td style="border: 1px solid #000; padding: 4px;">
+                        @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;">
                             {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                EXECUTIVE OFFICER
-                            </strong>
+                            <span >
+                                {{ ucwords(strtolower('EXECUTIVE OFFICER'))}}
+                            </span>
                         </td>
-                        <td style="border: 1px solid #000; padding: 4px;">
+                        @endif
+                        @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;">
                             {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                            <strong style="font-weight: bold; ">
-                                DEPUTY DIRECTOR
-                            </strong>
+                            <span >
+                                {{ ucwords(strtolower('DEPUTY DIRECTOR'))}}
+                            </span>
                         </td>
+                        @endif
                     </tr>
                 </table>
 
diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php
index 522b33e..bd97145 100644
--- a/resources/views/penilai/components/print-resume.blade.php
+++ b/resources/views/penilai/components/print-resume.blade.php
@@ -141,6 +141,13 @@
                 <td style="width: 20%; text-align: left;" class="header-left">
                     @include('lpj::component.logo-bag')
                 </td>
+                <td style="text-align: right;">
+                    <div style="">
+                        <p>Tanggal: {{ date('Y-m-d') }}</p>
+                        <p>Waktu: {{ date('H:i:s') }}</p>
+                        <p>User: {{ Auth::user()->name }}</p>
+                    </div>
+                </td>
             </tr>
         </table>
     </header>
@@ -304,7 +311,7 @@
                     <td style="border: 1px solid #000; padding: 4px;">{{ $item['sertifikat'] ?? '' }}</td>
                     <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_tanah'] ?? '' }}</td>
                     <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_bangunan'] ?? '' }}</td>
-                    <td style="border: 1px solid #000; padding: 4px;">{{ $item['nilai'] ?? '' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($item['nilai']) ?? '' }}</td>
                 </tr>
             @endforeach
         </table>
@@ -329,7 +336,7 @@
                     <td style="border: 1px solid #000; padding: 4px;">{{ $item['sertifikat'] ?? '' }}</td>
                     <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_tanah'] ?? '' }}</td>
                     <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_bangunan'] ?? '' }}</td>
-                    <td style="border: 1px solid #000; padding: 4px;">{{ $item['nilai'] ?? '' }}</td>
+                    <td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($item['nilai']) ?? '' }}</td>
                 </tr>
             @endforeach
         </table>
@@ -357,7 +364,7 @@
                         <td style="border: 1px solid #000; padding: 4px;">{{ $item['sertifikat'] ?? '-' }}</td>
                         <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_tanah'] ?? '-' }}</td>
                         <td style="border: 1px solid #000; padding: 4px;">{{ $item['luas_bangunan'] ?? '-' }}</td>
-                        <td style="border: 1px solid #000; padding: 4px;">{{ $item['nilai'] ?? '-' }}</td>
+                        <td style="border: 1px solid #000; padding: 4px;">{{ formatRupiah($item['nilai']) ?? '-' }}</td>
                     </tr>
                 </table>
             @endforeach
@@ -383,7 +390,7 @@
                             <label style="font-weight: bold;">DISCLAIMER</label>
                             <div>
                                 <ol style="padding-left: 20px; list-style-type: decimal; margin-top: 0;">
-                                    <li style="margin-bottom: 5px;">LAPORAN RESUME INI DIKELUARKAN DIKARENAKAN BELUM
+                                    <li style="margin-bottom: 5px; ">LAPORAN RESUME INI DIKELUARKAN DIKARENAKAN BELUM
                                         DILAKUKANNYA PEMBAYARAN BIAYA PENILAIAN JAMINAN</li>
                                     <li style="margin-bottom: 5px;">LAPORAN RESUME INI TIDAK BISA DIJADIKAN SEBAGAI
                                         DASAR PENGAJUAN DAN ATAU PENCAIRAN KREDIT, LAPORAN YANG DIGUNAKAN TETAP WAJIB
@@ -395,7 +402,7 @@
                                     <li style="margin-bottom: 5px;">LAPORAN RESUME INI HANYA BERLAKU <span style="color:red;">14 HARI KALENDER </span>
                                         TERHITUNG DARI TANGGAL RESUME INI DIBUAT SESUAI ATURAN YANG BERLAKU, APABILA
                                         LEWAT MAKA HARUS DILAKUKAN ORDER ULANG SESUAI PROSEDUR YANG BERLAKU</li>
-                                    <li style="margin-bottom: 5px;">Apabila sudah melewati 6 bulan, maka harus penilaian
+                                    <li style="margin-bottom: 5px; text-transform: uppercase;">Apabila sudah melewati 6 bulan, maka harus penilaian
                                         ulang kembali</li>
                                 </ol>
                             </div>
@@ -415,22 +422,31 @@
 
                     </tr>
                     <tr>
-                        <td>{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                            PENILAI
+                        <td> {{ $surveyor->userPenilaiTeam->name ?? '' }}</br>
+                            {{ ucwords(strtolower('SURVEYOR'))}}
                         </td>
-                        <td> {{ $senior_officer->name ?? '' }}</br>
-                            SENIOR OFFICER
+                        <td>{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
+                            {{ ucwords(strtolower('PENILAI'))}}
+                        </td>
+
+
+                        <td>
+                            @if ($permohonan->approval_so)
+                             {{ $senior_officer->name ?? '' }}</br>
+                            {{ ucwords(strtolower('SENIOR OFFICER'))}}
+                            @endif
                         </td>
 
                         @php
                             use Modules\Usermanagement\Models\User;
                         @endphp
-                        <td> {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                            EXECUTIVE OFFICER
-                        </td>
-                        <td> {{ $surveyor->userPenilaiTeam->name ?? '' }}</br>
-                            SURVEYOR
+                        <td> 
+                            @if ($permohonan->approval_eo != null)
+                            {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                            {{ ucwords(strtolower('EXECUTIVE OFFICER'))}}
+                            @endif
                         </td>
+                        
                     </tr>
                 </table>
             </tr>