From df6f7c7fd0ab0a5e79eace75960e192d11edf3a6 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 13:37:44 +0700 Subject: [PATCH 1/7] fix(penilai): tambahkan status 'paparan' pada query - Memperbarui query untuk menyertakan status 'paparan' dalam filter status. --- app/Http/Controllers/PenilaiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e19cf74..6fec085 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -374,7 +374,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?)', ['assign','done', 'proses-laporan']); + $query->whereRaw('LOWER(status) IN (?, ?, ?)', ['assign','done', 'proses-laporan','paparan']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { From e00825320c941fdd0be4777ee06523ea71e64134 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 14:36:39 +0700 Subject: [PATCH 2/7] fix(penilai): perbaiki query untuk status - Menambahkan status 'paparan' pada kondisi whereRaw. - Memastikan query mencakup semua status yang relevan. --- app/Http/Controllers/PenilaiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index a367667..e08ba77 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -374,7 +374,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?)', ['assign','done', 'proses-laporan','paparan']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?)', ['assign','done', 'proses-laporan','paparan']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { From 84a212a5058160536865bd3935719bd342fd30d8 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 14:42:51 +0700 Subject: [PATCH 3/7] fix(penilai): tambahkan status 'paparan' pada kondisi render aksi - Memperbarui kondisi render aksi untuk menyertakan status 'paparan'. - Memastikan bahwa tombol aksi ditampilkan untuk status yang baru ditambahkan. --- resources/views/penilai/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index af84db9..ace14ff 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -181,7 +181,7 @@ actions: { title: 'Action', render: (item, data) => { - if (data.status === 'done' || data.status === 'proses-laporan') { + if (data.status === 'done' || data.status === 'proses-laporan' || data.status === 'paparan') { return `
From 2d9cd4e1cb568e406b9114f7ff84d12d70b2ba50 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 14:56:42 +0700 Subject: [PATCH 4/7] feat(penilai): tambahkan kolom dan fungsionalitas status - Menambahkan kolom 'Status' pada tabel di halaman index penilai. - Mengimplementasikan render untuk menampilkan status dengan format badge. - Mengubah urutan default query menjadi berdasarkan 'updated_at' jika tidak ada parameter sort yang diberikan. --- app/Http/Controllers/PenilaiController.php | 2 ++ resources/views/penilai/index.blade.php | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e08ba77..85713c2 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -389,6 +389,8 @@ class PenilaiController extends Controller $order = $request->get('sortOrder'); $column = $request->get('sortField'); $query->orderBy($column, $order); + } else { + $query->orderBy('updated_at','DESC'); } // Get the total count of records diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index ace14ff..f3a3a9a 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -68,6 +68,10 @@ Due Date SLA + + Status + + Action @@ -178,6 +182,12 @@ return `${formatDate(new Date(data.created_at))}`; }, }, + status: { + title: 'Status', + render: (item, data) => { + return `${data.status.replace(/-/g, ' ')}`; + }, + }, actions: { title: 'Action', render: (item, data) => { From 1bfa6e942df521455f978fed94c676c394e89237 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 16:56:35 +0700 Subject: [PATCH 5/7] fix(laporan): perbaiki tampilan tombol resume dan label - Menambahkan kondisi untuk menampilkan tombol resume hanya jika data penilaian tersedia. - Memperbaiki label tombol dari 'Input NL' menjadi 'Laporn'. --- resources/views/laporan/index.blade.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index 3a895c2..e20b97b 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -190,15 +190,19 @@ const dokumenID = data.debiture?.documents[0]?.id || '-'; const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-'; let laporanButton = ''; - const resumeButton = ` + let resumeButton = ''; + + if(data.penilaian.resume) { + const resumeButton = ` Resume `; + } if(data.nilai_liquidasi==null) { laporanButton = ` - Input NL + Laporn `; } From dbfbf126bbad3677e53cacc43b274595e1324653 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 17:01:41 +0700 Subject: [PATCH 6/7] feat(laporan): tambahkan relasi penilai pada data laporan - Menambahkan relasi 'penilai' pada query pengambilan data laporan. - Memperbaiki referensi 'resume' dari 'penilaian' menjadi 'penilai' di tampilan. --- app/Http/Controllers/LaporanController.php | 2 +- resources/views/laporan/index.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 3d80fd6..61f98bc 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -105,7 +105,7 @@ class LaporanController extends Controller $filteredRecords = $query->count(); // Get the data for the current page - $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'debiture.documents.inspeksi'])->get(); + $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'debiture.documents.inspeksi','penilai'])->get(); // Calculate the page count $pageCount = ceil($totalRecords / $size); diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index e20b97b..d522f6c 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -192,7 +192,7 @@ let laporanButton = ''; let resumeButton = ''; - if(data.penilaian.resume) { + if(data.penilai.resume) { const resumeButton = ` Resume From c29f73cbce9ec2b3030ad942e309929d69b8a56a Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 18:17:58 +0700 Subject: [PATCH 7/7] fix(dokumen): perbaiki pengambilan nilai permohonan_id - Mengubah nilai yang diambil untuk permohonan_id dari $document->id menjadi $document->permohonan_id. - Memastikan bahwa nilai yang tepat digunakan dalam input tersembunyi untuk permohonan_id. --- resources/views/debitur/components/dokumen.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index df7de0b..ed7805f 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -3,7 +3,7 @@ @method('PUT') @endif @csrf - +