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

fix(so/dd/eo/penilai): perbaikan otorisasi untuk paparan, pelaporan, penambahan revisi pembayaran, data pembading dan ubah class bg-agi-50 ke light:bg-agi-50

Browse Source
This commit is contained in:
majid
2025-03-03 15:48:03 +07:00
parent f928cf1d76
commit b8dbda153e
26 changed files with 204 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
resources/views/penilaian/otorisator/show.blade.php
View File

@@ -108,6 +108,47 @@
</div>
</div>
@endif
@if ($permohonan->authorization->approve_so && $dataHeader == 'paparan' )
<div class="card border border-agi-100 pb-2.5">
<div class="card-header bg-agi-50" id="basic_settings">
<h3 class="card-title">
Approval
</h3>
</div>
<div class="card-body">
<table class="table table-border">
<tbody>
<tr>
<td>Diperiksa Oleh</td>
<td>{{ getUser($permohonan->authorization->approve_so)->name ?? 'N/A' }}</td>
<td>{{ $permohonan->authorization->approve_so_at ? formatTanggalIndonesia($permohonan->authorization->approve_so_at, 1) : 'N/A' }}
</td>
</tr>
@if ($permohonan->authorization->approve_eo != null)
<tr>
<td>Disetujui Oleh (EO)</td>
<td>{{ getUser($permohonan->authorization->approve_eo)->name ?? 'N/A' }}</td>
<td>{{ $permohonan->authorization->approve_eo_at ? formatTanggalIndonesia($permohonan->authorization->approve_eo_at, 1) : 'N/A' }}
</td>
</tr>
@endif
@if (in_array($permohonan->nilai_plafond_id, [1, 2, 4]) && $permohonan->approve_dd != null)
<tr>
<td>Disetujui Oleh (DD)</td>
<td>{{ getUser($permohonan->authorization->approve_dd)->name ?? 'N/A' }}</td>
<td>{{ $permohonan->authorization->approve_dd_at ? formatTanggalIndonesia($permohonan->authorization->approve_dd_at, 1) : 'N/A' }}
</td>
</tr>
@endif
</tbody>
</table>
</div>
</div>
@endif
<div>
<div>
<div class="flex gap-2.5">

8
resources/views/penilaian/paparan-so.blade.php
View File

@@ -75,7 +75,7 @@
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tanggal_paparan">
<span class="sort"> <span class="sort-label"> Tanggal Paparan </span>
<span class="sort"> <span class="sort-label">Keterangan/Tanggal Paparan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="approval_so">
@@ -240,7 +240,7 @@
title: 'Tanggal Paparan',
render: (item, data) => {
if(data.tanggal_paparan) {
return `${window.formatTanggalIndonesia(data.tanggal_paparan)}`;
return ` ${data?.keterangan} | ${window.formatTanggalIndonesia(data.tanggal_paparan)}`;
}
return "-";
@@ -258,8 +258,8 @@
approval_eo: {
title: 'Approval EO',
render: (item, data) => {
if (data.approve_eo) {
return `${data.approve_eo.name} | ${window.formatTanggalIndonesia(data.approval_eo_at)}`;
if (data?.authorization?.approve_eo) {
return `${data?.authorization?.approve_eo.name} | ${window.formatTanggalIndonesia(data.approval_eo_at)}`;
}
return '';
},