diff --git a/resources/views/component/detail-lokasi.blade.php b/resources/views/component/detail-lokasi.blade.php
index ddfa002..8c2ef39 100644
--- a/resources/views/component/detail-lokasi.blade.php
+++ b/resources/views/component/detail-lokasi.blade.php
@@ -1,10 +1,19 @@
@if (is_array($details) && count($details) > 0)
+ @php $currentKey = ''; @endphp
@foreach ($details as $value)
@foreach ($value as $key => $item)
+
@if (!empty($item))
|
- {{ formatLabel($key) }}
+ @if ($currentKey !== $key)
+ {{ formatLabel($key) }}
+ @endif
+ @php
+ if ($currentKey !== $key) {
+ $currentKey = $key;
+ }
+ @endphp
|
: |
diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php
index b534d49..0b87b66 100644
--- a/resources/views/penilai/components/footer.blade.php
+++ b/resources/views/penilai/components/footer.blade.php
@@ -39,18 +39,19 @@
];
$customLabels = [
- 'upload_gs' => 'Gambar Situasi',
- 'foto_sentuh_tanahku' => 'Sentuh Tanahku',
- 'foto_gistaru' => 'Gistaru',
- 'foto_bhumi' => 'Bhumi',
- 'foto_argis_region' => 'Blad Tata Ruang ',
- 'foto_tempat' => 'Peta Lokasi',
- ];
- // Memindahkan foto_tempat ke depan jika ada
- if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
- unset($fotoTypes[$key]);
- array_unshift($fotoTypes, 'upload_gs');
- }
+ 'upload_gs' => 'Gambar Situasi',
+ 'foto_sentuh_tanahku' => 'Sentuh Tanahku',
+ 'foto_gistaru' => 'Gistaru',
+ 'foto_bhumi' => 'Bhumi',
+ 'foto_argis_region' => 'Blad Tata Ruang ',
+ 'foto_tempat' => 'Peta Lokasi',
+ ];
+
+ // Memindahkan foto_tempat ke depan jika ada
+ if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
+ unset($fotoTypes[$key]);
+ array_unshift($fotoTypes, 'upload_gs');
+ }
// Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid
$validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) {
diff --git a/resources/views/penilai/components/foto-jaminan.blade.php b/resources/views/penilai/components/foto-jaminan.blade.php
index 64597e7..250875f 100644
--- a/resources/views/penilai/components/foto-jaminan.blade.php
+++ b/resources/views/penilai/components/foto-jaminan.blade.php
@@ -81,6 +81,32 @@
$groupedPhotos = collect($photos)->groupBy('category');
$mainPhotos = $groupedPhotos->filter(fn($_, $key) => strtolower($key) !== 'lainnya');
+
+ // Definisikan urutan yang diinginkan
+ $desiredOrder = [
+ 'PETA LOKASI',
+ 'GAMBAR SITUASI / SURAT UKUR',
+ 'BLAD TATA KOTA',
+ 'FOTO JAMINAN',
+ 'DOKUMEN PENDUKUNG'
+ ];
+
+ // Urutkan ulang $mainPhotos sesuai urutan yang diinginkan
+ $orderedMainPhotos = collect();
+ foreach ($desiredOrder as $category) {
+ if ($mainPhotos->has($category)) {
+ $orderedMainPhotos->put($category, $mainPhotos->get($category));
+ }
+ }
+
+ // Tambahkan kategori lain yang tidak ada dalam urutan yang diinginkan
+ foreach ($mainPhotos as $category => $photos) {
+ if (!in_array($category, $desiredOrder)) {
+ $orderedMainPhotos->put($category, $photos);
+ }
+ }
+
+ $mainPhotos = $orderedMainPhotos;
$otherPhotos = $groupedPhotos->get('lainnya', collect());
@endphp
@@ -88,6 +114,9 @@
Tidak ada foto yang tersedia.
@else
@foreach ($mainPhotos as $category => $photos)
+ @if($category=='DOKUMEN PENDUKUNG')
+ @php continue; @endphp
+ @endif
@php
$groupedBySubcategory = $photos->groupBy('sub');
@endphp
@@ -99,12 +128,35 @@
style="align-content: center; text-align: center; margin-bottom: 20px">
@foreach ($chunkedPhotos as $item)
@php
+ // Logika fallback untuk path file
+ $originalPath = $item['path'];
+ $fallbackPath = null;
+
+ // Jika file asli tidak ditemukan, buat fallback path
+ if ($statusLpj == 1) {
+ $fullOriginalPath = storage_path('app/public/' . $originalPath);
+
+ if (!file_exists($fullOriginalPath)) {
+ // Ekstrak bagian akhir path (contoh: 251051/251051_2_2.png)
+ $pathParts = explode('/', $originalPath);
+ if (count($pathParts) >= 2) {
+ $lastTwoParts = array_slice($pathParts, -2);
+ $fallbackPath = 'surveyor/001/' . implode('/', $lastTwoParts);
+ }
+ }
+ }
+
+ // Tentukan path yang akan digunakan
+ $pathToUse = ($fallbackPath && $statusLpj == 1 && file_exists(storage_path('app/public/' . $fallbackPath)))
+ ? $fallbackPath
+ : $originalPath;
+
$filePath =
$statusLpj == 1
- ? storage_path('app/public/' . $item['path'])
- : asset('storage/' . $item['path']);
+ ? storage_path('app/public/' . $pathToUse)
+ : asset('storage/' . $pathToUse);
- $extension = strtolower(pathinfo($item['path'], PATHINFO_EXTENSION));
+ $extension = strtolower(pathinfo($pathToUse, PATHINFO_EXTENSION));
$isImage = in_array($extension, [
'jpg',
'jpeg',
@@ -118,10 +170,10 @@
$isPdf = $extension === 'pdf';
@endphp
@if ($statusLpj == 1)
- @if ($isImage && $filePath)
+ @if ($isImage && $filePath)
|
|
+ class="border photo-item">
{{ $category }} -
@isset($subcategory)
@if (trim($subcategory) !== '')
@@ -130,7 +182,7 @@
@endisset
{{ $item['name'] ?? '' }}
- ![{{ $item['path'] }}]({{ $filePath }})
|
@@ -138,7 +190,7 @@
@elseif ($statusLpj != 1)
|
+ class="border photo-item">
{{ $category }} -
@isset($subcategory)
@@ -187,6 +239,7 @@
@endforeach
@if (!$otherPhotos->isEmpty())
+ @dd(!$otherPhotos->isEmpty())
@foreach ($otherPhotos->groupBy('sub') as $subcategory => $subPhotos)
@if (count($subPhotos) > 0)
@foreach ($subPhotos->chunk(2) as $chunkedPhotos)
@@ -216,7 +269,7 @@
@if ($isImage && $filePath)
|
|
+ class="border photo-item">
{{ $category }} -
@isset($subcategory)
@if (trim($subcategory) !== '')
@@ -232,7 +285,7 @@
@endif
@elseif ($statusLpj != 1)
|
- |
+ |
Lainnya -
@isset($subcategory)
@if (trim($subcategory) !== '')
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index b322e35..47696d0 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -252,7 +252,7 @@
|
- SARANA PELENGKAP DAN LINGKUNGAN
+ SARANA PELENGKAP DAN LINGKUNGAN --
|
@@ -520,7 +520,7 @@
- |
+ |
a. Total Nilai Pasar Wajar
|
@@ -545,15 +545,20 @@
@if (isset($lpjData['npw_tambahan']))
@foreach ($lpjData['npw_tambahan'] as $npw)
- |
- {{ $npw['name'] }} {{ $npw['luas'] }} m2
+ |
+ {{ $npw['name'] }}
|
-
- X Rp
+ |
+ {{ $npw['luas'] }} m2
+ |
+ X |
+
{{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }}
|
-
- = Rp
+ |
+ =
+ |
+
{{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
|
@@ -561,31 +566,27 @@
@endforeach
@endif
- | Total Nilai Pasar Wajar |
-
- =
+ | Total Nilai Pasar Wajar |
+ = |
+
- Rp {{ number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
+ {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
|
- |
+ |
b. Total Nilai Likuidasi
|
- |
- {{ $lpjData['likuidasi'] ?? '70' }}%
- |
-
- X Total Nilai Pasar
+ |
+ {{ $lpjData['likuidasi'] ?? '' }}% X Total Nilai Pasar
Wajar
|
-
- = Rp
- {{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
+ | = |
+ {{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
|
@@ -635,7 +636,7 @@
maupun ekstern |
- @include('lpj::penilai.components.signature-approval',['laporan' => 'sederhana'])
+ @include('lpj::penilai.components.signature-approval',['laporan' => 'sederhana','npw' => $totalNilaiPasarWajar])
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php
index 77baab4..6a80ca7 100644
--- a/resources/views/penilai/components/print-out-standar.blade.php
+++ b/resources/views/penilai/components/print-out-standar.blade.php
@@ -276,9 +276,19 @@
{{ $key }}
+ @php $currentLabel=''; @endphp
@foreach ($items as $item)
- | {{ $item['label'] }} |
+
+ @if ($currentLabel !== $item['label'])
+ {{ $item['label'] }}
+ @endif
+ @php
+ if ($currentLabel !== $item['label']) {
+ $currentLabel = $item['label'];
+ }
+ @endphp
+ |
: |
{{ ltrim($item['value'], ',') }} |
@@ -322,16 +332,16 @@
-
+
-
+
- | 1. Total Nilai Pasar Wajar
+ | 1. Total Nilai Pasar Wajar
|
@php
@@ -361,27 +371,31 @@
@if (isset($lpjData['npw_tambahan']))
@foreach ($lpjData['npw_tambahan'] as $npw)
- |
- {{ $npw['name'] }} {{ $npw['luas'] }} m2
+ |
+ {{ $npw['name'] }}
|
-
- X Rp
+ |
+ {{ $npw['luas'] }} m2
+ |
+ X |
+
{{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }}
|
-
- = Rp
+ | = |
+
{{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
|
@php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
@endforeach
@endif
+
- | Total Nilai Pasar Wajar |
-
- =
+ | Total Nilai Pasar Wajar |
+ = |
+
- Rp {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
+ {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
|
@@ -389,20 +403,16 @@
@if (isset($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi) || isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
- |
+ |
2. Total Nilai Likuidasi
|
- |
- {{ $lpjData['likuidasi'] ?? '70' }}%
+ |
+ {{ $lpjData['likuidasi'] ?? '' }}% X Total Nilai Pasar Wajar
|
-
- X Total Nilai Pasar Wajar
- |
-
- = Rp
- {{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
+ | = |
+ {{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
|
@endif
@@ -562,7 +572,7 @@
- @include('lpj::penilai.components.signature-approval')
+ @include('lpj::penilai.components.signature-approval',['laporan' => 'standar','npw' => $totalNilaiPasarWajar])
diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php
index 33d77ca..410cacb 100644
--- a/resources/views/penilai/components/signature-approval.blade.php
+++ b/resources/views/penilai/components/signature-approval.blade.php
@@ -1,7 +1,7 @@
@php
-
use Modules\Usermanagement\Models\User;
+
$laporan = $laporan ?? '';
$penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null;
$imagePathPenilai = $penilaiUser && $penilaiUser->sign
@@ -112,18 +112,19 @@
- {{ isset($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) ? formatTanggalIndonesia(parseTimestamp($permohonan_migrasi->mig_mst_jaminan_tgl_laporan)) : '' }}
+ {{ $permohonan_migrasi->mig_mst_jaminan_tgl_laporan ? formatTanggalIndonesia(parseTimestamp($permohonan_migrasi->mig_mst_jaminan_tgl_laporan)) : ($permohonan_migrasi->mig_mst_lpj_tgl_laporan ? formatTanggalIndonesia(parseTimestamp($permohonan_migrasi->mig_mst_lpj_tgl_laporan)) : '') }}
+
@if($soUser->name==$eoUser->name)
@if ($permohonan->approval_so != null)
|
{{ $soUser->name ?? $senior_officer->name ?? '' }}
- @if($laporan=='sederhana')
- {{ ucwords(strtolower('SENIOR OFFICER')) }}
+ @if($npw > 1000000000 && $npw < 5000000000)
+ {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
@else
- {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+ {{ ucwords(strtolower('SENIOR OFFICER')) }}
@endif
|