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

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

Browse Source 
Reviewed-on: #94
This commit is contained in:
putrakuningan
2025-02-13 09:44:18 +01:00
parent 5a4c8ab3a4 3b3765a53f
commit 259f63917e
5 changed files with 174 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PenilaianController.php
View File

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

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

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

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

@@ -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')) { if (!Auth::user()->hasRole('administrator')) {

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

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

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

@@ -71,6 +71,18 @@
</span> </span>
</th> </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> <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
</tr> </tr>
</thead> </thead>
@@ -201,7 +213,7 @@
} }
function approveReschedule(penilaianId,permohonanId, noReg, debitur, reschedule_date, reschedule_note) { function approveReschedule(penilaianId, permohonanId, noReg, debitur, reschedule_date, reschedule_note) {
Swal.fire({ Swal.fire({
title: 'Konfirmasi', title: 'Konfirmasi',
html: ` html: `
@@ -223,8 +235,8 @@
let useURL = "{{ URL::to('/surveyor/store-approve-reschedule') }}" + "/" + penilaianId; let useURL = "{{ URL::to('/surveyor/store-approve-reschedule') }}" + "/" + penilaianId;
var input_data = { var input_data = {
_token : token, _token: token,
permohonan_id : permohonanId, permohonan_id: permohonanId,
nomor_registrasi: noReg nomor_registrasi: noReg
} }
$.ajax({ $.ajax({
@@ -261,14 +273,15 @@
}).then((rejectResult) => { }).then((rejectResult) => {
if (rejectResult.isConfirmed && rejectResult.value) { if (rejectResult.isConfirmed && rejectResult.value) {
let token = "{{ csrf_token() }}"; let token = "{{ csrf_token() }}";
let useURL = "{{ URL::to('/surveyor/store-rejected-reschedule') }}" + "/" + penilaianId; let useURL = "{{ URL::to('/surveyor/store-rejected-reschedule') }}" + "/" +
penilaianId;
var input_data = { var input_data = {
_token : token, _token: token,
permohonan_id : permohonanId, permohonan_id: permohonanId,
nomor_registrasi: noReg, nomor_registrasi: noReg,
rejected_note : rejectResult.value rejected_note: rejectResult.value
} }
$.ajax({ $.ajax({
url: useURL, url: useURL,
@@ -279,7 +292,8 @@
success: function(response) { success: function(response) {
console.log(response); console.log(response);
if ('success' == response.status) { if ('success' == response.status) {
Swal.fire('Ditolak!', response.message, 'success').then(() => { Swal.fire('Ditolak!', response.message, 'success').then(
() => {
location.reload(true); location.reload(true);
}); });
} else { } else {
@@ -296,10 +310,10 @@
}); });
} }
}); });
} }
function prosesSurvey(permohonanId, nomor_registrasi) { function prosesSurvey(permohonanId, nomor_registrasi) {
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}?`,
@@ -336,13 +350,14 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
} }
}, },
error: function(response) { error: function(response) {
const errorMessage = response.responseJSON?.message || 'Terjadi kesalahan saat memproses data.'; const errorMessage = response.responseJSON?.message ||
'Terjadi kesalahan saat memproses data.';
Swal.fire('Error!', errorMessage, 'error'); Swal.fire('Error!', errorMessage, 'error');
} }
}); });
} }
}); });
} }
</script> </script>
<script type="module"> <script type="module">
@@ -396,6 +411,26 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
title: 'Fasilitas Kredit', title: 'Fasilitas Kredit',
render: (item, data) => data.jenis_fasilitas_kredit ? `${data.jenis_fasilitas_kredit.name}` : 'N/A', render: (item, data) => data.jenis_fasilitas_kredit ? `${data.jenis_fasilitas_kredit.name}` : 'N/A',
}, },
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 += `${data.penilaian.reschedule_note}`
};
return actionHtml;
}
},
actions: { actions: {
title: 'Action', title: 'Action',
render: (item, data) => { render: (item, data) => {
@@ -412,7 +447,6 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
} else { } else {
if (data.penilaian.waktu_penilaian == null || if (data.penilaian.waktu_penilaian == null ||
(data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) { (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) {
// Tombol Buat Jadwal Kunjungan
actionHtml += ` actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-primary" <a class="btn btn-sm btn-icon btn-clear btn-primary"
data-modal-toggle="#modal_jadwal" data-modal-toggle="#modal_jadwal"
@@ -423,16 +457,16 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
`; `;
if (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null) { if (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null) {
// Tambahkan elemen berdampingan
actionHtml += ` actionHtml += `
<span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span> <span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span>
`; `;
} }
} else if (data.status === 'approved-reschedule' || data.status === 'rejected-reschedule') { } else if (data.status === 'approved-reschedule' || data.status ===
'rejected-reschedule') {
actionHtml += ` actionHtml += `
<span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span> <span class="badge badge-xs badge-outline badge-warning text-4xs">Menunggu Pemohon</span>
`; `;
} 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}')"
@@ -440,7 +474,7 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
<i class="ki-filled ki-tablet-ok"></i> <i class="ki-filled ki-tablet-ok"></i>
</a> </a>
`; `;
}else { } else {
// Tombol Lihat Form Inspeksi dan Freeze Survey // Tombol Lihat Form Inspeksi dan Freeze Survey
actionHtml += ` actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-warning" <a class="btn btn-sm btn-icon btn-clear btn-warning"
@@ -460,7 +494,7 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
return actionHtml; return actionHtml;
} }
} }
} }
}; };