fix(penilaian): perbaiki logika otorisasi dan penanganan dataHeader
- Memperbaiki logika untuk mendapatkan otorisasi berdasarkan jenis laporan. - Menambahkan pengecekan untuk memastikan $permohonan->authorization->approve_so ada sebelum digunakan. - Memperbarui fungsi handleRejection untuk menerima parameter dataHeader.
This commit is contained in:
@@ -891,11 +891,13 @@ class PenilaianController extends Controller
|
|||||||
|
|
||||||
public function revisiLaporan(Request $request, $id)
|
public function revisiLaporan(Request $request, $id)
|
||||||
{
|
{
|
||||||
$permohonan = Permohonan::find($id);
|
if($request->dataHeader=='Paparan'){
|
||||||
$userRole = Auth::user()->roles[0]->name;
|
$authorization = Authorization::find($id);
|
||||||
|
$permohonan = Permohonan::find($authorization->permohonan_id);
|
||||||
$authorization = Authorization::where('permohonan_id', $permohonan->id)
|
} else {
|
||||||
->where('jenis', 'paparan')->first();
|
$permohonan = Permohonan::find($id);
|
||||||
|
$userRole = Auth::user()->roles[0]->name;
|
||||||
|
}
|
||||||
|
|
||||||
if ($permohonan->status === 'proses-paparan') {
|
if ($permohonan->status === 'proses-paparan') {
|
||||||
if ($authorization) {
|
if ($authorization) {
|
||||||
|
|||||||
@@ -110,7 +110,7 @@
|
|||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
@if ($permohonan->authorization->approve_so && $dataHeader == 'paparan' )
|
@if (isset($permohonan->authorization->approve_so) && $dataHeader == 'paparan' )
|
||||||
<div class="card border border-agi-100 pb-2.5">
|
<div class="card border border-agi-100 pb-2.5">
|
||||||
<div class="card-header bg-agi-50" id="basic_settings">
|
<div class="card-header bg-agi-50" id="basic_settings">
|
||||||
<h3 class="card-title">
|
<h3 class="card-title">
|
||||||
@@ -247,7 +247,7 @@
|
|||||||
|
|
||||||
@push('scripts')
|
@push('scripts')
|
||||||
<script>
|
<script>
|
||||||
const handleRejection = (dataId) => {
|
const handleRejection = (dataId,dataHeader='') => {
|
||||||
Swal.fire({
|
Swal.fire({
|
||||||
title: 'Masukkan alasan penolakan:',
|
title: 'Masukkan alasan penolakan:',
|
||||||
input: 'textarea',
|
input: 'textarea',
|
||||||
@@ -268,7 +268,8 @@
|
|||||||
if (rejectResult.isConfirmed) {
|
if (rejectResult.isConfirmed) {
|
||||||
handleAjaxRequest(
|
handleAjaxRequest(
|
||||||
`/otorisator/revisi-laporan/${dataId}`, {
|
`/otorisator/revisi-laporan/${dataId}`, {
|
||||||
keterangan: rejectResult.value
|
keterangan: rejectResult.value,
|
||||||
|
dataHeader: dataHeader
|
||||||
},
|
},
|
||||||
'Data berhasil ditolak.',
|
'Data berhasil ditolak.',
|
||||||
'Terjadi kesalahan saat melakukan penolakan.'
|
'Terjadi kesalahan saat melakukan penolakan.'
|
||||||
@@ -383,7 +384,7 @@
|
|||||||
'Terjadi kesalahan saat melakukan otorisasi.'
|
'Terjadi kesalahan saat melakukan otorisasi.'
|
||||||
);
|
);
|
||||||
} else if (result.isDenied) {
|
} else if (result.isDenied) {
|
||||||
handleRejection(dataId);
|
handleRejection(dataId,dataHeader);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user