Perbarui logika filter dan tampilan laporan serta otorisasi
- Menambahkan logika filter tambahan pada status permohonan di `LaporanController`. - Memperbaiki render button berdasarkan kondisi `status_bayar` di `laporan/index.blade.php`. - Menambahkan relasi baru untuk data penilaian di `PenilaianController`. - Memperbaiki validasi nilai plafon pada fitur otorisasi di `otorisator/index.blade.php`. - Menambahkan kondisi dinamis untuk data persetujuan EO dan DD di `otorisator/show.blade.php`.
This commit is contained in:
@@ -259,7 +259,7 @@
|
||||
<i class="ki-filled ki-double-check"></i>
|
||||
</a>
|
||||
`;
|
||||
} else if ((isAdmin || userRoles.includes('DD Appraisal')) && data.approval_eo && !data.approval_dd) {
|
||||
} else if ((isAdmin || userRoles.includes('DD Appraisal')) && data.approval_eo && !data.approval_dd && [1, 4].includes(data.nilai_plafond_id)) {
|
||||
buttons += `
|
||||
<a class="btn btn-sm btn-icon btn-clear btn-primary" onclick="otorisatorData(${data.id})">
|
||||
<i class="ki-filled ki-double-check"></i>
|
||||
|
||||
@@ -85,16 +85,20 @@
|
||||
<td>{{ getUser($permohonan->approval_so)->name ?? 'N/A' }}</td>
|
||||
<td>{{ $permohonan->approval_so_at ? formatTanggalIndonesia($permohonan->approval_so_at,1) : 'N/A' }}</td>
|
||||
</tr>
|
||||
@if($permohonan->approval_eo!=null)
|
||||
<tr>
|
||||
<td>Disetujui Oleh (EO)</td>
|
||||
<td>{{ getUser($permohonan->approval_eo)->name ?? 'N/A' }}</td>
|
||||
<td>{{ $permohonan->approval_eo_at ? formatTanggalIndonesia($permohonan->approval_eo_at,1) : 'N/A' }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
@if(in_array($permohonan->nilai_plafond_id,[1,4]) && $permohonan->approval_dd!=null)
|
||||
<tr>
|
||||
<td>Disetujui Oleh (DD)</td>
|
||||
<td>{{ getUser($permohonan->approval_dd)->name ?? 'N/A' }}</td>
|
||||
<td>{{ $permohonan->approval_dd_at ? formatTanggalIndonesia($permohonan->approval_dd_at,1) : 'N/A' }}</td>
|
||||
</tr>
|
||||
@endif
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -137,7 +141,7 @@
|
||||
</button>
|
||||
@endif
|
||||
|
||||
@if(Auth::user()->hasAnyRole(['administrator','DD Appraisal']) && $permohonan->approval_eo && $permohonan->approval_dd==null)
|
||||
@if(Auth::user()->hasAnyRole(['administrator','DD Appraisal']) && $permohonan->approval_eo && $permohonan->approval_dd==null && in_array($permohonan->nilai_plafond_id,[1,4]))
|
||||
<button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
|
||||
<i class="ki-filled ki-double-check"></i>
|
||||
Otorisator {{ $header ?? '' }}
|
||||
|
||||
Reference in New Issue
Block a user