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

🐛 fix(signature): Tangani SO/EO sama & perbaiki fallback tanggal migrasi" -m "

Browse Source 
- 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:
Daeng Deni Mardaeni
2025-10-20 10:47:49 +07:00
parent c8b5fcc9d1
commit ae5a9ce5b7
2 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Services/PreviewLaporanService.php
View File

@@ -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);

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

@@ -35,15 +35,24 @@
<td style=" padding: 4px;height: 25px"> <td style=" padding: 4px;height: 25px">
<b>Penilaian Dibuat</b> <b>Penilaian Dibuat</b>
</td> </td>
@if ($permohonan->approval_so != null) @if($soUser->name==$eoUser->name)
<td style=" padding: 4px;height: 25px"> @if ($permohonan->approval_so != null)
<b>Diperiksa</b> <td style=" padding: 4px;height: 25px">
</td> <b>Diperiksa dan Menyetujui</b>
@endif </td>
@if ($permohonan->approval_eo != null) @endif
<td style=" padding: 4px;height: 25px"> @else
<b>Menyetujui</b> @if ($permohonan->approval_so != null)
</td> <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
@endif @endif
@if ($permohonan->approval_dd != null) @if ($permohonan->approval_dd != null)
<td style=" padding: 4px;height: 25px"> <td style=" padding: 4px;height: 25px">
@@ -58,19 +67,29 @@
<img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px"> <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
@endif @endif
</td> </td>
@if ($permohonan->approval_so != null) @if($soUser->name==$eoUser->name)
<td style=" padding: 4px;height: 75px"> @if ($permohonan->approval_so != null)
@if (file_exists($imagePathSo)) <td style=" padding: 4px;height: 75px">
<img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px"> @if (file_exists($imagePathSo))
@endif <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
</td> @endif
@endif </td>
@if ($permohonan->approval_eo != null) @endif
<td style=" padding: 4px;height: 75px"> @else
@if (file_exists($imagePathEO)) @if ($permohonan->approval_so != null)
<img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px"> <td style=" padding: 4px;height: 75px">
@endif @if (file_exists($imagePathSo))
</td> <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
@endif
</td>
@endif
@if ($permohonan->approval_eo != null)
<td style=" padding: 4px;height: 75px">
@if (file_exists($imagePathEO))
<img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
@endif
</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">
@@ -90,30 +109,45 @@
{{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }} {{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }}
</span> </span>
</td> </td>
@if ($permohonan->approval_so != null) @if($soUser->name==$eoUser->name)
<td style=" padding: 4px;"> @if ($permohonan->approval_eo != null)
{{ $soUser->name ?? $senior_officer->name ?? '' }}</br> <td style=" padding: 4px;">
<span> {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
<b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b> <span>
</span> <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
</br> </span>
<span> </br>
{{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }} <span>
</span> {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
</td> </span>
@endif </td>
@endif
@else
@if ($permohonan->approval_so != null)
<td style=" padding: 4px;">
{{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
<span>
<b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
</span>
</br>
<span>
{{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }}
</span>
</td>
@endif
@if ($permohonan->approval_eo != null) @if ($permohonan->approval_eo != null)
<td style=" padding: 4px;"> <td style=" padding: 4px;">
{{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br> {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
<span> <span>
<b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b> <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
</span> </span>
</br> </br>
<span> <span>
{{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }} {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
</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;">