diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 948cc97..ef8f9ff 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -571,7 +571,7 @@ class PenilaiController extends Controller try { $validatedRequest = app(FormSurveyorRequest::class); $this->surveyorController->store($validatedRequest); - + $data = [ 'luas_tanah' => $request->input('luas_tanah'), 'nilai_tanah_1' => $request->input('nilai_tanah_1'), @@ -590,10 +590,10 @@ class PenilaiController extends Controller 'asuransi_nilai_1' => $request->input('asuransi_nilai_1'), 'asuransi_nilai_2' => $request->input('asuransi_nilai_2'), ]; - + $npwData = []; $npwCounter = 1; - + while ($request->has("name_npw_{$npwCounter}")) { $npwData[] = [ @@ -604,11 +604,11 @@ class PenilaiController extends Controller ]; $npwCounter++; } - + if (!empty($npwData)) { $data['npw_tambahan'] = $npwData; } - + // Update atau buat data baru $penilai = Penilai::updateOrCreate( [ @@ -620,7 +620,7 @@ class PenilaiController extends Controller 'lpj' => json_encode($data), ] ); - + return response()->json([ 'success' => true, 'message' => 'Berhasil menyimpan LPJ', @@ -635,7 +635,7 @@ class PenilaiController extends Controller ], 500); } } - + public function print_out(Request $request) diff --git a/resources/views/penilai/components/foto-jaminan.blade.php b/resources/views/penilai/components/foto-jaminan.blade.php index 4681453..8c895e2 100644 --- a/resources/views/penilai/components/foto-jaminan.blade.php +++ b/resources/views/penilai/components/foto-jaminan.blade.php @@ -55,8 +55,8 @@ @endif - @if (isset($formFoto['foto_lantai_unit']['foto_lantai_unit'] )) - @foreach ($formFoto['foto_lantai_unit']['foto_lantai_unit'] as $index => $floorPhotos) + @if (isset($formFoto['foto_lantai_unit'] )) + @foreach ($formFoto['foto_lantai_unit'] as $index => $floorPhotos) @foreach ($floorPhotos as $index => $item)

@@ -75,7 +75,7 @@ @endforeach @endif - {{-- @if (isset($formFoto['foto_lingkungan']['foto_lingkungan'])) + @if (isset($formFoto['foto_lingkungan']['foto_lingkungan'])) @foreach ($formFoto['foto_lingkungan']['foto_lingkungan'][0] as $index => $item)

@@ -91,7 +91,7 @@ @endif

@endforeach - @endif --}} + @endif @if (isset($formFoto['foto_basement']))
diff --git a/resources/views/penilai/components/foto-lampiran.blade.php b/resources/views/penilai/components/foto-lampiran.blade.php index f5a8531..796dce2 100644 --- a/resources/views/penilai/components/foto-lampiran.blade.php +++ b/resources/views/penilai/components/foto-lampiran.blade.php @@ -23,6 +23,7 @@

+@if (isset($formFoto['foto_rute_lainnya']))

@@ -47,7 +48,7 @@ @endif

- +@endif
@@ -74,13 +75,14 @@
+@if (isset($formFoto['foto_lantai_unit']))

Lantai

- @if (isset($formFoto['foto_lantai_unit']['foto_lantai_unit'])) - @foreach ($formFoto['foto_lantai_unit']['foto_lantai_unit'] as $floorIndex => $floorPhotos) + @if (isset($formFoto['foto_lantai_unit'])) + @foreach ($formFoto['foto_lantai_unit'] as $floorIndex => $floorPhotos)
@foreach ($floorPhotos as $index => $item)
@@ -102,7 +104,7 @@ @endif
- +@endif
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php index c24f439..ad9af9a 100644 --- a/resources/views/penilai/components/print-out-standard.blade.php +++ b/resources/views/penilai/components/print-out-standard.blade.php @@ -498,9 +498,11 @@ @php - $cekHub = isset($forminspeksi['asset']['hub_cadeb']) && $forminspeksi['asset']['hub_cadeb'] === 'sesuai' - ? 'sesuai' - : 'tidak sesuai'; + $cekHub = + isset($forminspeksi['asset']['hub_cadeb']) && + $forminspeksi['asset']['hub_cadeb'] === 'sesuai' + ? 'sesuai' + : 'tidak sesuai'; $hubCadeb = isset($forminspeksi['asset']['hub_cadeb'][$cekHub]) ? $forminspeksi['asset']['hub_cadeb'][$cekHub] @@ -523,48 +525,49 @@ @php $count++; @endphp @if ($count % 3 === 0) - - @endif - @endforeach - - {{-- Isi kolom kosong jika tidak genap --}} - @if ($count % 3 !== 0) - @for ($i = 0; $i < (3 - $count % 3); $i++) - - @endfor - @endif - + @endif - + @endforeach + + {{-- Isi kolom kosong jika tidak genap --}} + @if ($count % 3 !== 0) + @for ($i = 0; $i < 3 - ($count % 3); $i++) + + @endfor + @endif + + @endif + + - - @php + + @php - $cekHub = - isset($forminspeksi['asset']['hub_cadeb_penghuni']) && - $forminspeksi['asset']['hub_cadeb_penghuni'] === 'sesuai' - ? 'sesuai' - : 'tidak sesuai'; + $cekHub = + isset($forminspeksi['asset']['hub_cadeb_penghuni']) && + $forminspeksi['asset']['hub_cadeb_penghuni'] === 'sesuai' + ? 'sesuai' + : 'tidak sesuai'; - $hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub]) - ? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai'] - : $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']; - @endphp - Hubungan Penghuni Jaminan dengan Debitur - - @if (isset($basicData['hubPenghuni'])) - - - - -
- {{ $hubCadeb ?? '' }} -
- @endif - - + $hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub]) + ? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai'] + : $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']; + @endphp + Hubungan Penghuni Jaminan dengan Debitur + + @if (isset($basicData['hubPenghuni'])) + + + + +
+ {{ $hubCadeb ?? '' }} +
+ @endif + + @@ -836,44 +839,48 @@ @if (isset($basicData['spekKategoriBangunan'])) - @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi) - - {{ $spesifikasi->name }} - - - @if (isset($basicData['spekBangunan'])) - @php $count = 0; @endphp - - @foreach ($basicData['spekBangunan'] as $kategori) - @if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id) - - @php $count++; @endphp + @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi) + + + - - @endforeach -@endif + + + @endforeach + @endif @@ -893,7 +900,7 @@
- -
{{ $spesifikasi->name }} + + @if (isset($basicData['spekBangunan'])) + @php $count = 0; @endphp + + @foreach ($basicData['spekBangunan'] as $kategori) + @if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id) + + @php $count++; @endphp - @if ($count % 3 == 0) - - @endif - @endif - @endforeach - + @if ($count % 3 == 0) + + + @endif @endif + @endforeach + + @endif
+ +
-
- @elseif ($kategori === 'apartemen-kantor') + @elseif ($kategori === 'apartemen-kantor') @php @@ -1270,53 +1277,85 @@ + {{-- Faktor Negatif --}} + + {{-- Lain-lain --}} + @@ -1371,17 +1410,23 @@ +
Faktor Negatif - @isset($forminspeksi['fakta']['fakta_negatif']) + @php + $faktaNegatif = $forminspeksi['fakta']['fakta_negatif'] ?? []; + $faktaNegatifFiltered = is_array($faktaNegatif) + ? array_filter($faktaNegatif, function ($item) { + return !empty(trim($item)); + }) + : []; + @endphp + + @if (!empty($faktaNegatifFiltered)) - @foreach ($forminspeksi['fakta']['fakta_negatif'] as $key => $item) + @foreach ($faktaNegatifFiltered as $key => $item) - + @endforeach
[{{ $key }}] {{ $item }}[{{ $key + 1 }}] {{ $item }}
- @endisset + @else +

Tidak ada faktor negatif yang teridentifikasi.

+ @endif
Lain - lain :

- Berdasarkan hasil kunjungan di lapangan dapat disampaikan sebagai berikut :

- @isset($forminspeksi['fakta']) - @foreach ($forminspeksi['fakta'] as $key => $item) - @if ( - !in_array($key, [ - 'fakta_positif', - 'fakta_negatif', - 'rute_menuju', - 'batas_batas', - 'batas_batas_input', - 'kondisi_lingkungan', - 'kondisi_lain_bangunan', - 'informasi_dokument', - ])) + @php + $excludedKeys = [ + 'fakta_positif', + 'fakta_negatif', + 'rute_menuju', + 'batas_batas', + 'batas_batas_input', + 'kondisi_lingkungan', + 'kondisi_lain_bangunan', + 'informasi_dokument', + ]; + + $additionalFakta = []; + if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) { + foreach ($forminspeksi['fakta'] as $key => $item) { + // Cek apakah key tidak ada di daftar yang dikecualikan + if (!in_array($key, $excludedKeys)) { + // Pastikan item bukan array kosong atau null + if (!empty($item) && (!is_array($item) || count($item) > 0)) { + $additionalFakta[$key] = $item; + } + } + } + } + @endphp + + @if (!empty($additionalFakta)) + @foreach ($additionalFakta as $key => $item) + @if (is_array($item)) +

{{ $key }}: {{ implode(', ', array_filter($item)) }}

+ @else

{{ $item }}

@endif @endforeach - @endisset + @else +

Tidak ada informasi tambahan yang dapat disampaikan.

+ @endif
2. Informasi Harga:
Lain - lain : - - -
Catatan yang Perlu Diperhatikan: - @isset($forminspeksi['fakta']['keterangan']) + @php + $keterangan = $forminspeksi['fakta']['keterangan'] ?? ''; + if (is_array($keterangan)) { + $keterangan = implode(', ', array_filter($keterangan)); + } + @endphp + + @if (!empty($keterangan)) - - + -
{{ $forminspeksi['fakta']['keterangan'] ?? '' }}{{ $keterangan }}
- @endisset + @endif
@@ -1418,54 +1463,54 @@
+
+
+ + +
+
+
+ PETA +
-
+
+ @php + $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat']; + if (($key = array_search('foto_tempat', $fotoTypes)) !== false) { + unset($fotoTypes[$key]); + array_unshift($fotoTypes, 'foto_tempat'); + } + @endphp -
-
-
- PETA -
-
- -
- @php - $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat']; - if (($key = array_search('foto_tempat', $fotoTypes)) !== false) { - unset($fotoTypes[$key]); - array_unshift($fotoTypes, 'foto_tempat'); - } - @endphp - - @if (isset($forminspeksi)) - @forelse ($fotoTypes as $type) + @if (isset($forminspeksi)) + @forelse ($fotoTypes as $type)
@php $imagePath = $forminspeksi[$type] ?? null; @endphp @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath))) - {{ $type }} + {{ $type }} @endif

{{ Str::title(str_replace('_', ' ', $type)) }}

@empty

Tidak ada tipe foto yang tersedia

@endforelse - @endif -
+ @endif +
+
+
+
+
+ FOTO JAMINAN +
-
-
-
- FOTO JAMINAN -
-
- @include('lpj::penilai.components.foto-jaminan') -
+ @include('lpj::penilai.components.foto-jaminan') +
diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php index b5d4491..aad480c 100644 --- a/resources/views/surveyor/components/apartemen-kantor.blade.php +++ b/resources/views/surveyor/components/apartemen-kantor.blade.php @@ -42,9 +42,12 @@
+
+ M2 +
diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php index f131775..d280bf5 100644 --- a/resources/views/surveyor/components/bangunan.blade.php +++ b/resources/views/surveyor/components/bangunan.blade.php @@ -47,10 +47,13 @@
+
+ M2 +