diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index 9a1e7cd..18cc547 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -193,94 +193,7 @@
             <td>Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih</td>
         </tr>
         <tr>
-            <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=" 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=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                        <span>
-                            {{ ucwords(strtolower('PENILAI')) }}
-                        </span>
-                    </td>
-                    @if ($permohonan->approval_so != null)
-                        <td style=" padding: 4px;">
-                            {{ $senior_officer->name ?? '' }}</br>
-                            <span>
-                                {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                            </span>
-
-                        </td>
-                    @endif
-
-                    @if ($permohonan->approval_eo != null)
-                        <td style=" padding: 4px;">
-                            {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                            <span>
-                                {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
-                            </span>
-                        </td>
-                    @endif
-                    @if ($permohonan->approval_dd != null)
-                        <td style=" padding: 4px;">
-                            {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                            <span>
-                                {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                            </span>
-                        </td>
-                    @endif
-                </tr>
-            </table>
+            @include('lpj::penilai.components.signature-approval')
         </tr>
     </table>
 </main>
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 00303af..82a669a 100644
--- a/resources/views/penilai/components/print-out-call-report.blade.php
+++ b/resources/views/penilai/components/print-out-call-report.blade.php
@@ -229,93 +229,7 @@
                 <td>Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih</td>
             </tr>
             <tr>
-                <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=" 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=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                            <span>
-                                {{ ucwords(strtolower('PENILAI')) }}
-                            </span>
-                        </td>
-                        @if ($permohonan->approval_so != null)
-                            <td style=" padding: 4px;">
-                                {{ $senior_officer->name ?? '' }}</br>
-                                <span>
-                                    {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                                </span>
-
-                            </td>
-                        @endif
-
-                        @if ($permohonan->approval_eo != null)
-                            <td style=" padding: 4px;">
-                                {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                                <span>
-                                    {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
-                                </span>
-                            </td>
-                        @endif
-                        @if ($permohonan->approval_dd != null)
-                            <td style=" padding: 4px;">
-                                {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                                <span>
-                                    {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                                </span>
-                            </td>
-                        @endif
-                    </tr>
-                </table>
+               @include('lpj::penilai.components.signature-approval')
             </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 32e7432..4647d60 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -412,91 +412,6 @@
     @endisset
     <p>Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.</p>
 
-    <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=" 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=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                <span>
-                    {{ ucwords(strtolower('PENILAI')) }}
-                </span>
-            </td>
-            @if ($permohonan->approval_so != null)
-                <td style=" padding: 4px;">
-                    {{ $senior_officer->name ?? '' }}</br>
-                    <span>
-                        {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                    </span>
-
-                </td>
-            @endif
-
-            @if ($permohonan->approval_eo != null)
-                <td style=" padding: 4px;">
-                    {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                    <span>
-                        {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
-                    </span>
-                </td>
-            @endif
-            @if ($permohonan->approval_dd != null)
-                <td style=" padding: 4px;">
-                    {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                    <span>
-                        {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                    </span>
-                </td>
-            @endif
-        </tr>
-    </table>
+   @include('lpj::penilai.components.signature-approval')
 </main>
 @include('lpj::penilai.components.footer')
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php
index 3c35cb3..84f4481 100644
--- a/resources/views/penilai/components/print-out-standar.blade.php
+++ b/resources/views/penilai/components/print-out-standar.blade.php
@@ -374,94 +374,7 @@
             </tr>
         </table>
 
-        <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=" 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=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                    <span>
-                        {{ ucwords(strtolower('PENILAI')) }}
-                    </span>
-                </td>
-                @if ($permohonan->approval_so != null)
-                    <td style=" padding: 4px;">
-                        {{ $senior_officer->name ?? '' }}</br>
-                        <span>
-                            {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                        </span>
-
-                    </td>
-                @endif
-
-                @if ($permohonan->approval_eo != null)
-                    <td style=" padding: 4px;">
-                        {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                        <span>
-                            {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
-                        </span>
-                    </td>
-                @endif
-                @if ($permohonan->approval_dd != null)
-                    <td style=" padding: 4px;">
-                        {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                        <span>
-                            {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                        </span>
-                    </td>
-                @endif
-            </tr>
-        </table>
+        @include('lpj::penilai.components.signature-approval')
     </div>
     <hr />
     <table style="width: 100%; ">
diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php
new file mode 100644
index 0000000..f71d05c
--- /dev/null
+++ b/resources/views/penilai/components/signature-approval.blade.php
@@ -0,0 +1,105 @@
+<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=" 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=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
+                    <span>
+                        {{ ucwords(strtolower('PENILAI')) }}
+                    </span>
+                </br>
+                    <span>
+                        {{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }}
+                    </span>
+                </td>
+                @if ($permohonan->approval_so != null)
+                    <td style=" padding: 4px;">
+                        {{ $senior_officer->name ?? '' }}</br>
+                        <span>
+                            {{ ucwords(strtolower('SENIOR OFFICER')) }}
+                        </span>
+                         </br>
+                        <span>
+                             {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }}
+                        </span>
+                    </td>
+                @endif
+
+                @if ($permohonan->approval_eo != null)
+                    <td style=" padding: 4px;">
+                        {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                        <span>
+                            {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+                        </span>
+                    </br>
+                        <span>
+                            {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
+                        </span>
+                    </td>
+                @endif
+                @if ($permohonan->approval_dd != null)
+                    <td style=" padding: 4px;">
+                        {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                        <span>
+                            {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
+                        </span>
+                         </br>
+                        <span>
+                            {{
+                                isset($permohonan->approval_dd_at) ?
+                                formatTanggalIndonesia($permohonan->approval_dd_at) : '' }}
+                        </span>
+                    </td>
+                @endif
+            </tr>
+        </table>