From 96502f78ab1660404fe6cc01fbcf5f676209da87 Mon Sep 17 00:00:00 2001
From: Andy Chaerudin <andychaerudin@gmail.com>
Date: Wed, 6 Nov 2024 14:35:48 +0700
Subject: [PATCH] Feature SPK, perbaikan cara download PDF dan perbaikan CSS
 pdf SPK

---
 app/Http/Controllers/SpkController.php    | 27 ++++++++++++++++++++++-
 resources/views/spk/documentSPK.blade.php |  5 +++--
 resources/views/spk/edit.blade.php        |  2 +-
 resources/views/spk/index.blade.php       | 20 ++++++-----------
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index 8496397..e1cc50f 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -99,6 +99,14 @@ use Illuminate\Support\Facades\Auth;
                     
                 }
 
+                // data dokumen_spk
+                if($obj->dokumenSPK)
+                {
+                    $spkpenawaran_path = Storage::url($obj->dokumenSPK);
+                    // dd($spkpenawaran_path);
+                    $data[$i]->dokumenSPK = $spkpenawaran_path;
+                }
+
                 $i++;
             }
 
@@ -147,6 +155,12 @@ use Illuminate\Support\Facades\Auth;
                                                 'kjpp.address as kjpp_address',
                                                 'jenis_laporan.name as jenis_laporan_name'
                                     )->first();
+            // date_range
+            if($penawaran->start_date && $penawaran->end_date)
+            {
+                $penawaran->date_range = Carbon::parse($penawaran->start_date)->format('d M Y').' - '.Carbon::parse($penawaran->end_date)->format('d M Y');
+                
+            }
             
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
@@ -177,6 +191,13 @@ use Illuminate\Support\Facades\Auth;
                                                 'jenis_laporan.name as jenis_laporan_name'
                                     )->first();
             
+                                    // date_range
+            if($penawaran->start_date && $penawaran->end_date)
+            {
+                $penawaran->date_range = Carbon::parse($penawaran->start_date)->format('d M Y').' - '.Carbon::parse($penawaran->end_date)->format('d M Y');
+                
+            }
+
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
                                         ->leftJoin('jenis_jaminan', 'jenis_jaminan.id','=','dokumen_jaminan.jenis_jaminan_id')
@@ -239,6 +260,10 @@ use Illuminate\Support\Facades\Auth;
         public function download($id) {
             $document = Permohonan::find($id);
             
-            return response()->download(storage_path('app/public/' .$document->dokumen));
+            // return response()->download(storage_path('app/public/' .$document->dokumen));
+        
+            $spkpenawaran_path = Storage::url($document->dokumen);
+            dd($spkpenawaran_path);
+            return response()->download($spkpenawaran_path);
         }
     }
diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index a262e02..2329853 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -1,5 +1,6 @@
-<link rel="stylesheet" href="{{ public_path('build/assets/app-BEWyoHLE.css') }}" data-navigate-track="reload">
+<link rel="stylesheet" href="{{ public_path('build/assets/app-KMDgGgC4.css') }}" data-navigate-track="reload">
 <link rel="stylesheet" href="{{ public_path('build/assets/app-DqiwbDNQ.css') }}" data-navigate-track="reload">
+
 <div class="card-body">
 <div class="scrollable-x-auto">
 	<div class="print-area">
@@ -79,7 +80,7 @@
 		<tr>
 			<td>Jangka Waktu</td>
 			<td>:</td>
-			<td></td>
+			<td><span style="color: red;">{{ $penawaran->date_range }}</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 03edfae..701c7a2 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;">{{ $penawaran->date_range }}</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 7739980..3c0cc1b 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";
@@ -139,27 +133,27 @@
             actions: {
                 title: 'Status',
                 render: (item, data) => {
-                    var spkShow ='';
-                    var spkCreate='';
+                    var iconSpkShow ='';
+                    var iconSpkCreate='';
                     if(!data.dokumenSPK)
                     {
-                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" onclick="spkCreate(${data.id})" >
+                        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>
                         </a>`;
                     }
                     else
                     {
-                        spkShow =`<div class="flex flex-nowrap justify-center">
-                        <a href="/spk/${data.id}/download" class="btn btn-sm btn-icon btn-clear btn-primary" title="Download SPK">
+                        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 >
                             <i class="ki-filled ki-cloud-download"></i>
                         </a> `;
-                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >
+                        iconSpkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >
                             <i class="ki-outline ki-notepad-edit"></i>
                         </a>`;
                     }
 
                     return `<div class="flex flex-nowrap justify-center">` 
-                             +spkShow+spkCreate+
+                             +iconSpkShow+iconSpkCreate+
                              `</div>`;
                 },
             }