diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index bd4c3ec..3f1b3c1 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/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()
]);
diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php
index c6e80b2..676051e 100644
--- a/app/Http/Controllers/RegistrasiController.php
+++ b/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'))) {
diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index 08cca8f..22c602d 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/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')) {
diff --git a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
index 15b0ae7..4eb5cc9 100644
--- a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
+++ b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
@@ -113,7 +113,7 @@
@endphp
-
@@ -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'])) {
diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php
index 09b67fa..ef6e383 100644
--- a/resources/views/surveyor/index.blade.php
+++ b/resources/views/surveyor/index.blade.php
@@ -71,6 +71,18 @@
+
+ Status
+
+
+
+
+
+ Keterangan
+
+
+
+
Action
@@ -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: `
Yakin akan Menyetujui atau Menolak Reschedule Jadwal Kunjungan ${noReg} untuk Debitur ${debitur}
pada waktu ${window.formatTanggalWaktuIndonesia(reschedule_date)} ?
Catatan: ${reschedule_note}
`,
- 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');
+ }
+ });
}
});
}
- });
-}