fix(surveyor): perbaikan filter data revisi dan data pembanding

app/Http/Controllers/PenilaianController.php

@@ -838,7 +838,7 @@ class PenilaianController extends Controller
     {
         $permohonan = Permohonan::findOrFail($id);
         $permohonan->update([
-            'status' => 'done',
+            'status' => 'revisi-laporan',
             'keterangan' => $request->message,
             'submitted_at' => now()
         ]);

app/Http/Controllers/RegistrasiController.php

@@ -29,7 +29,9 @@
             }
 
             // Retrieve data from the database
-            $query = Permohonan::query()->where('status', '=', 'preregister');
+            $query = Permohonan::query()
+    ->whereIn('status', ['preregister', 'revisi']);
+
 
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {

app/Http/Controllers/SurveyorController.php

@@ -2016,7 +2016,7 @@ class SurveyorController extends Controller
             });
         }
 
-        $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule' ]);
+        $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-laporan' ]);
 
 
         if (!Auth::user()->hasRole('administrator')) {

resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php

@@ -113,7 +113,7 @@
 
                     @endphp
                     <td class="px-4 py-2">
-                        <input type="text" name="luas_tanah" class="input "
+                        <input type="text" name="luas_tanah" class="input number-format"
                             value="{{ $inspectionData['tanah']['luas_tanah']['sesuai'] ?? ($inspectionData['tanah']['luas_tanah']['tidak sesuai'] ?? '') }}">
                     </td>
                     <td class="px-4 py-2">
@@ -124,7 +124,7 @@
 
                 @php
                     $luasTanahData = [];
-                    $nilai = 'N/A';
+                    $nilai = 0;
 
                     // Memeriksa apakah key 'bangunan' ada di dalam $inspectionData
                     if (isset($inspectionData['bangunan']['luas_tanah_bagunan'])) {

resources/views/surveyor/index.blade.php

@@ -71,6 +71,18 @@
                                     </span>
                                 </th>
 
+                                <th class="min-w-[150px]" data-datatable-column="status">
+                                    <span class="sort"><span class="sort-label">Status</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+
+                                <th class="min-w-[150px]" data-datatable-column="keterangan">
+                                    <span class="sort"><span class="sort-label">Keterangan</span>
+                                        <span class="sort-icon"></span>
+                                    </span>
+                                </th>
+
                                 <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
                             </tr>
                         </thead>
@@ -201,85 +213,41 @@
 
         }
 
-        function approveReschedule(penilaianId,permohonanId, noReg, debitur, reschedule_date, reschedule_note) {
-    Swal.fire({
-        title: 'Konfirmasi',
-        html: `
+        function approveReschedule(penilaianId, permohonanId, noReg, debitur, reschedule_date, reschedule_note) {
+            Swal.fire({
+                title: 'Konfirmasi',
+                html: `
             <p>Yakin akan Menyetujui atau Menolak Reschedule Jadwal Kunjungan <b>${noReg}</b> untuk Debitur <b>${debitur}</b>
             pada waktu <b>${window.formatTanggalWaktuIndonesia(reschedule_date)}</b>?</p>
             <p><b>Catatan: </b> <br/>${reschedule_note}</p>
         `,
-        icon: 'warning',
-        showDenyButton: true,
-        showCancelButton: true,
-        confirmButtonColor: '#3085d6',
-        denyButtonColor: '#d33',
-        confirmButtonText: 'Approve',
-        denyButtonText: 'Reject'
-    }).then((result) => {
-        if (result.isConfirmed) {
-            // Approve action
-            let token = "{{ csrf_token() }}";
-            let useURL = "{{ URL::to('/surveyor/store-approve-reschedule') }}" + "/" + penilaianId;
-
-            var input_data = {
-                _token : token,
-                permohonan_id : permohonanId,
-                nomor_registrasi: noReg
-            }
-            $.ajax({
-                url: useURL,
-                type: "PUT",
-                cache: false,
-                data: input_data,
-                success: function(response) {
-                    console.log(response);
-                    if ('success' == response.status) {
-                        Swal.fire('Sukses!', response.message, 'success').then(() => {
-                            location.reload(true);
-                        });
-                    } else {
-                        Swal.fire('Error!', response.message, 'error');
-                    }
-                },
-                error: function(response, textStatus, errorThrown) {
-                    console.log(response);
-                }
-            });
-        } else if (result.isDenied) {
-            // Reject action
-            Swal.fire({
-                title: 'Masukkan Keterangan',
-                input: 'textarea',
-                inputPlaceholder: 'Tuliskan alasan penolakan di sini...',
-                inputAttributes: {
-                    'aria-label': 'Tuliskan alasan penolakan di sini'
-                },
+                icon: 'warning',
+                showDenyButton: true,
                 showCancelButton: true,
-                confirmButtonText: 'Submit',
-                cancelButtonText: 'Batal'
-            }).then((rejectResult) => {
-                if (rejectResult.isConfirmed && rejectResult.value) {
+                confirmButtonColor: '#3085d6',
+                denyButtonColor: '#d33',
+                confirmButtonText: 'Approve',
+                denyButtonText: 'Reject'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    // Approve action
                     let token = "{{ csrf_token() }}";
-                    let useURL = "{{ URL::to('/surveyor/store-rejected-reschedule') }}" + "/" + penilaianId;
+                    let useURL = "{{ URL::to('/surveyor/store-approve-reschedule') }}" + "/" + penilaianId;
 
-                
                     var input_data = {
-                _token : token,
-                permohonan_id : permohonanId,
-                nomor_registrasi: noReg,
-                rejected_note : rejectResult.value
-            }
+                        _token: token,
+                        permohonan_id: permohonanId,
+                        nomor_registrasi: noReg
+                    }
                     $.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(() => {
+                                Swal.fire('Sukses!', response.message, 'success').then(() => {
                                     location.reload(true);
                                 });
                             } else {
@@ -290,59 +258,106 @@
                             console.log(response);
                         }
                     });
-                } else if (rejectResult.dismiss === Swal.DismissReason.cancel) {
-                    Swal.fire('Dibatalkan', 'Aksi penolakan dibatalkan.', 'info');
+                } else if (result.isDenied) {
+                    // Reject action
+                    Swal.fire({
+                        title: 'Masukkan Keterangan',
+                        input: 'textarea',
+                        inputPlaceholder: 'Tuliskan alasan penolakan di sini...',
+                        inputAttributes: {
+                            'aria-label': 'Tuliskan alasan penolakan di sini'
+                        },
+                        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: noReg,
+                                rejected_note: 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');
+                        }
+                    });
                 }
             });
         }
-    });
-}
 
 
-function prosesSurvey(permohonanId, nomor_registrasi) { 
-    Swal.fire({
-        title: 'Konfirmasi',
-        text: `Yakin akan Melakukan Inspeksi dengan nomor registrasi ${nomor_registrasi}?`,
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonColor: '#3085d6',
-        cancelButtonColor: '#d33',
-        confirmButtonText: 'Ya, Setujui',
-        cancelButtonText: 'Batal',
-    }).then((result) => {
-        if (result.isConfirmed) {
-            // Mendefinisikan URL dan data
-            let token = "{{ csrf_token() }}";
-            let useURL = `{{ URL::to('/surveyor/store-proses-survey') }}/${permohonanId}`;
+        function prosesSurvey(permohonanId, nomor_registrasi) {
+            Swal.fire({
+                title: 'Konfirmasi',
+                text: `Yakin akan Melakukan Inspeksi dengan nomor registrasi ${nomor_registrasi}?`,
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Ya, Setujui',
+                cancelButtonText: 'Batal',
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    // Mendefinisikan URL dan data
+                    let token = "{{ csrf_token() }}";
+                    let useURL = `{{ URL::to('/surveyor/store-proses-survey') }}/${permohonanId}`;
 
-            let input_data = {
-                _token: token,
-                permohonan_id: permohonanId
-            };
+                    let input_data = {
+                        _token: token,
+                        permohonan_id: permohonanId
+                    };
 
-            // Melakukan AJAX request
-            $.ajax({
-                url: useURL,
-                type: "PUT",
-                cache: false,
-                data: input_data,
-                dataType: "json",
-                success: function(response) {
-                    if (response.status === 'success') {
-                        // Arahkan langsung ke halaman inspeksi
-                        window.location.href = `surveyor/${permohonanId}/show?form=inspeksi`;
-                    } 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');
+                    // Melakukan AJAX request
+                    $.ajax({
+                        url: useURL,
+                        type: "PUT",
+                        cache: false,
+                        data: input_data,
+                        dataType: "json",
+                        success: function(response) {
+                            if (response.status === 'success') {
+                                // Arahkan langsung ke halaman inspeksi
+                                window.location.href = `surveyor/${permohonanId}/show?form=inspeksi`;
+                            } 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');
+                        }
+                    });
                 }
             });
         }
-    });
-}
     </script>
 
     <script type="module">
@@ -396,24 +411,43 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
                     title: 'Fasilitas Kredit',
                     render: (item, data) => data.jenis_fasilitas_kredit ? `${data.jenis_fasilitas_kredit.name}` : 'N/A',
                 },
-                actions: {
-    title: 'Action',
-    render: (item, data) => {
-        let actionHtml = '';
+                status: {
+                    title: 'status',
+                    render: (item, data) => {
+                        return `<span class="badge badge-sm badge-default uppercase flex justify-center">${data.status}</span>`;
+                    }
+                },
+                keterangan: {
+                    title: 'Keterangan',
+                    render: (item, data) => {
+                        let actionHtml = '';
+                        if (data.status === 'revisi-laporan') {
+                            actionHtml += `${data.keterangan}`
+                        };
 
-        if (data.status === 'request-reschedule') {
-            actionHtml += `
+                        if (data.status === 'request-reschedule') {
+                            actionHtml += `${data.penilaian.reschedule_note}`
+                        };
+                        return actionHtml;
+                    }
+                },
+                actions: {
+                    title: 'Action',
+                    render: (item, data) => {
+                        let actionHtml = '';
+
+                        if (data.status === 'request-reschedule') {
+                            actionHtml += `
                 <button class="btn btn-sm btn-icon btn-clear btn-success"
                         onclick="approveReschedule('${data.penilaian.id}','${data.id}', '${data.nomor_registrasi}', '${data.debiture?.name}', '${data.penilaian.reschedule_date}', '${data.penilaian.reschedule_note}')"
                         title="Approve Reschedule">
                    <i class="ki-filled ki-double-check"></i>
                 </button>
             `;
-        } else {
-            if (data.penilaian.waktu_penilaian == null || 
-                (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) {
-                // Tombol Buat Jadwal Kunjungan
-                actionHtml += `
+                        } else {
+                            if (data.penilaian.waktu_penilaian == null ||
+                                (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) {
+                                actionHtml += `
                     <a class="btn btn-sm btn-icon btn-clear btn-primary"
                        data-modal-toggle="#modal_jadwal"
                        onclick="jadwal(${data.penilaian.id})"
@@ -422,27 +456,27 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
                     </a>
                 `;
 
-                if (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null) {
-                    // Tambahkan elemen berdampingan
-                    actionHtml += `
+                                if (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null) {
+                                    actionHtml += `
                         <span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span>
                     `;
-                }
-            } else if (data.status === 'approved-reschedule' || data.status === 'rejected-reschedule') {
-                actionHtml += `
+                                }
+                            } else if (data.status === 'approved-reschedule' || data.status ===
+                                'rejected-reschedule') {
+                                actionHtml += `
                     <span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span>
                 `;
-            } else if(data.status === 'proses-survey'){
-                actionHtml += `
+                            } else if (data.status === 'proses-survey') {
+                                actionHtml += `
                      <a class="btn btn-sm btn-icon btn-clear btn-clarity"
                         onclick="prosesSurvey(${data.id}, '${data.nomor_registrasi}')"
                        title="Masuk Form Inspeksi">
                        <i class="ki-filled ki-tablet-ok"></i>
                     </a>
                 `;
-        }else {
-                // Tombol Lihat Form Inspeksi dan Freeze Survey
-                actionHtml += `
+                            } else {
+                                // Tombol Lihat Form Inspeksi dan Freeze Survey
+                                actionHtml += `
                     <a class="btn btn-sm btn-icon btn-clear btn-warning"
                        href="surveyor/${data.id}/show?form=inspeksi"
                        title="Lihat Form Inspeksi">
@@ -455,12 +489,12 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
                         <i class="ki-filled ki-arrow-circle-right"></i>
                     </button>
                 `;
-            }
-        }
+                            }
+                        }
 
-        return actionHtml;
-    }
-}
+                        return actionHtml;
+                    }
+                }
 
             }
         };