🐛 fix(ui-print): Format nilai pasar wajar & perbaiki hitung hari kerja migrasi

- Terapkan number_format(ID) untuk nilai pasar wajar (0 desimal, ',' desimal, '.' ribuan)
- print-out-sederhana: format nilai per kategori & nilai perbandingan agar konsisten
- print-out-standar: format nilai per kategori, nilai perbandingan, dan total nilai pasar wajar
- Ganti perhitungan manual floor/diffInDays menjadi fungsi hitungHariKerja() yang akurat
- Parsing tanggal migrasi pakai Carbon::createFromFormat('d/m/Y H:i:s', ...) sebelum dihitung
- Tata ulang tampilan informasi Dinas Tata Ruang: wrapper tabel 'judul', struktur tabel rapi, <br> untuk array
- Inisialisasi $totalNilaiPasarWajar = 0 dan akumulasi nilai kategori + perbandingan dengan fallback kalkulasi
- Pastikan konsistensi format angka di seluruh laporan & fallback bila data backend tidak tersedia
- Uji: verifikasi format ribuan/jutaan, akurasi hari kerja (migrasi/non-migrasi), dan total nilai terhitung benar
This commit is contained in:
Daeng Deni Mardaeni
2025-10-16 10:04:40 +07:00
parent b83920d8aa
commit 2937add646
3 changed files with 22 additions and 13 deletions

View File

@@ -10,13 +10,19 @@
</td> </td>
</tr> </tr>
</table> </table>
@if (is_array($item)) <table class="judul" style="width: 100%; ">
@foreach ($item as $data_) <tr>
{!! nl2br(e($data_)) !!} <td style="width: 100%; text-align: left;">
@endforeach @if (is_array($item))
@else @foreach ($item as $data_)
{!! nl2br(e($item)) !!} {!! nl2br(e($data_)) !!}<br>
@endif @endforeach
@else
{!! nl2br(e($item)) !!}
@endif
</td>
</tr>
</table>
@endforeach @endforeach
@endif @endif
@else @else

View File

@@ -129,7 +129,7 @@
<td style="padding: 2px; vertical-align: top;">:</td> <td style="padding: 2px; vertical-align: top;">:</td>
<td> <td>
@if($permohonan->is_mig) @if($permohonan->is_mig)
{{ floor(\Carbon\Carbon::parse($permohonan->penilaian->tanggal_kunjungan)->diffInDays(\Carbon\Carbon::parse($tanggalLaporan))) }} {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, \Carbon\Carbon::createFromFormat('d/m/Y H:i:s', $permohonan_migrasi->mig_mst_jaminan_tgl_oto)->format('Y-m-d H:i:s')) }}
@else @else
{{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }} {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }}
@endif @endif
@@ -549,7 +549,7 @@
</td> </td>
<td style="padding: 3px; text-align: left; width:40%;"> <td style="padding: 3px; text-align: left; width:40%;">
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
{{ $lpjData['nilai_' . $key . '_2'] ?? '' }} {{ number_format($lpjData['nilai_' . $key . '_2'], 0, ',', '.') ?? '' }}
</td> </td>
</tr> </tr>
@php $totalNilaiPasarWajar += $lpjData['nilai_' . $key . '_2']; @endphp @php $totalNilaiPasarWajar += $lpjData['nilai_' . $key . '_2']; @endphp
@@ -567,7 +567,7 @@
</td> </td>
<td style="padding: 3px; text-align: left; width:40%"> <td style="padding: 3px; text-align: left; width:40%">
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
{{ $npw['nilai_2'] }} {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
</td> </td>
</tr> </tr>
@php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp

View File

@@ -313,6 +313,7 @@
</td> </td>
</tr> </tr>
@php @php
$totalNilaiPasarWajar = 0;
$labelNilai = [ $labelNilai = [
'bangunan' => 'Luas Bangunan', 'bangunan' => 'Luas Bangunan',
'tanah' => 'Luas Tanah', 'tanah' => 'Luas Tanah',
@@ -342,9 +343,10 @@
</td> </td>
<td style="padding: 3px; text-align: left; width:60%;"> <td style="padding: 3px; text-align: left; width:60%;">
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
{{ $lpjData['nilai_' . $key . '_2'] ?? '' }} {{ number_format($lpjData['nilai_' . $key . '_2'], 0, ',', '.') ?? '' }}
</td> </td>
</tr> </tr>
@php $totalNilaiPasarWajar += $lpjData['nilai_' . $key . '_2']; @endphp
@endif @endif
@endforeach @endforeach
@@ -360,9 +362,10 @@
</td> </td>
<td style="padding: 3px; text-align: left; width:70%"> <td style="padding: 3px; text-align: left; width:70%">
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
{{ $npw['nilai_2'] }} {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
</td> </td>
</tr> </tr>
@php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
@endforeach @endforeach
@endif @endif
<tr> <tr>
@@ -371,7 +374,7 @@
<td style="padding: 3px; text-align: left; font-weight: bold; width: 70%;"> <td style="padding: 3px; text-align: left; font-weight: bold; width: 70%;">
<span style="padding-left: 20px; padding-right: 20px;">=</span> <span style="padding-left: 20px; padding-right: 20px;">=</span>
<div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;"> <div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }} Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
</div> </div>
</td> </td>
</tr> </tr>