From ef7a47ebb9f28e0a2db4050249f1a4109e3d3795 Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 11 Mar 2025 13:15:51 +0700 Subject: [PATCH] fix(penilai): perbaikkan luas tanah, bangunan, dan print out sederhana, dan rap --- app/Helpers/Lpj.php | 54 +++++++++++++++- app/Http/Controllers/PenilaiController.php | 12 ++-- app/Http/Controllers/PenilaianController.php | 4 +- .../components/print-out-rap.blade.php | 62 +++++++++---------- .../components/print-out-sederhana.blade.php | 13 ++-- .../components/print-pembanding.blade.php | 3 + .../surveyor/components/bangunan.blade.php | 2 +- .../views/surveyor/components/tanah.blade.php | 3 +- 8 files changed, 101 insertions(+), 52 deletions(-) diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 0855bb3..4b182f0 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -485,7 +485,7 @@ function calculateSLA($permohonan, $type) * @param int $jenisLegalitas * @return int */ -function calculateTotalLuas($detailsArray, $key, $jenisLegalitas) +function calculateTotalLuas($detailsArray, $key, $jenisLegalitas, $defaultJenisLegalitas) { $total = 0; @@ -503,7 +503,57 @@ function calculateTotalLuas($detailsArray, $key, $jenisLegalitas) } } } + + // Jika total masih 0, gunakan jenis jaminan ppjb + if ($total === 0) { + foreach ($detailsArray as $item) { + if (isset($item->jenis_legalitas_jaminan_id) && $item->jenis_legalitas_jaminan_id === $defaultJenisLegalitas) { + $details = json_decode($item->details, true); + + if (is_array($details)) { + foreach ($details as $detail) { + if (isset($detail[$key]) && $detail[$key] !== null) { + $total += (int) $detail[$key]; + } + } + } + } + } + } + + // jika total masih kosong juga maka gunakan ppb + if ($total === 0 && $fallbackJenisLegalitas !== null) { + foreach ($detailsArray as $item) { + if (isset($item->jenis_legalitas_jaminan_id) && $item->jenis_legalitas_jaminan_id === $fallbackJenisLegalitas) { + $details = json_decode($item->details, true); + + if (is_array($details)) { + foreach ($details as $detail) { + if (isset($detail[$key]) && $detail[$key] !== null) { + $total += (int) $detail[$key]; + } + } + } + } + } + } } - return $total; + return $total > 0 ? $total : 0; +} + + +function ubahNomorHp($nomorHp) { + + $nomorHp = preg_replace('/\D/', '', $nomorHp); + if (strpos($nomorHp, '62') === 0) { + $nomorBaru = substr($nomorHp, 0, 5) . "xxxxx"; + return '+' . $nomorBaru; + } elseif (strpos($nomorHp, '0') === 0) { + + $nomorBaru = substr($nomorHp, 0, 5) . "xxxxxx"; + return $nomorBaru; + } else { + return "Nomor HP tidak valid"; + } } diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index a09c926..e61863d 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -144,10 +144,10 @@ class PenilaiController extends Controller } } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); + return view('lpj::penilai.components.lpj-sederhana-standar', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); } - public function standard(Request $request, $id) + public function standar(Request $request, $id) { $documentId = $request->query('documentId'); @@ -167,7 +167,7 @@ class PenilaiController extends Controller 'inspeksi_id' => $inspeksiId, ], [ - 'type_penilai' => 'standard', + 'type_penilai' => 'standar', ] ); @@ -212,7 +212,7 @@ class PenilaiController extends Controller } } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); + return view('lpj::penilai.components.lpj-sederhana-standar', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); } public function resume(Request $request) @@ -1358,7 +1358,7 @@ class PenilaiController extends Controller { $viewMap = [ 'sederhana' => 'penilai.components.print-out-sederhana', - 'standard' => 'penilai.components.print-out-standard', + 'standar' => 'penilai.components.print-out-standar', 'resume' => 'penilai.components.print-resume', 'memo' => 'penilai.components.print-memo', 'rap' => 'penilai.components.print-out-rap', @@ -1421,7 +1421,7 @@ class PenilaiController extends Controller } - if ($type === 'standard' || $type === 'sederhana') { + if ($type === 'standar' || $type === 'sederhana') { return $this->checkDataLpj($type, $statusLpj); } diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index aabb59b..11da675 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -825,8 +825,8 @@ class PenilaianController extends Controller private function getViewLaporan($tipe) { $viewMap = [ - 'sederhana' => 'penilai.components.lpj-sederhana-standard', - 'standard' => 'penilai.components.lpj-sederhana-standard', + 'sederhana' => 'penilai.components.lpj-sederhana-standar', + 'standar' => 'penilai.components.lpj-sederhana-standar', 'resume' => 'penilai.components.resume', 'memo' => 'penilai.components.memo', 'rap' => 'penilai.components.rap-penilai', diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php index 19a768d..32e7432 100644 --- a/resources/views/penilai/components/print-out-rap.blade.php +++ b/resources/views/penilai/components/print-out-rap.blade.php @@ -28,32 +28,26 @@ $data = rtrim($data, ', '); @endphp
- - - - -
-

Report Analisa Property

-
+
+

Report Analisa Property + {{ $data }}

+

NO: {{ $nomorLaporan }}

+
+
- + - + - - - - - - + @@ -77,7 +71,7 @@ - + @@ -87,7 +81,7 @@

NAMA DEVELOPER

KepadaKepada : {{ $rap['kepada'] ?? '' }}
DariDari : {{ $rap['dari'] ?? '' }}
No:{{ $nomorLaporan ?? '-' }}
Tanggal SurveyTanggal Survey : {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
PerihalPerihal : {{ $rap['perihal'] ?? '' }}
- + @@ -96,7 +90,7 @@

NAMA PROYEK

NamaNama : {{ $permohonan->debiture->name ?? '' }}
- + @@ -104,7 +98,7 @@

ALAMAT

ProyekProyek : {{ $data ?? '' }}
- + @@ -138,7 +132,7 @@ @if (isset($forminspeksi['perizinan']) && is_array($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0) @foreach ($forminspeksi['perizinan'] as $perizinan) - + @@ -148,7 +142,7 @@ @if (isset($forminspeksi['brosur_price_list']) && count($forminspeksi['brosur_price_list']) > 0) @foreach ($forminspeksi['brosur_price_list'] as $perizinan) - + @@ -160,13 +154,13 @@

DESKRIPSI DEVELOPER

Terletak diTerletak di : {{ $alamat['address'] ?? '' }}
PerizinanPerizinan : {{ $perizinan['perizinan'] }}
Brosur & PricelistBrosur & Pricelist : {{ $perizinan['jenis'] }}
- - + @@ -175,7 +169,7 @@ @isset($forminspeksi['lainnya_developer']) @foreach ($forminspeksi['lainnya_developer'] as $item) - +
Pengalaman Developer & Proyek Yang Pernah + Pengalaman Developer & Proyek Yang Pernah Dibuat : {!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}
Apakah Developer Anggota REIApakah Developer Anggota REI : {!! nl2br(e($forminspeksi['developer_anggota'] ?? 'Data tidak tersedia')) !!}
LainnyaLainnya : {!! nl2br(e($item)) !!} @@ -187,43 +181,43 @@

KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN

- - + - + - + - + - + - + - + @@ -232,7 +226,7 @@ @isset($forminspeksi['lainnya_kondisi']) @foreach ($forminspeksi['lainnya_kondisi'] as $item) - + - diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index acce9e1..02cee4c 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -8,6 +8,12 @@ @endphp
+
+

LAPORAN PENILAIAN ATAS + {{ $data }}

+

NO: {{ $nomorLaporan }}

+
+
Kapan Mulai Dibangun & Target Penyelesaian + Kapan Mulai Dibangun & Target Penyelesaian : {!! nl2br(e($forminspeksi['kapan_mulai_dibangun'] ?? 'Data tidak tersedia')) !!}
Kondisi Perumahan Saat IniKondisi Perumahan Saat Ini : {!! nl2br(e($forminspeksi['kondisi_perumahan'] ?? 'Data tidak tersedia')) !!}
Progress PembangunanProgress Pembangunan : {!! nl2br(e($forminspeksi['progres_pembangunan'] ?? 'Data tidak tersedia')) !!}
Kontraktor (internal/eksternal)Kontraktor (internal/eksternal) : {!! nl2br(e($forminspeksi['kontraktor'] ?? 'Data tidak tersedia')) !!}
Lingkungan SekitarLingkungan Sekitar : {!! nl2br(e($forminspeksi['lingkungan_sekitar'] ?? 'Data tidak tersedia')) !!}
Komplek Lain Disekitar LokasiKomplek Lain Disekitar Lokasi : {!! nl2br(e($forminspeksi['komplek_disekitar'] ?? 'Data tidak tersedia')) !!}
Pusat Keramaian Dekat LokasiPusat Keramaian Dekat Lokasi : {!! nl2br(e($forminspeksi['pusat_keramaian'] ?? 'Data tidak tersedia')) !!}
Transportasi Umum Yang TersediaTransportasi Umum Yang Tersedia : {!! nl2br(e($forminspeksi['transportasi_umum'] ?? 'Data tidak tersedia')) !!}
LainnyaLainnya : {!! nl2br(e($item)) !!} @@ -249,7 +243,7 @@ @foreach ($forminspeksi['partisi'] as $key => $item) @if (is_array($item))
+ {{ $item['nama'] ?? '' }} :
- - - - - @@ -266,7 +267,7 @@ @endphp - + diff --git a/resources/views/penilai/components/print-pembanding.blade.php b/resources/views/penilai/components/print-pembanding.blade.php index f18a495..bf342e0 100644 --- a/resources/views/penilai/components/print-pembanding.blade.php +++ b/resources/views/penilai/components/print-pembanding.blade.php @@ -44,6 +44,9 @@ @elseif($key == 'tanggal') {{ formatTanggalIndonesia($data[$key]) ?? '-' }} + @elseif($key == 'telepon') + {{ isset($data['telepon']) ? ubahNomorHp($data['telepon']) : '-' }} + @elseif($key == 'kordinat') @php $lat = $data['kordinat_lat'] ?? null; diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php index 9f6e622..5778669 100644 --- a/resources/views/surveyor/components/bangunan.blade.php +++ b/resources/views/surveyor/components/bangunan.blade.php @@ -16,7 +16,7 @@ $total_luas_bangunan = 0; $jenis_legalitas_jaminan_id = 0; if (isset($item->detail)) { - $total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10); + $total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10, 27, 3); } @endphp documents)) @foreach ($permohonan->documents as $item) @php + // 27 $total_luas_tanah = 0; $jenis_legalitas_jaminan_id = 0; if (isset($item->detail)) { - $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1); + $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3); } @endphp
@@ -99,11 +105,6 @@ : {{ $senior_officer->name ?? '' }}
No Laporan:{{ $nomorLaporan ?? '' }}
Tanggal Laporan :Luas Tanah :{{ $luas ?? '' }}{{ $luas ?? '' }} m2
Bentuk Tanah