From 61c5690e3838603be67b5d0cfb4b5e1e9ead7ff9 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 19 Feb 2025 17:34:13 +0700
Subject: [PATCH] perbaikan signature di print out

---
 .../penilai/components/print-memo.blade.php   |  95 ++++++++++-----
 .../components/print-out-rap.blade.php        |  17 +--
 .../penilai/components/print-resume.blade.php | 108 +++++++++++++-----
 3 files changed, 158 insertions(+), 62 deletions(-)

diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index f45c59e..87838e2 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -254,49 +254,90 @@
             <td>Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih</td>
         </tr>
         <tr>
-            <table style="width: 100%; text-align: center;">
-
-                <tr>
-                    <td style="height: 50px"></td>
-                    <td style="height: 50px"></td>
-                    <td style="height: 50px"></td>
-                    <td style="height: 50px"></td>
-                </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>{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
-                        <span style=" margin: 0; ">
-
+                    <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>
-                    <td>
-                        @if ($permohonan->approval_so != null)
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;">
                             {{ $senior_officer->name ?? '' }}</br>
-                            <span style=" margin: 0; ">
+                            <span>
                                 {{ ucwords(strtolower('SENIOR OFFICER')) }}
                             </span>
-                        @endif
-                    </td>
-                    <td>
-                        @if ($permohonan->approval_eo != null)
-                            {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                            <span style=" margin: 0; ">
 
+                        </td>
+                    @endif
+
+                    @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;">
+                            {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                            <span>
                                 {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
                             </span>
-                        @endif
-                    </td>
-                    <td>
-                        @if ($permohonan->approval_dd != null)
+                        </td>
+                    @endif
+                    @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;">
                             {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
-                            <span style=" margin: 0; ">
+                            <span>
                                 {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
                             </span>
-                        @endif
-                    </td>
+                        </td>
+                    @endif
                 </tr>
             </table>
         </tr>
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index b6c1bd8..a69fbd9 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -35,7 +35,7 @@ $data = rtrim($data, ', ');
             </td>
         </tr>
     </table>
- 
+
     <table style="width: 100%;">
         <tr>
             <td style="width: 20%; padding: 2px; vertical-align: top;">Kepada</td>
@@ -131,7 +131,7 @@ $data = rtrim($data, ', ');
     </table>
     <h2 style="text-transform: uppercase;">DOKUMEN TERLAMPIR</h2>
     <table style="width: 100%;">
-       
+
         @if (@isset($dokumen))
             @foreach ($dokumen->detail as $detail)
                 <tr>
@@ -458,9 +458,10 @@ $data = rtrim($data, ', ');
     @endisset
     <p>Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.</p>
 
-    <table style="width: 100%; text-align: center;">
+    <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);
 
@@ -509,11 +510,11 @@ $data = rtrim($data, ', ');
                 </td>
             @endif
         </tr>
-
         <tr>
-            <td></td>
-            <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
-                <br>{{ ucwords(strtolower('PENILAI')) }}
+            <td style=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
+                <span>
+                    {{ ucwords(strtolower('PENILAI')) }}
+                </span>
             </td>
             @if ($permohonan->approval_so != null)
                 <td style=" padding: 4px;">
@@ -524,6 +525,7 @@ $data = rtrim($data, ', ');
 
                 </td>
             @endif
+
             @if ($permohonan->approval_eo != null)
                 <td style=" padding: 4px;">
                     {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
@@ -532,7 +534,6 @@ $data = rtrim($data, ', ');
                     </span>
                 </td>
             @endif
-
             @if ($permohonan->approval_dd != null)
                 <td style=" padding: 4px;">
                     {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php
index cfef26e..d5e197c 100644
--- a/resources/views/penilai/components/print-resume.blade.php
+++ b/resources/views/penilai/components/print-resume.blade.php
@@ -368,37 +368,91 @@
         <table style="width: 100%;">
             <tr>
                 <td>
-                    <table style="width: 100%; text-align: center;">
+                    <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="height: 50px"></td>
-                            <td style="height: 50px"></td>
+                            <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>{{ $penilai->userPenilaiTeam->name ?? '' }}<br>
-                                {{ ucwords(strtolower('PENILAI')) }}
-                            </td>
-                            <td>
-                                @if ($permohonan->approval_so)
-                                    {{ $senior_officer->name ?? '' }}<br>
-                                    {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                                @endif
-                            </td>
-                            @php
-                                $eoUser = \Modules\Usermanagement\Models\User::role('EO Appraisal')->first();
-                                $ddUser = \Modules\Usermanagement\Models\User::role('DD Appraisal')->first();
-                            @endphp
-                            <td>
-                                @if ($permohonan->approval_eo != null)
-                                    {{ $eoUser->name ?? '' }}<br>
-                                    {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
-                                @endif
-                            </td>
-                            <td>
-                                @if ($permohonan->approval_eo != null)
-                                    {{ $ddUser->name ?? '' }}<br>
-                                    {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                                @endif
+                            <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>
                 </td>