🔧(penilai): Perbaiki tampilan laporan & tambah fitur saran
- PreviewLaporanService.php: - Aktifkan kembali filter dokument_id untuk query Penilai - Tambahkan validasi dokumen ID agar data yang diambil tepat - Perbaiki logika pengambilan status LPJ untuk akurasi laporan - informasi.blade.php: - Tambahkan section baru untuk menampilkan data saran dari form inspeksi - Implementasi loop untuk menampilkan banyak saran (array/string) - Styling tabel saran dengan border & alignment konsisten - print-out-sederhana.blade.php: - Hilangkan koma awal di nilai dengan ltrim() untuk tampilan bersih - Konsistensi format antar section laporan - print-out-standar.blade.php: - Tambah field 'Fasilitas Kredit' dan 'Alamat & Telepon Debitur' - Perbaiki logika total nilai pasar wajar dengan conditional formatting - Tambah section saran yang konsisten dengan komponen lain - Hapus semicolon berlebih (syntax fix) - signature-approval.blade.php: - Ubah sumber tanggal dari updated_at ke tanggal_kunjungan untuk akurasi
This commit is contained in:
@@ -306,9 +306,10 @@ class PreviewLaporanService
|
|||||||
|
|
||||||
// Ambil data berdasarkan ID
|
// Ambil data berdasarkan ID
|
||||||
$statusLpj = Penilai::where('permohonan_id', $permohonan_id)
|
$statusLpj = Penilai::where('permohonan_id', $permohonan_id)
|
||||||
//->where('dokument_id', $dokumen_id)
|
->where('dokument_id', $dokumen_id)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
|
|
||||||
$permohonan = Permohonan::where('id', $permohonan_id)->first();
|
$permohonan = Permohonan::where('id', $permohonan_id)->first();
|
||||||
|
|
||||||
// Jika data tidak ditemukan, kembalikan status null
|
// Jika data tidak ditemukan, kembalikan status null
|
||||||
|
|||||||
@@ -25,6 +25,31 @@
|
|||||||
</table>
|
</table>
|
||||||
@endforeach
|
@endforeach
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
@if (!empty($forminspeksi['fakta']['saran']))
|
||||||
|
@foreach ($forminspeksi['fakta']['saran'] as $key => $item)
|
||||||
|
<table class="judul" style="width: 100%; ">
|
||||||
|
<tr>
|
||||||
|
<td style="width: 100%; border: 1px solid #000; text-align: center;">
|
||||||
|
SARAN
|
||||||
|
</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
|
||||||
@else
|
@else
|
||||||
<tr>
|
<tr>
|
||||||
<td width="25%" style="vertical-align: top;">Informasi Dinas Tata Ruang
|
<td width="25%" style="vertical-align: top;">Informasi Dinas Tata Ruang
|
||||||
|
|||||||
@@ -305,7 +305,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td style="padding: 2px; vertical-align: top;">{{ $item['label'] }}</td>
|
<td style="padding: 2px; vertical-align: top;">{{ $item['label'] }}</td>
|
||||||
<td style="padding: 2px; vertical-align: top;">:</td>
|
<td style="padding: 2px; vertical-align: top;">:</td>
|
||||||
<td style="padding: 2px; vertical-align: top;">{{ $item['value'] }}</td>
|
<td style="padding: 2px; vertical-align: top;">{{ ltrim($item['value'], ',') }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</table>
|
</table>
|
||||||
@@ -466,7 +466,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td style="padding: 2px; vertical-align: top;">{{ $item['label'] }}</td>
|
<td style="padding: 2px; vertical-align: top;">{{ $item['label'] }}</td>
|
||||||
<td style="padding: 2px; vertical-align: top;">:</td>
|
<td style="padding: 2px; vertical-align: top;">:</td>
|
||||||
<td style="padding: 2px; vertical-align: top;">{{ $item['value'] }}</td>
|
<td style="padding: 2px; vertical-align: top;">{{ ltrim($item['value'], ',') }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -61,6 +61,12 @@
|
|||||||
<td style="vertical-align: top; padding: 2px;">
|
<td style="vertical-align: top; padding: 2px;">
|
||||||
{{ $permohonan->tujuanPenilaian->name ?? '' }}</td>
|
{{ $permohonan->tujuanPenilaian->name ?? '' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style=" padding: 2px; vertical-align: top;">Fasilitas Kredit</td>
|
||||||
|
<td style=" padding: 2px; vertical-align: top;">:</td>
|
||||||
|
<td style=" padding: 2px; vertical-align: top;">
|
||||||
|
{{ $permohonan->jenisFasilitasKredit->name ?? '' }}</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="width: 25%; padding: 2px;">Ao</td>
|
<td style="width: 25%; padding: 2px;">Ao</td>
|
||||||
<td style="width: 1%; padding: 2px;">:</td>
|
<td style="width: 1%; padding: 2px;">:</td>
|
||||||
@@ -103,6 +109,13 @@
|
|||||||
<td style="width: 1%; vertical-align: top;">:</td>
|
<td style="width: 1%; vertical-align: top;">:</td>
|
||||||
<td style="vertical-align: top; ">{{ $permohonan->debiture->name ?? '' }}</td>
|
<td style="vertical-align: top; ">{{ $permohonan->debiture->name ?? '' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Alamat dan Telpon</td>
|
||||||
|
<td style="padding: 2px; vertical-align: top;">:</td>
|
||||||
|
<td style="padding: 2px; vertical-align: top;">
|
||||||
|
{{ $permohonan->debiture->address ?? '' }} {{ $permohonan->debiture->phone ?? '' }}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="width: 25%; padding: 2px; vertical-align: top;">Debitur / Wakil Debitur</td>
|
<td style="width: 25%; padding: 2px; vertical-align: top;">Debitur / Wakil Debitur</td>
|
||||||
<td style="width: 1%; vertical-align: top;">:</td>
|
<td style="width: 1%; vertical-align: top;">:</td>
|
||||||
@@ -385,7 +398,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'] ?? number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
|
Rp {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -517,7 +530,32 @@
|
|||||||
</table>
|
</table>
|
||||||
@endforeach
|
@endforeach
|
||||||
@endif
|
@endif
|
||||||
@endif;
|
|
||||||
|
@if (!empty($forminspeksi['fakta']['saran']))
|
||||||
|
@foreach ($forminspeksi['fakta']['saran'] as $key => $item)
|
||||||
|
<table class="judul" style="width: 100%; ">
|
||||||
|
<tr>
|
||||||
|
<td style="width: 100%; border: 1px solid #000; text-align: center;">
|
||||||
|
SARAN
|
||||||
|
</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">
|
||||||
|
|||||||
@@ -106,7 +106,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</br>
|
</br>
|
||||||
<span>
|
<span>
|
||||||
{{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }}
|
{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
@if($soUser->name==$eoUser->name)
|
@if($soUser->name==$eoUser->name)
|
||||||
|
|||||||
Reference in New Issue
Block a user