🔧(penilai): Perbaikan tampilan dan logika fallback foto jaminan
Implementasi berbagai perbaikan pada komponen penilai dan foto jaminan: **Detail Lokasi (detail-lokasi.blade.php):** - Menambahkan logika untuk menghindari duplikasi label yang sama - Implementasi tracking currentKey untuk mencegah label berulang - Perbaikan tampilan tabel dengan label yang lebih bersih **Footer (footer.blade.php):** - Perbaikan indentasi dan formatting kode - Reorganisasi array customLabels untuk konsistensi - Perbaikan struktur conditional untuk upload_gs **Foto Jaminan (foto-jaminan.blade.php):** - Implementasi sistem fallback path untuk file foto yang tidak ditemukan - Logika fallback: surveyor/2025/APRIL/26042025/251051/251051_2_2.png → surveyor/001/251051/251051_2_2.png - Penambahan urutan kategori foto yang diinginkan (BLAD TATA KOTA sebelum FOTO JAMINAN) - Skip kategori DOKUMEN PENDUKUNG dari tampilan utama - Perbaikan class ordering (border photo-item) - Update alt attribute untuk menggunakan pathToUse - Penambahan debug @dd untuk otherPhotos (sementara) **Print Out Sederhana (print-out-sederhana.blade.php):** - Perbaikan tampilan Total Nilai Pasar Wajar dengan colspan yang benar - Restructuring tabel NPW tambahan dengan width yang tepat - Perbaikan alignment dan formatting nilai - Update parameter signature-approval dengan npw - Perbaikan tampilan Total Nilai Likuidasi - Penambahan tanda '--' pada SARANA PELENGKAP DAN LINGKUNGAN **Print Out Standar (print-out-standar.blade.php):** - Implementasi logika untuk menghindari duplikasi label - Perbaikan struktur tabel dengan width 100% - Update tracking currentLabel untuk konsistensi tampilan
This commit is contained in:
@@ -276,9 +276,19 @@
|
||||
{{ $key }}
|
||||
</td>
|
||||
</tr>
|
||||
@php $currentLabel=''; @endphp
|
||||
@foreach ($items as $item)
|
||||
<tr>
|
||||
<td style="padding: 2px; vertical-align: top;">{{ $item['label'] }}</td>
|
||||
<td style="padding: 2px; vertical-align: top;">
|
||||
@if ($currentLabel !== $item['label'])
|
||||
{{ $item['label'] }}
|
||||
@endif
|
||||
@php
|
||||
if ($currentLabel !== $item['label']) {
|
||||
$currentLabel = $item['label'];
|
||||
}
|
||||
@endphp
|
||||
</td>
|
||||
<td style="padding: 2px; vertical-align: top;">:</td>
|
||||
<td style="padding: 2px; vertical-align: top;">{{ ltrim($item['value'], ',') }}</td>
|
||||
</tr>
|
||||
@@ -322,16 +332,16 @@
|
||||
</div>
|
||||
|
||||
<div class="no-break">
|
||||
<table style="width: 100%; ">
|
||||
<table style="width: 100%;">
|
||||
<tr>
|
||||
<td style="width: 100%; border: 1px solid #000; text-align: center;">
|
||||
TOTAL NILAI PASAR WAJAR
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table>
|
||||
<table style="width: 100%;">
|
||||
<tr>
|
||||
<td colspan="3" style=" padding: 8px; text-align: left;">1. Total Nilai Pasar Wajar
|
||||
<td colspan="6" style=" padding: 8px; text-align: left;width:100%">1. Total Nilai Pasar Wajar
|
||||
</td>
|
||||
</tr>
|
||||
@php
|
||||
@@ -361,27 +371,31 @@
|
||||
@if (isset($lpjData['npw_tambahan']))
|
||||
@foreach ($lpjData['npw_tambahan'] as $npw)
|
||||
<tr>
|
||||
<td style="padding: 3px; text-align: right;width:45%; ">
|
||||
{{ $npw['name'] }} {{ $npw['luas'] }} m<sup>2</sup>
|
||||
<td width="30%" style="padding: 3px; text-align: right;">
|
||||
{{ $npw['name'] }}</sup>
|
||||
</td>
|
||||
<td style="padding: 3px;">
|
||||
<span style="padding-left:20px; padding-right: 20px">X</span> Rp
|
||||
<td width="10%" style="padding: 3px; text-align: right;">
|
||||
{{ $npw['luas'] }} 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">
|
||||
{{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }}
|
||||
</td>
|
||||
<td style="padding: 3px; text-align: left; width:70%">
|
||||
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp
|
||||
<td width="5" style="padding: 3px; text-align: center;">=</td>
|
||||
<td width="25%" style="padding: 3px; text-align: left; text-align: right;">
|
||||
{{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
|
||||
</td>
|
||||
</tr>
|
||||
@php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
<tr>
|
||||
<td style="padding: 3px; text-align: right; font-weight: bold; width:10%;" colspan="2">Total Nilai Pasar Wajar</td>
|
||||
<td style="padding: 3px; text-align: left; font-weight: bold; width: 70%;">
|
||||
<span style="padding-left: 20px; padding-right: 20px;">=</span>
|
||||
<td style="padding: 3px; text-align: right; font-weight: bold; width:10%;" colspan="4">Total Nilai Pasar Wajar</td>
|
||||
<td style="padding: 3px; text-align: center; width:5%;font-weight: bold;" >=</td>
|
||||
<td style="padding: 3px; text-align: right; font-weight: bold; width: 40%;">
|
||||
<div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
|
||||
Rp {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
|
||||
{{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -389,20 +403,16 @@
|
||||
<!-- Total Nilai Likuidasi -->
|
||||
@if (isset($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi) || isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
|
||||
<tr>
|
||||
<td colspan="3" style="padding: 8px; text-align: left">
|
||||
<td colspan="6" style="padding: 8px; text-align: left">
|
||||
2. Total Nilai Likuidasi
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding: 3px; text-align: right; width:10%">
|
||||
{{ $lpjData['likuidasi'] ?? '70' }}%
|
||||
<td style="padding: 3px; text-align: right;" colspan="4">
|
||||
{{ $lpjData['likuidasi'] ?? '' }}% <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
|
||||
</td>
|
||||
<td style="padding: 3px; text-align: left; font-weight: bold; width:20%">
|
||||
<span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
|
||||
</td>
|
||||
<td style="padding: 3px; text-align: left; width:70%;">
|
||||
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp
|
||||
{{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
|
||||
<td style="padding: 3px; text-align: center; font-weight: bold;">=</td>
|
||||
<td style="padding: 3px; text-align: right;font-weight: bold;">{{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@@ -562,7 +572,7 @@
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@include('lpj::penilai.components.signature-approval')
|
||||
@include('lpj::penilai.components.signature-approval',['laporan' => 'standar','npw' => $totalNilaiPasarWajar])
|
||||
</div>
|
||||
<hr />
|
||||
<table style="width: 100%; ">
|
||||
|
||||
Reference in New Issue
Block a user