From a6481dd4827a464f0fc5bd6666bcdc80c9670635 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 27 Oct 2025 15:13:35 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(penilai):=20Perbaiki=20tampilan=20?= =?UTF-8?q?laporan=20&=20tambah=20fitur=20saran?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- app/Services/PreviewLaporanService.php | 3 +- .../components/analisa/informasi.blade.php | 25 +++++++++++ .../components/print-out-sederhana.blade.php | 4 +- .../components/print-out-standar.blade.php | 42 ++++++++++++++++++- .../components/signature-approval.blade.php | 2 +- 5 files changed, 70 insertions(+), 6 deletions(-) diff --git a/app/Services/PreviewLaporanService.php b/app/Services/PreviewLaporanService.php index 9a5b795..014f9d2 100644 --- a/app/Services/PreviewLaporanService.php +++ b/app/Services/PreviewLaporanService.php @@ -306,9 +306,10 @@ class PreviewLaporanService // Ambil data berdasarkan ID $statusLpj = Penilai::where('permohonan_id', $permohonan_id) - //->where('dokument_id', $dokumen_id) + ->where('dokument_id', $dokumen_id) ->first(); + $permohonan = Permohonan::where('id', $permohonan_id)->first(); // Jika data tidak ditemukan, kembalikan status null diff --git a/resources/views/penilai/components/analisa/informasi.blade.php b/resources/views/penilai/components/analisa/informasi.blade.php index 28a4978..3fafae1 100644 --- a/resources/views/penilai/components/analisa/informasi.blade.php +++ b/resources/views/penilai/components/analisa/informasi.blade.php @@ -25,6 +25,31 @@ @endforeach @endif + + @if (!empty($forminspeksi['fakta']['saran'])) + @foreach ($forminspeksi['fakta']['saran'] as $key => $item) + + + + +
+ SARAN +
+ + + + +
+ @if (is_array($item)) + @foreach ($item as $data_) + {!! nl2br(e($data_)) !!}
+ @endforeach + @else + {!! nl2br(e($item)) !!} + @endif +
+ @endforeach + @endif @else Informasi Dinas Tata Ruang diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index dc2e859..5c2c7a0 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -305,7 +305,7 @@ {{ $item['label'] }} : - {{ $item['value'] }} + {{ ltrim($item['value'], ',') }} @endforeach @@ -466,7 +466,7 @@ {{ $item['label'] }} : - {{ $item['value'] }} + {{ ltrim($item['value'], ',') }} @endforeach diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 65ca741..2a5b2c1 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -61,6 +61,12 @@ {{ $permohonan->tujuanPenilaian->name ?? '' }} + + Fasilitas Kredit + : + + {{ $permohonan->jenisFasilitasKredit->name ?? '' }} + Ao : @@ -103,6 +109,13 @@ : {{ $permohonan->debiture->name ?? '' }} + + Alamat dan Telpon + : + + {{ $permohonan->debiture->address ?? '' }} {{ $permohonan->debiture->phone ?? '' }} + + Debitur / Wakil Debitur : @@ -385,7 +398,7 @@ =
- 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, ',', '.') ?? '' }}
@@ -517,7 +530,32 @@ @endforeach @endif - @endif; + + @if (!empty($forminspeksi['fakta']['saran'])) + @foreach ($forminspeksi['fakta']['saran'] as $key => $item) + + + + +
+ SARAN +
+ + + + +
+ @if (is_array($item)) + @foreach ($item as $data_) + {!! nl2br(e($data_)) !!}
+ @endforeach + @else + {!! nl2br(e($item)) !!} + @endif +
+ @endforeach + @endif + @endif @if (!empty($keterangan)) diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php index 0762f67..bd748f2 100644 --- a/resources/views/penilai/components/signature-approval.blade.php +++ b/resources/views/penilai/components/signature-approval.blade.php @@ -106,7 +106,7 @@
- {{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }} + {{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }} @if($soUser->name==$eoUser->name)