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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2025-03-06 07:51:51 +07:00
parent 87e1af60a5 14ac13551b
commit 0614905cda
11 changed files with 366 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Helpers/Lpj.php
View File

@@ -293,7 +293,23 @@ function holidays()
function countPermohonanForUser($userId) function countPermohonanForUser($userId)
{ {
$validStatuses = ['assign', 'proses-laporan', 'done']; $validStatuses = [
'assign',
'survey-completed',
'proses-laporan',
'paparan',
'proses-paparan',
'revisi-laporan',
'revisi-paparan',
'survey',
'proses-survey',
'request-reschedule',
'reschedule',
'rejected-reschedule',
'approved-reschedule',
'revisi-survey',
'revisi-pembayaran'
];
$result = Penilaian::whereHas('userPenilai', function ($query) use ($userId) { $result = Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
$query->where('user_id', $userId); $query->where('user_id', $userId);
@@ -412,3 +428,22 @@ function getWilayahName($code, $type)
return null; return null;
} }
} }
function formatLabel($key) {
$customLabels = [
'shgb_no_kel_desa' => 'SHGB',
'nib' => 'NIB',
'img_pbg_no' =>'IMB/PBG NO',
'no_surat_ukur_gs' => 'No Surat Ukur/GS',
];
// Jika ada dalam mapping, gunakan label custom
if (array_key_exists($key, $customLabels)) {
return $customLabels[$key];
}
// Default: Ubah underscore menjadi spasi dan kapitalisasi
return ucwords(str_replace('_', ' ', $key));
}

18
app/Http/Controllers/ActivityController.php
View File

@@ -392,7 +392,23 @@ class ActivityController extends Controller
$q->where('user_id', $id); $q->where('user_id', $id);
}) })
->whereHas('permohonan', function ($q) { ->whereHas('permohonan', function ($q) {
$q->whereNotIn('status', ['done']); $q->whereIn('status', [
'assign',
'survey-completed',
'proses-laporan',
'paparan',
'proses-paparan',
'revisi-laporan',
'revisi-paparan',
'survey',
'proses-survey',
'request-reschedule',
'reschedule',
'rejected-reschedule',
'approved-reschedule',
'revisi-survey',
'revisi-pembayaran'
]);
}); });

6
app/Http/Controllers/PenilaiController.php
View File

@@ -754,9 +754,13 @@ class PenilaiController extends Controller
if (!$allComplete) { if (!$allComplete) {
$message = $rap
? 'Harap Mengisi laporan terlebih dahulu'
: 'Harap Mengisi laporan terlebih dahulu atau kertas kerja';
return response()->json([ return response()->json([
'success' => false, 'success' => false,
'message' => 'Harap Mengisi laporan terlebih dahulu atau kertas kerja', 'message' => $message,
], 400); ], 400);
} }

4
app/Http/Controllers/SpkController.php
View File

@@ -158,7 +158,7 @@ use Illuminate\Support\Facades\Auth;
$penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name; $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
$penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code; $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
$penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name; $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
$penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian; $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? "";
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi) $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
@@ -244,7 +244,7 @@ use Illuminate\Support\Facades\Auth;
$penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name; $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
$penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code; $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
$penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name; $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
$penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian; $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? "";
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi) $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')

5
app/Http/Controllers/SurveyorController.php
View File

@@ -962,7 +962,8 @@ class SurveyorController extends Controller
$validate = $request->validate([ $validate = $request->validate([
'id' => 'required', 'id' => 'required',
'waktu_penilaian' => 'required', 'waktu_penilaian' => 'required',
'deskripsi_penilaian' => 'required' 'deskripsi_penilaian' => 'required',
'keterangan' => 'required',
]); ]);
$penilaian = Penilaian::findOrFail($id); $penilaian = Penilaian::findOrFail($id);
@@ -3713,7 +3714,7 @@ class SurveyorController extends Controller
return response()->json([ return response()->json([
'status' => 'success', 'status' => 'success',
'message' => 'Reschedule jadwal dengan nomor registrasi ' . $validatedData['nomor_registrasi'] . ' berhasil ditolak dengan alasan: ' . $validatedData['rejected_note'], 'message' => 'Reschedule jadwal dengan nomor registrasi ' . $validatedData['nomor_registrasi'] . ' berhasil dengan alasan: ' . $validatedData['rejected_note'],
]); ]);
} catch (\Exception $e) { } catch (\Exception $e) {
// Rollback jika ada error // Rollback jika ada error

217
resources/views/penilai/components/foto-jaminan.blade.php
View File

@@ -46,36 +46,24 @@
/* Media Print */ /* Media Print */
@media print { @media print {
.photo-item { table {
width: 48%; width: 100%;
margin-right: 2%; border-collapse: collapse;
float: left; }
padding: 5px; td {
box-sizing: border-box; vertical-align: top;
page-break-inside: avoid; text-align: center;
} page-break-inside: avoid;
}
.photo-item img { .photo-image {
width: 300px; width: auto;
height: 300px; height: 400px;
object-fit: contain; max-height: 400px;
background-color: #f0f0f0; }
border-radius: 5px; .page-break {
page-break-inside: avoid; page-break-after: always;
} }
}
h2 {
font-size: 14px;
}
.photo-container {
page-break-inside: avoid;
}
.photo-row {
page-break-inside: avoid;
}
}
</style> </style>
@isset($basicData['foto']) @isset($basicData['foto'])
@@ -93,6 +81,8 @@
@if ($groupedPhotos->isEmpty()) @if ($groupedPhotos->isEmpty())
<p class="text-gray-500">Tidak ada foto yang tersedia.</p> <p class="text-gray-500">Tidak ada foto yang tersedia.</p>
@else @else
@foreach ($mainPhotos as $category => $photos) @foreach ($mainPhotos as $category => $photos)
@php @php
$groupedBySubcategory = $photos->groupBy('sub'); $groupedBySubcategory = $photos->groupBy('sub');
@@ -100,142 +90,77 @@
@foreach ($groupedBySubcategory as $subcategory => $subPhotos) @foreach ($groupedBySubcategory as $subcategory => $subPhotos)
@if (count($subPhotos) > 0) @if (count($subPhotos) > 0)
<table width="100%" border="0" style="align-content: center; text-align: center"> @foreach ($subPhotos->chunk(2) as $chunkedPhotos)
<tr> <table width="100%" border="0" style="align-content: center; text-align: center; margin-bottom: 20px">
@if (count($subPhotos) === 1) @foreach ($chunkedPhotos as $item)
@php
$item = $subPhotos->first();
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<td style="width: 100%; vertical-align: top; text-align: center" colspan="2"
class="photo-item border">
<p style="font-weight: medium; font-size: 10px">{{ $category }} -
@isset($subcategory)
@if (trim($subcategory) !== '')
{{ $subcategory }} -
@endif
@endisset
{{ $item['name'] ?? '' }}
</p>
@if ($statusLpj || file_exists($imagePath))
<img src="{{ $imagePath }}" alt="{{ $item['path'] }}" class="photo-image"
style="width: 100%; max-width: 300px;">
@endif
@isset($item['description'])
<p style="font-size:9px">{{ $item['description'] }}</p>
@endisset
</td>
@else
@foreach ($subPhotos as $index => $item)
@php @php
$imagePath = storage_path('app/public/' . $item['path']); $imagePath = storage_path('app/public/' . $item['path']);
@endphp @endphp
<td style="width: 50%; vertical-align: top; text-align: center" <tr>
class="photo-item border"> <td style="width: 100%; padding: 10px;" class="photo-item border">
<p style="font-weight: medium; font-size: 10px">{{ $category }} - <p style="font-weight: medium; font-size: 10px">{{ $category }} -
@isset($subcategory) @isset($subcategory)
@if (trim($subcategory) !== '') @if (trim($subcategory) !== '')
{{ $subcategory }} - {{ $subcategory }} -
@endif @endif
@endisset @endisset
{{ $item['name'] ?? '' }} {{ $item['name'] ?? '' }}
</p> </p>
@if ($statusLpj || file_exists($imagePath)) @if ($statusLpj || file_exists($imagePath))
<img src="{{ $imagePath }}" alt="{{ $item['path'] }}" class="photo-image" <img src="{{ $imagePath }}" alt="{{ $item['path'] }}" class="photo-image">
style="width: 100%; max-width: 300px;">
@endif @endif
@isset($item['description']) @isset($item['description'])
<p style="font-size:9px">{{ $item['description'] }}</p> <p style="font-size:9px">{{ $item['description'] }}</p>
@endisset @endisset
</td> </td>
@if (($index + 1) % 2 == 0) </tr>
</tr> @endforeach
<tr> @if (count($chunkedPhotos) < 2)
<tr style="width: 100%;"></tr>
@endif
</table>
<div class="page-break"></div>
@endforeach
@endif @endif
@endforeach @endforeach
@if (count($subPhotos) % 2 != 0)
<td style="width: 50%;"></td>
@endif
@endif
</tr>
</table>
@endif
@endforeach
@endforeach
@endif
<div class="page-break"></div>
@if (!$otherPhotos->isEmpty())
@foreach ($otherPhotos->groupBy('sub') as $subcategory => $subPhotos)
@if (count($subPhotos) > 0)
<table width="100%" border="0" style="align-content: center; text-align: center">
<tr>
@if (count($subPhotos) === 1)
@php
$item = $subPhotos->first();
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<td style="width: 100%; vertical-align: top; text-align: center" colspan="2"
class="photo-item border">
<p style="font-weight: medium; font-size: 10px">Lainnya -
@isset($subcategory)
@if (trim($subcategory) !== '')
{{ $subcategory }} -
@endif
@endisset
{{ $item['name'] ?? '' }}
</p>
@if ($statusLpj || file_exists($imagePath))
<img src="{{ $imagePath }}" alt="{{ $item['path'] }}" class="photo-image"
style="width: 100%; max-width: 300px;">
@endif
@isset($item['description'])
<p style="font-size:9px">{{ $item['description'] }}</p>
@endisset
</td>
@else
@foreach ($subPhotos as $index => $item)
@php
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<td style="width: 50%; vertical-align: top; text-align: center" class="photo-item border">
<p style="font-weight: medium; font-size: 10px">Lainnya -
@isset($subcategory)
@if (trim($subcategory) !== '')
{{ $subcategory }} -
@endif
@endisset
{{ $item['name'] ?? '' }}
</p>
@if ($statusLpj || file_exists($imagePath))
<img src="{{ $imagePath }}" alt="{{ $item['path'] }}" class="photo-image"
style="width: 100%; max-width: 300px;">
@endif
@isset($item['description'])
<p style="font-size:9px">{{ $item['description'] }}</p>
@endisset
</td>
@if (($index + 1) % 2 == 0)
</tr>
<tr>
@endif
@endforeach @endforeach
@if (count($subPhotos) % 2 != 0)
<td style="width: 50%;"></td> @if (!$otherPhotos->isEmpty())
@foreach ($otherPhotos->groupBy('sub') as $subcategory => $subPhotos)
@if (count($subPhotos) > 0)
@foreach ($subPhotos->chunk(2) as $chunkedPhotos)
<table width="100%" border="0" style="align-content: center; text-align: center; margin-bottom: 20px">
@foreach ($chunkedPhotos as $item)
@php
$imagePath = storage_path('app/public/' . $item['path']);
@endphp
<tr>
<td style="width: 100%; padding: 10px;" class="photo-item border">
<p style="font-weight: medium; font-size: 10px">Lainnya -
@isset($subcategory)
@if (trim($subcategory) !== '')
{{ $subcategory }} -
@endif
@endisset
{{ $item['name'] ?? '' }}
</p>
@if ($statusLpj || file_exists($imagePath))
<img src="{{ $imagePath }}" alt="{{ $item['path'] }}" class="photo-image">
@endif
@isset($item['description'])
<p style="font-size:9px">{{ $item['description'] }}</p>
@endisset
</td>
@endforeach
</tr>
@if (count($chunkedPhotos) < 2)
<tr style="width: 100%;"></tr>
@endif
</table>
@endforeach
@endif
@endforeach
@endif @endif
@endif @endif
</tr>
</table>
@endif
@endforeach
@endif
@endisset @endisset

12
resources/views/penilaian/otorisator/show.blade.php
View File

@@ -216,24 +216,24 @@
</a> </a>
@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" <button onclick="otorisatorData({{ $permohonan->id }},'SO')" type="button"
class="btn btn-primary"> class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisator {{ $header ?? '' }} Otorisator {{ $header ?? '' }}
</button> </button>
@endif @endif
@if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_eo == null) @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null)
<button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button" <button onclick="otorisatorData({{ $permohonan->id }},'EO')" type="button"
class="btn btn-primary"> class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisator {{ $header ?? '' }} Otorisator {{ $header ?? '' }}
</button> </button>
@endif @endif
@if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_dd == null) @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null)
<button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button" <button onclick="otorisatorData({{ $permohonan->id }},'DD')" type="button"
class="btn btn-primary"> class="btn btn-primary">
<i class="ki-filled ki-double-check"></i> <i class="ki-filled ki-double-check"></i>
Otorisator {{ $header ?? '' }} Otorisator {{ $header ?? '' }}

299
resources/views/permohonan/index.blade.php
View File

@@ -206,25 +206,32 @@
if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') { if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') {
actionHtml += ` actionHtml += `
<a <a
title="Reschedule Jadwal Survey" title="Reschedule Jadwal Survey"
data-permohonan-id="${data.id}" data-permohonan-id="${data.id}"
data-id-penilaian="${data.penilaian.id}" data-id-penilaian="${data.penilaian.id}"
data-no-reg="${data.nomor_registrasi}" data-no-reg="${data.nomor_registrasi}"
data-debitur="${data.debiture ? data.debiture.name.replace(/'/g, "\\'") : ""}" data-debitur="${data.debiture ? data.debiture.name.replace(/'/g, "\\'") : ""}"
data-waktu-penilaian="${data.penilaian.waktu_penilaian}" data-waktu-penilaian="${data.penilaian.waktu_penilaian}"
data-rejected-note="${data.penilaian.rejected_note ? JSON.stringify(data.penilaian.rejected_note).replace(/'/g, "\\'").replace(/"/g, '&quot;') : '{}'}" data-rejected-note="${data.penilaian.rejected_note ? JSON.stringify(data.penilaian.rejected_note).replace(/'/g, "\\'").replace(/"/g, '&quot;') : '{}'}"
onclick="surveyorRescheduleJadwalSurvey(this)" onclick="surveyorRescheduleJadwalSurvey(this)"
class="delete btn btn-sm btn-outline btn-light"> class="delete btn btn-sm btn-outline btn-light">
<i class="ki-filled ki-calendar-remove"></i> <i class="ki-filled ki-calendar-remove"></i>
</a>`; </a>`;
} }
if (data && data.penilaian && data.penilaian.waktu_penilaian !== null && data.status !== if (data && data.penilaian && data.penilaian.waktu_penilaian !== null && data.status !==
'done' && data.penilaian.authorized_status == null || data.status === 'done' && data.penilaian.authorized_status == null || data.status ===
'approved-reschedule') { 'approved-reschedule') {
actionHtml += ` actionHtml += `
<a class="btn btn-sm btn-outline btn-primary" href="javascript:void(0)" onclick="surveyorApproveKunjungan(${data.id},${data.penilaian.id},'${data.nomor_registrasi}', '${data.debiture?.name}', '${data.penilaian.waktu_penilaian}')" title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" > <a class="btn btn-sm btn-outline btn-primary"
title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}"
data-permohonan-id="${data.id}"
data-id-penilaian="${data.penilaian.id}"
data-no-reg="${data.nomor_registrasi}"
data-debitur="${data.debiture ? data.debiture.name.replace(/'/g, "\\'") : ""}"
data-waktu-penilaian="${data.penilaian.waktu_penilaian}"
onclick="surveyorApproveKunjungan(this)" >
<i class="ki-filled ki-calendar-edit"></i> <i class="ki-filled ki-calendar-edit"></i>
</a> </a>
`; `;
@@ -268,16 +275,26 @@
}); });
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
function surveyorApproveKunjungan(permohonanId, idPenilaian, noReg, debitur, waktuPenilaian) { function surveyorApproveKunjungan(element) {
const permohonanId = element.getAttribute('data-permohonan-id');
const idPenilaian = element.getAttribute('data-id-penilaian');
const noReg = element.getAttribute('data-no-reg');
const debitur = element.getAttribute('data-debitur');
const waktuPenilaian = element.getAttribute('data-waktu-penilaian');
Swal.fire({ Swal.fire({
title: ' ', title: ' ',
text: "Yakin akan Menyetujui Jadwal Kunjungan " + noReg + " untuk Debitur " + debitur + text: "Yakin akan Menyetujui Jadwal Kunjungan " + noReg + " untuk Debitur " + debitur +
" pada waktu " + window.formatTanggalWaktuIndonesia(waktuPenilaian) + "?", " pada waktu " + window.formatTanggalWaktuIndonesia(waktuPenilaian) + "?",
icon: 'warning', icon: 'warning',
showCancelButton: true, showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'Cancel',
showDenyButton: true,
denyButtonText: 'Reschedule',
confirmButtonColor: '#3085d6', confirmButtonColor: '#3085d6',
denyButtonColor: '#f4b400',
cancelButtonColor: '#d33', cancelButtonColor: '#d33',
confirmButtonText: 'Yes'
}).then((result) => { }).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
//define variable //define variable
@@ -315,6 +332,94 @@
} }
}); });
} else if (result.isDenied) {
Swal.fire({
title: 'Reschedule Jadwal Kunjungan',
html: `
<div class="text-left space-y-4">
<p class="text-gray-700">
Yakin akan Reschedule Jadwal Kunjungan
<span class="font-semibold text-blue-600">${noReg}</span>
untuk Debitur
<span class="font-semibold text-blue-600">${debitur}</span>
pada waktu
<span class="font-semibold">${window.formatTanggalWaktuIndonesia(waktuPenilaian)}</span>?
</p>
<div>
<label for="reschedule_date" class="block text-sm font-medium text-gray-700 mb-1">Tanggal Baru</label>
<input type="datetime-local" id="reschedule_date"
class="block w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm">
</div>
<div>
<label for="reschedule_note" class="block text-sm font-medium text-gray-700 mb-1">Catatan</label>
<textarea id="reschedule_note"
class="block w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
placeholder="Masukkan alasan reschedule..."></textarea>
</div>
</div>
`,
showCancelButton: true,
confirmButtonText: 'Reschedule',
cancelButtonText: 'Batal',
preConfirm: () => {
const rescheduleDate = document.getElementById('reschedule_date').value;
const rescheduleNote = document.getElementById('reschedule_note').value;
if (!rescheduleDate || !rescheduleNote) {
Swal.showValidationMessage('Semua input wajib diisi!');
return false;
}
return {
rescheduleDate,
rescheduleNote
};
}
}).then((rescheduleResult) => {
if (rescheduleResult.isConfirmed) {
const {
rescheduleDate,
rescheduleNote
} = rescheduleResult.value;
const data = {
_token: "{{ csrf_token() }}",
penilaian_id: idPenilaian,
nomor_registrasi: noReg,
permohonan_id: permohonanId,
reschedule_date: rescheduleDate,
reschedule_note: rescheduleNote,
keterangan: rescheduleNote
};
$.ajax({
url: `{{ URL::to('/permohonan/store-reschedule-survey') }}/${idPenilaian}`,
type: "PUT",
cache: false,
data: data,
dataType: "json",
success: function(response) {
if (response.status === 'success') {
Swal.fire('Sukses Reschedule!', response.message,
'success').then(() => {
location.reload();
});
} else {
Swal.fire('Error!', response.message, 'error');
}
},
error: function(response) {
console.log(response);
}
});
}
});
} }
}) })
@@ -364,8 +469,8 @@
placeholder="Masukkan alasan reschedule..."></textarea> placeholder="Masukkan alasan reschedule..."></textarea>
</div> </div>
${note ? ` ${note ? `
<p class="text-gray-700"><strong>Catatan Reject:</strong> ${note}</p> <p class="text-gray-700"><strong>Catatan Reject:</strong> ${note}</p>
` : ''} ` : ''}
</div> </div>
`, `,
@@ -389,132 +494,50 @@
}; };
} }
}).then((result) => { }).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
const { const {
rescheduleDate, rescheduleDate,
rescheduleNote rescheduleNote
} = result.value; } = result.value;
// Data to send // Data to send
const data = { const data = {
_token: "{{ csrf_token() }}", _token: "{{ csrf_token() }}",
penilaian_id: idPenilaian, penilaian_id: idPenilaian,
nomor_registrasi: noReg, nomor_registrasi: noReg,
permohonan_id: permohonanId, permohonan_id: permohonanId,
reschedule_date: rescheduleDate, reschedule_date: rescheduleDate,
reschedule_note: rescheduleNote, reschedule_note: rescheduleNote,
keterangan: rescheduleNote keterangan: rescheduleNote
}; };
$.ajax({ $.ajax({
url: `{{ URL::to('/permohonan/store-reschedule-survey') }}/${idPenilaian}`, url: `{{ URL::to('/permohonan/store-reschedule-survey') }}/${idPenilaian}`,
type: "PUT", type: "PUT",
cache: false, cache: false,
data: data, data: data,
dataType: "json", dataType: "json",
success: function(response) { success: function(response) {
if (response.status === 'success') { if (response.status === 'success') {
Swal.fire('Sukses Reschedule!', response.message, 'success').then( Swal.fire('Sukses Reschedule!', response.message, 'success').then(
() => { () => {
location.reload(); location.reload();
});
} else {
Swal.fire('Error!', response.message, 'error');
}
}).then((result) => {
if (result.isConfirmed) {
const {
rescheduleDate,
rescheduleNote
} = result.value;
// Data to send
const data = {
_token: "{{ csrf_token() }}",
penilaian_id: idPenilaian,
nomor_registrasi: noReg,
permohonan_id: permohonanId,
reschedule_date: rescheduleDate,
reschedule_note: rescheduleNote,
keterangan: rejectedNote
};
$.ajax({
url: `{{ URL::to('/permohonan/store-reschedule-survey') }}/${idPenilaian}`,
type: "PUT",
cache: false,
data: data,
dataType: "json",
success: function(response) {
if (response.status === 'success') {
Swal.fire('Sukses Reschedule!', response.message,
'success').then(
() => {
location.reload();
});
} else {
Swal.fire('Error!', response.message, 'error');
}
return {
rescheduleDate,
rescheduleNote
};
}
}).then((result) => {
if (result.isConfirmed) {
const {
rescheduleDate,
rescheduleNote
} = result.value;
// Data to send
const data = {
_token: "{{ csrf_token() }}",
penilaian_id: idPenilaian,
nomor_registrasi: noReg,
permohonan_id: permohonanId,
reschedule_date: rescheduleDate,
reschedule_note: rescheduleNote
};
$.ajax({
url: `{{ URL::to('/permohonan/store-reschedule-survey') }}/${idPenilaian}`,
type: "PUT",
cache: false,
data: data,
dataType: "json",
success: function(response) {
if (response.status === 'success') {
Swal.fire('Sukses Reschedule!',
response.message,
'success').then(
() => {
location.reload();
});
} else {
Swal.fire('Error!', response
.message, 'error');
}
},
error: function(response) {
const errorMessage = response
.responseJSON?.message ||
'Terjadi kesalahan saat memproses data.';
Swal.fire('Error!', errorMessage,
'error');
}
});
}
}); });
} } else {
Swal.fire('Error!', response.message, 'error');
}
// window.formatTanggalIndonesia(date) },
}); error: function(response) {
}); const errorMessage = response.responseJSON?.message ||
'Terjadi kesalahan saat memproses data.';
Swal.fire('Error!', errorMessage, 'error');
}
});
} }
}); });
} }
// window.formatTanggalIndonesia(date)
</script> </script>
@endpush @endpush

6
resources/views/spk/documentSPK.blade.php
View File

@@ -60,7 +60,7 @@
</center> </center>
<br> <br>
<h3>Kepada</h3> <h3>Kepada</h3>
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_name }}</p> <p style="color: red; margin-left:25px">KJPP {{ $penawaran->kjpp_name }}</p>
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p> <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
<br/> <br/>
<br/> <br/>
@@ -237,8 +237,8 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br> <span style="color: red;">{{ getUser($penawaran->authorized_by)->name }}</span><br>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span> <span style="color: red;">{{ getUser($penawaran->authorized_by)->getRoleNames()[0] }}</span>
</td> </td>
<td align="center">(……………………………………..)</td> <td align="center">(……………………………………..)</td>
</tr> </tr>

6
resources/views/spk/edit.blade.php
View File

@@ -76,7 +76,7 @@
</center> </center>
<br> <br>
<h3>Kepada</h3> <h3>Kepada</h3>
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_name }}</p> <p style="color: red; margin-left:25px">KJPP {{ $penawaran->kjpp_name }}</p>
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p> <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
<br/> <br/>
<br/> <br/>
@@ -258,8 +258,8 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br> <span style="color: red;">{{ getUser($penawaran->authorized_by)->name }}</span><br>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span> <span style="color: red;">{{ getUser($penawaran->authorized_by)->getRoleNames()[0] }}</span>
</td> </td>
<td align="center">(……………………………………..)</td> <td align="center">(……………………………………..)</td>
</tr> </tr>

62
resources/views/surveyor/index.blade.php
View File

@@ -206,7 +206,7 @@
} }
function prosesSurvey(permohonanId, nomor_registrasi) { function prosesSurvey(permohonanId, nomor_registrasi, penilaianId) {
Swal.fire({ Swal.fire({
title: 'Konfirmasi', title: 'Konfirmasi',
text: `Yakin akan Melakukan Inspeksi dengan nomor registrasi ${nomor_registrasi}?`, text: `Yakin akan Melakukan Inspeksi dengan nomor registrasi ${nomor_registrasi}?`,
@@ -216,6 +216,9 @@
cancelButtonColor: '#d33', cancelButtonColor: '#d33',
confirmButtonText: 'Ya, Setujui', confirmButtonText: 'Ya, Setujui',
cancelButtonText: 'Batal', cancelButtonText: 'Batal',
denyButtonText: 'Ubah Jadwal Kunjungan',
denyButtonColor: '#f4b400',
showDenyButton: true
}).then((result) => { }).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
// Mendefinisikan URL dan data // Mendefinisikan URL dan data
@@ -250,6 +253,58 @@
Swal.fire('Error!', errorMessage, 'error'); Swal.fire('Error!', errorMessage, 'error');
} }
}); });
}else if (result.isDenied) {
// Reject action
Swal.fire({
title: 'Masukkan Keterangan',
input: 'textarea',
inputPlaceholder: 'Tuliskan alasan perubahan jadwal di sini dan masukkan tanggal kunjungan...',
inputAttributes: {
'aria-label': 'Tuliskan alasan perubahan jadwal di sini dan masukkan tanggal kunjungan'
},
showCancelButton: true,
confirmButtonText: 'Submit',
cancelButtonText: 'Batal'
}).then((rejectResult) => {
if (rejectResult.isConfirmed && rejectResult.value) {
let token = "{{ csrf_token() }}";
let useURL = "{{ URL::to('/surveyor/store-rejected-reschedule') }}" + "/" +
penilaianId;
var input_data = {
_token: token,
permohonan_id: permohonanId,
nomor_registrasi: nomor_registrasi,
rejected_note: rejectResult.value,
keterangan: rejectResult.value
}
$.ajax({
url: useURL,
type: "PUT",
cache: false,
data: input_data,
success: function(response) {
console.log(response);
if ('success' == response.status) {
Swal.fire('Ditolak!', response.message, 'success').then(
() => {
location.reload(true);
});
} else {
Swal.fire('Error!', response.message, 'error');
}
},
error: function(response, textStatus, errorThrown) {
console.log(response);
}
});
} else if (rejectResult.dismiss === Swal.DismissReason.cancel) {
Swal.fire('Dibatalkan', 'Aksi penolakan dibatalkan.', 'info');
}
});
} }
}); });
} }
@@ -444,7 +499,8 @@
_token: token, _token: token,
id: permohonanId, id: permohonanId,
waktu_penilaian: tanggal, waktu_penilaian: tanggal,
deskripsi_penilaian: keterangan deskripsi_penilaian: keterangan,
keterangan:'Tanggal Kunjungan: ' + tanggal + ', Keterangan: ' + keterangan
}; };
$.ajax({ $.ajax({
@@ -580,7 +636,7 @@
} else if (data.status === 'proses-survey') { } else if (data.status === 'proses-survey') {
actionHtml += ` actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-clarity" <a class="btn btn-sm btn-icon btn-clear btn-clarity"
onclick="prosesSurvey(${data.id}, '${data.nomor_registrasi}')" onclick="prosesSurvey(${data.id}, '${data.nomor_registrasi}', '${data.penilaian.id}')"
title="Masuk Form Inspeksi"> title="Masuk Form Inspeksi">
<i class="ki-filled ki-tablet-ok"></i> <i class="ki-filled ki-tablet-ok"></i>
</a> </a>