diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index bfb447f..9d9474c 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -48,7 +48,7 @@ class ActivityController extends Controller $regionId = $userTeam?->team->regions_id; $teamId = $userTeam?->teams_id; - } + } $teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles']) ->whereHas('team', function ($q) use ($regionId, $teamId) { @@ -74,7 +74,7 @@ class ActivityController extends Controller function updateTeamAssingment(Request $request) { - + try { $id = $request->input('id'); $user = PenilaianTeam::where('penilaian_id', $id)->get(); @@ -86,7 +86,7 @@ class ActivityController extends Controller } return redirect()->route('activity.progres.index')->with('success', 'Surveyor berhasil diganti'); } - + } catch (\Throwable $th) { return redirect()->route('activity.progres.index')->with('success', $th->getMessage()); } diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 3142aa8..32aca66 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -12,12 +12,16 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Storage; use Illuminate\Http\Response; +use Modules\Lpj\Models\Debiture; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\Branch; use Modules\Lpj\Models\Surveyor; use Modules\Lpj\Models\BentukTanah; use Modules\Lpj\Models\KonturTanah; use Modules\Location\Models\Province; +use Modules\Location\Models\City; +use Modules\Location\Models\District; +use Modules\Location\Models\Village; use Modules\Lpj\Models\PosisiKavling; use Modules\Lpj\Models\KondisiFisikTanah; use Modules\Lpj\Models\KetinggianTanah; @@ -709,10 +713,14 @@ class SurveyorController extends Controller $branches = Branch::all(); $provinces = Province::all(); + $debitur = Debiture::find($permohonan->debiture_id); + $cities = City::where('province_code', $debitur->province_code)->get(); + $districts = District::where('city_code', $debitur->city_code)->get(); + $villages = Village::where('district_code', $debitur->district_code)->get(); $surveyor = $id; $branches = Branch::all(); - $provinces = Province::all(); + $bentukTanah = BentukTanah::all(); $konturTanah = KonturTanah::all(); $posisiKavling = PosisiKavling::all(); @@ -755,6 +763,10 @@ class SurveyorController extends Controller 'surveyor', 'branches', 'provinces', + 'debitur', + 'cities', + 'districts', + 'villages', 'bentukTanah', 'konturTanah', 'posisiKavling', @@ -1460,11 +1472,11 @@ class SurveyorController extends Controller private function getAssetData(array $data): array { $alamatData = [ - 'nama_jalan' => $data['nama_jalan'] ?? null, - 'desa_kelurahan' => $data['desa_kelurahan'] ?? null, - 'kecamatan' => $data['kecamatan'] ?? null, - 'kota_kabupaten' => $data['kota_kabupaten'] ?? null, - 'provinsi' => $data['provinsi'] ?? null, + 'address' => $data['address'] ?? null, + 'village_code' => $data['village_code'] ?? null, + 'district_code' => $data['district_code'] ?? null, + 'city_code' => $data['city_code'] ?? null, + 'province_code' => $data['province_code'] ?? null, ]; return [ diff --git a/app/Http/Requests/FormSurveyorRequest.php b/app/Http/Requests/FormSurveyorRequest.php index 25f32c2..9bf82e3 100644 --- a/app/Http/Requests/FormSurveyorRequest.php +++ b/app/Http/Requests/FormSurveyorRequest.php @@ -528,11 +528,11 @@ class FormSurveyorRequest extends FormRequest 'hub_cadeb_penghuni_sesuai' => 'nullable', 'hub_cadeb_penghuni_tidak_sesuai' => 'nullable', - 'nama_jalan' => 'nullable', - 'desa_kelurahan' => 'nullable', - 'kecamatan' => 'nullable', - 'kota_kabupaten' => 'nullable', - 'provinsi' => 'nullable', + 'address' => 'nullable', + 'village_code' => 'nullable', + 'district_code' => 'nullable', + 'city_code' => 'nullable', + 'province_code' => 'nullable', 'kordinat_lng' => 'nullable', 'kordinat_lat' => 'nullable', ]; diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php index 046e426..1b1571d 100644 --- a/resources/views/surveyor/components/data-pembanding.blade.php +++ b/resources/views/surveyor/components/data-pembanding.blade.php @@ -65,11 +65,8 @@ src="{{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? asset('storage/' . $fotoForm['object_jaminan'][0]['foto_objek']) : '' }}" class="max-w-[200px] {{ isset($fotoForm['object_jaminan'][0]['foto_objek']) ? '' : 'hidden' }}" alt="Uploaded Image"> - + @@ -95,7 +92,9 @@ @@ -104,7 +103,9 @@ @@ -375,7 +376,8 @@ document.addEventListener('DOMContentLoaded', function() { try { const inspectionData = {!! isset($inspectionData) ? json_encode($inspectionData) : 'null' !!}; - const comparisons = {!! isset($comparisons) ? json_encode($comparisons) : '' !!}; + const comparisons = {!! isset($comparisons) ? json_encode($comparisons) : 'null' !!}; + console.log('Inspection Data:', inspectionData); // Debug console.log('Comparisons:', comparisons); // Debug diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php index 1d714fd..b531821 100644 --- a/resources/views/surveyor/components/foto.blade.php +++ b/resources/views/surveyor/components/foto.blade.php @@ -5,7 +5,7 @@ @endsection @section('content') -@include('lpj::assetsku.includenya') + @include('lpj::assetsku.includenya')
@@ -14,8 +14,7 @@ Data Jaminan
- + Back
@@ -334,32 +333,35 @@ @if (count($objekViews) > 0) @foreach ($objekViews as $view) -
-
- - -
- {{ $view['label'] }} -
- - -
- +
+
+ + +
+ {{ $view['label'] }} +
+ +
+
-
+ +
@endforeach @endif @@ -391,7 +393,7 @@ -
+
Gambar Pendamping @@ -436,30 +438,33 @@
- -
- - Gambar foto_basement -
- - + +
+ + Gambar foto_basement +
+ + +
-
- +
-
+
@@ -475,63 +480,69 @@
-
-

Lingkungan

- -
- - @if (isset($formFoto['lingkungan']) && is_array($formFoto['lingkungan']) && count($formFoto['lingkungan']) > 0) - @foreach ($formFoto['lingkungan'] as $key => $item) -
-
- -
- Gambar Lingkungan - -
- - -
- -
-
- -
- @endforeach - @else -
-
- -
- - - -
- -
-
- @endif + + @if (isset($formFoto['lingkungan']) && is_array($formFoto['lingkungan']) && count($formFoto['lingkungan']) > 0) + @foreach ($formFoto['lingkungan'] as $key => $item) +
+
+ +
+ Gambar Lingkungan + +
+ + +
+ +
+
+ +
+ @endforeach + @else +
+
+ +
+ + + +
+ +
+ +
+ @endif
-
+
+
@@ -594,7 +605,7 @@
- @include('lpj::surveyor.components.modal-kamera') + @include('lpj::surveyor.components.modal-kamera') @endsection @@ -693,7 +704,3 @@ } } - - - - diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index 3b669f8..617209d 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -100,7 +100,7 @@

Deskripsi Aset jaminan

-
+
@@ -153,7 +153,7 @@
-
+
@foreach ($permohonan->debiture->documents as $dokumen) {{ formatAlamat($dokumen) }} @@ -186,69 +186,117 @@
-
- @php - $fields = [ - [ - 'label' => 'Jl.', - 'name' => 'nama_jalan', - 'id' => 'nama_jalan', - 'readonly' => false, - ], - [ - 'label' => 'Provinsi', - 'name' => 'provinsi', - 'id' => 'provinsi', - 'type' => 'select', - 'options' => $provinces, - ], - [ - 'label' => 'Kota/Kabupaten', - 'name' => 'kota_kabupaten', - 'id' => 'kota_kabupaten', - 'type' => 'select', - 'options' => $provinces, - ], - [ - 'label' => 'Kecamatan', - 'name' => 'kecamatan', - 'id' => 'kecamatan', - 'type' => 'select', - 'options' => $provinces, - ], - [ - 'label' => 'Kelurahan', - 'name' => 'desa_kelurahan', - 'id' => 'desa_kelurahan', - 'type' => 'select', - 'options' => $provinces, - ], - ]; - @endphp - - @foreach ($fields as $field) -
- -
- @if (isset($field['type']) && $field['type'] === 'select') - - @else - - @endif -
+
+
+ +
+
- @endforeach -
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
@@ -399,7 +447,7 @@ + {{ old('hub_cadeb', isset($forminspeksi['asset']['hub_cadeb']['tidak sesuai'])) ? 'checked' : '' }}> Tidak diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php index 11f728d..b06eea7 100644 --- a/resources/views/surveyor/components/inspeksi.blade.php +++ b/resources/views/surveyor/components/inspeksi.blade.php @@ -52,27 +52,60 @@
@endsection + @push('scripts')