From a12c566fbd502af27fbd8a7b2ab8f006aac0504c Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 12 Mar 2025 00:57:33 +0700 Subject: [PATCH] fix(penilai/so): perbaikkan menu sla unfreeze --- app/Http/Controllers/PenilaiController.php | 2 +- app/Http/Controllers/PenilaianController.php | 14 +- app/Http/Controllers/SLAController.php | 2 +- resources/views/penilai/index.blade.php | 133 +++-- .../views/penilaian/otorisator/sla.blade.php | 534 +++++++++--------- 5 files changed, 363 insertions(+), 322 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index e61863d..8eb6ead 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -570,7 +570,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze','unfreeze-sla']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 11da675..78849d4 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -450,7 +450,7 @@ class PenilaianController extends Controller public function otorisatorUpdate(Request $request, $id, $context) { - if ($context === 'Freze SLA') { + if ($context === 'Freze SLA' || $context === 'Unfreeze SLA') { $authorization = Authorization::with(['user'])->find($id); if (!$authorization) { return response()->json([ @@ -595,6 +595,14 @@ class PenilaianController extends Controller ]); } break; + case 'unfreeze sla': + $authorization->update([ + 'request' => 'unfreeze-sla', + ]); + $permohonan->update([ + 'status' => 'unfreeze-sla', + ]); + break; default: return response()->json([ @@ -891,7 +899,7 @@ class PenilaianController extends Controller public function revisiLaporan(Request $request, $id) { - // dd($request->all()); + // dd($id); if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){ $authorization = Authorization::find($id); $permohonan = Permohonan::find($authorization->permohonan_id); @@ -906,7 +914,7 @@ class PenilaianController extends Controller } $status = 'revisi-paparan'; - }else if($permohonan->status === 'freeze'){ + }else if($permohonan->status === 'request-freeze'){ if ($authorization) { $authorization->delete(); } diff --git a/app/Http/Controllers/SLAController.php b/app/Http/Controllers/SLAController.php index 3256aee..159995c 100644 --- a/app/Http/Controllers/SLAController.php +++ b/app/Http/Controllers/SLAController.php @@ -71,7 +71,7 @@ class SLAController extends Controller // abort(403, 'Sorry! You are not allowed to view users.'); } - $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd')->where('jenis','sla'); + $query = Authorization::query()->with('permohonan.debiture', 'user', 'approveSo', 'approveEo', 'approveDd')->where('jenis', 'sla')->where('request', 'freeze'); // Pencarian berdasarkan parameter search if ($request->has('search') && !empty($request->get('search'))) { diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index ecfa4c7..a13c512 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -165,13 +165,15 @@ tujuan_penilaian_id: { title: 'Tujuan Penilaian', render: (item, data) => { - return data.tujuan_penilaian && data.tujuan_penilaian.name ? `${data.tujuan_penilaian.name}` : '-'; + return data.tujuan_penilaian && data.tujuan_penilaian.name ? + `${data.tujuan_penilaian.name}` : '-'; }, }, jenis_fasilitas_kredit_id: { title: 'Fasilitas Kredit', render: (item, data) => { - return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? `${data.jenisfasilitas_kredit.name}` : '-'; + return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? + `${data.jenisfasilitas_kredit.name}` : '-'; }, }, jenis_laporan: { @@ -183,7 +185,7 @@ tanggal_survei: { title: 'Tanggal Survei', render: (item, data) => { - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`; } return `${formatDate(new Date(data.penilaian.created_at))}`; @@ -196,19 +198,19 @@ const tipe_laporan = data.penilai?.type; const nilai_plafond = data.penilaian.nilaiPlafond?.name; let waktu_penilaian = new Date(data.penilaian.created_at); - if(data.penilaian.waktu_penilaian){ + if (data.penilaian.waktu_penilaian) { waktu_penilaian = new Date(data.penilaian.waktu_penilaian); } - if(tujuan_penilaian.name==="RAP"){ + if (tujuan_penilaian.name === "RAP") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { - if(tipe_laporan==="sederhana"){ + if (tipe_laporan === "sederhana") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 2); - } else if(tipe_laporan==="standar"){ - if(nilai_plafond==="2 M - 5 M"){ + } else if (tipe_laporan === "standar") { + if (nilai_plafond === "2 M - 5 M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); - } else if(nilai_plafond==="< 2M"){ + } else if (nilai_plafond === "< 2M") { waktu_penilaian.setDate(waktu_penilaian.getDate() + 3); } else { waktu_penilaian.setDate(waktu_penilaian.getDate() + 5); @@ -232,7 +234,10 @@ actions: { title: 'Action', render: (item, data) => { - if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan' || data.status === 'reject-freeze' || data.status === 'freeze' || data.status === 'request-freeze') { + if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data + .status === 'paparan' || data.status === 'proses-paparan' || data.status === + 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data + .status === 'revisi-paparan' || data.status === 'unfreeze-sla') { return `
@@ -245,9 +250,17 @@
`; - } else { + } else if (data.status === 'freeze' || data.status === 'request-freeze') { + return ` +
+ + + +
`; + } else + { return `
- +
` @@ -268,56 +281,56 @@ -@endpush + + @endpush