From f051fa9507b22cc5ae0ec0cb5f9ef1256f6cc6ba Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 26 Nov 2025 17:38:17 +0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(penilai/print-out):=20generasi?= =?UTF-8?q?=20baris=20nilai=20dinamis,=20tambah=20satuan=20jarak?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- .../components/analisa/lingkungan.blade.php | 2 +- .../components/print-out-sederhana.blade.php | 35 +++++++------------ .../components/print-out-standar.blade.php | 17 ++++++++- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/resources/views/penilai/components/analisa/lingkungan.blade.php b/resources/views/penilai/components/analisa/lingkungan.blade.php index e2a2eef..71d8e14 100644 --- a/resources/views/penilai/components/analisa/lingkungan.blade.php +++ b/resources/views/penilai/components/analisa/lingkungan.blade.php @@ -17,7 +17,7 @@ Jarak Jalan Utama : - {{ $lingkungan['jarak_jalan_utama'] ?? '-' }} + {{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m Jalan Lingkungan diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 6303da2..77fa0e2 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -557,28 +557,19 @@ {{-- Fallback untuk data tanpa npw_tambahan --}} @if(!$permohonan->is_mig) - @if (isset($lpjData['luas_tanah'])) - - Tanah - {{ $lpjData['luas_tanah'] }} m2 - X - {{ formatRupiah($lpjData['nilai_tanah_1'] ?? 0, 0, false) }} - = - {{ formatRupiah($lpjData['nilai_tanah_2'] ?? 0, 0, false) }} - - @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_tanah_2']); @endphp - @endif - @if (isset($lpjData['luas_bangunan'])) - - Bangunan - {{ $lpjData['luas_bangunan'] }} m2 - X - {{ formatRupiah($lpjData['nilai_bangunan_1'] ?? 0, 0, false) }} - = - {{ formatRupiah($lpjData['nilai_bangunan_2'] ?? 0, 0, false) }} - - @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_bangunan_2']); @endphp - @endif + @foreach ($labelNilai as $key => $label) + @if (isset($lpjData['luas_' . $key])) + + {{ $label }} + {{ $lpjData['luas_' . $key] }} m2 + X + {{ formatRupiah($lpjData['nilai_' . $key . '_1'] ?? 0, 0, false) }} + = + {{ formatRupiah($lpjData['nilai_' . $key . '_2'] ?? 0, 0, false) }} + + @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_' . $key . '_2']); @endphp + @endif + @endforeach @endif @if (isset($lpjData['npw_tambahan'])) @foreach ($lpjData['npw_tambahan'] as $npw) diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 24cb152..becedf2 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -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])) + + {{ $label }} + {{ $lpjData['luas_' . $key] }} m2 + X + {{ formatRupiah($lpjData['nilai_' . $key . '_1'] ?? 0, 0, false) }} + = + {{ formatRupiah($lpjData['nilai_' . $key . '_2'] ?? 0, 0, false) }} + + @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_' . $key . '_2']); @endphp + @endif + @endforeach + @endif + @if (isset($lpjData['npw_tambahan'])) @foreach ($lpjData['npw_tambahan'] as $npw)