From a53bbe1ca8a5cae24dc14f8430a0419ea562703c Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Tue, 5 Nov 2024 16:04:07 +0700 Subject: [PATCH 01/22] melengkapi feature download pdf di menu SPK dan Registrasi Final --- app/Http/Controllers/RegistrasiFinalController.php | 7 +++++++ app/Http/Controllers/SpkController.php | 8 +++++++- resources/views/registrasifinal/edit.blade.php | 2 +- resources/views/registrasifinal/js/editjs.blade.php | 2 ++ resources/views/spk/documentSPK.blade.php | 9 +-------- resources/views/spk/index.blade.php | 4 ++-- routes/registrasi.php | 3 +++ 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php index 2561079..f6be10c 100644 --- a/app/Http/Controllers/RegistrasiFinalController.php +++ b/app/Http/Controllers/RegistrasiFinalController.php @@ -27,6 +27,7 @@ use Exception; 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; @@ -164,6 +165,12 @@ use Modules\Lpj\Models\PenawaranTender; $penawaranString = convertSlug($penawaran->status); $penawaran->status = $penawaranString; } + + if($datas->dokumen) + { + $pdfSPK_path = Storage::url($datas->dokumen); + $datas->dokumen = $pdfSPK_path; + } $data['status'] = 'success'; $data['regions'] = $regions; diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php index ec96a62..8496397 100644 --- a/app/Http/Controllers/SpkController.php +++ b/app/Http/Controllers/SpkController.php @@ -4,7 +4,7 @@ namespace Modules\Lpj\Http\Controllers; use Carbon\Carbon; use App\Http\Controllers\Controller; -use Barryvdh\DomPDF\Facade\Pdf; +use Barryvdh\DomPDF\Facade\Pdf; // https://github.com/barryvdh/laravel-dompdf use Exception; use Illuminate\Http\Request; use Maatwebsite\Excel\Facades\Excel; @@ -235,4 +235,10 @@ use Illuminate\Support\Facades\Auth; return view('lpj::spk.dokumennya', compact('data', 'penawaran')); } + + public function download($id) { + $document = Permohonan::find($id); + + return response()->download(storage_path('app/public/' .$document->dokumen)); + } } diff --git a/resources/views/registrasifinal/edit.blade.php b/resources/views/registrasifinal/edit.blade.php index ddaead8..c820c79 100644 --- a/resources/views/registrasifinal/edit.blade.php +++ b/resources/views/registrasifinal/edit.blade.php @@ -69,7 +69,7 @@
-
SPK_Dokumen.pdf   
+
SPK_Dokumen.pdf   
diff --git a/resources/views/registrasifinal/js/editjs.blade.php b/resources/views/registrasifinal/js/editjs.blade.php index 9464649..c46596d 100644 --- a/resources/views/registrasifinal/js/editjs.blade.php +++ b/resources/views/registrasifinal/js/editjs.blade.php @@ -43,6 +43,8 @@ $("#textCodePenawaran").text(response.penawaran.code); $("#textStatusPenawaran").text(response.penawaran.status); setRegionList(response.regions,0); + // alert(response.datas.dokumen); + $("#pdfSPK").attr("href", response.datas.dokumen); // success // var message = response.message; diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php index 8bf42c3..a262e02 100644 --- a/resources/views/spk/documentSPK.blade.php +++ b/resources/views/spk/documentSPK.blade.php @@ -1,12 +1,5 @@ - - - - + - -
diff --git a/resources/views/spk/index.blade.php b/resources/views/spk/index.blade.php index 65d6e92..7739980 100644 --- a/resources/views/spk/index.blade.php +++ b/resources/views/spk/index.blade.php @@ -150,8 +150,8 @@ else { spkShow =`
- - + + `; spkCreate=` diff --git a/routes/registrasi.php b/routes/registrasi.php index a9334bd..5c36e38 100644 --- a/routes/registrasi.php +++ b/routes/registrasi.php @@ -88,11 +88,14 @@ Route::middleware(['auth'])->group(function () { Route::controller(SpkController::class)->group(function(){ Route::get('/spk/dokumennya', 'dokumennya')->name('spk.dokumennya'); + Route::get('/spk', 'index')->name('spk.index'); Route::get('/spk/datatables', 'dataForDatatables')->name('spk.datatables'); 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'); + + Route::get('spk/{spk}/download', 'download')->name('spk.download'); }); Route::controller(RegistrasiFinalController::class)->group(function(){ From 54b3bed665c79599c6382206bddde435ff14c6d3 Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Tue, 5 Nov 2024 17:21:44 +0700 Subject: [PATCH 02/22] pada Feature Registrasi, menambahkan inputan Catatan Opsional saat tindakan Yes --- app/Http/Controllers/RegistrasiController.php | 2 ++ resources/views/registrasi/edit.blade.php | 9 +++++++++ resources/views/registrasi/js/editjs.blade.php | 5 +++++ resources/views/registrasi/show.blade.php | 11 ++++++++++- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php index adc0f3e..99e5f4f 100644 --- a/app/Http/Controllers/RegistrasiController.php +++ b/app/Http/Controllers/RegistrasiController.php @@ -167,6 +167,8 @@ $dataku['jenis_penilaian_id'] =$request->jenis_penilaian; $dataku['region_id'] =$request->region; $dataku['status'] = 'registered'; + if($request->catatan2) + $dataku['registrasi_catatan'] =$request->catatan2; } else { diff --git a/resources/views/registrasi/edit.blade.php b/resources/views/registrasi/edit.blade.php index 167fa25..c606451 100644 --- a/resources/views/registrasi/edit.blade.php +++ b/resources/views/registrasi/edit.blade.php @@ -81,6 +81,15 @@ +
+
+
+ +
+ +
diff --git a/resources/views/registrasi/js/editjs.blade.php b/resources/views/registrasi/js/editjs.blade.php index 1863f78..80bc38d 100644 --- a/resources/views/registrasi/js/editjs.blade.php +++ b/resources/views/registrasi/js/editjs.blade.php @@ -13,6 +13,7 @@ $("#{{ $route[0] }}_div_jenis_pilihan").show(); $("#{{ $route[0] }}_div_catatan").hide(); $("#{{ $route[0] }}_div_region").hide(); + $("#{{ $route[0] }}_div_catatan2").show(); // prepare data setData(); } @@ -94,12 +95,14 @@ $("#{{ $route[0] }}_div_jenis_pilihan").show(); $("#{{ $route[0] }}_catatan").val(''); $("#{{ $route[0] }}_div_catatan").hide(); + $("#{{ $route[0] }}_div_catatan2").show(); } else { $("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true); $("#{{ $route[0] }}_div_jenis_pilihan").hide(); $("#{{ $route[0] }}_div_catatan").show(); + $("#{{ $route[0] }}_div_catatan2").hide(); } }); @@ -115,6 +118,7 @@ let jenis_penilaian = $("#{{$route[0]}}_jenis_penilaian").val(); let region = $("#{{$route[0]}}_region").val(); let catatan = $("#{{$route[0]}}_catatan").val(); + let catatan2 = $("#{{$route[0]}}_catatan2").val(); if(jenis_penilaian==0) jenis_penilaian=''; @@ -129,6 +133,7 @@ input_data.jenis_penilaian= jenis_penilaian; input_data.region= region; input_data.catatan = catatan; + input_data.catatan2 = catatan2; let useURL= '{{ route($route[0].'.update', $id) }}'; $.ajax({ diff --git a/resources/views/registrasi/show.blade.php b/resources/views/registrasi/show.blade.php index 9ff7791..22cc87f 100644 --- a/resources/views/registrasi/show.blade.php +++ b/resources/views/registrasi/show.blade.php @@ -199,7 +199,7 @@
-
+
@@ -208,6 +208,15 @@ +
+

+
+ +
+ +
From 33dcc50e182c1c483656a0f461edacaf1fbd5199 Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 6 Nov 2024 10:23:15 +0700 Subject: [PATCH 03/22] Perbaikan Feature Registrasi Final, penambahan dokumen SPK PDF --- app/Http/Controllers/RegistrasiFinalController.php | 7 +++++++ resources/views/registrasifinal/edit.blade.php | 2 +- resources/views/registrasifinal/show.blade.php | 3 +-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php index f6be10c..deb2781 100644 --- a/app/Http/Controllers/RegistrasiFinalController.php +++ b/app/Http/Controllers/RegistrasiFinalController.php @@ -136,6 +136,13 @@ use Modules\Lpj\Models\PenawaranTender; public function show($id) { $permohonan = Permohonan::find($id); + if($permohonan->dokumen) + { + $pdfSPK_path = Storage::url($permohonan->dokumen); + $permohonan->dokumen = $pdfSPK_path; + $permohonan->dokumen = '| Dokumen SPK.pdf   '; + } + return view('lpj::registrasifinal.show', compact('id','permohonan')); } diff --git a/resources/views/registrasifinal/edit.blade.php b/resources/views/registrasifinal/edit.blade.php index c820c79..a2e15e7 100644 --- a/resources/views/registrasifinal/edit.blade.php +++ b/resources/views/registrasifinal/edit.blade.php @@ -69,7 +69,7 @@
-
SPK_Dokumen.pdf   
+
Dokumen SPK.pdf   
diff --git a/resources/views/registrasifinal/show.blade.php b/resources/views/registrasifinal/show.blade.php index 7592d0d..b9471ad 100644 --- a/resources/views/registrasifinal/show.blade.php +++ b/resources/views/registrasifinal/show.blade.php @@ -45,10 +45,9 @@ Tujan Permohonan: - {{ $permohonan->tujuanPenilaian->name }} + {{ $permohonan->tujuanPenilaian->name }} {!! $permohonan->dokumen !!}
-
From a41d8e0edb720593568c8888dec95145cc49b6ac Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 6 Nov 2024 11:13:58 +0700 Subject: [PATCH 04/22] Perbaikan Feature Registrasi Final, Konsistensi id => penawaran.id --- .../Controllers/RegistrasiFinalController.php | 26 ++++++++++++------- .../views/registrasifinal/edit.blade.php | 3 ++- .../views/registrasifinal/js/editjs.blade.php | 4 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php index deb2781..033a044 100644 --- a/app/Http/Controllers/RegistrasiFinalController.php +++ b/app/Http/Controllers/RegistrasiFinalController.php @@ -47,6 +47,7 @@ use Modules\Lpj\Models\PenawaranTender; } // Retrieve data from the database + // data.id => penawaran.id $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') @@ -135,7 +136,10 @@ use Modules\Lpj\Models\PenawaranTender; public function show($id) { - $permohonan = Permohonan::find($id); + // $id => penawaran.id + $penawaran = PenawaranTender::find($id); + $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first(); + if($permohonan->dokumen) { $pdfSPK_path = Storage::url($permohonan->dokumen); @@ -148,6 +152,7 @@ use Modules\Lpj\Models\PenawaranTender; public function edit($id) { + // $id => penawaran.id return view('lpj::registrasifinal.edit', compact('id')); } @@ -155,16 +160,17 @@ use Modules\Lpj\Models\PenawaranTender; { $data = array(); $datas = array(); + $penawaran=null; + $regions=null; if (request()->ajax()) { + // $id => penawaran.id $id = $request->id; - $datas = Permohonan::find($id); - + $penawaran = PenawaranTender::find($id); + $datas = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first(); if ($datas) { - $penawaran=null; - $regions=null; + $regions=Regions::pluck('name', 'id'); - $penawaran = PenawaranTender::where('nomor_registrasi','=',$datas->nomor_registrasi)->first(); $penawaranString = ""; if($penawaran->status) @@ -229,10 +235,10 @@ use Modules\Lpj\Models\PenawaranTender; $dataPenawaran = ['status' => 'registrasi-final']; - - $permohonan = Permohonan::find($id); - $penawaran = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first(); - + // $id => penawaran.id + $penawaran = PenawaranTender::find($id); + $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first(); + $permohonan->update($dataPermohonan); $penawaran->update($dataPenawaran); // diff --git a/resources/views/registrasifinal/edit.blade.php b/resources/views/registrasifinal/edit.blade.php index a2e15e7..c0b365e 100644 --- a/resources/views/registrasifinal/edit.blade.php +++ b/resources/views/registrasifinal/edit.blade.php @@ -13,7 +13,8 @@
- + + @method('PUT') @csrf
diff --git a/resources/views/registrasifinal/js/editjs.blade.php b/resources/views/registrasifinal/js/editjs.blade.php index c46596d..89f2a5e 100644 --- a/resources/views/registrasifinal/js/editjs.blade.php +++ b/resources/views/registrasifinal/js/editjs.blade.php @@ -17,7 +17,8 @@ function setData() { - let id = $("#id").val(); + // id => penawaran.id + let id = $("#{{$route[0]}}_id").val(); let token = "{{ csrf_token() }}"; // alert('token = ' + token); var useURL = "{{ route('registrasifinal.setData') }}"; @@ -81,6 +82,7 @@ let token = "{{ csrf_token() }}"; let _method = $('input[name=_method]').val(); + // id => penawaran.id let id = $('#{{$route[0]}}_id').val(); let region = $("#{{$route[0]}}_region").val(); let catatan = $("#{{$route[0]}}_catatan").val(); From 4f8afe4ea720a59210ac8ee780f1c8cc12c648be Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 6 Nov 2024 11:28:21 +0700 Subject: [PATCH 05/22] Perbaikan parameter kembali ke data.id --- resources/views/registrasifinal/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/registrasifinal/index.blade.php b/resources/views/registrasifinal/index.blade.php index b25be3f..4e50882 100644 --- a/resources/views/registrasifinal/index.blade.php +++ b/resources/views/registrasifinal/index.blade.php @@ -133,10 +133,10 @@ title: 'Status', render: (item, data) => { return `
- + - +
`; From 96502f78ab1660404fe6cc01fbcf5f676209da87 Mon Sep 17 00:00:00 2001 From: Andy Chaerudin Date: Wed, 6 Nov 2024 14:35:48 +0700 Subject: [PATCH 06/22] 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 @@ - + +
@@ -79,7 +80,7 @@ Jangka Waktu : - + {{ $penawaran->date_range }} i 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 @@ Jangka Waktu : - + {{ $penawaran->date_range }} i 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')