From 2937add64606d95af69e76c098b507cfaf013430 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 16 Oct 2025 10:04:40 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(ui-print):=20Format=20nilai?=
 =?UTF-8?q?=20pasar=20wajar=20&=20perbaiki=20hitung=20hari=20kerja=20migra?=
 =?UTF-8?q?si?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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
---
 .../components/analisa/informasi.blade.php    | 20 ++++++++++++-------
 .../components/print-out-sederhana.blade.php  |  6 +++---
 .../components/print-out-standar.blade.php    |  9 ++++++---
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/resources/views/penilai/components/analisa/informasi.blade.php b/resources/views/penilai/components/analisa/informasi.blade.php
index 1bf8323..28a4978 100644
--- a/resources/views/penilai/components/analisa/informasi.blade.php
+++ b/resources/views/penilai/components/analisa/informasi.blade.php
@@ -10,13 +10,19 @@
                         </td>
                     </tr>
                 </table>
-                @if (is_array($item))
-                    @foreach ($item as $data_)
-                        {!! nl2br(e($data_)) !!}
-                    @endforeach
-                @else
-                    {!! nl2br(e($item)) !!}
-                @endif
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            @if (is_array($item))
+                                @foreach ($item as $data_)
+                                    {!! nl2br(e($data_)) !!}<br>
+                                @endforeach
+                            @else
+                                {!! nl2br(e($item)) !!}
+                            @endif
+                        </td>
+                    </tr>
+                </table>
             @endforeach
         @endif
     @else
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 6b354e9..30de3c3 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -129,7 +129,7 @@
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td>
                             @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
                             {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }}
                             @endif
@@ -549,7 +549,7 @@
                                     </td>
                                     <td style="padding: 3px; text-align: left; width:40%;">
                                         <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                                        {{ $lpjData['nilai_' . $key . '_2'] ?? '' }}
+                                        {{ number_format($lpjData['nilai_' . $key . '_2'], 0, ',', '.') ?? '' }}
                                     </td>
                                 </tr>
                                 @php $totalNilaiPasarWajar += $lpjData['nilai_' . $key . '_2']; @endphp
@@ -567,7 +567,7 @@
                                     </td>
                                     <td style="padding: 3px; text-align: left; width:40%">
                                         <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                                        {{ $npw['nilai_2'] }}
+                                        {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
                                     </td>
                                 </tr>
                                 @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php
index 12c3aa2..6a60019 100644
--- a/resources/views/penilai/components/print-out-standar.blade.php
+++ b/resources/views/penilai/components/print-out-standar.blade.php
@@ -313,6 +313,7 @@
                 </td>
             </tr>
             @php
+                $totalNilaiPasarWajar = 0;
                 $labelNilai = [
                     'bangunan' => 'Luas Bangunan',
                     'tanah' => 'Luas Tanah',
@@ -342,9 +343,10 @@
                         </td>
                         <td style="padding: 3px; text-align: left; width:60%;">
                             <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                            {{ $lpjData['nilai_' . $key . '_2'] ?? '' }}
+                            {{ number_format($lpjData['nilai_' . $key . '_2'], 0, ',', '.') ?? '' }}
                         </td>
                     </tr>
+                    @php $totalNilaiPasarWajar += $lpjData['nilai_' . $key . '_2']; @endphp
                 @endif
             @endforeach
 
@@ -360,9 +362,10 @@
                         </td>
                         <td style="padding: 3px; text-align: left; width:70%">
                             <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                            {{ $npw['nilai_2'] }}
+                            {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
                         </td>
                     </tr>
+                    @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
                 @endforeach
             @endif
             <tr>
@@ -371,7 +374,7 @@
                 <td style="padding: 3px; text-align: left; font-weight: bold; width: 70%;">
                     <span style="padding-left: 20px; padding-right: 20px;">=</span>
                     <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>
                 </td>
             </tr>