diff --git a/app/Http/Controllers/LaporanExternalController.php b/app/Http/Controllers/LaporanExternalController.php index ea6cec1..56b4763 100644 --- a/app/Http/Controllers/LaporanExternalController.php +++ b/app/Http/Controllers/LaporanExternalController.php @@ -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')); diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php index f5de6aa..2d9530a 100644 --- a/app/Http/Controllers/SpkController.php +++ b/app/Http/Controllers/SpkController.php @@ -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(); diff --git a/resources/views/laporan_external/index.blade.php b/resources/views/laporan_external/index.blade.php index e04b544..18152a1 100644 --- a/resources/views/laporan_external/index.blade.php +++ b/resources/views/laporan_external/index.blade.php @@ -36,8 +36,16 @@ Nomor Laporan - - Tanggal Final Laporan + + Nama Debitur + + + + Tujuan Penilaian + + + + Jenis Jaminan @@ -48,30 +56,7 @@ Indikasi Nilai Likuidasi - - Indikasi Nilai Pasar Tanah - - - - Estimasi Harga Bangunan - - - - Indikasi Nilai Pasar Bangunan - - - - Indikasi Nilai Pasar Sarana Pelengkap - - - - Indikasi Nilai Pasar Mesin - - - - Indikasi Nilai Pasar Kendaraan/Alat Berat - - + File Resume @@ -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) => { diff --git a/resources/views/registrasi/js/editjs.blade.php b/resources/views/registrasi/js/editjs.blade.php index b005f59..7d0d063 100644 --- a/resources/views/registrasi/js/editjs.blade.php +++ b/resources/views/registrasi/js/editjs.blade.php @@ -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'); } });