✨ feat(penilai/print-out): generasi baris nilai dinamis, tambah satuan jarak
- Tambah sufiks satuan m pada jarak_jalan_utama di resources/views/penilai/components/analisa/lingkungan.blade.php agar konsisten menampilkan satuan meter - Refactor perhitungan tabel nilai di resources/views/penilai/components/print-out-sederhana.blade.php menjadi iterasi dinamis menggunakan labelNilai untuk menampilkan baris Tanah/Bangunan berdasarkan ketersediaan data luas_* dan nilai_*_1/_2 - Refactor bagian nilai di resources/views/penilai/components/print-out-standar.blade.php untuk non-MIG ( !$permohonan->is_mig ) menjadi loop dinamis yang sama sehingga konsisten antara “sederhana” dan “standar” - Pastikan akumulasi totalNilaiPasarWajar menggunakan nilai hasil format yang dibersihkan dari simbol dan pemisah ribuan, tetap menghitung dari nilai_*_2 - Jaga kompatibilitas existing: tetap menghormati npw_tambahan yang dirender setelah blok non-MIG
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
<tr>
|
||||
<td style=" width:25%; padding: 2px; vertical-align: top;">Jarak Jalan Utama</td>
|
||||
<td style=" width:1%; padding: 2px; vertical-align: top;">:</td>
|
||||
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jarak_jalan_utama'] ?? '-' }}</td>
|
||||
<td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding: 2px; vertical-align: top;">Jalan Lingkungan</td>
|
||||
|
||||
@@ -557,28 +557,19 @@
|
||||
|
||||
{{-- Fallback untuk data tanpa npw_tambahan --}}
|
||||
@if(!$permohonan->is_mig)
|
||||
@if (isset($lpjData['luas_tanah']))
|
||||
<tr>
|
||||
<td width="30%" style="padding: 3px; text-align: right;">Tanah</td>
|
||||
<td width="10%" style="padding: 3px; text-align: right;">{{ $lpjData['luas_tanah'] }} m<sup>2</sup></td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">X</td>
|
||||
<td width="25%" style="padding: 3px; text-align:right">{{ formatRupiah($lpjData['nilai_tanah_1'] ?? 0, 0, false) }}</td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">=</td>
|
||||
<td width="25%" style="padding: 3px; text-align: right;">{{ formatRupiah($lpjData['nilai_tanah_2'] ?? 0, 0, false) }}</td>
|
||||
</tr>
|
||||
@php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_tanah_2']); @endphp
|
||||
@endif
|
||||
@if (isset($lpjData['luas_bangunan']))
|
||||
<tr>
|
||||
<td width="30%" style="padding: 3px; text-align: right;">Bangunan</td>
|
||||
<td width="10%" style="padding: 3px; text-align: right;">{{ $lpjData['luas_bangunan'] }} m<sup>2</sup></td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">X</td>
|
||||
<td width="25%" style="padding: 3px; text-align:right">{{ formatRupiah($lpjData['nilai_bangunan_1'] ?? 0, 0, false) }}</td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">=</td>
|
||||
<td width="25%" style="padding: 3px; text-align: right;">{{ formatRupiah($lpjData['nilai_bangunan_2'] ?? 0, 0, false) }}</td>
|
||||
</tr>
|
||||
@php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_bangunan_2']); @endphp
|
||||
@endif
|
||||
@foreach ($labelNilai as $key => $label)
|
||||
@if (isset($lpjData['luas_' . $key]))
|
||||
<tr>
|
||||
<td width="30%" style="padding: 3px; text-align: right;">{{ $label }}</td>
|
||||
<td width="10%" style="padding: 3px; text-align: right;">{{ $lpjData['luas_' . $key] }} m<sup>2</sup></td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">X</td>
|
||||
<td width="25%" style="padding: 3px; text-align:right">{{ formatRupiah($lpjData['nilai_' . $key . '_1'] ?? 0, 0, false) }}</td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">=</td>
|
||||
<td width="25%" style="padding: 3px; text-align: right;">{{ formatRupiah($lpjData['nilai_' . $key . '_2'] ?? 0, 0, false) }}</td>
|
||||
</tr>
|
||||
@php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_' . $key . '_2']); @endphp
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
@if (isset($lpjData['npw_tambahan']))
|
||||
@foreach ($lpjData['npw_tambahan'] as $npw)
|
||||
|
||||
@@ -329,9 +329,24 @@
|
||||
if (strcasecmp($jenisAset, 'Apartemen') === 0) {
|
||||
$labelNilai['tanah'] = 'Luas Unit';
|
||||
}
|
||||
|
||||
@endphp
|
||||
|
||||
@if(!$permohonan->is_mig)
|
||||
@foreach ($labelNilai as $key => $label)
|
||||
@if (isset($lpjData['luas_' . $key]))
|
||||
<tr>
|
||||
<td width="30%" style="padding: 3px; text-align: right;">{{ $label }}</td>
|
||||
<td width="10%" style="padding: 3px; text-align: right;">{{ $lpjData['luas_' . $key] }} m<sup>2</sup></td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">X</td>
|
||||
<td width="25%" style="padding: 3px; text-align:right">{{ formatRupiah($lpjData['nilai_' . $key . '_1'] ?? 0, 0, false) }}</td>
|
||||
<td width="5%" style="padding: 3px; text-align: center;">=</td>
|
||||
<td width="25%" style="padding: 3px; text-align: right;">{{ formatRupiah($lpjData['nilai_' . $key . '_2'] ?? 0, 0, false) }}</td>
|
||||
</tr>
|
||||
@php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_' . $key . '_2']); @endphp
|
||||
@endif
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
@if (isset($lpjData['npw_tambahan']))
|
||||
@foreach ($lpjData['npw_tambahan'] as $npw)
|
||||
<tr>
|
||||
|
||||
Reference in New Issue
Block a user