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

Merge pull request 'feature/senior-officer' (#118) from feature/senior-officer into staging

Browse Source 
Reviewed-on: #118
This commit is contained in:
putrakuningan
2025-03-05 10:02:07 +01:00
parent dd5f0f94b5 50029c6b07
commit e9ec75219a
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,7 +267,7 @@
}).then((rejectResult) => { }).then((rejectResult) => {
if (rejectResult.isConfirmed) { if (rejectResult.isConfirmed) {
handleAjaxRequest( handleAjaxRequest(
`/otorisator/revisi/${dataId}`, { `/otorisator/revisi-laporan/${dataId}`, {
keterangan: rejectResult.value keterangan: rejectResult.value
}, },
'Data berhasil ditolak.', 'Data berhasil ditolak.',

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

@@ -326,7 +326,14 @@
const noReg = element.getAttribute('data-no-reg'); const noReg = element.getAttribute('data-no-reg');
const debitur = element.getAttribute('data-debitur'); const debitur = element.getAttribute('data-debitur');
const waktuPenilaian = element.getAttribute('data-waktu-penilaian'); const waktuPenilaian = element.getAttribute('data-waktu-penilaian');
const rejectedNote = JSON.parse(element.getAttribute('data-rejected-note')); let rejectedNote = element.getAttribute('data-rejected-note');
try {
rejectedNote = rejectedNote ? JSON.parse(rejectedNote) : null;
} catch (e) {
console.warn('Failed to parse rejectedNote:', e);
rejectedNote = null;
}
const note = rejectedNote && typeof rejectedNote === 'string' && rejectedNote.trim() ? String(rejectedNote).trim() : '';
Swal.fire({ Swal.fire({
title: 'Reschedule Jadwal Kunjungan', title: 'Reschedule Jadwal Kunjungan',
@@ -354,8 +361,8 @@
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" 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> placeholder="Masukkan alasan reschedule..."></textarea>
</div> </div>
${rejectedNote && rejectedNote.trim() ? ` ${note ? `
<p class="text-gray-700"><strong>Catatan Reject:</strong> ${rejectedNote}</p> <p class="text-gray-700"><strong>Catatan Reject:</strong> ${note}</p>
` : ''} ` : ''}
</div> </div>

2
routes/web.php
View File

@@ -527,7 +527,7 @@ Route::middleware(['auth'])->group(function () {
); );
Route::post('otorisator/{id}/{context}', [PenilaianController::class, 'otorisatorUpdate'])->name('otorisator.update'); Route::post('otorisator/{id}/{context}', [PenilaianController::class, 'otorisatorUpdate'])->name('otorisator.update');
Route::post('revisi/{id}', [PenilaianController::class, 'revisiLaporan'])->name('otorisator.revisi'); Route::post('revisi-laporan/{id}', [PenilaianController::class, 'revisiLaporan'])->name('otorisator.revisi');
Route::get('pembatalan', [PenilaianController::class, 'otorisator'])->name('pembatalan.index')->defaults( Route::get('pembatalan', [PenilaianController::class, 'otorisator'])->name('pembatalan.index')->defaults(
'type', 'type',