From 1c92ce9dea517fb5ac2564458722c3bff9829242 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Wed, 2 Oct 2024 00:15:59 +0700 Subject: [PATCH] Membuat Sub Menu Data Penawaran dari Menu Tender part 2 --- app/Http/Controllers/TenderController.php | 24 +++- app/Http/Requests/TenderPenawaranRequest.php | 3 +- resources/views/penawaran/create.blade.php | 109 ++++++++----------- resources/views/permohonan/index.blade.php | 13 +-- 4 files changed, 72 insertions(+), 77 deletions(-) diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index 2dab89c..0ac29a0 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -37,19 +37,35 @@ class TenderController extends Controller $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all(); $jenis_laporan = JenisLaporan::all(); $kjpp = KJPP::all(); - // $penawaran = Permohonan::where('nomor_registrasi', $id)->get(); + $permohonan = Permohonan::find($id); + $permohonanId = $permohonan->id; + $permohonanNomorRegistrasi = $permohonan->nomor_registrasi; - return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'id')); + return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonanId', 'permohonanNomorRegistrasi')); } /** * Store a newly created resource in storage. */ - public function penawaran_store(TenderPenawaranRequest $request) + public function penawaran_store(TenderPenawaranRequest $request, $id) { $validated = $request->validated(); - dd($validated); + if ($validated) { + $validated['nomor_registrasi'] = $request->nomor_registrasi; + + $validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya')); + + PenawaranTender::create($validated); + + return redirect() + ->route('tender.penawaran.index') + ->with('success', 'Data Penawaran created successfully'); + } else { + return redirect() + ->route('tender.penawaran.createPenawaran', $id) + ->with('error', 'Validation failed'); + } } /** diff --git a/app/Http/Requests/TenderPenawaranRequest.php b/app/Http/Requests/TenderPenawaranRequest.php index 2551998..16ed5bc 100644 --- a/app/Http/Requests/TenderPenawaranRequest.php +++ b/app/Http/Requests/TenderPenawaranRequest.php @@ -50,6 +50,7 @@ class TenderPenawaranRequest extends FormRequest 'code.unique' => 'Kode Penawaran tidak boleh sama!', 'nama_kjpp_sebelumnya.required' => 'Nama KJPP Sebelumnya Wajib diisi!', 'biaya_kjpp_sebelumnya.required' => 'Biaya KJPP Sebelumnya Wajib diisi!', + 'biaya_kjpp_sebelumnya.numeric' => 'Biaya KJPP Sebelumnya harus berupa angka!', 'tanggal_penilaian_sebelumnya.required' => 'Tanggal Penilaian Sebelumnya Wajib diisi!', 'nomor_registrasi.required' => 'Nomor Registrasi Wajib diisi!', 'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!', @@ -67,7 +68,7 @@ class TenderPenawaranRequest extends FormRequest $endDate = strtotime($this->input('end_date')); if ($endDate < $startDate) { - $validator->errors()->add('end_date', 'End date tidak boleh lebih awal dari start date.'); + $validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.'); } }); } diff --git a/resources/views/penawaran/create.blade.php b/resources/views/penawaran/create.blade.php index c73484f..9a081ec 100644 --- a/resources/views/penawaran/create.blade.php +++ b/resources/views/penawaran/create.blade.php @@ -6,19 +6,13 @@ @section('content')
-
- @if (isset($id)) - - @method('PUT') - @endif + @csrf

- {{ isset($id) ? 'Edit' : 'Tambah' }} Data Penawaran + Tambah Data Penawaran

-

- {{ $id }} -

+ + @error('nomor_registrasi') + {{ $message }} + @enderror
@@ -43,7 +40,7 @@
+ value="{{ old('code') }}"> @error('code') {{ $message }} @enderror @@ -60,11 +57,14 @@ @foreach ($kjpp as $row) @endforeach + @error('nama_kjpp_sebelumnya') + {{ $message }} + @enderror
@@ -72,7 +72,8 @@ Biaya KJPP Sebelumnya
- + @error('biaya_kjpp_sebelumnya') {{ $message }} @enderror @@ -83,7 +84,7 @@
+ value="{{ old('tanggal_penilaian_sebelumnya') }}"> @error('tanggal_penilaian_sebelumnya') {{ $message }} @enderror @@ -99,23 +100,17 @@ name="tujuan_penilaian_kjpp_id"> @if (isset($tujuan_penilaian_kjpp)) - @if (isset($penawaran)) - @foreach ($tujuan_penilaian_kjpp as $tp) - - @endforeach - @else - @foreach ($tujuan_penilaian_kjpp as $tp) - - @endforeach - @endif + @foreach ($tujuan_penilaian_kjpp as $tp) + + @endforeach @endif + @error('tujuan_penilaian_kjpp_id') + {{ $message }} + @enderror
@@ -151,7 +140,7 @@
+ name="start_date" value="{{ old('start_date') }}"> @error('start_date') {{ $message }} @enderror @@ -160,9 +149,9 @@ Tanggal Akhir
- - @error('tanggal_akhir') + + @error('end_date') {{ $message }} @enderror
@@ -172,7 +161,7 @@ Catatan
- + @error('catatan') {{ $message }} @enderror @@ -184,21 +173,11 @@ name="status"> @if (isset($status)) - @if (isset($penawaran)) - @foreach ($status as $s) - - @endforeach - @else - @foreach ($status as $s) - - @endforeach - @endif + @foreach ($status as $s) + + @endforeach @endif
diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php index f432405..c5c6014 100644 --- a/resources/views/permohonan/index.blade.php +++ b/resources/views/permohonan/index.blade.php @@ -175,15 +175,14 @@ title: 'Status', render: (item, data) => { return ` -
- +
+ + Penawaran + + -
- - - - +
`;