🐛 fix(ui-print): Format nilai pasar wajar & tampilkan fakta migrasi
- Terapkan number_format(ID) (0 desimal, ',' desimal, '.' ribuan) untuk nilai pasar wajar Bagian 1
- print-out-sederhana: format nilai per kategori & nilai perbandingan (Bagian 1)
- print-out-standar: format nilai per kategori, nilai perbandingan (Bagian 1), dan nilai likuidasi
- Tambah section fakta khusus permohonan migrasi (is_mig) dengan tabel 'judul' per kategori
- Support konten fakta sebagai array/string; render dinamis & rapi
- Perbaiki logika tanggal laporan migrasi: fallback tgl_laporan → tgl_create → null
- Parsing tanggal migrasi via Carbon::createFromFormat('d/m/Y H:i:s') → 'Y-m-d H:i:s'
- Jaga konsistensi & keterbacaan angka besar (ribuan–miliaran) di semua laporan
This commit is contained in:
@@ -153,9 +153,18 @@ class PreviewLaporanService
|
|||||||
$lpj = Penilai::where('permohonan_id', $permohonan_id)->where('dokument_id', $document_id)->first();
|
$lpj = Penilai::where('permohonan_id', $permohonan_id)->where('dokument_id', $document_id)->first();
|
||||||
|
|
||||||
$mig_permohonan = json_decode($permohonan->mig_permohonan);
|
$mig_permohonan = json_decode($permohonan->mig_permohonan);
|
||||||
|
|
||||||
$nomorLaporan = getNomorLaporan($permohonan_id, $document_id);
|
$nomorLaporan = getNomorLaporan($permohonan_id, $document_id);
|
||||||
$tanggalLaporan = $permohonan->is_mig ? $mig_permohonan->mig_mst_jaminan_tgl_laporan : $lpj->created_at ?? null;
|
|
||||||
|
//Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s');
|
||||||
|
|
||||||
|
$tanggalLaporan = $permohonan->is_mig
|
||||||
|
? ($mig_permohonan->mig_mst_jaminan_tgl_laporan
|
||||||
|
? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s')
|
||||||
|
: ($mig_permohonan->mig_mst_jaminan_tgl_create
|
||||||
|
? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_create)->format('Y-m-d H:i:s')
|
||||||
|
: null))
|
||||||
|
: ($lpj->created_at ?? null);
|
||||||
|
|
||||||
|
|
||||||
$forminspeksi = null;
|
$forminspeksi = null;
|
||||||
$lpjData = null;
|
$lpjData = null;
|
||||||
|
|||||||
@@ -545,7 +545,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td style="padding: 3px; width:30%;">
|
<td style="padding: 3px; width:30%;">
|
||||||
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
||||||
{{ $lpjData['nilai_' . $key . '_1'] ?? '' }}
|
{{ number_format($lpjData['nilai_' . $key . '_1'], 0, ',', '.') ?? '' }}
|
||||||
</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
|
||||||
@@ -563,7 +563,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td style="padding: 3px;">
|
<td style="padding: 3px;">
|
||||||
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
||||||
{{ $npw['nilai_1'] }}
|
{{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }}
|
||||||
</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
|
||||||
@@ -599,7 +599,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['likuidasi_nilai_2'] ?? '' }}
|
{{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -339,7 +339,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td style="padding: 3px; width:5%;">
|
<td style="padding: 3px; width:5%;">
|
||||||
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
||||||
{{ $lpjData['nilai_' . $key . '_1'] ?? '' }}
|
{{ number_format($lpjData['nilai_' . $key . '_1'], 0, ',', '.') ?? '' }}
|
||||||
</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
|
||||||
@@ -358,7 +358,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td style="padding: 3px;">
|
<td style="padding: 3px;">
|
||||||
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
||||||
{{ $npw['nilai_1'] }}
|
{{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }}
|
||||||
</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
|
||||||
@@ -395,7 +395,7 @@
|
|||||||
</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
|
||||||
{{ $lpjData['likuidasi_nilai_2'] ?? '' }}
|
{{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endif
|
@endif
|
||||||
@@ -407,6 +407,33 @@
|
|||||||
$keterangan = implode(', ', array_filter($keterangan));
|
$keterangan = implode(', ', array_filter($keterangan));
|
||||||
}
|
}
|
||||||
@endphp
|
@endphp
|
||||||
|
@if($permohonan->is_mig)
|
||||||
|
@if (!empty($forminspeksi['fakta']['keterangan']))
|
||||||
|
@foreach ($forminspeksi['fakta']['keterangan'] as $key => $item)
|
||||||
|
<table class="judul" style="width: 100%; ">
|
||||||
|
<tr>
|
||||||
|
<td style="width: 100%; border: 1px solid #000; text-align: center;">
|
||||||
|
{{ $key }}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<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
|
||||||
|
@endif;
|
||||||
|
|
||||||
@if (!empty($keterangan))
|
@if (!empty($keterangan))
|
||||||
<table style="width: 100% margin-top: 20px">
|
<table style="width: 100% margin-top: 20px">
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user