diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index 6d2246c..40d13c3 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -256,16 +256,10 @@ `; } - if (data.nilai_liquidasi == null) { - laporanButton = ` - - Laporan - `; - } - if ((data.status_bayar == "sudah_bayar" || data.status_bayar == "tidak_bayar") && data - .nilai_liquidasi > 0) { - if (data.penilai.type_penilai == 'resume' && !data.penilai.resume) { + + if ((data.status_bayar == "sudah_bayar" || data.status_bayar == "tidak_bayar")) { + if (data.penilai?.type_penilai == 'resume' && !data.penilai?.resume) { laporanButton = ` Laporan diff --git a/resources/views/penilai/components/analisa/informasi.blade.php b/resources/views/penilai/components/analisa/informasi.blade.php index ef95741..3d38455 100644 --- a/resources/views/penilai/components/analisa/informasi.blade.php +++ b/resources/views/penilai/components/analisa/informasi.blade.php @@ -1,6 +1,23 @@
- + @if($permohonan->is_mig) + @if (!empty($forminspeksi['fakta']['keterangan'])) + @foreach ($forminspeksi['fakta']['keterangan'] as $key => $item) +
+ + + +
+ {{ $key }} +
+ @foreach ($item as $data_) + {!! nl2br(e($data_)) !!} + @endforeach + @endforeach + @endif + @else + + Informasi Dinas Tata Ruang : @@ -34,31 +51,6 @@ - - @if (!empty($forminspeksi['fakta']['keterangan'])) - - Catatan yang Perlu - Diperhatikan - : - - @php - $keterangan = $forminspeksi['fakta']['keterangan'] ?? ''; - if (is_array($keterangan)) { - $keterangan = implode(', ', array_filter($keterangan)); - } - @endphp - - @if (!empty($keterangan)) - - - - - -
{!! nl2br(e($keterangan)) !!}
- @endif - - - @endif
diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php index 6565c5a..b534d49 100644 --- a/resources/views/penilai/components/footer.blade.php +++ b/resources/views/penilai/components/footer.blade.php @@ -68,7 +68,7 @@ @endphp @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath))) - +

{{ $customLabels[$type] ?? '' }}

diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 403670a..6400c44 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -6,6 +6,9 @@ $jenisAset = $dokumen->jenisJaminan->name; } $data = rtrim($data, ', '); + + $permohonan_migrasi = json_decode($permohonan->mig_permohonan); + @endphp
@@ -43,7 +46,7 @@ Permintaan (AO) : - {{ $permohonan->user->name ?? '-' }} + {{ $permohonan->user->name ?? $permohonan_migrasi->mig_mst_jaminan_nama_ao ?? '-' }} No Order @@ -62,13 +65,6 @@ {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }} - - User - : - {{ $permohonan->user->name ?? '' }} - - - @php $senior_officer = null; if ($permohonan->debiture && $permohonan->documents) { @@ -97,6 +93,11 @@ } @endphp + + User + : + {{ $penilai->user->name ?? '' }} + Pemeriksa : @@ -107,17 +108,32 @@ : {{ $permohonan->approveSo->name ?? '' }} + @if($permohonan->is_mig) + + No Laporan + : + + {{ $permohonan_migrasi->mig_mst_lpj_nomor_lpj ?? '-' }} + + + @endif Tanggal Laporan : - {{ formatTanggalIndonesia($tanggalLaporan) ?? '' }} + {{ formatTanggalIndonesia($tanggalLaporan) ?? '' }} + Waktu Penyelesaian : - - {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }} + + @if($permohonan->is_mig) + {{ floor(\Carbon\Carbon::parse($permohonan->penilaian->tanggal_kunjungan)->diffInDays(\Carbon\Carbon::parse($tanggalLaporan))) }} + @else + {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }} + @endif + @@ -448,7 +464,7 @@ @endforeach - @else + @endif @foreach ($permohonan->documents as $dokumen) @if ($dokumen->jenisJaminan) @php @@ -460,20 +476,19 @@ $kategoriUnik = array_unique($kategoriArray); @endphp - @foreach ($kategoriUnik as $kategori) - @if ($kategori !== 'lingkungan') + @if(!$permohonan->is_mig) + @foreach ($kategoriUnik as $kategori) @include( 'lpj::penilai.components.analisa.' . str_replace('-', '-', $kategori), - [ - 'dokumen' => $dokumen, - ] - ) - @endif - @endforeach + [ + 'dokumen' => $dokumen, + ] + ) + @endforeach + @endif @endif @endif @endforeach - @endif
@@ -483,7 +498,9 @@
- @include('lpj::penilai.components.print-pembanding') + @if(isset($dataPembanding)) + @include('lpj::penilai.components.print-pembanding') + @endif
@@ -502,6 +519,7 @@ @php + $totalNilaiPasarWajar = 0; $labelNilai = [ 'bangunan' => 'Luas Bangunan', 'tanah' => 'Luas Tanah', @@ -532,6 +550,7 @@ {{ $lpjData['nilai_' . $key . '_2'] ?? '' }} + @php $totalNilaiPasarWajar += $lpjData['nilai_' . $key . '_2']; @endphp @endif @endforeach @if (isset($lpjData['npw_tambahan'])) @@ -549,6 +568,7 @@ {{ $npw['nilai_2'] }} + @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp @endforeach @endif @@ -557,12 +577,11 @@ - @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0) - @endif
=
- Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }} + Rp {{ number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
b. Total Nilai Likuidasi @@ -581,12 +600,19 @@ {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
+ @if($permohonan->is_mig) + @include( + 'lpj::penilai.components.analisa.informasi', + [ + 'dokumen' => $dokumen, + ] + ) + @endif
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 65ccc1c..a2369b1 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -137,7 +137,7 @@
- + @if ($permohonan->is_mig == 1) @if (@isset($dokumen)) @@ -274,7 +274,9 @@
+ @if(isset($dataPembanding)) @include('lpj::penilai.components.print-pembanding') + @endif
diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php index fc8cec2..211ee6f 100644 --- a/resources/views/penilai/components/signature-approval.blade.php +++ b/resources/views/penilai/components/signature-approval.blade.php @@ -1,4 +1,4 @@ - +
@php use Modules\Usermanagement\Models\User; @@ -17,7 +17,6 @@ ? 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) @@ -33,27 +32,48 @@ ); @endphp - + @if ($permohonan->approval_so != null) + + @endif + @if ($permohonan->approval_eo != null) + + @endif + @if ($permohonan->approval_dd != null) + + @endif + + + + @if ($permohonan->approval_so != null) - @endif @if ($permohonan->approval_eo != null) - @endif @if ($permohonan->approval_dd != null) - @if ($permohonan->approval_so != null)
+ + Penilaian Dibuat + + Diperiksa + + Menyetujui + + Menyetujui +
@if (file_exists($imagePathPenilai)) {{ $imagePathPenilai }} @endif + @if (file_exists($imagePathSo)) {{ $imagePathSo }} @endif + @if (file_exists($imagePathEO)) {{ $imagePathEO }} @endif + @if (file_exists($imagePathDD)) {{ $imagePathDD }} @endif @@ -63,7 +83,7 @@
{{ $penilai->userPenilaiTeam->name ?? '' }}
- {{ ucwords(strtolower('PENILAI')) }} + {{ ucwords(strtolower('PENILAI')) }}
@@ -72,9 +92,9 @@ 		- {{ $senior_officer->name ?? '' }}
+ {{ $soUser->name ?? $senior_officer->name ?? '' }}
- {{ ucwords(strtolower('SENIOR OFFICER')) }} + {{ ucwords(strtolower('SENIOR OFFICER')) }}
@@ -85,9 +105,9 @@ @if ($permohonan->approval_eo != null) 		- {{ User::role('EO Appraisal')->first()->name ?? '' }}
+ {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}
- {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} + {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
@@ -97,9 +117,9 @@ @endif @if ($permohonan->approval_dd != null) 		- {{ User::role('DD Appraisal')->first()->name ?? '' }}
+ {{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}
- {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} + {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 7c2581c..83346f3 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -95,7 +95,6 @@ {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) ?? '' }}

@if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang'])) - @@ -105,11 +104,10 @@ {{ str_replace('_', ' ', $permohonan->status_bayar) }} - - @endif + @endif + - @foreach ($permohonan->documents as $dokumen) @@ -164,7 +162,7 @@

@@ -220,116 +218,116 @@

+ href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&jaminanId={{ $dokumen->jenis_jaminan_id }}"> Lampiran Foto dan Dokumen @if ($permohonan->status != 'freeze') - @if (strtolower($permohonan->tujuanPenilaian->name) != 'rap') - - Kertas Kerja + @if (strtolower($permohonan->tujuanPenilaian->name) != 'rap') + + Kertas Kerja + + @endif + + Paparan - @endif - - Paparan - -
- +
+ + + {{-- kios tanah bangunan kalo dalam mall ruko --}} +
+
+ @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap') +
+ + + + + + + RAP + + +
+ @else + {{-- pendapingan kjjp leleang --}} + {{-- memo pendapingan lelang --}} + {{-- existing di --}} +
+ + + + + + + MEMO + + +
+ @if (!in_array(strtoupper($dokumen->jenisJaminan->name), $tanahBangunanTypes)) + @if ($permohonan->status_bayar === 'belum_bayar') +
+ + + + + + + RESUME + + +
+ @endif + + {{-- untuk laporan standart itu non kerjasama tapi sederhanan in kerjasama --}} - {{-- kios tanah bangunan kalo dalam mall ruko --}} -
-
- @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap') -
- - - - - - - RAP - - -
- @else - {{-- pendapingan kjjp leleang --}} - {{-- memo pendapingan lelang --}} - {{-- existing di --}} -
- - - - - - - MEMO - - -
- @if (!in_array(strtoupper($dokumen->jenisJaminan->name), $tanahBangunanTypes)) - @if ($permohonan->status_bayar === 'belum_bayar')
+ onclick="seletSederhanaStandart('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }}, '{{ $permohonan->jenisFasilitasKredit->name }}', '{{ $permohonan->status_bayar }}')"> - - - - - RESUME + + LPJ
@endif - - {{-- untuk laporan standart itu non kerjasama tapi sederhanan in kerjasama --}} -
+ onclick="callReport('{{ $permohonan->id }}', '{{ $dokumen->id }}', {{ $dokumen->jenis_jaminan_id }})"> - + + + + + CALL REPORT - LPJ
@endif -
- - - - - - - CALL REPORT - - -
- @endif - {{-- @if ($permohonan->penilaian->jenis_penilaian_id == 2 && $permohonan->tujuanPenilaian->id == 4) --}} + {{-- @if ($permohonan->penilaian->jenis_penilaian_id == 2 && $permohonan->tujuanPenilaian->id == 4) --}} - {{-- @endif --}} + {{-- @endif --}} +
-
- {{-- @if($permohonan->jenisPenilaian->name=="Eksternal") - @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan)) + {{-- @if ($permohonan->jenisPenilaian->name == 'Eksternal') + @if (isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
- @if(isset($permohonan->laporanExternal->file_resume) && !empty($permohonan->laporanExternal->file_resume)) + @if (isset($permohonan->laporanExternal->file_resume) && !empty($permohonan->laporanExternal->file_resume))
@@ -341,7 +339,7 @@
@endif - @if(isset($permohonan->laporanExternal->file_laporan) && !empty($permohonan->laporanExternal->file_laporan)) + @if (isset($permohonan->laporanExternal->file_laporan) && !empty($permohonan->laporanExternal->file_laporan))
@@ -365,18 +363,18 @@
+ class="btn btn-light"> Cetak Hasil Inspeksi + href="penilai/show-laporan-inspeksi/{{ $permohonan->id }}/{{ $dokumen->id }}/{{ $dokumen->jenis_jaminan_id }}"> Lihat Laporan + href="penilai/print-out-laporan/{{ $permohonan->id }}/{{ $dokumen->id }}/{{ $dokumen->jenis_jaminan_id }}?type=penilai"> Cetak Laporan @@ -385,19 +383,19 @@
@endforeach @if ($permohonan->status != 'freeze') -
- - - REPORT - +
+ + + REPORT + - status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }} - onclick="revisiSurveyor('{{ $permohonan->id }}', '{{ $permohonan->debiture->name }}', '{{ $permohonan->nomor_registrasi }}')"> - - REVISI - -
+ status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }} + onclick="revisiSurveyor('{{ $permohonan->id }}', '{{ $permohonan->debiture->name }}', '{{ $permohonan->nomor_registrasi }}')"> + + REVISI + +
@endif @@ -429,7 +427,6 @@ // Ambil ID inspeksi pertama (jika ada) - // Ambil jenis jaminan jika ada if ($firstDocument->jenisjaminan) { $jenisJaminanId = $firstDocument->jenisjaminan->id; @@ -447,14 +444,14 @@
@if (isset($permohonan->penilai) && isset($permohonan->penilai->kertas_kerja) && $permohonan->penilai->kertas_kerja) Lihat Kertas Kerja @endif
@@ -479,13 +476,13 @@ confirmButtonText: 'Lanjutkan', confirmButtonColor: '#3085d6', }).then(() => { - resume(permohonanId, documentId, jaminanId) + resume(permohonanId, documentId, jaminanId) }); } else { fetch( - `{{ url('/penilai/check-status-lpj') }}?permohonanId=${permohonanId}&documentId=${documentId}` - ) + `{{ url('/penilai/check-status-lpj') }}?permohonanId=${permohonanId}&documentId=${documentId}` + ) .then(response => response.json()) .then(data => { if (data.status) { @@ -508,7 +505,7 @@ confirmButtonText: 'Lanjutkan', confirmButtonColor: '#3085d6', }).then(() => { - saveStatusLpj(permohonanId, documentId, 'sederhana', jaminanId); + saveStatusLpj(permohonanId, documentId, 'sederhana', jaminanId); }); } else { Swal.fire({ @@ -523,10 +520,10 @@ denyButtonColor: '#d33', }).then((result) => { if (result.isConfirmed) { - saveStatusLpj(permohonanId, documentId, 'standar', + saveStatusLpj(permohonanId, documentId, 'standar', jaminanId); } else if (result.isDenied) { - saveStatusLpj(permohonanId, documentId, 'sederhana', + saveStatusLpj(permohonanId, documentId, 'sederhana', jaminanId); } }); @@ -541,17 +538,17 @@ function saveStatusLpj(permohonanId, documentId, type, jaminanId) { fetch(`{{ url('/penilai/save-status-lpj') }}`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-CSRF-TOKEN': '{{ csrf_token() }}', - }, - body: JSON.stringify({ - permohonan_id: permohonanId, - document_id: documentId, - type: type, - }), - }).then(response => response.json()) + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-CSRF-TOKEN': '{{ csrf_token() }}', + }, + body: JSON.stringify({ + permohonan_id: permohonanId, + document_id: documentId, + type: type, + }), + }).then(response => response.json()) .then(data => { if (data.success) { if (type === 'standar') { @@ -566,7 +563,7 @@ } - function uploadKertasKerja(permohonanId, documentId, jaminanId) { + function uploadKertasKerja(permohonanId, documentId, jaminanId) { const kertasKerjaInput = document.getElementById('kertas_kerja'); if (!kertasKerjaInput.files.length) { Swal.fire({ @@ -586,12 +583,12 @@ formData.append('kertas_kerja', kertasKerja); fetch(`{{ url('/penilai/import/kertas-kerja') }}`, { - method: 'POST', - headers: { - 'X-CSRF-TOKEN': '{{ csrf_token() }}', - }, - body: formData, - }) + method: 'POST', + headers: { + 'X-CSRF-TOKEN': '{{ csrf_token() }}', + }, + body: formData, + }) .then(response => response.json()) // Pastikan respons diurai menjadi JSON .then(data => { if (data.success) { @@ -625,26 +622,26 @@ }); } - function resume(permohonanId, documentId, jaminanId) { + function resume(permohonanId, documentId, jaminanId) { showLoadingSwal('Tunggu ...'); window.location.href = `{{ route('penilai.resume') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`; } - function memo(permohonanId, documentId, jaminanId) { + function memo(permohonanId, documentId, jaminanId) { showLoadingSwal('Tunggu ...'); window.location.href = `{{ route('penilai.memo') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`; } - function rap(permohonanId, documentId, jaminanId) { + function rap(permohonanId, documentId, jaminanId) { showLoadingSwal('Tunggu ...'); window.location.href = `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`; } - function paparan(permohonanId, documentId, jaminanId) { + function paparan(permohonanId, documentId, jaminanId) { Swal.fire({ title: 'Apakah Kamu yakin ingin melakukan paparan', icon: 'warning', @@ -660,7 +657,7 @@ }); } - function callReport(permohonanId, documentId, jaminanId) { + function callReport(permohonanId, documentId, jaminanId) { showLoadingSwal('Tunggu ...'); window.location.href = `{{ route('penilai.call-report') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`; @@ -675,7 +672,7 @@ headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, - success: function (response) { + success: function(response) { if (response.success) { // window.location.reload(); hideLoadingSwal(); @@ -685,7 +682,7 @@ Swal.fire('Perhatian!', response.message, 'warning'); } }, - error: function (xhr, status, error) { + error: function(xhr, status, error) { console.log('Error checking button status:', error, status, xhr); if (xhr.responseJSON.message) { // window.location.reload();