fix(print-resume): perbaiki validasi dan format tampilan nilai

- Mengubah cara menampilkan nilai dan total likuidasi agar lebih jelas.
- Mengganti penggunaan operator null coalescing dengan pengecekan isset untuk menghindari tampilan kosong.
- Memperbaiki struktur HTML untuk bagian penilai dan pejabat terkait.
This commit is contained in:
Daeng Deni Mardaeni
2025-02-17 10:00:11 +07:00
parent e328852ffe
commit 968adae26f

View File

@@ -241,10 +241,9 @@
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td> {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td>
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ formatRupiah($item['nilai']) ?? '' }}</td> {{ isset($item['nilai']) ? formatRupiah($item['nilai']) : '-' }}</td>
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ formatRupiah($item['total_likuidasi']) ?? '' }}</td> {{ isset($item['total_likuidasi']) ? formatRupiah($item['total_likuidasi']) : '-' }}</td>
</tr> </tr>
@endforeach @endforeach
</table> </table>
@@ -277,10 +276,9 @@
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td> {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td>
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ formatRupiah($item['nilai']) ?? '' }}</td> {{ isset($item['nilai']) ? formatRupiah($item['nilai']) : '-' }}</td>
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ formatRupiah($item['total_likuidasi']) ?? '' }}</td> {{ isset($item['total_likuidasi']) ? formatRupiah($item['total_likuidasi']) : '-' }}</td>
</tr> </tr>
@endforeach @endforeach
</table> </table>
@@ -313,11 +311,9 @@
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td> {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }}</td>
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ formatRupiah($item['nilai']) ?? '-' }} {{ isset($item['nilai']) ? formatRupiah($item['nilai']) : '-' }}</td>
</td>
<td style="border: 1px solid #000; padding: 4px; text-align: center"> <td style="border: 1px solid #000; padding: 4px; text-align: center">
{{ formatRupiah($item['total_likuidasi']) ?? '' }}</td> {{ isset($item['total_likuidasi']) ? formatRupiah($item['total_likuidasi']) : '-' }}</td>
</tr> </tr>
</table> </table>
@endforeach @endforeach
@@ -369,45 +365,45 @@
<tr> <tr>
<td>Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih</td> <td>Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih</td>
</tr> </tr>
<tr> <table style="width: 100%;">
<table style="width: 100%; text-align: center;"> <tr>
<tr> <td>
<td style="height: 50px"></td> <table style="width: 100%; text-align: center;">
<td style="height: 50px"></td> <tr>
<td style="height: 50px"></td>
</tr> <td style="height: 50px"></td>
<tr> </tr>
<td>{{ $penilai->userPenilaiTeam->name ?? '' }}</br> <tr>
{{ ucwords(strtolower('PENILAI')) }} <td>{{ $penilai->userPenilaiTeam->name ?? '' }}<br>
</td> {{ ucwords(strtolower('PENILAI')) }}
</td>
<td>
<td> @if ($permohonan->approval_so)
@if ($permohonan->approval_so) {{ $senior_officer->name ?? '' }}<br>
{{ $senior_officer->name ?? '' }}</br> {{ ucwords(strtolower('SENIOR OFFICER')) }}
{{ ucwords(strtolower('SENIOR OFFICER')) }} @endif
@endif </td>
</td> @php
$eoUser = \Modules\Usermanagement\Models\User::role('EO Appraisal')->first();
@php $ddUser = \Modules\Usermanagement\Models\User::role('DD Appraisal')->first();
use Modules\Usermanagement\Models\User; @endphp
@endphp <td>
<td> @if ($permohonan->approval_eo != null)
@if ($permohonan->approval_eo != null) {{ $eoUser->name ?? '' }}<br>
{{ User::role('EO Appraisal')->first()->name ?? '' }}</br> {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
{{ ucwords(strtolower('EXECUTIVE OFFICER')) }} @endif
@endif </td>
</td> <td>
<td> @if ($permohonan->approval_eo != null)
@if ($permohonan->approval_eo != null) {{ $ddUser->name ?? '' }}<br>
{{ User::role('DD Appraisal')->first()->name ?? '' }}</br> {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
{{ ucwords(strtolower('DEPUTY DIRECTOR')) }} @endif
@endif </td>
</td> </tr>
</table>
</tr> </td>
</table> </tr>
</tr> </table>
</table> </table>
<div class="page-break"></div> <div class="page-break"></div>