diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index e27ff54..970fcc7 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -1,7 +1,8 @@ mengurutkan data berdasarkan kolom `created_at` secara DESC + $maxCode = PenawaranTender::max('code'); + // $penawaran = PenawaranTender::latest()->first(); + $penawaran = PenawaranTender::where('code','=',$maxCode)->first(); + $code_penawaran_last=''; + $noUrutAkhirString = sprintf("%04s", 1); + if($penawaran) + { + $code_penawaran_last = substr ($maxCode, -4); + $year_penawaran_last = Carbon::parse($penawaran->created_at)->year; + $year_now = Carbon::now()->year; + if($year_now == $year_penawaran_last) + { + $noUrutAkhirString = sprintf("%04s", abs($code_penawaran_last + 1)); + } + } + + return 'NP'.Carbon::now()->format('y').$noUrutAkhirString; + } // andy add diff --git a/app/Http/Controllers/OtorisasiPenawaranController.php b/app/Http/Controllers/OtorisasiPenawaranController.php index 66180ed..82f6fff 100644 --- a/app/Http/Controllers/OtorisasiPenawaranController.php +++ b/app/Http/Controllers/OtorisasiPenawaranController.php @@ -5,6 +5,7 @@ namespace Modules\Lpj\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; use App\Http\Controllers\Controller; +use Carbon\Carbon; use Exception; use Maatwebsite\Excel\Facades\Excel; use Illuminate\Http\JsonResponse; @@ -40,7 +41,18 @@ class OtorisasiPenawaranController extends Controller // Retrieve data from the database $query =PenawaranTender::query() - ->select('penawaran.*',DB::raw("CONCAT(DATE_FORMAT(penawaran.start_date, '%d %M %Y'), ' - ', DATE_FORMAT(penawaran.end_date, '%d %M %Y')) AS date_range"), 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name') + ->select('penawaran.*', + 'debitures.name as debitures_name', + 'permohonan.tanggal_permohonan', + 'users.name as user_pemohon', + 'branches.name as branches_name', + 'tujuan_penilaian.name as tujuan_penilaian_name', + 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name') + ->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi') + ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id') + ->leftJoin('users', 'users.id', '=', 'permohonan.user_id') + ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id') + ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id') ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id') ->where('penawaran.status','=','proposal-tender') ->withCount('penawarandetails'); @@ -82,6 +94,27 @@ class OtorisasiPenawaranController extends Controller //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get(); $data = $query->get(); + // format date + $i = 0; + foreach ($data as $obj) { + + // tanggal_permohonan + if ($obj->tanggal_permohonan) { + $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y'); + } + + // date_range + $data[$i]->date_range = "-"; + if ($obj->start_date && $obj->end_date) + { + $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . + Carbon::parse($obj->end_date)->format('d M Y'); + } + + $i++; + } + // format date + // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 6b2a0c0..ab47dd1 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -39,8 +39,9 @@ class PenilaiController extends Controller */ public function show($id) { - $permohonan = Permohonan::with('debiture.documents.jenisjaminan')->find($id); + $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id); + // return response()->json(['permohonan' => $permohonan]); return view('lpj::penilai.show', compact('permohonan')); } diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index c5d5252..8daef81 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -98,7 +98,7 @@ class PenilaianController extends Controller if (isset($validatedData['penilai_surveyor_id'])) { $user_ids[] = $validatedData['penilai_surveyor_id']; - }else { + } else { $user_ids[] = $validatedData['penilai_id']; } @@ -126,11 +126,11 @@ class PenilaianController extends Controller ]); DB::commit(); - - return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan'); + return response()->json(['success' => true, 'message' => 'Data berhasil disimpan'], 200); } catch (Exception $e) { DB::rollBack(); - return redirect()->route('penilaian.index')->with('error', $e->getMessage()); + + return response()->json(['error' => $e->getMessage()]); } } } @@ -179,10 +179,10 @@ class PenilaianController extends Controller 'status' => 'assign', ]); DB::commit(); - return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan'); + return response()->json(['success' => true, 'message' => 'Data berhasil disimpan'], 200); } catch (Exception $e) { DB::rollBack(); - return redirect()->route('penilaian.index')->with('error', $e->getMessage()); + return response()->json([ 'success' => false, 'error' => $e->getMessage()]); } } diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php index 05b199c..f457660 100644 --- a/app/Http/Controllers/ProsesPenawaranController.php +++ b/app/Http/Controllers/ProsesPenawaranController.php @@ -13,12 +13,16 @@ use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\DB; +use Modules\Lpj\Http\Requests\ProsesPenawaranRequest; +use Modules\Lpj\Models\JenisLaporan; use Modules\Lpj\Models\KJPP; use Modules\Lpj\Models\PenawaranDetailTender; use Modules\Lpj\Models\PenawaranDetailTenderLog; use Modules\Lpj\Models\PenawaranTender; use Modules\Lpj\Models\Permohonan; +use Modules\Lpj\Models\StatusPermohonan; +use Modules\Lpj\Models\TujuanPenilaianKJPP; class ProsesPenawaranController extends Controller { @@ -40,7 +44,51 @@ class ProsesPenawaranController extends Controller } // Retrieve data from the database - $query = PenawaranTender::query()->whereIn('status', ['tender', 'proposal-tender'])->withCount('penawarandetails'); + // $query = PenawaranTender::query()->whereIn('status', ['tender', 'proposal-tender'])->withCount('penawarandetails'); + + // penawaran need union with permohonan + $query = PenawaranTender::query()->whereIn('penawaran.status', ['tender', 'proposal-tender']) + ->select('penawaran.id', + 'penawaran.nomor_registrasi', + 'penawaran.code as penawaran_code', + 'penawaran.start_date', + 'penawaran.end_date', + 'penawaran.status as statusnya', + 'debitures.name as debitures_name', + 'permohonan.tanggal_permohonan', + 'users.name as user_pemohon', + 'branches.name as branches_name', + 'tujuan_penilaian.name as tujuan_penilaian_name', + 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name' + ) + ->withCount('penawarandetails') + ->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi') + ->leftJoin('users', 'users.id', '=', 'permohonan.user_id') + ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id') + ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id') + ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id') + ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id', '=', 'penawaran.tujuan_penilaian_kjpp_id'); + + $permohonanQuery = Permohonan::whereIn('permohonan.status', ['registered'])->where('permohonan.jenis_penilaian_id', '=', 2) + ->select('permohonan.id', + 'permohonan.nomor_registrasi', + DB::raw('"" as penawaran_code'), + DB::raw('"" as start_date'), + DB::raw('"" as end_date'), + 'permohonan.status as statusnya', + 'debitures.name as debitures_name', + 'permohonan.tanggal_permohonan', + 'users.name as user_pemohon', + 'branches.name as branches_name', + 'tujuan_penilaian.name as tujuan_penilaian_name', + DB::raw('"" as tujuan_penilaian_kjpp_name'), + DB::raw('"-" as penawarandetails_count')) + ->leftJoin('users', 'users.id', '=', 'permohonan.user_id') + ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id') + ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id') + ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id'); + $query->union($permohonanQuery); + // penawaran need union with permohonan // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { @@ -76,8 +124,29 @@ class ProsesPenawaranController extends Controller $filteredRecords = $query->count(); // Get the data for the current page - //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get(); - $data = $query->with(['tujuanPenilaianKjpp','permohonan','permohonan.debiture'])->get(); + // $data = $query->with(['tujuanPenilaianKjpp','permohonan','permohonan.debiture'])->get(); + $data = $query->get(); + + // format date + $i = 0; + foreach ($data as $obj) { + + // tanggal_permohonan + if ($obj->tanggal_permohonan) { + $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y'); + } + + // date_range + $data[$i]->date_range = "-"; + if ($obj->start_date && $obj->end_date) + { + $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . + Carbon::parse($obj->end_date)->format('d M Y'); + } + + $i++; + } + // format date // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); @@ -826,4 +895,77 @@ class ProsesPenawaranController extends Controller return response()->json($data); } + + // merger permohonan + /** + * Show the form for creating a new resource. + */ + public function createPenawaran($id) + { + // id ==> permohonan.id + $permohonan = Permohonan::find($id); + // dd($permohonan); + $status = StatusPermohonan::all(); + $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all(); + $jenis_laporan = JenisLaporan::all(); + $kjpp = KJPP::all(); + + return view('lpj::prosespenawaran.createPenawaran', compact('id', 'status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonan')); + } + + public function storePenawaran(ProsesPenawaranRequest $request, $id) + { + $validated = $request->validated(); + + DB::beginTransaction(); + + try { + + $permohonan = Permohonan::find($id); + + $userId = Auth::user()->id; + $validated['nomor_registrasi'] = $permohonan->nomor_registrasi; + $validated['status'] = 'tender'; + $validated['updated_by'] = $userId; // Updating the record + $validated['end_date'] = $request->input('end_date') . ' 23:59:59'; + + $permohonan->update($validated); + + // Adding created_by for the new penawaran record + $validated['created_by'] = $userId; + $validated['code'] = onLastnumberCodePenawaran(); + $penawaran = PenawaranTender::create($validated); + + $kjpps = $request->input('kjpp', []); + + foreach ($kjpps as $kjpp) { + PenawaranDetailTender::create([ + 'penawaran_id' => $penawaran->id, + 'kjpp_rekanan_id' => $kjpp, + 'created_by' => $userId, // Set created_by for details + 'updated_by' => $userId + ]); + } + + // Commit the transaction + DB::commit(); + + return redirect() + ->route('tender.prosespenawaran.index') + ->with('success', 'Data Penawaran created successfully'); + } catch (Exception $e) { + DB::rollBack(); + + return redirect() + ->route('tender.prosespenawaran.createPenawaran', $id) + ->with('error', 'Validation failed: ' . $e); + } + } + + public function showPermohonan($id) + { + $permohonan = Permohonan::find($id); + return view('lpj::prosespenawaran.showPermohonan', compact('id', 'permohonan')); + } + // merger permohonan } diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 3c86379..681dbe1 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -40,6 +40,10 @@ use Modules\Lpj\Models\Lantai; use Modules\Lpj\Models\Inspeksi; use Modules\Lpj\Models\ViewUnit; use Modules\Lpj\Models\ObjekJaminan; +use Modules\Lpj\Models\ModelAlatBerat; +use Modules\Lpj\Models\JenisPesawat; +use Modules\Lpj\Models\JenisKapal; +use Modules\Lpj\Models\JenisKendaraan; use Modules\Lpj\Models\RuteJaminan; use Modules\Lpj\Models\AnalisaUnit; use Modules\Lpj\Models\GolonganMasySekitar; @@ -48,6 +52,8 @@ use Modules\Lpj\Models\LaluLintasLokasi; use Modules\Lpj\Models\SpekBagunanAnalisaDetail; use Modules\Lpj\Http\Requests\SurveyorRequest; use Modules\Lpj\Http\Requests\FormSurveyorRequest; +use Modules\Lpj\Emails\SendEmail; +use Illuminate\Support\Facades\Mail; class SurveyorController extends Controller { @@ -93,6 +99,10 @@ class SurveyorController extends Controller $spekBangunan = SpekBangunan::all(); $saranaPelengkap = SaranaPelengkap::all(); $arahMataAngin = ArahMataAngin::all(); + $jenisKendaraan = JenisKendaraan::all(); + $jenisKapal = JenisKapal::all(); + $jenisPesawat = JenisPesawat::all(); + $modelAlatBerat = ModelAlatBerat::all(); @@ -146,7 +156,11 @@ class SurveyorController extends Controller 'forminspeksi', 'formDenah', 'formFoto', - 'jaminanId' + 'jaminanId', + 'jenisKendaraan', + 'jenisKapal', + 'jenisPesawat', + 'modelAlatBerat' )); } /** @@ -167,7 +181,7 @@ class SurveyorController extends Controller $rules = $this->getActionSpecificRules($data, $action, $request); $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first(); - if ($request->input('permohonan_id') == $inspeksi->permohonan_id && $request->input('jenis_jaminan_id') == $inspeksi->jenis_jaminan_id) { + if ($inspeksi) { $inspeksi->update(['data_form' => json_encode($rules)]); } else { Inspeksi::create([ @@ -210,7 +224,7 @@ class SurveyorController extends Controller foreach ($pisah as $act) { if (isset($allRules[$act])) { $rules = array_merge($rules, $allRules[$act]); - if ($act == 'tanah' || $act == 'bangunan') { + if ($act == 'tanah' || $act == 'bangunan' || $act == 'apartemen-kantor') { $hasAssetDescriptionRules = true; } } @@ -226,7 +240,6 @@ class SurveyorController extends Controller public function storeDenah(Request $request) { - try { $validatedData = $request->validate([ 'foto_denah' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:2048', @@ -237,31 +250,33 @@ class SurveyorController extends Controller $validatedData['foto_denah'] = $this->uploadFile($request->file('foto_denah'), 'foto_denah'); - $formatJsonDenah = [ 'foto_denah' => $validatedData['foto_denah'], 'luas' => $validatedData['luas'], ]; - $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first(); - if ($request->input('permohonan_id') == $inspeksi->permohonan_id && $request->input('jenis_jaminan_id') == $inspeksi->jenis_jaminan_id) { + $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id')) + ->where('jenis_jaminan_id', $request->input('jenis_jaminan_id')) + ->first(); + + if ($inspeksi) { $inspeksi->update([ 'denah_form' => json_encode($formatJsonDenah) ]); } else { Inspeksi::create([ 'permohonan_id' => $request->input('permohonan_id'), - 'denah_form' => json_encode($formatFotojson) + 'jenis_jaminan_id' => $request->input('jenis_jaminan_id'), + 'denah_form' => json_encode($formatJsonDenah) ]); } return response()->json(['success' => true, 'message' => 'Data berhasil disimpan', - 'data' => $formatJsonDenah], 200); + 'data' => $formatJsonDenah], 200); } catch (Exception $e) { return response()->json(['success' => false, 'message' => 'Data gagal disimpan: ' . $e->getMessage()], 500); } - } @@ -368,20 +383,22 @@ class SurveyorController extends Controller ,'foto_lantai_unit' => $foto_lantai_unit, 'foto_lantai_lainnya' => $foto_lantai_lainnya, 'foto_rute_lainnya' => $foto_rute_lainnya, - 'basement' => $basement, - 'gerbang' => $gerbang, + 'foto_basement' => $basement, + 'foto_gerbang' => $gerbang, 'pendamping' => $pendamping ]; $inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first(); - if ($request->input('permohonan_id') == $inspeksi->permohonan_id && $request->input('jenis_jaminan_id') == $inspeksi->jenis_jaminan_id) { + + if ($inspeksi) { $inspeksi->update([ 'foto_form' => json_encode($formatFotojson) ]); } else { Inspeksi::create([ 'permohonan_id' => $request->input('permohonan_id'), - 'foto_form' => json_encode($formatFotojson) + 'foto_form' => json_encode($formatFotojson), + 'jenis_jaminan_id' => $request->input('jenis_jaminan_id') ]); } @@ -391,19 +408,21 @@ class SurveyorController extends Controller } } - public function submitSurveyor($id,$jaminanId) + + + public function submitSurveyor($id) { try { - $cekButton = $this->checkButtonStatus($id)->getData(); - if (!$cekButton->buttonDisable) { + // $cekButton = $this->checkButtonStatus($id); + // if (!$cekButton->buttonDisable) { $permohonan = Permohonan::find($id); $permohonan->update([ 'status' => 'done', ]); return response()->json(['success' => true, 'message' => 'Form surveyor submitted successfully'], 200); - } else { - return response()->json(['error' => 'Something went wrong'], 400); - } + // } else { + // return response()->json(['error' => 'Something went wrong'], 400); + // } } catch (Exception $e) { return response()->json(['error' => 'Something went wrong', 'message' => $e->getMessage()], 500); } @@ -436,7 +455,11 @@ class SurveyorController extends Controller return response()->json(['buttonDisable' => true]); } } catch (\Exception $e) { - return response()->json(['buttonDisable' => true]); + // return response()->json(['buttonDisable' => true]); + return response()->json([ + 'error' => 'Something went wrong', + 'message' => $e->getMessage() + ], 500); } } @@ -445,35 +468,40 @@ class SurveyorController extends Controller public function storeJadwal(Request $request) { try { - $validate = $request->validate([ 'id' => 'required', 'waktu_penilaian' => 'required', 'deskripsi_penilaian' => 'required' ]); - // return response()->json([ - // 'daa'=>$validate - // ]); + // $user = ['user' => 'rustammajid76@gmail.com']; + + // $emailData = [ + // 'email' => 'rustammajid76@gmail.com', + // 'subject' => 'Test', + // 'emailData' => '

Hello, World!

This is the email content. Waktu Penilaian:

' + // ]; + + // $this->sendMessage($emailData, $user); + $id = $request->input('id'); $penilaian = Penilaian::findOrFail($id); $penilaian->update([ 'waktu_penilaian' => $validate['waktu_penilaian'], 'deskripsi_penilaian' => $validate['deskripsi_penilaian'], - ]); return redirect() ->route('surveyor.index') ->with('success', 'Jadwal berhasil dibuat.'); } catch (\Exception $e) { - return redirect() - ->route('surveyor.index') - ->with('error', 'Gagal membuat jadwal: ' . $e->getMessage()); + return response()->json(['buttonDisable' => $e->getMessage()]); } } + + public function storeAproved($id) { try { @@ -534,7 +562,10 @@ class SurveyorController extends Controller $tingkatKeramaian = TingkatKeramaian::all(); $laluLintasLokasi = LaluLintasLokasi::all(); $perkerasanJalan = PerkerasanJalan::all(); - + $jenisKendaraan = JenisKendaraan::all(); + $jenisKapal = JenisKapal::all(); + $jenisPesawat = JenisPesawat::all(); + $modelAlatBerat = ModelAlatBerat::all(); // return response()->json([ // 'per'=> @@ -571,7 +602,11 @@ class SurveyorController extends Controller 'laluLintasLokasi', 'perkerasanJalan', 'link_url_region', - 'forminspeksi' + 'forminspeksi', + 'jenisKendaraan', + 'jenisKapal', + 'jenisPesawat', + 'modelAlatBerat' )); } @@ -628,7 +663,7 @@ class SurveyorController extends Controller * Data pembanding. */ - public function dataPembanding($id) + public function dataPembanding($id, $jaminanId) { $permohonan = Permohonan::with( [ @@ -646,7 +681,16 @@ class SurveyorController extends Controller $branches = Branch::all(); $provinces = Province::all(); - return view('lpj::surveyor.detail', compact('permohonan', 'surveyor', 'branches', 'provinces')); + + $inpeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first(); + $forminspeksi = null; + if ($inpeksi) { + $forminspeksi = $inpeksi; + // $forminspeksi = json_decode($inpeksi->data_form, true); + } + + // return response()->json($forminspeksi); + return view('lpj::surveyor.components.data-pembanding', compact('permohonan', 'surveyor', 'branches', 'provinces','forminspeksi')); } @@ -731,6 +775,10 @@ class SurveyorController extends Controller 'lantai-unit' => ['Lantai Unit', 'lantai-unit', Lantai::class], 'view-unit' => ['View Unit', 'view-unit', ViewUnit::class], 'gol-mas-sekitar' => ['Golongan Masyarakat Sekitar', 'gol-mas-sekitar', GolonganMasySekitar::class], + 'jenis-pesawat' => ['Jenis Pasawat', 'jenis-pesawat', JenisPesawat::class], + 'model-alat-berat' => ['Model Alat Berat', 'model-alat-berat', ModelAlatBerat::class], + 'jenis-kapal' => ['Jenis Kapal', 'jenis-kapal', JenisKapal::class], + 'jenis-kendaraan' => ['Jenis Kendaraan', 'jenis-kendaraan', JenisKendaraan::class], ]; @@ -878,7 +926,11 @@ class SurveyorController extends Controller 'Golongan Masyarakat Sekitar' => GolonganMasySekitar::class, 'Lantai Unit' => Lantai::class, 'View Unit' => ViewUnit::class, - 'Perkerasan jalan' => PerkerasanJalan::class + 'Perkerasan jalan' => PerkerasanJalan::class, + 'Jenis pesawat' => JenisPesawat::class, + 'Model alat berat' => ModelAlatBerat::class, + 'Jenis kapal' => JenisKapal::class, + 'Jenis kendaraan' => JenisKendaraan::class, ]; @@ -1011,6 +1063,10 @@ class SurveyorController extends Controller 'spek-bangunan' => SpekBangunan::class, 'lantai-unit' => Lantai::class, 'view-unit' => ViewUnit::class, + 'jenis-pesawat' => JenisPesawat::class, + 'model-alat-berat' => ModelAlatBerat::class, + 'jenis-kapal' => JenisKapal::class, + 'jenis-kendaraan' => JenisKendaraan::class, ]; @@ -1038,6 +1094,10 @@ class SurveyorController extends Controller 'golMasySekitar' => GolonganMasySekitar::all(), 'tingkatKeramaian' => TingkatKeramaian::all(), 'laluLintasLokasi' => LaluLintasLokasi::all(), + 'jenisPesawat' => JenisPesawat::all(), + 'modelAlatBerat' => ModelAlatBerat::all(), + 'jenisKapal' => JenisKapal::all(), + 'jenisKendaraan' => JenisKendaraan::all(), ]; } @@ -1060,8 +1120,12 @@ class SurveyorController extends Controller 'spek-bangunan' => ['Spek Bangunan', 'spek-bangunan'], 'lantai-unit' => ['Lantai Unit', 'lantai-unit'], 'view-unit' => ['View Unit', 'view-unit'], - 'perkerasan-jalan' => ['Perkerasan jalan', 'perkerasan-jalan'] - ]; + 'perkerasan-jalan' => ['Perkerasan jalan', 'perkerasan-jalan'], + 'jenis-pesawat' => ['Jenis pesawat', 'jenis-pesawat'], + 'model-alat-berat' => ['Model alat berat', 'model-alat-berat'], + 'jenis-kapal' => ['Jenis kapal', 'jenis-kapal'], + 'jenis-kendaraan' => ['Jenis kendaraan', 'jenis-kendaraan'], + ]; private function getAssetData($data) { @@ -1107,14 +1171,25 @@ class SurveyorController extends Controller private function getBangunanData($data, $request): array { + // $kategori_bangunan = []; + // if ($request->has('spek_kategori_bagunan')) { + // foreach ($request->input('spek_kategori_bagunan', []) as $value) { + // $kategori_bangunan[] = [ + // 'value' => [ + // 'data' => $data['spek_bangunan'] ?? [], + // ], + // ]; + // } + // } + return [ 'luas_tanah_bagunan' => $data['luas_tanah_bagunan'] ?? null, 'jenis_bangunan' => $data['jenis_bangunan'] ?? null, 'kondisi_bangunan' => $data['kondisi_bangunan'] ?? null, 'sifat_bangunan' => $data['sifat_bangunan'] ?? null, - 'sifat_bangunan_input' => $data['sifat_bagunan_input'] ?? null, + 'sifat_bangunan_input' => $data['sifat_bangunan_input'] ?? null, 'spek_kategori_bagunan' => $data['spek_kategori_bagunan'] ?? null, - 'spek_bangunan' => $data['spek_bangunan'] ?? null, + 'spek_bangunan' => $data['spek_bangunan'] ?? [], 'sarana_pelengkap' => $data['sarana_pelengkap'] ?? [], 'sarana_pelengkap_input' => $data['sarana_pelengkap_input'] ?? null, ]; @@ -1154,6 +1229,7 @@ class SurveyorController extends Controller 'fakta_negatif' => $data['fakta_negatif'] ?? null, 'rute_menuju' => $data['rute_menuju'] ?? null, 'batas_batas' => $data['batas_batas'] ?? null, + 'batas_batas_input' => $data['batas_batas_input'] ?? null, 'kondisi_lingkungan' => $data['kondisi_lingkungan'] ?? null, 'kondisi_lain_bangunan' => $data['kondisi_lain_bangunan'] ?? null, 'informasi_dokument' => $data['informasi_dokument'] ?? null, @@ -1210,47 +1286,361 @@ class SurveyorController extends Controller unlink($fullPath); } } - private function getKapalData($data): array + + + private function getKapalData($data, $request): array { return [ - 'keterangan' => $data['keterangan'] + 'action' => $data['action'] ?? null, + 'nama_wakil_debitur' => $data['nama_wakil_debitur'] ?? null, + 'hub_calon_debitur' => $data['hub_calon_debitur'] ?? null, + 'dermaga' => $data['dermaga'] ?? null, + 'desa_kelurahan' => $data['desa_kelurahan'] ?? null, + 'kecamatan' => $data['kecamatan'] ?? null, + 'kota_madya' => $data['kota_madya'] ?? null, + 'provinsi' => $data['provinsi'] ?? null, + 'jenis' => $data['jenis'] ?? null, + 'size' => $data['size'] ?? null, + 'kondisi' => $data['kondisi'] ?? null, + 'klasifikasi' => $data['klasifikasi'] ?? null, + + 'nama_kapal' => $data['nama_kapal'] ?? null, + 'pemilik_kapal' => $data['pemilik_kapal'] ?? null, + 'bendera' => $data['bendera'] ?? null, + 'nomor_selar' => $data['nomor_selar'] ?? null, + 'kapal' => $data['kapal'] ?? null, + 'galangan_kapal' => $data['galangan_kapal'] ?? null, + 'kapal_shipyard' => $data['kapal_shipyard'] ?? null, + 'tahun_pembuatan' => $data['tahun_pembuatan'] ?? null, + 'tahun_launcing' => $data['tahun_launcing'] ?? null, + 'dwt' => $data['dwt'] ?? null, + 'lwt' => $data['lwt'] ?? null, + 'gross_tonnage' => $data['gross_tonnage'] ?? null, + 'net_tonnage' => $data['net_tonnage'] ?? null, + 'tenaga_mesin' => $data['tenaga_mesin'] ?? null, + 'loa' => $data['loa'] ?? null, + 'lbp' => $data['lbp'] ?? null, + 'beam' => $data['beam'] ?? null, + 'depth' => $data['depth'] ?? null, + 'draft' => $data['draft'] ?? null, + + 'lambung_kapal' => $data['lambung_kapal'] ?? null, + 'dek' => $data['dek'] ?? null, + 'struktur_rangka' => $data['struktur_rangka'] ?? null, + 'palka' => $data['palka'] ?? null, + 'pondasi_mesin' => $data['pondasi_mesin'] ?? null, + 'area_mesin' => $data['area_mesin'] ?? null, + 'cat_dan_korosi' => $data['cat_dan_korosi'] ?? null, + 'sistem_pengelasan' => $data['sistem_pengelasan'] ?? null, + 'deskripsi_struktur' => $data['deskripsi_struktur'] ?? null, + + 'sekoci' => $data['sekoci'] ?? null, + 'jaket_pelampung' => $data['jaket_pelampung'] ?? null, + 'alat_pemadaman' => $data['alat_pemadaman'] ?? null, + 'rambu_darurat' => $data['rambu_darurat'] ?? null, + 'sistem_alarm' => $data['sistem_alarm'] ?? null, + 'sistem_pencegah' => $data['sistem_pencegah'] ?? null, + 'kebakaran' => $data['kebakaran'] ?? null, + 'lampu_darurat' => $data['lampu_darurat'] ?? null, + 'deskripsi_peralatan' => $data['deskripsi_peralatan'] ?? null, + + 'gps' => $data['gps'] ?? null, + 'radar' => $data['radar'] ?? null, + 'radio_komunikasi' => $data['radio_komunikasi'] ?? null, + 'lampu_navigasi' => $data['lampu_navigasi'] ?? null, + 'sistem_kendali_otomatis' => $data['sistem_kendali_otomatis'] ?? null, + 'kompas' => $data['kompas'] ?? null, + 'deskripsi_navigasi' => $data['deskripsi_navigasi'] ?? null, + + 'mesin_utama' => $data['mesin_utama'] ?? null, + 'mesin_bantu' => $data['mesin_bantu'] ?? null, + 'pompa_pendingin' => $data['pompa_pendingin'] ?? null, + 'sistem_pelumasan' => $data['sistem_pelumasan'] ?? null, + 'propeller' => $data['propeller'] ?? null, + 'sistem_kelistrikan' => $data['sistem_kelistrikan'] ?? null, + 'deskripsi_mesin_penggerak' => $data['deskripsi_mesin_penggerak'] ?? null, + + 'lampu_navigasi' => $data['lampu_navigasi'] ?? null, + 'sistem_penerangan' => $data['sistem_penerangan'] ?? null, + 'sistem_panel_distribusi' => $data['sistem_panel_distribusi'] ?? null, + 'kabel_perangkat' => $data['kabel_perangkat'] ?? null, + 'deskripsi_kelistrikan' => $data['deskripsi_kelistrikan'] ?? null, + + 'kebersihan_dek_luar' => $data['kebersihan_dek_luar'] ?? null, + 'tangki_limbah' => $data['tangki_limbah'] ?? null, + 'sistem_pengelolaan_limbah' => $data['sistem_pengelolaan_limbah'] ?? null, + 'pengelolaan_air_ballast' => $data['pengelolaan_air_ballast'] ?? null, + 'deskripsi_kebersihan' => $data['deskripsi_kebersihan'] ?? null, + + 'fakta_positif' => $data['fakta_positif'] ?? null, + 'fakta_negatif' => $data['fakta_negatif'] ?? null, + 'analisa_makro' => $data['analisa_makro'] ?? null, + 'kesimpulan' => $data['kesimpulan'] ?? null, + 'catatan' => $data['catatan'] ?? null, + ]; + } + public function getKendaraanData($data, $request): array + { + return [ + 'action' => $data['action'] ?? null, + 'tanggal_survey' => $data['tanggal_survey'] ?? null, + 'nama_wakil' => $data['nama_wakil'] ?? null, + 'hub_calon_debitur' => $data['hub_calon_debitur'] ?? null, + 'nama_jalan' => $data['nama_jalan'] ?? null, + 'perumahan_gang' => $data['perumahan_gang'] ?? null, + 'blok_nomor' => $data['blok_nomor'] ?? null, + 'desa_kelurahan' => $data['desa_kelurahan'] ?? null, + 'kecamatan' => $data['kecamatan'] ?? null, + 'kota_madya' => $data['kota_madya'] ?? null, + 'provinsi' => $data['provinsi'] ?? null, + 'kondisi' => $data['kondisi'] ?? null, + 'nomor_polisi' => $data['nomor_polisi'] ?? null, + 'nomor_polis_tidak_sesuai' => $data['nomor_polis_tidak_sesuai'] ?? null, + 'merek' => $data['merek'] ?? null, + 'merek_tidak_sesuai' => $data['merek_tidak_sesuai'] ?? null, + 'warna' => $data['warna'] ?? null, + 'warna_tidak_sesuai' => $data['warna_tidak_sesuai'] ?? null, + 'nomor_rangka' => $data['nomor_rangka'] ?? null, + 'nomor_rangka_tidak_sesuai' => $data['nomor_rangka_tidak_sesuai'] ?? null, + 'nomor_mesin' => $data['nomor_mesin'] ?? null, + 'nomor_mesin_tidak_sesuai' => $data['nomor_mesin_tidak_sesuai'] ?? null, + 'posisi_kilometer' => $data['posisi_kilometer'] ?? null, + 'transmisi' => $data['transmisi'] ?? null, + + + 'mesin_panel_instrument' => $data['mesin_panel_instrument'] ?? null, + 'fungsi_mesin_panel_instrument' => $data['fungsi_mesin_panel_instrument'] ?? null, + 'interior' => $data['interior'] ?? null, + 'interior' => $data['interior'] ?? null, + + 'jumlah_pintu' => $data['jumlah_pintu'] ?? null, + 'rangka_karoseri' => $data['rangka_karoseri'] ?? null, + 'ban' => $data['ban'] ?? null, + 'velg' => $data['velg'] ?? null, + 'bamper_depan' => $data['bamper_depan'] ?? null, + 'bamper_belakang' => $data['bamper_belakang'] ?? null, + 'lampu_depan' => $data['lampu_depan'] ?? null, + 'lampu_belakang' => $data['lampu_belakang'] ?? null, + 'kaca_kendaraan' => $data['kaca_kendaraan'] ?? null, + 'air_conditioner' => $data['air_conditioner'] ?? null, + 'tape_radio_cd' => $data['tape_radio_cd'] ?? null, + 'sensor_parkir' => $data['sensor_parkir'] ?? null, + 'sensor_camera_recorder' => $data['sensor_camera_recorder'] ?? null, + 'lcd' => $data['lcd'] ?? null, + 'sabuk_keselamatan' => $data['sabuk_keselamatan'] ?? null, + 'airbag' => $data['airbag'] ?? null, + 'asuransi' => $data['asuransi'] ?? null, + 'perusahaan_asuransi' => $data['perusahaan_asuransi'] ?? null, + 'tahun_berakhir' => $data['tahun_berakhir'] ?? null, + + + 'fakta_positif' => $data['fakta_positif'] ?? null, + 'fakta_negatif' => $data['fakta_negatif'] ?? null, + 'analisa_makro' => $data['analisa_makro'] ?? null, + 'kesimpulan' => $data['kesimpulan'] ?? null, + 'catatan' => $data['catatan'] ?? null, ]; } - private function getKendaraanData($data): array + public function getMesinData($data, $request): array { return [ - 'keterangan' => $data['keterangan'] + 'action' => $data['action'] ?? null, + 'nama_wakil' => $data['nama_wakil'] ?? null, + 'nama_jalan' => $data['nama_jalan'] ?? null, + 'perumahan_gang' => $data['perumahan_gang'] ?? null, + 'blok' => $data['blok'] ?? null, + 'desa_kelurahan' => $data['desa_kelurahan'] ?? null, + 'kecamatan' => $data['kecamatan'] ?? null, + 'kota_madya' => $data['kota_madya'] ?? null, + 'provinsi' => $data['provinsi'] ?? null, + 'hub_calon_debitur' => $data['hub_calon_debitur'] ?? null, + 'tipe_model' => $data['tipe_model'] ?? null, + 'merek' => $data['merek'] ?? null, + 'tahun_pembuatan' => $data['tahun_pembuatan'] ?? null, + 'negara_pembuat' => $data['negara_pembuat'] ?? null, + 'kondisi_mesin' => $data['kondisi_mesin'] ?? null, + 'faktor_positif' => $data['faktor_positif'] ?? null, + 'faktor_negatif' => $data['faktor_negatif'] ?? null, + 'kesimpulan' => $data['kesimpulan'] ?? null, + 'catatan' => $data['catatan'] ?? null, ]; } - private function getMesinData($data): array + public function getAlatBeratData($data, $request): array { return [ - 'keterangan' => $data['keterangan'] + 'action' => $data['action'] ?? null, + 'tanggal_survey' => $data['tanggal_survey'] ?? null, + 'nama_wakil' => $data['nama_wakil'] ?? null, + 'hub_calon_debitur' => $data['hub_calon_debitur'] ?? null, + 'dengan_wadeb' => $data['dengan_wadeb'] ?? null, + 'nama_jalan' => $data['nama_jalan'] ?? null, + 'perumahan_gang' => $data['perumahan_gang'] ?? null, + 'blok' => $data['blok'] ?? null, + 'desa_kelurahan' => $data['desa_kelurahan'] ?? null, + 'kecamatan' => $data['kecamatan'] ?? null, + 'kota_madya' => $data['kota_madya'] ?? null, + 'provinsi' => $data['provinsi'] ?? null, + 'jenis_model' => $data['jenis_model'] ?? null, + 'nomor_lambung' => $data['nomor_lambung'] ?? null, + 'model_unit' => $data['model_unit'] ?? null, + 'tahun_pembuatan' => $data['tahun_pembuatan'] ?? null, + 'merk' => $data['merk'] ?? null, + 'negara_pembuat' => $data['negara_pembuat'] ?? null, + 'tahun_pembelian' => $data['tahun_pembelian'] ?? null, + 'nomor_faktur' => $data['nomor_faktur'] ?? null, + 'nomor_kontrak' => $data['nomor_kontrak'] ?? null, + 'nama_pemilik' => $data['nama_pemilik'] ?? null, + 'alamat_pemilik' => $data['alamat_pemilik'] ?? null, + 'nomor_asuransi' => $data['nomor_asuransi'] ?? null, + 'nomor_rangka' => $data['nomor_rangka'] ?? null, + 'nomor_mesin' => $data['nomor_mesin'] ?? null, + 'hour_mesters' => $data['hour_mesters'] ?? null, + 'overhaul_mesin' => $data['overhaul_mesin'] ?? null, + + 'mesin_panel' => $data['mesin_panel'] ?? null, + 'fungsi_panel' => $data['fungsi_panel'] ?? null, + 'interior' => $data['interior'] ?? null, + 'rangka_Karoseri' => $data['rangka_Karoseri'] ?? null, + 'ban' => $data['ban'] ?? null, + 'velg' => $data['velg'] ?? null, + 'air_conditioner' => $data['air_conditioner'] ?? null, + 'aksesoris' => $data['aksesoris'] ?? null, + 'lcd' => $data['lcd'] ?? null, + 'perlengkapan' => $data['perlengkapan'] ?? null, + 'asuransi' => $data['asuransi'] ?? null, + 'perusahaan_asuransi' => $data['perusahaan_asuransi'] ?? null, + 'tahun_berakhir' => $data['tahun_berakhir'] ?? null, + 'sensor_kamera' => $data['sensor_kamera'] ?? null, + 'sabuk_keselamatan' => $data['sabuk_keselamatan'] ?? null, + 'air_bag' => $data['air_bag'] ?? null, + + 'faktor_positif' => $data['faktor_positif'] ?? null, + 'faktor_negatif' => $data['faktor_negatif'] ?? null, + 'kesimpulan' => $data['kesimpulan'] ?? null, + 'catatan' => $data['catatan'] ?? null, ]; } - private function getPesawatData($data): array + private function getPesawatData($data, $request): array { return [ - 'keterangan' => $data['keterangan'] + 'action' => $data['action'] ?? null, + 'tanggal_survey' => $data['tanggal_survey'] ?? null, + 'nama_wakil' => $data['nama_wakil'] ?? null, + 'hub_calon_debitur' => $data['hub_calon_debitur'] ?? null, + 'bandara' => $data['bandara'] ?? null, + 'desa_kelurahan' => $data['desa_kelurahan'] ?? null, + 'kecamatan' => $data['kecamatan'] ?? null, + 'kota_madya' => $data['kota_madya'] ?? null, + 'provinsi' => $data['provinsi'] ?? null, + + 'jenis_pesawat' => $data['jenis_pesawat'] ?? null, + 'size' => $data['size'] ?? null, + 'kondisi' => $data['kondisi'] ?? null, + 'nama_pesawat' => $data['nama_pesawat'] ?? null, + 'model' => $data['model'] ?? null, + 'nomor_registrasi' => $data['nomor_registrasi'] ?? null, + 'tahun_pembuatan' => $data['tahun_pembuatan'] ?? null, + 'certificate_of_airworthines' => $data['certificate_of_airworthines'] ?? null, + 'certificate_of_registration' => $data['certificate_of_registration'] ?? null, + 'total_service_hours' => $data['total_service_hours'] ?? null, + 'total_service_cycles' => $data['total_service_cycles'] ?? null, + + 'last_a_check' => $data['last_a_check'] ?? null, + 'next_a_check' => $data['next_a_check'] ?? null, + 'last_b_check' => $data['last_b_check'] ?? null, + 'next_b_check' => $data['next_b_check'] ?? null, + 'last_c_check' => $data['last_c_check'] ?? null, + 'next_c_check' => $data['next_c_check'] ?? null, + 'next_d_check' => $data['next_d_check'] ?? null, + 'last_d_check' => $data['last_d_check'] ?? null, + 'deskripsi_maintenence' => $data['deskripsi_maintenence'] ?? null, + + 'instrument_landing_system' => $data['instrument_landing_system'] ?? null, + 'traffic_collision_avoidance_system' => $data['traffic_collision_avoidance_system'] ?? null, + 'windshear' => $data['windshear'] ?? null, + 'electronic_flight' => $data['electronic_flight'] ?? null, + 'winglets' => $data['winglets'] ?? null, + 'deskripsi_konfigurasi' => $data['deskripsi_konfigurasi'] ?? null, + + 'maksimal_penumpang' => $data['maksimal_penumpang'] ?? null, + 'jumlah_kursi' => $data['jumlah_kursi'] ?? null, + 'kursi_pramugari_pramugara' => $data['kursi_pramugari_pramugara'] ?? null, + 'kartu_fitur_keselamatan' => $data['kartu_fitur_keselamatan'] ?? null, + 'sabuk_pengaman' => $data['sabuk_pengaman'] ?? null, + 'lampu_kabin' => $data['lampu_kabin'] ?? null, + 'lampu_pintu_keluar' => $data['lampu_pintu_keluar'] ?? null, + 'intercom_kabin' => $data['intercom_kabin'] ?? null, + 'deskripsi_kabin' => $data['deskripsi_kabin'] ?? null, + + 'badan_pesawat' => $data['badan_pesawat'] ?? null, + 'sayap_pesawat' => $data['sayap_pesawat'] ?? null, + 'ekor_pesawat' => $data['ekor_pesawat'] ?? null, + 'landing_gear' => $data['landing_gear'] ?? null, + 'sistem_pengelasan' => $data['sistem_pengelasan'] ?? null, + 'deskripsi_struktur' => $data['deskripsi_struktur'] ?? null, + + 'gps' => $data['gps'] ?? null, + 'radar' => $data['radar'] ?? null, + 'radio_komunikasi' => $data['radio_komunikasi'] ?? null, + 'lampu_navigasi' => $data['lampu_navigasi'] ?? null, + 'sistem_autopilot' => $data['sistem_autopilot'] ?? null, + 'deskripsi_navigasi' => $data['deskripsi_navigasi'] ?? null, + + 'tangki_bahan_bakar' => $data['tangki_bahan_bakar'] ?? null, + 'saluran_pipa_bahan_bakar' => $data['saluran_pipa_bahan_bakar'] ?? null, + 'pompa_bahan_bakar' => $data['pompa_bahan_bakar'] ?? null, + 'sistem_hidrolik_utama' => $data['sistem_hidrolik_utama'] ?? null, + 'sistem_pendigin_hidrolik' => $data['sistem_pendigin_hidrolik'] ?? null, + 'deskripsi_hidrolik' => $data['deskripsi_hidrolik'] ?? null, + + 'mesin_utama' => $data['mesin_utama'] ?? null, + 'sistem_pendorong' => $data['sistem_pendorong'] ?? null, + 'sistem_pendigin_mesin' => $data['sistem_pendigin_mesin'] ?? null, + 'sistem_pelumasan' => $data['sistem_pelumasan'] ?? null, + 'filter_dan_perangkat_pendukung' => $data['filter_dan_perangkat_pendukung'] ?? null, + 'deskripsi_kondisi_mesin' => $data['deskripsi_kondisi_mesin'] ?? null, + + 'jaket_pelampung' => $data['jaket_pelampung'] ?? null, + 'pintu_darurat' => $data['pintu_darurat'] ?? null, + 'alat_pemadaman_kebakaran' => $data['alat_pemadaman_kebakaran'] ?? null, + 'sistem_alaram_darurat' => $data['sistem_alaram_darurat'] ?? null, + 'sekoci' => $data['sekoci'] ?? null, + 'masker_oxigen' => $data['masker_oxigen'] ?? null, + 'sabuk_pengaman' => $data['sabuk_pengaman'] ?? null, + 'deskripsi_fungsi_keselamatan' => $data['deskripsi_fungsi_keselamatan'] ?? null, + + 'sistem_ventilasi_ac' => $data['sistem_ventilasi_ac'] ?? null, + 'sistem_penerangan_kabin' => $data['sistem_penerangan_kabin'] ?? null, + 'panel_informasi_penumpang' => $data['panel_informasi_penumpang'] ?? null, + 'sistem_hiburan_kabin' => $data['sistem_hiburan_kabin'] ?? null, + 'deskripsi_Interior' => $data['deskripsi_Interior'] ?? null, + + // Validasi untuk faktor dan kesimpulan + 'faktor_positif' => $data['faktor_positif'] ?? null, + 'faktor_negatif' => $data['faktor_negatif'] ?? null, + 'kesimpulan' => $data['kesimpulan'] ?? null, + 'catatan' => $data['catatan'] ?? null, ]; } - private function getAlatBeratData($data): array - { - return [ - 'keterangan' => $data['keterangan'] - ]; - } - private function getUnitData($data): array + private function getUnitData($data, $request): array { return [ - 'keterangan' => $data['keterangan'] + 'action' => $data['action'] ?? null, + 'luas_unit' => $data['luas_unit'] ?? null, + 'luas_unit_tidak_sesuai' => $data['luas_unit_tidak_sesuai'] ?? null, + 'jenis_unit' => $data['jenis_unit'] ?? null, + 'kondisi_unit' => $data['kondisi_unit'] ?? null, + 'posisi_unit' => $data['posisi_unit'] ?? null, + 'lantai' => $data['lantai'] ?? null, + 'view' => $data['view'] ?? null, + 'bentuk_unit' => $data['bentuk_unit'] ?? null, ]; } diff --git a/app/Http/Requests/FormSurveyorRequest.php b/app/Http/Requests/FormSurveyorRequest.php index d724c72..719b695 100644 --- a/app/Http/Requests/FormSurveyorRequest.php +++ b/app/Http/Requests/FormSurveyorRequest.php @@ -38,8 +38,8 @@ class FormSurveyorRequest extends FormRequest 'kapal' => $this->getKapalRules(), 'kendaraan' => $this->getKendaraanRules(), 'mesin' => $this->getMesinRules(), - 'pesawat' => $this->getLinkunganRules(), - 'alat-berat' => $this->getLinkunganRules(), + 'pesawat' => $this->getPesawatRules(), + 'alat-berat' => $this->getAlatBeratRules(), 'apartemen-kantor' => $this->getUnitRules(), 'lingkungan' => $this->getLinkunganRules(), 'fakta' => $this->getCommonRules(), @@ -51,7 +51,7 @@ class FormSurveyorRequest extends FormRequest foreach ($pisah as $act) { if (isset($allRules[$act])) { $rules = array_merge($rules, $allRules[$act]); - if ($act == 'tanah' || $act == 'bangunan') { + if ($act == 'tanah' || $act == 'bangunan' || $act == 'apartemen-kantor') { $hasAssetDescriptionRules = true; } } @@ -162,8 +162,91 @@ class FormSurveyorRequest extends FormRequest { return [ 'action' => 'required', - 'kondisi_kapal' => 'required', - 'kondisi_kapal_lain' => 'required', + 'nama_wakil_debitur' => 'required', + 'hub_calon_debitur' => 'required', + 'dermaga' => 'required', + 'desa_kelurahan' => 'required', + 'kecamatan' => 'required', + 'kota_madya' => 'required', + 'provinsi' => 'required', + 'jenis.*' => 'required', + 'size.*' => 'required', + 'kondisi.*' => 'required', + 'klasifikasi.*' => 'required', + + 'nama_kapal' => 'required', + 'pemilik_kapal' => 'required', + 'bendera' => 'required', + 'nomor_selar' => 'required', + 'kapal' => 'required', + 'galangan_kapal' => 'required', + 'kapal_shipyard' => 'required', + 'tahun_pembuatan' => 'required', + 'tahun_launcing' => 'required', + 'dwt' => 'required', + 'lwt' => 'required', + 'gross_tonnage' => 'required', + 'net_tonnage' => 'required', + 'tenaga_mesin' => 'required', + 'loa' => 'required', + 'lbp' => 'required', + 'beam' => 'required', + 'depth' => 'required', + 'draft' => 'required', + + 'lambung_kapal' => 'required', + 'dek' => 'required', + 'struktur_rangka' => 'required', + 'palka' => 'required', + 'pondasi_mesin' => 'required', + 'area_mesin' => 'required', + 'cat_dan_korosi' => 'required', + 'sistem_pengelasan' => 'required', + 'deskripsi_struktur' => 'required', + + 'sekoci' => 'required', + 'jaket_pelampung' => 'required', + 'alat_pemadaman' => 'required', + 'rambu_darurat' => 'required', + 'sistem_alarm' => 'required', + 'sistem_pencegah' => 'required', + 'kebakaran' => 'required', + 'lampu_darurat' => 'required', + 'deskripsi_peralatan' => 'required', + + 'gps' => 'required', + 'radar' => 'required', + 'radio_komunikasi' => 'required', + 'lampu_navigasi' => 'required', + 'sistem_kendali_otomatis' => 'required', + 'kompas' => 'required', + 'deskripsi_navigasi' => 'required', + + 'mesin_utama' => 'required', + 'mesin_bantu' => 'required', + 'pompa_pendingin' => 'required', + 'sistem_pelumasan' => 'required', + 'propeller' => 'required', + 'sistem_kelistrikan' => 'required', + 'deskripsi_mesin_penggerak' => 'required', + + 'lampu_navigasi' => 'required', + 'sistem_penerangan' => 'required', + 'sistem_panel_distribusi' => 'required', + 'kabel_perangkat' => 'required', + 'deskripsi_kelistrikan' => 'required', + + 'kebersihan_dek_luar' => 'required', + 'tangki_limbah' => 'required', + 'sistem_pengelolaan_limbah' => 'required', + 'pengelolaan_air_ballast' => 'required', + 'deskripsi_kebersihan' => 'required', + + 'fakta_positif.*' => 'nullable', + 'fakta_negatif.*' => 'nullable', + 'analisa_makro.*' => 'nullable', + 'kesimpulan.*' => 'nullable', + 'catatan.*' => 'nullable', ]; } @@ -171,8 +254,56 @@ class FormSurveyorRequest extends FormRequest { return [ 'action' => 'required', - 'kondisi_kendaraan' => 'required', - 'kondisi_kendaraan_lain' => 'required', + 'tanggal_survey' => 'required', + 'nama_wakil' => 'required', + 'hub_calon_debitur' => 'required', + 'nama_jalan' => 'required', + 'perumahan_gang' => 'required', + 'blok_nomor' => 'required', + 'desa_kelurahan' => 'required', + 'kecamatan' => 'required', + 'kota_madya' => 'required', + 'provinsi' => 'required', + 'kondisi' => 'required', + 'nomor_polisi' => 'required', + 'nomor_polis_tidak_sesuai' => 'nullable', + 'merek' => 'required', + 'merek_tidak_sesuai' => 'nullable', + 'warna' => 'required', + 'warna_tidak_sesuai' => 'nullable', + 'nomor_rangka' => 'required', + 'nomor_rangka_tidak_sesuai' => 'nullable', + 'nomor_mesin' => 'required', + 'nomor_mesin_tidak_sesuai' => 'nullable', + 'posisi_kilometer' => 'required', + 'transmisi' => 'required', + 'mesin_panel_instrument.*' => 'required', + 'fungsi_mesin_panel_instrument.*' => 'required', + 'interior.*' => 'required', + 'jumlah_pintu.*' => 'required', + 'rangka_karoseri.*' => 'required', + 'ban.*' => 'required', + 'velg.*' => 'required', + 'bamper_depan.*' => 'required', + 'bamper_belakang.*' => 'required', + 'lampu_depan.*' => 'required', + 'lampu_belakang.*' => 'required', + 'kaca_kendaraan.*' => 'required', + 'air_conditioner.*' => 'required', + 'tape_radio_cd.*' => 'required', + 'sensor_parkir.*' => 'required', + 'sensor_camera_recorder.*' => 'required', + 'lcd.*' => 'required', + 'sabuk_keselamatan.*' => 'required', + 'airbag.*' => 'required', + 'asuransi.*' => 'required', + 'perusahaan_asuransi' => 'required', + 'tahun_berakhir' => 'required', + 'fakta_positif.*' => 'nullable', + 'fakta_negatif.*' => 'nullable', + 'analisa_makro.*' => 'nullable', + 'kesimpulan.*' => 'nullable', + 'catatan.*' => 'nullable', ]; } @@ -181,8 +312,24 @@ class FormSurveyorRequest extends FormRequest { return [ 'action' => 'required', - 'kondisi_mesin' => 'required', - 'kondisi_mesin_lain' => 'required', + 'nama_wakil' => 'required', + 'nama_jalan' => 'required', + 'perumahan_gang' => 'required', + 'blok' => 'required', + 'desa_kelurahan' => 'required', + 'kecamatan' => 'required', + 'kota_madya' => 'required', + 'provinsi' => 'required', + 'hub_calon_debitur' => 'required', + 'tipe_model' => 'required', + 'merek' => 'required', + 'tahun_pembuatan' => 'required', + 'negara_pembuat' => 'required', + 'kondisi_mesin' => 'required', + 'faktor_positif' => 'nullable', + 'faktor_negatif' => 'nullable', + 'kesimpulan' => 'nullable', + 'catatan' => 'nullable', ]; } @@ -191,12 +338,173 @@ class FormSurveyorRequest extends FormRequest { return [ 'action' => 'required', - 'kondisi_alat_berat' => 'required', - 'kondisi_alat_berat_lain' => 'required', + 'tanggal_survey' => 'required', + 'nama_wakil' => 'required', + 'hub_calon_debitur' => 'required', + 'dengan_wadeb' => 'required', + 'nama_jalan' => 'required', + 'perumahan_gang' => 'required', + 'blok' => 'required', + 'desa_kelurahan' => 'required', + 'kecamatan' => 'required', + 'kota_madya' => 'required', + 'provinsi' => 'required', + 'jenis_model' => 'required', + 'nomor_lambung' => 'required', + 'model_unit' => 'required', + 'tahun_pembuatan' => 'required', + 'merk' => 'required', + 'negara_pembuat' => 'required', + 'tahun_pembelian' => 'required', + 'nomor_faktur' => 'nullable', + 'nomor_kontrak' => 'nullable', + 'nama_pemilik' => 'nullable', + 'alamat_pemilik' => 'nullable', + 'nomor_asuransi' => 'nullable', + 'nomor_rangka' => 'nullable', + 'nomor_mesin' => 'nullable', + 'hour_mesters' => 'nullable', + 'overhaul_mesin' => 'nullable', + 'mesin_panel.*' => 'nullable', + 'fungsi_panel.*' => 'nullable', + 'interior.*' => 'nullable', + 'rangka_Karoseri.*' => 'nullable', + 'ban.*' => 'nullable', + 'velg.*' => 'nullable', + 'air_conditioner.*' => 'nullable', + 'aksesoris.*' => 'nullable', + 'lcd.*' => 'nullable', + 'perlengkapan.*' => 'nullable', + 'asuransi.*' => 'nullable', + 'perusahaan_asuransi.*' => 'nullable', + 'tahun_berakhir.*' => 'nullable', + 'sensor_kamera.*' => 'nullable', + 'lcd.*' => 'nullable', + 'sabuk_keselamatan.*' => 'nullable', + 'air_bag.*' => 'nullable', + 'asuransi.*' => 'nullable', + 'perusahan_asuransi' => 'nullable', + 'tahun_berakhir' => 'nullable', + 'faktor_positif' => 'nullable', + 'faktor_negatif' => 'nullable', + 'kesimpulan' => 'nullable', + 'catatan' => 'nullable', ]; } + + private function getPesawatRules(): array + { + return [ + 'action' => 'required', + 'tanggal_survey' => 'required', + 'nama_wakil' => 'required', + 'hub_calon_debitur' => 'required', + 'bandara' => 'required', + 'desa_kelurahan' => 'required', + 'kecamatan' => 'required', + 'kota_madya' => 'required', + 'provinsi' => 'required', + + 'jenis_pesawat' => 'required', + 'size' => 'required', + 'kondisi' => 'required', + 'nama_pesawat' => 'required', + 'model' => 'required', + 'nomor_registrasi' => 'required', + 'tahun_pembuatan' => 'required', + 'certificate_of_airworthines' => 'required', + 'certificate_of_registration' => 'required', + 'total_service_hours' => 'required', + 'total_service_cycles' => 'required', + + 'last_a_check' => 'required', + 'next_a_check' => 'required', + 'last_b_check' => 'required', + 'next_b_check' => 'required', + 'last_c_check' => 'required', + 'next_c_check' => 'required', + 'next_d_check' => 'required', + 'last_d_check' => 'required', + 'deskripsi_maintenence' => 'nullable', + + 'instrument_landing_system' => 'required', + 'traffic_collision_avoidance_system' => 'required', + 'windshear' => 'required', + 'electronic_flight' => 'required', + 'winglets' => 'required', + 'deskripsi_konfigurasi' => 'required', + + + 'maksimal_penumpang' => 'required', + 'jumlah_kursi' => 'required', + 'kursi_pramugari_pramugara' => 'required', + 'kartu_fitur_keselamatan' => 'required', + 'sabuk_pengaman' => 'required', + 'lampu_kabin' => 'required', + 'lampu_pintu_keluar' => 'required', + 'intercom_kabin' => 'required', + 'deskripsi_kabin' => 'required', + + + 'badan_pesawat' => 'required', + 'sayap_pesawat' => 'required', + 'ekor_pesawat' => 'required', + 'landing_gear' => 'required', + 'sabuk_pengaman' => 'required', + 'sistem_pengelasan' => 'required', + 'deskripsi_struktur' => 'required', + + 'gps' => 'required', + 'radar' => 'required', + 'radio_komunikasi' => 'required', + 'lampu_navigasi' => 'required', + 'sistem_autopilot' => 'required', + 'deskripsi_navigasi' => 'required', + + 'tangki_bahan_bakar' => 'required', + 'saluran_pipa_bahan_bakar' => 'required', + 'pompa_bahan_bakar' => 'required', + 'sistem_hidrolik_utama' => 'required', + 'sistem_pendigin_hidrolik' => 'required', + 'deskripsi_hidrolik' => 'required', + + 'mesin_utama' => 'required', + 'sistem_pendorong' => 'required', + 'sistem_pendigin_mesin' => 'required', + 'sistem_pelumasan' => 'required', + 'filter_dan_perangkat_pendukung' => 'required', + 'deskripsi_kondisi_mesin' => 'required', + + + 'jaket_pelampung' => 'required', + 'pintu_darurat' => 'required', + 'alat_pemadaman_kebakaran' => 'required', + 'sistem_alaram_darurat' => 'required', + 'sekoci' => 'required', + 'masker_oxigen' => 'required', + 'sabuk_pengaman' => 'required', + 'deskripsi_fungsi_keselamatan' => 'required', + + + 'sistem_ventilasi_ac' => 'required', + 'sistem_penerangan_kabin' => 'required', + 'panel_informasi_penumpang' => 'required', + 'sistem_hiburan_kabin' => 'required', + 'deskripsi_Interior' => 'required', + + + + 'faktor_positif.*' => 'nullable', + 'faktor_negatif.*' => 'nullable', + 'kesimpulan.*' => 'nullable', + 'catatan.*' => 'nullable', + + + ]; + } + private function getAssetDescriptionRules(): array { return [ @@ -229,6 +537,7 @@ class FormSurveyorRequest extends FormRequest 'fakta_negatif' => 'nullable|array', 'rute_menuju' => 'nullable', 'batas_batas' => 'nullable|array', + 'batas_batas_input' => 'nullable|array', 'kondisi_lingkungan' => 'nullable|array', 'kondisi_lain_bangunan' => 'nullable|array', 'informasi_dokument' => 'nullable', diff --git a/app/Http/Requests/ProsesPenawaranRequest.php b/app/Http/Requests/ProsesPenawaranRequest.php new file mode 100644 index 0000000..9b31000 --- /dev/null +++ b/app/Http/Requests/ProsesPenawaranRequest.php @@ -0,0 +1,85 @@ + 'exists:kjpp,id', + 'tujuan_penilaian_kjpp_id' => 'required', + 'jenis_laporan_id' => 'required', + 'start_date' => 'required', + 'end_date' => 'required', + 'catatan' => 'nullable' + ]; + + // if ($this->method() == 'PUT') { + // $rules['code'] = 'required|max:50'; + // } else { + // $rules['code'] = 'required|max:50|unique:penawaran,code'; + // } + + return $rules; + } + + /** + * Determine if the user is authorized to make this request. + */ + public function authorize(): bool + { + return true; + } + + public function messages(): array + { + return [ + 'code.required' => 'Kode Penawaran Wajib diisi!', + 'code.max' => 'Kode Penawaran maksimal 255 huruf!', + 'code.unique' => 'Kode Penawaran tidak boleh sama!', + 'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!', + 'jenis_laporan_id.required' => 'Jenis Laporan Wajib diisi!', + 'start_date.required' => 'Tanggal Awal Wajib diisi!', + 'end_date.required' => 'Tanggal Akhir Wajib diisi!', + ]; + } + + public function withValidator($validator) + { + $validator->after(function ($validator) { + $startDate = strtotime($this->input('start_date')); + $endDate = strtotime($this->input('end_date')); + $today = strtotime(date('Y-m-d')); + + // Jika dalam keadaan tambah penawaran maka munculkan pesan ini + // if ($this->method() !== 'PUT') { + // if ($startDate < $today) { + // $validator->errors()->add('start_date', 'Tanggal Awal tidak boleh sebelum hari ini.'); + // } + // } + + if ($endDate < $startDate) { + $validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.'); + } + + + // Validasi minimal 3 pilihan pada nama_kjpp + $namaKjpp = $this->input('kjpp', []); + + // jika nama KJPP itu kosong + if (empty($namaKjpp)) { + $validator->errors()->add('kjpp', 'Nama KJPP wajib diisi.'); + } + // jika terisi kurang dari 3 item + elseif (is_array($namaKjpp) && count($namaKjpp) < 3) { + $validator->errors()->add('kjpp', 'Nama KJPP minimal 3 pilihan.'); + } + }); + } +} diff --git a/app/Http/Requests/SurveyorRequest.php b/app/Http/Requests/SurveyorRequest.php index 0762ad9..b6b1791 100644 --- a/app/Http/Requests/SurveyorRequest.php +++ b/app/Http/Requests/SurveyorRequest.php @@ -28,6 +28,10 @@ class SurveyorRequest extends FormRequest 'spek-bangunan' => 'spek_bangunan', 'lantai-unit' => 'lantai', 'view-unit' => 'view_unit', + 'jenis-pesawat' => 'jenis_pesawat', + 'model-alat-berat' => 'model_alat_berat', + 'jenis-kapal' => 'jenis_kapal', + 'jenis-kendaraan' => 'jenis_kendaraan', ]; /** diff --git a/app/Models/JenisKapal.php b/app/Models/JenisKapal.php new file mode 100644 index 0000000..169d29d --- /dev/null +++ b/app/Models/JenisKapal.php @@ -0,0 +1,24 @@ +belongsTo(Team::class, 'team_id', 'id'); + return $this->belongsTo(Teams::class, 'team_id', 'id'); } public function penilaian(){ diff --git a/database/migrations/2024_11_20_042242_create_jenis_kendaraan_table.php b/database/migrations/2024_11_20_042242_create_jenis_kendaraan_table.php new file mode 100644 index 0000000..6a6403e --- /dev/null +++ b/database/migrations/2024_11_20_042242_create_jenis_kendaraan_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('jenis_kendaraan'); + } +}; diff --git a/database/migrations/2024_11_20_042337_create_model_alat_berat_table.php b/database/migrations/2024_11_20_042337_create_model_alat_berat_table.php new file mode 100644 index 0000000..7176863 --- /dev/null +++ b/database/migrations/2024_11_20_042337_create_model_alat_berat_table.php @@ -0,0 +1,36 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('model_alat_berat'); + } +}; diff --git a/database/migrations/2024_11_20_042453_create_jenis_pesawat_table.php b/database/migrations/2024_11_20_042453_create_jenis_pesawat_table.php new file mode 100644 index 0000000..9cf0c61 --- /dev/null +++ b/database/migrations/2024_11_20_042453_create_jenis_pesawat_table.php @@ -0,0 +1,36 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('jenis_pesawat'); + } +}; diff --git a/database/migrations/2024_11_20_042545_create_jenis_kapal_table.php b/database/migrations/2024_11_20_042545_create_jenis_kapal_table.php new file mode 100644 index 0000000..3be6b80 --- /dev/null +++ b/database/migrations/2024_11_20_042545_create_jenis_kapal_table.php @@ -0,0 +1,37 @@ +id(); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true); + $table->char('authorized_status', 1)->nullable(); + $table->timestamps(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('jenis_kapal'); + } +}; diff --git a/module.json b/module.json index 4f82cdf..9e3a069 100644 --- a/module.json +++ b/module.json @@ -36,14 +36,6 @@ "permission": "", "roles": ["administrator", "admin"], "sub": [ - { - "title": "Data Penawaran", - "path": "tender.penawaran", - "classes": "", - "attributes": [], - "permission": "", - "roles": ["administrator", "admin"] - }, { "title": "Data Proses Penawaran", "path": "tender.prosespenawaran", @@ -567,9 +559,39 @@ "attributes": [], "permission": "", "roles": ["administrator","surveyor"] + }, + { + "title": "Jenis Pesawat", + "path": "basicdata.jenis-pesawat", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + { + "title": "Jenis kapal", + "path": "basicdata.jenis-kapal", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + { + "title": "Jenis Kendaraan", + "path": "basicdata.jenis-kendaraan", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] + }, + { + "title": "Model Alat Berat", + "path": "basicdata.model-alat-berat", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["administrator","surveyor"] } - - ] } ], diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php index 4ed5286..3884136 100644 --- a/resources/views/activity/progres_activity/index.blade.php +++ b/resources/views/activity/progres_activity/index.blade.php @@ -210,7 +210,11 @@ }, due_date: { title: 'Due Date', - render: (item, data) => `${data.due_date || ''}`, + render: (item, data) => { + const mulai = new Date(data.permohonan.created_at); + const selesai = new Date(data.tanggal_kunjungan) + return `${mulai.getDate()}-${mulai.getMonth() + 1}-${mulai.getFullYear()} - ${selesai.getDate()}-${selesai.getMonth() + 1}-${selesai.getFullYear()}` + }, }, paparan: { title: 'Paparan', @@ -236,6 +240,11 @@ }); }); + + + + + function formatDateFromISO(isoDateString) { const date = new Date(isoDateString); const day = String(date.getDate()).padStart(2, '0'); diff --git a/resources/views/jenis_jaminan/create.blade.php b/resources/views/jenis_jaminan/create.blade.php index a12b7ee..382377f 100644 --- a/resources/views/jenis_jaminan/create.blade.php +++ b/resources/views/jenis_jaminan/create.blade.php @@ -75,7 +75,7 @@ name="form_kategori[]" multiple="multiple"> - @foreach (['tanah', 'bangunan', 'kapal', 'kendaraan', 'mesin', 'pesawat', 'alat-berat', 'apartemen-kantor','lingkungan', 'fakta'] as $item) + @foreach (['tanah', 'bangunan', 'kapal', 'kendaraan', 'mesin', 'pesawat', 'alat-berat', 'apartemen-kantor','lingkungan', 'fakta','informasi'] as $item)