Refactor handling data memo dan penyesuaian form lokasi

- Memperbaiki struktur data `memo` menjadi objek `lokasi` untuk konsistensi penanganan data.
- Menambahkan properti tambahan pada objek `lokasi`, seperti `tanggal_survey` dan `penilai`.
- Memperbarui logika query terkait kota, kecamatan, dan kelurahan berdasarkan struktur baru.
- Mengubah atribut form dan placeholder untuk mencocokkan perubahan struktur data.
This commit is contained in:
Daeng Deni Mardaeni
2024-12-29 09:21:16 +07:00
parent 970ecff9dc
commit 837f9fc098
2 changed files with 22 additions and 17 deletions

View File

@@ -158,21 +158,23 @@ class PenilaiController extends Controller
$provinces = Province::all();
$basicData = $this->surveyorController->getCommonData();
$formFoto = $formPeta = $cities = $districts = $villages= null;
$formFoto = $formPeta = $cities = $districts = $villages= $memo = null;
if ($inspeksi) {
$formFoto = json_decode($inspeksi->foto_form, true);
$formPeta = json_decode($inspeksi->data_form, true);
$memo = json_decode($penilai->memo);
if(isset($memo->province_code)){
$cities = City::where('province_id', $memo->province_code)->get();
if(isset($penilai->memo)) {
$memo = json_decode($penilai->memo);
}
if(isset($memo->lokasi->province_code)){
$cities = City::where('province_code', $memo->lokasi->province_code)->get();
}
if(isset($memo->city_code)){
$districts = District::where('city_id', $memo->city_code)->get();
if(isset($memo->lokasi->city_code)){
$districts = District::where('city_code', $memo->lokasi->city_code)->get();
}
if(isset($memo->district_code)) {
$villages = Village::where('district_id', $memo->district_code)->get();
if(isset($memo->lokasi->district_code)) {
$villages = Village::where('district_code', $memo->lokasi->district_code)->get();
}
}