diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 660176e..07556de 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -75,11 +75,9 @@ class LaporanController extends Controller } // Retrieve data from the database - $query = Permohonan::query()->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan'])->whereNotNull('approval_so_at')->whereNotNull('approval_eo_at')->where(function ($q) { - $q->whereIn('nilai_plafond_id', [1,4]) - ->whereNotNull('approval_dd_at') - ->orWhereIn('nilai_plafond_id', [2,3]); - }); + $query = Permohonan::query() + ->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan']); + $query = $query->orderBy('nomor_registrasi', 'desc'); // Apply search filter if provided diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index 127c154..6d2246c 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -151,7 +151,7 @@ user_id: { title: 'User Pemohon', render: (item, data) => { - return `${data.user.name}`; + return `${data.user?.name}`; }, }, tujuan_penilaian_id: { @@ -180,16 +180,16 @@ jenis_fasilitas_kredit_id: { title: 'Fasilitas Kredit', render: (item, data) => { - return `${data.jenis_fasilitas_kredit.name}`; + return `${data.jenis_fasilitas_kredit?.name}`; } }, tanggal_survei: { title: 'Tanggal Survei', render: (item, data) => { - if (data.penilaian.waktu_penilaian) { - return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`; + if (data.penilaian?.waktu_penilaian) { + return `${formatDate(new Date(data.penilaian?.waktu_penilaian))}`; } - return `${formatDate(new Date(data.penilaian.created_at))}`; + return `${formatDate(new Date(data.penilaian?.created_at))}`; }, }, due_date_sla: { @@ -197,10 +197,10 @@ render: (item, data) => { const tujuan_penilaian = data.tujuan_penilaian.name; const tipe_laporan = data.penilai?.type; - const nilai_plafond = data.penilaian.nilaiPlafond?.name; - let waktu_penilaian = new Date(data.penilaian.created_at); - if (data.penilaian.waktu_penilaian) { - waktu_penilaian = new Date(data.penilaian.waktu_penilaian); + const nilai_plafond = data.penilaian?.nilaiPlafond?.name; + let waktu_penilaian = new Date(data.penilaian?.created_at); + if (data.penilaian?.waktu_penilaian) { + waktu_penilaian = new Date(data.penilaian?.waktu_penilaian); } if (tujuan_penilaian.name === "RAP") { @@ -249,7 +249,7 @@ } } - if (data.penilai.resume) { + if (data.penilai?.resume) { resumeButton = ` Resume diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php index 4647d60..ba33652 100644 --- a/resources/views/penilai/components/print-out-rap.blade.php +++ b/resources/views/penilai/components/print-out-rap.blade.php @@ -47,7 +47,7 @@ {{ $rap['dari'] ?? '' }} - Tanggal Survey + Tanggal Penilaian : {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }} diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 863e38b..403670a 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -57,7 +57,7 @@ {{ formatTanggalIndonesia($permohonan->tanggal_permohonan) }} - Tanggal Survey + Tanggal Penilaian : {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }} @@ -97,7 +97,6 @@ } @endphp - Pemeriksa : @@ -142,50 +141,64 @@ {{ $permohonan->tujuanPenilaian->name ?? '' }} - @if ($permohonan->is_mig == 1) - {{-- --}} - @if (@isset($dokumen)) - @foreach ($dokumen->detail as $detail) - @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) - - - - @endif - @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN') - @php - $details = json_decode($detail->details, true); - @endphp - @include('lpj::component.detail-lokasi', ['details' => $details]) - @endif - @endforeach - @endif - @else - - - - - - - - - - - - - - - - - - - - - - - - - + @if ($permohonan->is_mig) + @php + $data = json_decode($inspeksi->mig_detail_data_jaminan, true); + @endphp + @foreach ($data as $key => $item) + @if ($key == 'address') + @php $key = 'Terletak di'; @endphp + @endif + + + + + + @endforeach + {{--
{{ $detail->name ?? '' }}
Terletak di:{{ $alamat['address'] ?? '' }}
Desa/Kelurahan:{{ $alamat['village_code'] ?? '' }}
Kecamatan:{{ $alamat['district_code'] ?? '' }}
Kabupaten/Kota:{{ $alamat['city_code'] ?? '' }}
Provinsi:{{ $alamat['province_code'] ?? '' }}
{{ $key }}:{{ $item }}
--}} + @if (@isset($dokumen)) + @foreach ($dokumen->detail as $detail) + @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) + + + + @endif + + @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN') + @php + $details = json_decode($detail->details, true); + @endphp + @include('lpj::component.detail-lokasi', ['details' => $details]) + @endif + @endforeach + @endif + @else + + + + + + + + + + + + + + + + + + + + + + + + + @endif @include('lpj::component.print-out-dokument') @@ -209,196 +222,233 @@
{{ $detail->name ?? '' }}
Terletak di:{{ $alamat['address'] ?? '' }}
Desa/Kelurahan:{{ $alamat['village_code'] ?? '' }}
Kecamatan:{{ $alamat['district_code'] ?? '' }}
Kabupaten/Kota:{{ $alamat['city_code'] ?? '' }}
Provinsi:{{ $alamat['province_code'] ?? '' }}
+ @php $mig_detail_legalitas_jaminan = json_decode($inspeksi->mig_detail_legalitas_jaminan, true); @endphp + + + -
+ STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI +
- - - - - - - - - -
- STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI - - SARANA PELENGKAP DAN LINGKUNGAN -
- - - @php - $cekHubDebitur = isset($forminspeksi['asset']['hub_cadeb']) && - $forminspeksi['asset']['hub_cadeb'] === 'sesuai' - ? 'sesuai' - : 'tidak sesuai'; - - $hubCadebDebitur = isset($forminspeksi['asset']['hub_cadeb'][$cekHubDebitur]) - ? $forminspeksi['asset']['hub_cadeb']['tidak sesuai'] - : $forminspeksi['asset']['hub_cadeb']['sesuai']; - @endphp - - - - - - @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'] - : $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']; - @endphp - - - - -
Hubungan Pemilik Jaminan dengan Debitur:{{ $hubCadebDebitur ?? '' }}
Hubungan Penghuni Jaminan dengan Debitur:{{ $hubCadeb ?? '' }}
- 		- - @php - $lingkungan = $forminspeksi['lingkungan']; - $fasilitas = $lingkungan['fasilitas_dekat_object'] ?? []; - $fasilitasInput = $lingkungan['fasilitas_dekat_object_input'] ?? []; - @endphp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @if ($lingkungan['dekat_makam'] == 'ya') + + + + - -
Jarak Jalan Utama:{{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m -
Jalan Lingkungan:{{ $lingkungan['jalan_linkungan'] ?? '-' }} m -
Jarak CBD:{{ $lingkungan['jarak_cbd_point'] ?? '-' }} m - ({{ $lingkungan['nama_cbd_point'] ?? '-' }})
Lebar Perkerasan Jalan: - {{ $lingkungan['lebar_perkerasan_jalan'] ?? '-' }} m
Perkerasan Jalan: - - {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? $lingkungan['perkerasan_jalan'] ?? ['-']) }} -
Lalu Lintas:{{ - $lingkungan['lalu_lintas'] - ? (is_array($lingkungan['lalu_lintas']) - ? implode(', ', $lingkungan['lalu_lintas']) - : $lingkungan['lalu_lintas']) - : '-' - }} -
Golongan Masyarakat Sekitar:{{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? $lingkungan['gol_mas_sekitar'] ?? ['-']) }} -
Tingkat Keramaian: - {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? $lingkungan['tingkat_keramaian'] ?? ['-']) }} -
Terletak di Area: - {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? $lingkungan['terletak_diarea'] ?? ['-']) }} -
Kondisi Bangunan Sekitar: - {{ $lingkungan['kondisi_bagunan_disekitar_lokasi'] ?? '-' }} -
Sifat Bangunan Sekitar: - {{ $lingkungan['sifat_bagunan_disekitar_lokasi'] ?? '-' }}
+ SARANA PELENGKAP DAN LINGKUNGAN +
+ - - - + + - @endif - - @if ($lingkungan['dekat_tps'] == 'ya') - - - - - @endif + @php - - - - - + $cekHub = + isset($forminspeksi['asset']['hub_cadeb_penghuni']) && + $forminspeksi['asset']['hub_cadeb_penghuni'] === 'sesuai' + ? 'sesuai' + : 'tidak sesuai'; - @if (!empty($fasilitas)) - - - - + + - @endif -
Dekat Makam:Ya, Jarak - {{ $lingkungan['jarak_makam'] ?? '-' }} m - ({{ $lingkungan['nama_makam'] ?? '-' }}) + @php + $cekHubDebitur = + isset($forminspeksi['asset']['hub_cadeb']) && + $forminspeksi['asset']['hub_cadeb'] === 'sesuai' + ? 'sesuai' + : 'tidak sesuai'; + + $hubCadebDebitur = isset($forminspeksi['asset']['hub_cadeb'][$cekHubDebitur]) + ? $forminspeksi['asset']['hub_cadeb']['tidak sesuai'] + : $forminspeksi['asset']['hub_cadeb']['sesuai']; + + @endphp + Hubungan Pemilik Jaminan dengan + Debitur:{{ $hubCadebDebitur ?? '' }}
Dekat TPS:Ya, Jarak - {{ $lingkungan['jarak_tps'] ?? '-' }} m - ({{ $lingkungan['nama_tps'] ?? '-' }})
Daerah: - {{ implode(', ', $lingkungan['merupakan_daerah'] ?? ['-']) }} -
Fasilitas Dekat Objek: - @foreach ($fasilitas as $fas) - {{ $fas }} - @if (isset($fasilitasInput[$fas])) - ({{ $fasilitasInput[$fas] }}) - @endif - @if (!$loop->last) - , - @endif - @endforeach + $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 :{{ $hubCadeb ?? '' }}
-
- +
+ + + @if ($permohonan->is_mig) + + @foreach ($mig_detail_legalitas_jaminan['SARANA PELENGKAP DAN LINGKUNGAN'] as $item) + + + + + + @endforeach +
{{ $item['label'] }}:{{ $item['value'] }}
+ @else + + @php + $lingkungan = $forminspeksi['lingkungan']; + $fasilitas = $lingkungan['fasilitas_dekat_object'] ?? []; + $fasilitasInput = $lingkungan['fasilitas_dekat_object_input'] ?? []; + @endphp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @if ($lingkungan['dekat_makam'] == 'ya') + + + + + + @endif + + @if ($lingkungan['dekat_tps'] == 'ya') + + + + + + @endif + + + + + + + + @if (!empty($fasilitas)) + + + + + + @endif +
Jarak Jalan Utama: + {{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m +
Jalan Lingkungan: + {{ $lingkungan['jalan_linkungan'] ?? '-' }} + m +
Jarak CBD: + {{ $lingkungan['jarak_cbd_point'] ?? '-' }} + m + ({{ $lingkungan['nama_cbd_point'] ?? '-' }})
Lebar Perkerasan Jalan: + {{ $lingkungan['lebar_perkerasan_jalan'] ?? '-' }} m
Perkerasan Jalan: + + {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? ($lingkungan['perkerasan_jalan'] ?? ['-'])) }} +
Lalu Lintas: + {{ $lingkungan['lalu_lintas'] + ? (is_array($lingkungan['lalu_lintas']) + ? implode(', ', $lingkungan['lalu_lintas']) + : $lingkungan['lalu_lintas']) + : '-' }} +
Golongan Masyarakat Sekitar: + {{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ($lingkungan['gol_mas_sekitar'] ?? ['-'])) }} +
Tingkat Keramaian: + {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? ($lingkungan['tingkat_keramaian'] ?? ['-'])) }} +
Terletak di Area: + {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? ($lingkungan['terletak_diarea'] ?? ['-'])) }} +
Kondisi Bangunan Sekitar: + {{ $lingkungan['kondisi_bagunan_disekitar_lokasi'] ?? '-' }} +
Sifat Bangunan Sekitar: + {{ $lingkungan['sifat_bagunan_disekitar_lokasi'] ?? '-' }}
Dekat Makam:Ya, Jarak + {{ $lingkungan['jarak_makam'] ?? '-' }} m + ({{ $lingkungan['nama_makam'] ?? '-' }}) +
Dekat TPS:Ya, Jarak + {{ $lingkungan['jarak_tps'] ?? '-' }} m + ({{ $lingkungan['nama_tps'] ?? '-' }})
Daerah: + {{ implode(', ', $lingkungan['merupakan_daerah'] ?? ['-']) }} +
Fasilitas Dekat Objek: + @foreach ($fasilitas as $fas) + {{ $fas }} + @if (isset($fasilitasInput[$fas])) + ({{ $fasilitasInput[$fas] }}) + @endif + @if (!$loop->last) + , + @endif + @endforeach +
+ @endif + + + +
+ + @if ($permohonan->is_mig) + + + + + @foreach ($mig_detail_legalitas_jaminan['ANALISA TANAH DAN BANGUNAN'] as $item) + + + + + + @endforeach +
+ ANALISA TANAH DAN BANGUNAN +
{{ $item['label'] }}:{{ $item['value'] }}
+ @else @foreach ($permohonan->documents as $dokumen) @if ($dokumen->jenisJaminan) @php @@ -411,17 +461,19 @@ @endphp @foreach ($kategoriUnik as $kategori) - @if ($kategori !== 'lingkungan') - @include('lpj::penilai.components.analisa.' . str_replace('-', '-', $kategori), [ - 'dokumen' => $dokumen, - ]) + @include( + 'lpj::penilai.components.analisa.' . str_replace('-', '-', $kategori), + [ + 'dokumen' => $dokumen, + ] + ) @endif - @endforeach @endif @endif @endforeach + @endif
@@ -461,9 +513,9 @@ 'kapal' => 'Luas Kapal', ]; if (strcasecmp($jenisAset, 'RUKO/RUKAN') === 0) { - $labelNilai['bangunan'] = 'Luas Unit'; - unset($labelNilai['tanah']); - } + $labelNilai['bangunan'] = 'Luas Unit'; + unset($labelNilai['tanah']); + } @endphp @foreach ($labelNilai as $key => $label) @if (isset($lpjData['luas_' . $key])) @@ -511,25 +563,24 @@ @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0) - - - - - - - - - - + + + + + + + + @endif
- b. Total Nilai Likuidasi -
- {{ $lpjData['likuidasi'] ?? '' }}% - - X Total Nilai Pasar Wajar - - = Rp - {{ $lpjData['likuidasi_nilai_2'] ?? '' }} -
+ b. Total Nilai Likuidasi +
+ {{ $lpjData['likuidasi'] ?? '' }}% + + X Total Nilai Pasar + Wajar + + = Rp + {{ $lpjData['likuidasi_nilai_2'] ?? '' }} +
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 9e345b6..65ccc1c 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -77,7 +77,7 @@ {{ formatTanggalIndonesia($permohonan->tanggal_permohonan) }} - Tanggal Survey + Tanggal Penilaian : {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }} @@ -137,6 +137,7 @@ + @if ($permohonan->is_mig == 1) @if (@isset($dokumen)) diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index d61d1c3..d50cc3f 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -95,7 +95,7 @@ - + diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index 3082862..e10d254 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -65,7 +65,7 @@
{{ $alamat['province_code'] ?? '' }}
Tanggal SurveyTanggal Penilaian : {{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }} - Tanggal Survei + Tanggal Penilaian @@ -183,7 +183,7 @@ }, }, tanggal_survei: { - title: 'Tanggal Survei', + title: 'Tanggal Penilaian', render: (item, data) => { if (data.penilaian.waktu_penilaian) { return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`;