fix(laporan_external): perbaiki pengambilan data dan update tampilan tabel
- Mengubah query untuk mengambil data dengan relasi yang lebih lengkap. - Menambahkan kolom 'Nama Debitur' dan 'Tujuan Penilaian' pada tampilan tabel. - Menghapus kolom yang tidak diperlukan untuk menyederhanakan tampilan.
This commit is contained in:
@@ -151,7 +151,7 @@ class LaporanExternalController extends Controller
|
|||||||
$filteredRecords = $query->count();
|
$filteredRecords = $query->count();
|
||||||
|
|
||||||
// Get the data for the current page
|
// Get the data for the current page
|
||||||
$data = $query->get();
|
$data = $query->with(['permohonan.debiture','permohonan.penawaran.tujuanPenilaianKjpp'])->get();
|
||||||
|
|
||||||
// Calculate the page count
|
// Calculate the page count
|
||||||
$pageCount = ceil($totalRecords / $request->get('size'));
|
$pageCount = ceil($totalRecords / $request->get('size'));
|
||||||
|
|||||||
@@ -36,8 +36,12 @@
|
|||||||
<span class="sort"> <span class="sort-label"> Nomor Laporan </span>
|
<span class="sort"> <span class="sort-label"> Nomor Laporan </span>
|
||||||
<span class="sort-icon"> </span> </span>
|
<span class="sort-icon"> </span> </span>
|
||||||
</th>
|
</th>
|
||||||
<th class="min-w-[150px]" data-datatable-column="tgl_final_laporan">
|
<th class="min-w-[150px]" data-datatable-column="nama_debitur">
|
||||||
<span class="sort"> <span class="sort-label"> Tanggal Final Laporan </span>
|
<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>
|
<span class="sort-icon"> </span> </span>
|
||||||
</th>
|
</th>
|
||||||
<th class="min-w-[150px]" data-datatable-column="nilai_pasar">
|
<th class="min-w-[150px]" data-datatable-column="nilai_pasar">
|
||||||
@@ -48,30 +52,7 @@
|
|||||||
<span class="sort"> <span class="sort-label"> Indikasi Nilai Likuidasi </span>
|
<span class="sort"> <span class="sort-label"> Indikasi Nilai Likuidasi </span>
|
||||||
<span class="sort-icon"> </span> </span>
|
<span class="sort-icon"> </span> </span>
|
||||||
</th>
|
</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">
|
<th class="min-w-[150px]" data-datatable-column="file_resume">
|
||||||
<span class="sort"> <span class="sort-label"> File Resume </span>
|
<span class="sort"> <span class="sort-label"> File Resume </span>
|
||||||
<span class="sort-icon"> </span> </span>
|
<span class="sort-icon"> </span> </span>
|
||||||
@@ -156,8 +137,17 @@
|
|||||||
nomor_laporan: {
|
nomor_laporan: {
|
||||||
title: 'Nomor Laporan',
|
title: 'Nomor Laporan',
|
||||||
},
|
},
|
||||||
tgl_final_laporan: {
|
nama_debitur: {
|
||||||
title: 'Tanggal Final Laporan',
|
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}` ?? '';
|
||||||
|
}
|
||||||
},
|
},
|
||||||
nilai_pasar: {
|
nilai_pasar: {
|
||||||
title: 'Nilai Pasar',
|
title: 'Nilai Pasar',
|
||||||
@@ -165,24 +155,6 @@
|
|||||||
indikasi_nilai_likuidasi: {
|
indikasi_nilai_likuidasi: {
|
||||||
title: '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: {
|
file_resume: {
|
||||||
title: 'File Resume',
|
title: 'File Resume',
|
||||||
render: (item, data) => {
|
render: (item, data) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user