From f8a3ecb0aff2fb00bce4f89f59b87df7e3235490 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 22:17:23 +0700
Subject: [PATCH 01/12] Betulkan akses data tujuan_penilaian_kjpp

Ganti atribut `tujuan_penilaian_k_j_p_p` dengan `tujuan_penilaian_kjpp` dalam file `index.blade.php` untuk memastikan data yang benar ditampilkan di antarmuka pengguna. Perubahan ini berfokus pada pembetulan akses data yang sebelumnya salah.
---
 resources/views/prosespenawaran/index.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/prosespenawaran/index.blade.php b/resources/views/prosespenawaran/index.blade.php
index 88ca76f..c4aa34e 100644
--- a/resources/views/prosespenawaran/index.blade.php
+++ b/resources/views/prosespenawaran/index.blade.php
@@ -149,10 +149,10 @@
                         return `${formatDate(new Date(data.start_date))} - ${formatDate(new Date(data.end_date))}`
                     }
                 },
-                tujuan_penilaian_k_j_p_p: {
+                tujuan_penilaian_kjpp: {
                     title: 'Tujuan Penilaian KJPP',
                     render: (item, data) => {
-                        return data.tujuan_penilaian_k_j_p_p[0].name
+                        return data.tujuan_penilaian_kjpp.name
                     }
                 },
                 penawarandetails_count: {

From a26b099164a98421593045b3a4c1ed333e44ac66 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 22:30:34 +0700
Subject: [PATCH 02/12] Perbaiki kode dan optimalkan query

Memperbaiki controller RegistrasiFinalController dengan merapikan dan menyusun ulang kode untuk meningkatkan keterbacaan. Menambahkan dependency yang diperlukan dan optimalkan query untuk mengambil data dengan lebih efisien. Menambahkan render function pada tujuan_penilaian_kjpp_name di view registrasifinal.
---
 .../Controllers/RegistrasiFinalController.php | 176 +++++++++---------
 .../views/registrasifinal/index.blade.php     |   3 +
 2 files changed, 86 insertions(+), 93 deletions(-)

diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php
index 4ccb0e7..94323f1 100644
--- a/app/Http/Controllers/RegistrasiFinalController.php
+++ b/app/Http/Controllers/RegistrasiFinalController.php
@@ -3,10 +3,19 @@
     namespace Modules\Lpj\Http\Controllers;
 
     use App\Http\Controllers\Controller;
-use Carbon\Carbon;
-use Exception;
+    use Carbon\Carbon;
+    use Exception;
+    use Illuminate\Http\JsonResponse;
     use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Illuminate\Support\Facades\DB;
+    use Illuminate\Support\Facades\Storage;
+    use Illuminate\Support\Facades\Validator;
     use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Lpj\Models\PenawaranTender;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\Regions;
+
     // use Modules\Location\Models\City;
     // use Modules\Location\Models\District;
     // use Modules\Location\Models\Province;
@@ -20,16 +29,6 @@ use Exception;
     // use Modules\Lpj\Models\JenisJaminan;
     // use Modules\Lpj\Models\JenisLegalitasJaminan;
     // use Modules\Lpj\Models\PemilikJaminan;
-    use Modules\Lpj\Models\Permohonan;
-    use Modules\Lpj\Models\JenisPenilaian;
-    use Modules\Lpj\Models\Regions;
-    use Illuminate\Http\JsonResponse;
-    use Illuminate\Support\Facades\Validator;
-    use Illuminate\Support\Facades\Auth;
-    use Illuminate\Support\Facades\DB;
-    use Illuminate\Support\Facades\Storage;
-
-use Modules\Lpj\Models\PenawaranTender;
 
     class RegistrasiFinalController extends Controller
     {
@@ -47,11 +46,11 @@ use Modules\Lpj\Models\PenawaranTender;
             }
 
             // Retrieve data from the database
-            $query =PenawaranTender::query()
-                            ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
-                            ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
-                            ->where('penawaran.status','=','spk')
-                            ->withCount('penawarandetails');
+            $query = PenawaranTender::query()->with(['permohonan', 'tujuanPenilaianKjpp'])->where(
+                    'permohonan.status',
+                    '=',
+                    'spk',
+                )->withCount('penawarandetails');
 
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
@@ -90,25 +89,23 @@ use Modules\Lpj\Models\PenawaranTender;
             //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
             $data = $query->with(['permohonan'])->get();
             // dd($data);
-            $i=0;
-            foreach($data as $obj)
-            {
-                if($obj->tanggal_penilaian_sebelumnya)
-                {
-                    $data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s');
+            $i = 0;
+            foreach ($data as $obj) {
+                if ($obj->tanggal_penilaian_sebelumnya) {
+                    $data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format(
+                        'd F Y H:i:s',
+                    );
                 }
 
-                if($obj->biaya_kjpp_sebelumnya)
-                {
+                if ($obj->biaya_kjpp_sebelumnya) {
                     $data[$i]->biaya_kjpp_sebelumnya = formatRupiah($obj->biaya_kjpp_sebelumnya);
-
                 }
 
                 // date_range
-                if($obj->start_date && $obj->end_date)
-                {
-                    $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y').' - '.Carbon::parse($obj->end_date)->format('d M Y');
-
+                if ($obj->start_date && $obj->end_date) {
+                    $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . Carbon::parse(
+                            $obj->end_date,
+                        )->format('d M Y');
                 }
 
                 $i++;
@@ -129,21 +126,20 @@ use Modules\Lpj\Models\PenawaranTender;
                 'pageCount'       => $pageCount,
                 'page'            => $currentPage,
                 'totalCount'      => $totalRecords,
-                'data'            => $data
+                'data'            => $data,
             ]);
         }
 
         public function show($id)
         {
-            $permohonan  = Permohonan::find($id);
-            if($permohonan->dokumen)
-            {
-                $pdfSPK_path = Storage::url($permohonan->dokumen);
+            $permohonan = Permohonan::find($id);
+            if ($permohonan->dokumen) {
+                $pdfSPK_path         = Storage::url($permohonan->dokumen);
                 $permohonan->dokumen = $pdfSPK_path;
-                $permohonan->dokumen = '| <a download href="'. $pdfSPK_path.'" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a>';
+                $permohonan->dokumen = '| <a download href="' . $pdfSPK_path . '" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a>';
             }
 
-            return view('lpj::registrasifinal.show', compact('id','permohonan'));
+            return view('lpj::registrasifinal.show', compact('id', 'permohonan'));
         }
 
         public function edit($id)
@@ -151,129 +147,123 @@ use Modules\Lpj\Models\PenawaranTender;
             return view('lpj::registrasifinal.edit', compact('id'));
         }
 
-        public function setData(Request $request): JsonResponse
-        {
-            $data = array();
-            $datas = array();
+        public function setData(Request $request)
+        : JsonResponse {
+            $data  = [];
+            $datas = [];
 
             if (request()->ajax()) {
-                $id = $request->id;
+                $id    = $request->id;
                 $datas = Permohonan::find($id);
 
                 if ($datas) {
-                    $penawaran=null;
-                    $regions=null;
-                    $regions=Regions::pluck('name', 'id');
-                    $penawaran = PenawaranTender::where('nomor_registrasi','=',$datas->nomor_registrasi)->first();
+                    $penawaran = null;
+                    $regions   = null;
+                    $regions   = Regions::pluck('name', 'id');
+                    $penawaran = PenawaranTender::where('nomor_registrasi', '=', $datas->nomor_registrasi)->first();
 
                     $penawaranString = "";
-                    if($penawaran->status)
-                    {
-                        $penawaranString = convertSlug($penawaran->status);
+                    if ($penawaran->status) {
+                        $penawaranString   = convertSlug($penawaran->status);
                         $penawaran->status = $penawaranString;
                     }
 
-                    if($datas->dokumen)
-                    {
-                        $pdfSPK_path = Storage::url($datas->dokumen);
+                    if ($datas->dokumen) {
+                        $pdfSPK_path    = Storage::url($datas->dokumen);
                         $datas->dokumen = $pdfSPK_path;
                     }
 
-                    $data['status'] = 'success';
-                    $data['regions'] = $regions;
-                    $data['penawaran'] = $penawaran;
-                    $data['datas'] = $datas;
-                    $data['message']['message_success'] = array("data successfully found");
+                    $data['status']                     = 'success';
+                    $data['regions']                    = $regions;
+                    $data['penawaran']                  = $penawaran;
+                    $data['datas']                      = $datas;
+                    $data['message']['message_success'] = ["data successfully found"];
                 } else {
-                    $data['status'] = 'error';
-                    $data['datas'] = null;
-                    $data['message']['message_data'] = array("data not found");
+                    $data['status']                  = 'error';
+                    $data['datas']                   = null;
+                    $data['message']['message_data'] = ["data not found"];
                 }
             } else {
-                $data['status'] = 'error';
-                $data['message']['message_ajax'] = array("no ajax request");
+                $data['status']                  = 'error';
+                $data['message']['message_ajax'] = ["no ajax request"];
             }
 
             return response()->json($data);
         }
 
-        public function update(Request $request, $id): JsonResponse
-        {
+        public function update(Request $request, $id)
+        : JsonResponse {
             // init
-            $data = array();
-            $dataPermohonan = array();
-            $dataPenawaran = array();
+            $data           = [];
+            $dataPermohonan = [];
+            $dataPenawaran  = [];
 
             if (request()->ajax()) {
                 $validator = RegistrasiFinalController::rulesEditnya($request, $id);
 
                 if ($validator['fails']) {
                     $data['message'] = $validator['errors'];
-                    $data['status'] = 'error';
-                }
-                else
-                {
+                    $data['status']  = 'error';
+                } else {
                     DB::beginTransaction();
                     try {
-
                         // update table permohonan => status (registrasi-final), region_id, keterangan, authorized_at, authorized_status, authorized_by
                         // update table penawaran  => status (registrasi-final)
                         $dataPermohonan = [
-                                    'status' => 'registrasi-final',
-                                    'region_id' => $request->region,
-                                    'keterangan' => $request->catatan,
-                                    'authorized_at' => now(),
-                                    'authorized_status' =>1,
-                                    'authorized_by' => Auth::id()
-                                  ];
+                            'status'            => 'registrasi-final',
+                            'region_id'         => $request->region,
+                            'keterangan'        => $request->catatan,
+                            'authorized_at'     => now(),
+                            'authorized_status' => 1,
+                            'authorized_by'     => Auth::id(),
+                        ];
 
                         $dataPenawaran = ['status' => 'registrasi-final'];
 
 
                         $permohonan = Permohonan::find($id);
-                        $penawaran = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();
+                        $penawaran  = PenawaranTender::where('nomor_registrasi', '=', $permohonan->nomor_registrasi)
+                                                     ->first();
 
                         $permohonan->update($dataPermohonan);
                         $penawaran->update($dataPenawaran);
                         //
                         DB::commit();
 
-                        $data['status'] = 'success';
-                        $data['message']['message_success'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' successfully');
+                        $data['status']                     = 'success';
+                        $data['message']['message_success'] = ['Regitrasi Final ' . $permohonan->nomor_registrasi . ' successfully'];
                     } catch (Exception $e) {
                         DB::rollBack();
-                        $data['status'] = 'error';
-                        $data['message']['message_try_catch'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' failed.');
+                        $data['status']                       = 'error';
+                        $data['message']['message_try_catch'] = ['Regitrasi Final ' . $permohonan->nomor_registrasi . ' failed.'];
                     }
                 }
-
             } else {
-                $data['status'] = 'error';
-                $data['message']['message_ajax'] = array("no ajax request");
+                $data['status']                  = 'error';
+                $data['message']['message_ajax'] = ["no ajax request"];
             }
 
             return response()->json($data);
-
         }
 
         public function rulesEditnya($request, $id)
         {
-            $validate_catatan='';
+            $validate_catatan = '';
 
             $validateIt = [
                 // 'name' diambil dari definisi parameter yang di kirim pada POST Data
-                'region' => 'required',
+                'region'  => 'required',
                 'catatan' => 'required',
             ];
 
             $messageIt = [
-                'region.required' => 'Silahkan pilih Region',
-                'catatan.required' => 'Silahkan isi Catatan'
+                'region.required'  => 'Silahkan pilih Region',
+                'catatan.required' => 'Silahkan isi Catatan',
             ];
 
             $validator = Validator::make($request->all(), $validateIt, $messageIt);
 
-            $data['fails'] = $validator->fails();
+            $data['fails']  = $validator->fails();
             $data['errors'] = $validator->errors();
 
             return $data;
diff --git a/resources/views/registrasifinal/index.blade.php b/resources/views/registrasifinal/index.blade.php
index b25be3f..808da23 100644
--- a/resources/views/registrasifinal/index.blade.php
+++ b/resources/views/registrasifinal/index.blade.php
@@ -114,6 +114,9 @@
                 },
                 tujuan_penilaian_kjpp_name: {
                     title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return `${data.tujuan_penilaian_kjpp.name || ''}`;
+                    },
                 },
                 nama_kjpp_sebelumnya: {
                     title: 'Nama KJPP Terpilih',

From f41ed73af79765dcbff8b912899a2852c5499141 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 22:33:27 +0700
Subject: [PATCH 03/12] Refactor query dalam RegistrasiFinalController

Mengubah cara pemanggilan query dari metode `where` menjadi `whereHas` pada model PenawaranTender untuk memperjelas pencarian berdasarkan status `spk`. Ini termasuk penyesuaian dengan loop anonim function untuk filter. Transformasi ini bertujuan meningkatkan kejelasan dan maintainability dari kode.
---
 app/Http/Controllers/RegistrasiFinalController.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php
index 94323f1..c82c2e6 100644
--- a/app/Http/Controllers/RegistrasiFinalController.php
+++ b/app/Http/Controllers/RegistrasiFinalController.php
@@ -46,10 +46,11 @@
             }
 
             // Retrieve data from the database
-            $query = PenawaranTender::query()->with(['permohonan', 'tujuanPenilaianKjpp'])->where(
-                    'permohonan.status',
-                    '=',
-                    'spk',
+            $query = PenawaranTender::with(['permohonan', 'tujuanPenilaianKjpp'])->whereHas(
+                    'permohonan',
+                    function ($q) {
+                        $q->where('status', '=', 'spk');
+                    },
                 )->withCount('penawarandetails');
 
             // Apply search filter if provided

From 2cf40eb978161c4b9b6aae1397abd43283a00a47 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 22:38:08 +0700
Subject: [PATCH 04/12] Perbaiki penamaan properti di ProsesPenawaranController

Ganti properti 'tujuanPenilaianKJPP' menjadi 'tujuanPenilaianKjpp' untuk konsistensi penamaan. Menghapus baris kosong yang tidak diperlukan di bagian iterasi 'penawrandetails'.
---
 app/Http/Controllers/ProsesPenawaranController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php
index d8a5e9b..bbd3fab 100644
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -75,7 +75,7 @@ class ProsesPenawaranController extends Controller
 
         // Get the data for the current page
         //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-        $data = $query->with(['tujuanPenilaianKJPP','permohonan','permohonan.debiture'])->get();
+        $data = $query->with(['tujuanPenilaianKjpp','permohonan','permohonan.debiture'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
@@ -116,7 +116,6 @@ class ProsesPenawaranController extends Controller
                                 ->get();
 
             if ($penawaran) {
-
                 $i=0;
                 foreach($penawrandetails as $obj)
                 {

From b14bc6787d4ae7d8af8f618615245238b7e1df20 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 06:57:40 +0700
Subject: [PATCH 05/12] Perbarui tampilan jangka waktu dan hapus fungsi spkShow

Perbarui kolom jangka waktu dengan format tanggal yang benar di file edit.blade.php dan documentSPK.blade.php. Selain itu, hapus fungsi spkShow yang tidak digunakan di file index.blade.php untuk kebersihan kode.
---
 resources/views/spk/documentSPK.blade.php | 4 ++--
 resources/views/spk/edit.blade.php        | 2 +-
 resources/views/spk/index.blade.php       | 6 ------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index a262e02..49aefcd 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -79,7 +79,7 @@
 		<tr>
 			<td>Jangka Waktu</td>
 			<td>:</td>
-			<td></td>
+            <td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) - formatTanggalIndonesia($penawaran->end_date) }}</span></td>
 		</tr>
 		<tr>
 			<td colspan="2" style="text-align: center;">i</td>
@@ -179,4 +179,4 @@
 		</table>
 	</div>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php
index 80b780a..30563d7 100644
--- a/resources/views/spk/edit.blade.php
+++ b/resources/views/spk/edit.blade.php
@@ -104,7 +104,7 @@
 					<tr>
 						<td>Jangka Waktu</td>
 						<td>:</td>
-						<td></td>
+						<td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) - formatTanggalIndonesia($penawaran->end_date) }}</span></td>
 					</tr>
 					<tr>
 						<td colspan="2" style="text-align: center;">i</td>
diff --git a/resources/views/spk/index.blade.php b/resources/views/spk/index.blade.php
index eb06f5c..1f6bb0c 100644
--- a/resources/views/spk/index.blade.php
+++ b/resources/views/spk/index.blade.php
@@ -78,12 +78,6 @@
 
 @push('scripts')
 <script type="text/javascript">
-    function spkShow(regId)
-    {
-        var url = "{{ url('show') }}/"+regId;
-        $(location).attr('href',url);
-    }
-
     function spkCreate(regId)
     {
         var url1 = "/spk/"+regId+"/edit";

From 22324f85749a2cf21ae99fafd499e3d12c69059c Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 06:58:12 +0700
Subject: [PATCH 06/12] Refactor CSS loading in documentSPK.blade.php

Mengubah cara memuat file CSS pada documentSPK.blade.php dengan memanfaatkan manifest.json untuk secara dinamis mengambil file CSS yang ada. Hal ini bertujuan untuk rotasi file CSS yang lebih fleksibel dan menghindari hardcoding.
---
 resources/views/spk/documentSPK.blade.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index 49aefcd..8e4928a 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -1,5 +1,15 @@
-<link rel="stylesheet" href="{{ public_path('build/assets/app-BEWyoHLE.css') }}" data-navigate-track="reload">
-<link rel="stylesheet" href="{{ public_path('build/assets/app-DqiwbDNQ.css') }}" data-navigate-track="reload">
+@php
+    $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
+    $cssFiles = array_filter($manifest, function($value) {
+        return strpos($value['file'], '.css') !== false;
+    });
+
+@endphp
+
+@foreach($cssFiles as $file)
+    <link rel="stylesheet" href="{{ public_path('build/'.$file['file']) }}" data-navigate-track="reload">
+@endforeach
+
 <div class="card-body">
 <div class="scrollable-x-auto">
 	<div class="print-area">

From 85c75762b9fac5b122967ac49be76b7ee6eab5ae Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 07:20:03 +0700
Subject: [PATCH 07/12] Perbaiki tampilan tanggal pada jangka waktu

Mengubah format tampilan jangka waktu pada file blade `edit.blade.php` dan `documentSPK.blade.php` dari pengurangan dua tanggal menjadi rentang dua tanggal yang lebih mudah dibaca. Perubahan ini meningkatkan kejelasan informasi yang ditampilkan kepada pengguna.
---
 resources/views/spk/documentSPK.blade.php | 2 +-
 resources/views/spk/edit.blade.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index 8e4928a..0f9f78a 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -89,7 +89,7 @@
 		<tr>
 			<td>Jangka Waktu</td>
 			<td>:</td>
-            <td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) - formatTanggalIndonesia($penawaran->end_date) }}</span></td>
+            <td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) }} - {{ formatTanggalIndonesia($penawaran->end_date) }}</span></td>
 		</tr>
 		<tr>
 			<td colspan="2" style="text-align: center;">i</td>
diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php
index 30563d7..171d57a 100644
--- a/resources/views/spk/edit.blade.php
+++ b/resources/views/spk/edit.blade.php
@@ -104,7 +104,7 @@
 					<tr>
 						<td>Jangka Waktu</td>
 						<td>:</td>
-						<td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) - formatTanggalIndonesia($penawaran->end_date) }}</span></td>
+						<td><span style="color: red;"> {{ formatTanggalIndonesia($penawaran->start_date) }} - {{ formatTanggalIndonesia($penawaran->end_date) }}</span></td>
 					</tr>
 					<tr>
 						<td colspan="2" style="text-align: center;">i</td>

From bf4bfe13d9f10c9bd69719d0ca2b500e97101684 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 13:46:10 +0700
Subject: [PATCH 08/12] Perbaiki typo pada kolom posisi_kavling

Mengubah penamaan kolom dalam tabel `analisa_tanah_bangunan` dari `posis_kavling` menjadi `posisi_kavling`. Perubahan ini untuk memastikan konsistensi dan akurasi dalam penamaan kolom agar lebih mudah dipahami dan dioperasikan.
---
 .../2024_10_16_153558_create_analisa_tanah_bangunan_table.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php b/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php
index 585dbf4..2c0cf23 100644
--- a/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php
+++ b/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php
@@ -20,7 +20,7 @@ return new class extends Migration
             $table->string('kontur_tanah');
             $table->string('ketinggian_jalan');
             $table->string('kontur_jalan');
-            $table->string('posis_kavling');
+            $table->string('posisi_kavling');
             $table->enum('tusuk_sate', ['yes', 'no']);
             $table->enum('lockland', ['yes', 'no']);
             $table->string('kondisi_fisik_tanah');

From cae4d56daa84806df3aecd834d039b64f711ec62 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 13:46:22 +0700
Subject: [PATCH 09/12] Tambahkan kolom kategori_jenis_aset_id ke tabel
 kategori_form_analisa_inspeksi

Menambahkan kolom 'kategori_jenis_aset_id' ke tabel 'kategori_form_analisa_inspeksi'. Kolom ini memiliki tipe unsignedBigInteger dan relasi foreign key ke tabel 'kategori_jenis_aset' menggunakan field 'id'. Perubahan ini diperlukan untuk mendukung koneksi antara kategori form analisa inspeksi dengan jenis aset terkait.
---
 ..._11_01_081201_create_kategori_form_analisa_inspeksi_table.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/database/migrations/2024_11_01_081201_create_kategori_form_analisa_inspeksi_table.php b/database/migrations/2024_11_01_081201_create_kategori_form_analisa_inspeksi_table.php
index 7b14758..87c765e 100644
--- a/database/migrations/2024_11_01_081201_create_kategori_form_analisa_inspeksi_table.php
+++ b/database/migrations/2024_11_01_081201_create_kategori_form_analisa_inspeksi_table.php
@@ -15,6 +15,7 @@ return new class extends Migration
             $table->id();
             $table->string('name');
             $table->string('code');
+            $table->unsignedBigInteger('kategori_jenis_aset_id');  // Add this line
             $table->foreign('kategori_jenis_aset_id')->references('id')->on('kategori_jenis_aset');
             $table->boolean('status')->default(true);
             $table->char('authorized_status', 1)->nullable();

From 1e1529b72748822db196a57cafade6eb55a98fb1 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 13:46:39 +0700
Subject: [PATCH 10/12] Tambah kolom 'dokumen_nomor' ke tabel
 'detail_dokumen_jaminan'

Penambahan kolom 'dokumen_nomor' yang bersifat nullable ke tabel 'detail_dokumen_jaminan' untuk menyimpan nomor dokumen terkait. Dalam fungsi up(), kolom ini ditambahkan setelah kolom 'dokumen_jaminan'. Fungsi down() juga disertakan untuk menghapus kolom ini jika diperlukan rollback.
---
 ...04_update_detail_dokumen_jaminan_table.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 database/migrations/2024_11_07_044004_update_detail_dokumen_jaminan_table.php

diff --git a/database/migrations/2024_11_07_044004_update_detail_dokumen_jaminan_table.php b/database/migrations/2024_11_07_044004_update_detail_dokumen_jaminan_table.php
new file mode 100644
index 0000000..c8b10ee
--- /dev/null
+++ b/database/migrations/2024_11_07_044004_update_detail_dokumen_jaminan_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('detail_dokumen_jaminan', function (Blueprint $table) {
+            $table->string('dokumen_nomor')->nullable()->after('dokumen_jaminan');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('detail_dokumen_jaminan', function (Blueprint $table) {
+            $table->dropColumn('dokumen_nomor');
+        });
+    }
+};

From efd0d570da787a2dce1cf92dda5d03e31072b4ae Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 13:49:02 +0700
Subject: [PATCH 11/12] Tambah nomor dokumen untuk dokumen jaminan

Menambahkan kolom 'dokumen_nomor' pada model DetailDokumenJaminan serta melakukan update terkait di controller dan view. Perubahan ini memungkinkan pengguna untuk memasukkan nomor dokumen selain file dokumen jaminan. Rutin yang terkait dengan penyimpanan dan pengambilan dokumen diperbarui untuk menangani data nomor dokumen. Perbaikan minor pada penataan kode juga dilakukan untuk konsistensi.
---
 .../Controllers/DokumenJaminanController.php  | 175 ++++++++++--------
 app/Models/DetailDokumenJaminan.php           |   1 +
 .../debitur/components/dokumen.blade.php      |  38 ++--
 3 files changed, 119 insertions(+), 95 deletions(-)

diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php
index 60ff7a8..b3cfe8a 100644
--- a/app/Http/Controllers/DokumenJaminanController.php
+++ b/app/Http/Controllers/DokumenJaminanController.php
@@ -4,6 +4,8 @@
 
     use App\Http\Controllers\Controller;
     use Exception;
+    use Illuminate\Http\JsonResponse;
+    use Illuminate\Support\Collection;
     use Illuminate\Support\Facades\DB;
     use Illuminate\Support\Facades\Storage;
     use Modules\Location\Models\City;
@@ -18,8 +20,6 @@
     use Modules\Lpj\Models\JenisJaminan;
     use Modules\Lpj\Models\JenisLegalitasJaminan;
     use Modules\Lpj\Models\PemilikJaminan;
-    use Illuminate\Http\JsonResponse;
-    use Illuminate\Support\Collection;
     use ZipArchive;
 
     class DokumenJaminanController extends Controller
@@ -72,45 +72,41 @@
 
                     $document = DokumenJaminan::create($validate);
 
-                    try {
-                        foreach ($request->dokumen_jaminan as $key => $value) {
-                            $file_name = $value->getClientOriginalName();
+                    if ($request->jenis_legalitas_jaminan_id) {
+                        foreach ($request->jenis_legalitas_jaminan_id as $key => $value) {
+                            $detailData = [
+                                'dokumen_jaminan_id'         => $document->id,
+                                'jenis_legalitas_jaminan_id' => $value,
+                                'name'                       => $request->name[$key],
+                                'keterangan'                 => $request->keterangan[$key],
+                            ];
 
-                            if ($file_name) {
-                                try {
-                                    $file_name = $value->getClientOriginalName();
-                                    $value->storeAs(
-                                        'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
-                                        $file_name,
-                                    );
-
-                                    $detail = [
-                                        'dokumen_jaminan_id'         => $document->id,
-                                        'jenis_legalitas_jaminan_id' => $request->jenis_legalitas_jaminan_id[$key],
-                                        'dokumen_jaminan'            => 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name,
-                                        'name'                       => $request->name[$key],
-                                        'keterangan'                 => $request->keterangan[$key],
-                                        'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : '',
-                                    ];
-                                    DetailDokumenJaminan::create($detail);
-                                } catch (Exception $e) {
-                                    DB::rollBack();
-                                    return redirect()->route('debitur.jaminan.index', $id)->with(
-                                        'error',
-                                        'Gagal upload file dokumen jaminan ' . $key . ': ' . $e->getMessage(),
-                                    );
+                            $dokumenJaminan = [];
+                            $dokumenNomor   = [];
+                            if (isset($request->dokumen_jaminan[$key]) && is_array($request->dokumen_jaminan[$key])) {
+                                foreach ($request->dokumen_jaminan[$key] as $index => $file) {
+                                    if ($file) {
+                                        $file_name = $file->getClientOriginalName();
+                                        $file->storeAs(
+                                            'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
+                                            $file_name,
+                                        );
+                                        $dokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '';
+                                    }
                                 }
                             }
+
+                            if (!empty($dokumenJaminan)) {
+                                $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
+                                $detailData['dokumen_nomor']   = json_encode($dokumenNomor);
+                            }
+
+                            DetailDokumenJaminan::create($detailData);
                         }
-                        DB::commit();
-                    } catch (Exception $e) {
-                        DB::rollBack();
-                        return redirect()->route('debitur.jaminan.index', $id)->with(
-                            'error',
-                            'gg' . $e->getMessage(),
-                        );
                     }
 
+                    DB::commit();
                     return redirect()->route('debitur.jaminan.index', $id)->with(
                         'success',
                         'Dokumen Jaminan berhasil ditambahkan',
@@ -149,6 +145,7 @@
             $debitur = Debiture::find($id);
 
             $validate = $request->validated();
+
             if ($validate) {
                 try {
                     DB::beginTransaction();
@@ -226,44 +223,59 @@
                     $document->update($validate);
 
                     // Get existing detail documents
-                    $existingDetails = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get()->keyBy('id');
+                    $existingDetails = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get()->keyBy(
+                        'id',
+                    );
 
-                    if($request->jenis_legalitas_jaminan_id){
-                        foreach($request->jenis_legalitas_jaminan_id as $key => $value){
+                    if ($request->jenis_legalitas_jaminan_id) {
+                        foreach ($request->jenis_legalitas_jaminan_id as $key => $value) {
                             $detailData = [
-                                'dokumen_jaminan_id' => $document->id,
+                                'dokumen_jaminan_id'         => $document->id,
                                 'jenis_legalitas_jaminan_id' => $value,
-                                'name' => $request->name[$key],
-                                'keterangan' => $request->keterangan[$key],
+                                'name'                       => $request->name[$key],
+                                'keterangan'                 => $request->keterangan[$key],
                             ];
 
                             $dokumenJaminan = [];
+                            $dokumenNomor=[];
+
                             if (isset($request->dokumen_jaminan[$key]) && is_array($request->dokumen_jaminan[$key])) {
-                                foreach($request->dokumen_jaminan[$key] as $file) {
+                                foreach ($request->dokumen_jaminan[$key] as $index => $file) {
                                     if ($file) {
                                         $file_name = $file->getClientOriginalName();
                                         $file->storeAs(
                                             'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
-                                            $file_name
+                                            $file_name,
                                         );
                                         $dokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '';
                                     }
                                 }
                             }
 
                             if (!empty($dokumenJaminan)) {
                                 $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
+                                $detailData['dokumen_nomor']   = json_encode($dokumenNomor);
                             }
 
                             if (isset($request->detail_dokumen_jaminan_id[$key])) {
-                                $detailId = $request->detail_dokumen_jaminan_id[$key];
+                                $detailId       = $request->detail_dokumen_jaminan_id[$key];
                                 $detailDocument = $existingDetails->get($detailId);
                                 if ($detailDocument) {
                                     // Merge new files with existing ones
                                     if (!empty($dokumenJaminan)) {
-                                        $existingFiles = json_decode($detailDocument->dokumen_jaminan, true) ?: [];
-                                        $mergedFiles = array_merge($existingFiles, $dokumenJaminan);
+                                        $existingFiles                 = json_decode(
+                                            $detailDocument->dokumen_jaminan,
+                                            true,
+                                        ) ?: [];
+                                        $existingNomor                 = json_decode(
+                                            $detailDocument->dokumen_nomor,
+                                            true,
+                                        ) ?: [];
+                                        $mergedFiles                   = array_merge($existingFiles, $dokumenJaminan);
+                                        $mergedNomor                   = array_merge($existingNomor, $dokumenNomor);
                                         $detailData['dokumen_jaminan'] = json_encode($mergedFiles);
+                                        $detailData['dokumen_nomor']   = json_encode($mergedNomor);
                                     }
                                     $detailDocument->update($detailData);
                                     $existingDetails->forget($detailId);
@@ -299,24 +311,26 @@
             $id,
             $jaminan,
         ) {
-            $document              = DokumenJaminan::find($jaminan);
-            $details               = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get();
+            $document = DokumenJaminan::find($jaminan);
+            $details  = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get();
 
-            $debitur               = Debiture::find($document->debiture_id);
-            $provinces             = Province::all();
-            $cities                = City::where('province_code', $document->province_code)->get();
-            $districts             = District::where('city_code', $document->city_code)->get();
-            $villages              = Village::where('district_code', $document->district_code)->get();
+            $debitur   = Debiture::find($document->debiture_id);
+            $provinces = Province::all();
+            $cities    = City::where('province_code', $document->province_code)->get();
+            $districts = District::where('city_code', $document->city_code)->get();
+            $villages  = Village::where('district_code', $document->district_code)->get();
 
 
             $jenisJaminan          = JenisJaminan::all();
             $jenisLegalitasJaminan = JenisLegalitasJaminan::all();
 
-            $_jenisJaminan = JenisJaminan::find($document->jenis_jaminan_id);
+            $_jenisJaminan    = JenisJaminan::find($document->jenis_jaminan_id);
             $legalitasJaminan = json_decode($_jenisJaminan->jenis_legalitas_jaminan_id, true);
 
-            $currentLegalitasJaminan = JenisLegalitasJaminan::whereIn('id',$document->detail->pluck('jenis_legalitas_jaminan_id')->toArray())->get();
-
+            $currentLegalitasJaminan = JenisLegalitasJaminan::whereIn(
+                'id',
+                $document->detail->pluck('jenis_legalitas_jaminan_id')->toArray(),
+            )->get();
 
 
             // Remove values from $legalitasJaminan that are in $currentLegalitasJaminan
@@ -324,8 +338,8 @@
 
             $legalitas = JenisLegalitasJaminan::whereIn('code', $legalitasJaminan)->get();
 
-            $pemilikJaminan        = PemilikJaminan::where('debiture_id', $document->debiture_id)->get();
-            $hubunganPemilik       = HubunganPemilikJaminan::all();
+            $pemilikJaminan  = PemilikJaminan::where('debiture_id', $document->debiture_id)->get();
+            $hubunganPemilik = HubunganPemilikJaminan::all();
 
             return view(
                 'lpj::debitur.jaminan',
@@ -341,7 +355,7 @@
                     'villages',
                     'pemilikJaminan',
                     'hubunganPemilik',
-                    'legalitas'
+                    'legalitas',
                 ),
             );
         }
@@ -378,7 +392,9 @@
 
             if ($zip->open($zipFilePath, ZipArchive::CREATE) === true) {
                 foreach ($documents as $document) {
-                    $files = is_array(json_decode($document->dokumen_jaminan)) ? json_decode($document->dokumen_jaminan) : [$document->dokumen_jaminan];
+                    $files = is_array(json_decode($document->dokumen_jaminan)) ? json_decode(
+                        $document->dokumen_jaminan,
+                    ) : [$document->dokumen_jaminan];
 
                     foreach ($files as $file) {
                         $filePath = storage_path('app/public/' . $file);
@@ -411,7 +427,9 @@
         {
             $dokumen  = request()->get('dokumen');
             $document = DetailDokumenJaminan::find($dokumen);
-            $file = is_array(json_decode($document->dokumen_jaminan)) ? json_decode($document->dokumen_jaminan) : [$document->dokumen_jaminan];
+            $file     = is_array(json_decode($document->dokumen_jaminan)) ? json_decode(
+                $document->dokumen_jaminan,
+            ) : [$document->dokumen_jaminan];
             return response()->download(storage_path('app/public/' . $file[request()->get('index')]));
         }
 
@@ -425,20 +443,19 @@
         }
 
 
-        public function getLegalitasJaminan($id = 10, $jenisJaminanId = 1) : JsonResponse
-        {
-
-            $jenisJaminan = JenisJaminan::findOrFail($jenisJaminanId);
-            $legalitasJaminan = $jenisJaminan->jenis_legalitas_jaminan_id;
+        public function getLegalitasJaminan($id = 10, $jenisJaminanId = 1)
+        : JsonResponse {
+            $jenisJaminan        = JenisJaminan::findOrFail($jenisJaminanId);
+            $legalitasJaminan    = $jenisJaminan->jenis_legalitas_jaminan_id;
             $newLegalitasJaminan = JenisLegalitasJaminan::whereIn('code', json_decode($legalitasJaminan, true))->get();
 
             $existingLegalitas = [];
-            $newLegalitas = [];
+            $newLegalitas      = [];
 
             // Create a set of new jenis_legalitas_jaminan_ids for quick lookup
             $newLegalitasIds = $newLegalitasJaminan->pluck('id')->toArray();
 
-            if($id>0) {
+            if ($id > 0) {
                 $document = DokumenJaminan::findOrFail($id);
                 if ($document && $document->detail) {
                     foreach ($document->detail as $detail) {
@@ -448,12 +465,14 @@
                                 'id'                         => $detail->id,
                                 'jenis_legalitas_jaminan_id' => $detail->jenis_legalitas_jaminan_id,
                                 'name'                       => $detail->jenisLegalitasJaminan->name,
-                                'dokumen_jaminan'            => json_decode($detail->dokumen_jaminan) ?? $detail->dokumen_jaminan,
+                                'dokumen_jaminan'            => json_decode(
+                                        $detail->dokumen_jaminan,
+                                    ) ?? $detail->dokumen_jaminan,
                                 'custom_field'               => $detail->jenisLegalitasJaminan->custom_field,
                                 'custom_field_type'          => $detail->jenisLegalitasJaminan->custom_field_type,
                                 'details'                    => $detail->details,
                                 'keterangan'                 => $detail->keterangan,
-                                'is_existing'                => true
+                                'is_existing'                => true,
                             ];
                         }
                     }
@@ -463,15 +482,15 @@
             foreach ($newLegalitasJaminan as $legalitas) {
                 if (!Collection::make($existingLegalitas)->contains('jenis_legalitas_jaminan_id', $legalitas->id)) {
                     $newLegalitas[] = [
-                        'id' => null,
+                        'id'                         => null,
                         'jenis_legalitas_jaminan_id' => $legalitas->id,
-                        'name' => $legalitas->name,
-                        'dokumen_jaminan' => null,
-                        'custom_field' => $legalitas->custom_field,
-                        'custom_field_type' => $legalitas->custom_field_type,
-                        'details' => null,
-                        'keterangan' => null,
-                        'is_existing' => false
+                        'name'                       => $legalitas->name,
+                        'dokumen_jaminan'            => null,
+                        'custom_field'               => $legalitas->custom_field,
+                        'custom_field_type'          => $legalitas->custom_field_type,
+                        'details'                    => null,
+                        'keterangan'                 => null,
+                        'is_existing'                => false,
                     ];
                 }
             }
diff --git a/app/Models/DetailDokumenJaminan.php b/app/Models/DetailDokumenJaminan.php
index 487cf75..ad76f13 100644
--- a/app/Models/DetailDokumenJaminan.php
+++ b/app/Models/DetailDokumenJaminan.php
@@ -16,6 +16,7 @@
             'jenis_legalitas_jaminan_id',
             'name',
             'dokumen_jaminan',
+            'dokumen_nomor',
             'keterangan',
             'details',
             'status',
diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 4278656..35fc4d0 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -146,10 +146,10 @@
 
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">
-                        Nama Dokumen
+                        Nomor
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <input class="input " type="text" id="name" name="name[]" value="{{ $detail->name ?? "" }}" placeholder="Nama Dokumen">
+                        <input class="input " type="text" id="name" name="name[]" value="{{ $detail->name ?? "" }}" placeholder="Nomor">
                     </div>
                 </div>
 
@@ -158,10 +158,11 @@
                         Dokumen Jaminan
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <div class="flex flex-col w-full gap-2"  id="file-container-{{$n}}">
+                        <div class="flex flex-col w-full gap-2" id="file-container-{{$n}}">
                             <div class="flex items-center gap-2">
-                                <input class="file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" multiple>
-                                <button type="button" class="btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
+                                <input class="flex-1 input" type="text" name="dokumen_nomor[{{ $n }}][]" placeholder="Nomor Dokumen">
+                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]">
+                                <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
                             </div>
                             <div id="additional-files-{{ $n }}"></div>
                         </div>
@@ -234,10 +235,10 @@
 
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">
-                        Nama Dokumen
+                        Nomor
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <input class="input " type="text" id="name" name="name[]" value="" placeholder="Nama Dokumen">
+                        <input class="input " type="text" id="name" name="name[]" value="" placeholder="Nomor">
                     </div>
                 </div>
 
@@ -246,10 +247,11 @@
                         Dokumen Jaminan
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <div class="flex flex-col w-full gap-2"  id="file-container-{{$n}}">
+                        <div class="flex flex-col w-full gap-2" id="file-container-{{$n}}">
                             <div class="flex items-center gap-2">
-                                <input class="file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" multiple>
-                                <button type="button" class="btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
+                                <input class="flex-1 input" type="text" name="dokumen_nomor[{{ $n }}][]" placeholder="Nomor Dokumen">
+                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" multiple>
+                                <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
                             </div>
                             <div id="additional-files-{{ $n }}"></div>
                         </div>
@@ -287,8 +289,8 @@
                 </div>
                 @php $n++; @endphp
             @endforeach
+        @endif
     </div>
-    @endif
 
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
         <label class="form-label max-w-56">
@@ -496,10 +498,10 @@
 
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">
-                                Nama Dokumen
+                                Nomor
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input" type="text" name="name[]" value="${item.name || ''}" placeholder="Nama Dokumen">
+                                <input class="input" type="text" name="name[]" value="${item.name || ''}" placeholder="Nomor">
                             </div>
                         </div>
 
@@ -510,8 +512,9 @@
                             <div class="flex flex-wrap items-baseline w-full" id="file-container-${index}">
                                 ${item.dokumen_jaminan ? renderExistingFiles(item.dokumen_jaminan, debiturId, item.id) : ''}
                                 <div class="flex items-center gap-2 my-2 w-full">
-                                    <input class="file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
-                                    <button type="button" class="btn btn-primary w-[100px] text-center" onclick="addFileInput(${index})">Add File</button>
+                                    <input class="flex-1 input" type="text" name="dokumen_nomor[${index}][]" placeholder="Nomor Dokumen">
+                                    <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
+                                    <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput(${index})">Add File</button>
                                 </div>
                             </div>
                         </div>
@@ -565,8 +568,9 @@
             const newInput = document.createElement('div');
             newInput.className = 'flex items-center gap-2 mb-2 w-full';
             newInput.innerHTML = `
-                <input class="file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
-                <button type="button" class="btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
+                <input class="flex-1 input" type="text" name="dokumen_nomor[${index}][]" placeholder="Nomor Dokumen">
+                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
+                <button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
             `;
             container.appendChild(newInput);
         }

From bb5623d65c6fa3bbcb975c9b6e44bb36a30a7f0b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 7 Nov 2024 14:12:11 +0700
Subject: [PATCH 12/12] Perbarui tampilan dokumen jaminan pada detail jaminan

Tambahkan nomor dokumen untuk setiap dokumen jaminan jika tersedia. Pisahkan elemen nomor dokumen, tautan unduhan, dan preview dalam satu baris untuk tata letak yang lebih rapi.
---
 .../views/component/detail-jaminan.blade.php  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php
index cc5a114..3435775 100644
--- a/resources/views/component/detail-jaminan.blade.php
+++ b/resources/views/component/detail-jaminan.blade.php
@@ -69,7 +69,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="py-3  max-w-[100px] align-top" >
+                                    <td class="py-3  max-w-[100px] align-top">
                                         Dokumen Jaminan
                                     </td>
                                     <td class="py-3 text-gray-700 text-2sm font-normal">
@@ -77,16 +77,22 @@
                                         @if(isset($detail->dokumen_jaminan))
                                             @php
                                                 $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
+                                                $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
                                             @endphp
                                             @foreach($dokumen_jaminan as $index => $dokumen)
-                                                @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
-                                                    <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
-                                                       class="badge badge-sm badge-outline mt-2 mr-2">
-                                                        {{ basename($dokumen) }}
-                                                        <i class="ki-filled ki-cloud-download"></i>
-                                                    </a>
-                                                @endif
-                                                <span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
+                                                <div class="flex w-full lg:w-[30%]">
+                                                    @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
+                                                        @if(!empty($dokumen_nomor))
+                                                            <span class="flex-1 mt-2 text-info">Nomor Dokumen : {{ $dokumen_nomor[$index] }}</span>
+                                                        @endif
+                                                        <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
+                                                           class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                                                            {{ basename($dokumen) }}
+                                                            <i class="ki-filled ki-cloud-download"></i>
+                                                        </a>
+                                                    @endif
+                                                    <span class="flex-none badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
+                                                </div>
                                                 <br>
                                             @endforeach
                                         @endif