From fe3b1bebcebe57ae1ac531e071808fb132374f26 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 4 Mar 2025 13:30:21 +0700 Subject: [PATCH] fix(prosespenawaran): perbaiki penanganan data dan tampilan - Menambahkan pengambilan data Permohonan berdasarkan nomor registrasi pada metode show. - Memperbaiki tampilan dengan menggunakan komponen detail-jaminan untuk menampilkan data proses penawaran. - Menghapus kode yang tidak diperlukan untuk meningkatkan kebersihan kode. --- .../Controllers/ProsesPenawaranController.php | 6 +- .../views/component/detail-jaminan.blade.php | 3 +- .../views/prosespenawaran/show.blade.php | 62 ++++++------------- 3 files changed, 26 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php index 6339a94..c6e6ccc 100644 --- a/app/Http/Controllers/ProsesPenawaranController.php +++ b/app/Http/Controllers/ProsesPenawaranController.php @@ -437,7 +437,11 @@ class ProsesPenawaranController extends Controller public function show($id) { $prosespenawaran = PenawaranTender::find($id); - return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran')); + $permohonan = ""; + if($prosespenawaran){ + $permohonan = Permohonan::where('nomor_registrasi',$prosespenawaran->nomor_registrasi)->first(); + } + return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran','permohonan')); } public function updateDraft(Request $request, $id): JsonResponse diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index 8338814..3d996ed 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -1,6 +1,6 @@ @if (!isset($status))
-
+
@php $title = $title ?? 'Data Permohonan'; @endphp @@ -9,6 +9,7 @@
+ {!! $customlink ?? "" !!} @if (isset($id)) @php $parameters = isset($id) ? ['id' => $id] : []; diff --git a/resources/views/prosespenawaran/show.blade.php b/resources/views/prosespenawaran/show.blade.php index 4376f2b..8e9ebfc 100644 --- a/resources/views/prosespenawaran/show.blade.php +++ b/resources/views/prosespenawaran/show.blade.php @@ -7,48 +7,24 @@ $route = explode('.', Route::currentRouteName()); @endphp @section('content') -
-
-
-

- Detail Data Proses Penawaran -

-
- @php - $buttonProses=''; - if('tender'==$prosespenawaran->status) - { - $buttonProses=' Proses Penawaran'; - } - elseif ('proposal-tender'==$prosespenawaran->status) - { - $buttonProses=' Proses Penawaran Ulang'; - } - @endphp - {!! $buttonProses !!} - Back -
-
-
-
-

- Nomor Register Permohonan: -

- - {{ $prosespenawaran->nomor_registrasi }} - -
-
-

- Nomor Penawaran: -

- - {{ $prosespenawaran->code }} - -
-
+
+ @php + $buttonProses=''; + if('tender'==$prosespenawaran->status) + { + $buttonProses=' Proses Penawaran'; + } + elseif ('proposal-tender'==$prosespenawaran->status) + { + $buttonProses=' Proses Penawaran Ulang'; + } + @endphp + + @include('lpj::component.detail-jaminan', [ + 'customlink' => $buttonProses, + 'backLink' => 'tender.prosespenawaran.index', + 'title' => 'Detail Data Proses Penawaran', + ]) +
-
- - @endsection