From 74872076e4c0b2e5a6e31992b9cb6e8ff89f61d4 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 11:18:02 +0700
Subject: [PATCH 1/4] refactor(spk): optimalkan pengambilan data penawaran

- Mengubah query untuk mengambil data penawaran dengan menggunakan eager loading.
- Menambahkan relasi baru pada model PenawaranTender untuk penilaian dan persetujuan.
- Memperbaiki tampilan pada dokumen SPK dan halaman edit dengan mengurangi duplikasi kode.
---
 app/Http/Controllers/SpkController.php    | 59 +++++++++--------------
 app/Models/PenawaranTender.php            |  8 +++
 resources/views/spk/documentSPK.blade.php | 13 +++--
 resources/views/spk/edit.blade.php        |  9 ++--
 4 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index 994520b..ef87340 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -148,26 +148,17 @@ use Illuminate\Support\Facades\Auth;
 
         public function edit($id)
         {
-            // dd(Carbon::now()->addDays(1)->format('d F Y'));
-            // dd(Carbon::now()->subDays(1)->format('d F Y')); jenis_laporan_name
-            $penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id')
-                                     ->leftJoin('jenis_laporan', 'jenis_laporan.id','=','penawaran.jenis_laporan_id')
-                                     ->leftJoin('kjpp', 'kjpp.id','=','detail_penawaran.kjpp_rekanan_id')
-                                     ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
-                                     ->leftJoin('penilaian', 'penilaian.nomor_registrasi','=','penawaran.nomor_registrasi')
-                                     ->where('detail_penawaran.status','=',1)
-                                     ->where('penawaran.id','=', $id)
-                                     ->select('penawaran.*', 'detail_penawaran.attachment as attachmentku',
-                                                'detail_penawaran.no_proposal as detail_penawaran_no_proposal',
-                                                'detail_penawaran.tgl_proposal as detail_penawaran_tgl_proposal',
-                                                'detail_penawaran.biaya_penawaran as detail_penawaran_biaya_penawaran',
-                                                'kjpp.name as kjpp_name',
-                                                'kjpp.address as kjpp_address',
-                                                'jenis_laporan.name as jenis_laporan_name',
-                                                'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name',
-                                                'jenis_laporan.code as jenis_laporan_code',
-                                                'penilaian.waktu_penilaian as penilaian_waktu_penilain'
-                                    )->first();
+            $penawaran = PenawaranTender::with(['jenisLaporan','tujuanPenilaianKjpp','detail.kjpp','penilaian','persetujuan_penawaran'])->where('id',$id)->first();
+            $penawaran->attachmentku = $penawaran->detail->attachment;
+            $penawaran->detail_penawaran_no_proposal = $penawaran->detail->no_proposal;
+            $penawaran->detail_penawaran_tgl_proposal = $penawaran->detail->tgl_proposal;
+            $penawaran->detail_penawaran_biaya_penawaran = $penawaran->detail->biaya_penawaran;
+            $penawaran->kjpp_name = $penawaran->detail->kjpp->name;
+            $penawaran->kjpp_address = $penawaran->detail->kjpp->address;
+            $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
+            $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
+            $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
+            $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian;
 
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
@@ -236,28 +227,24 @@ use Illuminate\Support\Facades\Auth;
 
         public function update(Request $request, $id): JsonResponse
         {
+
             // init
             $data1 = [];
             // $dataPermohonan = array();
             $dataPenawaran = [];
             // data
 
-            $penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id')
-                                     ->leftJoin('jenis_laporan', 'jenis_laporan.id','=','penawaran.jenis_laporan_id')
-                                     ->leftJoin('kjpp', 'kjpp.id','=','detail_penawaran.kjpp_rekanan_id')
-                                     ->leftJoin('penilaian', 'penilaian.nomor_registrasi','=','penawaran.nomor_registrasi')
-                                     ->where('detail_penawaran.status','=',1)
-                                     ->where('penawaran.id','=', $id)
-                                     ->select('penawaran.*', 'detail_penawaran.attachment as attachmentku',
-                                                'detail_penawaran.no_proposal as detail_penawaran_no_proposal',
-                                                'detail_penawaran.tgl_proposal as detail_penawaran_tgl_proposal',
-                                                'detail_penawaran.biaya_penawaran as detail_penawaran_biaya_penawaran',
-                                                'kjpp.name as kjpp_name',
-                                                'kjpp.address as kjpp_address',
-                                                'jenis_laporan.name as jenis_laporan_name',
-                                                'jenis_laporan.code as jenis_laporan_code',
-                                                'penilaian.waktu_penilaian as penilaian_waktu_penilain'
-                                    )->first();
+            $penawaran = PenawaranTender::with(['jenisLaporan','tujuanPenilaianKjpp','detail.kjpp','penilaian','persetujuan_penawaran'])->where('id',$id)->first();
+            $penawaran->attachmentku = $penawaran->detail->attachment;
+            $penawaran->detail_penawaran_no_proposal = $penawaran->detail->no_proposal;
+            $penawaran->detail_penawaran_tgl_proposal = $penawaran->detail->tgl_proposal;
+            $penawaran->detail_penawaran_biaya_penawaran = $penawaran->detail->biaya_penawaran;
+            $penawaran->kjpp_name = $penawaran->detail->kjpp->name;
+            $penawaran->kjpp_address = $penawaran->detail->kjpp->address;
+            $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
+            $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
+            $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
+            $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian;
 
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
diff --git a/app/Models/PenawaranTender.php b/app/Models/PenawaranTender.php
index 1c2832c..2d583b0 100644
--- a/app/Models/PenawaranTender.php
+++ b/app/Models/PenawaranTender.php
@@ -59,4 +59,12 @@ class PenawaranTender extends Model
     public function persetujuan(){
         return $this->belongsTo(PersetujuanPenawaran::class, 'id', 'penawaran_id');
     }
+
+    public function penilaian(){
+        return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
+
+    public function persetujuan_penawaran(){
+        return $this->belongsTo(PersetujuanPenawaran::class, 'id', 'penawaran_id');
+    }
 }
diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index 76bd9e8..08dd70a 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -50,7 +50,7 @@
             </table>
             <br/>
             <center>
-                <h2 style="text-decoration: underline;">SURAT PERINTAH KERJA</h2>
+                <h2 style="text-decoration: underline;">SURAT PERINTAH KERJAaaa</h2>
                 <p>
                     No. {{ $penawaran->spk_no }}
                     <data id="date"></data>
@@ -58,12 +58,11 @@
                 <p>Tanggal: <?php
                                 echo date('d F Y'); ?></p>
             </center>
+            <br>
             <h3>Kepada</h3>
+            <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_name }}</p>
+            <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
             <br/>
-            <p style="color: red;">{{ $penawaran->kjpp_name }}</p>
-            <p style="color: red;">{{ $penawaran->kjpp_address }}</p>
-            <br/>
-            <h3>Perihal: <b>Penunjukan sebagai Penyedia Jasa Penilaian Agunan</b></h3>
             <br/>
             <p style="text-align: justify;">
                 Berdasarkan surat penawaran Saudara
@@ -238,8 +237,8 @@
                 </tr>
                 <tr>
                     <td>
-                        <span style="color: red;">{{ $data->user->name }}</span><br>
-                        <span style="color: red;">{{ $data->user->getRoleNames()[0] }}</span>
+                        <span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br>
+                        <span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span>
                     </td>
                     <td align="center">(……………………………………..)</td>
                 </tr>
diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php
index 9b768ae..be61c5f 100644
--- a/resources/views/spk/edit.blade.php
+++ b/resources/views/spk/edit.blade.php
@@ -74,10 +74,11 @@
                                 Tanggal: <?php
                                              echo date('d F Y'); ?></p>
                         </center>
+                        <br>
                         <h3>Kepada</h3>
+                        <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_name }}</p>
+                        <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
                         <br/>
-                        <p style="color: red;">{{ $penawaran->kjpp_name }}</p>
-                        <p style="color: red;">{{ $penawaran->kjpp_address }}</p>
                         <br/>
                         <h3>Perihal: <b>Penunjukan sebagai Penyedia Jasa Penilaian Agunan</b></h3>
                         <br/>
@@ -257,8 +258,8 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <span style="color: red;">{{ $data->user->name }}</span><br>
-                                    <span style="color: red;">{{ $data->user->getRoleNames()[0] }}</span>
+                                    <span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br>
+                                    <span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span>
                                 </td>
                                 <td align="center">(……………………………………..)</td>
                             </tr>

From 42ed13e0efaf6129632db6b295db570d0976f466 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 11:52:50 +0700
Subject: [PATCH 2/4] fix(tender): perbaiki validasi dan tampilan biaya KJPP
 sebelumnya

- Menghapus aturan numeric pada biaya_kjpp_sebelumnya
- Mengubah input biaya_kjpp_sebelumnya menjadi hidden
- Menambahkan tombol untuk mengirim email pada tampilan proses penawaran
---
 app/Http/Requests/TenderPenawaranRequest.php    | 2 +-
 resources/views/penawaran/edit.blade.php        | 5 +++--
 resources/views/prosespenawaran/index.blade.php | 8 +++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Http/Requests/TenderPenawaranRequest.php b/app/Http/Requests/TenderPenawaranRequest.php
index 85e66a5..b26e64e 100644
--- a/app/Http/Requests/TenderPenawaranRequest.php
+++ b/app/Http/Requests/TenderPenawaranRequest.php
@@ -13,7 +13,7 @@ class TenderPenawaranRequest extends FormRequest
     {
         $rules = [
             'nama_kjpp_sebelumnya' => 'nullable',
-            'biaya_kjpp_sebelumnya' => 'nullable|numeric',
+            'biaya_kjpp_sebelumnya' => 'nullable',
             'tanggal_penilaian_sebelumnya' => 'nullable',
             'nomor_registrasi' => 'required',
             'kjpp.*' => 'exists:kjpp,id',
diff --git a/resources/views/penawaran/edit.blade.php b/resources/views/penawaran/edit.blade.php
index 61ac3b2..3bea064 100644
--- a/resources/views/penawaran/edit.blade.php
+++ b/resources/views/penawaran/edit.blade.php
@@ -53,8 +53,9 @@
                             Biaya KJPP Sebelumnya
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
-                                name="biaya_kjpp_sebelumnya" readonly
+                            <input type="hidden" name="biaya_kjpp_sebelumnya"
+                                value="{{ $penawaran->biaya_kjpp_sebelumnya !== null ? $penawaran->biaya_kjpp_sebelumnya : '' }}">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text" readonly
                                 value="{{ $penawaran->biaya_kjpp_sebelumnya !== null ? formatRupiah($penawaran->biaya_kjpp_sebelumnya) : '' }}">
                         </div>
                         <label class="form-label max-w-56">
diff --git a/resources/views/prosespenawaran/index.blade.php b/resources/views/prosespenawaran/index.blade.php
index 688f9cd..1c52e3a 100644
--- a/resources/views/prosespenawaran/index.blade.php
+++ b/resources/views/prosespenawaran/index.blade.php
@@ -216,7 +216,13 @@
                                                 </a>`;
                         }
 
-                        return `<div class="flex flex-nowrap justify-center">`+iconDetail+iconProses+`</div>`;
+
+                        var iconSendEmail = ` <a href="/tender/penawaran/${data.nomor_registrasi}/showKirimEmail" class="btn btn-sm btn-icon btn-clear btn-success" title="Kirim Email">
+                        <i class="ki-filled ki-paper-plane"></i>
+                    </a>`;
+
+
+                        return `<div class="flex flex-nowrap justify-center">`+iconDetail+iconProses+iconSendEmail+`</div>`;
                     },
                 }
             },

From 4a05b9e9035e3443ef087dd68ba518dac8d51536 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 12:55:57 +0700
Subject: [PATCH 3/4] feat(spk): tambahkan fitur pembaruan SLA

- Menambahkan metode updateSla pada SpkController untuk memperbarui SLA.
- Memvalidasi input SLA agar wajib diisi dan berupa angka positif.
- Mengupdate tampilan untuk meminta input SLA sebelum membuat SPK.
- Menambahkan rute baru untuk pembaruan SLA di registrasi.php.
---
 app/Http/Controllers/SpkController.php | 13 +++++
 resources/views/spk/index.blade.php    | 66 +++++++++++++++++++++++---
 routes/registrasi.php                  |  1 +
 3 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index ef87340..770944c 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -385,4 +385,17 @@ use Illuminate\Support\Facades\Auth;
 
             return response()->download(storage_path('app/public/' .$document->spk_dokumen_path));
         }
+
+        public function updateSla(Request $request, $id): JsonResponse
+        {
+            $request->validate([
+                'sla' => 'required|integer|min:1',
+            ]);
+
+            $permohonan = Permohonan::where('nomor_registrasi','=',$id)->first();
+            $permohonan->sla = $request->sla;
+            $permohonan->save();
+
+            return response()->json(['message' => 'SLA updated successfully']);
+        }
     }
diff --git a/resources/views/spk/index.blade.php b/resources/views/spk/index.blade.php
index 9814a7c..bd9a6ea 100644
--- a/resources/views/spk/index.blade.php
+++ b/resources/views/spk/index.blade.php
@@ -98,12 +98,63 @@
 
 @push('scripts')
 <script type="text/javascript">
-    function spkCreate(regId)
+    function spkCreate(regId, sla)
     {
-        var url1 = "/spk/"+regId+"/edit";
-        var url = "{{ url('/') }}"+url1;
-        $(location).attr('href',url);
+        const csrf = '{{ @csrf_token() }}';
+        if (!sla) {
+            Swal.fire({
+                title: 'Input SLA',
+                input: 'number',
+                inputAttributes: {
+                    min: 1,
+                    step: 1
+                },
+                showCancelButton: true,
+                confirmButtonText: 'Submit',
+                showLoaderOnConfirm: true,
+                preConfirm: (inputValue) => {
+                    if (inputValue) {
+                        return fetch(`/spk/update-sla/${regId}`, {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json',
+                                'X-CSRF-TOKEN': `${csrf}`
+                            },
+                            body: JSON.stringify({ sla: inputValue })
+                        })
+                            .then(response => {
+                                if (!response.ok) {
+                                    throw new Error(response.statusText)
+                                }
+                                return response.json()
+                            })
+                            .catch(error => {
+                                Swal.showValidationMessage(
+                                    `Request failed: ${error}`
+                                )
+                            })
+                    } else {
+                        Swal.showValidationMessage('SLA is required')
+                    }
+                },
+                allowOutsideClick: () => !Swal.isLoading()
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    Swal.fire({
+                        title: 'SLA updated successfully',
+                        icon: 'success'
+                    }).then(() => {
+                        // Redirect to edit page after successful SLA update
+                        window.location.href = "{{ url('/') }}/spk/"+regId+"/edit";
+                    });
+                }
+            });
+        } else {
+            // If SLA is not empty, directly redirect to edit page
+            window.location.href = "{{ url('/') }}/spk/"+regId+"/edit";
+        }
     }
+
 </script>
 <script type="module">
     const element = document.querySelector('#spk-table');
@@ -203,11 +254,12 @@
             actions: {
                 title: 'Status',
                 render: (item, data) => {
+                    console.log(data.id);
                     var spkShow ='';
                     var spkCreate='';
                     if(!data.spk_dokumen_path)
                     {
-                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >
+                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id}, ${data.permohonan.sla})" >
                             <i class="ki-outline ki-notepad-edit"></i>
                         </a>`;
                     }
@@ -218,14 +270,14 @@
                             <i class="ki-filled ki-cloud-download"></i>
                         </a> `;
                         if(data.status==='spk') {
-                            spkCreate = `<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >
+                            spkCreate = `<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id}, ${data.permohonan.sla})" >
                             <i class="ki-outline ki-notepad-edit"></i>
                         </a>`;
                         }
                     }
 
                     return `<div class="flex flex-nowrap justify-center">`
-                             +spkShow+spkCreate+
+                             +spkShow+spkCreate+data.permohonan.sla+
                              `</div>`;
                 },
             }
diff --git a/routes/registrasi.php b/routes/registrasi.php
index ce7d5c5..0d0f8df 100644
--- a/routes/registrasi.php
+++ b/routes/registrasi.php
@@ -110,6 +110,7 @@ Route::middleware(['auth'])->group(function () {
 
         Route::get('/spk', 'index')->name('spk.index');
         Route::get('/spk/datatables', 'dataForDatatables')->name('spk.datatables');
+        Route::POST('/spk/update-sla/{id}', 'updateSla')->name('spk.update-sla');
         Route::get('/spk/{spk}', 'show')->name('spk.show');
         Route::get('/spk/{spk}/edit', 'edit')->name('spk.edit');
         Route::put('/spk/{spk}', 'update')->name('spk.update');

From d813fb10e17210bdb409bdba5a29f24d7e79f7ea Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 5 Mar 2025 12:56:47 +0700
Subject: [PATCH 4/4] fix(spk): hapus tampilan SLA dari komponen

- Menghapus elemen SLA dari tampilan komponen SPK.
- Memastikan tampilan lebih bersih dan fokus pada fungsi utama.
---
 resources/views/spk/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/spk/index.blade.php b/resources/views/spk/index.blade.php
index bd9a6ea..11ca8d5 100644
--- a/resources/views/spk/index.blade.php
+++ b/resources/views/spk/index.blade.php
@@ -277,7 +277,7 @@
                     }
 
                     return `<div class="flex flex-nowrap justify-center">`
-                             +spkShow+spkCreate+data.permohonan.sla+
+                             +spkShow+spkCreate+
                              `</div>`;
                 },
             }