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 968e584..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,13 +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 response()->json(['error'=> $e->getMessage()]); - // return redirect()->route('penilaian.index')->with('error', $e->getMessage()); + return response()->json(['error' => $e->getMessage()]); } } } @@ -181,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/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 4bb1364..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; @@ -95,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(); @@ -148,7 +156,11 @@ class SurveyorController extends Controller 'forminspeksi', 'formDenah', 'formFoto', - 'jaminanId' + 'jaminanId', + 'jenisKendaraan', + 'jenisKapal', + 'jenisPesawat', + 'modelAlatBerat' )); } /** @@ -212,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; } } @@ -371,7 +383,7 @@ class SurveyorController extends Controller ,'foto_lantai_unit' => $foto_lantai_unit, 'foto_lantai_lainnya' => $foto_lantai_lainnya, 'foto_rute_lainnya' => $foto_rute_lainnya, - 'basement' => $basement, + 'foto_basement' => $basement, 'foto_gerbang' => $gerbang, 'pendamping' => $pendamping ]; @@ -398,19 +410,19 @@ 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); } @@ -443,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); } } @@ -484,15 +500,7 @@ class SurveyorController extends Controller } } - // public function sendMessage($emailData, $user) - // { - // try { - // Mail::to('rustammobil1@gmail.com')->send(new SendEmail($emailData, $user)); - // } catch (\Throwable $th) { - // return $th; - // } - // } public function storeAproved($id) { @@ -554,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'=> @@ -591,7 +602,11 @@ class SurveyorController extends Controller 'laluLintasLokasi', 'perkerasanJalan', 'link_url_region', - 'forminspeksi' + 'forminspeksi', + 'jenisKendaraan', + 'jenisKapal', + 'jenisPesawat', + 'modelAlatBerat' )); } @@ -670,11 +685,12 @@ class SurveyorController extends Controller $inpeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first(); $forminspeksi = null; if ($inpeksi) { - $forminspeksi = json_decode($inpeksi->data_form, true); + $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')); + return view('lpj::surveyor.components.data-pembanding', compact('permohonan', 'surveyor', 'branches', 'provinces','forminspeksi')); } @@ -759,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], ]; @@ -906,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, ]; @@ -1039,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, ]; @@ -1066,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(), ]; } @@ -1088,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) { @@ -1193,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, @@ -1343,269 +1380,269 @@ class SurveyorController extends Controller ]; } 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, + { + 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, + '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, + '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, - ]; -} + '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 getMesinData($data, $request): array -{ - return [ - '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, - ]; -} + public function getMesinData($data, $request): array + { + return [ + '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, + ]; + } -public function getAlatBeratData($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, - '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, + public function getAlatBeratData($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, + '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, + '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, - ]; -} + 'faktor_positif' => $data['faktor_positif'] ?? null, + 'faktor_negatif' => $data['faktor_negatif'] ?? null, + 'kesimpulan' => $data['kesimpulan'] ?? null, + 'catatan' => $data['catatan'] ?? null, + ]; + } -private function getPesawatData($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, - 'bandara' => $data['bandara'] ?? null, - 'desa_kelurahan' => $data['desa_kelurahan'] ?? null, - 'kecamatan' => $data['kecamatan'] ?? null, - 'kota_madya' => $data['kota_madya'] ?? null, - 'provinsi' => $data['provinsi'] ?? null, + private function getPesawatData($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, + '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, + '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, + '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, + '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, + '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, + '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, + '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, + '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, + '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, + '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, + '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, - ]; -} + // 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 getUnitData($data, $request): array -{ - return [ - '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, - ]; -} + private function getUnitData($data, $request): array + { + return [ + '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 39a6376..719b695 100644 --- a/app/Http/Requests/FormSurveyorRequest.php +++ b/app/Http/Requests/FormSurveyorRequest.php @@ -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; } } @@ -537,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/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..c4bd9c7 100644 --- a/module.json +++ b/module.json @@ -567,9 +567,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/penilai/index.blade.php b/resources/views/penilai/index.blade.php index 196b6c3..539b603 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -5,9 +5,10 @@ @endsection @section('content') -
-
-
+ + +

@@ -29,7 +30,7 @@
+ data-datatable-table="true"> @@ -61,23 +61,53 @@ Foto @@ -91,44 +121,249 @@ - -
@@ -86,8 +87,10 @@ + + - + @endsection diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 107256e..d259dda 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -88,27 +88,36 @@ {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}

+ + + + @foreach($permohonan->debiture->documents as $dokumen) +
+
+ @php + $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); + $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); + + @endphp
-

- {{ $permohonan->penilaian->userSurveyor->name }}

-

- Region 1

+ +

{{ $surveyor->userPenilaiTeam->name }}

+ +

{{ $permohonan->region->name }}

+ +

{{ $penilai->userPenilaiTeam->name }}

+

- @foreach ($permohonan->penilaian->teams->teamsUsers as $index => $penilaian) - {{ $penilaian->user->name }}{{ $index + 1 < count($permohonan->penilaian->teams->teamsUsers) ? ', ' : '' }} - @endforeach -

-

- {{ $permohonan->penilaian->teams->regions->name }} + {{ $permohonan->region->name }}

@@ -154,7 +163,48 @@ PJ/001/001

+ + + + +
+
+ + LAMPIRAN FOTO DAN DOKUMEN + + + + KERTAS KERJA + + + PAPARAN + + + + WORKSHEET + +
+ +
+ + SAVE + + + + REPORT + + + + + PRINT OUT + +
+ +
+ + @endforeach + @endsection diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index 72a77d1..3dd26a7 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -4,25 +4,12 @@ {{ Breadcrumbs::render(request()->route()->getName()) }} @endsection -@push('styles') - -@endpush + @section('content')
- @include('lpj::component.detail-jaminan',['backLink' => 'penilaian.index']) + @include('lpj::component.detail-jaminan', ['backLink' => 'penilaian.index'])
@@ -33,9 +20,7 @@
-
+ @if (isset($penilaian->nomor_registrasi)) @method('PUT') @endif @@ -86,10 +71,8 @@
+ - @error('surveyor_selection') - {{ $message }} - @enderror
@@ -108,9 +91,9 @@ @endforeach - @error('penilai_surveyor_id') - {{ $message }} - @enderror + + + @@ -141,9 +124,9 @@ @endif - @error('surveyor_id') - {{ $message }} - @enderror + + + @elseif($penilaianTeam->isEmpty()) @@ -166,9 +149,9 @@ @endif - @error('surveyor_id') - {{ $message }} - @enderror + + + @endif @@ -192,9 +175,9 @@ @endif - @error('surveyor_region_id') - {{ $message }} - @enderror + + + @@ -220,9 +203,7 @@ @endif - @error('penilai_id') - {{ $message }} - @enderror + @elseif($penilaianTeam->isEmpty()) @@ -244,9 +225,7 @@ @endif - @error('penilai_id') - {{ $message }} - @enderror + @endif @@ -268,9 +247,7 @@ @endif - @error('penilai_region_id') - {{ $message }} - @enderror + @@ -285,9 +262,8 @@ - @error('tanggal_kunjungan') - {{ $message }} - @enderror + + @@ -300,13 +276,13 @@ - @error('keterangan') - {{ $message }} - @enderror + + +
- @@ -321,8 +297,8 @@
- + @endsection @push('scripts') - - - @endpush diff --git a/resources/views/surveyor/components/alat-berat.blade.php b/resources/views/surveyor/components/alat-berat.blade.php index 0974b28..790967d 100644 --- a/resources/views/surveyor/components/alat-berat.blade.php +++ b/resources/views/surveyor/components/alat-berat.blade.php @@ -102,8 +102,8 @@ class="input tomselect w-full @error('model_unit') border-danger bg-danger-light @enderror" name="jenis_model"> - @if (isset($arahMataAngin)) - @foreach ($arahMataAngin as $item) + @if (isset($modelAlatBerat)) + @foreach ($modelAlatBerat as $item) diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php index 00ec1e8..97bc1c2 100644 --- a/resources/views/surveyor/components/apartemen-kantor.blade.php +++ b/resources/views/surveyor/components/apartemen-kantor.blade.php @@ -6,7 +6,7 @@
-
+

Analisa Unit

@@ -18,19 +18,18 @@
- @error('luas') - {{ $message }} - @enderror + +
@@ -44,7 +43,7 @@ @foreach ($jenisBangunan as $item) @endforeach @@ -64,7 +63,7 @@ @foreach ($kondisiBangunan as $item) @endforeach @@ -75,7 +74,6 @@
-
@@ -86,7 +84,7 @@ @foreach ($ketinggianTanah as $item) @endforeach @@ -110,7 +108,7 @@ @foreach ($lantai as $item) @endforeach @@ -132,7 +130,7 @@ @foreach ($viewUnit as $item) @endforeach @@ -152,7 +150,7 @@ @foreach ($bentukTanah as $item) @endforeach diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php index b69e6e0..92c3d85 100644 --- a/resources/views/surveyor/components/data-pembanding.blade.php +++ b/resources/views/surveyor/components/data-pembanding.blade.php @@ -10,7 +10,7 @@

- Form Inspeksi + Data Pembanding

+ style="min-width: 350px"id="dataPembanding2Header"> Data Pembanding 1
- - + @php + $formFoto = json_decode($forminspeksi['foto_form'], true); + + $formIns = json_decode($forminspeksi['data_form'], true); + + @endphp + + @if (isset($formFoto['object_jaminan']) && + count($formFoto['object_jaminan']) > 0 && + isset($formFoto['object_jaminan'][0]['foto_object'])) + Gambar Pendamping + @else + + @endif + + - - + +
- Alamat +

Alamat

+

Desa

+

Kecamatan

+

Kabupaten

+

Provinsi

 - + + + + + + +
-
-
-

-
- - - -
-
-
-

Informasi khusus

-
-
-
- - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- Nama - - - Objek Penilaian - - - Data Pembanding 1 - + Luas Tanah + + + + +
+ Luas Bangunan + + + + +
+ Tahun Bangunan + + + + +
+ Estimasi Tahun Visual + + + + +
+ Kepemilikan + + + + +
+ Harga + + + + +
+ Tinggi Lantai + + + + +
+ Lebar Depan + + + + +
+ Lebar Jalan + + + + +
+ Sumber + + + + +
+ Nomor tlp + + + + +
+ Titik Lokasi + +
+ + +
+ 		+
+ + +
+
+ Link Internet + + + + +
Lokasi
+

Jarak Ke jalan utama

+

Lebar jalan depan aset (m)

+

Posisi kavling

+

Tingkat Keramaian (Occupancy)

+ 		+ + + + + + + + + + + + + + + + + +
Karakteristik Fisik
+

Kondisi Fisik Tanah

+

Beda Ketinggian dengan Jalan

+

Bentuk Tanah

+

Lebar Depan

+

Fasos Fasum

+

Lain-lain

+ 		+ + + + + + + + + + + + + +
+ Karakteristik Ekonomi + + + + +
+

Pengunaan

+

Zonasi/Tata Kota

+

KDB, KLB, KTB, KDH & Peraturan Lainnya

+ 		+ + + + + + + +
@@ -142,24 +377,23 @@ document.getElementById('addColumnBtn').addEventListener('click', function() { columnCount++; + + // Create new header cell const newHeader = document.createElement('th'); newHeader.className = 'min-w-[350px] text-center'; - newHeader.style = 'min-width: 350px'; - newHeader.innerHTML = `Data Pembanding ${columnCount}`; + newHeader.style.minWidth = '350px'; + newHeader.textContent = `Data Pembanding ${columnCount}`; document.querySelector('#dataTable thead tr').appendChild(newHeader); - // Tampilkan tombol hapus kolom document.getElementById('removeColumnBtn').style.display = 'inline-block'; - // Tambahkan sel baru ke setiap baris di tbody + const rows = document.querySelectorAll('#dataTable tbody tr'); rows.forEach((row, index) => { const newCell = document.createElement('td'); newCell.className = 'text-center'; - // Hanya baris pertama yang memiliki input file if (index === 0) { - // Buat elemen gambar dan input file untuk baris pertama const imgElement = document.createElement('img'); imgElement.src = ''; imgElement.className = 'img-responsive'; @@ -167,7 +401,7 @@ imgElement.style.width = '10rem'; imgElement.style.height = '10rem'; imgElement.style.display = 'none'; - imgElement.id = `uploadedImage${columnCount}-${index + 1}`; // ID unik untuk setiap gambar + imgElement.id = `uploadedImage${columnCount}-${index + 1}`; const fileInput = document.createElement('input'); fileInput.type = 'file'; @@ -177,21 +411,30 @@ previewImage(event, imgElement.id); }; - // Tambahkan elemen gambar dan input file ke sel baru newCell.appendChild(imgElement); newCell.appendChild(fileInput); } else { - // Untuk baris lainnya, hanya tambahkan input teks - const textInput = document.createElement('input'); - textInput.type = 'text'; - textInput.className = 'input'; - textInput.placeholder = `Data Pembanding ${columnCount}`; - newCell.appendChild(textInput); + // Other rows get text inputs + const numInputs = row.querySelectorAll('input').length; + for (let i = 0; i < numInputs; i++) { + const textInput = document.createElement('input'); + textInput.type = 'text'; + textInput.className = 'input mt-2'; + textInput.placeholder = `Data Pembanding ${columnCount}`; + newCell.appendChild(textInput); + } } - // Tambahkan sel baru ke baris row.appendChild(newCell); }); + + // Update colspan on label row + const colspanRow = document.createElement('tr'); + const colspanCell = document.createElement('td'); + colspanCell.colSpan = 3 + columnCount - 1; + colspanCell.textContent = `Data Pembanding ${columnCount}`; + colspanRow.appendChild(colspanCell); + document.querySelector('#dataTable tbody').insertBefore(colspanRow, rows[0]); }); document.getElementById('removeColumnBtn').addEventListener('click', function() { diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php index 08b8c39..d7fcc67 100644 --- a/resources/views/surveyor/components/denah.blade.php +++ b/resources/views/surveyor/components/denah.blade.php @@ -10,7 +10,7 @@

- Data Jaminan + Denah

Gambar foto_denah + src="{{ isset($formDenah['foto_denah']) ? asset('storage/' . old('foto_denah', $formDenah['foto_denah'])) : '' }}" + alt="Gambar foto_denah" style="{{ isset($formDenah['foto_denah']) ? 'width: 30rem;' : 'display: none;' }}"> +
- @error('luas') - {{ $message }} - @enderror + + +
diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php index bf99d26..53ca8b4 100644 --- a/resources/views/surveyor/components/foto.blade.php +++ b/resources/views/surveyor/components/foto.blade.php @@ -79,16 +79,13 @@
-
- -
-
+

Rute Menuju Lokasi

+
@endforeach @else
@@ -162,7 +160,6 @@
- @endif
@@ -191,14 +188,16 @@
@if (isset($formFoto['foto_rute_lainnya']) && is_array($formFoto['foto_rute_lainnya'])) @foreach ($formFoto['foto_rute_lainnya'] as $Index => $photo) -
+
- +
-
@@ -229,19 +228,16 @@ - -
-
+

Objek Jaminan

@php - // Array untuk menyimpan kategori yang sudah diproses $processedCategories = []; @endphp @@ -334,22 +330,20 @@ } @endphp + @if (count($objekViews) > 0) @foreach ($objekViews as $view)
+ class="form-label">{{ $view['label'] }}
{{ $view['label'] }} - + style="{{ isset($formFoto['object_jaminan'][$view['index']]['foto_object']) ? '' : 'display: none;' }} width: 30rem;">
- Camera + Camera
- - +
@@ -370,7 +363,6 @@ @endif @php - // Tandai kategori sebagai sudah diproses $processedCategories[] = $kategori; @endphp @endif @@ -381,8 +373,8 @@ @endforeach
-
-
+
+
@@ -399,7 +391,6 @@ Foto Lantai 1
- Gambar Pendamping @@ -411,17 +402,13 @@
-
- -
@endforeach @else
- @@ -432,7 +419,7 @@ capture="camera">
-
+ +
+ + Gambar foto_basement +
+ +
- +
+
- +
-
- - -
- -
+
- -
-
-

Lingkungan

- -
- - @if (isset($formFoto['lingkungan']) && !is_array($formFoto['lingkungan']) && !empty($formFoto['lingkungan'])) - @foreach ($formFoto['lingkungan'] as $item) -
-
- -
- Gambar Pendamping - -
- - - -
- -
-
- +
+

Lingkungan

+ +
+ @if (isset($formFoto['lingkungan']) && is_array($formFoto['lingkungan']) && count($formFoto['lingkungan']) > 0) + @foreach ($formFoto['lingkungan'] as $key => $item) +
+
+ +
+ Gambar Lingkungan + +
+ +
- @endforeach - @else -
-
- -
- - - - -
- - -
- + +
- @endif + +
+ @endforeach + @else +
+
+ +
+ + + +
+ +
+ +
+ @endif
-
- +
- - -
+

Pendamping

@@ -619,9 +584,8 @@
- {{-- -
-
--}} + +
@@ -720,24 +684,14 @@ @push('scripts') @endpush + + + + diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index 795f322..e009cb0 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -100,22 +100,26 @@
+ class="radio" name="alamat_sesuai" value="sesuai" + {{ old('alamat_sesuai', $forminspeksi['alamat_sesuai'] ?? '') == 'sesuai' ? 'checked' : '' }}> Ya + value="{{ old('alamat_tidak_sesuai', $forminspeksi['alamat_tidak_sesuai'] ?? '') }}" + style="{{ old('alamat_sesuai', $forminspeksi['alamat_sesuai'] ?? '') == 'tidak sesuai' ? '' : 'display: none;' }}">
-
+
@php $inputDataLoaksi = []; @@ -170,7 +173,8 @@ 'index' => 0, 'name' => 'nama_jalan', 'value' => old( - 'nama_jalan', isset($forminspeksi['nama_jalan']) ? $forminspeksi['nama_jalan'] : '', + 'nama_jalan', + isset($forminspeksi['nama_jalan']) ? $forminspeksi['nama_jalan'] : '', ), ], @@ -179,32 +183,36 @@ 'index' => 3, 'name' => 'desa_kelurahan', 'value' => old( - 'desa_kelurahan', isset($forminspeksi['desa_kelurahan']) ? $forminspeksi['desa_kelurahan'] : '', - ) + 'desa_kelurahan', + isset($forminspeksi['desa_kelurahan']) ? $forminspeksi['desa_kelurahan'] : '', + ), ], [ 'label' => 'Kecamatan', 'index' => 4, 'name' => 'kecamatan', 'value' => old( - 'kecamatan', isset($forminspeksi['kecamatan']) ? $forminspeksi['kecamatan'] : '', - ) + 'kecamatan', + isset($forminspeksi['kecamatan']) ? $forminspeksi['kecamatan'] : '', + ), ], [ 'label' => 'Kota/Kabupaten', 'index' => 5, 'name' => 'kota_kabupaten', 'value' => old( - 'kota_kabupaten', isset($forminspeksi['kota_kabupaten']) ? $forminspeksi['kota_kabupaten'] : '', - ) + 'kota_kabupaten', + isset($forminspeksi['kota_kabupaten']) ? $forminspeksi['kota_kabupaten'] : '', + ), ], [ 'label' => 'Provinsi', 'index' => 6, 'name' => 'provinsi', 'value' => old( - 'provinsi', isset($forminspeksi['provinsi']) ? $forminspeksi['provinsi'] : '', - ) + 'provinsi', + isset($forminspeksi['provinsi']) ? $forminspeksi['provinsi'] : '', + ), ], ]; @@ -219,10 +227,7 @@ - - @error($item['name']) - {{ $message }} - @enderror +
@endforeach @@ -251,8 +256,9 @@ value="{{ old('kordinat_lat') }}" @readonly(true)> -
- +
+
@@ -260,43 +266,122 @@
+
+ @foreach ($permohonan->debiture->documents as $dokumen) + - -
-
-

Izin Bangunan

-
-
- - -
-
-

SPPT PBB

-
-
- -
-
-

Dokument Lainnya

-
-
- - + @include('lpj::component.pdfviewer')

Hubungan cadeb/debitur dengan Pemilik Jaminan

+ +
+ +
+ @foreach ($permohonan->debiture->documents as $dokumen) + {{ $dokumen->pemilik->hubungan_pemilik->name?? "" }} + @endforeach +
+
+

Hubungan Cadeb/Debitur dengan Penghuni Jaminan

+
+ +
+ @foreach ($permohonan->debiture->documents as $dokumen) + {{ $dokumen->penghuni->hubungan_penghuni->name?? "" }} + @endforeach +
+
diff --git a/resources/views/surveyor/components/kapal.blade.php b/resources/views/surveyor/components/kapal.blade.php index af0745e..f92d38f 100644 --- a/resources/views/surveyor/components/kapal.blade.php +++ b/resources/views/surveyor/components/kapal.blade.php @@ -103,8 +103,8 @@ - @if (isset($arahMataAngin)) - @foreach ($arahMataAngin as $item) + @if (isset($jenisPesawat)) + @foreach ($jenisPesawat as $item) @@ -112,7 +112,7 @@ @endif - @error('hadapMataAngin') + @error('jenisPesawat') @enderror
diff --git a/resources/views/surveyor/detail.blade.php b/resources/views/surveyor/detail.blade.php index ae98ad0..6a28dac 100644 --- a/resources/views/surveyor/detail.blade.php +++ b/resources/views/surveyor/detail.blade.php @@ -101,7 +101,7 @@ function onSubmit() { $.ajax({ url: "{{ route('surveyor.submitSurveyor', ['id' => $surveyor]) }}", - type: "GET", + type: "POST", headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php index 4783173..ec9b573 100644 --- a/resources/views/surveyor/index.blade.php +++ b/resources/views/surveyor/index.blade.php @@ -5,26 +5,11 @@ @endsection @section('content') @push('styles') - @endpush
-
- - -

@@ -109,7 +94,7 @@

-
+
@@ -215,14 +200,13 @@ function jadwal(id){ return `${day}-${month}-${year}`; } - - +ihfdksfjhjfjbkdfkdsfdsjkjdjdsgjjgdgjhgdgjkhdshggkhgkhdghskghkjkhjsdgjkgdjhg @endpush -