From 80c6c82ad127347cf459770bbea0c2d73702449f Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 5 Feb 2025 13:59:18 +0700 Subject: [PATCH 1/3] fix(laporan): tambahkan type penilaian pada URL laporan - Menambahkan parameter type pada URL laporan untuk mencakup type penilaian. - Menghapus log console yang tidak diperlukan. --- resources/views/laporan/index.blade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index 555b890..8340497 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -189,6 +189,7 @@ const inspeksiId = data.debiture?.documents[0]?.inspeksi[0]?.id || '-'; const dokumenID = data.debiture?.documents[0]?.id || '-'; const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-'; + const typePenilaian = data.penilai?.type_penilai || ''; let laporanButton = ''; let resumeButton = ''; @@ -206,11 +207,9 @@ `; } - console.log(data.nilai_liquidasi); if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) { - laporanButton = ` - + Laporan `; } From 1b321056030e4d253734566e984145bd06569241 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 5 Feb 2025 14:18:57 +0700 Subject: [PATCH 2/3] fix(laporan): perbaiki logika penentuan type penilaian pada tombol laporan - Menambahkan variabel type untuk mengambil type dari data penilai. - Memperbaiki logika untuk menampilkan tombol laporan berdasarkan type penilai. - Memastikan tombol laporan mengarah ke URL yang benar sesuai dengan type penilaian. --- resources/views/laporan/index.blade.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index 8340497..f07bf16 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -190,6 +190,7 @@ const dokumenID = data.debiture?.documents[0]?.id || '-'; const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-'; const typePenilaian = data.penilai?.type_penilai || ''; + const type = data.penilai?.type || ''; let laporanButton = ''; let resumeButton = ''; @@ -203,15 +204,23 @@ if(data.nilai_liquidasi==null) { laporanButton = ` - Laporn + Laporan `; } if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) { - laporanButton = ` + if(data.penilai.type_penilai=='resume' && !data.penilai.resume){ + laporanButton = ` + + Laporan + `; + } else { + laporanButton = ` Laporan `; + } + } return `${resumeButton} ${laporanButton}`; From 28d579d65df2f397fc7f96435a31da7412e64ceb Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 5 Feb 2025 15:03:31 +0700 Subject: [PATCH 3/3] fix(penilaian): perbaiki urutan parameter pada fungsi revisiLaporan - Mengubah urutan parameter pada fungsi revisiLaporan di PenilaianController. - Memperbaiki URL pada permintaan AJAX di tampilan show.blade.php. --- app/Http/Controllers/PenilaianController.php | 2 +- resources/views/penilaian/otorisator/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index a3da8f7..bd4c3ec 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -834,7 +834,7 @@ class PenilaianController extends Controller } } - public function revisiLaporan($id, Request $request) + public function revisiLaporan(Request $request,$id) { $permohonan = Permohonan::findOrFail($id); $permohonan->update([ diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index 82b55ec..025b2db 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -372,7 +372,7 @@ }, }); $.ajax({ - url: `/otorisator/revisi/${dataId}/`, + url: `/otorisator/revisi/${dataId}`, type: 'POST', data: { message: userMessage