From e5fee57d0b2a6cccb6f516f287b38ef85d9ed203 Mon Sep 17 00:00:00 2001 From: majid Date: Sun, 29 Dec 2024 11:49:22 +0700 Subject: [PATCH] penambahan inputan dekat lainnya,pihak bank dan buka galery foto dimobile --- app/Http/Controllers/SurveyorController.php | 4 +- app/Http/Requests/FormSurveyorRequest.php | 4 +- .../components/print-out-standard.blade.php | 67 +++++++++---------- .../surveyor/components/bangunan.blade.php | 2 +- .../views/surveyor/components/foto.blade.php | 4 +- .../surveyor/components/header.blade.php | 25 +++++-- .../surveyor/components/informasi.blade.php | 36 ++++++++-- .../surveyor/components/lingkungan.blade.php | 10 +++ 8 files changed, 98 insertions(+), 54 deletions(-) diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 3baf1aa..59c585a 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -1892,7 +1892,7 @@ class SurveyorController extends Controller 'hub_cadeb_penghuni' => [ $data['hub_cadeb_penghuni'] => ($data['hub_cadeb_penghuni'] == 'sesuai') ? $data['hub_cadeb_penghuni_sesuai'] : $data['hub_penghuni_tidak_sesuai'] ], - + 'pihak_bank' => $data['pihak_bank'] ?? null, 'kordinat_lng' => $data['kordinat_lng'] ?? null, 'kordinat_lat' => $data['kordinat_lat'] ?? null, ] @@ -1932,6 +1932,7 @@ class SurveyorController extends Controller false, 'lainnya' ), + 'tusuk_sate' => $data['tusuk_sate'] ?? null, 'lockland' => $data['lockland'] ?? null, 'kondisi_fisik_tanah' => $this->getFieldData( @@ -2038,6 +2039,7 @@ class SurveyorController extends Controller 'dekat_tps' => $data['dekat_tps'] ?? null, 'jarak_tps' => $data['jarak_tps'] ?? null, 'nama_tps' => $data['nama_tps'] ?? null, + 'dekat_lainnya' => $data['dekat_lainnya'] ?? null, 'merupakan_daerah' => $data['merupakan_daerah'] ?? null, 'fasilitas_dekat_object' => $data['fasilitas_dekat_object'] ?? null, 'fasilitas_dekat_object_input' => $data['fasilitas_dekat_object_input'] ?? null, diff --git a/app/Http/Requests/FormSurveyorRequest.php b/app/Http/Requests/FormSurveyorRequest.php index 701fb3a..5e07ac0 100644 --- a/app/Http/Requests/FormSurveyorRequest.php +++ b/app/Http/Requests/FormSurveyorRequest.php @@ -164,6 +164,7 @@ class FormSurveyorRequest extends FormRequest 'dekat_tps' => 'nullable', 'jarak_tps' => 'nullable', 'nama_tpu' => 'nullable', + 'dekat_lainnya' => 'nullable', 'merupakan_daerah' => 'nullable', 'fasilitas_dekat_object' => 'nullable|array', 'fasilitas_dekat_object_input' => 'nullable|array', @@ -528,6 +529,7 @@ class FormSurveyorRequest extends FormRequest 'jenis_asset_tidak_sesuai' => 'nullable|string', 'alamat_sesuai' => 'required', 'alamat_tidak_sesuai' => 'nullable|string', + 'pihak_bank' => 'required|string', 'hub_cadeb' => 'required', 'hub_cadeb_sesuai' => 'nullable|string', @@ -577,7 +579,7 @@ class FormSurveyorRequest extends FormRequest 'foto_bhumi' => 'nullable', 'foto_argis_region' => 'nullable', 'foto_tempat' => 'nullable', - 'keterangan' => 'nullable', + 'keterangan' => 'nullable|array', ]; } diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php index c8517cc..eeaff63 100644 --- a/resources/views/penilai/components/print-out-standard.blade.php +++ b/resources/views/penilai/components/print-out-standard.blade.php @@ -822,43 +822,38 @@ @if (isset($basicData['spekKategoriBangunan'])) - @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi) - - {{ $spesifikasi->name }} - - - @if (isset($basicData['spekBangunan'])) - @foreach ($basicData['spekBangunan'] as $kategori) - @if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id) - + @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi) + + + - - @endforeach - @endif + + @endif + @endforeach + @endif +
- -
{{ $spesifikasi->name }} + + @if (isset($basicData['spekBangunan'])) + @foreach ($basicData['spekBangunan'] as $kategori) + @if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id) + @if ($loop->iteration % 3 == 1 && $loop->iteration > 1) + @endif - @endforeach - @endif -
-
+ +
+ + + @endforeach + @endif + diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php index edf6fc2..fe572da 100644 --- a/resources/views/surveyor/components/bangunan.blade.php +++ b/resources/views/surveyor/components/bangunan.blade.php @@ -7,7 +7,7 @@
- +
@if (isset($permohonan->debiture->documents)) diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php index 3872f27..892a786 100644 --- a/resources/views/surveyor/components/foto.blade.php +++ b/resources/views/surveyor/components/foto.blade.php @@ -104,7 +104,7 @@ style="{{ isset($formFoto['foto_gerbang']) ? '' : 'display: none;' }} width: 30rem;">
+ + +
+ +
+
+ +
+
+
@@ -251,7 +263,7 @@ +
+ @endforeach + @else +
+ + + +
+ @endif + +
diff --git a/resources/views/surveyor/components/lingkungan.blade.php b/resources/views/surveyor/components/lingkungan.blade.php index a2ff48c..dd62910 100644 --- a/resources/views/surveyor/components/lingkungan.blade.php +++ b/resources/views/surveyor/components/lingkungan.blade.php @@ -339,6 +339,16 @@ +
+ +
+ + +
+
+