From e34f5f67f5be11ef76822f5c103f788dfb0527c3 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 17 Mar 2025 13:25:47 +0700 Subject: [PATCH 01/12] feat(laporanAdminKredit): perbarui logika pengolahan data permohonan - Tambahkan variabel npw untuk menyimpan nilai pasar wajar. - Modifikasi pengambilan nama jenis legalitas jaminan untuk menyertakan nomor dokumen jika tersedia. --- app/Http/Controllers/LaporanAdminKreditController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/LaporanAdminKreditController.php b/app/Http/Controllers/LaporanAdminKreditController.php index 7656461..d62ce28 100644 --- a/app/Http/Controllers/LaporanAdminKreditController.php +++ b/app/Http/Controllers/LaporanAdminKreditController.php @@ -21,6 +21,7 @@ { $permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->where(['status'=>'done'])->get(); foreach($permohonan as $_permohonan){ + $npw = 0; if(isset($_permohonan->penilai->lpj)){ $npw = json_decode($_permohonan->penilai->lpj, true); $npw = $npw['total_nilai_pasar_wajar'] ?? 0; @@ -38,7 +39,9 @@ 'nilai_pasar_wajar' => str_replace('.', '', $npw), 'bukti_kepemilikan' => $_permohonan->documents->flatMap(function ($document) { return $document->detail->map(function ($detail) { - return $detail->jenisLegalitasJaminan->name ?? null; + return (!empty($detail->dokumen_nomor) && is_array($detail->dokumen_nomor)) + ? ($detail->jenisLegalitasJaminan->name ?? '') . "\n" . implode(', ', $detail->dokumen_nomor) + : null; }); })->filter()->unique()->implode(', '), ]; From 5c00c22b5e30d88ac9816758d83c8602bc699006 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 17 Mar 2025 14:27:09 +0700 Subject: [PATCH 02/12] feat(spk): hapus pemanggilan script SweetAlert2 - Menghapus pemanggilan script SweetAlert2 dari view SPK. - Memastikan tidak ada ketergantungan yang tidak perlu pada library eksternal. --- resources/views/spk/view.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/spk/view.blade.php b/resources/views/spk/view.blade.php index 1a81ab3..57ae0f2 100644 --- a/resources/views/spk/view.blade.php +++ b/resources/views/spk/view.blade.php @@ -142,7 +142,6 @@ @endsection @push('scripts') - + +@endpush From 047e543d8d09510769014a72d156116eedb6fbe8 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 18 Mar 2025 07:25:27 +0700 Subject: [PATCH 10/12] feat(bank-data): tambahkan info window untuk marker peta - Menambahkan array untuk menyimpan info window. - Membuat konten info window yang menampilkan detail aset. - Menambahkan event listener untuk marker agar info window terbuka saat marker diklik. - Menutup semua info window yang terbuka saat marker baru diklik. --- resources/views/bank-data/index.blade.php | 33 ++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/resources/views/bank-data/index.blade.php b/resources/views/bank-data/index.blade.php index 992a893..dc6b59b 100644 --- a/resources/views/bank-data/index.blade.php +++ b/resources/views/bank-data/index.blade.php @@ -173,6 +173,7 @@ +@endpush diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index ef77526..715c088 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -673,55 +673,58 @@ Breadcrumbs::for('noc', function (BreadcrumbTrail $trail) { $trail->push('NOC', route('noc.index')); }); - Breadcrumbs::for('noc.edit', function (BreadcrumbTrail $trail) { - $trail->parent('noc'); - $trail->push('Proses NOC'); - }); +Breadcrumbs::for('noc.edit', function (BreadcrumbTrail $trail) { + $trail->parent('noc'); + $trail->push('Proses NOC'); +}); - Breadcrumbs::for('laporan-external', function (BreadcrumbTrail $trail) { - $trail->push('Laporan External', route('laporan-external.index')); - }); +Breadcrumbs::for('laporan-external', function (BreadcrumbTrail $trail) { + $trail->push('Laporan External', route('laporan-external.index')); +}); - Breadcrumbs::for('laporan-external.show', function (BreadcrumbTrail $trail) { - $trail->parent('laporan-external'); - $trail->push('Show Laporan External'); - }); +Breadcrumbs::for('laporan-external.show', function (BreadcrumbTrail $trail) { + $trail->parent('laporan-external'); + $trail->push('Show Laporan External'); +}); - Breadcrumbs::for('laporan-external.create', function (BreadcrumbTrail $trail) { - $trail->parent('laporan-external'); - $trail->push('Tambah Laporan External', route('laporan-external.create')); - }); +Breadcrumbs::for('laporan-external.create', function (BreadcrumbTrail $trail) { + $trail->parent('laporan-external'); + $trail->push('Tambah Laporan External', route('laporan-external.create')); +}); - Breadcrumbs::for('laporan-external.edit', function (BreadcrumbTrail $trail) { - $trail->parent('laporan-external'); - $trail->push('Data Laporan External'); - }); +Breadcrumbs::for('laporan-external.edit', function (BreadcrumbTrail $trail) { + $trail->parent('laporan-external'); + $trail->push('Data Laporan External'); +}); - Breadcrumbs::for('basicdata.jenis-lampiran', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Jenis Lampiran', route('basicdata.jenis-lampiran.index')); - }); +Breadcrumbs::for('basicdata.jenis-lampiran', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Jenis Lampiran', route('basicdata.jenis-lampiran.index')); +}); - Breadcrumbs::for('basicdata.jenis-lampiran.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-lampiran'); - $trail->push('Tambah Jenis Lampiran', route('basicdata.jenis-lampiran.create')); - }); +Breadcrumbs::for('basicdata.jenis-lampiran.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-lampiran'); + $trail->push('Tambah Jenis Lampiran', route('basicdata.jenis-lampiran.create')); +}); - Breadcrumbs::for('basicdata.jenis-lampiran.edit', function (BreadcrumbTrail $trail, $id) { - $trail->parent('basicdata.jenis-lampiran'); - $trail->push('Edit Jenis Lampiran', route('basicdata.jenis-lampiran.edit', $id)); - }); +Breadcrumbs::for('basicdata.jenis-lampiran.edit', function (BreadcrumbTrail $trail, $id) { + $trail->parent('basicdata.jenis-lampiran'); + $trail->push('Edit Jenis Lampiran', route('basicdata.jenis-lampiran.edit', $id)); +}); - // Laporan Admin Kredit - Breadcrumbs::for('laporan-admin-kredit', function ($trail) { - $trail->push('Laporan Admin Kredit', route('laporan-admin-kredit.index')); - }); +// Laporan Admin Kredit +Breadcrumbs::for('laporan-admin-kredit', function ($trail) { + $trail->push('Laporan Admin Kredit', route('laporan-admin-kredit.index')); +}); - Breadcrumbs::for('bank-data', function ($trail) { - $trail->push('Bank Data', route('bank-data.index')); - }); +Breadcrumbs::for('bank-data', function ($trail) { + $trail->push('Bank Data', route('bank-data.index')); +}); +Breadcrumbs::for('laporan-penilai-jaminan', function ($trail) { + $trail->push('Laporan Penilai Jaminan', route('laporan-penilai-jaminan.index')); +}); // add andy require __DIR__ . '/breadcrumbs_registrasi.php'; diff --git a/routes/web.php b/routes/web.php index b6df375..a315769 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,8 +3,8 @@ use Illuminate\Support\Facades\Route; use Modules\Lpj\Http\Controllers\ActivityController; use Modules\Lpj\Http\Controllers\ArahMataAnginController; - use Modules\Lpj\Http\Controllers\BankDataController; - use Modules\Lpj\Http\Controllers\CustomFieldController; +use Modules\Lpj\Http\Controllers\BankDataController; +use Modules\Lpj\Http\Controllers\CustomFieldController; use Modules\Lpj\Http\Controllers\DebitureController; use Modules\Lpj\Http\Controllers\DokumenJaminanController; use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController; @@ -13,16 +13,16 @@ use Modules\Lpj\Http\Controllers\IjinUsahaController; use Modules\Lpj\Http\Controllers\JenisDokumenController; use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController; use Modules\Lpj\Http\Controllers\JenisJaminanController; - use Modules\Lpj\Http\Controllers\JenisLampiranController; - use Modules\Lpj\Http\Controllers\JenisLaporanController; +use Modules\Lpj\Http\Controllers\JenisLampiranController; +use Modules\Lpj\Http\Controllers\JenisLaporanController; use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController; use Modules\Lpj\Http\Controllers\JenisPenilaianController; use Modules\Lpj\Http\Controllers\KJPPController; - use Modules\Lpj\Http\Controllers\LampiranDokumenController; - use Modules\Lpj\Http\Controllers\LaporanAdminKreditController; - use Modules\Lpj\Http\Controllers\LaporanController; - use Modules\Lpj\Http\Controllers\LaporanExternalController; - use Modules\Lpj\Http\Controllers\NilaiPlafondController; +use Modules\Lpj\Http\Controllers\LampiranDokumenController; +use Modules\Lpj\Http\Controllers\LaporanAdminKreditController; +use Modules\Lpj\Http\Controllers\LaporanController; +use Modules\Lpj\Http\Controllers\LaporanExternalController; +use Modules\Lpj\Http\Controllers\NilaiPlafondController; use Modules\Lpj\Http\Controllers\NocController; use Modules\Lpj\Http\Controllers\PembatalanController; use Modules\Lpj\Http\Controllers\PemilikJaminanController; @@ -39,6 +39,7 @@ use Modules\Lpj\Http\Controllers\TeamsController; use Modules\Lpj\Http\Controllers\TenderController; use Modules\Lpj\Http\Controllers\TujuanPenilaianController; use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController; +use Modules\Lpj\Http\Controllers\LaporanPenilaiJaminanController; // use Modules\Lpj\Http\Controllers\ActivityController; @@ -667,11 +668,17 @@ Route::middleware(['auth'])->group(function () { }); Route::name('bank-data.')->prefix('bank-data')->group(function () { - Route::get('datatables', [BankDataController::class, 'dataForDatatables'])->name('datatables'); + Route::get('datatables', [BankDataController::class, 'dataForDatatables'])->name('datatables'); }); Route::resource('bank-data', BankDataController::class); + Route::name('laporan-penilai-jaminan.')->prefix('laporan-penilai-jaminan')->group(function () { + Route::get('/', [LaporanPenilaiJaminanController::class, 'index'])->name('index'); + Route::get('datatables', [LaporanPenilaiJaminanController::class, 'dataForDatatables'])->name('datatables'); + Route::get('export', [LaporanPenilaiJaminanController::class, 'export'])->name('export'); + }); + }); require __DIR__ . '/registrasi.php';