Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2025-03-07 16:08:35 +07:00
4 changed files with 40 additions and 61 deletions

View File

@@ -151,7 +151,7 @@ class LaporanExternalController extends Controller
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->get();
$data = $query->with(['permohonan.debiture','permohonan.penawaran.tujuanPenilaianKjpp'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));

View File

@@ -388,11 +388,15 @@ use Illuminate\Support\Facades\Auth;
public function updateSla(Request $request, $id): JsonResponse
{
$request->validate([
'sla' => 'required|integer|min:1',
]);
$permohonan = Permohonan::where('nomor_registrasi','=',$id)->first();
$penawaran = PenawaranTender::find($id);
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
$permohonan->sla = $request->sla;
$permohonan->save();

View File

@@ -36,8 +36,16 @@
<span class="sort"> <span class="sort-label"> Nomor Laporan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tgl_final_laporan">
<span class="sort"> <span class="sort-label"> Tanggal Final Laporan </span>
<th class="min-w-[150px]" data-datatable-column="nama_debitur">
<span class="sort"> <span class="sort-label"> Nama Debitur </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
<span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="jenis_jaminan">
<span class="sort"> <span class="sort-label"> Jenis Jaminan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="nilai_pasar">
@@ -48,30 +56,7 @@
<span class="sort"> <span class="sort-label"> Indikasi Nilai Likuidasi </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_tanah">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Tanah </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="estimasi_harga_bangunan">
<span class="sort"> <span class="sort-label"> Estimasi Harga Bangunan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_bangunan">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Bangunan </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_sarana_pelengkap">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Sarana Pelengkap </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_mesin">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Mesin </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="indikasi_nilai_pasar_kendaraan_alat_berat">
<span class="sort"> <span class="sort-label"> Indikasi Nilai Pasar Kendaraan/Alat Berat </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[150px]" data-datatable-column="file_resume">
<span class="sort"> <span class="sort-label"> File Resume </span>
<span class="sort-icon"> </span> </span>
@@ -156,8 +141,23 @@
nomor_laporan: {
title: 'Nomor Laporan',
},
tgl_final_laporan: {
title: 'Tanggal Final Laporan',
nama_debitur: {
title: 'Nama Debitur',
render: (item, data) => {
return `${data.permohonan.debiture.name}`;
},
},
tujuan_penilaian: {
title: 'Tujuan Penilaian',
render: (item, data) => {
return `${data.permohonan.penawaran?.tujuanPenilaianKjpp.name}` ?? '';
}
},
jenis_jaminan: {
title: 'Jenis Jaminan',
render: (item, data) => {
return `${data.permohonan.dokumenjaminan[0]?.jenisjaminan?.name}` ?? '';
}
},
nilai_pasar: {
title: 'Nilai Pasar',
@@ -165,24 +165,6 @@
indikasi_nilai_likuidasi: {
title: 'Indikasi Nilai Likuidasi',
},
indikasi_nilai_pasar_tanah: {
title: 'Indikasi Nilai Pasar Tanah',
},
estimasi_harga_bangunan: {
title: 'Estimasi Harga Bangunan',
},
indikasi_nilai_pasar_bangunan: {
title: 'Indikasi Nilai Pasar Bangunan',
},
indikasi_nilai_pasar_sarana_pelengkap: {
title: 'Indikasi Nilai Pasar Sarana Pelengkap',
},
indikasi_nilai_pasar_mesin: {
title: 'Indikasi Nilai Pasar Mesin',
},
indikasi_nilai_pasar_kendaraan_alat_berat: {
title: 'Indikasi Nilai Pasar Kendaraan/Alat Berat',
},
file_resume: {
title: 'File Resume',
render: (item, data) => {

View File

@@ -200,23 +200,16 @@
});
$('#{{$route[0]}}_jenis_penilaian').on('change', function (e) {
var jenis_penilaian_id = $(this).val();
var idNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").val();
// var textNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").text();
if('1'==idNya)
{
if (jenis_penilaian_id === '1') {
// INTERNAL, show region
$("#{{ $route[0] }}_div_region").show();
}
else if('2' == idNya)
{
$("#{{ $route[0] }}_div_region").hide();
}
else if('0' == idNya)
{
// selain INTERNAL, hide region
$("#jenis_laporan").val('sederhana');
} else {
// For all other cases, hide region
$("#{{ $route[0] }}_div_region").hide();
$("#jenis_laporan").val('standar');
}
});