Feature SPK, perbaikan CONFLICT

resources/views/spk/index.blade.php

@@ -84,6 +84,15 @@
         var url = "{{ url('/') }}"+url1;
         $(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 type="module">
     const element = document.querySelector('#spk-table');
@@ -109,25 +118,44 @@
             },
             code: {
                 title: 'Kode Penawaran',
+                render: (item, data) => {
+                   if(data.penawaran) {
+                       return `${data.penawaran.code}`;
+                   }
+
+                   return '-';
+                },
             },
             date_range: {
                 title: 'Tanggal Penawaran',
+                render: (item, data) => {
+                    const startDate = formatTanggalIndonesia(data.penawaran.start_date);
+                    const endDate = formatTanggalIndonesia(data.penawaran.end_date);
+                    return `${startDate} - ${endDate}`;
+                },
             },
             tujuan_penilaian_kjpp_name: {
                 title: 'Tujuan Penilaian',
+                render: (item, data) => {
+                    if(data.penawaran.tujuan_penilaian_kjpp) {
+                        return `${data.penawaran.tujuan_penilaian_kjpp.name}`;
+                    }
+
+                    return '-';
+                },
             },
             nama_kjpp_sebelumnya: {
                 title: 'Nama KJPP Terpilih',
                 render: (item, data) => {
-                    return `${data.nama_kjpp_sebelumnya}`+'<br />'
-                            +`${data.biaya_kjpp_sebelumnya}`+'<br /> '
-                            +`${data.tanggal_penilaian_sebelumnya}`;
+                    return `${data.penawaran.nama_kjpp_sebelumnya}`+'<br />'
+                            +`${data.penawaran.biaya_kjpp_sebelumnya}`+'<br /> '
+                            +`${data.penawaran.tanggal_penilaian_sebelumnya}`;
                 },
             },
             status: {
                 title: 'Status',
                 render: (item, data) => {
-                    return `${data.status}`.toUpperCase();
+                    return `${data.penawaran.status}`.toUpperCase();
                 },
             },
             actions: {
@@ -135,7 +163,7 @@
                 render: (item, data) => {
                     var iconSpkShow ='';
                     var iconSpkCreate='';
-                    if(!data.dokumenSPK)
+                    if(!data.dokumen)
                     {
                         iconSpkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" onclick="spkCreate(${data.id})" >
                             <i class="ki-outline ki-notepad-edit"></i>
@@ -144,7 +172,7 @@
                     else
                     {
                         iconSpkShow =`<div class="flex flex-nowrap justify-center">
-                        <a href="${data.dokumenSPK}" class="btn btn-sm btn-icon btn-clear btn-primary" title="Download SPK" download >
+                        <a href="${data.dokumen}" class="btn btn-sm btn-icon btn-clear btn-primary" title="Download SPK" download >
                             <i class="ki-filled ki-cloud-download"></i>
                         </a> `;
                         iconSpkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >