From 5cc18fa0e16b77af9ea9f32e247efbf3f298ac99 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Thu, 3 Oct 2024 17:20:03 +0700 Subject: [PATCH 1/3] Memperbaiki KJPP create dan edit di bagian jenis kantor yang tadi nya relasi dengan cabang menjadi opsi manual --- resources/views/kjpp/create.blade.php | 32 +++++++++++++-------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php index c03ab45..0fb62fc 100644 --- a/resources/views/kjpp/create.blade.php +++ b/resources/views/kjpp/create.blade.php @@ -53,23 +53,21 @@
@error('jenis_kantor') From 07c0276c342c3fce7586eb37a90f1c75b5fe10c2 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Thu, 3 Oct 2024 17:48:21 +0700 Subject: [PATCH 2/3] Membuat Sub Menu Data Penawaran dari Menu Tender part 4 --- app/Http/Controllers/TenderController.php | 13 +- app/Http/Requests/TenderPenawaranRequest.php | 18 +- ...24_10_03_073923_update_penawaran_table.php | 32 + ...24_10_03_074430_update_penawaran_table.php | 28 + module.json | 52 +- resources/views/penawaran/create.blade.php | 41 +- resources/views/penawaran/index.blade.php | 50 +- resources/views/penawaran/show.blade.php | 52 ++ routes/web.php | 841 +++++++++--------- 9 files changed, 614 insertions(+), 513 deletions(-) create mode 100644 database/migrations/2024_10_03_073923_update_penawaran_table.php create mode 100644 database/migrations/2024_10_03_074430_update_penawaran_table.php diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index 6829346..4fca97d 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -55,9 +55,12 @@ class TenderController extends Controller $validated['nomor_registrasi'] = $penawaran->nomor_registrasi; - $validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya')); + // Mengatasi null untuk nama_kjpp_sebelumnya, biaya_kjpp_sebelumnya, dan tanggal_penilaian_sebelumnya + $validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya') ?? []); + $validated['biaya_kjpp_sebelumnya'] = $request->input('biaya_kjpp_sebelumnya') ?? ''; + $validated['tanggal_penilaian_sebelumnya'] = $request->input('tanggal_penilaian_sebelumnya') ?? ''; - dd($validated); + // dd($validated); PenawaranTender::create($validated); @@ -77,7 +80,9 @@ class TenderController extends Controller public function penawaran_show($id) { $penawaran = PenawaranTender::find($id); - return view('lpj::penawaran.show', compact('id', 'penawaran')); + $kjpps = KJPP::find($id); + + return view('lpj::penawaran.show', compact('id', 'penawaran', 'kjpps')); } /** @@ -111,7 +116,7 @@ class TenderController extends Controller } // Retrieve data from the database - $query = PenawaranTender::query(); + $query = PenawaranTender::query()->where('status', '=', 'Registered'); // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { diff --git a/app/Http/Requests/TenderPenawaranRequest.php b/app/Http/Requests/TenderPenawaranRequest.php index 16ed5bc..63e0b8b 100644 --- a/app/Http/Requests/TenderPenawaranRequest.php +++ b/app/Http/Requests/TenderPenawaranRequest.php @@ -12,10 +12,10 @@ class TenderPenawaranRequest extends FormRequest public function rules(): array { $rules = [ - 'nama_kjpp_sebelumnya' => 'required|array', + 'nama_kjpp_sebelumnya' => 'nullable|array', 'nama_kjpp_sebelumnya.*' => 'exists:kjpp,name', - 'biaya_kjpp_sebelumnya' => 'required|numeric', - 'tanggal_penilaian_sebelumnya' => 'required', + 'biaya_kjpp_sebelumnya' => 'nullable|numeric', + 'tanggal_penilaian_sebelumnya' => 'nullable', 'nomor_registrasi' => 'required', 'tujuan_penilaian_kjpp_id' => 'required', 'jenis_laporan_id' => 'required', @@ -48,10 +48,6 @@ class TenderPenawaranRequest extends FormRequest 'code.required' => 'Kode Penawaran Wajib diisi!', 'code.max' => 'Kode Penawaran maksimal 255 huruf!', '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!', 'jenis_laporan_id.required' => 'Jenis Laporan Wajib diisi!', @@ -70,6 +66,14 @@ class TenderPenawaranRequest extends FormRequest if ($endDate < $startDate) { $validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.'); } + + // Validasi minimal 3 pilihan pada nama_kjpp_sebelumnya + $namaKjppSebelumnya = $this->input('nama_kjpp_sebelumnya', []); + + // Abaikan jika array kosong, tetapi validasi jika terisi kurang dari 3 item + if (!empty($namaKjppSebelumnya) && is_array($namaKjppSebelumnya) && count($namaKjppSebelumnya) < 3) { + $validator->errors()->add('nama_kjpp_sebelumnya', 'Nama KJPP Sebelumnya harus memiliki minimal 3 pilihan jika diisi.'); + } }); } } diff --git a/database/migrations/2024_10_03_073923_update_penawaran_table.php b/database/migrations/2024_10_03_073923_update_penawaran_table.php new file mode 100644 index 0000000..a22d315 --- /dev/null +++ b/database/migrations/2024_10_03_073923_update_penawaran_table.php @@ -0,0 +1,32 @@ +string('nama_kjpp_sebelumnya')->nullable()->change(); + $table->string('biaya_kjpp_sebelumnya')->nullable()->change(); + $table->datetime('tanggal_penilaian_sebelumnya')->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('penawaran', function (Blueprint $table) { + $table->string('nama_kjpp_sebelumnya')->change(); + $table->string('biaya_kjpp_sebelumnya')->change(); + $table->datetime('tanggal_penilaian_sebelumnya')->change(); + }); + } +}; diff --git a/database/migrations/2024_10_03_074430_update_penawaran_table.php b/database/migrations/2024_10_03_074430_update_penawaran_table.php new file mode 100644 index 0000000..9ceb263 --- /dev/null +++ b/database/migrations/2024_10_03_074430_update_penawaran_table.php @@ -0,0 +1,28 @@ +text('catatan')->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('penawaran', function (Blueprint $table) { + $table->text('catatan')->change(); + }); + } +}; diff --git a/module.json b/module.json index d3775b8..374c181 100644 --- a/module.json +++ b/module.json @@ -5,9 +5,7 @@ "description": "", "keywords": [], "priority": 0, - "providers": [ - "Modules\\Lpj\\Providers\\LpjServiceProvider" - ], + "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"], "files": [], "menu": { "main": [ @@ -18,9 +16,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "administrator" - ] + "roles": ["administrator"] }, { "title": "Tender", @@ -29,9 +25,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "administrator" - ], + "roles": ["administrator"], "sub": [ { "title": "Data Penawaran", @@ -66,9 +60,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "administrator" - ] + "roles": ["administrator"] }, { "title": "Data Debitur", @@ -77,9 +69,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "administrator" - ] + "roles": ["administrator"] }, { "title": "Authorization", @@ -88,9 +78,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "administrator" - ] + "roles": ["administrator"] }, { "title": "Registrasi", @@ -99,9 +87,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "Administrator" - ] + "roles": ["administrator"] }, { "title": "Assignment", @@ -110,9 +96,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "Administrator" - ] + "roles": ["administrator"] }, { "title": "Activity", @@ -121,9 +105,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "Administrator" - ] + "roles": ["administrator"] }, { "title": "Laporan", @@ -132,9 +114,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "administrator" - ] + "roles": ["administrator"] } ], "master": [ @@ -145,9 +125,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": [ - "Administrator" - ], + "roles": ["administrator"], "sub": [ { "title": "Cabang", @@ -197,6 +175,14 @@ "permission": "", "roles": [] }, + { + "title": "Jenis Laporan", + "path": "basicdata.jenis_laporan", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, { "title": "Tujuan Penilaian", "path": "basicdata.tujuan-penilaian", diff --git a/resources/views/penawaran/create.blade.php b/resources/views/penawaran/create.blade.php index c494a4e..7f41fd6 100644 --- a/resources/views/penawaran/create.blade.php +++ b/resources/views/penawaran/create.blade.php @@ -29,7 +29,7 @@
+ class="flex w-full text-gray-600 font-medium text-sm input-custom" readonly> @error('nomor_registrasi') {{ $message }} @enderror @@ -40,7 +40,7 @@ Nomor Penawaran
- @error('code') {{ $message }} @@ -170,18 +170,22 @@
- +
+ + @error('status') + {{ $message }} + @enderror +
@endsection + +@push('styles') + +@endpush diff --git a/resources/views/penawaran/index.blade.php b/resources/views/penawaran/index.blade.php index 93b5ad2..31b95cc 100644 --- a/resources/views/penawaran/index.blade.php +++ b/resources/views/penawaran/index.blade.php @@ -90,38 +90,6 @@ 1]; } -