@if (isset($basicData['saranaPelengkap']))
@foreach ($basicData['saranaPelengkap'] as $item)
diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php
index c327c3f..dae8677 100644
--- a/resources/views/surveyor/components/data-pembanding.blade.php
+++ b/resources/views/surveyor/components/data-pembanding.blade.php
@@ -110,34 +110,63 @@
-
+ @else
+
+ @endif
-
-
-
-
| Total |
{
- input.addEventListener('input', function() {
- const inputs = document.getElementsByName(this.name);
- const index = Array.from(inputs).indexOf(this);
- calculatePrices(index);
- });
+ // Event listener untuk input utama
+ const mainHargaInput = document.querySelector('input[name="harga"]');
+ const mainDiskonInput = document.querySelector('input[name="diskon"]');
+
+ if (mainHargaInput) {
+ mainHargaInput.addEventListener('input', () => calculatePrices('main'));
+ }
+
+ if (mainDiskonInput) {
+ mainDiskonInput.addEventListener('input', () => calculatePrices('main'));
+ }
+
+ // Event listener untuk input pembanding
+ const pembandingHargaInputs = document.getElementsByName('harga_pembanding[]');
+ const pembandingDiskonInputs = document.getElementsByName('diskon_pembanding[]');
+
+ pembandingHargaInputs.forEach((input, index) => {
+ input.addEventListener('input', () => calculatePrices('pembanding', index));
+ });
+
+ pembandingDiskonInputs.forEach((input, index) => {
+ input.addEventListener('input', () => calculatePrices('pembanding', index));
});
}
@@ -657,18 +744,30 @@
if (input.classList.contains('currency-format')) {
input.addEventListener('input', function() {
formatCurrency(this);
+
+ // Special handling for price-related inputs
+ if (input.name.includes('harga_pembanding') ||
+ input.name.includes('diskon_pembanding')) {
+ const inputs = document.getElementsByName(input.name);
+ const index = Array.from(inputs).indexOf(this);
+ calculatePrices(index);
+ }
});
}
- if (input.classList.contains('number-format')) {
+
+ // Specific handling for discount to limit to 100%
+ if (input.name.includes('diskon_pembanding')) {
input.addEventListener('input', function() {
- formatNumber(this);
+ let value = parseFloat(this.value.replace(/[^\d]/g, '') || '0');
+ value = Math.min(value, 100);
+ this.value = formatCurrency(value.toString());
});
}
});
}
row.appendChild(newCell);
});
-
+ initializePriceCalculation();
updateRemoveButtonVisibility();
}
@@ -913,8 +1012,6 @@
window.location.href =
'{{ route('surveyor.show', ['id' => $permohonan->id]) }}';
}
-
-
});
} else {
@@ -925,6 +1022,7 @@
confirmButtonText: 'OK'
});
}
+
},
error: function(xhr, status, error) {
hideLoadingSwal();
diff --git a/resources/views/surveyor/components/fakta.blade.php b/resources/views/surveyor/components/fakta.blade.php
index 7f054fb..eff1fc9 100644
--- a/resources/views/surveyor/components/fakta.blade.php
+++ b/resources/views/surveyor/components/fakta.blade.php
@@ -15,9 +15,10 @@
@foreach ($forminspeksi['fakta']['fakta_positif'] as $index => $positif)
-
+
@endforeach
@else
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index d0a6890..b989fb9 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -190,7 +190,8 @@
Tidak
-
+
+
@php
@@ -217,7 +218,7 @@
@@ -340,9 +341,13 @@
@foreach ($permohonan->debiture->documents as $dokumen)
- {{ $dokumen->pemilik->hubungan_pemilik->name ?? '' }}
-
+ @php
+ $hubCadebPemilik = $dokumen->pemilik->hubungan_pemilik->name ?? 'N/A';
+ @endphp
+ {{ $hubCadebPemilik }}
+
+
@endforeach
@@ -375,10 +380,12 @@
@if (isset($basicData['hubCadeb']))
@foreach ($basicData['hubCadeb'] as $item)
-
+ @if ($item->name != $hubCadebPemilik)
+
+ @endif
@endforeach
@endif
@@ -400,10 +407,12 @@
@foreach ($permohonan->debiture->documents as $dokumen)
- {{ $dokumen->penghuni->hubungan_penghuni->name ?? 'N/A' }}
+ @php
+ $hubCadebPenghuni = $dokumen->penghuni->hubungan_penghuni->name ?? 'N/A';
+ @endphp
+ {{ $hubCadebPenghuni }}
+ value="{{ isset($hubCadebPenghuni) ?? '' }}" id="">
@endforeach
@@ -438,15 +447,17 @@
@if (isset($basicData['hubPenghuni']))
@foreach ($basicData['hubPenghuni'] as $item)
-
+ @if ($item->name != $hubCadebPenghuni)
+
+ @endif
@endforeach
@endif
-
+
@@ -482,102 +493,238 @@
-
-
-
+
+
-
+
+
+
+
`;
}
- if (data == 'tidak sesuai') {
+ if (data === 'tidak sesuai') {
createElementAlamat.innerHTML = `
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
`;
+ loadSavedLocationData();
+ }
+ }
+
+ document.addEventListener('DOMContentLoaded', () => {
+ loadSavedLocationData();
+ });
+ // Fungsi untuk memuat data lokasi yang tersimpan
+ 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);
}
}
diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php
index 844c865..611e844 100644
--- a/resources/views/surveyor/components/informasi.blade.php
+++ b/resources/views/surveyor/components/informasi.blade.php
@@ -1,208 +1,228 @@
-
-
-
-
- @php
- $inputDinasTata = [
- [
- 'label' => 'Peruntukan',
- 'name' => 'peruntukan',
- 'index' => 0,
- 'value' => old(
- 'peruntukan',
- isset($forminspeksi['fakta']['peruntukan']) ? $forminspeksi['fakta']['peruntukan'] : '',
- ),
- ],
- [
- 'label' => 'KDB',
- 'name' => 'kdb',
- 'index' => 1,
- 'value' => old('kdb', isset($forminspeksi['fakta']['kdb']) ? $forminspeksi['fakta']['kdb'] : ''),
- ],
- [
- 'label' => 'KDH',
- 'name' => 'kdh',
- 'index' => 2,
- 'value' => old('kdh', isset($forminspeksi['fakta']['kdh']) ? $forminspeksi['fakta']['kdh'] : ''),
- ],
- [
- 'label' => 'GSB',
- 'name' => 'gsb',
- 'index' => 3,
- 'value' => old('gsb', isset($forminspeksi['fakta']['gsb']) ? $forminspeksi['fakta']['gsb'] : ''),
- ],
- [
- 'label' => 'Max Lantai',
- 'name' => 'max_lantai',
- 'index' => 4,
- 'value' => old(
- 'max_lantai',
- isset($forminspeksi['fakta']['max_lantai']) ? $forminspeksi['fakta']['max_lantai'] : '',
- ),
- ],
- [
- 'label' => 'KLB',
- 'name' => 'klb',
- 'index' => 5,
- 'value' => old('klb', isset($forminspeksi['fakta']['klb']) ? $forminspeksi['fakta']['klb'] : ''),
- ],
- [
- 'label' => 'GSS',
- 'name' => 'gss',
- 'index' => 6,
- 'value' => old('gss', isset($forminspeksi['fakta']['gss']) ? $forminspeksi['fakta']['gss'] : ''),
- ],
- [
- 'label' => 'Pelebaran Jalan',
- 'name' => 'pelebaran_jalan',
- 'index' => 7,
- 'value' => old(
- 'pelebaran_jalan',
- isset($forminspeksi['fakta']['pelebaran_jalan']) ? $forminspeksi['fakta']['pelebaran_jalan'] : '',
- ),
- ],
- [
- 'label' => 'Nama Petugas TK',
- 'name' => 'nama_petugas',
- 'index' => 8,
- 'value' => old(
- 'nama_petugas',
- isset($forminspeksi['fakta']['nama_petugas']) ? $forminspeksi['fakta']['nama_petugas'] : '',
- ),
- ],
- ];
- @endphp
+
+
+
+
+ @php
+ $inputDinasTata = [
+ [
+ 'label' => 'Peruntukan',
+ 'name' => 'peruntukan',
+ 'index' => 0,
+ 'value' => old(
+ 'peruntukan',
+ isset($forminspeksi['fakta']['peruntukan']) ? $forminspeksi['fakta']['peruntukan'] : '',
+ ),
+ ],
+ [
+ 'label' => 'KDB',
+ 'name' => 'kdb',
+ 'index' => 1,
+ 'value' => old(
+ 'kdb',
+ isset($forminspeksi['fakta']['kdb']) ? $forminspeksi['fakta']['kdb'] : '',
+ ),
+ ],
+ [
+ 'label' => 'KDH',
+ 'name' => 'kdh',
+ 'index' => 2,
+ 'value' => old(
+ 'kdh',
+ isset($forminspeksi['fakta']['kdh']) ? $forminspeksi['fakta']['kdh'] : '',
+ ),
+ ],
+ [
+ 'label' => 'GSB',
+ 'name' => 'gsb',
+ 'index' => 3,
+ 'value' => old(
+ 'gsb',
+ isset($forminspeksi['fakta']['gsb']) ? $forminspeksi['fakta']['gsb'] : '',
+ ),
+ ],
+ [
+ 'label' => 'Max Lantai',
+ 'name' => 'max_lantai',
+ 'index' => 4,
+ 'value' => old(
+ 'max_lantai',
+ isset($forminspeksi['fakta']['max_lantai']) ? $forminspeksi['fakta']['max_lantai'] : '',
+ ),
+ ],
+ [
+ 'label' => 'KLB',
+ 'name' => 'klb',
+ 'index' => 5,
+ 'value' => old(
+ 'klb',
+ isset($forminspeksi['fakta']['klb']) ? $forminspeksi['fakta']['klb'] : '',
+ ),
+ ],
+ [
+ 'label' => 'GSS',
+ 'name' => 'gss',
+ 'index' => 6,
+ 'value' => old(
+ 'gss',
+ isset($forminspeksi['fakta']['gss']) ? $forminspeksi['fakta']['gss'] : '',
+ ),
+ ],
+ [
+ 'label' => 'Pelebaran Jalan',
+ 'name' => 'pelebaran_jalan',
+ 'index' => 7,
+ 'value' => old(
+ 'pelebaran_jalan',
+ isset($forminspeksi['fakta']['pelebaran_jalan'])
+ ? $forminspeksi['fakta']['pelebaran_jalan']
+ : '',
+ ),
+ ],
+ [
+ 'label' => 'Nama Petugas TK',
+ 'name' => 'nama_petugas',
+ 'index' => 8,
+ 'value' => old(
+ 'nama_petugas',
+ isset($forminspeksi['fakta']['nama_petugas'])
+ ? $forminspeksi['fakta']['nama_petugas']
+ : '',
+ ),
+ ],
+ ];
+ @endphp
- @if (count($inputDinasTata) > 0)
- @foreach ($inputDinasTata as $item)
-
-
-
-
- @error($item['name'])
-
- @enderror
-
-
- @endforeach
- @endif
+ @if (count($inputDinasTata) > 0)
+ @foreach ($inputDinasTata as $item)
+
+
+
+
+ @error($item['name'])
+
+ @enderror
+
+
+ @endforeach
+ @endif
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+  ? $forminspeksi['foto_bhumi'] : '')) }})
+
+
+ Bhumi
+
+
+
-@include('lpj::surveyor.components.modal-kamera')
+ @if (isset($link_url_region->regions->url))
+
+
+
+
+ @endif
+
+
-@push('scripts')
-@include('lpj::surveyor.js.camera-editor')
-@endpush
+
+
+
+
+
+
+
+
+  ? $forminspeksi['foto_tempat'] : '')) }})
+
+
+
+
+
+
+
+
+
+
+
+
+
@php
- $lebarPerkerasanJalan = old('lebar_perkerasan_jalan', $forminspeksi['lingkungan']['lebar_perkerasan_jalan'] ?? '');
+ $lebarPerkerasanJalan = old(
+ 'lebar_perkerasan_jalan',
+ $forminspeksi['lingkungan']['lebar_perkerasan_jalan'] ?? '',
+ );
@endphp
@@ -50,28 +53,35 @@
@if (isset($basicData['perkerasanJalan']))
@foreach ($basicData['perkerasanJalan'] as $item)
@php
- $isChecked = in_array($item->name, isset($forminspeksi['lingkungan']['perkerasan_jalan']['perkerasan_jalan']) ? $forminspeksi['lingkungan']['perkerasan_jalan']['perkerasan_jalan'] : []);
+ $isChecked = in_array(
+ $item->name,
+ isset($forminspeksi['lingkungan']['perkerasan_jalan']['perkerasan_jalan'])
+ ? $forminspeksi['lingkungan']['perkerasan_jalan']['perkerasan_jalan']
+ : [],
+ );
@endphp
@if (strcasecmp($item->name, 'Lainnya') == 0)
- @php
-
- $lainnyaValue = old('perkerasan_jalan_lainnya', isset($forminspeksi['lingkungan']['perkerasan_jalan']['lainnya']) ? $forminspeksi['lingkungan']['perkerasan_jalan']['lainnya'] : '');
- @endphp
-
- @endif
+ @php
+ $lainnyaValue = old(
+ 'perkerasan_jalan_lainnya',
+ isset($forminspeksi['lingkungan']['perkerasan_jalan']['lainnya'])
+ ? $forminspeksi['lingkungan']['perkerasan_jalan']['lainnya']
+ : '',
+ );
+ @endphp
+
+ @endif
@endforeach
@endif
@@ -103,7 +113,7 @@
-
+
@if (isset($basicData['golMasySekitar']))
@@ -159,16 +169,19 @@
{{ $item->name }}
@if (strcasecmp($item->name, 'Lainnya') == 0)
- @php
- $lainnyaValue = old('terletak_diarea_lainnya', isset($forminspeksi['lingkungan']['terletak_diarea']['lainnya']) ? $forminspeksi['lingkungan']['terletak_diarea']['lainnya'] : '');
- @endphp
-
- @endif
-
+ @php
+ $lainnyaValue = old(
+ 'terletak_diarea_lainnya',
+ isset($forminspeksi['lingkungan']['terletak_diarea']['lainnya'])
+ ? $forminspeksi['lingkungan']['terletak_diarea']['lainnya']
+ : '',
+ );
+ @endphp
+
+ @endif
@endforeach
@endif
@@ -356,48 +369,37 @@
@if (isset($basicData['fasilitasObjek']))
@foreach ($basicData['fasilitasObjek'] as $item)
@php
+ $isChecked = false;
+ $inputValue = '';
- $selectedFasilitas = is_array(
- old(
- 'fasilitas_dekat_object',
- $forminspeksi['lingkungan']['fasilitas_dekat_object']['fasilitas_dekat_object'] ?? [],
- ),
- )
- ? old(
- 'fasilitas_dekat_object',
- $forminspeksi['lingkungan']['fasilitas_dekat_object']['fasilitas_dekat_object'] ?? [],
- )
- : explode(
- ',',
- old(
- 'fasilitas_dekat_object',
- $forminspeksi['lingkungan']['fasilitas_dekat_object']['fasilitas_dekat_object'] ?? '',
- ),
- );
+ // Cek old input terlebih dahulu
+ if (old('fasilitas_dekat_object') && in_array($item->name, old('fasilitas_dekat_object'))) {
+ $isChecked = true;
+ $oldInputIndex = array_search($item->name, old('fasilitas_dekat_object'));
+ $inputValue = old('fasilitas_dekat_object_input')[$oldInputIndex] ?? '';
+ }
+ elseif (isset($forminspeksi['lingkungan']['fasilitas_dekat_object'])) {
+ foreach ($forminspeksi['lingkungan']['fasilitas_dekat_object'] as $key => $value) {
+ if ($key === $item->name) {
+ $isChecked = true;
+ $inputValue = $value;
+ break;
+ }
+ }
+ }
@endphp
-
-
- @if (strcasecmp($item->name, 'Lainnya') == 0)
-
- @endif
+
+
+
+
@endforeach
@endif
@@ -405,6 +407,9 @@
|