diff --git a/app/Services/PreviewLaporanService.php b/app/Services/PreviewLaporanService.php index 90c01e2..6f6f68f 100644 --- a/app/Services/PreviewLaporanService.php +++ b/app/Services/PreviewLaporanService.php @@ -153,9 +153,18 @@ class PreviewLaporanService $lpj = Penilai::where('permohonan_id', $permohonan_id)->where('dokument_id', $document_id)->first(); $mig_permohonan = json_decode($permohonan->mig_permohonan); - $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; $lpjData = null; diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 30de3c3..2a8e9b3 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -545,7 +545,7 @@ X Rp - {{ $lpjData['nilai_' . $key . '_1'] ?? '' }} + {{ number_format($lpjData['nilai_' . $key . '_1'], 0, ',', '.') ?? '' }} = Rp @@ -563,7 +563,7 @@ X Rp - {{ $npw['nilai_1'] }} + {{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }} = Rp @@ -599,7 +599,7 @@ = Rp - {{ $lpjData['likuidasi_nilai_2'] ?? '' }} + {{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }} diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 6a60019..53af9d9 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -339,7 +339,7 @@ X Rp - {{ $lpjData['nilai_' . $key . '_1'] ?? '' }} + {{ number_format($lpjData['nilai_' . $key . '_1'], 0, ',', '.') ?? '' }} = Rp @@ -358,7 +358,7 @@ X Rp - {{ $npw['nilai_1'] }} + {{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }} = Rp @@ -395,7 +395,7 @@ = Rp - {{ $lpjData['likuidasi_nilai_2'] ?? '' }} + {{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }} @endif @@ -407,6 +407,33 @@ $keterangan = implode(', ', array_filter($keterangan)); } @endphp + @if($permohonan->is_mig) + @if (!empty($forminspeksi['fakta']['keterangan'])) + @foreach ($forminspeksi['fakta']['keterangan'] as $key => $item) + + + + +
+ {{ $key }} +
+ + + + +
+ @if (is_array($item)) + @foreach ($item as $data_) + {!! nl2br(e($data_)) !!}
+ @endforeach + @else + {!! nl2br(e($item)) !!} + @endif +
+ @endforeach + @endif + @endif; + @if (!empty($keterangan))