perbaikan data pembanding dan print out resume
This commit is contained in:
@@ -1176,13 +1176,38 @@ class SurveyorController extends Controller
|
|||||||
$dataForm = json_decode($inspeksi->data_form, true) ?: [];
|
$dataForm = json_decode($inspeksi->data_form, true) ?: [];
|
||||||
|
|
||||||
// Inisialisasi struktur data jika belum ada
|
// Inisialisasi struktur data jika belum ada
|
||||||
if (!isset($dataForm['bangunan'])) {
|
if ($request->filled('luas_tanah_bagunan')) {
|
||||||
$dataForm['bangunan'] = [];
|
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;
|
$needsSave = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!isset($dataForm['tanah'])) {
|
if ($request->filled('luas_tanah')) {
|
||||||
$dataForm['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;
|
$needsSave = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -141,7 +141,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td style="width: 20%">Pemohon</td>
|
<td style="width: 20%">Pemohon</td>
|
||||||
<td style="width: 1%">:</td>
|
<td style="width: 1%">:</td>
|
||||||
<td style="width: 100%">{{ $permohonan->user->name }}</td>
|
<td style="width: 100%">{{ $permohonan->user->name ?? '' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
@@ -331,12 +331,6 @@
|
|||||||
<footer>
|
<footer>
|
||||||
|
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
<script>
|
|
||||||
const data = @json($resumeData);
|
|
||||||
console.log(data);
|
|
||||||
|
|
||||||
</script>
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -112,31 +112,38 @@
|
|||||||
class="input number-format">
|
class="input number-format">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td class="px-4 py-2">Luas Bangunan (m²)</td>
|
|
||||||
<td class="px-4 py-2">
|
|
||||||
@php
|
|
||||||
$luasTanahData = $inspectionData['bangunan']['luas_tanah_bagunan'];
|
|
||||||
$nilai = 'N/A';
|
|
||||||
|
|
||||||
if (!empty($luasTanahData['sesuai'])) {
|
@php
|
||||||
$nilai = $luasTanahData['sesuai'];
|
$luasTanahData = [];
|
||||||
} elseif (!empty($luasTanahData['tidak sesuai'])) {
|
$nilai = 'N/A';
|
||||||
$nilai = $luasTanahData['tidak sesuai'];
|
|
||||||
}
|
|
||||||
@endphp
|
|
||||||
<input type="text"
|
|
||||||
name="luas_tanah_bagunan"
|
|
||||||
class="input number-format"
|
|
||||||
value="{{ $nilai }}">
|
|
||||||
</td>
|
|
||||||
|
|
||||||
|
// Memeriksa apakah key 'bangunan' ada di dalam $inspectionData
|
||||||
|
if (isset($inspectionData['bangunan']['luas_tanah_bagunan'])) {
|
||||||
|
$luasTanahData = $inspectionData['bangunan']['luas_tanah_bagunan'];
|
||||||
|
|
||||||
<td class="px-4 py-2">
|
if (!empty($luasTanahData['sesuai'])) {
|
||||||
<input type="text" name="luas_bangunan_pembanding[]"
|
$nilai = $luasTanahData['sesuai'];
|
||||||
class="input number-format">
|
} elseif (!empty($luasTanahData['tidak sesuai'])) {
|
||||||
</td>
|
$nilai = $luasTanahData['tidak sesuai'];
|
||||||
</tr>
|
}
|
||||||
|
}
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
@if (isset($inspectionData['bangunan']))
|
||||||
|
<tr>
|
||||||
|
<td class="px-4 py-2">Luas Bangunan (m²)</td>
|
||||||
|
<td class="px-4 py-2">
|
||||||
|
<input type="text"
|
||||||
|
name="luas_tanah_bagunan"
|
||||||
|
class="input number-format"
|
||||||
|
value="{{ $nilai }}">
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-2">
|
||||||
|
<input type="text" name="luas_bangunan_pembanding[]"
|
||||||
|
class="input number-format">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
|
||||||
<!-- Informasi Harga -->
|
<!-- Informasi Harga -->
|
||||||
|
|||||||
Reference in New Issue
Block a user