diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 347d9c7..7049c2a 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -373,13 +373,14 @@ function checkRegionUserName($userId) } } -function getNomorLaporan($permohonanId, $documentId) +function getNomorLaporan($permohonanId, $documentId, $type = 'nomor_laporan') { + $laporan = Laporan::where([ 'permohonan_id' => $permohonanId, 'dokumen_jaminan_id' => $documentId, ])->first(); - return $laporan->nomor_laporan ?? null; + return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at; } function getCustomField($param) diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 54f7fa2..c8d856a 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -168,7 +168,7 @@

- {{ formatTanggalIndonesia($permohonan->created_at) }}

+ {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}

@@ -177,7 +177,12 @@

- {{ formatTanggalIndonesia($permohonan->created_at) }}

+ + @php + $tglLaporan = getNomorLaporan($permohonan->id, $dokumen->id, 'tanggal_laporan'); + @endphp + + {{ isset($tglLaporan) ? formatTanggalIndonesia($tglLaporan) : '-' }}

diff --git a/resources/views/surveyor/components/print-out/informasi.blade.php b/resources/views/surveyor/components/print-out/informasi.blade.php index b5f3dac..680a015 100644 --- a/resources/views/surveyor/components/print-out/informasi.blade.php +++ b/resources/views/surveyor/components/print-out/informasi.blade.php @@ -60,7 +60,7 @@ 'foto_gistaru' => 'Gistaru', 'foto_bhumi' => 'Bhumi', 'foto_argis_region' => 'Blad Tata Ruang ', - 'foto_tempat' => 'Tempat', + 'foto_tempat' => 'Peta Lokasi', ]; // Memindahkan foto_tempat ke depan jika ada if (($key = array_search('upload_gs', $fotoTypes)) !== false) {