From 6ddf78d2b0a55db5ad2b23617bdcb716330fc8e7 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 21 May 2025 10:30:18 +0700 Subject: [PATCH] fix: update dokumentId and fix save penilai rap --- app/Http/Controllers/PenilaiController.php | 23 ++++----------- app/Http/Controllers/SurveyorController.php | 16 +++++----- app/Services/SaveFormInspesksiService.php | 2 +- .../lpj-sederhana-standar.blade.php | 8 ++--- .../penilai/components/rap-penilai.blade.php | 29 +++++++++++-------- resources/views/penilai/show.blade.php | 10 +++---- .../surveyor/components/card-tambah.blade.php | 12 ++++---- .../components/data-pembanding.blade.php | 2 +- .../views/surveyor/components/foto.blade.php | 10 +++---- .../surveyor/components/informasi.blade.php | 2 +- .../surveyor/components/inspeksi.blade.php | 2 +- .../components/pembanding-kendaraan.blade.php | 2 +- .../pembanding-tanah-bangunan-unit.blade.php | 2 +- 13 files changed, 57 insertions(+), 63 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 3f21f73..6a148cc 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -82,7 +82,7 @@ class PenilaiController extends Controller public function sederhana(Request $request, $id) { - $documentId = $request->query('dokument'); + $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); @@ -148,7 +148,7 @@ class PenilaiController extends Controller public function standar(Request $request, $id) { - $documentId = $request->query('dokument'); + $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); @@ -401,7 +401,7 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); - $documentId = $request->query('dokument'); + $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); @@ -1153,20 +1153,9 @@ class PenilaiController extends Controller { DB::beginTransaction(); try { - $formRequest = new FormSurveyorRequest(); - $formRequest->setContainer(app()); - $formRequest->initialize( - $request->all(), - $request->query->all(), - $request->attributes->all(), - $request->cookies->all(), - $request->files->all(), - $request->server->all(), - $request->getContent() - ); - $validated = $formRequest->validateResolved(); - $result = $this->surveyorController->store($formRequest); + $validatedData = $request->all(); + $result = $this->inspeksiService->storeInspeksi($validatedData, $request->input('type'), $request); $data = [ 'kepada' => $request->input('kepada'), @@ -1431,7 +1420,7 @@ class PenilaiController extends Controller } - // pengunaan request query by id permohonan, dokument, jaminan , inspeksi + // pengunaan request query by id permohonan, documentId, jaminan , inspeksi protected function getRequestQueryId(Request $request) { return [ diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 137b986..605f99d 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -1556,11 +1556,11 @@ class SurveyorController extends Controller { $validated = $request->validate([ - 'dokument' => 'required', + 'documentId' => 'required', 'jenis_jaminan' => 'required' ]); - $dokumentId = $validated['dokument']; + $dokumentId = $validated['documentId']; $jaminanId = $validated['jenis_jaminan']; $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId); @@ -1644,11 +1644,11 @@ class SurveyorController extends Controller public function denah(Request $request, $id) { $validated = $request->validate([ - 'dokument' => 'required', + 'documentId' => 'required', 'jenis_jaminan' => 'required' ]); - $dokumentId = $validated['dokument']; + $dokumentId = $validated['documentId']; $jaminanId = $validated['jenis_jaminan']; $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId); @@ -1672,11 +1672,11 @@ class SurveyorController extends Controller public function foto(Request $request, $id) { $validated = $request->validate([ - 'dokument' => 'required', + 'documentId' => 'required', 'jenis_jaminan' => 'required' ]); - $dokumentId = $validated['dokument']; + $dokumentId = $validated['documentId']; $jaminanId = $validated['jenis_jaminan']; $fotoObjekJaminan = FotoObjekJaminan::all(); @@ -1707,11 +1707,11 @@ class SurveyorController extends Controller // Ambil data permohonan dengan eager loading $validated = $request->validate([ - 'dokument' => 'required', + 'documentId' => 'required', 'jenis_jaminan' => 'required' ]); - $dokumentId = $validated['dokument']; + $dokumentId = $validated['documentId']; $jaminanId = $validated['jenis_jaminan']; $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId); diff --git a/app/Services/SaveFormInspesksiService.php b/app/Services/SaveFormInspesksiService.php index cc88461..1abc932 100644 --- a/app/Services/SaveFormInspesksiService.php +++ b/app/Services/SaveFormInspesksiService.php @@ -122,7 +122,7 @@ class SaveFormInspesksiService } if ($hasFactaData) { - $rules = array_merge($rules, $this->getFactData($data, $request)); + $rules = array_merge($rules, $this->getFactData($data, $request, $inspeksi)); } return $rules; diff --git a/resources/views/penilai/components/lpj-sederhana-standar.blade.php b/resources/views/penilai/components/lpj-sederhana-standar.blade.php index e210da6..b928fa3 100644 --- a/resources/views/penilai/components/lpj-sederhana-standar.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standar.blade.php @@ -23,7 +23,7 @@ @include('lpj::assetsku.includenya')
- + @include('lpj::component.form-penilai') @@ -52,15 +52,15 @@ @endif @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator'])) + href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> Lampiran Foto dan Dokumen - Cetak Hasil Inspeksi + onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', {{ request('jaminanId') }}, 0)"> Cetak Laporan @endif diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php index be5966a..2f684f7 100644 --- a/resources/views/penilai/components/rap-penilai.blade.php +++ b/resources/views/penilai/components/rap-penilai.blade.php @@ -14,14 +14,16 @@ @include('lpj::assetsku.includenya') - @include('lpj::surveyor.components.header') - @include('lpj::surveyor.components.rap') -

RAP

+ + Back + + +
@@ -64,24 +66,27 @@
+ @include('lpj::surveyor.components.header') + @include('lpj::surveyor.components.rap')
@if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator'])) - +
+ @endif @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator'])) Lampiran Foto dan Dokumen - + Cetak Hasil Inspeksi id) }}?dokument=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; } else if (data.status === 'sederhana') { showLoadingSwal('Tunggu ...'); window.location.href = - `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; } } else { if (fasilitasKredit.toUpperCase() === 'KPR KERJASAMA') { @@ -556,10 +556,10 @@ if (data.success) { if (type === 'standar') { window.location.href = - `{{ route('penilai.standar', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; } else if (type === 'sederhana') { window.location.href = - `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; } } }); @@ -640,7 +640,7 @@ function rap(permohonanId, documentId, jaminanId) { showLoadingSwal('Tunggu ...'); window.location.href = - `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&dokument=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`; } diff --git a/resources/views/surveyor/components/card-tambah.blade.php b/resources/views/surveyor/components/card-tambah.blade.php index 6116d9d..8f5d5ba 100644 --- a/resources/views/surveyor/components/card-tambah.blade.php +++ b/resources/views/surveyor/components/card-tambah.blade.php @@ -14,7 +14,7 @@ 'url' => route('surveyor.inspeksi', [ 'id' => $permohonan->id, - ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", + ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['data_form']), ], @@ -27,7 +27,7 @@ 'url' => route('surveyor.denah', [ 'id' => $permohonan->id, - ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", + ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['denah_form']), ]; @@ -39,7 +39,7 @@ 'url' => route('surveyor.foto', [ 'id' => $permohonan->id, - ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", + ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['foto_form']), ], @@ -48,7 +48,7 @@ 'url' => route('surveyor.data-pembanding', [ 'id' => $permohonan->id, - ]) . "?dokument={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", + ]) . "?documentId={$jaminanId}&jenis_jaminan={$dokumen->jenisJaminan->id}", 'show' => true, 'icon' => !empty($currentInspeksi['data_pembanding']), ], @@ -84,7 +84,7 @@ @@ -109,7 +109,7 @@ diff --git a/resources/views/surveyor/components/data-pembanding.blade.php b/resources/views/surveyor/components/data-pembanding.blade.php index 375f94f..72c9888 100644 --- a/resources/views/surveyor/components/data-pembanding.blade.php +++ b/resources/views/surveyor/components/data-pembanding.blade.php @@ -20,7 +20,7 @@ @csrf - +
diff --git a/resources/views/surveyor/components/foto.blade.php b/resources/views/surveyor/components/foto.blade.php index 571ca91..61ee117 100644 --- a/resources/views/surveyor/components/foto.blade.php +++ b/resources/views/surveyor/components/foto.blade.php @@ -171,7 +171,7 @@ - + @@ -303,7 +303,7 @@ params: { permohonan_id: {{ $permohonan->id ?? 0 }}, - dokument_id: '{{ request('dokument') ?? '' }}', + dokument_id: '{{ request('documentId') ?? '' }}', param_name: paramName, nomor_registrasi: '{{ $permohonan->nomor_registrasi ?? '' }}', }, @@ -531,7 +531,7 @@ method: 'GET', data: { permohonan_id: {{ $permohonan->id ?? 0 }}, - dokument_id: '{{ request('dokument') ?? '' }}', + dokument_id: '{{ request('documentId') ?? '' }}', param_name: paramName }, headers: { @@ -881,7 +881,7 @@ data: { path: response.path, permohonan_id: {{ $permohonan->id ?? 0 }}, - dokument_id: '{{ request('dokument') ?? '' }}', + dokument_id: '{{ request('documentId') ?? '' }}', param_name: response.param_name }, headers: { @@ -916,7 +916,7 @@ }, data: { permohonan_id: {{ $permohonan->id }}, - dokument_id: '{{ request('dokument') ?? '' }}', + dokument_id: '{{ request('documentId') ?? '' }}', name: $('#editDataName').val(), description: $('#editDataDescription').val(), category: $('#editDataCategory').val(), diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index b3a7104..22b766c 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -342,7 +342,7 @@ // Buat FormData untuk mengirim file const formData = new FormData(); - const dokument = "{{ request('dokument') }}"; + const dokument = "{{ request('documentId') }}"; const permohonan = "{{ $permohonan->id }}"; formData.append('file', file); formData.append('dokument_id', dokument); diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php index ddc0603..7ec3ab1 100644 --- a/resources/views/surveyor/components/inspeksi.blade.php +++ b/resources/views/surveyor/components/inspeksi.blade.php @@ -70,7 +70,7 @@ Simpan - Cetak Form Inspeksi diff --git a/resources/views/surveyor/components/pembanding-kendaraan.blade.php b/resources/views/surveyor/components/pembanding-kendaraan.blade.php index fd51c94..40987c9 100644 --- a/resources/views/surveyor/components/pembanding-kendaraan.blade.php +++ b/resources/views/surveyor/components/pembanding-kendaraan.blade.php @@ -1,7 +1,7 @@

Data Pembanding

- @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('dokument') && request()->has('jenis_jaminan')) + @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('documentId') && request()->has('jenis_jaminan')) Back diff --git a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php index 6b2eabb..0daa270 100644 --- a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php +++ b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php @@ -1,7 +1,7 @@

Data Pembanding

- @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('dokument') && request()->has('jenis_jaminan')) + @if (Request::is('penilai/show-data-pembanding/*/edit') && request()->has('documentId') && request()->has('jenis_jaminan')) Back