diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php index 71df00c..3a1b1c7 100644 --- a/app/Http/Controllers/KJPPController.php +++ b/app/Http/Controllers/KJPPController.php @@ -45,17 +45,7 @@ class KJPPController extends Controller // Combine KJPP number with branch code $fullKjppNumber = $kjppNumber; - $emailKantor = []; - $namaPimpinan = []; - $nomorHpPimpinan = []; - $namaPicReviewer = []; - $nomorHpPicReviewer = []; - $namaPicAdmin = []; - $nomorHpPicAdmin = []; - $namaPicMarketing = []; - $nomorHpPicMarketing = []; - - return view('lpj::kjpp.create', compact('ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber', 'emailKantor', 'namaPimpinan', 'nomorHpPimpinan', 'namaPicReviewer', 'nomorHpPicReviewer', 'namaPicAdmin', 'nomorHpPicAdmin', 'namaPicMarketing', 'nomorHpPicMarketing')); + return view('lpj::kjpp.create', compact('ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber')); } /** @@ -65,54 +55,142 @@ class KJPPController extends Controller { $validated = $request->validated(); - $validated['email_kantor'] = json_encode($validated['email_kantor']); - $validated['nama_pimpinan'] = json_encode($validated['nama_pimpinan']); - $validated['nomor_hp_pimpinan'] = json_encode($validated['nomor_hp_pimpinan']); - $validated['nama_pic_reviewer'] = json_encode($validated['nama_pic_reviewer']); - $validated['nomor_hp_pic_reviewer'] = json_encode($validated['nomor_hp_pic_reviewer']); - $validated['nama_pic_admin'] = json_encode($validated['nama_pic_admin']); - $validated['nomor_hp_pic_admin'] = json_encode($validated['nomor_hp_pic_admin']); - $validated['nama_pic_marketing'] = json_encode($validated['nama_pic_marketing']); - $validated['nomor_hp_pic_marketing'] = json_encode($validated['nomor_hp_pic_marketing']); - // Konversi array ke JSON untuk ijin_usaha_id - $validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']); - // Konversi jenis_aset_id ke JSON, dengan penanganan array kosong - $validated['jenis_aset_id'] = $validated['jenis_aset_id'] - ? json_encode($validated['jenis_aset_id']) - : json_encode([]); + if ($validated) { + $detailEmailKantor = []; + $detailNamaPimpinan = []; + $detailNomorPicPimpinan = []; + $detailNamaPicReviewer = []; + $detailNomorHpPicReviewer = []; + $detailNamaPicAdmin = []; + $detailNomorHpPicAdmin = []; + $detailNamaPicMarketing = []; + $detailNomorHpPicMarketing = []; + + $emailKantor = $request->input('detail_email_kantor.email_kantor', []); + $namaPimpinan = $request->input('detail_nama_pimpinan.nama_pimpinan', []); + $nomorHpPimpinan = $request->input('detail_nomor_hp_pimpinan.nomor_hp_pimpinan', []); + $namaPicReviewer = $request->input('detail_nama_pic_reviewer.nama_pic_reviewer', []); + $nomorHpPicReviewer = $request->input('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer', []); + $namaPicAdmin = $request->input('detail_nama_pic_admin.nama_pic_admin', []); + $nomorHpPicAdmin = $request->input('detail_nomor_hp_pic_admin.nomor_hp_pic_admin', []); + $namaPicMarketing = $request->input('detail_nama_pic_marketing.nama_pic_marketing', []); + $nomorHpPicMarketing = $request->input('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing', []); + + foreach ($emailKantor as $value) { + $detailEmailKantor[] = [ + 'email_kantor' => $value + ]; + } + // Encode to JSON and store + $detailEmailKantorJson = json_encode($detailEmailKantor); + + // Process detail_nama_pimpinan + foreach ($namaPimpinan as $value) { + $detailNamaPimpinan[] = [ + 'nama_pimpinan' => $value + ]; + } + $detailNamaPimpinanJson = json_encode($detailNamaPimpinan); + + // Process detail_nomor_pic_pimpinan + foreach ($nomorHpPimpinan as $value) { + $detailNomorPicPimpinan[] = [ + 'nomor_hp_pimpinan' => $value + ]; + } + $detailNomorPicPimpinanJson = json_encode($detailNomorPicPimpinan); + + // Process detail_nama_pic_reviewer + foreach ($namaPicReviewer as $value) { + $detailNamaPicReviewer[] = [ + 'nama_pic_reviewer' => $value + ]; + } + $detailNamaPicReviewerJson = json_encode($detailNamaPicReviewer); + + // Process detail_nomor_hp_pic_reviewer + foreach ($nomorHpPicReviewer as $value) { + $detailNomorHpPicReviewer[] = [ + 'nomor_hp_pic_reviewer' => $value + ]; + } + $detailNomorHpPicReviewerJson = json_encode($detailNomorHpPicReviewer); + + // Process detail_nama_pic_admin + foreach ($namaPicAdmin as $value) { + $detailNamaPicAdmin[] = [ + 'nama_pic_admin' => $value + ]; + } + $detailNamaPicAdminJson = json_encode($detailNamaPicAdmin); + + // Process detail_nomor_hp_pic_admin + foreach ($nomorHpPicAdmin as $value) { + $detailNomorHpPicAdmin[] = [ + 'nomor_hp_pic_admin' => $value + ]; + } + $detailNomorHpPicAdminJson = json_encode($detailNomorHpPicAdmin); + + // Process detail_nama_pic_marketing + foreach ($namaPicMarketing as $value) { + $detailNamaPicMarketing[] = [ + 'nama_pic_marketing' => $value + ]; + } + $detailNamaPicMarketingJson = json_encode($detailNamaPicMarketing); + + // Process detail_nomor_hp_pic_marketing + foreach ($nomorHpPicMarketing as $value) { + $detailNomorHpPicMarketing[] = [ + 'nomor_hp_pic_marketing' => $value + ]; + } + $detailNomorHpPicMarketingJson = json_encode($detailNomorHpPicMarketing); + - // Handle file attachment - if ($request->hasFile('attachment')) { $file = $request->file('attachment'); - $filename = time() . '.' . $file->getClientOriginalExtension(); + $filename = $file ? time() . '.' . $file->getClientOriginalExtension() : 'default.pdf'; - // Simpan file - $file->storeAs('public/uploads_pdf', $filename); + if ($file) { + // Simpan file yang diunggah + $file->storeAs('public/uploads_pdf', $filename); + } else { + // Salin file default ke lokasi yang diinginkan + Storage::copy('public/test/default.pdf', 'public/uploads_pdf/' . $filename); + } + + $validated['detail_email_kantor'] = $detailEmailKantorJson; + $validated['detail_nama_pimpinan'] = $detailNamaPimpinanJson; + $validated['detail_nomor_hp_pimpinan'] = $detailNomorPicPimpinanJson; + $validated['detail_nama_pic_reviewer'] = $detailNamaPicReviewerJson; + $validated['detail_nomor_hp_pic_reviewer'] = $detailNomorHpPicReviewerJson; + $validated['detail_nama_pic_admin'] = $detailNamaPicAdminJson; + $validated['detail_nomor_hp_pic_admin'] = $detailNomorHpPicAdminJson; + $validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson; + $validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson; + $validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']); + if (empty($validated['jenis_aset_id'])) { + $validated['jenis_aset_id'] = json_encode([]); + } else { + $validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']); + } + // Tambahkan nama file ke data yang divalidasi $validated['attachment'] = $filename; - } else { - // Gunakan file default jika tidak ada file yang diunggah - $defaultFilename = 'default.pdf'; - Storage::copy('public/test/default.pdf', 'public/uploads_pdf/' . $defaultFilename); - $validated['attachment'] = $defaultFilename; - } - // Hapus baris dd() sebelum membuat record - // dd($validated); + // dd($validated); - - try { - // Buat record KJPP - $kjpp = KJPP::create($validated); + // Simpan data ke database + KJPP::create($validated); return redirect() ->route('basicdata.kjpp.index') ->with('success', 'KJPP created successfully'); - } catch (\Exception $e) { - // Tangani kesalahan jika ada + } else { return redirect() ->route('basicdata.kjpp.create') - ->with('error', 'Failed to create KJPP: ' . $e->getMessage()); + ->with('error', 'Validation failed'); } } @@ -129,18 +207,46 @@ class KJPPController extends Controller $cities = City::where('code', $kjpp->city_code)->get(); $districts = District::where('code', $kjpp->district_code)->get(); $villages = Village::where('code', $kjpp->village_code)->get(); + $detailEmailKantor = json_decode($kjpp->detail_email_kantor); + $detailNamaPimpinan = json_decode($kjpp->detail_nama_pimpinan); + $detailNomorHpPimpinan = json_decode($kjpp->detail_nomor_hp_pimpinan); + $detailNamaPicReviewer = json_decode($kjpp->detail_nama_pic_reviewer); + $detailNomorHpPicReviewer = json_decode($kjpp->detail_nomor_hp_pic_reviewer); + $detailNamaPicAdmin = json_decode($kjpp->detail_nama_pic_admin); + $detailNomorHpPicAdmin = json_decode($kjpp->detail_nomor_hp_pic_admin); + $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing); + $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing); - $emailKantor = json_decode($kjpp->email_kantor); - $namaPimpinan = json_decode($kjpp->nama_pimpinan); - $nomorHpPimpinan = json_decode($kjpp->nomor_hp_pimpinan); - $namaPicReviewer = json_decode($kjpp->nama_pic_reviewer); - $nomorHpPicReviewer = json_decode($kjpp->nomor_hp_pic_reviewer); - $namaPicAdmin = json_decode($kjpp->nama_pic_admin); - $nomorHpPicAdmin = json_decode($kjpp->nomor_hp_pic_admin); - $namaPicMarketing = json_decode($kjpp->nama_pic_marketing); - $nomorHpPicMarketing = json_decode($kjpp->nomor_hp_pic_marketing); + $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pimpinan' => $nama->nama_pimpinan, + 'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan + ]; + }, $detailNamaPimpinan, $detailNomorHpPimpinan)); - return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages', 'emailKantor', 'namaPimpinan', 'nomorHpPimpinan', 'namaPicReviewer', 'nomorHpPicReviewer', 'namaPicAdmin', 'nomorHpPicAdmin', 'namaPicMarketing', 'nomorHpPicMarketing')); + + $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pic_reviewer' => $nama->nama_pic_reviewer, + 'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer + ]; + }, $detailNamaPicReviewer, $detailNomorHpPicReviewer)); + + $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pic_admin' => $nama->nama_pic_admin, + 'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin + ]; + }, $detailNamaPicAdmin, $detailNomorHpPicAdmin)); + + $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pic_marketing' => $nama->nama_pic_marketing, + 'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing + ]; + }, $detailNamaPicMarketing, $detailNomorHpPicMarketing)); + + return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages', 'detailEmailKantor', 'detailJoinPicReviewer', 'detailJoinPicAdmin', 'detailJoinPicMarketing', 'detailJoinPimpinan')); } /** @@ -155,19 +261,49 @@ class KJPPController extends Controller $cities = City::where('province_code', $kjpp->province_code)->get(); $districts = District::where('city_code', $kjpp->city_code)->get(); $villages = Village::where('district_code', $kjpp->district_code)->get(); + $detailEmailKantor = json_decode($kjpp->detail_email_kantor); + $detailNamaPimpinan = json_decode($kjpp->detail_nama_pimpinan); + $detailNomorHpPimpinan = json_decode($kjpp->detail_nomor_hp_pimpinan); + $detailNamaPicReviewer = json_decode($kjpp->detail_nama_pic_reviewer); + $detailNomorHpPicReviewer = json_decode($kjpp->detail_nomor_hp_pic_reviewer); + $detailNamaPicAdmin = json_decode($kjpp->detail_nama_pic_admin); + $detailNomorHpPicAdmin = json_decode($kjpp->detail_nomor_hp_pic_admin); + $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing); + $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing); - $emailKantor = json_decode($kjpp->email_kantor); - $namaPimpinan = json_decode($kjpp->nama_pimpinan); - $nomorHpPimpinan = json_decode($kjpp->nomor_hp_pimpinan); - $namaPicReviewer = json_decode($kjpp->nama_pic_reviewer); - $nomorHpPicReviewer = json_decode($kjpp->nomor_hp_pic_reviewer); - $namaPicAdmin = json_decode($kjpp->nama_pic_admin); - $nomorHpPicAdmin = json_decode($kjpp->nomor_hp_pic_admin); - $namaPicMarketing = json_decode($kjpp->nama_pic_marketing); - $nomorHpPicMarketing = json_decode($kjpp->nomor_hp_pic_marketing); + // dd($detailNamaPimpinan); + $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pimpinan' => $nama->nama_pimpinan, + 'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan + ]; + }, $detailNamaPimpinan, $detailNomorHpPimpinan)); - return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages', 'emailKantor', 'namaPimpinan', 'nomorHpPimpinan', 'namaPicReviewer', 'nomorHpPicReviewer', 'namaPicAdmin', 'nomorHpPicAdmin', 'namaPicMarketing', 'nomorHpPicMarketing')); + // dd($detailJoinPimpinan); + + $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pic_reviewer' => $nama->nama_pic_reviewer, + 'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer + ]; + }, $detailNamaPicReviewer, $detailNomorHpPicReviewer)); + + $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pic_admin' => $nama->nama_pic_admin, + 'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin + ]; + }, $detailNamaPicAdmin, $detailNomorHpPicAdmin)); + + $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pic_marketing' => $nama->nama_pic_marketing, + 'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing + ]; + }, $detailNamaPicMarketing, $detailNomorHpPicMarketing)); + + return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages', 'detailJoinPicReviewer', 'detailJoinPicAdmin', 'detailJoinPicMarketing', 'detailEmailKantor', 'detailJoinPimpinan')); } /** @@ -177,7 +313,102 @@ class KJPPController extends Controller { $validated = $request->validated(); + // dd($validated); + if ($validated) { + $detailEmailKantor = []; + $detailNamaPimpinan = []; + $detailNomorHpPimpinan = []; + $detailNamaPicReviewer = []; + $detailNomorHpPicReviewer = []; + $detailNamaPicAdmin = []; + $detailNomorHpPicAdmin = []; + $detailNamaPicMarketing = []; + $detailNomorHpPicMarketing = []; + + $emailKantor = $request->input('detail_email_kantor.email_kantor', []); + $namaPimpinan = $request->input('detail_nama_pimpinan.nama_pimpinan', []); + $nomorHpPimpinan = $request->input('detail_nomor_hp_pimpinan.nomor_hp_pimpinan', []); + $namaPicReviewer = $request->input('detail_nama_pic_reviewer.nama_pic_reviewer', []); + $nomorHpPicReviewer = $request->input('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer', []); + $namaPicAdmin = $request->input('detail_nama_pic_admin.nama_pic_admin', []); + $nomorHpPicAdmin = $request->input('detail_nomor_hp_pic_admin.nomor_hp_pic_admin', []); + $namaPicMarketing = $request->input('detail_nama_pic_marketing.nama_pic_marketing', []); + $nomorHpPicMarketing = $request->input('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing', []); + + foreach ($emailKantor as $value) { + $detailEmailKantor[] = [ + 'email_kantor' => $value + ]; + } + // Encode to JSON and store + $detailEmailKantorJson = json_encode($detailEmailKantor); + + // Process detail_nama_pimpinan + foreach ($namaPimpinan as $value) { + $detailNamaPimpinan[] = [ + 'nama_pimpinan' => $value + ]; + } + $detailNamaPimpinanJson = json_encode($detailNamaPimpinan); + + // Process detail_nomor_hp_pimpinan + foreach ($nomorHpPimpinan as $value) { + $detailNomorHpPimpinan[] = [ + 'nomor_hp_pimpinan' => $value + ]; + } + $detailNomorHpPimpinanJson = json_encode($detailNomorHpPimpinan); + + // Process detail_nama_pic_reviewer + foreach ($namaPicReviewer as $value) { + $detailNamaPicReviewer[] = [ + 'nama_pic_reviewer' => $value + ]; + } + $detailNamaPicReviewerJson = json_encode($detailNamaPicReviewer); + + // Process detail_nomor_hp_pic_reviewer + foreach ($nomorHpPicReviewer as $value) { + $detailNomorHpPicReviewer[] = [ + 'nomor_hp_pic_reviewer' => $value + ]; + } + $detailNomorHpPicReviewerJson = json_encode($detailNomorHpPicReviewer); + + // Process detail_nama_pic_admin + foreach ($namaPicAdmin as $value) { + $detailNamaPicAdmin[] = [ + 'nama_pic_admin' => $value + ]; + } + $detailNamaPicAdminJson = json_encode($detailNamaPicAdmin); + + // Process detail_nomor_hp_pic_admin + foreach ($nomorHpPicAdmin as $value) { + $detailNomorHpPicAdmin[] = [ + 'nomor_hp_pic_admin' => $value + ]; + } + $detailNomorHpPicAdminJson = json_encode($detailNomorHpPicAdmin); + + // Process detail_nama_pic_marketing + foreach ($namaPicMarketing as $value) { + $detailNamaPicMarketing[] = [ + 'nama_pic_marketing' => $value + ]; + } + $detailNamaPicMarketingJson = json_encode($detailNamaPicMarketing); + + // Process detail_nomor_hp_pic_marketing + foreach ($nomorHpPicMarketing as $value) { + $detailNomorHpPicMarketing[] = [ + 'nomor_hp_pic_marketing' => $value + ]; + } + $detailNomorHpPicMarketingJson = json_encode($detailNomorHpPicMarketing); + + $file = $request->file('attachment'); $filename = $file ? time() . '.' . $file->getClientOriginalExtension() : null; @@ -197,16 +428,15 @@ class KJPPController extends Controller $validated['attachment'] = $kjpp->attachment ?? 'default.pdf'; } - $validated['email_kantor'] = json_encode($validated['email_kantor']); - $validated['nama_pimpinan'] = json_encode($validated['nama_pimpinan']); - $validated['nomor_hp_pimpinan'] = json_encode($validated['nomor_hp_pimpinan']); - $validated['nama_pic_reviewer'] = json_encode($validated['nama_pic_reviewer']); - $validated['nomor_hp_pic_reviewer'] = json_encode($validated['nomor_hp_pic_reviewer']); - $validated['nama_pic_admin'] = json_encode($validated['nama_pic_admin']); - $validated['nomor_hp_pic_admin'] = json_encode($validated['nomor_hp_pic_admin']); - $validated['nama_pic_marketing'] = json_encode($validated['nama_pic_marketing']); - $validated['nomor_hp_pic_marketing'] = json_encode($validated['nomor_hp_pic_marketing']); - + $validated['detail_email_kantor'] = $detailEmailKantorJson; + $validated['detail_nama_pimpinan'] = $detailNamaPimpinanJson; + $validated['detail_nomor_hp_pimpinan'] = $detailNomorHpPimpinanJson; + $validated['detail_nama_pic_reviewer'] = $detailNamaPicReviewerJson; + $validated['detail_nomor_hp_pic_reviewer'] = $detailNomorHpPicReviewerJson; + $validated['detail_nama_pic_admin'] = $detailNamaPicAdminJson; + $validated['detail_nomor_hp_pic_admin'] = $detailNomorHpPicAdminJson; + $validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson; + $validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson; $validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']); if (empty($validated['jenis_aset_id'])) { $validated['jenis_aset_id'] = json_encode([]); @@ -214,8 +444,6 @@ class KJPPController extends Controller $validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']); } - // dd($validated); - // Perbarui data di database KJPP::where('id', $id)->update($validated); diff --git a/app/Http/Requests/KJPPRequest.php b/app/Http/Requests/KJPPRequest.php index 4f77130..4ff5821 100644 --- a/app/Http/Requests/KJPPRequest.php +++ b/app/Http/Requests/KJPPRequest.php @@ -22,43 +22,24 @@ class KJPPRequest extends FormRequest 'address' => 'required', 'postal_code' => 'nullable|numeric', 'nomor_telepon_kantor' => 'nullable|numeric|digits_between:8,15', - - // Validasi email kantor - 'email_kantor' => 'array', - 'email_kantor.*' => 'required|email', - - // Validasi nama pimpinan - 'nama_pimpinan' => 'array', - 'nama_pimpinan.*' => 'required|not_regex:/^\d+$/|max:255', - - // Validasi nomor HP pimpinan - 'nomor_hp_pimpinan' => 'array', - 'nomor_hp_pimpinan.*' => 'required|numeric|digits_between:10,15', - - // Validasi nama PIC Reviewer - 'nama_pic_reviewer' => 'nullable|array', - 'nama_pic_reviewer.*' => 'nullable|not_regex:/^\d+$/|max:255', - - // Validasi nomor HP PIC Reviewer - 'nomor_hp_pic_reviewer' => 'array', - 'nomor_hp_pic_reviewer.*' => 'nullable|numeric|digits_between:10,15', - - // Validasi nama PIC Admin - 'nama_pic_admin' => 'array', - 'nama_pic_admin.*' => 'nullable|not_regex:/^\d+$/|max:255', - - // Validasi nomor HP PIC Admin - 'nomor_hp_pic_admin' => 'array', - 'nomor_hp_pic_admin.*' => 'nullable|numeric|digits_between:10,15', - - // Validasi nama PIC Marketing - 'nama_pic_marketing' => 'array', - 'nama_pic_marketing.*' => 'nullable|not_regex:/^\d+$/|max:255', - - // Validasi nomor HP PIC Marketing - 'nomor_hp_pic_marketing' => 'array', - 'nomor_hp_pic_marketing.*' => 'nullable|numeric|digits_between:10,15', - + 'email_kantor' => 'required|email', + 'detail_email_kantor' => 'nullable', + 'nama_pimpinan' => 'required|string|not_regex:/^\d+$/|max:255', + 'detail_nama_pimpinan' => 'nullable', + 'nomor_hp_pimpinan' => 'required|numeric|digits_between:10,15', + 'detail_nomor_pic_pimpinan' => 'nullable', + 'nama_pic_reviewer' => 'nullable|string|not_regex:/^\d+$/|max:255', + 'detail_nama_pic_reviewer' => 'nullable', + 'nomor_hp_pic_reviewer' => 'nullable|numeric|digits_between:10,15', + 'detail_nomor_hp_pic_reviewer' => 'nullable', + 'nama_pic_admin' => 'nullable|string|not_regex:/^\d+$/|max:255', + 'detail_nama_pic_admin' => 'nullable', + 'nomor_hp_pic_admin' => 'nullable|numeric|digits_between:10,15', + 'detail_nomor_hp_pic_admin' => 'nullable', + 'nama_pic_marketing' => 'nullable|string|not_regex:/^\d+$/|max:255', + 'detail_nama_pic_marketing' => 'nullable', + 'nomor_hp_pic_marketing' => 'nullable|numeric|digits_between:10,15', + 'detail_nomor_hp_pic_marketing' => 'nullable', 'ijin_usaha_id' => 'required|array', 'ijin_usaha_id.*' => 'exists:ijin_usaha,code', 'jenis_aset_id' => 'nullable|array', @@ -86,45 +67,6 @@ class KJPPRequest extends FormRequest public function messages(): array { return [ - // Pesan untuk email kantor - 'email_kantor.*.required' => 'Email Kantor Wajib diisi!', - 'email_kantor.*.email' => 'Email Kantor tidak valid!', - - // Pesan untuk nama pimpinan - 'nama_pimpinan.*.required' => 'Nama Pimpinan Wajib diisi!', - 'nama_pimpinan.*.not_regex' => 'Nama Pimpinan harus berupa huruf!', - 'nama_pimpinan.*.max' => 'Nama Pimpinan maksimal 255 huruf!', - - // Pesan untuk nomor HP pimpinan - 'nomor_hp_pimpinan.*.required' => 'Nomor HP Pimpinan Wajib diisi!', - 'nomor_hp_pimpinan.*.numeric' => 'Nomor HP Pimpinan harus berupa angka!', - 'nomor_hp_pimpinan.*.digits_between' => 'Nomor HP Pimpinan minimum 10 digit dan maksimum 15 digit!', - - // Pesan untuk nama PIC Reviewer - 'nama_pic_reviewer.*.not_regex' => 'Nama PIC Reviewer harus berupa huruf!', - 'nama_pic_reviewer.*.max' => 'Nama PIC Reviewer maksimal 255 huruf!', - - // Pesan untuk nomor HP PIC Reviewer - 'nomor_hp_pic_reviewer.*.numeric' => 'Nomor HP PIC Reviewer harus berupa angka!', - 'nomor_hp_pic_reviewer.*.digits_between' => 'Nomor HP PIC Reviewer minimum 10 digit dan maksimum 15 digit!', - - // Pesan untuk nama PIC Admin - 'nama_pic_admin.*.not_regex' => 'Nama PIC Admin harus berupa huruf!', - 'nama_pic_admin.*.max' => 'Nama PIC Admin maksimal 255 huruf!', - - // Pesan untuk nomor HP PIC Admin - 'nomor_hp_pic_admin.*.numeric' => 'Nomor HP PIC Admin harus berupa angka!', - 'nomor_hp_pic_admin.*.digits_between' => 'Nomor HP PIC Admin minimum 10 digit dan maksimum 15 digit!', - - // Pesan untuk nama PIC Marketing - 'nama_pic_marketing.*.not_regex' => 'Nama PIC Marketing harus berupa huruf!', - 'nama_pic_marketing.*.max' => 'Nama PIC Marketing maksimal 255 huruf!', - - // Pesan untuk nomor HP PIC Marketing - 'nomor_hp_pic_marketing.*.numeric' => 'Nomor HP PIC Marketing harus berupa angka!', - 'nomor_hp_pic_marketing.*.digits_between' => 'Nomor HP PIC Marketing minimum 10 digit dan maksimum 15 digit!', - - // Pesan lainnya tetap sama 'code.required' => 'Kode KJPP Wajib diisi!', 'code.max' => 'Kode KJPP maksimal 255 huruf!', 'code.unique' => 'Kode KJPP tidak boleh sama!', @@ -139,6 +81,22 @@ class KJPPRequest extends FormRequest 'address.required' => 'Alamat Kantor Wajib diisi!', 'nomor_telepon_kantor.numeric' => 'Nomor Telepon Kantor harus berupa angka!', 'nomor_telepon_kantor.digits_between' => 'Nomor Telepon Kantor minimum 8 digit dan maksimum 15 digit!', + 'email_kantor.required' => 'Email Kantor Wajib diisi!', + 'email_kantor.email' => 'Email Kantor tidak valid!', + 'nama_pimpinan.required' => 'Nama Pimpinan Wajib diisi!', + 'nama_pimpinan.not_regex' => 'Nama Pimpinan harus berupa huruf!', + 'nomor_hp_pimpinan.required' => 'Nomor HP Pimpinan Wajib diisi!', + 'nomor_hp_pimpinan.numeric' => 'Nomor HP Pimpinan harus berupa angka!', + 'nomor_hp_pimpinan.digits_between' => 'Nomor HP Pimpinan minimum 10 digit dan maksimum 15 digit!', + 'nama_pic_reviewer.not_regex' => 'Nama PIC Reviewer harus berupa huruf!', + 'nomor_hp_pic_reviewer.numeric' => 'Nomor HP PIC Reviewer harus berupa angka!', + 'nomor_hp_pic_reviewer.digits_between' => 'Nomor HP PIC Reviewer minimum 10 digit dan maksimum 15 digit!', + 'nama_pic_admin.not_regex' => 'Nama PIC Admin harus berupa huruf!', + 'nomor_hp_pic_admin.numeric' => 'Nomor HP PIC Admin harus berupa angka!', + 'nomor_hp_pic_admin.digits_between' => 'Nomor HP PIC Admin minimum 10 digit dan maksimum 15 digit!', + 'nama_pic_marketing.not_regex' => 'Nama PIC Marketing harus berupa huruf!', + 'nomor_hp_pic_marketing.numeric' => 'Nomor HP PIC Marketing harus berupa angka!', + 'nomor_hp_pic_marketing.digits_between' => 'Nomor HP PIC Marketing minimum 10 digit dan maksimum 15 digit!', 'ijin_usaha_id.required' => 'Ijin Usaha Wajib diisi!', 'attachment.mimes' => 'Attachment harus berformat pdf!', 'attachment.max' => 'Attachment berukuran maksimum 1 MB!', diff --git a/database/migrations/2024_12_11_102623_delete_kjpp_table.php b/database/migrations/2024_12_11_102623_delete_kjpp_table.php deleted file mode 100644 index 7ddba24..0000000 --- a/database/migrations/2024_12_11_102623_delete_kjpp_table.php +++ /dev/null @@ -1,36 +0,0 @@ -dropColumn(['detail_email_kantor', 'detail_nama_pimpinan', 'detail_nomor_hp_pimpinan', 'detail_nama_pic_reviewer', 'detail_nomor_hp_pic_reviewer', 'detail_nama_pic_admin', 'detail_nomor_hp_pic_admin', 'detail_nama_pic_marketing', 'detail_nomor_hp_pic_marketing']); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::table('kjpp', function (Blueprint $table) { - $table->string('detail_email_kantor')->nullable(); - $table->string('detail_nama_pimpinan')->nullable(); - $table->string('detail_nomor_hp_pimpinan')->nullable(); - $table->string('detail_nama_pic_reviewer')->nullable(); - $table->string('detail_nomor_hp_pic_reviewer')->nullable(); - $table->string('detail_nama_pic_admin')->nullable(); - $table->string('detail_nomor_hp_pic_admin')->nullable(); - $table->string('detail_nama_pic_marketing')->nullable(); - $table->string('detail_nomor_hp_pic_marketing')->nullable(); - }); - } -}; diff --git a/database/seeders/LpjDatabaseSeeder.php b/database/seeders/LpjDatabaseSeeder.php index b8ab38c..2ea3738 100644 --- a/database/seeders/LpjDatabaseSeeder.php +++ b/database/seeders/LpjDatabaseSeeder.php @@ -30,14 +30,14 @@ class LpjDatabaseSeeder extends Seeder TeamUsersSeeder::class, JenisPenilaianSeeder::class, IjinUsahaSeeder::class, - // TujuanPenilaianKJPPSeeder::class, - // KJPPSeeder::class, - // JenisLaporanSeeder::class, - // DebitureSeeder::class, - // PemilikJaminanSeeder::class, - // DokumenJaminanSeeder::class, - // DetailDokumenJaminanSeeder::class, - // PermohonanSeeder::class, + TujuanPenilaianKJPPSeeder::class, + KJPPSeeder::class, + JenisLaporanSeeder::class, + DebitureSeeder::class, + PemilikJaminanSeeder::class, + DokumenJaminanSeeder::class, + DetailDokumenJaminanSeeder::class, + PermohonanSeeder::class, // PenawaranSeeder::class, // DetailPenawaranSeeder::class, // PenilaianSeeder::class, diff --git a/database/seeders/sql/jenis_jaminan.sql b/database/seeders/sql/jenis_jaminan.sql index 0b7cc76..883c818 100644 --- a/database/seeders/sql/jenis_jaminan.sql +++ b/database/seeders/sql/jenis_jaminan.sql @@ -1,37 +1,29 @@ --- MySQL dump 10.13 Distrib 8.0.39, for Win64 (x86_64) --- --- Host: localhost Database: lpj --- ------------------------------------------------------ --- Server version 8.0.39 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `jenis_jaminan` --- - -LOCK TABLES `jenis_jaminan` WRITE; -/*!40000 ALTER TABLE `jenis_jaminan` DISABLE KEYS */; -INSERT INTO `jenis_jaminan` VALUES (1,'JJ001','Tanah','tanah','[\"tanah\", \"lingkungan\", \"fakta\"]','[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ005\",\"JLJ006\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'JJ002','Unit Apartemen','unit-apartemen','[\"apartemen-kantor\", \"lingkungan\", \"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ022\",\"JLJ024\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'JJ003','Kawasan Industrial / Komersil / Residensial - Perumahan','kawasan-industrial-komersil-residensial-perumahan','[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ008\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'JJ004','Mall','mall','null','[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ009\",\"JLJ012\",\"JLJ013\",\"JLJ014\",\"JLJ015\",\"JLJ021\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'JJ005','Pabrik','pabrik','null','[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ009\",\"JLJ011\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'JJ006','Emas dan Perak','emas-dan-perak','null','[\"JLJ001\",\"JLJ007\",\"JLJ014\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,'JJ007','Alat Berat','alat-berat','null','[\"JLJ004\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'JJ008','Rumah Tinggal','rumah-tinggal','[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ009\",\"JLJ024\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(9,'JJ009','Full Properti','full-properti','[\"tanah\", \"bangunan\", \"informasi\"]','[\"JLJ001\",\"JLJ006\",\"JLJ007\",\"JLJ009\"]',1,'2024-12-06 02:16:02','2024-12-10 15:07:46',NULL,NULL,NULL,NULL,1,NULL,NULL),(10,'JJ010','Gudang','gudang','[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ009\",\"JLJ024\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'JJ011','Unit Kios','unit-kios','[\"apartemen-kantor\", \"lingkungan\", \"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ007\",\"JLJ009\",\"JLJ024\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'JJ012','Gedung Mall','gedung-mall','[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ007\",\"JLJ009\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'JJ013','Tanah Bangunan','tanah-bangunan','[\"tanah\", \"bangunan\"]','[\"JLJ001\",\"JLJ003\",\"JLJ005\",\"JLJ007\",\"JLJ009\",\"JLJ022\",\"JLJ024\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'JJ014','Apartemen','apartemen','[\"apartemen-kantor\", \"lingkungan\", \"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ003\",\"JLJ022\",\"JLJ024\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,'JJ015','Ruko','ruko','[\"tanah\", \"bangunan\"]','[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'JJ016','Mesin Tekstil','mesin-tekstil','[\"mesin\"]','[\"JLJ011\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'JJ017','Mesin','mesin','[\"mesin\"]','[\"JLJ011\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'JJ018','Mesin Tenun Tekstil','mesin-tenun-tekstil','[\"mesin\"]','[\"JLJ011\",\"JLJ022\"]',1,'2024-12-06 02:16:02','2024-12-06 02:16:02',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'JJ019','Penilaian Bisnis','penilaian-bisnis','[\"fakta\", \"informasi\"]','[\"JLJ001\",\"JLJ007\",\"JLJ014\"]',1,'2024-12-09 19:34:01','2024-12-09 19:34:01',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,'JJ020','Penilaian Tanah dan Bangunan','penilaian-tanah-dan-bangunan','[\"tanah\", \"bangunan\"]','[\"JLJ001\",\"JLJ003\",\"JLJ007\"]',1,'2024-12-09 19:34:54','2024-12-09 19:34:54',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,'JJ021','Penilaian Mesin','penilaian-mesin','[\"mesin\"]','[\"JLJ011\",\"JLJ022\"]',1,'2024-12-09 20:00:13','2024-12-09 20:00:13',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'JJ022','Penilian Kapal dan Pesawat','penilian-kapal-dan-pesawat','[\"kapal\", \"pesawat\"]','[\"JLJ011\",\"JLJ022\"]',1,'2024-12-09 20:01:00','2024-12-09 20:01:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'JJ023','Tanah Kosong','tanah-kosong','[\"tanah\"]','[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ022\"]',1,'2024-12-09 20:18:24','2024-12-09 20:18:24',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'JJ024','Tanah Kosong untuk dikembangkan','tanah-kosong-untuk-dikembangkan','[\"tanah\"]','[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ022\"]',1,'2024-12-09 20:19:03','2024-12-09 20:19:03',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(25,'JJ025','Bisnis','bisnis','[\"informasi\", \"lingkungan\"]','[\"JLJ001\",\"JLJ007\"]',1,'2024-12-10 15:09:26','2024-12-10 15:09:26',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,'JJ026','Properti Sederhana','properti-sederhana','[\"lingkungan\", \"tanah\"]','[\"JLJ001\",\"JLJ007\"]',1,'2024-12-10 15:10:01','2024-12-10 15:10:01',NULL,NULL,NULL,NULL,NULL,NULL,NULL); -/*!40000 ALTER TABLE `jenis_jaminan` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2024-12-11 8:45:38 +INSERT INTO jenis_jaminan VALUES +(1, 'JJ001', 'Tanah', 'tanah', '[\"tanah\", \"lingkungan\", \"fakta\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ005\",\"JLJ006\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(2, 'JJ002', 'Unit Apartemen', 'unit-apartemen', '[\"apartemen-kantor\", \"lingkungan\", \"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ022\",\"JLJ024\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(3, 'JJ003', 'Kawasan Industrial / Komersil / Residensial - Perumahan', 'kawasan-industrial-komersil-residensial-perumahan', '[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ008\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(4, 'JJ004', 'Mall', 'mall', 'null', '[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ009\",\"JLJ012\",\"JLJ013\",\"JLJ014\",\"JLJ015\",\"JLJ021\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(5, 'JJ005', 'Pabrik', 'pabrik', 'null', '[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ009\",\"JLJ011\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(6, 'JJ006', 'Emas dan Perak', 'emas-dan-perak', 'null', '[\"JLJ001\",\"JLJ007\",\"JLJ014\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(7, 'JJ007', 'Alat Berat', 'alat-berat', 'null', '[\"JLJ004\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(8, 'JJ008', 'Rumah Tinggal', 'rumah-tinggal', '[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ004\",\"JLJ006\",\"JLJ007\",\"JLJ009\",\"JLJ024\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(9, 'JJ009', 'Full Properti', 'full-properti', '[\"tanah\", \"bangunan\", \"informasi\"]', '[\"JLJ001\",\"JLJ006\",\"JLJ007\",\"JLJ009\"]', 1, '2024-12-06 09:16:02', '2024-12-10 22:07:46', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(10, 'JJ010', 'Gudang', 'gudang', '[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ009\",\"JLJ024\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(11, 'JJ011', 'Unit Kios', 'unit-kios', '[\"apartemen-kantor\", \"lingkungan\", \"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ007\",\"JLJ009\",\"JLJ024\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(12, 'JJ012', 'Gedung Mall', 'gedung-mall', '[\"tanah\", \"bangunan\", \"lingkungan\", \"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ007\",\"JLJ009\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(13, 'JJ013', 'Tanah Bangunan', 'tanah-bangunan', '[\"tanah\", \"bangunan\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ005\",\"JLJ007\",\"JLJ009\",\"JLJ022\",\"JLJ024\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(14, 'JJ014', 'Apartemen', 'apartemen', '[\"apartemen-kantor\", \"lingkungan\", \"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ022\",\"JLJ024\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(15, 'JJ015', 'Ruko', 'ruko', '[\"tanah\", \"bangunan\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(16, 'JJ016', 'Mesin Tekstil', 'mesin-tekstil', '[\"mesin\"]', '[\"JLJ011\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(17, 'JJ017', 'Mesin', 'mesin', '[\"mesin\"]', '[\"JLJ011\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(18, 'JJ018', 'Mesin Tenun Tekstil', 'mesin-tenun-tekstil', '[\"mesin\"]', '[\"JLJ011\",\"JLJ022\"]', 1, '2024-12-06 09:16:02', '2024-12-06 09:16:02', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(19, 'JJ019', 'Penilaian Bisnis', 'penilaian-bisnis', '[\"fakta\", \"informasi\"]', '[\"JLJ001\",\"JLJ007\",\"JLJ014\"]', 1, '2024-12-10 02:34:01', '2024-12-10 02:34:01', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(20, 'JJ020', 'Penilaian Tanah dan Bangunan', 'penilaian-tanah-dan-bangunan', '[\"tanah\", \"bangunan\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ007\"]', 1, '2024-12-10 02:34:54', '2024-12-10 02:34:54', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(21, 'JJ021', 'Penilaian Mesin', 'penilaian-mesin', '[\"mesin\"]', '[\"JLJ011\",\"JLJ022\"]', 1, '2024-12-10 03:00:13', '2024-12-10 03:00:13', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(22, 'JJ022', 'Penilian Kapal dan Pesawat', 'penilian-kapal-dan-pesawat', '[\"kapal\", \"pesawat\"]', '[\"JLJ011\",\"JLJ022\"]', 1, '2024-12-10 03:01:00', '2024-12-10 03:01:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(23, 'JJ023', 'Tanah Kosong', 'tanah-kosong', '[\"tanah\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ022\"]', 1, '2024-12-10 03:18:24', '2024-12-10 03:18:24', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(24, 'JJ024', 'Tanah Kosong untuk dikembangkan', 'tanah-kosong-untuk-dikembangkan', '[\"tanah\"]', '[\"JLJ001\",\"JLJ003\",\"JLJ007\",\"JLJ022\"]', 1, '2024-12-10 03:19:03', '2024-12-10 03:19:03', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(25, 'JJ025', 'Bisnis', 'bisnis', '[\"informasi\", \"lingkungan\"]', '[\"JLJ001\",\"JLJ007\"]', 1, '2024-12-10 22:09:26', '2024-12-10 22:09:26', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(26, 'JJ026', 'Properti Sederhana', 'properti-sederhana', '[\"lingkungan\", \"tanah\"]', '[\"JLJ001\",\"JLJ007\"]', 1, '2024-12-10 22:10:01', '2024-12-10 22:10:01', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(27, 'JJ027', 'Bangunan', 'bangunan', '[\"bangunan\"]', '[\"JLJ003\",\"JLJ007\"]', 1, '2024-12-12 08:13:41', '2024-12-12 08:13:41', NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(28, 'JJ028', 'Kendaraan Bermotor', 'kendaraan-bermotor', '[\"kendaraan\"]', '[\"JLJ022\"]', 1, '2024-12-12 08:15:51', '2024-12-12 08:15:51', NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php index 62da0f7..1bd1ff7 100644 --- a/resources/views/kjpp/create.blade.php +++ b/resources/views/kjpp/create.blade.php @@ -223,36 +223,31 @@ Email Kantor
- - @error('email_kantor.0') + + @error('email_kantor') {{ $message }} @enderror
- @if (is_array(old('email_kantor', $emailKantor)) && count(old('email_kantor', $emailKantor)) > 1) - @foreach (old('email_kantor', $emailKantor) as $index => $email) - @if ($index > 0 && !empty($email)) -
-
- - @error('email_kantor.' . $index) - {{ $message }} - @enderror -
- + @if (isset($kjpp->detail_email_kantor)) + @foreach ($detailEmailKantor as $detail_email_kantor) +
+
+ + @error('email_kantor') + {{ $message }} + @enderror
- @endif + +
@endforeach @endif -
- +
@@ -260,9 +255,9 @@ Nama Pimpinan
- - @error('nama_pimpinan.0') + + @error('nama_pimpinan') {{ $message }} @enderror
@@ -270,50 +265,47 @@ Nomor HP Pimpinan
- - @error('nomor_hp_pimpinan.0') + + @error('nomor_hp_pimpinan') {{ $message }} @enderror
- @if (is_array($namaPimpinan) && is_array(old('nama_pimpinan', $namaPimpinan))) - @foreach (old('nama_pimpinan', $namaPimpinan) as $index => $pimpinan) - @php - $nomorHp = old('nomor_hp_pimpinan.' . $index, $nomorHpPimpinan[$index] ?? ''); - @endphp - @if ($index > 0 && (!empty($pimpinan) || !empty($nomorHp))) -
- -
- - @error('nama_pimpinan.' . $index) - {{ $message }} - @enderror -
- -
- - @error('nomor_hp_pimpinan.' . $index) - {{ $message }} - @enderror -
- + @if (isset($kjpp->detail_nama_pimpinan) && isset($kjpp->detail_nomor_hp_pimpinan)) + @foreach (json_decode($detailJoinPimpinan) as $detail_pimpinan) +
+ +
+ + @error('nama_pimpinan') + {{ $message }} + @enderror
- @endif + +
+ + @error('nomor_hp_pimpinan') + {{ $message }} + @enderror +
+ +
@endforeach @endif -
@@ -330,10 +322,10 @@ Nama PIC Reviewer
- - @error('nama_pic_reviewer.0') + + @error('nama_pic_reviewer') {{ $message }} @enderror
@@ -341,61 +333,46 @@ Nomor HP PIC Reviewer
- - @error('nomor_hp_pic_reviewer.0') + + @error('nomor_hp_pic_reviewer') {{ $message }} @enderror
- @if (is_array(old('nama_pic_reviewer', $namaPicReviewer)) && is_array(old('nomor_hp_pic_reviewer', $nomorHpPicReviewer))) - @foreach (old('nama_pic_reviewer', $namaPicReviewer) as $index => $picReviewer) - @php - $nomorHpReviewer = old( - 'nomor_hp_pic_reviewer.' . $index, - $nomorHpPicReviewer[$index] ?? '', - ); - @endphp - @if ($index > 0 && (!empty($picReviewer) || !empty($nomorHpReviewer))) -
- -
- -
- - @error('nama_pic_reviewer.' . $index) - {{ $message }} - @enderror -
-
- - -
- -
- - @error('nomor_hp_pic_reviewer.' . $index) - {{ $message }} - @enderror -
-
- - - + @if (isset($kjpp->detail_nama_pic_reviewer) && isset($kjpp->detail_nomor_hp_pic_reviewer)) + @foreach (json_decode($detailJoinPicReviewer) as $detail_pic_reviewer) +
+ +
+ + @error('nama_pic_reviewer') + {{ $message }} + @enderror
- @endif + +
+ + @error('nomor_hp_pic_reviewer') + {{ $message }} + @enderror +
+ +
@endforeach @endif
@@ -414,9 +391,9 @@ Nama PIC Admin
- - @error('nama_pic_admin.0') + + @error('nama_pic_admin') {{ $message }} @enderror
@@ -424,55 +401,45 @@ Nomor HP PIC Admin
- - @error('nomor_hp_pic_admin.0') + + @error('nomor_hp_pic_admin') {{ $message }} @enderror
- @if (is_array(old('nama_pic_admin', $namaPicAdmin)) && is_array(old('nomor_hp_pic_admin', $nomorHpPicAdmin))) - @foreach (old('nama_pic_admin', $namaPicAdmin) as $index => $picAdmin) - @php - $nomorHpAdmin = old( - 'nomor_hp_pic_admin.' . $index, - $nomorHpPicAdmin[$index] ?? '', - ); - @endphp - @if ($index > 0 && (!empty($picAdmin) || !empty($nomorHpAdmin))) -
- - -
- - @error('nama_pic_admin.' . $index) - {{ $message }} - @enderror -
- - - -
- - @error('nomor_hp_pic_admin.' . $index) - {{ $message }} - @enderror -
- - - + @if (isset($kjpp->detail_nama_pic_admin) && isset($kjpp->detail_nomor_hp_pic_admin)) + @foreach (json_decode($detailJoinPicAdmin) as $detail_pic_admin) +
+ +
+ + @error('nama_pic_admin') + {{ $message }} + @enderror
- @endif + +
+ + @error('nomor_hp_pic_admin') + {{ $message }} + @enderror +
+ +
@endforeach @endif
@@ -491,10 +458,10 @@ Nama PIC Marketing
- - @error('nama_pic_marketing.0') + + @error('nama_pic_marketing') {{ $message }} @enderror
@@ -502,59 +469,49 @@ Nomor HP PIC Marketing
- - @error('nomor_hp_pic_marketing.0') + + @error('nomor_hp_pic_marketing') {{ $message }} @enderror
- @if (is_array(old('nama_pic_marketing', $namaPicMarketing)) && - is_array(old('nomor_hp_pic_marketing', $nomorHpPicMarketing))) - @foreach (old('nama_pic_marketing', $namaPicMarketing) as $index => $picMarketing) - @php - $nomorHpMarketing = old( - 'nomor_hp_pic_marketing.' . $index, - $nomorHpPicMarketing[$index] ?? '', - ); - @endphp - @if ($index > 0 && (!empty($picMarketing) || !empty($nomorHpMarketing))) -
- - -
- - @error('nama_pic_marketing.' . $index) - {{ $message }} - @enderror -
- - - -
- - @error('nomor_hp_pic_marketing.' . $index) - {{ $message }} - @enderror -
- - - + @if (isset($kjpp->detail_nama_pic_marketing) && isset($kjpp->detail_nomor_hp_pic_marketing)) + @foreach (json_decode($detailJoinPicMarketing) as $detail_pic_marketing) +
+ +
+ + @error('nama_pic_marketing') + {{ $message }} + @enderror
- @endif + +
+ + @error('nomor_hp_pic_marketing') + {{ $message }} + @enderror +
+ +
@endforeach @endif -
diff --git a/resources/views/kjpp/scripts/index.blade.php b/resources/views/kjpp/scripts/index.blade.php index 91ba746..118969c 100644 --- a/resources/views/kjpp/scripts/index.blade.php +++ b/resources/views/kjpp/scripts/index.blade.php @@ -32,7 +32,7 @@ newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full"; newDiv.innerHTML = `
- +
`; @@ -51,13 +51,13 @@ Nama Pimpinan
- +
- +
`; @@ -76,13 +76,13 @@ Nama PIC Reviewer
- +
- +
`; @@ -101,13 +101,13 @@ Nama PIC Admin
- +
- +
`; @@ -126,13 +126,13 @@ Nama PIC Marketing
- +
- +
`; diff --git a/resources/views/kjpp/show.blade.php b/resources/views/kjpp/show.blade.php index 1a5184b..b0bb344 100644 --- a/resources/views/kjpp/show.blade.php +++ b/resources/views/kjpp/show.blade.php @@ -95,16 +95,13 @@ Email Kantor
- @if (isset($emailKantor) && count($emailKantor) > 0) - @foreach ($emailKantor as $email) +

{{ $kjpp->email_kantor }}

+ @if (isset($kjpp->detail_email_kantor)) + @foreach (json_decode($kjpp->detail_email_kantor) as $detail_email_kantor)

- {{ $email }} + {{ $detail_email_kantor->email_kantor }}

@endforeach - @else -

- - -

@endif
@@ -113,32 +110,26 @@ Nama Pimpinan
- @if (isset($namaPimpinan) && count($namaPimpinan) > 0) - @foreach ($namaPimpinan as $pimpinan) +

{{ $kjpp->nama_pimpinan }}

+ @if (isset($kjpp->detail_nama_pimpinan)) + @foreach (json_decode($detailJoinPimpinan) as $detail_nama_pimpinan)

- {{ $pimpinan }} + {{ $detail_nama_pimpinan->nama_pimpinan }}

@endforeach - @else -

- - -

@endif
- @if (isset($nomorHpPimpinan) && count($nomorHpPimpinan) > 0) - @foreach ($nomorHpPimpinan as $hp_pimpinan) +

{{ $kjpp->nomor_hp_pimpinan }}

+ @if (isset($kjpp->detail_nomor_hp_pimpinan)) + @foreach (json_decode($detailJoinPimpinan) as $detail_nomor_hp_pimpinan)

- {{ $hp_pimpinan }} + {{ $detail_nomor_hp_pimpinan->nomor_hp_pimpinan }}

@endforeach - @else -

- - -

@endif
@@ -147,32 +138,27 @@ Nama PIC Reviewer
- @if (isset($namaPicReviewer) && count($namaPicReviewer) > 0) - @foreach ($namaPicReviewer as $pic_reviewer) +

{{ $kjpp->nama_pic_reviewer ?? '-' }}

+ @if (isset($kjpp->detail_nama_pic_reviewer)) + @foreach (json_decode($detailJoinPicReviewer) as $detail_nama_pic_reviewer)

- {{ $pic_reviewer }} + {{ $detail_nama_pic_reviewer->nama_pic_reviewer }}

@endforeach - @else -

- - -

@endif
- @if (isset($nomorHpPicReviewer) && count($nomorHpPicReviewer) > 0) - @foreach ($nomorHpPicReviewer as $hp_pic_reviewer) +

{{ $kjpp->nomor_hp_pic_reviewer ?? '-' }} +

+ @if (isset($kjpp->detail_nomor_hp_pic_reviewer)) + @foreach (json_decode($detailJoinPicReviewer) as $detail_nomor_hp_pic_reviewer)

- {{ $hp_pic_reviewer }} + {{ $detail_nomor_hp_pic_reviewer->nomor_hp_pic_reviewer }}

@endforeach - @else -

- - -

@endif
@@ -181,32 +167,26 @@ Nama PIC Admin
- @if (isset($namaPicAdmin) && count($namaPicAdmin) > 0) - @foreach ($namaPicAdmin as $pic_admin) +

{{ $kjpp->nama_pic_admin ?? '-' }}

+ @if (isset($kjpp->detail_nama_pic_admin)) + @foreach (json_decode($detailJoinPicAdmin) as $detail_nama_pic_admin)

- {{ $pic_admin }} + {{ $detail_nama_pic_admin->nama_pic_admin }}

@endforeach - @else -

- - -

@endif
- @if (isset($nomorHpPicAdmin) && count($nomorHpPicAdmin) > 0) - @foreach ($nomorHpPicAdmin as $hp_pic_admin) +

{{ $kjpp->nomor_hp_pic_admin ?? '-' }}

+ @if (isset($kjpp->detail_nomor_hp_pic_admin)) + @foreach (json_decode($detailJoinPicAdmin) as $detail_nomor_hp_pic_admin)

- {{ $hp_pic_admin }} + {{ $detail_nomor_hp_pic_admin->nomor_hp_pic_admin }}

@endforeach - @else -

- - -

@endif
@@ -215,32 +195,27 @@ Nama PIC Marketing
- @if (isset($namaPicMarketing) && count($namaPicMarketing) > 0) - @foreach ($namaPicMarketing as $pic_marketing) +

{{ $kjpp->nama_pic_marketing ?? '-' }}

+ @if (isset($kjpp->detail_nama_pic_marketing)) + @foreach (json_decode($detailJoinPicMarketing) as $detail_nama_pic_marketing)

- {{ $pic_marketing }} + {{ $detail_nama_pic_marketing->nama_pic_marketing }}

@endforeach - @else -

- - -

@endif
- @if (isset($nomorHpPicMarketing) && count($nomorHpPicMarketing) > 0) - @foreach ($nomorHpPicMarketing as $hp_pic_marketing) +

{{ $kjpp->nomor_hp_pic_marketing ?? '-' }} +

+ @if (isset($kjpp->detail_nomor_hp_pic_marketing)) + @foreach (json_decode($detailJoinPicMarketing) as $detail_nomor_hp_pic_marketing)

- {{ $hp_pic_marketing }} + {{ $detail_nomor_hp_pic_marketing->nomor_hp_pic_marketing }}

@endforeach - @else -

- - -

@endif
@@ -248,23 +223,25 @@ -
+
@if (isset($kjpp->ijin_usaha_id)) - @foreach (json_decode($kjpp->ijin_usaha_id, true) as $ijin_code) - @php - $ijin_usaha = $ijin_usahas->firstWhere('code', $ijin_code); - @endphp - @if ($ijin_usaha) -
- {{ $ijin_usaha->name }} -
- @endif - @endforeach - @else -
- - +
+ @foreach (json_decode($kjpp->ijin_usaha_id, true) as $ijin_code) + @php + $ijin_usaha = $ijin_usahas->firstWhere('code', $ijin_code); + @endphp + @if ($ijin_usaha) +
+ {{ $ijin_usaha->name }} +
+ @endif + @endforeach
+ @else +
No + business license + selected.
@endif
@@ -280,13 +257,13 @@ @endphp @if ($jenis_aset) + class="flex flex-row space-x-4 text-white font-medium text-sm badge badge-dark dark-mode:badge dark-mode:text-gray-600"> {{ $jenis_aset->name }} @endif @endforeach @else - + - @endif