From 968adae26fc1a9d4a9b891b3e667fcd1dcf7a6de Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 17 Feb 2025 10:00:11 +0700 Subject: [PATCH] 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. --- .../penilai/components/print-resume.blade.php | 94 +++++++++---------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index 8ef56e2..cfef26e 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -241,10 +241,9 @@ {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }} - {{ formatRupiah($item['nilai']) ?? '' }} - + {{ isset($item['nilai']) ? formatRupiah($item['nilai']) : '-' }} - {{ formatRupiah($item['total_likuidasi']) ?? '' }} + {{ isset($item['total_likuidasi']) ? formatRupiah($item['total_likuidasi']) : '-' }} @endforeach @@ -277,10 +276,9 @@ {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }} - {{ formatRupiah($item['nilai']) ?? '' }} - + {{ isset($item['nilai']) ? formatRupiah($item['nilai']) : '-' }} - {{ formatRupiah($item['total_likuidasi']) ?? '' }} + {{ isset($item['total_likuidasi']) ? formatRupiah($item['total_likuidasi']) : '-' }} @endforeach @@ -313,11 +311,9 @@ {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }} - {{ formatRupiah($item['nilai']) ?? '-' }} - - + {{ isset($item['nilai']) ? formatRupiah($item['nilai']) : '-' }} - {{ formatRupiah($item['total_likuidasi']) ?? '' }} + {{ isset($item['total_likuidasi']) ? formatRupiah($item['total_likuidasi']) : '-' }} @endforeach @@ -369,45 +365,45 @@ Demikian Kami Sampaikan, atas perhatiannya kami ucapkan terimakasih - - - - - - - - - - - - - - @php - use Modules\Usermanagement\Models\User; - @endphp - - - - -
{{ $penilai->userPenilaiTeam->name ?? '' }}
- {{ ucwords(strtolower('PENILAI')) }} -
- @if ($permohonan->approval_so) - {{ $senior_officer->name ?? '' }}
- {{ ucwords(strtolower('SENIOR OFFICER')) }} - @endif -
- @if ($permohonan->approval_eo != null) - {{ User::role('EO Appraisal')->first()->name ?? '' }}
- {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} - @endif -
- @if ($permohonan->approval_eo != null) - {{ User::role('DD Appraisal')->first()->name ?? '' }}
- {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} - @endif -
- + + + + +
+ + + + + + + + + @php + $eoUser = \Modules\Usermanagement\Models\User::role('EO Appraisal')->first(); + $ddUser = \Modules\Usermanagement\Models\User::role('DD Appraisal')->first(); + @endphp + + + +
{{ $penilai->userPenilaiTeam->name ?? '' }}
+ {{ ucwords(strtolower('PENILAI')) }} +
+ @if ($permohonan->approval_so) + {{ $senior_officer->name ?? '' }}
+ {{ ucwords(strtolower('SENIOR OFFICER')) }} + @endif +
+ @if ($permohonan->approval_eo != null) + {{ $eoUser->name ?? '' }}
+ {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} + @endif +
+ @if ($permohonan->approval_eo != null) + {{ $ddUser->name ?? '' }}
+ {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} + @endif +
+