From 43b086f3ea9c36bedbc9554438f0b17e71881759 Mon Sep 17 00:00:00 2001 From: majid Date: Mon, 21 Apr 2025 15:59:56 +0700 Subject: [PATCH 1/8] fix(print-out): perbaikkan print out foto dan print out resume --- .../penilai/components/foto-jaminan.blade.php | 4 +-- .../penilai/components/print-resume.blade.php | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/resources/views/penilai/components/foto-jaminan.blade.php b/resources/views/penilai/components/foto-jaminan.blade.php index 002e072..d8ad12e 100644 --- a/resources/views/penilai/components/foto-jaminan.blade.php +++ b/resources/views/penilai/components/foto-jaminan.blade.php @@ -31,7 +31,8 @@ /* Image Styling */ .photo-item img { width: auto; - height: 400px; + max-width: 100%; + height: auto; max-height: 400px; object-fit: contain; background-color: #f0f0f0; @@ -59,7 +60,6 @@ } .photo-image { - width: 100; height: 400px; max-height: 400px; } diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index de2290a..d61d1c3 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -1,5 +1,36 @@ @include('lpj::penilai.components.header') +@php + $data = ''; + foreach ($permohonan->documents as $dokumen) { + $data .= $dokumen->jenisJaminan->name . ', '; + + $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); + $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); + $teams = $permohonan->region->teams; + + if ($teams) { + foreach ($teams as $team) { + $team_users = $team->teamsUsers; + // print_r($team_users); + if ($team_users) { + foreach ($team_users as $team_user) { + $user = $team_user->user; + + if ($user && $user->hasRole('senior-officer')) { + $senior_officer = $user; + break 3; + } + } + } + } + } + } + use Modules\Usermanagement\Models\User; + $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); + + $data = rtrim($data, ', '); +@endphp
From 6f8db7415977e6cd9185abbf368b4449a29ff6eb Mon Sep 17 00:00:00 2001 From: majid Date: Mon, 21 Apr 2025 16:37:33 +0700 Subject: [PATCH 2/8] fix(print-out): perbaikkan fungsi cetak laporan --- resources/views/surveyor/js/utils.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/surveyor/js/utils.blade.php b/resources/views/surveyor/js/utils.blade.php index 580fc70..8da858a 100644 --- a/resources/views/surveyor/js/utils.blade.php +++ b/resources/views/surveyor/js/utils.blade.php @@ -309,7 +309,7 @@ } - function checkLaporan(permohonanId, documentId, inspeksiId, jaminanId, statusLpj) { + function checkLaporan(permohonanId, documentId, inspeksiId, statusLpj) { // showLoadingSwal('Tunggu...'); fetch( `{{ url('/penilai/check-laporan') }}?permohonanId=${permohonanId}&documentId=${documentId}&inspeksiId=${inspeksiId}` @@ -318,7 +318,7 @@ .then(data => { if (data.status) { window.location.href = - `{{ route('penilai.print-out') }}?permohonanId=${permohonanId}&documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}&statusLpj=${statusLpj}&type=${data.status}`; + `{{ route('penilai.print-out') }}?permohonanId=${permohonanId}&documentId=${documentId}&inspeksiId=${inspeksiId}&statusLpj=${statusLpj}&type=${data.status}`; } else { // Jika laporan belum ada, tampilkan pesan peringatan Swal.fire({ From ade4ffcad49d1175a1c0d6e1fe9122b5bc70c3e4 Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 20 May 2025 14:10:52 +0700 Subject: [PATCH 3/8] fix: perbaikkan update surveyor dan penilai --- app/Http/Controllers/PenilaiController.php | 27 ++++++++++++++++--- .../views/component/form-penilai.blade.php | 4 +-- .../lpj-sederhana-standar.blade.php | 8 +++--- resources/views/penilai/show.blade.php | 10 +++---- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index b3c498f..3f21f73 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('documentId'); + $documentId = $request->query('dokument'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); @@ -148,10 +148,15 @@ class PenilaiController extends Controller public function standar(Request $request, $id) { - $documentId = $request->query('documentId'); + $documentId = $request->query('dokument'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); + + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } + $basicData = $this->surveyorController->getCommonData(); $noLpSederhana = $this->generateNoLaporan($permohonan, $documentId, 'lpj'); @@ -218,6 +223,11 @@ class PenilaiController extends Controller $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } + $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'resume'); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); $noLpresume = $this->generateNoLaporan($permohonan, $documentId, 'resume'); @@ -253,6 +263,9 @@ class PenilaiController extends Controller $data = $this->getDataPermohonanWithPenilaiAndInspeksi($req['permohonanId'], $req['documentId'], $req['jaminanId']); $permohonan = $data['permohonan']; + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } $nomorLaporan = $this->generateNoLaporan($permohonan, $req['documentId'], 'memo'); $inspeksi = Inspeksi::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first(); @@ -388,10 +401,15 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); - $documentId = $request->query('documentId'); + $documentId = $request->query('dokument'); $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } + $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'rap'); $basicData = $this->surveyorController->getCommonData(); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); @@ -470,6 +488,9 @@ class PenilaiController extends Controller $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'call-report'); $basicData = $this->surveyorController->getCommonData(); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 12b2cee..946ca13 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -36,7 +36,7 @@ Informasi dan pembanding
- Edit Data Pembanding @@ -553,7 +553,7 @@ const urlParams = new URLSearchParams(window.location.search); const permohonanId = {{ $permohonan->id }}; - const documentId = urlParams.get('documentId'); + const documentId = urlParams.get('dokument'); const inspeksiId = urlParams.get('inspeksiId'); const requestUrl = diff --git a/resources/views/penilai/components/lpj-sederhana-standar.blade.php b/resources/views/penilai/components/lpj-sederhana-standar.blade.php index 1008b5f..e210da6 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('dokument') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> Lampiran Foto dan Dokumen - Cetak Hasil Inspeksi + onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('dokument') }}', {{ request('jaminanId') }}, 0)"> Cetak Laporan @endif diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 853834f..705c3cb 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -493,11 +493,11 @@ if (data.status === 'standar') { showLoadingSwal('Tunggu ...'); window.location.href = - `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.standar', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`; } else if (data.status === 'sederhana') { showLoadingSwal('Tunggu ...'); window.location.href = - `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${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) }}?documentId=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.standar', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`; } else if (type === 'sederhana') { window.location.href = - `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`; } } }); @@ -640,7 +640,7 @@ function rap(permohonanId, documentId, jaminanId) { showLoadingSwal('Tunggu ...'); window.location.href = - `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`; + `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&dokument=${documentId}&jaminanId=${jaminanId}`; } From 6ddf78d2b0a55db5ad2b23617bdcb716330fc8e7 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 21 May 2025 10:30:18 +0700 Subject: [PATCH 4/8] 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 From 320dba9d9c63968a83f2cd520c5d24d78cf92c5d Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 21 May 2025 10:57:25 +0700 Subject: [PATCH 5/8] fix navigation buttons back, in file memo, rap-penilai, resume, sla, show, and header --- resources/views/penilai/components/memo.blade.php | 2 +- resources/views/penilai/components/rap-penilai.blade.php | 3 --- resources/views/penilai/components/resume.blade.php | 2 +- resources/views/penilaian/otorisator/show.blade.php | 4 ++-- resources/views/penilaian/otorisator/sla.blade.php | 2 +- resources/views/surveyor/components/header.blade.php | 8 +++++--- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php index 4bf608d..d24c23e 100644 --- a/resources/views/penilai/components/memo.blade.php +++ b/resources/views/penilai/components/memo.blade.php @@ -19,7 +19,7 @@ @endphp @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) && Route::currentRouteName('otorisator.show')) - Back diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php index 2f684f7..e77ee29 100644 --- a/resources/views/penilai/components/rap-penilai.blade.php +++ b/resources/views/penilai/components/rap-penilai.blade.php @@ -19,9 +19,6 @@

RAP

- - Back -
diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index 033dbf9..37cfd69 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -57,7 +57,7 @@ @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) && Route::currentRouteName('otorisator.show')) - Back diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index cf027b1..ca79239 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -159,7 +159,7 @@ @if ($dataHeader == 'pelaporan') + href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}"> Lihat Laporan @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == 0) @@ -203,7 +203,7 @@ + href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}"> Lihat resume diff --git a/resources/views/penilaian/otorisator/sla.blade.php b/resources/views/penilaian/otorisator/sla.blade.php index e119b58..eabe6f5 100644 --- a/resources/views/penilaian/otorisator/sla.blade.php +++ b/resources/views/penilaian/otorisator/sla.blade.php @@ -161,7 +161,7 @@ @if ($dataHeader == 'pelaporan') + href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header }}"> Lihat Laporan @endif diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index 032bbb1..067a0ef 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -9,6 +9,8 @@
@php use Illuminate\Support\Facades\Route; + + // dd(request('header')); @endphp @if (isset($id)) @@ -16,13 +18,13 @@ @else @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) && - Request::is('otorisator/show/*/Pelaporan')) - Back @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor', 'penilai'])) - @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan')) + @if (Request::is('surveyor/inspeksi/*/create') && request()->has('documentId') && request()->has('jenis_jaminan')) Back From fa659ff11515666c7e2d8e75c528040f4e5badcc Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 21 May 2025 14:10:36 +0700 Subject: [PATCH 6/8] fix: perbaikan form-penilai,inspeksi denah - ubah dokument ke documentId, dan print-out-sederhana berdasarkan kategori form --- .../views/component/form-penilai.blade.php | 2 +- .../components/print-out-sederhana.blade.php | 595 ++---------------- .../views/surveyor/components/denah.blade.php | 2 +- .../surveyor/components/inspeksi.blade.php | 2 +- 4 files changed, 38 insertions(+), 563 deletions(-) diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 946ca13..a606f6f 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -36,7 +36,7 @@ Informasi dan pembanding
- Edit Data Pembanding diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 3ebc2f9..946368b 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -17,12 +17,12 @@
- - - - - - - - - - - -
+ - + @@ -120,7 +120,7 @@
Nama Debitur :{{ $permohonan->debiture->name ?? '' }}{{ u $permohonan->debiture->name ?? '' }}
Alamat dan Telpon
 + @@ -191,17 +191,17 @@
Fasilitas Kredit
-
- A. STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI + STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI - C. SARANA PELENGKAP DAN LINGKUNGAN + SARANA PELENGKAP DAN LINGKUNGAN
- +
+ @php @@ -236,328 +236,6 @@
{{ $hubCadeb ?? '' }}
- - - - - - -
- B. ANALISA {{ $data }} -
- - @foreach ($permohonan->documents as $dokumen) - @if ($dokumen->jenisJaminan) - @php - $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); - @endphp - @if (isset($formKategori) && $formKategori) - @php - $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; - $kategoriUnik = array_unique($kategoriArray); - @endphp - - @foreach ($kategoriUnik as $kategori) - @if ($kategori === 'tanah') - - - @php - $cekLuas = isset($forminspeksi['tanah']['luas_tanah']['tidak sesuai']) - ? 'tidak sesuai' - : 'sesuai'; - - $luas = $forminspeksi['tanah']['luas_tanah'][$cekLuas] ?? null; - @endphp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @php - $spesifikasiBangunan = - $forminspeksi['bangunan']['spesifikasi_bangunan'] ?? []; - @endphp - - @if (!empty($spesifikasiBangunan)) - @foreach ($spesifikasiBangunan as $index => $bangunan) - @php - $spekKategori = $bangunan['spek_kategori_bangunan'] ?? []; - @endphp - - @if (count($spesifikasiBangunan) > 1) - - - - @endif - - @foreach ($spekKategori as $kategori => $nilaiKategori) - @if (!empty($nilaiKategori)) - - - - - - @endif - @endforeach - @endforeach - @else - - - - @endif -
Luas Tanah:{{ $luas ?? '' }} m²
Bentuk Tanah: - @php - $bentukTanah = isset( - $forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah'], - ) - ? $forminspeksi['tanah']['bentuk_tanah']['bentuk_tanah'] - : []; - $lainnya = isset($forminspeksi['tanah']['bentuk_tanah']['lainnya']) - ? $forminspeksi['tanah']['bentuk_tanah']['lainnya'] - : null; - @endphp - - {{ !empty($bentukTanah) ? implode(', ', $bentukTanah) : '' }} - - @if (in_array('lainnya', array_map('strtolower', $bentukTanah)) && !empty($lainnya)) - ({{ $lainnya }}) - @endif -
Kontur Tanah: - @php - $konturTanah = $forminspeksi['tanah']['kontur_tanah'] ?? []; - @endphp - - @if (!empty($konturTanah)) - {{ implode(', ', $konturTanah) }} - @else - - - @endif -
Permukaan dengan Jalan: - @php - $ketinggianTanah = $forminspeksi['tanah']['ketinggian_tanah']; - $ketinggian = $ketinggianTanah['ketinggian'][0] ?? '-'; - $lebihTinggi = $ketinggianTanah['lebih_tinggi']; - $lebihRendah = $ketinggianTanah['lebih_rendah']; - @endphp - - {{ $ketinggian }} - @if ($ketinggian === 'Lebih Tinggi' && $lebihTinggi !== null) - (Ketinggian: {{ $lebihTinggi }} cm) - @elseif($ketinggian === 'Lebih Rendah' && $lebihRendah !== null) - (Kerendahan: {{ $lebihRendah }} cm) - @endif -
Peruntukan Tanah:Perumahan bukan Real Estate -
Fisik Tanah: - @php - $kondisiFisikTanah = - $forminspeksi['tanah']['kondisi_fisik_tanah'][ - 'kondisi_fisik_tanah' - ][0] ?? '-'; - $lainnya = - $forminspeksi['tanah']['kondisi_fisik_tanah']['lainnya'] ?? - null; - @endphp - - {{ $kondisiFisikTanah }} - @if (strcasecmp($kondisiFisikTanah, 'Lainnya') === 0 && $lainnya) - ({{ $lainnya }}) - @endif - -
Luas Bangunan: - @php - $luasTanahBangunan = - $forminspeksi['bangunan']['luas_tanah_bagunan']; - - $output = !empty($luasTanahBangunan['sesuai']) - ? $luasTanahBangunan['sesuai'] - : (!empty($luasTanahBangunan['tidak sesuai']) - ? $luasTanahBangunan['tidak sesuai'] - : '-'); - @endphp - - {{ $output }} m² -
Jenis Bangunan: - @php - $jenisBangunan = $forminspeksi['bangunan']['jenis_bangunan'] ?? []; - @endphp - - @if (!empty($jenisBangunan)) - {{ implode(', ', $jenisBangunan) }} - @else - - - @endif -
Kondisi Bangunan: - @php - $kondisiBangunan = - $forminspeksi['bangunan']['kondisi_bangunan'] ?? []; - @endphp - - @if (!empty($kondisiBangunan)) - {{ implode(', ', $kondisiBangunan) }} - @else - - - @endif -
Sifat Bangunan: - @php - $sifatBangunan = - $forminspeksi['bangunan']['sifat_bangunan'][0] ?? '-'; - $sifatBangunanInput = - $forminspeksi['bangunan']['sifat_bangunan_input']; - - // Filter input yang tidak null - $inputTambahan = array_filter($sifatBangunanInput, function ( - $value, - ) { - return $value !== null && $value !== ''; - }); - - // Gabungkan sifat bangunan dengan input tambahan - $output = $sifatBangunan; - - if (!empty($inputTambahan)) { - $output .= ' (' . implode(', ', $inputTambahan) . ')'; - } - @endphp - - {{ $output }} -
- {{ $bangunan['bagunan'] ?? 'Bangunan ' . ($index + 1) }} -
- {{ $kategori }}: - {{ implode(', ', $nilaiKategori) }}
Tidak - ada data - spesifikasi bangunan
- @elseif ($kategori === 'apartemen-kantor') - - - @php - $cekLuas = isset($forminspeksi['luas_unit']['tidak sesuai']) - ? 'tidak sesuai' - : 'sesuai'; - - $luas = $forminspeksi['luas_unit'][$cekLuas] ?? null; - @endphp - - - - - - - - - - - - - - - - - - - - - - - - -
Luas Unit:{{ $luas ?? '' }} m2
Bentuk Unit: - @php - $bentukUnit = $forminspeksi['bentuk_unit'] ?? []; - @endphp - - @if (!empty($bentukUnit)) - {{ implode(', ', $bentukUnit) }} - @else - - - @endif -
Kondisi Unit: - @php - $bentukUnit = $forminspeksi['kondisi_unit'] ?? []; - @endphp - - @if (!empty($bentukUnit)) - {{ implode(', ', $bentukUnit) }} - @else - - - @endif -
Posisi Unit: - @php - $bentukUnit = $forminspeksi['posisi_unit'] ?? []; - @endphp - - @if (!empty($bentukUnit)) - {{ implode(', ', $bentukUnit) }} - @else - - - @endif -
View Unit: - @php - $bentukUnit = $forminspeksi['view'] ?? []; - @endphp - - @if (!empty($bentukUnit)) - {{ implode(', ', $bentukUnit) }} - @else - - - @endif -
- @endif - @endforeach - @endif - @endif - @endforeach 		@@ -693,11 +371,36 @@
+ + @foreach ($permohonan->documents as $dokumen) + @if ($dokumen->jenisJaminan) + @php + $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); + @endphp + @if (isset($formKategori) && $formKategori) + @php + $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori]; + $kategoriUnik = array_unique($kategoriArray); + @endphp + + @foreach ($kategoriUnik as $kategori) + + @if ($kategori !== 'lingkungan') + @include('lpj::penilai.components.analisa.' . str_replace('-', '-', $kategori), [ + 'dokumen' => $dokumen, + ]) + @endif + + @endforeach + @endif + @endif + @endforeach +
-
- D. INFORMASI HARGA + + INFORMASI HARGA
@@ -706,7 +409,7 @@
-
E. INFORMASI NILAI + INFORMASI NILAI
@@ -801,233 +504,5 @@
-
- - - - - -
- F. ANALISA FAKTA -
- - - - - - - - - - - - - - - - - - @if (!empty($forminspeksi['fakta']['keterangan'])) - - - - - @endif -
Faktor Positif - @isset($forminspeksi['fakta']['fakta_positif']) - - @foreach ($forminspeksi['fakta']['fakta_positif'] as $key => $item) - - - - @endforeach -
{!! nl2br(e($item)) !!}
- @endisset -
Faktor Negatif - @isset($forminspeksi['fakta']['fakta_negatif']) - - @foreach ($forminspeksi['fakta']['fakta_negatif'] as $key => $item) - - - - @endforeach -
{!! nl2br(e($item)) !!}
- @endisset -
Batas batas - @foreach ($forminspeksi['fakta']['batas_batas_input'] ?? [] as $arah => $batas) - @if ($batas) -

- {{ $arah }} : {{ $batas }}

- @endif - @endforeach -
Informasi Dinas Tata Ruang - - @php - $informasi = [ - 'peruntukan', - 'kdb', - 'kdh', - 'gsb', - 'max_lantai', - 'klb', - 'gss', - 'pelebaran_jalan', - 'nama_petugas', - ]; - @endphp - - @foreach ($informasi as $key) - @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-') - @php - $displayKey = ucfirst(str_replace('_', ' ', $key)); - if (strlen($key) == 3) { - $displayKey = strtoupper($key); - } - @endphp -

- {{ $displayKey }}: {{ $forminspeksi['fakta'][$key] }}

- @endif - @endforeach - -
Catatan yang Perlu - Diperhatikan - @php - $keterangan = $forminspeksi['fakta']['keterangan'] ?? ''; - if (is_array($keterangan)) { - $keterangan = implode(', ', array_filter($keterangan)); - } - @endphp - - @if (!empty($keterangan)) - - - - -
{{ $keterangan }}
- @endif -
-
- -
- -
-
    - -
  1. PENILAIAN INI DIBUAT BERDASARKAN ATURAN YANG - BERLAKU DI SUBDIT APPRAISAL
    2. -
  2. LAPORAN INI DIBUAT BERDASARKAN DATA FOTOCOPY - DOKUMEN YANG DITERIMA PENILAI DENGAN ASUMSI BAHWA DATA TERSEBUT SESUAI DENGAN - DOKUMEN ASLINYA
    3. -
  3. PENILAI TIDAK MELAKUKAN PEMBUKTIAN LEBIH RINCI ATAU - PENGAKUAN TERTULIS DARI PIHAK YANG DITEMUI SAAT PENILAIAN, ATAS INFORMASI YANG - DIBERIKAN SECARA LISAN SEHUBUNGAN DENGAN IDENTITAS DIRI DAN HUBUNGAN DI ANTARA - PIHAK TERKAIT SAAT MELAKUKAN INSPEKSI OBJEK YANG DINILAI
    4. -
  4. LAPORAN INI DIGUNAKAN HANYA UNTUK KEPENTINGAN - INTERNAL DAN DILARANG MENYEBARKAN KEPADA PIHAK KETIGA
    5. -
-
-
- -
-
Demikian laporan penilai jaminan ini di buat secara objektif, tanpa adanya pengaruh baik intern - maupun ekstern
- @php - use Modules\Usermanagement\Models\User; - $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); - $imagePathPenilai = storage_path( - 'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign, - ); - - $soUser = User::where('id', $senior_officer->id)->first(); - $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); - - $imagePathEO = storage_path( - 'app/public/signatures/' . - User::role('EO Appraisal')->first()->id . - '/' . - User::role('EO Appraisal')->first()->sign, - ); - - $imagePathDD = storage_path( - 'app/public/signatures/' . - User::role('DD Appraisal')->first()->id . - '/' . - User::role('DD Appraisal')->first()->sign, - ); - @endphp - - - @if ($permohonan->approval_so != null) - - @endif - @if ($permohonan->approval_eo != null) - - @endif - @if ($permohonan->approval_dd != null) - - @endif - - - - @if ($permohonan->approval_so != null) - - @endif - - @if ($permohonan->approval_eo != null) - - @endif - @if ($permohonan->approval_dd != null) - - @endif - -
- @if (file_exists($imagePathPenilai)) - {{ $imagePathPenilai }} - @endif - - @if (file_exists($imagePathSo)) - {{ $imagePathSo }} - @endif - - @if (file_exists($imagePathEO)) - {{ $imagePathEO }} - @endif - - @if (file_exists($imagePathDD)) - {{ $imagePathDD }} - @endif -
{{ $penilai->userPenilaiTeam->name ?? '' }}
- - {{ ucwords(strtolower('PENILAI')) }} - - 		- {{ $senior_officer->name ?? '' }}
- - {{ ucwords(strtolower('SENIOR OFFICER')) }} - - - 		- {{ User::role('EO Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} - - 		- {{ User::role('DD Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} - -
- - - -
@include('lpj::penilai.components.footer') diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php index 6dbe2f9..deb149d 100644 --- a/resources/views/surveyor/components/denah.blade.php +++ b/resources/views/surveyor/components/denah.blade.php @@ -35,7 +35,7 @@ @csrf - +
diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php index 7ec3ab1..9c39fab 100644 --- a/resources/views/surveyor/components/inspeksi.blade.php +++ b/resources/views/surveyor/components/inspeksi.blade.php @@ -10,7 +10,7 @@ @csrf - + @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap') From 0f8774a37c60d06cf4cebb4c4b1999c25d38b72d Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 21 May 2025 10:30:18 +0700 Subject: [PATCH 7/8] fix: update dokumentId and fix save penilai rap --- app/Http/Controllers/PenilaiController.php | 6 +++--- .../penilai/components/lpj-sederhana-standar.blade.php | 6 +++--- resources/views/penilai/show.blade.php | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 83f8eec..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); diff --git a/resources/views/penilai/components/lpj-sederhana-standar.blade.php b/resources/views/penilai/components/lpj-sederhana-standar.blade.php index 543dd34..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,10 +52,10 @@ @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 diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 705c3cb..853834f 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -493,11 +493,11 @@ if (data.status === 'standar') { showLoadingSwal('Tunggu ...'); window.location.href = - `{{ route('penilai.standar', $permohonan->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}`; } From 760a0cb85dbf77288f8110c810dbd89f3b05371f Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 21 May 2025 14:38:50 +0700 Subject: [PATCH 8/8] fix: hapus 'u' yang tidak diperlukan di file prit-out-sederhana --- .../views/penilai/components/print-out-sederhana.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 946368b..f9f6cb0 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -22,7 +22,7 @@ Nama Debitur : - {{ u $permohonan->debiture->name ?? '' }} + {{ u $permohonan->debiture->name ?? '' }} Alamat dan Telpon