update form
This commit is contained in:
@@ -51,6 +51,7 @@ use Modules\Lpj\Models\JenisPesawat;
|
||||
use Modules\Lpj\Models\JenisKapal;
|
||||
use Modules\Lpj\Models\JenisKendaraan;
|
||||
use Modules\Lpj\Models\RuteJaminan;
|
||||
use Modules\Lpj\Models\JenisJaminan;
|
||||
use Modules\Lpj\Models\HubunganPemilikJaminan;
|
||||
use Modules\Lpj\Models\AnalisaUnit;
|
||||
use Modules\Lpj\Models\GolonganMasySekitar;
|
||||
@@ -112,8 +113,6 @@ class SurveyorController extends Controller
|
||||
$modelAlatBerat = ModelAlatBerat::all();
|
||||
|
||||
|
||||
|
||||
|
||||
$denah = Denah::where('permohonan_id', $id)->get();
|
||||
$fotojaminan = FotoJaminan::where('permohonan_id', $id)->get();
|
||||
$analisa = Analisa::with('analisaUnit', 'analisaTanahBangunan', 'analisaLingkungan', 'analisaFakta', 'jenisJaminan')
|
||||
@@ -188,6 +187,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 ($inspeksi) {
|
||||
$inspeksi->update(['data_form' => json_encode($rules)]);
|
||||
} else {
|
||||
@@ -422,11 +422,11 @@ class SurveyorController extends Controller
|
||||
try {
|
||||
// $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);
|
||||
$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);
|
||||
// }
|
||||
@@ -573,13 +573,13 @@ class SurveyorController extends Controller
|
||||
$jenisKapal = JenisKapal::all();
|
||||
$jenisPesawat = JenisPesawat::all();
|
||||
$modelAlatBerat = ModelAlatBerat::all();
|
||||
$hubCadeb =HubunganPemilikJaminan::all();
|
||||
|
||||
|
||||
// return response()->json([
|
||||
// 'per'=>
|
||||
// $permohonan]);
|
||||
|
||||
$hubCadeb = HubunganPemilikJaminan::all();
|
||||
$jenisJaminan = JenisJaminan::all();
|
||||
$fasilitasObjek = FasilitasObjek::all();
|
||||
$merupakanDaerah = MerupakanDaerah::all();
|
||||
$terletakDiArea = TerletakArea::all();
|
||||
$posisiUnit = PosisiUnit::all();
|
||||
$bentukUnit = BentukUnit::all();
|
||||
|
||||
|
||||
$inpeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first();
|
||||
@@ -616,7 +616,13 @@ class SurveyorController extends Controller
|
||||
'jenisKapal',
|
||||
'jenisPesawat',
|
||||
'modelAlatBerat',
|
||||
'hubCadeb'
|
||||
'hubCadeb',
|
||||
'jenisJaminan',
|
||||
'fasilitasObjek',
|
||||
'merupakanDaerah',
|
||||
'terletakDiArea',
|
||||
'posisiUnit',
|
||||
'bentukUnit'
|
||||
));
|
||||
}
|
||||
|
||||
@@ -700,7 +706,7 @@ class SurveyorController extends Controller
|
||||
}
|
||||
|
||||
// return response()->json($forminspeksi);
|
||||
return view('lpj::surveyor.components.data-pembanding', compact('permohonan', 'surveyor', 'branches', 'provinces','forminspeksi'));
|
||||
return view('lpj::surveyor.components.data-pembanding', compact('permohonan', 'surveyor', 'branches', 'provinces', 'forminspeksi'));
|
||||
}
|
||||
|
||||
|
||||
@@ -1164,6 +1170,7 @@ class SurveyorController extends Controller
|
||||
private function getAssetData($data)
|
||||
{
|
||||
return [
|
||||
'asset' =>[
|
||||
'debitur_perwakilan' => $data['debitur_perwakilan'] ?? [],
|
||||
'jenis_asset' => $data['jenis_asset'] ?? null,
|
||||
'jenis_asset_tidak_sesuai' => $data['jenis_asset_tidak_sesuai'] ?? null,
|
||||
@@ -1176,13 +1183,15 @@ class SurveyorController extends Controller
|
||||
'provinsi' => $data['provinsi'] ?? null,
|
||||
'kordinat_lng' => $data['kordinat_lng'] ?? null,
|
||||
'kordinat_lat' => $data['kordinat_lat'] ?? null,
|
||||
];
|
||||
]];
|
||||
}
|
||||
|
||||
|
||||
private function getTanahData($data, $request): array
|
||||
{
|
||||
return [
|
||||
'tanah' => [
|
||||
|
||||
'luas_tanah' => $data['luas_tanah'] ?? null,
|
||||
'luas_tanah_tidak_sesuai' => $data['luas_tanah_tidak_sesuai'] ?? null,
|
||||
'hadap_mata_angin' => $data['hadap_mata_angin'] ?? null,
|
||||
@@ -1200,6 +1209,7 @@ class SurveyorController extends Controller
|
||||
'lockland' => $data['lockland'] ?? null,
|
||||
'kondisi_fisik_tanah' => $data['kondisi_fisik_tanah'] ?? [],
|
||||
'kondisi_fisik_tanah_lainnya' => $data['kondisi_fisik_tanah_lainnya'] ?? null,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1217,6 +1227,7 @@ class SurveyorController extends Controller
|
||||
// }
|
||||
|
||||
return [
|
||||
'bangunan' => [
|
||||
'luas_tanah_bagunan' => $data['luas_tanah_bagunan'] ?? null,
|
||||
'jenis_bangunan' => $data['jenis_bangunan'] ?? null,
|
||||
'kondisi_bangunan' => $data['kondisi_bangunan'] ?? null,
|
||||
@@ -1226,12 +1237,14 @@ class SurveyorController extends Controller
|
||||
'spek_bangunan' => $data['spek_bangunan'] ?? [],
|
||||
'sarana_pelengkap' => $data['sarana_pelengkap'] ?? [],
|
||||
'sarana_pelengkap_input' => $data['sarana_pelengkap_input'] ?? null,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
private function getLingkunganData($data, $request): array
|
||||
{
|
||||
return [
|
||||
'lingkungan' => [
|
||||
'jarak_jalan_utama' => $data['jarak_jalan_utama'] ?? null,
|
||||
'jalan_linkungan' => $data['jalan_linkungan'] ?? null,
|
||||
'jarak_cbd_point' => $data['jarak_cbd_point'] ?? null,
|
||||
@@ -1253,12 +1266,14 @@ class SurveyorController extends Controller
|
||||
'nama_tps' => $data['nama_tps'] ?? null,
|
||||
'merupakan_daerah' => $data['merupakan_daerah'] ?? null,
|
||||
'fasilitas_dekat_object' => $data['fasilitas_dekat_object'] ?? null,
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
private function getFactData($data, $request): array
|
||||
{
|
||||
$factData = [
|
||||
'fakta' => [
|
||||
'fakta_positif' => $data['fakta_positif'] ?? null,
|
||||
'fakta_negatif' => $data['fakta_negatif'] ?? null,
|
||||
'rute_menuju' => $data['rute_menuju'] ?? null,
|
||||
@@ -1276,16 +1291,36 @@ class SurveyorController extends Controller
|
||||
'gss' => $data['gss'] ?? null,
|
||||
'pelebaran_jalan' => $data['pelebaran_jalan'] ?? null,
|
||||
'nama_petugas' => $data['nama_petugas'] ?? null,
|
||||
'lat' => $data['lat'] ?? null,
|
||||
'lng' => $data['lng'] ?? null,
|
||||
'keterangan' => $data['keterangan'] ?? null,
|
||||
]
|
||||
];
|
||||
|
||||
$factData['foto_gistaru'] = $this->updateOrDeleteFile($data, $request, 'foto_gistaru');
|
||||
$factData['foto_bhumi'] = $this->updateOrDeleteFile($data, $request, 'foto_bhumi');
|
||||
$factData['foto_argis_region'] = $this->updateOrDeleteFile($data, $request, 'foto_argis_region');
|
||||
$factData['foto_tempat'] = $this->updateOrDeleteFile($data, $request, 'foto_tempat');
|
||||
|
||||
$inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))->first();
|
||||
|
||||
|
||||
$fotoTypes = [
|
||||
'foto_gistaru',
|
||||
'foto_bhumi',
|
||||
'foto_argis_region',
|
||||
'foto_tempat'
|
||||
];
|
||||
|
||||
if ($inspeksi) {
|
||||
$dataForm = json_decode($inspeksi->data_form, true);
|
||||
foreach ($fotoTypes as $fotoType) {
|
||||
// Jika ada file baru diupload
|
||||
if ($request->hasFile($fotoType)) {
|
||||
$factData[$fotoType] = $this->updateOrDeleteFile($dataForm, $request, $fotoType);
|
||||
} else {
|
||||
$factData[$fotoType] = $dataForm[$fotoType] ?? null;
|
||||
}
|
||||
}
|
||||
}else{
|
||||
foreach ($fotoTypes as $fotoType) {
|
||||
$factData[$fotoType] = $this->updateOrDeleteFile($data, $request, $fotoType);
|
||||
}
|
||||
}
|
||||
return $factData;
|
||||
}
|
||||
|
||||
@@ -1296,6 +1331,7 @@ class SurveyorController extends Controller
|
||||
if ($file->isValid()) {
|
||||
$fileName = time() . '_' . $file->getClientOriginalName();
|
||||
$path = $file->storeAs("public/surveyor/{$request->type}", $fileName);
|
||||
|
||||
if ($path === false) {
|
||||
throw new Exception("Failed to store file for {$fileKey}");
|
||||
}
|
||||
@@ -1325,6 +1361,7 @@ class SurveyorController extends Controller
|
||||
private function getKapalData($data, $request): array
|
||||
{
|
||||
return [
|
||||
|
||||
'action' => $data['action'] ?? null,
|
||||
'nama_wakil_debitur' => $data['nama_wakil_debitur'] ?? null,
|
||||
'hub_calon_debitur' => $data['hub_calon_debitur'] ?? null,
|
||||
@@ -1358,6 +1395,7 @@ class SurveyorController extends Controller
|
||||
'depth' => $data['depth'] ?? null,
|
||||
'draft' => $data['draft'] ?? null,
|
||||
|
||||
|
||||
'lambung_kapal' => $data['lambung_kapal'] ?? null,
|
||||
'dek' => $data['dek'] ?? null,
|
||||
'struktur_rangka' => $data['struktur_rangka'] ?? null,
|
||||
@@ -1411,6 +1449,7 @@ class SurveyorController extends Controller
|
||||
'analisa_makro' => $data['analisa_makro'] ?? null,
|
||||
'kesimpulan' => $data['kesimpulan'] ?? null,
|
||||
'catatan' => $data['catatan'] ?? null,
|
||||
|
||||
];
|
||||
}
|
||||
public function getKendaraanData($data, $request): array
|
||||
@@ -1700,3 +1739,7 @@ class SurveyorController extends Controller
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user