From 3d7da22ac03285f4f2ca381fe015f68a3556e2c0 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 26 Feb 2025 06:27:39 +0700 Subject: [PATCH] fix(penilai): perbaikan lpj standart dan sederhana --- app/Http/Controllers/PenilaiController.php | 7 +- .../views/component/form-penilai.blade.php | 473 +----------------- .../surveyor/components/header.blade.php | 20 +- 3 files changed, 23 insertions(+), 477 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 37c2bf9..d2de8f5 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -82,6 +82,7 @@ class PenilaiController extends Controller $inspeksiId = $request->query('inspeksiId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); + $provinces = Province::all(); $noLpSederhana = $this->generateNoLaporan($permohonan, $documentId, 'lpj'); @@ -107,7 +108,7 @@ class PenilaiController extends Controller $lpjData = json_decode($lpj->lpj, true); } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData')); + return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces')); } public function standard(Request $request, $id) @@ -121,7 +122,7 @@ class PenilaiController extends Controller $basicData = $this->surveyorController->getCommonData(); $noLpSederhana = $this->generateNoLaporan($permohonan, $documentId, 'lpj'); - + $provinces = Province::all(); $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first(); $lpj = Penilai::updateOrCreate( [ @@ -144,7 +145,7 @@ class PenilaiController extends Controller $lpjData = json_decode($lpj->lpj, true); } - return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData')); + return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces')); } public function resume(Request $request) diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 9629021..0866ddd 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -1,343 +1,6 @@ -
-
- - - - @if (isset($forminspeksi['asset']['debitur_perwakilan']) && !empty($forminspeksi['asset']['debitur_perwakilan'])) -
- @foreach ($forminspeksi['asset']['debitur_perwakilan'] as $key => $item) -
- - -
- @endforeach -
- @else -
-
- - -
-
- @endif - - - -
- - -
- -
-
- -
-
-
-
-
-

Nama Cadeb/Debitur

-
-
- - -
-
- -
- @if (isset($permohonan->debiture)) -

{{ $permohonan->debiture->name }}

- @endif -
-
-
-
-
- - -
-
-

Deskripsi Aset jaminan

-
-
-
-
- -
-
- @if (isset($permohonan->documents)) - @foreach ($permohonan->documents as $item) -

{{ $item->jenisJaminan->name }}

- - @endforeach - @endif -
-
-
- - - - @php - $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai']) - ? 'sesuai' - : 'tidak sesuai'; - $selectedValue = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null; - @endphp -
- - {{-- --}} -
-
- -
- -
-
- -
- -
- - - {{ formatAlamat($permohonan->debiture) }} - - - -
-
- - -
- - -
- - @php - $statusKey = isset($forminspeksi['asset']['alamat']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $address = $forminspeksi['asset']['alamat'][$statusKey] ?? null; - - @endphp - - -
-
- - -
-
-
- - -
-
-

Titik Koordinat Google Maps

-
-
-
- -
-
- - -
- - Ambil - Koordinat - - Ke google Maps -
-
-
-
- -
-
-

Status

-
-
- -
-
-

Hubungan cadeb/debitur dengan Pemilik Jaminan -

-
- -
- -
-
- @foreach ($permohonan->documents as $dokumen) - @php - $hubCadebPemilik = $dokumen->pemilik->hubungan_pemilik->name ?? 'N/A'; - @endphp - {{ $hubCadebPemilik }} - - - @endforeach -
- -
-
- - - - @php - $statusKey = isset($forminspeksi['asset']['hub_cadeb']['sesuai']) - ? 'sesuai' - : 'tidak sesuai'; - $selectedData = $forminspeksi['asset']['hub_cadeb'][$statusKey] ?? null; - @endphp - - - -
- -
-
-
- -
- -
-
-

Hubungan Cadeb/Debitur dengan Penghuni Jaminan -

-
- - -
-
- -
- -
-
- - - - @php - $statusKey = isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']) - ? 'sesuai' - : 'tidak sesuai'; - $selectedData = - $forminspeksi['asset']['hub_cadeb_penghuni'][$statusKey] ?? null; - @endphp - - - -
- -
-
-
-
-
- -
-
-
-
+ {{--

@@ -412,135 +75,7 @@

-
- -
-
-

- Identitas Cadeb/Debitur -

-
-
- -
- -
- - @if (isset($permohonan->debiture)) -

{{ $permohonan->debiture->name }}

- @endif - -
-
- -
- -
- - {{ $forminspeksi['asset']['debitur_perwakilan'][0] ?? '' }} - -
-
- -
- -
- {{ $forminspeksi['asset']['pihak_bank'] ?? '' }} -
-
- -
-
- - -
-
-

- Deskripsi dan Alamat Aset -

-
-
-
- - @php - $statusKey = isset($forminspeksi['asset']['jenis_asset']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $selectedValue = $forminspeksi['asset']['jenis_asset'][$statusKey] ?? null; - @endphp -
- {{ $selectedValue }} -
-
- -
- @php - $statusKey = isset($forminspeksi['asset']['alamat']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $selectedValue = $forminspeksi['asset']['alamat'][$statusKey] ?? null; - @endphp - -
- {{ $selectedValue['address'] ?? '' }} -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
-
- -
-
-

- dokumen -

-
-
- @include('lpj::component.detail-jaminan', ['status' => true]) -
-
- -
-
-

- Hubungan Cadeb/Debitur dengan pemilik dan penghuni -

-
- @php - $statusKey = isset($forminspeksi['asset']['hub_cadeb']['sesuai']) ? 'sesuai' : 'tidak sesuai'; - $selectedData = $forminspeksi['asset']['hub_cadeb'][$statusKey] ?? null; - @endphp -
-
-
- +
--}} @foreach ($permohonan->documents as $dokumen) @@ -558,6 +93,10 @@ + @if (array_intersect($kategoriUnik, ['tanah', 'bangunan', 'apartemen-kantor'])) + @include('lpj::surveyor.components.header') + @endif + @foreach ($kategoriUnik as $kategori) {{-- Tampilkan komponen sesuai kategori --}} @include('lpj::surveyor.components.' . str_replace('-', '-', $kategori), [ diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index cd14ecb..d500571 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -8,14 +8,13 @@
@php - use Illuminate\Support\Facades\Route; - @endphp + use Illuminate\Support\Facades\Route; + @endphp @if (isset($id)) Back @else - @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) && Route::currentRouteName('otorisator.show')) Back @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show')) - - Back - + @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan')) + + Back + + @else + + Back + + @endif @endif @endif {{-- @@ -283,7 +288,8 @@
-