daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(penilai/so): perbaikkan menu sla unfreeze

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PenilaiController.php
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')) { if (!Auth::user()->hasRole('administrator')) {
$query->whereHas('penilaian.userPenilai', function ($q) { $query->whereHas('penilaian.userPenilai', function ($q) {

14
app/Http/Controllers/PenilaianController.php
View File

@@ -450,7 +450,7 @@ class PenilaianController extends Controller
public function otorisatorUpdate(Request $request, $id, $context) public function otorisatorUpdate(Request $request, $id, $context)
{ {
if ($context === 'Freze SLA') { if ($context === 'Freze SLA' || $context === 'Unfreeze SLA') {
$authorization = Authorization::with(['user'])->find($id); $authorization = Authorization::with(['user'])->find($id);
if (!$authorization) { if (!$authorization) {
return response()->json([ return response()->json([
@@ -595,6 +595,14 @@ class PenilaianController extends Controller
]); ]);
} }
break; break;
case 'unfreeze sla':
$authorization->update([
'request' => 'unfreeze-sla',
]);
$permohonan->update([
'status' => 'unfreeze-sla',
]);
break;
default: default:
return response()->json([ return response()->json([
@@ -891,7 +899,7 @@ class PenilaianController extends Controller
public function revisiLaporan(Request $request, $id) public function revisiLaporan(Request $request, $id)
{ {
// dd($request->all()); // dd($id);
if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){ if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){
$authorization = Authorization::find($id); $authorization = Authorization::find($id);
$permohonan = Permohonan::find($authorization->permohonan_id); $permohonan = Permohonan::find($authorization->permohonan_id);
@@ -906,7 +914,7 @@ class PenilaianController extends Controller
} }
$status = 'revisi-paparan'; $status = 'revisi-paparan';
}else if($permohonan->status === 'freeze'){ }else if($permohonan->status === 'request-freeze'){
if ($authorization) { if ($authorization) {
$authorization->delete(); $authorization->delete();
} }

2
app/Http/Controllers/SLAController.php
View File

@@ -71,7 +71,7 @@ class SLAController extends Controller
// abort(403, 'Sorry! You are not allowed to view users.'); // 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 // Pencarian berdasarkan parameter search
if ($request->has('search') && !empty($request->get('search'))) { if ($request->has('search') && !empty($request->get('search'))) {

23
resources/views/penilai/index.blade.php
View File

@@ -165,13 +165,15 @@
tujuan_penilaian_id: { tujuan_penilaian_id: {
title: 'Tujuan Penilaian', title: 'Tujuan Penilaian',
render: (item, data) => { 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: { jenis_fasilitas_kredit_id: {
title: 'Fasilitas Kredit', title: 'Fasilitas Kredit',
render: (item, data) => { 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: { jenis_laporan: {
@@ -232,7 +234,10 @@
actions: { actions: {
title: 'Action', title: 'Action',
render: (item, data) => { 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 ` return `
<div class="flex flex-nowrap justify-center gap-1.5"> <div class="flex flex-nowrap justify-center gap-1.5">
<a class="btn btn-sm btn-icon btn-clear btn-info" href="penilai/${data.id}/show"> <a class="btn btn-sm btn-icon btn-clear btn-info" href="penilai/${data.id}/show">
@@ -245,9 +250,17 @@
<i class="ki-filled ki-arrow-circle-right"></i> <i class="ki-filled ki-arrow-circle-right"></i>
</button> </button>
</div>`; </div>`;
} else { } else if (data.status === 'freeze' || data.status === 'request-freeze') {
return `
<div class="flex flex-nowrap justify-center">
<a class="btn btn-sm btn-icon btn-clear btn-warning" onclick="showLoadingSwal('Masih dalam proses pengajuan freeze...')">
<i class="ki-filled ki-watch"></i>
</a>
</div>`;
} else
{
return `<div class="flex flex-nowrap justify-center"> return `<div class="flex flex-nowrap justify-center">
<a class="btn btn-sm btn-icon btn-clear btn-success" onclick="showLoadingSwal('Masih Menunggu proses inspeksi dari surveyor...')"> <a class="btn btn-sm btn-icon btn-clear btn-success" onclick="showLoadingSwal('Masih Menunggu proses ...')">
<i class="ki-filled ki-watch"></i> <i class="ki-filled ki-watch"></i>
</a> </a>
</div>` </div>`

82
resources/views/penilaian/otorisator/sla.blade.php
View File

@@ -1,8 +1,8 @@
@extends('layouts.main') @extends('layouts.main')
@php @php
if($header=="sla"){ if ($header == 'sla') {
$header = "Freze SLA"; $header = 'Freze SLA';
} }
@endphp @endphp
@@ -43,7 +43,8 @@
{{ $surveyor->userPenilaiTeam->name }} {{ $surveyor->userPenilaiTeam->name }}
</p> </p>
<p class="flex w-full text-gray-600 font-medium text-sm">{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }} <p class="flex w-full text-gray-600 font-medium text-sm">
{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}
</p> </p>
</div> </div>
<label class="form-label max-w-56"> <label class="form-label max-w-56">
@@ -99,8 +100,8 @@
</div> </div>
@php @php
if($header=="SLA"){ if ($header == 'SLA') {
$header = "Freze SLA"; $header = 'Freze SLA';
} }
@endphp @endphp
@@ -118,20 +119,23 @@
<tr> <tr>
<td>Diperiksa Oleh</td> <td>Diperiksa Oleh</td>
<td>{{ getUser($authorization->approve_so)->name ?? 'N/A' }}</td> <td>{{ getUser($authorization->approve_so)->name ?? 'N/A' }}</td>
<td>{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at,1) : 'N/A' }}</td> <td>{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at, 1) : 'N/A' }}
</td>
</tr> </tr>
@if ($authorization->approve_eo != null) @if ($authorization->approve_eo != null)
<tr> <tr>
<td>Disetujui Oleh (EO)</td> <td>Disetujui Oleh (EO)</td>
<td>{{ getUser($authorization->approve_eo)->name ?? 'N/A' }}</td> <td>{{ getUser($authorization->approve_eo)->name ?? 'N/A' }}</td>
<td>{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at,1) : 'N/A' }}</td> <td>{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at, 1) : 'N/A' }}
</td>
</tr> </tr>
@endif @endif
@if (in_array($authorization->nilai_eafond_id, [1, 4]) && $authorization->approve_dd != null) @if (in_array($authorization->nilai_eafond_id, [1, 4]) && $authorization->approve_dd != null)
<tr> <tr>
<td>Disetujui Oleh (DD)</td> <td>Disetujui Oleh (DD)</td>
<td>{{ getUser($authorization->approve_dd)->name ?? 'N/A' }}</td> <td>{{ getUser($authorization->approve_dd)->name ?? 'N/A' }}</td>
<td>{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at,1) : 'N/A' }}</td> <td>{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at, 1) : 'N/A' }}
</td>
</tr> </tr>
@endif @endif
</tbody> </tbody>
@@ -163,33 +167,51 @@
@endif @endif
@if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $authorization->approve_so == null) @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $authorization->approve_so == null)
<button onclick="otorisatorData({{ $authorization->id }}, 'SO')" type="button" class="btn btn-primary"> <button onclick="otorisatorData({{ $authorization->id }}, 'SO')" type="button"
class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisasi {{ $header ?? '' }} Otorisasi {{ $header ?? '' }}
</button> </button>
@endif @endif
@if(Auth::user()->hasAnyRole(['administrator','EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo==null) @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
<button onclick="otorisatorData({{ $authorization->id }}, 'EO')" type="button" class="btn btn-primary"> $authorization->approve_so &&
$authorization->approve_eo == null)
<button onclick="otorisatorData({{ $authorization->id }}, 'EO')" type="button"
class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisasi {{ $header ?? '' }} Otorisasi {{ $header ?? '' }}
</button> </button>
@endif @endif
@if(Auth::user()->hasAnyRole(['administrator','DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd==null && in_array($permohonan->nilai_plafond_id,[1, 4])) @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
<button onclick="otorisatorData({{ $authorization->id }}, 'DD')" type="button" class="btn btn-primary"> $authorization->approve_eo &&
$authorization->approve_dd == null &&
in_array($permohonan->nilai_plafond_id, [1, 4]))
<button onclick="otorisatorData({{ $authorization->id }}, 'DD')" type="button"
class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisasi {{ $header ?? '' }} Otorisasi {{ $header ?? '' }}
</button> </button>
@endif @endif
@if (
(Auth::user()->hasAnyRole(['administrator', 'senior-officer']) &&
$authorization->approve_so != null &&
$authorization->approve_eo != null) ||
$authorization->approve_dd != null)
<button onclick="otorisatorData({{ $authorization->id }}, 'UNFREZE')" type="button"
class="btn btn-primary">
<i class="ki-filled ki-double-check"></i>
Otorisasi Un{{ $header ?? '' }}
</button>
@endif
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@push('scripts') @push('scripts')
<script> <script>
const handleRejection = (dataId, dataHeader = '') => { const handleRejection = (dataId, dataHeader = '') => {
Swal.fire({ Swal.fire({
@@ -255,7 +277,6 @@
data: data, data: data,
success: () => { success: () => {
Swal.fire('Berhasil!', successMessage, 'success').then(() => { Swal.fire('Berhasil!', successMessage, 'success').then(() => {
const dataHeader = @json($header);
const redirectUrl = `/otorisator/sla`; const redirectUrl = `/otorisator/sla`;
window.location.href = redirectUrl; window.location.href = redirectUrl;
}); });
@@ -268,19 +289,21 @@
}; };
function otorisatorData(dataId, role = '') { function otorisatorData(dataId, role = '') {
const dataHeader = @json($header); let dataHeader = @json($header);
const isPaparanSO = dataHeader === 'SLA' && role === 'SO';
// Update dataHeader if condition matches
if (dataHeader === 'Freze SLA' && (role === 'UNFREZE' || role === 'FREZE')) {
dataHeader = 'Unfreeze SLA';
}
const isPaparanSO = dataHeader === 'Unfreeze SLA' && role === 'UNFREZE';
const hideDenyButton = (dataHeader === 'Unfreeze SLA' && (role === 'UNFREZE' || role === 'FREZE'));
const swalHtml = isPaparanSO ? ` const swalHtml = isPaparanSO ? `
<div class="text-left space-y-4"> <div class="text-left space-y-4">
<p class="text-gray-700 text-center">Untuk melakukan otorisasi ${dataHeader}!</p> <p class="text-gray-700 text-center">Untuk melakukan otorisasi ${dataHeader}!</p>
<div> <div>
<label for="swal-keterangan" class="block text-sm font-medium text-gray-700 mb-1">Keterangan</label> <textarea id="swal-keterangan" class="textarea" placeholder="Masukkan Keterangan"></textarea>
<input id="swal-keterangan" class="input" placeholder="Masukkan Keterangan">
</div>
<div>
<label for="swal-tanggal-paparan" class="block text-sm font-medium text-gray-700 mb-1">Tanggal Paparan</label>
<input id="swal-tanggal-paparan" class="input" type="date" placeholder="Tanggal paparan">
</div> </div>
</div>` : ''; </div>` : '';
@@ -289,21 +312,19 @@
`Untuk melakukan otorisasi ${dataHeader}!`, `Untuk melakukan otorisasi ${dataHeader}!`,
swalHtml, swalHtml,
'Ya, Lanjutkan!', 'Ya, Lanjutkan!',
'Tolak', hideDenyButton ? null : 'Tolak',
'Batal', 'Batal',
() => { () => {
if (isPaparanSO) { if (isPaparanSO) {
const message = document.getElementById('swal-keterangan')?.value; const message = document.getElementById('swal-keterangan')?.value;
const tanggalPaparan = document.getElementById('swal-tanggal-paparan').value;
if (!message || !tanggalPaparan) { if (!message) {
Swal.showValidationMessage('Keterangan dan Tanggal Paparan harus diisi!'); Swal.showValidationMessage('Keterangan harus diisi!');
return false; return false;
} }
return { return {
message, message,
tanggalPaparan
}; };
} else { } else {
return { return {
@@ -316,7 +337,6 @@
if (result.isConfirmed) { if (result.isConfirmed) {
const requestData = isPaparanSO ? { const requestData = isPaparanSO ? {
keterangan: result.value.message, keterangan: result.value.message,
tanggalPaparan: result.value.tanggalPaparan
} : { } : {
keterangan: result.value.message keterangan: result.value.message
}; };
@@ -327,7 +347,7 @@
'Data berhasil diotorisasi.', 'Data berhasil diotorisasi.',
'Terjadi kesalahan saat melakukan otorisasi.' 'Terjadi kesalahan saat melakukan otorisasi.'
); );
} else if (result.isDenied) { } else if (!hideDenyButton && result.isDenied) {
handleRejection(dataId, dataHeader); handleRejection(dataId, dataHeader);
} }
}); });