🐛 fix(signature): Tangani SO/EO sama & perbaiki fallback tanggal migrasi" -m "
- signature-approval.blade.php: tambahkan kondisi SO==EO → render 1 kolom 'Diperiksa dan Menyetujui' (pakai jabatan EO)
- signature-approval.blade.php: bila SO≠EO → render kolom terpisah 'Diperiksa' (SO) & 'Menyetujui' (EO) seperti sebelumnya
- signature-approval.blade.php: jaga konsistensi label/jabatan & area tanda tangan agar tidak redundan
- PreviewLaporanService: ubah urutan fallback tanggal migrasi → tgl_laporan → tgl_oto → null
- PreviewLaporanService: parsing tanggal migrasi via Carbon::createFromFormat('d/m/Y H:i:s') → 'Y-m-d H:i:s'
- Akurasi tanggal laporan meningkat karena tgl_oto merefleksikan tanggal otorisasi/approval
- Tampilan blok signature lebih rapi pada kasus SO/EO sama; hilangkan duplikasi informasi
- Backward-compatible: perilaku SO≠EO & data non-migrasi tidak berubah
This commit is contained in:
@@ -160,8 +160,8 @@ class PreviewLaporanService
|
|||||||
$tanggalLaporan = $permohonan->is_mig
|
$tanggalLaporan = $permohonan->is_mig
|
||||||
? ($mig_permohonan->mig_mst_jaminan_tgl_laporan
|
? ($mig_permohonan->mig_mst_jaminan_tgl_laporan
|
||||||
? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s')
|
? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s')
|
||||||
: ($mig_permohonan->mig_mst_jaminan_tgl_create
|
: ($mig_permohonan->mig_mst_jaminan_tgl_oto
|
||||||
? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_create)->format('Y-m-d H:i:s')
|
? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_oto)->format('Y-m-d H:i:s')
|
||||||
: null))
|
: null))
|
||||||
: ($lpj->created_at ?? null);
|
: ($lpj->created_at ?? null);
|
||||||
|
|
||||||
|
|||||||
@@ -35,16 +35,25 @@
|
|||||||
<td style=" padding: 4px;height: 25px">
|
<td style=" padding: 4px;height: 25px">
|
||||||
<b>Penilaian Dibuat</b>
|
<b>Penilaian Dibuat</b>
|
||||||
</td>
|
</td>
|
||||||
|
@if($soUser->name==$eoUser->name)
|
||||||
|
@if ($permohonan->approval_so != null)
|
||||||
|
<td style=" padding: 4px;height: 25px">
|
||||||
|
<b>Diperiksa dan Menyetujui</b>
|
||||||
|
</td>
|
||||||
|
@endif
|
||||||
|
@else
|
||||||
@if ($permohonan->approval_so != null)
|
@if ($permohonan->approval_so != null)
|
||||||
<td style=" padding: 4px;height: 25px">
|
<td style=" padding: 4px;height: 25px">
|
||||||
<b>Diperiksa</b>
|
<b>Diperiksa</b>
|
||||||
</td>
|
</td>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if ($permohonan->approval_eo != null)
|
@if ($permohonan->approval_eo != null)
|
||||||
<td style=" padding: 4px;height: 25px">
|
<td style=" padding: 4px;height: 25px">
|
||||||
<b>Menyetujui</b>
|
<b>Menyetujui</b>
|
||||||
</td>
|
</td>
|
||||||
@endif
|
@endif
|
||||||
|
@endif
|
||||||
@if ($permohonan->approval_dd != null)
|
@if ($permohonan->approval_dd != null)
|
||||||
<td style=" padding: 4px;height: 25px">
|
<td style=" padding: 4px;height: 25px">
|
||||||
<b>Menyetujui</b>
|
<b>Menyetujui</b>
|
||||||
@@ -58,6 +67,15 @@
|
|||||||
<img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
|
<img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
|
||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
|
@if($soUser->name==$eoUser->name)
|
||||||
|
@if ($permohonan->approval_so != null)
|
||||||
|
<td style=" padding: 4px;height: 75px">
|
||||||
|
@if (file_exists($imagePathSo))
|
||||||
|
<img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
|
||||||
|
@endif
|
||||||
|
</td>
|
||||||
|
@endif
|
||||||
|
@else
|
||||||
@if ($permohonan->approval_so != null)
|
@if ($permohonan->approval_so != null)
|
||||||
<td style=" padding: 4px;height: 75px">
|
<td style=" padding: 4px;height: 75px">
|
||||||
@if (file_exists($imagePathSo))
|
@if (file_exists($imagePathSo))
|
||||||
@@ -72,6 +90,7 @@
|
|||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
@endif
|
@endif
|
||||||
|
@endif
|
||||||
@if ($permohonan->approval_dd != null)
|
@if ($permohonan->approval_dd != null)
|
||||||
<td style=" padding: 4px;height: 75px">
|
<td style=" padding: 4px;height: 75px">
|
||||||
@if (file_exists($imagePathDD))
|
@if (file_exists($imagePathDD))
|
||||||
@@ -90,6 +109,20 @@
|
|||||||
{{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }}
|
{{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
|
@if($soUser->name==$eoUser->name)
|
||||||
|
@if ($permohonan->approval_eo != null)
|
||||||
|
<td style=" padding: 4px;">
|
||||||
|
{{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
|
||||||
|
<span>
|
||||||
|
<b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
|
||||||
|
</span>
|
||||||
|
</br>
|
||||||
|
<span>
|
||||||
|
{{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
@endif
|
||||||
|
@else
|
||||||
@if ($permohonan->approval_so != null)
|
@if ($permohonan->approval_so != null)
|
||||||
<td style=" padding: 4px;">
|
<td style=" padding: 4px;">
|
||||||
{{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
|
{{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
|
||||||
@@ -115,6 +148,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
@endif
|
@endif
|
||||||
|
@endif
|
||||||
@if ($permohonan->approval_dd != null)
|
@if ($permohonan->approval_dd != null)
|
||||||
<td style=" padding: 4px;">
|
<td style=" padding: 4px;">
|
||||||
{{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
|
{{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
|
||||||
|
|||||||
Reference in New Issue
Block a user