diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 0aa1d1c..96ddb43 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -10,6 +10,7 @@ use Modules\Lpj\Models\Penilai; use Modules\Lpj\Models\Laporan; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use Maatwebsite\Excel\Facades\Excel; use Modules\Lpj\Exports\KertasKerjaExport; use Modules\Lpj\Http\Controllers\SurveyorController; @@ -153,7 +154,7 @@ class PenilaiController extends Controller $permohonan = $data['permohonan']; $inspeksi = Inspeksi::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first(); - $penilai = Penilai::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->firstska(); + $penilai = Penilai::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first(); $provinces = Province::all(); $basicData = $this->surveyorController->getCommonData(); @@ -582,6 +583,7 @@ class PenilaiController extends Controller public function storeLpjSederhanadanStandard(Request $request) { + DB::beginTransaction(); try { $validatedRequest = app(FormSurveyorRequest::class); $this->surveyorController->store($validatedRequest); @@ -634,13 +636,14 @@ class PenilaiController extends Controller 'lpj' => json_encode($data), ] ); - + DB::commit(); return response()->json([ 'success' => true, 'message' => 'Berhasil menyimpan LPJ', - 'data' => $penilai + 'data' => $validatedRequest ], 200); } catch (\Throwable $e) { + DB::rollBack(); return response()->json([ 'success' => false, 'message' => 'Terjadi kesalahan saat menyimpan LPJ', @@ -654,14 +657,16 @@ class PenilaiController extends Controller public function print_out(Request $request) { - - $documentId = $request->query('documentId'); $jaminanId = $request->query('jaminanId'); $permohonanId = $request->query('permohonanId'); $statusLpj = $request->query('statusLpj'); + $tipeLaporan = $request->query('tipe'); + + $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, + $documentId, + $jaminanId); - $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); @@ -676,19 +681,17 @@ class PenilaiController extends Controller 'nomor_laporan' => generateLpjUniqueCode(6), ] ); - $nomorLaporan = $laporan->nomor_laporan; + $nomorLaporan = $laporan->nomor_laporan; $forminspeksi = null; $lpjData = null; $formFoto = null; if ($inspeksi) { $forminspeksi = json_decode($inspeksi->data_form, true); - $formFoto = json_decode($inspeksi->foto_form, true); // $denahForm = json_decode($data->denah_form, true); $dataPembanding = json_decode($inspeksi->data_pembanding, true); - } if ($lpj) { @@ -706,22 +709,7 @@ class PenilaiController extends Controller 'province_code' => $this->getWilayahName($inputAddress['province_code'] ?? null, 'province') ]; - ['sederhana', 'resume']; - - ['memo']; - ['rap']; - - - // $laporan = $lpj->type == ; - - // $laporanPenilai = $lpj - $viewLaporan = null; - - // $viewLaporan = 'penilai.components.print-out-sederhana'; - // $viewLaporan = 'penilai.components.print-out-standard'; - // $viewLaporan = 'penilai.components.print-resume'; - // $viewLaporan = 'penilai.components.print-memo'; - // $viewLaporan = 'penilai.components.print-rap'; + $viewLaporan = $this->getViewLaporan($tipeLaporan); try { if ($statusLpj) { @@ -741,7 +729,6 @@ class PenilaiController extends Controller $pdf->setPaper('A4', 'portrait'); return $pdf->stream(); - } else { $pdf = view('lpj::' . $viewLaporan, compact( // $pdf = PDF::loadView('lpj::' . $viewLaporan, compact( @@ -771,6 +758,19 @@ class PenilaiController extends Controller } + private function getViewLaporan($tipe) +{ + $viewMap = [ + 'sederhana' => 'penilai.components.print-out-sederhana', + 'standard' => 'penilai.components.print-out-standard', + 'resume' => 'penilai.components.print-resume', + 'memo' => 'penilai.components.print-memo', + 'rap' => 'penilai.components.print-rap' + ]; + + return $viewMap[$tipe] ?? 'penilai.components.print-resume'; +} + public function getWilayahName($code, $type) { try { diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standard.blade.php index 212979f..f240e5a 100644 --- a/resources/views/penilai/components/lpj-sederhana-standard.blade.php +++ b/resources/views/penilai/components/lpj-sederhana-standard.blade.php @@ -1,8 +1,7 @@ @extends('layouts.main') @section('breadcrumbs') - {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} - --}} + {{ Breadcrumbs::render(request()->route()->getName()) }} @endsection @section('content') diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php index 5fdacef..cd67033 100644 --- a/resources/views/penilai/components/memo.blade.php +++ b/resources/views/penilai/components/memo.blade.php @@ -1,9 +1,7 @@ @extends('layouts.main') @section('breadcrumbs') - {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} - --}} - Resume + {{ Breadcrumbs::render(request()->route()->getName()) }} @endsection @section('content') diff --git a/resources/views/penilai/components/paparan.blade.php b/resources/views/penilai/components/paparan.blade.php index cf1d114..71c2efe 100644 --- a/resources/views/penilai/components/paparan.blade.php +++ b/resources/views/penilai/components/paparan.blade.php @@ -1,9 +1,7 @@ @extends('layouts.main') @section('breadcrumbs') - {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} - --}} - Paparan + {{ Breadcrumbs::render(request()->route()->getName()) }} @endsection @section('content') @include('lpj::assetsku.includenya') diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 6d5e1f8..2e7bd73 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -135,7 +135,7 @@ - + @@ -238,7 +238,7 @@ + +
Nama DebiturNama Debitur : {{ $permohonan->debiture->name ?? '' }}
- + diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index 324d2b2..82611b0 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -107,6 +107,13 @@ + @php + $data = ''; + foreach ($permohonan->debiture->documents as $dokumen) { + $data .= $dokumen->jenisJaminan->name . ', '; + } + $data = rtrim($data, ', '); +@endphp
Fasilitas KreditFasilitas Kredit : {{ $permohonan->jenisFasilitasKredit->name ?? '' }}
@@ -128,28 +135,28 @@
- +
- - - + + + - + - + - + @@ -186,19 +193,23 @@ + @php + $cekLuas = isset( + $forminspeksi['tanah']['luas_tanah']['tidak sesuai'], + ) + ? 'tidak sesuai' + : 'sesuai'; + + $luas = $forminspeksi['tanah']['luas_tanah'][$cekLuas] ?? null; + @endphp - + - - - - - - +
Pemohon:Pemohon:{{ $permohonan->user->name }}
Atas Nama Cadeb :{{ $permohonan->debiture->name ?? '' }}
Aset :{{ $data ?? '' }}
Lokasi Objek :{{ $alamat['village_code'] ?? '' }}, {{ $alamat['district_code'] ?? '' }}, {{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }}
Dokumen
Luas Tanah :{{ $luas ?? '' }}
Tanggal Kunjungan :
Luast Lahan:{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}
@@ -207,6 +218,8 @@

Faktor Positif

:
@@ -215,6 +228,8 @@

Faktor negatif

+ : + @@ -222,6 +237,8 @@ + +

Nilai Pasar Wajar

:
diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index d4b0314..3c26c02 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -1,9 +1,8 @@ @extends('layouts.main') @section('breadcrumbs') - {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} - --}} - Resume + {{ Breadcrumbs::render(request()->route()->getName()) }} + @endsection @section('content') @@ -315,7 +314,7 @@
- +
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 4d8224b..bec3202 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('content') -@include('lpj::assetsku.includenya') + @include('lpj::assetsku.includenya')
@@ -100,9 +100,9 @@
- {{ str_replace('_', ' ', $permohonan->status_bayar) }} - + class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase"> + {{ str_replace('_', ' ', $permohonan->status_bayar) }} +
@@ -128,7 +128,8 @@ {{ $surveyor->userPenilaiTeam->name }}

-

{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }} +

+ {{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}

- + PRINT OUT
@@ -347,7 +363,7 @@ @include('lpj::surveyor.js.utils') diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 32f7500..c92d36a 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -582,11 +582,36 @@ $trail->push('Detail Penilai'); }); + Breadcrumbs::for('penilai.standard', function (BreadcrumbTrail $trail) { + $trail->parent('penilai.show'); + $trail->push('Standard'); + }); + + Breadcrumbs::for('penilai.sederhana', function (BreadcrumbTrail $trail) { + $trail->parent('penilai.show'); + $trail->push('Sederhana'); + }); + + Breadcrumbs::for('penilai.memo', function (BreadcrumbTrail $trail) { + $trail->parent('penilai.show'); + $trail->push('Memo'); + }); + + Breadcrumbs::for('penilai.resume', function (BreadcrumbTrail $trail) { + $trail->parent('penilai.show'); + $trail->push('Resume'); + }); + Breadcrumbs::for('penilai.lampiran', function (BreadcrumbTrail $trail) { - $trail->parent('penilai'); + $trail->parent('penilai.show'); $trail->push('Lampiran Foto dan Dokument'); }); + Breadcrumbs::for('penilai.paparan', function (BreadcrumbTrail $trail) { + $trail->parent('penilai.show'); + $trail->push('Paparan'); + }); + Breadcrumbs::for('sla', function (BreadcrumbTrail $trail) { $trail->parent('basicdata');