From 16a805e853f0a7b63946f04cb6bea7b9d20f82a4 Mon Sep 17 00:00:00 2001 From: majid Date: Fri, 7 Mar 2025 16:08:01 +0700 Subject: [PATCH] fix(penilai): perbaikkan save penilai dan foto lampiran, kembali ke back --- app/Http/Controllers/PenilaiController.php | 62 +++++++++++++++++-- .../components/foto-lampiran.blade.php | 21 +++++-- resources/views/penilai/lampiran.blade.php | 2 +- resources/views/penilai/show.blade.php | 19 +++--- .../surveyor/components/header.blade.php | 4 +- .../pembanding-tanah-bangunan-unit.blade.php | 2 +- 6 files changed, 85 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 0a57ec5..690e98a 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -109,7 +109,34 @@ class PenilaiController extends Controller $lpjData = json_decode($lpj->lpj, true); } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces')); + $cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null; + + if ($cekAlamat) { + $provinceCode = $cekAlamat['province_code'] ?? $provinceCode; + $cityCode = $cekAlamat['city_code'] ?? $cityCode; + $districtCode = $cekAlamat['district_code'] ?? $districtCode; + // Ambil data menggunakan kode yang telah ditentukan + + } + $cities = City::where('province_code', $provinceCode)->get(); + $districts = District::where('city_code', $cityCode)->get(); + $villages = Village::where('district_code', $districtCode)->get(); + + if ($forminspeksi) { + if (isset($forminspeksi['alamat']['sesuai']['province_code'])) { + $cities = City::where('province_code', $forminspeksi['alamat']['sesuai']['province_code'])->get(); + } + + if (isset($forminspeksi['alamat']['sesuai']['city_code'])) { + $districts = District::where('city_code', $forminspeksi['alamat']['sesuai']['city_code'])->get(); + } + + if (isset($forminspeksi['alamat']['sesuai']['district_code'])) { + $villages = Village::where('district_code', $forminspeksi['alamat']['sesuai']['district_code'])->get(); + } + } + + return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); } public function standard(Request $request, $id) @@ -146,7 +173,34 @@ class PenilaiController extends Controller $lpjData = json_decode($lpj->lpj, true); } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces')); + $cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null; + + if ($cekAlamat) { + $provinceCode = $cekAlamat['province_code'] ?? $provinceCode; + $cityCode = $cekAlamat['city_code'] ?? $cityCode; + $districtCode = $cekAlamat['district_code'] ?? $districtCode; + // Ambil data menggunakan kode yang telah ditentukan + + } + $cities = City::where('province_code', $provinceCode)->get(); + $districts = District::where('city_code', $cityCode)->get(); + $villages = Village::where('district_code', $districtCode)->get(); + + if ($forminspeksi) { + if (isset($forminspeksi['alamat']['sesuai']['province_code'])) { + $cities = City::where('province_code', $forminspeksi['alamat']['sesuai']['province_code'])->get(); + } + + if (isset($forminspeksi['alamat']['sesuai']['city_code'])) { + $districts = District::where('city_code', $forminspeksi['alamat']['sesuai']['city_code'])->get(); + } + + if (isset($forminspeksi['alamat']['sesuai']['district_code'])) { + $villages = Village::where('district_code', $forminspeksi['alamat']['sesuai']['district_code'])->get(); + } + } + + return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages')); } public function resume(Request $request) @@ -1048,7 +1102,7 @@ class PenilaiController extends Controller 'message' => 'Berhasil menyimpan LPJ', 'data' => $result ], 200); - } catch (\Throwable $e) { + }catch (\Throwable $e) { DB::rollBack(); return response()->json([ 'success' => false, @@ -1396,7 +1450,7 @@ class PenilaiController extends Controller public function generateNoLaporan($permohonan, $documentId, $type) { - $typeMapping = ['sederhana' => 'LPJ', 'standard' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR']; + $typeMapping = ['lpj' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR']; // Cek apakah data sudah ada $laporan = Laporan::where([ diff --git a/resources/views/penilai/components/foto-lampiran.blade.php b/resources/views/penilai/components/foto-lampiran.blade.php index 607f004..63cf78a 100644 --- a/resources/views/penilai/components/foto-lampiran.blade.php +++ b/resources/views/penilai/components/foto-lampiran.blade.php @@ -109,10 +109,20 @@ @php - $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat', 'foto_sentuh_tanahku']; - if (($key = array_search('foto_tempat', $fotoTypes)) !== false) { + $fotoTypes = ['upload_gs','foto_sentuh_tanahku','foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat']; + + $customLabels = [ + 'upload_gs' => 'Gambar Situasi', + 'foto_sentuh_tanahku' => 'Sentuh Tanahku', + 'foto_gistaru' => 'Gistaru', + 'foto_bhumi' => 'Bhumi', + 'foto_argis_region' => 'Region', + 'foto_tempat' => 'Tempat', + ]; + + if (($key = array_search('upload_gs', $fotoTypes)) !== false) { unset($fotoTypes[$key]); - array_unshift($fotoTypes, 'foto_tempat'); + array_unshift($fotoTypes, 'upload_gs'); } $adaFoto = false; if (isset($forminspeksi)) { @@ -130,11 +140,10 @@

- Peta + Peta, dan tata ruang, blad

-
@if (isset($forminspeksi)) @forelse ($fotoTypes as $type) @@ -147,7 +156,7 @@ {{ $type }} @endif -

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

+

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

@empty

Tidak ada tipe foto yang tersedia

diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php index cb51243..18b976a 100644 --- a/resources/views/penilai/lampiran.blade.php +++ b/resources/views/penilai/lampiran.blade.php @@ -22,7 +22,7 @@ @include('lpj::component.detail-jaminan', [ 'backLink' => 'penilai.show', 'id' => $permohonan->id, - 'title' => 'Lampiran foto dan dokument', + 'title' => 'Lampiran foto dan dokumen', ]) @endif diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 0e723fa..c7c0403 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -95,22 +95,19 @@

{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) ?? '' }}

- -
- @if (strtolower($permohonan->tujuanPenilaian->name) == - 'penilaian ulang') - - - @else + @if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang'])) + + +
{{ str_replace('_', ' ', $permohonan->status_bayar) }} - @endif -
+
- + @endif diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index 0cc9318..6018701 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -181,14 +181,14 @@ $selectedValue = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null; @endphp
+ style="{{ old('jenis_asset_tidak_sesuai', isset($forminspeksi['asset']['jenis_asset']['tidak sesuai'])) ? '' : 'display: none;' }}">