From 676619f5df0ae945e05bc4dc4851f59084477499 Mon Sep 17 00:00:00 2001 From: majid Date: Mon, 30 Dec 2024 15:51:16 +0700 Subject: [PATCH 1/2] perbaikan tampilan informasi harga di print out --- .../components/print-out-sederhana.blade.php | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index eadb5ec..e92e98b 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -839,7 +839,7 @@ - +
Instansi yang relevanInstansi yang relevan : @php @@ -866,28 +866,32 @@ 'harga_diskon' => 'Indikasi Harga Transaksi', ]; @endphp - - + @foreach (['pembanding1', 'pembanding2', 'pembanding3'] as $index => $pembanding) +
+ + + @foreach ($fields as $key => $label) - - @foreach (['pembanding1', 'pembanding2', 'pembanding3'] as $pembanding) - - - + + + + + @endforeach - - @endforeach +
Pembanding {{ $index + 1 }}
{{ $label }}: - @if ($key == 'luas_tanah' || $key == 'luas_bangunan') - {{ $exportData[$pembanding][$key] ?? '-' }} m² - @elseif($key == 'harga' || $key == 'harga_diskon') - Rp. {{ $exportData[$pembanding][$key] ?? '-' }} - @else - {{ $exportData[$pembanding][$key] ?? '-' }} - @endif -
{{ $label }}: + @if ($key == 'luas_tanah' || $key == 'luas_bangunan') + {{ $exportData[$pembanding][$key] ?? '-' }} m² + @elseif($key == 'harga' || $key == 'harga_diskon') + Rp. {{ $exportData[$pembanding][$key] ?? '-' }} + @else + {{ $exportData[$pembanding][$key] ?? '-' }} + @endif +
+ @endforeach +
- + From 800d0c24967461c1d7be0397c4699f9887c745ea Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 31 Dec 2024 07:56:41 +0700 Subject: [PATCH 2/2] perbaikan laporan so , form inspksi alat berat, kendaraan dan mesin --- app/Http/Controllers/PenilaiController.php | 2 +- app/Http/Controllers/PenilaianController.php | 10 +- app/Http/Requests/FormSurveyorRequest.php | 17 +-- app/Http/Requests/SurveyorRequest.php | 3 + .../components/print-out-sederhana.blade.php | 2 +- .../components/print-out-standard.blade.php | 2 +- .../views/penilaian/laporan-so.blade.php | 17 ++- .../surveyor/components/alat-berat.blade.php | 136 +++++++++++------- .../surveyor/components/header.blade.php | 127 +--------------- .../surveyor/components/kendaraan.blade.php | 109 +++++--------- .../components/lokasi-jaminan.blade.php | 126 ++++++++++++---- .../views/surveyor/components/mesin.blade.php | 15 +- resources/views/surveyor/js/utils.blade.php | 125 ++++++++++++++++ 13 files changed, 385 insertions(+), 306 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index b78ef6a..ed0eecf 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -579,7 +579,7 @@ class PenilaiController extends Controller 'luas_bangunan' => $request->input('luas_bangunan'), 'nilai_bangunan_1' => $request->input('nilai_bangunan_1'), 'nilai_bangunan_2' => $request->input('nilai_bangunan_2'), - 'sarana_pelengkap' => $request->input('sarana_pelengkap', []), + 'sarana_pelengkap_penilai' => $request->input('sarana_pelengkap_penilai'), 'nilai_sarana_pelengkap_1' => $request->input('nilai_sarana_pelengkap_1'), 'nilai_sarana_pelengkap_2' => $request->input('nilai_sarana_pelengkap_2'), 'total_nilai_pasar_wajar' => $request->input('total_nilai_pasar_wajar'), diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 7247f82..39af828 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -599,18 +599,20 @@ class PenilaianController extends Controller public function storePenilaiLaporan(Request $request) { + DB::beginTransaction(); try { + $validatedRequest = app(FormSurveyorRequest::class); $this->surveyorController->store($validatedRequest); $data = [ - 'luas_tanah' => $request->input('luas_tanah'), + 'luas_tanah_penilai' => $request->input('luas_tanah_penilai'), 'nilai_tanah_1' => $request->input('nilai_tanah_1'), 'nilai_tanah_2' => $request->input('nilai_tanah_2'), - 'luas_bangunan' => $request->input('luas_bangunan'), + 'luas_bangunan_penilai' => $request->input('luas_bangunan_penilai'), 'nilai_bangunan_1' => $request->input('nilai_bangunan_1'), 'nilai_bangunan_2' => $request->input('nilai_bangunan_2'), - 'sarana_pelengkap' => $request->input('sarana_pelengkap', []), + 'sarana_pelengkap_penilai' => $request->input('sarana_pelengkap_penilai'), 'nilai_sarana_pelengkap_1' => $request->input('nilai_sarana_pelengkap_1'), 'nilai_sarana_pelengkap_2' => $request->input('nilai_sarana_pelengkap_2'), 'total_nilai_pasar_wajar' => $request->input('total_nilai_pasar_wajar'), @@ -633,12 +635,14 @@ class PenilaianController extends Controller 'lpj' => json_encode($data), ] ); + DB::commit(); return response()->json([ 'success' => true, 'message' => 'Berhasil Update Laporan penilai', 'data' => $request->all(), ], 200); } catch (\Throwable $e) { + DB::rollBack(); return response()->json([ 'success' => false, 'message' => 'Terjadi kesalahan', diff --git a/app/Http/Requests/FormSurveyorRequest.php b/app/Http/Requests/FormSurveyorRequest.php index 2a16878..5089b22 100644 --- a/app/Http/Requests/FormSurveyorRequest.php +++ b/app/Http/Requests/FormSurveyorRequest.php @@ -351,17 +351,15 @@ class FormSurveyorRequest extends FormRequest { return [ 'action' => 'required', - 'tanggal_survey' => 'required', - 'nama_wakil' => 'required', - 'hub_calon_debitur' => 'required', - 'dengan_wadeb' => 'required', + 'nama_wakil' => 'required|string', + 'hub_calon_debitur' => 'required|string', 'nama_jalan' => 'required', 'perumahan_gang' => 'required', - 'blok' => 'required', - 'desa_kelurahan' => 'required', - 'kecamatan' => 'required', - 'kota_madya' => 'required', - 'provinsi' => 'required', + 'blok_nomor' => 'required', + 'village_code' => 'nullable|string', + 'district_code' => 'nullable|string', + 'city_code' => 'nullable|string', + 'province_code' => 'nullable|string', 'jenis_model' => 'required', 'nomor_lambung' => 'required', 'model_unit' => 'required', @@ -411,7 +409,6 @@ class FormSurveyorRequest extends FormRequest { return [ 'action' => 'required', - 'tanggal_survey' => 'required', 'nama_wakil' => 'required', 'hub_calon_debitur' => 'required', 'bandara' => 'required', diff --git a/app/Http/Requests/SurveyorRequest.php b/app/Http/Requests/SurveyorRequest.php index f3cc205..658c451 100644 --- a/app/Http/Requests/SurveyorRequest.php +++ b/app/Http/Requests/SurveyorRequest.php @@ -85,6 +85,9 @@ class SurveyorRequest extends FormRequest ], ], + 'foto-objek-jaminan' => [ + 'kategori' => 'required', + ], // Add more action specific rules here default => [], }; diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index e92e98b..6d5e1f8 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -930,7 +930,7 @@ Sarana Pelengkap - {{ $lpjData['sarana_pelengkap'] ?? '' }}m2 + {{ $lpjData['sarana_pelengkap_penilai'] ?? '' }}m2 X {{ $lpjData['nilai_sarana_pelengkap_1'] ?? '' }} diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php index da50a29..c24f439 100644 --- a/resources/views/penilai/components/print-out-standard.blade.php +++ b/resources/views/penilai/components/print-out-standard.blade.php @@ -1339,7 +1339,7 @@ Sarana Pelengkap - {{ $lpjData['sarana_pelengkap'] ?? '' }}m2 + {{ $lpjData['sarana_pelengkap_penilai'] ?? '' }}m2 X {{ $lpjData['nilai_sarana_pelengkap_1'] ?? '' }} diff --git a/resources/views/penilaian/laporan-so.blade.php b/resources/views/penilaian/laporan-so.blade.php index 5a5d58d..f4fab29 100644 --- a/resources/views/penilaian/laporan-so.blade.php +++ b/resources/views/penilaian/laporan-so.blade.php @@ -21,10 +21,14 @@ @include('lpj::component.form-penilai', ['title' => 'Laporan'])
- + + Print @@ -35,6 +39,10 @@ @endsection + @include('lpj::surveyor.js.utils') diff --git a/resources/views/surveyor/components/kendaraan.blade.php b/resources/views/surveyor/components/kendaraan.blade.php index 47850be..d2c43cc 100644 --- a/resources/views/surveyor/components/kendaraan.blade.php +++ b/resources/views/surveyor/components/kendaraan.blade.php @@ -1,11 +1,10 @@
+
+

+ Order Penilaian +

+
- - -
-

Order Penilaian

-
-
@@ -57,10 +56,13 @@
+
+

+ Identitas Debitur +

+
-
-

Identitas Debitur

-
+
@@ -95,83 +97,35 @@
{{-- lokasi jaminan --}} - @include('lpj::surveyor.components.lokasi-jaminan')
+
+ @include('lpj::surveyor.components.lokasi-jaminan') +
+
+
+

Data Data Jaminan

+
-
-

Data Data Jaminan

-
- -
- -
-

N/A

-
-
- -
- -
-

N/A

-
-
-
- -
-
-
+ @include('lpj::component.detail-jaminan', ['status' => true]) @php $inputDataJaminan = [ - [ - 'label' => 'Nama pemilik', - 'name' => 'nama_pemilik', - 'index' => 0, - ], - [ - 'label' => 'Nomor polisi', - 'name' => 'nomor_polisi_jaminan', - 'index' => 1, - ], - [ - 'label' => 'Merek', - 'name' => 'merek_jaminan', - 'index' => 2, - ], - [ - 'label' => 'jenis', - 'name' => 'jenis', - 'index' => 3, - ], - [ - 'label' => 'Warna', - 'name' => 'warna_jaminan', - 'index' => 4, - ], - [ - 'label' => 'Nomor Rangka/NIK/VIN', - 'name' => 'nomor_rangka_jaminan', - 'index' => 5, - ], - [ - 'label' => 'Nomor Mesin', - 'name' => 'nomor_mesin_jaminan', - 'index' => 6, - ], [ 'label' => 'Masa Berlaku STNK', 'name' => 'masa_stnk', 'index' => 7, + 'value' => old('masa_stnk', $forminspeksi['masa_stnk'] ?? '') ], [ 'label' => 'Masa Berlaku Pajak', 'name' => 'masa_pajak', 'index' => 8, + 'value' => old('masa_pajak', $forminspeksi['masa_pajak'] ?? '') ], ]; @endphp @@ -182,7 +136,9 @@
-

N/A

+ +
@endforeach @@ -193,10 +149,13 @@
+
+

+ Kondisi Fisik Objek +

+
-
-

Kondisi Fisik Objek

-
+
@@ -627,10 +586,12 @@
+
+

+ Analisis Fakta +

+
-
-

Analisis Fakta

-
diff --git a/resources/views/surveyor/components/lokasi-jaminan.blade.php b/resources/views/surveyor/components/lokasi-jaminan.blade.php index bfcd473..93eff01 100644 --- a/resources/views/surveyor/components/lokasi-jaminan.blade.php +++ b/resources/views/surveyor/components/lokasi-jaminan.blade.php @@ -1,38 +1,104 @@ -
-

Lokasi Jaminan

+
+

+ Lokasi Jaminan +

-
+
+
- @php + @php + $inputDataLoaksi = [ + [ + 'label' => 'Nama Jalan', + 'index' => 0, + 'name' => 'nama_jalan', + 'value' => old('nama_jalan', isset($forminspeksi['nama_jalan']) ? $forminspeksi['nama_jalan'] : ''), + ], + [ + 'label' => 'Perumahan/Gang', + 'index' => 1, + 'name' => 'perumahan_gang', + 'value' => old( + 'perumahan_gang', + isset($forminspeksi['perumahan_gang']) ? $forminspeksi['perumahan_gang'] : '', + ), + ], + [ + 'label' => 'Blok/Nomor', + 'index' => 2, + 'name' => 'blok_nomor', + 'value' => old('blok_nomor', isset($forminspeksi['blok_nomor']) ? $forminspeksi['blok_nomor'] : ''), + ], + ]; + @endphp - $inputDataLoaksi = []; - $inputDataLoaksi = [ - ['label' => 'Nama Jalan', 'index' => 0, 'name' => 'nama_jalan', 'value' => old('nama_jalan', isset($analisa->analisaLingkungan) ? $analisa->analisaLingkungan->lokasi_jalan : '')], - ['label' => 'Perumahan/Gang', 'index' => 1, 'name' => 'perumahan_gang', 'value' => old('lokasi_perumahan_gang', isset($analisa->analisaLingkungan) ? $analisa->analisaLingkungan->lokasi_perumahan_gang : '')], - ['label' => 'Blok/Nomor', 'index' => 2, 'name' => 'blok_nomor', 'value' => old('blok_nomor', isset($analisa->analisaLingkungan) ? $analisa->analisaLingkungan->lokasi_blok_nomor : '')], - ['label' => 'Desa/Kelurahan', 'index' => 3, 'name' => 'desa_kelurahan', 'value' => old('desa_kelurahan', isset($analisa->analisaLingkungan) ? $analisa->analisaLingkungan->lokasi_desa_kelurahan : '')], - ['label' => 'Kecamatan', 'index' => 4, 'name' => 'kecamatan' , 'value' => old('kecamatan', isset($analisa->analisaLingkungan) ? $analisa->analisaLingkungan->lokasi_kecamatan : '')], - ['label' => 'Kota/Kotamadya', 'index' => 5, 'name' => 'kota_madya', 'value' => old('kota_madya', isset($analisa->analisaLingkungan) ? $analisa->analisaLingkungan->lokasi_kota_kotamadya : '')], - ['label' => 'Provinsi', 'index' => 6, 'name' => 'provinsi', 'value' => old('provinsi', isset($analisa->analisaLingkungan) ? $analisa->analisaLingkungan->lokasi_provinsi : '')], - ]; + @if (count($inputDataLoaksi) > 0) + @foreach ($inputDataLoaksi as $item) + +
+ +
+ - @endphp - - @if (count($inputDataLoaksi) > 0) - @foreach ($inputDataLoaksi as $item) - -
- -
- - - @error($item['name']) - {{ $message }} - @enderror + @error($item['name']) + {{ $message }} + @enderror +
+ @endforeach + @endif +
+ +
+
- @endforeach - @endif +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +@include('lpj::surveyor.js.utils') diff --git a/resources/views/surveyor/components/mesin.blade.php b/resources/views/surveyor/components/mesin.blade.php index b70e0bf..7516aad 100644 --- a/resources/views/surveyor/components/mesin.blade.php +++ b/resources/views/surveyor/components/mesin.blade.php @@ -83,18 +83,21 @@
- - {{-- lokasi jaminan --}} - @include('lpj::surveyor.components.lokasi-jaminan')
+
+ @include('lpj::surveyor.components.lokasi-jaminan') +
+
+
+

+ Data Data Jaminan +

+
-
-

Data Data Jaminan

-
diff --git a/resources/views/surveyor/js/utils.blade.php b/resources/views/surveyor/js/utils.blade.php index da8b7bd..2d6563f 100644 --- a/resources/views/surveyor/js/utils.blade.php +++ b/resources/views/surveyor/js/utils.blade.php @@ -177,4 +177,129 @@ }); newElement.dispatchEvent(event); } + + async function loadSavedLocationData() { + const provinceCode = '{{ $cekAlamat['province_code'] ?? '' }}'; + const cityCode = '{{ $cekAlamat['city_code'] ?? '' }}'; + const districtCode = '{{ $cekAlamat['district_code'] ?? '' }}'; + const villageCode = '{{ $cekAlamat['village_code'] ?? '' }}'; + + // Set province + const provinceSelect = document.getElementById('province_code'); + if (provinceCode && provinceSelect) { + provinceSelect.value = provinceCode; + await getCity(provinceCode); + } + + // Set city + const citySelect = document.getElementById('city_code'); + if (cityCode && citySelect) { + citySelect.value = cityCode; + await getDistrict(cityCode); + } + + // Set district + const districtSelect = document.getElementById('district_code'); + if (districtCode && districtSelect) { + districtSelect.value = districtCode; + await getVillage(districtCode); + } + + // Set village + const villageSelect = document.getElementById('village_code'); + if (villageCode && villageSelect) { + villageSelect.value = villageCode; + } + } + + // Modifikasi fungsi existing + async function getCity(provinceId) { + try { + const response = await fetch(`/locations/cities/province/${provinceId}`); + const data = await response.json(); + + const cityDropdown = document.getElementById('city_code'); + if (cityDropdown) { + cityDropdown.innerHTML = ''; + data.forEach(city => { + const option = document.createElement('option'); + option.value = city.code; + option.textContent = city.name; + @if (isset($debitur->city_code)) + if (city.code === '{{ $debitur->city_code }}') { + option.selected = true; + } + @endif + + cityDropdown.appendChild(option); + }); + + // Reset dropdown kecamatan dan desa + document.getElementById('district_code').innerHTML = ''; + document.getElementById('village_code').innerHTML = ''; + } + } catch (error) { + console.error('Error fetching cities:', error); + } + } + + // Lakukan hal serupa untuk getDistrict dan getVillage + async function getDistrict(cityId) { + try { + const response = await fetch(`/locations/districts/city/${cityId}`); + const data = await response.json(); + + const districtDropdown = document.getElementById('district_code'); + if (districtDropdown) { + districtDropdown.innerHTML = ''; + data.forEach(district => { + const option = document.createElement('option'); + option.value = district.code; + option.textContent = district.name; + + // Cek apakah ini adalah kecamatan yang sebelumnya dipilih + @if (isset($debitur->district_code)) + if (district.code === '{{ $debitur->district_code }}') { + option.selected = true; + } + @endif + + districtDropdown.appendChild(option); + }); + + // Reset dropdown desa + document.getElementById('village_code').innerHTML = ''; + } + } catch (error) { + console.error('Error fetching districts:', error); + } + } + + async function getVillage(districtId) { + try { + const response = await fetch(`/locations/villages/district/${districtId}`); + const data = await response.json(); + + const villageDropdown = document.getElementById('village_code'); + if (villageDropdown) { + villageDropdown.innerHTML = ''; + data.forEach(village => { + const option = document.createElement('option'); + option.value = village.code; + option.textContent = village.name; + + // Cek apakah ini adalah desa yang sebelumnya dipilih + @if (isset($debitur->village_code)) + if (village.code === '{{ $debitur->village_code }}') { + option.selected = true; + } + @endif + + villageDropdown.appendChild(option); + }); + } + } catch (error) { + console.error('Error fetching villages:', error); + } + }