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->update([
'status' => 'done',
'status' => 'revisi-laporan',
'keterangan' => $request->message,
'submitted_at' => now()
]);

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

@@ -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'))) {

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')) {

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

@@ -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'])) {

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

@@ -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>
@@ -261,7 +273,8 @@
}).then((rejectResult) => {
if (rejectResult.isConfirmed && rejectResult.value) {
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 = {
@@ -279,7 +292,8 @@
success: function(response) {
console.log(response);
if ('success' == response.status) {
Swal.fire('Ditolak!', response.message, 'success').then(() => {
Swal.fire('Ditolak!', response.message, 'success').then(
() => {
location.reload(true);
});
} else {
@@ -336,7 +350,8 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
}
},
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');
}
});
@@ -396,6 +411,26 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
title: 'Fasilitas Kredit',
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: {
title: 'Action',
render: (item, data) => {
@@ -412,7 +447,6 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
} else {
if (data.penilaian.waktu_penilaian == null ||
(data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) {
// Tombol Buat Jadwal Kunjungan
actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-primary"
data-modal-toggle="#modal_jadwal"
@@ -423,12 +457,12 @@ function prosesSurvey(permohonanId, nomor_registrasi) {
`;
if (data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null) {
// Tambahkan elemen berdampingan
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') {
} 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>
`;