diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php index 220c55f..fe01afb 100644 --- a/resources/views/activity/activitydetail.blade.php +++ b/resources/views/activity/activitydetail.blade.php @@ -38,7 +38,7 @@ Pemohon: - {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }} @@ -85,7 +85,7 @@ Hasil Inspeksi - + Print Laporan @@ -100,4 +100,4 @@ @endsection -@include('lpj::surveyor.js.utils') +{{-- @include('lpj::surveyor.js.utils') --}} diff --git a/resources/views/activity/index.blade.php b/resources/views/activity/index.blade.php index 57cc962..6ce66a6 100644 --- a/resources/views/activity/index.blade.php +++ b/resources/views/activity/index.blade.php @@ -208,11 +208,11 @@ title: 'Tanggal Permohonan' }, user_id: { - title: 'User Pemohon', - render: (item, data) => { - return data.user && data.user.name ? `${data.user.name}` : '-'; - }, - }, + title: 'User Pemohon', + render: (item, data) => { + return data?.user?.name ?? data?.mig_nama_ao ?? '-'; + }}, + branch_id: { title: 'Cabang Pemohon', @@ -275,10 +275,10 @@ ['survey', 'done', 'proses-laporan', 'laporan', 'paparan'].includes(status) ? dokumenjaminan.map(dokumen => { return ` - - - - `; + + + + `; }).join('') : '' } diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index 9575154..679ae5e 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -9,7 +9,7 @@
- {!! $customlink ?? '' !!} + {!! $customlink ?? "" !!} @if (isset($id)) @php $parameters = isset($id) ? ['id' => $id] : []; @@ -46,18 +46,18 @@ Pemohon: - {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }}
- @if (isset($penawaran)) + @if(isset($penawaran))

Nomor Penawaran:

- {{ $penawaran->code }} - + {{ $penawaran->code }} +
@@ -65,17 +65,18 @@ Nomor Penawaran: - {{ $penawaran->tujuanPenilaianKjpp->name }} - + {{ $penawaran->tujuanPenilaianKjpp->name }} +
@else +

Tujan Permohonan:

- {{ $permohonan->tujuanPenilaian->name }} - + {{ $permohonan->tujuanPenilaian->name }} +
@@ -83,8 +84,8 @@ Nilai Plafond: - {{ $permohonan->nilaiPlafond->name }} - + {{ $permohonan->nilaiPlafond->name ?? '' }} +
@@ -93,8 +94,8 @@ - {{ str_replace('_', ' ', $permohonan->status_bayar) }} - + {{ str_replace('_', ' ', $permohonan->status_bayar) }} +
@endif diff --git a/resources/views/component/detail-lokasi.blade.php b/resources/views/component/detail-lokasi.blade.php new file mode 100644 index 0000000..8c2ef39 --- /dev/null +++ b/resources/views/component/detail-lokasi.blade.php @@ -0,0 +1,33 @@ +@if (is_array($details) && count($details) > 0) + @php $currentKey = ''; @endphp + @foreach ($details as $value) + @foreach ($value as $key => $item) + + @if (!empty($item)) + + + @if ($currentKey !== $key) + {{ formatLabel($key) }} + @endif + @php + if ($currentKey !== $key) { + $currentKey = $key; + } + @endphp + + : + + @if (strpos(strtolower($key), 'tanggal') !== false) + {{ formatTanggalIndonesia($item) }} + @else + {{ $item }} + @if ($key == 'luas_bangunan' || $key == 'luas_tanah') + + @endif + @endif + + + @endif + @endforeach + @endforeach +@endif diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 6e6c8f3..d3103aa 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -76,24 +76,17 @@ @foreach ($kategoriUnik as $item) @php + $luas = match ($item) { + 'bangunan' => $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? + $forminspeksi['bangunan']['luas_tanah_bagunan']['sesuai'] ?? null, + 'tanah' => $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? + $forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null, + 'apartemen-kantor' => $forminspeksi['luas_unit']['sesuai'] ?? + $forminspeksi['luas_unit']['tidak sesuai'] ?? null, + default => null, + }; - if ($item === 'bangunan') { - $luas = - $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? - ($forminspeksi['bangunan']['luas_tanah_bagunan']['sesuai'] ?? null); - } elseif ($item === 'tanah') { - $luas = - $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ?? - ($forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null); - } elseif ($item === 'apartemen-kantor') { - $luas = - $forminspeksi['luas_unit']['sesuai'] ?? - ($forminspeksi['luas_unit']['tidak sesuai'] ?? null); - } else { - $luas = null; - } $luas = old('luas_' . $item, $lpjData['luas_' . $item] ?? $luas); - $luasKey = 'luas_' . $item; $nilaiKey1 = 'nilai_' . $item . '_1'; $nilaiKey2 = 'nilai_' . $item . '_2'; @@ -122,7 +115,8 @@
@@ -477,7 +471,6 @@ if (luasInput && nilaiInput && outputElement) { const luas = parseFloat(luasInput.value.replace(/[^0-9.]/g, '')) || 0; - console.log("a", luas); const nilai = parseInput(nilaiInput.value); const hasil = luas * nilai; @@ -620,24 +613,4 @@ input.value = formattedValue; } - - function showLoadingSwal(message, duration = 5000) { - Swal.fire({ - title: message, - allowOutsideClick: false, - didOpen: () => { - Swal.showLoading(); - }, - timer: duration, // Durasi dalam milidetik - timerProgressBar: true, // Menampilkan progres bar timer - }).then((result) => { - if (result.dismiss === Swal.DismissReason.timer) { - console.log("Dialog loading otomatis ditutup."); - } - }); - } - - function hideLoadingSwal() { - Swal.close(); - } diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php index 8cb86f0..d98d64d 100644 --- a/resources/views/component/print-out-dokument.blade.php +++ b/resources/views/component/print-out-dokument.blade.php @@ -1,41 +1,11 @@ @if (@isset($dokumen)) @foreach ($dokumen->detail as $detail) - @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) - - {{ $detail->name ?? '' }} - - @endif - - @if (isset($detail->details)) - @php - $details = json_decode($detail->details, true); - @endphp - - @if (is_array($details) && count($details) > 0) - @foreach ($details as $value) - @if (is_array($value)) - @foreach ($value as $key => $item) - @if (!empty($item)) - - - {{ formatLabel($key) }} - - : - - @if (strpos(strtolower($key), 'tanggal') !== false) - {{ formatTanggalIndonesia($item) }} - @else - {{ $item }} - @if ($key == 'luas_bangunan' || $key == 'luas_tanah') - - @endif - @endif - - - @endif - @endforeach - @endif - @endforeach + @if ($detail->name != 'LOKASI JAMINAN') + @if (isset($detail->details)) + @php + $details = json_decode($detail->details, true); + @endphp + @include('lpj::component.detail-lokasi', ['details' => $details]) @endif @endif @endforeach diff --git a/resources/views/component/show-laporan-inspeksi.blade.php b/resources/views/component/show-laporan-inspeksi.blade.php new file mode 100644 index 0000000..517b6cf --- /dev/null +++ b/resources/views/component/show-laporan-inspeksi.blade.php @@ -0,0 +1,132 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} --}} +@endsection + +@section('content') +
+
+
+
+ + +
+
+ {{-- + Back --}} + + Back + +
+
+
+
+ @php + $permohonan_id = request()->segment(3); + $dokumen_id = request()->segment(4); + $jenis_jaminan_id = request()->segment(5); + @endphp + +
+ + + @php + $laporan = [ + 'sederhana' => 'lpj::penilai.components.print-out-sederhana', + 'standar' => 'lpj::penilai.components.print-out-standar', + 'resume' => 'lpj::penilai.components.print-resume', + 'memo' => 'lpj::penilai.components.print-memo', + 'rap' => 'lpj::penilai.components.print-out-rap', + 'call-report' => 'penilai.components.print-out-call-report', + ]; + @endphp + @if (array_key_exists($lpj->type_penilai, $laporan)) + @include($laporan[$lpj->type_penilai]) + @else +

Tipe laporan tidak ditemukan.

+ @endif +
+
+ + @include('lpj::surveyor.components.print-out.main') +
+
+ + + + + + {{-- @include('lpj::surveyor.js.utils') --}} + @endsection diff --git a/resources/views/daftar-pustaka/create.blade.php b/resources/views/daftar-pustaka/create.blade.php index f35d03d..b245c3c 100644 --- a/resources/views/daftar-pustaka/create.blade.php +++ b/resources/views/daftar-pustaka/create.blade.php @@ -5,7 +5,7 @@ @endsection @section('content') -
+
@@ -15,18 +15,18 @@ @method('PUT') @endif -
+

{{ isset($daftarPustaka->id) ? 'Edit' : 'Tambah' }} Daftar Pustaka

- -
-
+
+
@@ -34,11 +34,11 @@ @error('judul') - {{ $message }} + {{ $message }} @enderror
-
+
@@ -46,12 +46,12 @@ @error('attachment') - {{ $message }} + {{ $message }} @enderror
@if (isset($daftarPustaka->attachment)) -
+
@@ -64,14 +64,14 @@
@endif -
+
- @if (isset($categories)) @foreach ($categories as $item) @@ -83,19 +83,19 @@ @endif @error('category_id') - {{ $message }} + {{ $message }} @enderror
-
+
@error('deskripsi') - {{ $message }} + {{ $message }} @enderror
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 5cfc1a9..987b38f 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -6,12 +6,16 @@ $jenisAset = $dokumen->jenisJaminan->name; } $data = rtrim($data, ', '); + + $permohonan_migrasi = json_decode($permohonan->mig_permohonan); + @endphp

LAPORAN PENILAIAN ATAS - {{ $data }}

+ {{ $data }} +

NO: {{ $nomorLaporan }}


@@ -41,7 +45,7 @@ Permintaan (AO) : - {{ $permohonan->user->name }} + {{ $permohonan->user->name ?? $permohonan_migrasi->mig_mst_jaminan_nama_ao ?? '-' }} No Order diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 84f4481..24cb152 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -4,12 +4,15 @@ $data = ''; $dokument = null; foreach ($permohonan->documents as $dokumen) { - $data .= $dokumen->jenisJaminan->name . ', '; - $jenisAset = $dokumen->jenisJaminan->name; - $dokument = $dokumen; + $data .= $dokumen->jenisJaminan->name . ', '; + $jenisAset = $dokumen->jenisJaminan->name; + $dokument = $dokumen; } $data = rtrim($data, ', '); + + $permohonan_migrasi = json_decode($permohonan->mig_permohonan); @endphp +
@php $senior_officer = null; @@ -21,7 +24,6 @@ if ($teams) { foreach ($teams as $team) { $team_users = $team->teamsUsers; - // print_r($team_users); if ($team_users) { foreach ($team_users as $team_user) { $user = $team_user->user; @@ -36,11 +38,12 @@ } } } - @endphp +

LAPORAN PENILAIAN ATAS - {{ $data }}

+ {{ $data }} +

NO: {{ $nomorLaporan }}


@@ -52,19 +55,25 @@ Cabang/Pemohon : - {{ $permohonan->debiture->branch->name ?? '' }} + {{ $permohonan->branch->name ?? '' }} Tujuan Penilai : + {{ $permohonan->tujuanPenilaian->name ?? '' }} + + + Fasilitas Kredit + : + {{ $permohonan->jenisFasilitasKredit->name ?? '' }} Ao : - {{ $permohonan->user->name ?? '' }} + {{ $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '' }} @@ -84,7 +93,6 @@ - @@ -103,16 +111,21 @@ : {{ $permohonan->debiture->name ?? '' }} + + Alamat dan Telpon + : + + {{ $permohonan->debiture->address ?? '' }} {{ $permohonan->debiture->phone ?? '' }} + + Debitur / Wakil Debitur : - @if (isset($forminspeksi['asset']['debitur_perwakilan'])) - - @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $item) - {{ $item ?? $permohonan->debiture->name ?? '' }}
- @endforeach - - @endif + + {{ is_array($forminspeksi['asset']['debitur_perwakilan'] ?? null) + ? implode('
', array_map(fn($v) => $v ?? $permohonan->debiture->name ?? '', $forminspeksi['asset']['debitur_perwakilan'])) + : ($forminspeksi['asset']['debitur_perwakilan'] ?? $permohonan->debiture->name ?? '') }} + Pihak Bank selain Appraisal @@ -131,98 +144,128 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
Terletak di: {{ $alamat['address'] ?? '' }}
Desa/Kelurahan:{{ $alamat['village_code'] ?? '' }}
Kecamatan:{{ $alamat['district_code'] ?? '' }}
Kabupaten/Kota: {{ $alamat['city_code'] ?? '' }}
Provinsi:{{ $alamat['province_code'] ?? '' }}
+ + @if ($permohonan->is_mig) + @if ($dokument) + + + + + + + + @foreach ($dokument->detail as $detail) + @if ($detail->name === 'LOKASI JAMINAN' && $detail->details) + @include('lpj::component.detail-lokasi', ['details' => json_decode($detail->details, true)]) + @endif + @endforeach +
Jenis Jaminan:{{ $dokument->jenisJaminan?->name }}
+ @endif + @else + + + + + + + + + + + + + + + + + + + + + + + + + + +
Terletak di: {{ $alamat['address'] ?? '' }}
Desa/Kelurahan:{{ $alamat['village_code'] ?? '' }}
Kecamatan:{{ $alamat['district_code'] ?? '' }}
Kabupaten/Kota: {{ $alamat['city_code'] ?? '' }}
Provinsi:{{ $alamat['province_code'] ?? '' }}
+ @endif
- {{--
--}} - - - - -
- DOKUMEN -
- +
+ + + +
+ DOKUMEN +
+ + @include('lpj::component.print-out-dokument')
- {{--
--}} -
- - - - -
- HUBUNGAN CADEB/DEBITUR DENGAN PEMILIK DAN PENGHUNI -
- - - @php - $cekHubDebitur = isset($forminspeksi['asset']['hub_cadeb']) && - $forminspeksi['asset']['hub_cadeb'] === 'sesuai' - ? 'sesuai' - : 'tidak sesuai'; + @if (!$permohonan->is_mig) +
+
+ + + +
+ HUBUNGAN CADEB/DEBITUR DENGAN PEMILIK DAN PENGHUNI +
+ + + @php + $cekHubDebitur = ($forminspeksi['asset']['hub_cadeb'] ?? null) === 'sesuai' ? 'sesuai' : 'tidak sesuai'; + $hubCadebDebitur = $forminspeksi['asset']['hub_cadeb'][$cekHubDebitur] ?? ''; + @endphp + + + + + + @php + $hubCadeb = $forminspeksi['asset']['hub_cadeb_penghuni'][$forminspeksi['asset']['hub_cadeb_penghuni']] ?? ''; + @endphp + + + + +
Hubungan Pemilik Jaminan dengan Debitur:{{ $hubCadebDebitur ?? '' }}
Hubungan Penghuni Jaminan dengan Debitur:{{ $hubCadeb ?? '' }}
+
- $hubCadebDebitur = isset($forminspeksi['asset']['hub_cadeb'][$cekHubDebitur]) - ? $forminspeksi['asset']['hub_cadeb']['tidak sesuai'] - : $forminspeksi['asset']['hub_cadeb']['sesuai']; - @endphp - Hubungan Pemilik Jaminan dengan Debitur - : - {{ $cekHubDebitur ?? '' }} - - - @php - - $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'] ?? null) - : ($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'] ?? null); - @endphp - Hubungan Penghuni Jaminan dengan Debitur - : - {{ $hubCadeb ?? '' }} - - -
- - - @foreach ($permohonan->documents as $dokumen) - @if ($dokumen->jenisJaminan) - @php - $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); - @endphp + @php $mig_detail_legalitas_jaminan = json_decode($inspeksi->mig_detail_legalitas_jaminan, true); @endphp + @if($mig_detail_legalitas_jaminan) + @foreach($mig_detail_legalitas_jaminan as $key => $items) + + + + + @php $currentLabel=''; @endphp + @foreach ($items as $item) + + + + + + @endforeach +
+ {{ $key }} +
+ @if ($currentLabel !== $item['label']) + {{ $item['label'] }} + @php $currentLabel = $item['label']; @endphp + @endif + :{{ ltrim($item['value'], ',') }}
+ @endforeach + @endif + @endif + @foreach ($permohonan->documents as $dokumen) + @if ($dokumen->jenisJaminan) + @php + $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); + @endphp + @if(!$permohonan->is_mig) @if (isset($formKategori) && $formKategori) @php $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; @@ -236,7 +279,8 @@ @endforeach @endif @endif - @endforeach + @endif + @endforeach
@@ -246,104 +290,96 @@
- @include('lpj::penilai.components.print-pembanding') + @if(isset($dataPembanding)) + @include('lpj::penilai.components.print-pembanding') + @endif
- +
TOTAL NILAI PASAR WAJAR
- +
- @php + $totalNilaiPasarWajar = 0; $labelNilai = [ - 'bangunan' => 'Luas Bangunan', - 'tanah' => 'Luas Tanah', + 'bangunan' => 'Luas Bangunan', + 'tanah' => 'Luas Tanah', 'apartemen-kantor' => 'Luas Unit', - 'alat-berat' => 'Luas Alat Berat', - 'mesin' => 'Luas Mesin', - 'kendaraan' => 'Luas Kendaraan', - 'pesawat' => 'Luas Pesawat', - 'kapal' => 'Luas Kapal', + 'apartemen' => 'Luas Unit', + 'alat-berat' => 'Luas Alat Berat', + 'mesin' => 'Luas Mesin', + 'kendaraan' => 'Luas Kendaraan', + 'pesawat' => 'Luas Pesawat', + 'kapal' => 'Luas Kapal', ]; - if (strcasecmp($jenisAset, 'RUKO/RUKAN') === 0) { - $labelNilai['bangunan'] = 'Luas Unit'; - unset($labelNilai['tanah']); + $labelNilai['bangunan'] = 'Luas Unit'; + unset($labelNilai['tanah']); + } + + if (strcasecmp($jenisAset, 'Apartemen') === 0) { + $labelNilai['tanah'] = 'Luas Unit'; } @endphp - @foreach ($labelNilai as $key => $label) - @if (isset($lpjData['luas_' . $key])) - - - - - - @endif - @endforeach @if (isset($lpjData['npw_tambahan'])) @foreach ($lpjData['npw_tambahan'] as $npw) - - - + + + + @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp @endforeach @endif + - - - + + - - - - - - - - + @if (isset($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi) || isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0) + + + + + + + + + @endif
1. Total Nilai Pasar Wajar + 1. Total Nilai Pasar Wajar
- {{ $label }} {{ $lpjData['luas_' . $key] ?? '' }} m2 - - X Rp - {{ $lpjData['nilai_' . $key . '_1'] ?? '' }} - - = Rp - {{ $lpjData['nilai_' . $key . '_2'] ?? '' }} -
- {{ $npw['name'] }} {{ $npw['luas'] }} m2 + + {{ $npw['name'] }} - X Rp - {{ $npw['nilai_1'] }} + + {{ $npw['luas'] }} m2 - = Rp - {{ $npw['nilai_2'] }} + X + {{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }} + = + {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
Total Nilai Pasar Wajar - = + Total Nilai Pasar Wajar=
- Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }} + {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
- 2. Total Nilai Likuidasi -
- {{ $lpjData['likuidasi'] ?? '' }}% - - X Total Nilai Pasar Wajar - - = Rp - {{ $lpjData['likuidasi_nilai_2'] ?? '' }} -
+ 2. Total Nilai Likuidasi +
+ {{ $lpjData['likuidasi'] ?? '' }}% X Total Nilai Pasar Wajar + ={{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }} +
@php @@ -352,6 +388,136 @@ $keterangan = implode(', ', array_filter($keterangan)); } @endphp + @if($permohonan->is_mig) + @if (!empty($forminspeksi['fakta']['fakta_positif'])) + + + + +
+ FAKTOR POSITIF +
+ @foreach ($forminspeksi['fakta']['fakta_positif'] as $key => $item) + + + + +
+ @if (is_array($item)) + @foreach ($item as $data_) + {!! nl2br(e($data_)) !!}
+ @endforeach + @else + {!! nl2br(e($item)) !!} + @endif +
+ @endforeach + @endif + @if (!empty($forminspeksi['fakta']['fakta_negatif'])) + + + + +
+ FAKTOR NEGATIF +
+ @foreach ($forminspeksi['fakta']['fakta_negatif'] as $key => $item) + + + + +
+ @if (is_array($item)) + @foreach ($item as $data_) + {!! nl2br(e($data_)) !!}
+ @endforeach + @else + {!! nl2br(e($item)) !!} + @endif +
+ @endforeach + @endif + @if (!empty($forminspeksi['fakta']['informasi_dokument'])) + + + + +
+ LAIN - LAIN +
+ @foreach ($forminspeksi['fakta']['informasi_dokument'] as $key => $item) + + + + +
+ @if (is_array($item)) + @foreach ($item as $data_) + {!! nl2br(e($data_)) !!}
+ @endforeach + @else + {!! nl2br(e($item)) !!} + @endif +
+ @endforeach + + @endif + + @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 + + @if (!empty($forminspeksi['fakta']['saran'])) + + + + +
+ SARAN +
+ @foreach ($forminspeksi['fakta']['saran'] as $key => $item) + + + + +
+
    +
  • + @if (is_array($item)) + @foreach ($item as $data_) + {!! nl2br(e($data_)) !!}
    + @endforeach + @else + {!! nl2br(e($item)) !!} + @endif +
  • +
+
+ @endforeach + @endif + @endif + @if (!empty($keterangan)) @@ -366,7 +532,7 @@
@endif -
+
Demikian laporan penilai jaminan ini di buat secara objektif, tanpa adanya pengaruh baik intern @@ -374,7 +540,7 @@
- @include('lpj::penilai.components.signature-approval') + @include('lpj::penilai.components.signature-approval',['laporan' => 'standar','npw' => $totalNilaiPasarWajar])

diff --git a/resources/views/penilai/components/print-pembanding.blade.php b/resources/views/penilai/components/print-pembanding.blade.php index 3458fbf..2897b1b 100644 --- a/resources/views/penilai/components/print-pembanding.blade.php +++ b/resources/views/penilai/components/print-pembanding.blade.php @@ -12,19 +12,20 @@ } $fields = [ - 'jenis_aset' => 'Jenis properti', - 'hak_properti' => 'Status Hak Tanah', - 'address' => 'Alamat Lokasi', - 'harga' => 'Harga Penawaran', - 'total' => 'Indikasi Harga Transaksi', - 'telepon' => 'Penjual (HP)', - 'luas_tanah' => 'Luas Tanah', + 'jenis_aset' => 'Jenis properti', + 'hak_properti' => 'Status Hak Tanah', + 'address' => 'Alamat Lokasi', + 'harga' => 'Harga Penawaran', + 'total' => 'Indikasi Harga Transaksi', + 'telepon' => 'Penjual (HP)', + 'luas_tanah' => 'Luas Tanah', 'luas_bangunan' => 'Luas Bangunan', - 'tanggal' => 'Tanggal Data', - 'kordinat' => 'Titik Kordinat', + 'tanggal' => 'Tanggal Data', + 'kordinat' => 'Titik Kordinat', ]; @endphp + @foreach ($exportData as $index => $data)
@@ -32,37 +33,48 @@ Pembanding {{ substr($index, -1) }} - @foreach ($fields as $key => $label) + + @if ($inspeksi->is_mig == 1) - - + + - @endforeach + @else + @foreach ($fields as $key => $label) + + + + + + @endforeach + @endif
{{ $label }}:Keterangan: - @if ($key == 'luas_tanah' || $key == 'luas_bangunan') - {{ $data[$key] ?? '-' }} m² - @elseif($key == 'harga' || $key == 'total') - {{ isset($data[$key]) ? formatRupiah($data[$key]) : 0 }} - - @elseif($key == 'tanggal') - {{ isset($data[$key]) ? formatTanggalIndonesia($data[$key]) : '-' }} - @elseif($key == 'telepon') - {{ isset($data['telepon']) ? ubahNomorHp($data['telepon']) : '-' }} - - @elseif($key == 'kordinat') - @php - $lat = $data['kordinat_lat'] ?? null; - $lng = $data['kordinat_lng'] ?? null; - @endphp - @if ($lat && $lng) - {{ $lat }},{{ $lng }} - @else - - - @endif - @else - {{ $data[$key] ?? '-' }} - @endif + {!! isset($data['keterangan']) ? nl2br(e(parsePembandingMigration($data['keterangan']))) : '' !!}
{{ $label }}: + @if ($key == 'luas_tanah' || $key == 'luas_bangunan') + {{ $data[$key] ?? '-' }} m² + @elseif($key == 'harga' || $key == 'total') + {{ isset($data[$key]) ? formatRupiah($data[$key]) : 0 }} + + @elseif($key == 'tanggal') + {{ isset($data[$key]) ? formatTanggalIndonesia($data[$key]) : '-' }} + @elseif($key == 'telepon') + {{ isset($data['telepon']) ? ubahNomorHp($data['telepon']) : '-' }} + + @elseif($key == 'kordinat') + @php + $lat = $data['kordinat_lat'] ?? null; + $lng = $data['kordinat_lng'] ?? null; + @endphp + @if ($lat && $lng) + {{ $lat }},{{ $lng }} + @else + - + @endif + @else + {{ $data[$key] ?? '-' }} + @endif +
@endforeach diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php index f71d05c..410cacb 100644 --- a/resources/views/penilai/components/signature-approval.blade.php +++ b/resources/views/penilai/components/signature-approval.blade.php @@ -1,21 +1,29 @@ - +
@php use Modules\Usermanagement\Models\User; - $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); - $imagePathPenilai = storage_path( - 'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign, - ); + $laporan = $laporan ?? ''; + $penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null; + $imagePathPenilai = $penilaiUser && $penilaiUser->sign + ? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign) + : null; + + $soUser = $permohonan->approval_so ? User::find($permohonan->approval_so) : null; + $imagePathSo = $soUser && $soUser->sign + ? storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign) + : null; + + $eoUser = $permohonan->approval_eo ? User::find($permohonan->approval_eo) : null; + $imagePathEO = $eoUser && $eoUser->sign + ? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign) + : null; + + $ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null; + $imagePathDD = $ddUser && $ddUser->sign + ? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign) + : null; - $soUser = User::where('id', $senior_officer->id)->first(); - $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); - $imagePathEO = storage_path( - 'app/public/signatures/' . - User::role('EO Appraisal')->first()->id . - '/' . - User::role('EO Appraisal')->first()->sign, - ); $imagePathDD = storage_path( 'app/public/signatures/' . @@ -25,81 +33,148 @@ ); @endphp - + @if($soUser->name==$eoUser->name) + @if ($permohonan->approval_so != null) + + @endif + @else + @if ($permohonan->approval_so != null) + + @endif + + @if ($permohonan->approval_eo != null) + + @endif + @endif + + @if($permohonan->approval_dd!==$permohonan->approval_eo) + @if ($permohonan->approval_dd != null) + + @endif + @endif + + + + - @if ($permohonan->approval_so != null) - + @if($soUser->name==$eoUser->name) + @if ($permohonan->approval_so != null) + + @endif + @else + @if ($permohonan->approval_so != null) + + @endif + @if ($permohonan->approval_eo != null) + + @endif @endif - @if ($permohonan->approval_eo != null) - - @endif - @if ($permohonan->approval_dd != null) - + @if($permohonan->approval_dd!==$permohonan->approval_eo) + @if ($permohonan->approval_dd != null) + + @endif @endif - @if ($permohonan->approval_so != null) - - @endif - @if ($permohonan->approval_eo != null) - + @if($soUser->name==$eoUser->name) + @if ($permohonan->approval_so != null) + + @endif + @else + @if ($permohonan->approval_so != null) + + @endif + + @if ($permohonan->approval_eo != null) + + @endif @endif - @if ($permohonan->approval_dd != null) - + @if($permohonan->approval_dd!==$permohonan->approval_eo) + @if ($permohonan->approval_dd != null) + + @endif @endif
+ + Penilaian Dibuat + + Diperiksa dan Menyetujui + + Diperiksa + + Menyetujui + + Menyetujui +
@if (file_exists($imagePathPenilai)) {{ $imagePathPenilai }} @endif - @if (file_exists($imagePathSo)) - {{ $imagePathSo }} - @endif - + @if (file_exists($imagePathSo)) + {{ $imagePathSo }} + @endif + + @if (file_exists($imagePathSo)) + {{ $imagePathSo }} + @endif + + @if (file_exists($imagePathEO)) + {{ $imagePathEO }} + @endif + - @if (file_exists($imagePathEO)) - {{ $imagePathEO }} - @endif - - @if (file_exists($imagePathDD)) - {{ $imagePathDD }} - @endif - + @if (file_exists($imagePathDD)) + {{ $imagePathDD }} + @endif +
{{ $penilai->userPenilaiTeam->name ?? '' }}
- {{ ucwords(strtolower('PENILAI')) }} + {{ ucwords(strtolower('PENILAI')) }}
- {{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }} + {{ $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)) : '') }}
- {{ $senior_officer->name ?? '' }}
- - {{ ucwords(strtolower('SENIOR OFFICER')) }} - -
- - {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }} - -
- {{ User::role('EO Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} - -
- - {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }} - -
+ {{ $soUser->name ?? $senior_officer->name ?? '' }}
+ + @if($npw > 1000000000 && $npw < 5000000000) + {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} + @else + {{ ucwords(strtolower('SENIOR OFFICER')) }} + @endif + +
+ + {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }} + +
+ {{ $soUser->name ?? $senior_officer->name ?? '' }}
+ + {{ ucwords(strtolower('SENIOR OFFICER')) }} + +
+ + {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }} + +
+ {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}
+ + {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} + +
+ + {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }} + +
- {{ User::role('DD Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} - -
- - {{ - isset($permohonan->approval_dd_at) ? - formatTanggalIndonesia($permohonan->approval_dd_at) : '' }} - -
+ {{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}
+ + {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} + +
+ + {{ + isset($permohonan->approval_dd_at) ? + formatTanggalIndonesia($permohonan->approval_dd_at) : '' }} + +
diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php index fc5af10..07df345 100644 --- a/resources/views/penilai/lampiran.blade.php +++ b/resources/views/penilai/lampiran.blade.php @@ -6,8 +6,7 @@ @section('content')
- @if (Auth::user()->hasAnyRole(['senior-officer', 'administrator', 'DD Appraisal', 'EO Appraisal']) && - Request::is('penilai/lampiran')) + @if (Auth::user()->hasAnyRole(['senior-officer', 'administrator','DD Appraisal', 'EO Appraisal']) && Request::is('penilai/lampiran')) @include('lpj::component.detail-jaminan', [ 'backLink' => 'otorisator.view-laporan', 'queryParams' => [ @@ -47,8 +46,7 @@ @endphp @if (in_array($fileExtension, ['jpg', 'jpeg', 'png'])) - + @elseif($fileExtension === 'pdf') diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index f8cbc36..c4a27b8 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -53,8 +53,8 @@ @enderror
- -
+
@@ -394,7 +394,7 @@ differentSurveyorPenilai.classList.remove('hidden'); surveyorPenilaiRegion.classList.add('hidden'); - } else { + } else { sameSurveyorPenilai.classList.add('hidden'); differentSurveyorPenilai.classList.add('hidden'); surveyorPenilaiRegion.classList.add('hidden'); diff --git a/resources/views/penilaian/otorisator/index-sla.blade.php b/resources/views/penilaian/otorisator/index-sla.blade.php index 8c4c15a..14e1fc0 100644 --- a/resources/views/penilaian/otorisator/index-sla.blade.php +++ b/resources/views/penilaian/otorisator/index-sla.blade.php @@ -7,7 +7,7 @@ @section('content')
-
@@ -291,5 +291,22 @@ } }); } + + + function showLoadingSwal(message, duration = 5000) { + Swal.fire({ + title: message, + allowOutsideClick: false, + didOpen: () => { + Swal.showLoading(); + }, + timer: duration, // Durasi dalam milidetik + timerProgressBar: true, // Menampilkan progres bar timer + }).then((result) => { + if (result.dismiss === Swal.DismissReason.timer) { + console.log('Dialog loading otomatis ditutup.'); + } + }); + } @endpush diff --git a/resources/views/penilaian/otorisator/index.blade.php b/resources/views/penilaian/otorisator/index.blade.php index aa46af7..4284273 100644 --- a/resources/views/penilaian/otorisator/index.blade.php +++ b/resources/views/penilaian/otorisator/index.blade.php @@ -361,5 +361,22 @@ } }); } + + + function showLoadingSwal(message, duration = 5000) { + Swal.fire({ + title: message, + allowOutsideClick: false, + didOpen: () => { + Swal.showLoading(); + }, + timer: duration, // Durasi dalam milidetik + timerProgressBar: true, // Menampilkan progres bar timer + }).then((result) => { + if (result.dismiss === Swal.DismissReason.timer) { + console.log('Dialog loading otomatis ditutup.'); + } + }); + } @endpush diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index ca79239..16bfbea 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -216,7 +216,7 @@ @endif - @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,3,4]) && $permohonan->status === 'proses-paparan') + @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2, 3, 4]) && $permohonan->status === 'proses-paparan') @endif - @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]) &&$permohonan->status === 'proses-paparan') + @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [2, 4]) &&$permohonan->status === 'proses-paparan')
@@ -260,17 +256,14 @@
@php - $fotoTempat = - isset($forminspeksi['foto_tempat']) && - is_string($forminspeksi['foto_tempat']) && - !empty($forminspeksi['foto_tempat']) - ? asset('storage/' . $forminspeksi['foto_tempat']) - : ''; + $fotoTempat = isset($forminspeksi['foto_tempat']) && is_string($forminspeksi['foto_tempat']) && !empty($forminspeksi['foto_tempat']) + ? asset('storage/' . $forminspeksi['foto_tempat']) + : ''; @endphp Foto Tempat + style="max-width: 30rem; {{ $fotoTempat ? '' : 'display: none;' }}">
@@ -321,7 +314,6 @@ // Ambil file dari elemen input const file = inputElement.files[0]; - if (!file) { Swal.fire({ icon: 'warning', diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php index 6c608a3..9c54d6e 100644 --- a/resources/views/surveyor/components/inspeksi.blade.php +++ b/resources/views/surveyor/components/inspeksi.blade.php @@ -6,6 +6,7 @@ @section('content') @include('lpj::assetsku.includenya') + + @php - use Modules\Usermanagement\Models\User; - $cabangUser = User::where('id', $permohonan->user->id)->first(); - - // print_r($cabangUser->sign); + $cabangUser = null; + if ($permohonan->user) { + $cabangUser = getUser('id', $permohonan->user->id); + } @endphp @endsection @@ -237,7 +238,7 @@ (type === 'penilai' ? `{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}` : (type === 'cabang' ? - `{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}` : + `{{ asset('storage/signatures/' . $cabangUser?->id . '/' . $cabangUser?->sign) }}` : '')) : signaturePad.toDataURL('image/png', 1.0); // Use full quality @@ -332,13 +333,13 @@ } else { const signUrl = type === 'penilai' ? `{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}` : - `{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}`; + `{{ asset('storage/signatures/' . $cabangUser?->id . '/' . $cabangUser?->sign) }}`; drawSignature(signaturePad, signUrl); const defaultName = type === 'penilai' ? `{{ Auth::user()->name }}` : - `{{ $cabangUser->name }}`; + `{{ $cabangUser?->name }}`; if (nameInputElement) { nameInputElement.value = defaultName; } @@ -362,7 +363,7 @@ (type === 'penilai' ? `{{ asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign) }}` : (type === 'cabang' ? - `{{ asset('storage/signatures/' . $cabangUser->id . '/' . $cabangUser->sign) }}` : + `{{ asset('storage/signatures/' . $cabangUser?->id . '/' . $cabangUser?->sign) }}` : '')) : signaturePad.toDataURL('image/png'); diff --git a/resources/views/surveyor/components/print-out/fakta.blade.php b/resources/views/surveyor/components/print-out/fakta.blade.php index 164e81f..ab93e2a 100644 --- a/resources/views/surveyor/components/print-out/fakta.blade.php +++ b/resources/views/surveyor/components/print-out/fakta.blade.php @@ -1,13 +1,10 @@
- -

- ANalisa Fakta + Analisa Fakta

-
@@ -28,6 +25,7 @@ @endisset + Faktor Negatif : @@ -55,64 +53,63 @@ - - Rute Munuju - : - -

{{ $forminspeksi['fakta']['rute_menuju'] ?? '' }}

- - + @if (!empty($forminspeksi['fakta']['rute_menuju'])) + + Rute Munuju + : + +

{{ $forminspeksi['fakta']['rute_menuju'] ?? '' }}

+ + + @endif - - Batas Batas - : - - - - @foreach ($forminspeksi['fakta']['batas_batas_input'] ?? [] as $arah => $batas) - @if ($batas) + @if (!empty($forminspeksi['fakta']['batas_batas_input'])) + + Batas Batas + : + + @foreach (array_filter($forminspeksi['fakta']['batas_batas_input'] ?? []) as $arah => $batas)

- {{ $arah }} : {{ $batas }}

- @endif - @endforeach - - - - - Kondisi lain terkait lingkungan - : - - - - @foreach ($forminspeksi['fakta']['kondisi_lingkungan'] ?? [] as $kondisi) -

{!! nl2br(e($kondisi)) !!}

- @endforeach - - - - Kondisi lain terkait Bangunan - : - - - @foreach ($forminspeksi['fakta']['kondisi_lain_bangunan'] ?? [] as $kondisiLain) -

{!! nl2br(e($kondisiLain)) !!}

- @endforeach - - - - Informasi Terkait Dokumen - : - - - @foreach ($forminspeksi['fakta']['informasi_dokument'] ?? [] as $informasi) -

{!! nl2br(e($informasi)) !!}

- @endforeach - - - + @endforeach + + + @endif + @if (!empty($forminspeksi['fakta']['kondisi_lingkungan'])) + + Kondisi lain terkait lingkungan + : + + @foreach ($forminspeksi['fakta']['kondisi_lingkungan'] ?? [] as $kondisi) +

{!! nl2br(e($kondisi)) !!}

+ @endforeach + + + @endif + @if (!empty($forminspeksi['fakta']['kondisi_lain_bangunan'])) + + Kondisi lain terkait Bangunan + : + + @foreach ($forminspeksi['fakta']['kondisi_lain_bangunan'] ?? [] as $kondisiLain) +

{!! nl2br(e($kondisiLain)) !!}

+ @endforeach + + + @endif + @if (!empty($forminspeksi['fakta']['informasi_dokument'])) + + Informasi Terkait Dokumen + : + + @foreach ($forminspeksi['fakta']['informasi_dokument'] ?? [] as $informasi) +

{!! nl2br(e($informasi)) !!}

+ @endforeach + + + @endif -
diff --git a/resources/views/surveyor/components/print-out/informasi.blade.php b/resources/views/surveyor/components/print-out/informasi.blade.php index 7e529ba..2c1433c 100644 --- a/resources/views/surveyor/components/print-out/informasi.blade.php +++ b/resources/views/surveyor/components/print-out/informasi.blade.php @@ -1,103 +1,99 @@ -
- - - - -
-

Informasi Dinas Tata Ruang

-
- +@php + use Illuminate\Support\Facades\Storage; + // Daftar kunci informasi dan tipe foto yang akan ditampilkan + $informasi = [ + 'peruntukan', 'kdb', 'kdh', 'gsb', 'max_lantai', 'klb', 'gss', 'pelebaran_jalan', 'nama_petugas', + ]; - - - - - + $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', + ]; - @php - $fotoTypes = [ - 'upload_gs', - 'foto_sentuh_tanahku', - 'foto_gistaru', - 'foto_bhumi', - 'foto_argis_region', - 'foto_tempat', - ]; + // Periksa apakah ada informasi dinas tata ruang yang valid + $hasInformasi = collect($informasi)->some(fn ($key) => isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-'); - $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'); - } - // Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid - $validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) { - return isset($forminspeksi[$type]) && !empty($forminspeksi[$type]) && is_string($forminspeksi[$type]); - }); - @endphp - @foreach ($validPhotoTypes as $type) - @php - $imagePath = $forminspeksi[$type] ?? null; - $imageUrl = is_string($imagePath) ? asset('storage/' . $imagePath) : null; + // Periksa apakah ada foto yang valid (menggunakan Storage disk public) + $hasValidPhotos = collect($fotoTypes)->some(function ($type) use ($forminspeksi) { + $imagePath = $forminspeksi[$type] ?? null; + return is_string($imagePath) && Storage::disk('public')->exists($imagePath); + }); - @endphp - @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath))) + // Siapkan catatan sebagai array, kemudian periksa apakah ada catatan yang perlu diperhatikan + $notes = (array) ($forminspeksi['fakta']['keterangan'] ?? []); + $hasNotes = count($notes) > 0; + + // Log render status untuk debugging + \Log::info('Render print-out informasi tata ruang', [ + 'hasInformasi' => $hasInformasi, + 'hasValidPhotos' => $hasValidPhotos, + 'hasNotes' => $hasNotes, + ]); +@endphp + +@if ($hasInformasi || $hasValidPhotos || $hasNotes) +
+
Informasi Dinas Tata Ruang : - @php - $informasi = [ - 'peruntukan', - 'kdb', - 'kdh', - 'gsb', - 'max_lantai', - 'klb', - 'gss', - 'pelebaran_jalan', - 'nama_petugas', - ]; - @endphp + $fotoTypes = [ + 'upload_gs', 'foto_sentuh_tanahku', 'foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat', + ]; - @foreach ($informasi as $key) - @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-') - @php - $displayKey = ucfirst(str_replace('_', ' ', $key)); - if (strlen($key) == 3) { - $displayKey = strtoupper($key); - } - @endphp -

- {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}

- @endif - @endforeach -
+ + + +
+

Informasi Dinas Tata Ruang

+
+ + + @if ($hasInformasi) - - - + + @endif - @endforeach - - - - + + + + + @endif @endforeach + @endif - - - -
{{ $customLabels[$type] ?? '' }} - {{ $imageUrl }} + Informasi Dinas Tata Ruang: + @foreach ($informasi as $key) + @if (($val = $forminspeksi['fakta'][$key] ?? null) && $val !== '-') +

- {{ strlen($key) === 3 ? strtoupper($key) : ucfirst(str_replace('_', ' ', $key)) }}: {{ $val }}

+ @endif + @endforeach
Catatan yang Perlu Diperhatikan : - @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $informasi) -

{!! nl2br(e($informasi)) !!}

+ @if ($hasValidPhotos) + @foreach ($fotoTypes as $type) + @php + $imagePath = $forminspeksi[$type] ?? null; + @endphp + @if (is_string($imagePath) && Storage::disk('public')->exists($imagePath)) +
{{ $customLabels[$type] ?? '' }} + {{ $customLabels[$type] ?? '' }} +
-
+ @if ($hasNotes) + + Catatan yang Perlu Diperhatikan + : + + @foreach ($notes as $note) +

{!! nl2br(e($note)) !!}

+ @endforeach + + + @endif + +
+@endif diff --git a/resources/views/surveyor/components/print-out/lingkungan.blade.php b/resources/views/surveyor/components/print-out/lingkungan.blade.php index 2c1dd76..154691e 100644 --- a/resources/views/surveyor/components/print-out/lingkungan.blade.php +++ b/resources/views/surveyor/components/print-out/lingkungan.blade.php @@ -1,6 +1,5 @@
- @foreach ($basicData['perkerasanJalan'] as $index => $item) @if ($index % 3 == 0 && $index > 0) + + @endif + + @endforeach - +

@@ -38,27 +37,26 @@

+ +
@endif - - - @endforeach - - @endif - - Lalu Lintas Depan Lokasi @@ -69,245 +67,242 @@ @foreach ($basicData['laluLintasLokasi'] as $index => $item) @if ($index % 3 == 0 && $index > 0) + + @endif + + + + @endforeach - + + @endif + + + + Golongan Masyarakat Sekitar + : + + @if (isset($basicData['golMasySekitar'])) + + + @foreach ($basicData['golMasySekitar'] as $index => $item) + @if ($index % 3 == 0 && $index > 0) + + @endif + + @endforeach + +
+ +
+ @endif + + + + Tingkat Keramaian + : + + @if (isset($basicData['tingkatKeramaian'])) + + + @foreach ($basicData['tingkatKeramaian'] as $index => $item) + @if ($index % 3 == 0 && $index > 0) + + @endif + + @endforeach + +
+ +
+ @endif + + + + Terletak Di Area + : + + @if (isset($basicData['terletakDiArea'])) + + + @foreach ($basicData['terletakDiArea'] as $index => $item) + @if ($index % 3 == 0 && $index > 0) + + @endif + + @endforeach + +
+ +
+ @endif + + + + Disekitar Lokasi + : + +
+ + +
+ + + + + Dekat Makam + : + +
+ + +
+ + + + + Dekat TPS + : + +
+ + +
+ + + + + Dekat Lainnya + : + {{ $forminspeksi['lingkungan']['dekat_lainnya'] ?? '' }} + + + + Merupakan Daerah + : + + @if (isset($basicData['merupakanDaerah'])) + + + @foreach ($basicData['merupakanDaerah'] as $index => $item) + @if ($index % 3 == 0 && $index > 0) + + @endif + + @endforeach + +
+ +
+ @endif + + + + + Fasilitas Umum Dekat Lokasi + : + + @if (isset($basicData['fasilitasObjek'])) + + + @foreach ($basicData['fasilitasObjek'] as $index => $item) + @if ($index % 3 == 0 && $index > 0) + + @endif + + @endforeach + +
+ +
@endif - - - @endforeach - @endif - - - - - Golongan Masyarakat Sekitar - : - - @if (isset($basicData['golMasySekitar'])) - - - @foreach ($basicData['golMasySekitar'] as $index => $item) - @if ($index % 3 == 0 && $index > 0) - - - @endif - - @endforeach - -
- -
- @endif - - - - - Tingkat Keramaian - : - - @if (isset($basicData['tingkatKeramaian'])) - - - @foreach ($basicData['tingkatKeramaian'] as $index => $item) - @if ($index % 3 == 0 && $index > 0) - - - @endif - - @endforeach - -
- -
- @endif - - - - - Terletak Di Area - : - - @if (isset($basicData['terletakDiArea'])) - - - @foreach ($basicData['terletakDiArea'] as $index => $item) - @if ($index % 3 == 0 && $index > 0) - - - @endif - - @endforeach - -
- -
- @endif - - - - - Disekitar Lokasi - : - -
- - -
- - - - - - Dekat Makam - : - -
- - -
- - - - - - Dekat TPS - : - -
- - -
- - - - - - Dekat Lainnya - : - {{ $forminspeksi['lingkungan']['dekat_lainnya'] ?? '' }} - - - - - - Merupakan Daerah - : - - @if (isset($basicData['merupakanDaerah'])) - - - @foreach ($basicData['merupakanDaerah'] as $index => $item) - @if ($index % 3 == 0 && $index > 0) - - - @endif - - @endforeach - -
- -
- @endif - - - - - Fasilitas Umum Dekat Lokasi - : - - @if (isset($basicData['fasilitasObjek'])) - - - @foreach ($basicData['fasilitasObjek'] as $index => $item) - @if ($index % 3 == 0 && $index > 0) - - - @endif - - @endforeach - -
- -
- @endif - - - - - -
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index 96109a1..4e486d2 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -148,11 +148,9 @@ td, th { border: 1px solid #000; } - } - @php @@ -167,14 +165,14 @@ $senior_officer = null; if ($permohonan->debiture && $permohonan->documents) { foreach ($permohonan->documents as $dokumen) { - $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); + $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); - $teams = $permohonan->region->teams; + $teams = $permohonan->region->teams; if ($teams) { foreach ($teams as $team) { $team_users = $team->teamsUsers; - // print_r($team_users); + if ($team_users) { foreach ($team_users as $team_user) { $user = $team_user->user; @@ -189,8 +187,8 @@ } } } - use Modules\Usermanagement\Models\User; - $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first(); + + $surveyorUser = getUser($surveyor->userPenilaiTeam->id); @endphp @@ -218,11 +216,11 @@

FORM INSPEKSI {{ $data ?? '' }} -

-
- + + +
+
@@ -280,7 +279,7 @@

@@ -254,11 +252,12 @@

Debitur/Perwakilan : - @if (isset($forminspeksi['asset']['debitur_perwakilan']) && !empty($forminspeksi['asset']['debitur_perwakilan'])) - @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item) -

- {{ $item }} -

+ @php + $debitur = $forminspeksi['asset']['debitur_perwakilan'] ?? null; + @endphp + @if ($debitur) + @foreach (is_array($debitur) ? $debitur : [$debitur] as $item) +

{{ $item }}

@endforeach @endif
Pihak Bank : - {{ isset($forminspeksi['asset']['pihak_bank']) ? $forminspeksi['asset']['pihak_bank'] : '' }} + {{ $forminspeksi['asset']['pihak_bank'] ?? '' }}
@@ -319,16 +318,13 @@ - + ß @php - $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $selectedData = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null; - - $lainnya = isset($forminspeksi['asset']['jenis_asset']['Lainnya']) - ? $forminspeksi['asset']['jenis_asset']['Lainnya'] - : null; - + $jenisAsset = $forminspeksi['asset']['jenis_asset'] ?? []; + $selectedData = $jenisAsset['sesuai'] ?? $jenisAsset['tidak sesuai'] ?? null; + $lainnya = $jenisAsset['Lainnya'] ?? null; @endphp +
Jenis Aset : @@ -340,35 +336,31 @@ Alamat : - - - - - - - - - - - - - - - - - - - - - -
Terletak di {{ $alamat['address'] ?? '' }}
Kelurahan{{ $alamat['village_code'] ?? '' }}
Kecamatan{{ $alamat['district_code'] ?? '' }}
Kotamadya {{ $alamat['city_code'] ?? '' }}
Propinsi{{ $alamat['province_code'] ?? '' }}
+ @if ($permohonan->is_mig == 1 && $dokumen) + + @foreach ($dokumen->detail as $detail) + @if ($detail->name && $detail->details && $detail->dokumen_jaminan) + + @endif + @if ($detail->name == 'LOKASI JAMINAN' && $detail->details) + @include('lpj::component.detail-lokasi', ['details' => json_decode($detail->details, true)]) + @endif + @endforeach +
{{ $detail->name }}
+ @else + + + + + + +
Terletak di{{ $alamat['address'] ?? '' }}
Kelurahan{{ $alamat['village_code'] ?? '' }}
Kecamatan{{ $alamat['district_code'] ?? '' }}
Kotamadya{{ $alamat['city_code'] ?? '' }}
Propinsi{{ $alamat['province_code'] ?? '' }}
+ @endif
- - +

@@ -383,16 +375,15 @@

Titik Kordinat : - {{ isset($forminspeksi['asset']['kordinat_lat']) ? $forminspeksi['asset']['kordinat_lat'] : '' }} + {{ isset($forminspeksi['asset']['kordinat_lat']) && !empty($forminspeksi['asset']['kordinat_lat']) ? $forminspeksi['asset']['kordinat_lat'] : '-' }} , - {{ isset($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '' }} + {{ isset($forminspeksi['asset']['kordinat_lng']) && !empty($forminspeksi['asset']['kordinat_lng']) ? $forminspeksi['asset']['kordinat_lng'] : '-' }}
-
- +
+
@php // Ambil nilai sesuai dan tidak sesuai - $hubCadebSesuai = $forminspeksi['asset']['hub_cadeb']['sesuai'] ?? null; - $hubCadebTidakSesuai = $forminspeksi['asset']['hub_cadeb']['tidak sesuai'] ?? null; + $hubCadeb = $forminspeksi['asset']['hub_cadeb'] ?? []; + $hubCadebSesuai = $hubCadeb['sesuai'] ?? null; + $hubCadebTidakSesuai = $hubCadeb['tidak sesuai'] ?? null; @endphp @@ -428,7 +420,6 @@ @if (!empty($basicData['hubCadeb']))

@@ -408,8 +399,9 @@

Hubungan Pemilik Jaminan dengan Debitur :
- @php $count = 0; @endphp @foreach ($basicData['hubCadeb'] as $item) - @php $count++; @endphp - - @if ($count % 3 === 0) + @if ($loop->iteration % 3 === 0) + + + @endif + @endforeach - +
@endif - @endforeach + + - @if ($count % 3 !== 0) - @for ($i = 0; $i < 3 - ($count % 3); $i++) - - @endfor - @endif + + @php + $selectedData = $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'] + ?? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai'] + ?? null; + @endphp + + Hubungan Penghuni Jaminan dengan Debitur + : + + {{ $selectedData ?? '' }} + - @endif - - - - - - - @php - $statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']) - ? 'sesuai' - : 'tidak sesuai'; - $selectedData = $forminspeksi['asset']['hub_cadeb_penghuni'][$statusKey] ?? null; - @endphp - - Hubungan Penghuni Jaminan dengan Debitur - : - - @if (isset($selectedData)) - {{ $selectedData ?? '' }} - - @endif - - - -
@@ -487,20 +463,12 @@ @foreach ($permohonan->documents as $dokumen) @if ($dokumen->jenisJaminan) @php - $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); + $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true) ?: []; + $kategoriUnik = array_unique(is_array($formKategori) ? $formKategori : [$formKategori]); @endphp - @if (isset($formKategori) && $formKategori) - @php - $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; - $kategoriUnik = array_unique($kategoriArray); - @endphp - @endif @foreach ($kategoriUnik as $kategori) - {{-- Tampilkan komponen sesuai kategori jika file komponen ada --}} - @includeIf('lpj::surveyor.components.print-out.' . str_replace('-', '-', $kategori), [ - 'dokumen' => $dokumen, - ]) + @includeIf('lpj::surveyor.components.print-out.' . $kategori, ['dokumen' => $dokumen]) @endforeach @endif @endforeach diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php index cddb1d4..89aff73 100644 --- a/resources/views/surveyor/components/tanah.blade.php +++ b/resources/views/surveyor/components/tanah.blade.php @@ -4,6 +4,7 @@ Analisa Tanah
+
@@ -13,7 +14,7 @@ @if (isset($permohonan->documents)) @foreach ($permohonan->documents as $item) - @php + @php $total_luas_tanah = 0; $jenis_legalitas_jaminan_id = 0; if (isset($item->detail)) { @@ -28,8 +29,8 @@

{{ $total_luas_tanah }} m2

@endforeach @endif -
+
-
+
@@ -111,6 +112,7 @@
+
@@ -164,6 +166,7 @@
+
@@ -201,6 +204,7 @@
+
@@ -224,7 +228,6 @@
-
@@ -242,6 +245,7 @@ $forminspeksi['tanah']['posisi_kavling']['lainnya'] ?? '', ); @endphp + @foreach ($basicData['posisiKavling'] as $item)
+
-
diff --git a/resources/views/surveyor/detail.blade.php b/resources/views/surveyor/detail.blade.php index 3fe7603..287f632 100644 --- a/resources/views/surveyor/detail.blade.php +++ b/resources/views/surveyor/detail.blade.php @@ -18,27 +18,25 @@ @endpush @include('lpj::assetsku.includenya')
- @include('lpj::component.detail-jaminan', ['backLink' => 'surveyor.index']) + @include('lpj::component.detail-jaminan',['backLink'=>'surveyor.index']) @if ($permohonan->status == 'revisi-survey')
- Catatan Revisi + Catatan Revisi

{{ $permohonan->keterangan ?? '' }}

-
@endif -
- Form Jaminan + Form Jaminan
@@ -48,7 +46,6 @@