diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 8f46792..30e25d8 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -1176,13 +1176,38 @@ class SurveyorController extends Controller $dataForm = json_decode($inspeksi->data_form, true) ?: []; // Inisialisasi struktur data jika belum ada - if (!isset($dataForm['bangunan'])) { - $dataForm['bangunan'] = []; + if ($request->filled('luas_tanah_bagunan')) { + if (!isset($dataForm['bangunan'])) { + $dataForm['bangunan'] = []; + } + + if (!isset($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' + ? 'sesuai' + : 'tidak sesuai'; + + $dataForm['bangunan']['luas_tanah_bagunan'][$cekBanguan] = $request->input('luas_tanah_bagunan'); $needsSave = true; } + - if (!isset($dataForm['tanah'])) { - $dataForm['tanah'] = []; + if ($request->filled('luas_tanah')) { + if (!isset($dataForm['tanah'])) { + $dataForm['tanah'] = []; + } + + if (!isset($dataForm['tanah']['luas_tanah'])) { + $dataForm['tanah']['luas_tanah'] = []; + } + + $cekLuas = isset($dataForm['tanah']['luas_tanah']['sesuai']) && $dataForm['tanah']['luas_tanah']['sesuai'] === 'sesuai' + ? 'sesuai' + : 'tidak sesuai'; + + $dataForm['tanah']['luas_tanah'][$cekLuas] = $request->input('luas_tanah'); $needsSave = true; } diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index c1512e5..9aa516c 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -141,7 +141,7 @@ Pemohon : - {{ $permohonan->user->name }} + {{ $permohonan->user->name ?? '' }} @@ -331,12 +331,6 @@ - - diff --git a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php index 47e35ed..9a4eab9 100644 --- a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php +++ b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php @@ -112,31 +112,38 @@ class="input number-format"> - - Luas Bangunan (m²) - - @php - $luasTanahData = $inspectionData['bangunan']['luas_tanah_bagunan']; - $nilai = 'N/A'; - if (!empty($luasTanahData['sesuai'])) { - $nilai = $luasTanahData['sesuai']; - } elseif (!empty($luasTanahData['tidak sesuai'])) { - $nilai = $luasTanahData['tidak sesuai']; - } - @endphp - - + @php + $luasTanahData = []; + $nilai = 'N/A'; + // Memeriksa apakah key 'bangunan' ada di dalam $inspectionData + if (isset($inspectionData['bangunan']['luas_tanah_bagunan'])) { + $luasTanahData = $inspectionData['bangunan']['luas_tanah_bagunan']; - - - - + if (!empty($luasTanahData['sesuai'])) { + $nilai = $luasTanahData['sesuai']; + } elseif (!empty($luasTanahData['tidak sesuai'])) { + $nilai = $luasTanahData['tidak sesuai']; + } + } + @endphp + + @if (isset($inspectionData['bangunan'])) + + Luas Bangunan (m²) + + + + + + + + @endif