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

resources/views/penilaian/otorisator/show.blade.php

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

resources/views/permohonan/index.blade.php

@@ -206,14 +206,16 @@
 
                         if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') {
                             actionHtml += `
-            <a onclick="surveyorRescheduleJadwalSurvey(
+            <a
-    ${data.id},
+            title="Reschedule Jadwal Survey"
-    ${data.penilaian.id},
+    data-permohonan-id="${data.id}"
-    '${data.nomor_registrasi}',
+    data-id-penilaian="${data.penilaian.id}"
-    '${data.debiture ? data.debiture.name.replace(/'/g, "\\'") : ""}',
+    data-no-reg="${data.nomor_registrasi}"
-    '${data.penilaian.waktu_penilaian}',
+    data-debitur="${data.debiture ? data.debiture.name.replace(/'/g, "\\'") : ""}"
-    '${data.penilaian.rejected_note ? JSON.stringify(data.penilaian.rejected_note).replace(/'/g, "\\'").replace(/"/g, '&quot;') : '{}'}'
+    data-waktu-penilaian="${data.penilaian.waktu_penilaian}"
-)" class="delete btn btn-sm btn-outline btn-light" title="Reschedule Jadwal Survey">
+    data-rejected-note="${data.penilaian.rejected_note ? JSON.stringify(data.penilaian.rejected_note).replace(/'/g, "\\'").replace(/"/g, '&quot;') : '{}'}"
+    onclick="surveyorRescheduleJadwalSurvey(this)"
+    class="delete btn btn-sm btn-outline btn-light">
     <i class="ki-filled ki-calendar-remove"></i>
 </a>`;
                         }
@@ -319,8 +321,22 @@
         }
 
 
-        function surveyorRescheduleJadwalSurvey(permohonanId, idPenilaian, noReg, debitur, waktuPenilaian, rejectedNote) {
+        function surveyorRescheduleJadwalSurvey(element) {
-            rejectedNote = JSON.parse(rejectedNote);
+            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');
+            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({
                 title: 'Reschedule Jadwal Kunjungan',
                 html: `
@@ -347,10 +363,10 @@
                               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>
-
+                ${note ? `
-                 ${rejectedNote && rejectedNote.trim() ? `
+                                                <p class="text-gray-700"><strong>Catatan Reject:</strong> ${note}</p>
-                                <p class="text-gray-700"><strong>Catatan Reject:</strong> ${rejectedNote}</p>
                                             ` : ''}
+
             </div>
         `,
                 icon: 'warning',
@@ -387,7 +403,7 @@
                             permohonan_id: permohonanId,
                             reschedule_date: rescheduleDate,
                             reschedule_note: rescheduleNote,
-                                keterangan: rejectedNote
+                            keterangan: rescheduleNote
                         };
 
                         $.ajax({
@@ -405,6 +421,40 @@
                                     } 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,
@@ -436,19 +486,23 @@
                                                 dataType: "json",
                                                 success: function(response) {
                                                     if (response.status === 'success') {
-                                                Swal.fire('Sukses Reschedule!', response.message,
+                                                        Swal.fire('Sukses Reschedule!',
+                                                            response.message,
                                                             'success').then(
                                                             () => {
                                                                 location.reload();
                                                             });
                                                     } else {
-                                                Swal.fire('Error!', response.message, 'error');
+                                                        Swal.fire('Error!', response
+                                                            .message, 'error');
                                                     }
                                                 },
                                                 error: function(response) {
-                                            const errorMessage = response.responseJSON?.message ||
+                                                    const errorMessage = response
+                                                        .responseJSON?.message ||
                                                         'Terjadi kesalahan saat memproses data.';
-                                            Swal.fire('Error!', errorMessage, 'error');
+                                                    Swal.fire('Error!', errorMessage,
+                                                        'error');
                                                 }
                                             });
                                         }
@@ -457,5 +511,10 @@
 
 
                                 // window.formatTanggalIndonesia(date)
+                            });
+                        });
+                }
+            });
+        }
     </script>
 @endpush

routes/web.php

@@ -527,7 +527,7 @@ Route::middleware(['auth'])->group(function () {
         );
 
         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(
             'type',