daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(penilai) : perbaikkan , tampilan tanggal permohonan, konfirmasi kunjunagan, laporan, dan survey, ganti nama tempat ke peta lokasi

Browse Source
This commit is contained in:
majid
2025-03-10 04:19:34 +07:00
parent c37ac7e120
commit 117e82765c
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Helpers/Lpj.php
View File

@@ -373,13 +373,14 @@ function checkRegionUserName($userId)
} }
} }
function getNomorLaporan($permohonanId, $documentId) function getNomorLaporan($permohonanId, $documentId, $type = 'nomor_laporan')
{ {
$laporan = Laporan::where([ $laporan = Laporan::where([
'permohonan_id' => $permohonanId, 'permohonan_id' => $permohonanId,
'dokumen_jaminan_id' => $documentId, 'dokumen_jaminan_id' => $documentId,
])->first(); ])->first();
return $laporan->nomor_laporan ?? null; return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at;
} }
function getCustomField($param) function getCustomField($param)

9
resources/views/penilai/show.blade.php
View File

@@ -168,7 +168,7 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ formatTanggalIndonesia($permohonan->created_at) }}</p> {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</p>
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -177,7 +177,12 @@
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ formatTanggalIndonesia($permohonan->created_at) }}</p>
@php
$tglLaporan = getNomorLaporan($permohonan->id, $dokumen->id, 'tanggal_laporan');
@endphp
{{ isset($tglLaporan) ? formatTanggalIndonesia($tglLaporan) : '-' }}</p>
</div> </div>
</div> </div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">

2
resources/views/surveyor/components/print-out/informasi.blade.php
View File

@@ -60,7 +60,7 @@
'foto_gistaru' => 'Gistaru', 'foto_gistaru' => 'Gistaru',
'foto_bhumi' => 'Bhumi', 'foto_bhumi' => 'Bhumi',
'foto_argis_region' => 'Blad Tata Ruang ', 'foto_argis_region' => 'Blad Tata Ruang ',
'foto_tempat' => 'Tempat', 'foto_tempat' => 'Peta Lokasi',
]; ];
// Memindahkan foto_tempat ke depan jika ada // Memindahkan foto_tempat ke depan jika ada
if (($key = array_search('upload_gs', $fotoTypes)) !== false) { if (($key = array_search('upload_gs', $fotoTypes)) !== false) {