daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨(ui-penilai): Konsolidasi tampilan migrasi, fallback user, dan label tanggal penilaian

Browse Source 
- Menyesuaikan tampilan & logika untuk data permohonan hasil migrasi (is_mig)
- Tambahkan fallback user untuk SO, EO, dan DD agar nama tetap muncul meski data tidak lengkap
- Ubah label 'Tanggal Survei' menjadi 'Tanggal Penilaian' untuk konsistensi di seluruh halaman
- Perbaiki struktur & border tabel tanda tangan approval, tambahkan bold pada jabatan
- Sesuaikan kondisi tombol laporan agar hanya bergantung pada status_bayar
- Tambahkan logika decode mig_permohonan di print-out-sederhana untuk data migrasi
- Tambahkan fallback AO name dari data migrasi dan perhitungan hari kerja khusus is_mig
- Perbaiki struktur HTML, indentasi, dan formatting di semua view terkait
- File diubah: laporan/index, analisa/informasi, signature-approval, show, print-out-sederhana
This commit is contained in:
Daeng Deni Mardaeni
2025-10-13 16:46:43 +07:00
parent 291811b74a
commit c981237663
7 changed files with 239 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
resources/views/penilai/components/signature-approval.blade.php
View File

@@ -1,4 +1,4 @@
<table style="width: 100%; border-collapse: collapse; text-align: center;">
<table style="width: 100%; border-collapse: collapse; text-align: center;" border="1">
@php
use Modules\Usermanagement\Models\User;
@@ -17,7 +17,6 @@
? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign)
: null;
$ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null;
$imagePathDD = $ddUser && $ddUser->sign
? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign)
@@ -33,27 +32,48 @@
);
@endphp
<tr>
<td style=" padding: 4px;height: 50px">
<td style=" padding: 4px;height: 25px">
<b>Penilaian Dibuat</b>
</td>
@if ($permohonan->approval_so != null)
<td style=" padding: 4px;height: 25px">
<b>Diperiksa</b>
</td>
@endif
@if ($permohonan->approval_eo != null)
<td style=" padding: 4px;height: 25px">
<b>Menyetujui</b>
</td>
@endif
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;height: 25px">
<b>Menyetujui</b>
</td>
@endif
</tr>
<tr>
<td style=" padding: 4px;height: 75px">
@if (file_exists($imagePathPenilai))
<img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
@endif
</td>
@if ($permohonan->approval_so != null)
<td style=" padding: 4px;height: 50px">
<td style=" padding: 4px;height: 75px">
@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">
<td style=" padding: 4px;height: 75px">
@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">
<td style=" padding: 4px;height: 75px">
@if (file_exists($imagePathDD))
<img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
@endif
@@ -63,7 +83,7 @@
<tr>
<td style=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
<span>
{{ ucwords(strtolower('PENILAI')) }}
<b>{{ ucwords(strtolower('PENILAI')) }}</b>
</span>
</br>
<span>
@@ -72,9 +92,9 @@
</td>
@if ($permohonan->approval_so != null)
<td style=" padding: 4px;">
{{ $senior_officer->name ?? '' }}</br>
{{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
<span>
{{ ucwords(strtolower('SENIOR OFFICER')) }}
<b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
</span>
</br>
<span>
@@ -85,9 +105,9 @@
@if ($permohonan->approval_eo != null)
<td style=" padding: 4px;">
{{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
{{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
<span>
{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
<b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
</span>
</br>
<span>
@@ -97,9 +117,9 @@
@endif
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;">
{{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
{{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
<span>
{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
<b>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}</b>
</span>
</br>
<span>