From 16bbe542e31b0b62b33d2ad1e4ed6c2e1d179c99 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 13:59:18 +0700
Subject: [PATCH] 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.
---
 app/Http/Controllers/SpkController.php |  2 +-
 app/Models/PenawaranTender.php         |  6 ++++--
 app/Models/Permohonan.php              |  6 +-----
 resources/views/spk/index.blade.php    | 24 +++++++++++++++++-------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index 5b4a683..60568f9 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -34,7 +34,7 @@ use Illuminate\Support\Facades\Auth;
             }
 
             // Retrieve data from the database
-            $query =Permohonan::query()->with(['penawaran','tujuan_penilaian_kjpp'])
+            $query =Permohonan::query()->with(['penawaran','penawaran.tujuanPenilaianKjpp'])
                         ->where('permohonan.status','=','spk');
 
             // Apply search filter if provided
diff --git a/app/Models/PenawaranTender.php b/app/Models/PenawaranTender.php
index 4ae1496..92ac865 100644
--- a/app/Models/PenawaranTender.php
+++ b/app/Models/PenawaranTender.php
@@ -32,9 +32,9 @@ class PenawaranTender extends Model
     }
 
     // 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()
@@ -46,4 +46,6 @@ class PenawaranTender extends Model
     {
         return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id');
     }
+
+
 }
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index cf44584..1dd7bdd 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -91,10 +91,6 @@ class Permohonan extends Base
     }
 
     public function penawaran(){
-        return $this->hasMany(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
-    }
-
-    public function tujuan_penilaian_kjpp(){
-            return $this->belongsTo(TujuanPenilaianKJPP::class, 'tujuan_penilaian_kjpp_id', 'id');
+        return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
     }
 }
diff --git a/resources/views/spk/index.blade.php b/resources/views/spk/index.blade.php
index 33fb705..a8446d0 100644
--- a/resources/views/spk/index.blade.php
+++ b/resources/views/spk/index.blade.php
@@ -90,6 +90,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');
@@ -116,21 +125,22 @@
             code: {
                 title: 'Kode Penawaran',
                 render: (item, data) => {
-                    console.log(data);
-                   return `${data.penawaran.code}`;
+                   if(data.penawaran) {
+                       return `${data.penawaran.code}`;
+                   }
+
+                   return '-';
                 },
             },
             date_range: {
                 title: 'Tanggal Penawaran',
-                render: (item, data) => {
-                    return `${data.penawaran.start_date} - ${data.penawaran.end_date}`;
-                },
+
             },
             tujuan_penilaian_kjpp_name: {
                 title: 'Tujuan Penilaian',
                 render: (item, data) => {
-                    if(data.tujuan_penilaian_kjpp) {
-                        return `${data.tujuan_penilaian_kjpp.name}`;
+                    if(data.penawaran.tujuan_penilaian_kjpp) {
+                        return `${data.penawawan.tujuan_penilaian_kjpp.name}`;
                     }
 
                     return '-';