daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2025-01-20 15:24:22 +07:00
parent 0a38319d98 08c296fd50
commit 04eba570e5
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/SurveyorController.php
View File

@@ -1180,33 +1180,33 @@ class SurveyorController extends Controller
if (!isset($dataForm['bangunan'])) { if (!isset($dataForm['bangunan'])) {
$dataForm['bangunan'] = []; $dataForm['bangunan'] = [];
} }
if (!isset($dataForm['bangunan']['luas_tanah_bagunan'])) { if (!isset($dataForm['bangunan']['luas_tanah_bagunan'])) {
$dataForm['bangunan']['luas_tanah_bagunan'] = []; $dataForm['bangunan']['luas_tanah_bagunan'] = [];
} }
$cekBanguan = isset($dataForm['bangunan']['luas_tanah_bagunan']['sesuai']) && $dataForm['bangunan']['luas_tanah_bagunan']['sesuai'] === 'sesuai' $cekBanguan = isset($dataForm['bangunan']['luas_tanah_bagunan']['sesuai']) && $dataForm['bangunan']['luas_tanah_bagunan']['sesuai'] === 'sesuai'
? 'sesuai' ? 'sesuai'
: 'tidak sesuai'; : 'tidak sesuai';
$dataForm['bangunan']['luas_tanah_bagunan'][$cekBanguan] = $request->input('luas_tanah_bagunan'); $dataForm['bangunan']['luas_tanah_bagunan'][$cekBanguan] = $request->input('luas_tanah_bagunan');
$needsSave = true; $needsSave = true;
} }
if ($request->filled('luas_tanah')) { if ($request->filled('luas_tanah')) {
if (!isset($dataForm['tanah'])) { if (!isset($dataForm['tanah'])) {
$dataForm['tanah'] = []; $dataForm['tanah'] = [];
} }
if (!isset($dataForm['tanah']['luas_tanah'])) { if (!isset($dataForm['tanah']['luas_tanah'])) {
$dataForm['tanah']['luas_tanah'] = []; $dataForm['tanah']['luas_tanah'] = [];
} }
$cekLuas = isset($dataForm['tanah']['luas_tanah']['sesuai']) && $dataForm['tanah']['luas_tanah']['sesuai'] === 'sesuai' $cekLuas = isset($dataForm['tanah']['luas_tanah']['sesuai']) && $dataForm['tanah']['luas_tanah']['sesuai'] === 'sesuai'
? 'sesuai' ? 'sesuai'
: 'tidak sesuai'; : 'tidak sesuai';
$dataForm['tanah']['luas_tanah'][$cekLuas] = $request->input('luas_tanah'); $dataForm['tanah']['luas_tanah'][$cekLuas] = $request->input('luas_tanah');
$needsSave = true; $needsSave = true;
} }
@@ -1482,11 +1482,22 @@ class SurveyorController extends Controller
$fotoForm['object_jaminan'] = []; $fotoForm['object_jaminan'] = [];
} }
if (empty($fotoForm['object_jaminan'])) { if (empty($fotoForm['object_jaminan'])) {
$fotoForm['object_jaminan'][] = ['foto_objek' => $newFoto]; $fotoForm['object_jaminan'][] = [
'name_objek' => 'Tampak Depan Objek',
'foto_objek' => $newFoto,
'deskripsi_objek' => ''
];
} else { } else {
// Update objek pertama dalam array object_jaminan
$fotoForm['object_jaminan'][0]['foto_objek'] = $newFoto; $fotoForm['object_jaminan'][0]['foto_objek'] = $newFoto;
// Tambahkan nama dan deskripsi jika belum ada
if (!isset($fotoForm['object_jaminan'][0]['name_objek'])) {
$fotoForm['object_jaminan'][0]['name_objek'] = 'Tampak Depan Objek';
}
} }
$inspeksi->foto_form = json_encode($fotoForm); $inspeksi->foto_form = json_encode($fotoForm);
$inspeksi->save(); $inspeksi->save();
} }