fix(penilai/so): perbaikkan menu sla unfreeze

This commit is contained in:
majid
2025-03-12 00:57:33 +07:00
parent bea0c2cf78
commit a12c566fbd
5 changed files with 363 additions and 322 deletions

View File

@@ -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) {

View File

@@ -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();
}

View File

@@ -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'))) {