From f81cdbb50d8a79b749d4514533a972432843ea13 Mon Sep 17 00:00:00 2001 From: majid Date: Fri, 9 May 2025 14:32:48 +0700 Subject: [PATCH] Updates user data and improves UI components Updates user data display across multiple views to handle migrated data. Improves UI components by adding a detail location component and refining print layouts. Also, it fixes minor bugs and enhances data presentation in reports and forms. --- ...PenilaianJaminanInternalExternalExport.php | 6 +-- resources/views/activity/index.blade.php | 14 +++---- .../views/component/detail-lokasi.blade.php | 24 +++++++++++ .../component/print-out-dokument.blade.php | 41 ++++--------------- .../laporan-penilai-jaminan/index.blade.php | 4 +- .../components/analisa/fakta.blade.php | 6 +-- .../views/penilai/components/footer.blade.php | 4 +- .../components/print-out-sederhana.blade.php | 26 ++++++++++-- .../components/print-out-standar.blade.php | 31 +++++++++++--- resources/views/permohonan/index.blade.php | 10 ++--- .../components/print-out/main.blade.php | 26 ++++++++++++ 11 files changed, 129 insertions(+), 63 deletions(-) create mode 100644 resources/views/component/detail-lokasi.blade.php diff --git a/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php b/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php index 0784786..0926097 100644 --- a/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php +++ b/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php @@ -97,11 +97,11 @@ class LaporanHasilPenilaianJaminanInternalExternalExport implements FromCollecti $permohonan->nomor_registrasi, $permohonan->tanggal_permohonan ?? '', $permohonan->debiture->branch->name ?? '', - $permohonan->creator->name ?? '', + $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '', $permohonan->debiture->cif ?? '', $permohonan->debiture->name ?? '', - $permohonan->jenisPenilaian->name ?? '', $permohonan->tujuanPenilaian->name, + $permohonan->jenisPenilaian->name ?? '', $permohonan->jenisFasilitasKredit->name, $permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '), $permohonan->documents->map(function ($document) { @@ -139,7 +139,7 @@ class LaporanHasilPenilaianJaminanInternalExternalExport implements FromCollecti ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '', $permohonan->penilaian->_user_penilai->userPenilaiTeam->name ?? '', - $permohonan->penilaian->teams ?? '', + $permohonan->approveSo->name ?? '', '', // saran '' // catatan ]; diff --git a/resources/views/activity/index.blade.php b/resources/views/activity/index.blade.php index eda029b..571b58b 100644 --- a/resources/views/activity/index.blade.php +++ b/resources/views/activity/index.blade.php @@ -208,11 +208,11 @@ title: 'Tanggal Permohonan' }, user_id: { - title: 'User Pemohon', - render: (item, data) => { - return data.user && data.user.name ? `${data.user.name}` : '-'; - }, - }, + title: 'User Pemohon', + render: (item, data) => { + return data?.user?.name ?? data?.mig_nama_ao ?? '-'; + }}, + branch_id: { title: 'Cabang Pemohon', @@ -264,7 +264,7 @@ title: 'Action', render: (item, data) => { const status = data.status; // Anggap status berada di dalam objek data - const dokumenjaminan = data.dokumenjaminan || []; + const dokumenjaminan = data.dokumenjaminan || []; return `
@@ -287,7 +287,7 @@ }, } - + }; let dataTable = new KTDataTable(element, dataTableOptions); diff --git a/resources/views/component/detail-lokasi.blade.php b/resources/views/component/detail-lokasi.blade.php new file mode 100644 index 0000000..ddfa002 --- /dev/null +++ b/resources/views/component/detail-lokasi.blade.php @@ -0,0 +1,24 @@ +@if (is_array($details) && count($details) > 0) + @foreach ($details as $value) + @foreach ($value as $key => $item) + @if (!empty($item)) + + + {{ formatLabel($key) }} + + : + + @if (strpos(strtolower($key), 'tanggal') !== false) + {{ formatTanggalIndonesia($item) }} + @else + {{ $item }} + @if ($key == 'luas_bangunan' || $key == 'luas_tanah') + m² + @endif + @endif + + + @endif + @endforeach + @endforeach +@endif diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php index 1b7848a..ad76e50 100644 --- a/resources/views/component/print-out-dokument.blade.php +++ b/resources/views/component/print-out-dokument.blade.php @@ -1,41 +1,16 @@ @if (@isset($dokumen)) @foreach ($dokumen->detail as $detail) - @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) + {{-- @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) {{ $detail->name ?? '' }} - @endif - - @if (isset($detail->details)) - @php - $details = json_decode($detail->details, true); - @endphp - - @if (is_array($details) && count($details) > 0) - @foreach ($details as $value) - @if (is_array($value)) - @foreach ($value as $key => $item) - @if (!empty($item)) - - - {{ formatLabel($key) }} - - : - - @if (strpos(strtolower($key), 'tanggal') !== false) - {{ formatTanggalIndonesia($item) }} - @else - {{ $item }} - @if ($key == 'luas_bangunan' || $key == 'luas_tanah') - m² - @endif - @endif - - - @endif - @endforeach - @endif - @endforeach + @endif --}} + @if ($detail->name != 'LOKASI JAMINAN') + @if (isset($detail->details)) + @php + $details = json_decode($detail->details, true); + @endphp + @include('lpj::component.detail-lokasi', ['details' => $details]) @endif @endif @endforeach diff --git a/resources/views/laporan-penilai-jaminan/index.blade.php b/resources/views/laporan-penilai-jaminan/index.blade.php index c378220..0803266 100644 --- a/resources/views/laporan-penilai-jaminan/index.blade.php +++ b/resources/views/laporan-penilai-jaminan/index.blade.php @@ -245,8 +245,8 @@ user_id: { title: 'User Pemohon', render: (item, data) => { - return data.user && data.user.name ? `${data.user.name}` : '-'; - }, + return data?.user?.name ?? data?.mig_nama_ao ?? '-'; + } }, debitur_id: { title: 'Debitur', diff --git a/resources/views/penilai/components/analisa/fakta.blade.php b/resources/views/penilai/components/analisa/fakta.blade.php index c9088cb..b5d4add 100644 --- a/resources/views/penilai/components/analisa/fakta.blade.php +++ b/resources/views/penilai/components/analisa/fakta.blade.php @@ -1,4 +1,4 @@ -
+{{--
--}} @endif - @if (!empty($forminspeksi['fakta']['batas_batas_input'])) + @if (!empty($forminspeksi['fakta']['batas_batas_input']) && count($forminspeksi['fakta']['batas_batas_input']) > 0) @@ -103,4 +103,4 @@
@@ -63,7 +63,7 @@
Batas batas :
-
+{{--
--}} diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php index d1fa89e..6565c5a 100644 --- a/resources/views/penilai/components/footer.blade.php +++ b/resources/views/penilai/components/footer.blade.php @@ -19,6 +19,7 @@ + @if ($inspeksi->is_mig != 1)
@@ -79,9 +80,8 @@ @endforeach
- -
+ @endif + @if ($permohonan->is_mig == 1) + {{--
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 656e7d8..ed0172f 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -142,6 +142,25 @@ {{ $permohonan->tujuanPenilaian->name ?? '' }}
--}} + @if (@isset($dokumen)) + @foreach ($dokumen->detail as $detail) + @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) + + + + @endif + + @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN') + @php + $details = json_decode($detail->details, true); + @endphp + @include('lpj::component.detail-lokasi', ['details' => $details]) + @endif + @endforeach + @endif + @else @@ -168,6 +187,7 @@ + @endif @include('lpj::component.print-out-dokument') @if (isset($forminspeksi['asset']['nomor_nib'])) @@ -1021,7 +1041,7 @@ @if ($permohonan->approval_so != null) - +
{{ $detail->name ?? '' }}
Terletak di :{{ $alamat['province_code'] ?? '' }}
- {{ $senior_officer->name ?? '' }}
+ {{ $soUser->name ?? '' }}
{{ ucwords(strtolower('SENIOR OFFICER')) }} @@ -1031,7 +1051,7 @@ @if ($permohonan->approval_eo != null) 		- {{ User::role('EO Appraisal')->first()->name ?? '' }}
+ {{ $eoUser->name ?? '' }}
{{ ucwords(strtolower('EXECUTIVE OFFICER')) }} @@ -1039,7 +1059,7 @@ @endif @if ($permohonan->approval_dd != null) 		- {{ User::role('DD Appraisal')->first()->name ?? '' }}
+ {{ $ddUser->name ?? '' }}
{{ ucwords(strtolower('DEPUTY DIRECTOR')) }} diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 0e4172c..3d1e140 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -64,7 +64,7 @@
Ao :{{ $permohonan->user->name ?? '' }}{{ $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '' }}
@@ -106,7 +106,7 @@ Debitur / Wakil Debitur : - {{ $permohonan->debiture->name ?? '' }} + {{ $forminspeksi['asset']['debitur_perwakilan'] ??$permohonan->debiture->name ?? '' }} @@ -126,6 +126,26 @@ + @if ($permohonan->is_mig == 1) + + @if (@isset($dokumen)) + @foreach ($dokumen->detail as $detail) + @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) + + + + @endif + + @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN') + @php + $details = json_decode($detail->details, true); + @endphp + @include('lpj::component.detail-lokasi', ['details' => $details]) + @endif + @endforeach + @endif +
{{ $detail->name ?? '' }}
+ @else @@ -153,6 +173,7 @@
Terletak di{{ $alamat['province_code'] ?? '' }}
+ @endif {{--
--}} @@ -437,7 +458,7 @@ @if ($permohonan->approval_so != null) - {{ $senior_officer->name ?? '' }}
+ {{ $soUser->name ?? '' }}
{{ ucwords(strtolower('SENIOR OFFICER')) }} @@ -447,7 +468,7 @@ @if ($permohonan->approval_eo != null) - {{ User::role('EO Appraisal')->first()->name ?? '' }}
+ {{ $eoUser->name ?? '' }}
{{ ucwords(strtolower('EXECUTIVE OFFICER')) }} @@ -455,7 +476,7 @@ @endif @if ($permohonan->approval_dd != null) - {{ User::role('DD Appraisal')->first()->name ?? '' }}
+ {{ $ddUser->name ?? '' }}
{{ ucwords(strtolower('DEPUTY DIRECTOR')) }} diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php index f6df6be..c17f56a 100644 --- a/resources/views/permohonan/index.blade.php +++ b/resources/views/permohonan/index.blade.php @@ -155,11 +155,11 @@ }, }, user_id: { - title: 'User Pemohon', - render: (item, data) => { - return `${data?.user?.name || '-'}`; - }, - }, + title: 'User Pemohon', + render: (item, data) => { + return data?.user?.name ?? data?.mig_nama_ao ?? '-'; + }}, + branch_id: { title: 'Cabang Pemohon', render: (item, data) => { diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index d224a9f..1396e69 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -343,10 +343,34 @@ + + Alamat : + + + @if ($permohonan->is_mig == 1) + + @if (@isset($dokumen)) + @foreach ($dokumen->detail as $detail) + @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan)) + + + + @endif + + @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN') + @php + $details = json_decode($detail->details, true); + @endphp + @include('lpj::component.detail-lokasi', ['details' => $details]) + @endif + @endforeach + @endif +
{{ $detail->name ?? '' }}
+ @else @@ -369,8 +393,10 @@
Terletak di{{ $alamat['province_code'] ?? '' }}
+ @endif +