Perbaiki relasi model dan tampilkan format tanggal Indonesia

Perbaikan pada relasi model PenawaranTender dan Permohonan untuk memastikan data diambil dengan benar. Menambahkan fungsi `formatTanggalIndonesia` pada view SPK dan merapihkan tampilan data penawaran dan tujuan penilaian KJPP.
This commit is contained in:
Daeng Deni Mardaeni
2024-11-06 13:59:18 +07:00
parent 474a3041c8
commit 16bbe542e3
4 changed files with 23 additions and 15 deletions

View File

@@ -34,7 +34,7 @@ use Illuminate\Support\Facades\Auth;
} }
// Retrieve data from the database // Retrieve data from the database
$query =Permohonan::query()->with(['penawaran','tujuan_penilaian_kjpp']) $query =Permohonan::query()->with(['penawaran','penawaran.tujuanPenilaianKjpp'])
->where('permohonan.status','=','spk'); ->where('permohonan.status','=','spk');
// Apply search filter if provided // Apply search filter if provided

View File

@@ -32,9 +32,9 @@ class PenawaranTender extends Model
} }
// menambahkan relasi tujuan penilaian KJPP // menambahkan relasi tujuan penilaian KJPP
public function tujuanPenilaianKJPP() public function tujuanPenilaianKjpp()
{ {
return $this->hasMany(TujuanPenilaianKJPP::class, 'id', 'tujuan_penilaian_kjpp_id'); return $this->belongsTo(TujuanPenilaianKJPP::class, 'id', 'tujuan_penilaian_kjpp_id');
} }
public function permohonan() public function permohonan()
@@ -46,4 +46,6 @@ class PenawaranTender extends Model
{ {
return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id'); return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id');
} }
} }

View File

@@ -91,10 +91,6 @@ class Permohonan extends Base
} }
public function penawaran(){ public function penawaran(){
return $this->hasMany(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi'); return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
}
public function tujuan_penilaian_kjpp(){
return $this->belongsTo(TujuanPenilaianKJPP::class, 'tujuan_penilaian_kjpp_id', 'id');
} }
} }

View File

@@ -90,6 +90,15 @@
var url = "{{ url('/') }}"+url1; var url = "{{ url('/') }}"+url1;
$(location).attr('href',url); $(location).attr('href',url);
} }
function formatTanggalIndonesia(dateString) {
const date = new Date(dateString);
const day = date.getDate().toString().padStart(2, '0');
const monthNames = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni', 'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'];
const month = monthNames[date.getMonth()];
const year = date.getFullYear();
return `${day} ${month} ${year}`;
}
</script> </script>
<script type="module"> <script type="module">
const element = document.querySelector('#spk-table'); const element = document.querySelector('#spk-table');
@@ -116,21 +125,22 @@
code: { code: {
title: 'Kode Penawaran', title: 'Kode Penawaran',
render: (item, data) => { render: (item, data) => {
console.log(data); if(data.penawaran) {
return `${data.penawaran.code}`; return `${data.penawaran.code}`;
}
return '-';
}, },
}, },
date_range: { date_range: {
title: 'Tanggal Penawaran', title: 'Tanggal Penawaran',
render: (item, data) => {
return `${data.penawaran.start_date} - ${data.penawaran.end_date}`;
},
}, },
tujuan_penilaian_kjpp_name: { tujuan_penilaian_kjpp_name: {
title: 'Tujuan Penilaian', title: 'Tujuan Penilaian',
render: (item, data) => { render: (item, data) => {
if(data.tujuan_penilaian_kjpp) { if(data.penawaran.tujuan_penilaian_kjpp) {
return `${data.tujuan_penilaian_kjpp.name}`; return `${data.penawawan.tujuan_penilaian_kjpp.name}`;
} }
return '-'; return '-';