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

🔧(penilai): Perbaiki logika approval & tanggal laporan

Browse Source 
- Nonaktifkan filter dokument_id di PreviewLaporanService untuk fleksibilitas
- Tambah kondisi tampilkan DD hanya jika berbeda dengan EO
- Gunakan tanggal mig_mst_jaminan_tgl_laporan sebagai sumber utama
- Perbaiki logika nama & tanggal approval SO
- Gunakan Carbon::createFromFormat untuk parsing tanggal migrasi
- Tambah validasi kondisional agar tidak duplikasi approval
- Rapikan struktur HTML & indentasi signature-approval.blade.php
- Pastikan konsistensi data antara preview service & signature view
- Hasil: tampilan signature lebih akurat & sesuai data migrasi
This commit is contained in:
Daeng Deni Mardaeni
2025-10-28 12:33:25 +07:00
parent ee828455a9
commit d6d0ed28b9
2 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/PreviewLaporanService.php
View File

@@ -306,7 +306,7 @@ class PreviewLaporanService
// Ambil data berdasarkan ID
$statusLpj = Penilai::where('permohonan_id', $permohonan_id)
->where('dokument_id', $dokumen_id)
//->where('dokument_id', $dokumen_id)
->first();

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

@@ -54,10 +54,13 @@
</td>
@endif
@endif
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;height: 25px">
<b>Menyetujui</b>
</td>
@if($permohonan->approval_dd!==$permohonan->approval_eo)
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;height: 25px">
<b>Menyetujui</b>
</td>
@endif
@endif
</tr>
@@ -91,12 +94,14 @@
</td>
@endif
@endif
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;height: 75px">
@if (file_exists($imagePathDD))
<img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
@endif
</td>
@if($permohonan->approval_dd!==$permohonan->approval_eo)
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;height: 75px">
@if (file_exists($imagePathDD))
<img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
@endif
</td>
@endif
@endif
</tr>
<tr>
@@ -106,19 +111,19 @@
</span>
</br>
<span>
{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
{{ isset($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) ? formatTanggalIndonesia(\Carbon\Carbon::createFromFormat('d/m/Y H:i:s', $permohonan_migrasi->mig_mst_jaminan_tgl_laporan)) : '' }}
</span>
</td>
@if($soUser->name==$eoUser->name)
@if ($permohonan->approval_eo != null)
@if ($permohonan->approval_so != null)
<td style=" padding: 4px;">
{{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
{{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
<span>
<b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
</span>
</br>
</br>
<span>
{{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
{{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }}
</span>
</td>
@endif
@@ -149,19 +154,21 @@
</td>
@endif
@endif
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;">
{{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
<span>
<b>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}</b>
</span>
</br>
<span>
{{
isset($permohonan->approval_dd_at) ?
formatTanggalIndonesia($permohonan->approval_dd_at) : '' }}
</span>
</td>
@if($permohonan->approval_dd!==$permohonan->approval_eo)
@if ($permohonan->approval_dd != null)
<td style=" padding: 4px;">
{{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
<span>
<b>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}</b>
</span>
</br>
<span>
{{
isset($permohonan->approval_dd_at) ?
formatTanggalIndonesia($permohonan->approval_dd_at) : '' }}
</span>
</td>
@endif
@endif
</tr>
</table>