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

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2024-12-29 11:50:28 +07:00
parent e5fee57d0b 121b5df9df
commit ac622759f9
3 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/PenilaiController.php
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();
}
}