diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 9d3c95b..b695d90 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -44,15 +44,15 @@ class PenilaiController extends Controller /** * Show the form for creating a new resource. */ - public function lampiran(Request $request, $id) + public function lampiran(Request $request) { $permohonanId = $request->query('permohonanId'); $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); - $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); - $inpeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); + $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + $inpeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); $formFoto = null; if ($inpeksi) { @@ -280,6 +280,7 @@ class PenilaiController extends Controller $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + $noLpRAP = $this->generateNoLaporan($permohonan, $documentId, 'rap'); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); Penilai::updateOrCreate( [ @@ -302,7 +303,7 @@ class PenilaiController extends Controller $rap = json_decode($resume->rap, true); } - return view('lpj::penilai.components.rap-penilai', compact('permohonan', 'rap', 'provinces', 'forminspeksi')); + return view('lpj::penilai.components.rap-penilai', compact('permohonan', 'rap', 'provinces', 'forminspeksi', 'noLpRAP')); } @@ -756,6 +757,60 @@ class PenilaiController extends Controller } } + public function storeRap(Request $request){ + 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); + + $data =[ + 'kepada' => $request->input('kepada'), + 'dari' => $request->input('dari'), + 'nomor_rap' => $request->input('nomor_rap'), + 'tanggal' => $request->input('tanggal'), + 'perihal' => $request->input('perihal') + ]; + + Penilai::updateOrCreate( + [ + 'permohonan_id' => $request->permohonanId, + 'dokument_id' => $request->documentId, + 'inspeksi_id' => $request->inspeksiId, + ], + [ + 'rap' => json_encode($data), + ] + ); + DB::commit(); + return response()->json([ + 'success' => true, + 'message' => 'Berhasil menyimpan LPJ', + 'data' => $result + ], 200); + } catch (\Throwable $e) { + DB::rollBack(); + return response()->json([ + 'success' => false, + 'message' => 'Terjadi kesalahan saat menyimpan LPJ', + 'error' => $e->getMessage(), + 'trace' => $e->getTraceAsString() + ], 500); + } + + } + public function print_out(Request $request) @@ -794,6 +849,7 @@ class PenilaiController extends Controller $lpjData = json_decode($lpj->lpj, true); $memo = json_decode($lpj->memo, true); $resumeData = json_decode($lpj->resume, true); + $rap = json_decode($lpj->rap, true); } $inputAddress = $forminspeksi['asset']['alamat']['sesuai'] ?? $forminspeksi['asset']['alamat']['tidak sesuai']; @@ -824,7 +880,8 @@ class PenilaiController extends Controller 'nomorLaporan', 'memo', 'resumeData', - 'tanggalLaporan' + 'tanggalLaporan', + 'rap' )); $pdf->setPaper('A4', 'portrait'); @@ -845,7 +902,8 @@ class PenilaiController extends Controller 'nomorLaporan', 'memo', 'resumeData', - 'tanggalLaporan' + 'tanggalLaporan', + 'rap' )); // return $pdf; diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index c7ed587..216cfd9 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -2763,7 +2763,7 @@ class SurveyorController extends Controller 'sensor_camera_recorder' => $data['sensor_camera_recorder'] ?? null, 'sensor_camera_recorder_input' => $data['sensor_camera_recorder_input'] ?? null, 'lcd' => $data['lcd'] ?? null, - 'lcd_innput' => $data['lcd_innput'] ?? null, + 'lcd_input' => $data['lcd_input'] ?? null, 'sabuk_keselamatan' => $data['sabuk_keselamatan'] ?? null, 'sabuk_keselamatan_input' => $data['sabuk_keselamatan_input'] ?? null, 'airbag' => $data['airbag'] ?? null, diff --git a/app/Http/Requests/FormSurveyorRequest.php b/app/Http/Requests/FormSurveyorRequest.php index 25a887b..5378464 100644 --- a/app/Http/Requests/FormSurveyorRequest.php +++ b/app/Http/Requests/FormSurveyorRequest.php @@ -182,7 +182,7 @@ class FormSurveyorRequest extends FormRequest 'nama_jalan' => 'required', 'perumahan_gang' => 'required', 'blok_nomor' => 'required', - + 'village_code' => 'nullable|string', 'district_code' => 'nullable|string', 'city_code' => 'nullable|string', @@ -280,10 +280,16 @@ class FormSurveyorRequest extends FormRequest 'nama_jalan' => 'required', 'perumahan_gang' => 'required', 'blok_nomor' => 'required', - 'desa_kelurahan' => 'required', - 'kecamatan' => 'required', - 'kota_madya' => 'required', - 'provinsi' => 'required', + + 'village_code' => 'nullable|string', + 'district_code' => 'nullable|string', + 'city_code' => 'nullable|string', + 'province_code' => 'nullable|string', + + 'masa_stnk' => 'required', + 'masa_pajak' => 'required', + 'kendaraan.*' => 'required', + 'kendaraan_input.*' => 'nullable', 'kondisi' => 'required', 'nomor_polisi' => 'required', 'nomor_polis_tidak_sesuai' => 'nullable', @@ -297,26 +303,47 @@ class FormSurveyorRequest extends FormRequest 'nomor_mesin_tidak_sesuai' => 'nullable', 'posisi_kilometer' => 'required', 'transmisi' => 'required', + 'transmisi_input' => 'nullable', 'mesin_panel_instrument.*' => 'required', + 'mesin_panel_instrument_input.*' => 'nullable', 'fungsi_mesin_panel_instrument.*' => 'required', + 'fungsi_mesin_panel_instrument_input.*' => 'nullable', 'interior.*' => 'required', + 'interior_input.*' => 'nullable', 'jumlah_pintu.*' => 'required', + 'jumlah_pintu_input.*' => 'nullable', 'rangka_karoseri.*' => 'required', + 'rangka_karoseri_input.*' => 'nullable', 'ban.*' => 'required', + 'ban_input.*' => 'nullable', 'velg.*' => 'required', + 'velg_input.*' => 'nullable', 'bamper_depan.*' => 'required', + 'bamper_depan_input.*' => 'nullable', 'bamper_belakang.*' => 'required', + 'bamper_belakang_input.*' => 'nullable', 'lampu_depan.*' => 'required', + 'lampu_depan_input.*' => 'nullable', 'lampu_belakang.*' => 'required', + 'lampu_belakang_input.*' => 'nullable', 'kaca_kendaraan.*' => 'required', + 'kaca_kendaraan_input.*' => 'nullable', 'air_conditioner.*' => 'required', + 'air_conditioner_input.*' => 'nullable', 'tape_radio_cd.*' => 'required', + 'tape_radio_cd_input.*' => 'nullable', 'sensor_parkir.*' => 'required', + 'sensor_parkir_input.*' => 'nullable', 'sensor_camera_recorder.*' => 'required', + 'sensor_camera_recorder_input.*' => 'nullable', 'lcd.*' => 'required', + 'lcd_input.*' => 'nullable', 'sabuk_keselamatan.*' => 'required', + 'sabuk_keselamatan_input.*' => 'nullable', 'airbag.*' => 'required', + 'airbag_input.*' => 'nullable', 'asuransi.*' => 'required', + 'asuransi_input.*' => 'nullable', 'perusahaan_asuransi' => 'required', 'tahun_berakhir' => 'required', 'fakta_positif.*' => 'nullable', @@ -433,7 +460,7 @@ class FormSurveyorRequest extends FormRequest 'nama_jalan' => 'required', 'perumahan_gang' => 'required', 'blok_nomor' => 'required', - + 'village_code' => 'nullable|string', 'district_code' => 'nullable|string', 'city_code' => 'nullable|string', diff --git a/app/Models/Penilai.php b/app/Models/Penilai.php index c817862..1d15c41 100644 --- a/app/Models/Penilai.php +++ b/app/Models/Penilai.php @@ -23,6 +23,7 @@ class Penilai extends Model 'lpj', 'type', 'memo', + 'rap', 'type_penilai' ]; diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index 4eead8a..d2f427a 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -14,9 +14,9 @@ Back @else - - Back - + + Back + @endif diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 7635835..f2f8652 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -541,6 +541,7 @@ @if ($dokumen->jenisJaminan) @php $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); + $jenisAset = $dokumen->jenisJaminan->name; @endphp @if (isset($formKategori) && $formKategori) @php @@ -593,6 +594,11 @@ 'pesawat' => 'Luas Pesawat', 'kapal' => 'Luas Kapal', ]; + + if (strcasecmp($jenisAset, 'RUKO/RUKAN') === 0) { + $labelNilai['bangunan'] = 'Luas Unit'; + unset($labelNilai['tanah']); + } @endphp @foreach ($kategoriUnik as $item) @@ -640,8 +646,8 @@ @@ -656,6 +662,8 @@ Tambah NPW + +
@@ -693,6 +701,41 @@
+ +
+ + +
+
+ @if (!empty($lpjData['keterangan_penilai']) && is_array($lpjData['keterangan_penilai'])) + @foreach ($lpjData['keterangan_penilai'] as $index => $item) +
+ + +
+ @endforeach + @else +
+ + + +
+ @endif +
+ +
+
@@ -770,20 +813,29 @@ oninput="calculateTotal()">
+ +
+ @@ -841,22 +893,31 @@
+ +
+
- @if (Auth::user()->hasAnyRole(['senior-officer'])) + @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal'])) + + LAMPIRAN FOTO DAN DOKUMEN + + + PAPARAN + Print diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php index ab956eb..da20d4a 100644 --- a/resources/views/penilai/components/memo.blade.php +++ b/resources/views/penilai/components/memo.blade.php @@ -24,21 +24,21 @@
+ value=" {{ $memo->kepada ?? '' }}">
+ value="{{ $memo->dari ?? '' }}">
+ value="{{ $noLpmemo ?? '' }}" @readonly(true)>
{{-- 250109828129/ --}} @@ -47,7 +47,7 @@
+ value="{{ $memo->tanggal ?? '' }}">
@@ -55,7 +55,7 @@
+ value="{{ $memo->perihal ?? '' }}">
@@ -64,7 +64,8 @@

Sehubungan dengan permintaan BAGI Cabang - {{ $permohonan->branch->name }}, untuk dilakukan survey untuk penilaian baru/review, calon debitur/debitur an + {{ $permohonan->branch->name }}, untuk dilakukan survey untuk penilaian baru/review, calon + debitur/debitur an {{ $permohonan->debiture->name }},dengan deskripsi sebagai berikut :

@@ -78,7 +79,8 @@ + placeholder="Masukkan Jl." + value="{{ $memo->lokasi->lokasi ?? old('lokasi') }}">
@@ -102,7 +105,9 @@ @@ -113,9 +118,11 @@
@@ -127,9 +134,11 @@
@@ -141,9 +150,11 @@
@@ -154,15 +165,17 @@
+ placeholder="Masukkan Jl." + value="{{ $memo->lokasi->address ?? old('address') }}">
- +
@@ -170,7 +183,8 @@
+ placeholder="Masukkan Penilai" + value="{{ $memo->lokasi->penilai ?? old('penilai') }}">
@@ -196,7 +210,7 @@
- +
@@ -210,7 +224,7 @@
@@ -219,13 +233,13 @@
@endif
@@ -240,7 +254,7 @@
@@ -249,14 +263,14 @@
@endif @@ -264,18 +278,26 @@ - {{-- @include('lpj::penilai.components.foto-lampiran') --}} + @include('lpj::penilai.components.foto-lampiran')
SAVE - @if (Auth::user()->hasAnyRole(['senior-officer'])) - - Print - - @endif + @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal'])) + + LAMPIRAN FOTO DAN DOKUMEN + + + PAPARAN + + + Print + + @endif
@@ -330,7 +352,7 @@ headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, - success: function (response) { + success: function(response) { hideLoadingSwal(); if (response.success) { Swal.fire({ @@ -353,11 +375,11 @@ } console.log(response); }, - error: function (xhr, status, error) { + error: function(xhr, status, error) { let errors = xhr.responseJSON?.errors; $('.alert').text(''); if (errors) { - $.each(errors, function (key, value) { + $.each(errors, function(key, value) { $(`#error-${key}`).text(value[0]); toastrErrorBuild(value[0]); }); diff --git a/resources/views/penilai/components/paparan.blade.php b/resources/views/penilai/components/paparan.blade.php index 71c2efe..b6d308f 100644 --- a/resources/views/penilai/components/paparan.blade.php +++ b/resources/views/penilai/components/paparan.blade.php @@ -6,11 +6,26 @@ @section('content') @include('lpj::assetsku.includenya')
- @include('lpj::component.detail-jaminan', [ - 'backLink' => 'penilai.show', - 'id' => $permohonan->id, - 'title' => 'Paparan dokument', - ]) + + @if (Auth::user()->hasAnyRole(['senior-officer'])) + @include('lpj::component.detail-jaminan', [ + 'backLink' => 'otorisator.view-laporan', + 'queryParams' => [ + 'permohonanId' => request()->query('permohonanId'), + 'documentId' => request()->query('documentId'), + 'inspeksiId' => request()->query('inspeksiId'), + 'jaminanId' => request()->query('jaminanId'), + 'statusLpj' => 1, + ], + 'title' => 'Paparan dokument', + ]) + @else + @include('lpj::component.detail-jaminan', [ + 'backLink' => 'penilai.show', + 'id' => $permohonan->id, + 'title' => 'Paparan dokument', + ]) + @endif @include('lpj::penilai.components.foto-lampiran') @@ -36,7 +51,7 @@

{{ $fileName }}

@else

Belum ada kertas kerja

- @endif + @endif
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php index 8a2068c..06b7276 100644 --- a/resources/views/penilai/components/print-out-rap.blade.php +++ b/resources/views/penilai/components/print-out-rap.blade.php @@ -129,29 +129,29 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +
Kepada:{{ $rap['kepada'] ?? '' }}Kepada:{{ $rap['kepada'] ?? '' }}
Dari:{{ $rap['dari'] ?? '' }}Dari:{{ $rap['dari'] ?? '' }}
No:{{ $rap['nomor_rap'] ?? '' }}No:{{ $nomorLaporan ?? '-' }}
Tanggal:_Tanggal:{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
Perihal:{{ $rap['perihal'] ?? '' }}Perihal:{{ $rap['perihal'] ?? '' }}
diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php index 999d045..79fd193 100644 --- a/resources/views/penilai/components/rap-penilai.blade.php +++ b/resources/views/penilai/components/rap-penilai.blade.php @@ -15,6 +15,54 @@ @include('lpj::assetsku.includenya') @include('lpj::surveyor.components.header') @include('lpj::surveyor.components.rap') + +
+
+

+ RAP +

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ {{-- 250109828129/ --}} + +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
- @if (Auth::user()->hasAnyRole(['senior-officer'])) + @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal'])) + + LAMPIRAN FOTO DAN DOKUMEN + Print @@ -35,6 +87,9 @@ @endsection @push('scripts') @endpush diff --git a/routes/web.php b/routes/web.php index 3b6de08..3157fa6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -562,7 +562,7 @@ Route::middleware(['auth'])->group(function () { Route::get('/{id}/show', [PenilaiController::class, 'show'])->name('show'); Route::get('datatables', [PenilaiController::class, 'dataForDatatables'])->name('dataForTables'); - Route::get('lampiran/{id}', [PenilaiController::class, 'lampiran'])->name('lampiran'); + Route::get('lampiran', [PenilaiController::class, 'lampiran'])->name('lampiran'); Route::get('export/kertas-kerja', [PenilaiController::class, 'export_kertas_kerja'])->name('export.kertas-kerja'); Route::get('print-out', [PenilaiController::class, 'print_out'])->name('print-out'); @@ -581,6 +581,7 @@ Route::middleware(['auth'])->group(function () { Route::post('storeResume', [PenilaiController::class, 'storeResume'])->name('storeResume'); Route::post('storeMemo', [PenilaiController::class, 'storeMemo'])->name('storeMemo'); + Route::post('storeRap', [PenilaiController::class, 'storeRap'])->name('storeRap'); Route::post('storeLpjSederhanadanStandard', [PenilaiController::class, 'storeLpjSederhanadanStandard'])->name('storeLpjSederhanadanStandard'); });