From 2b5556410d427b7841843424b118cfa0b1db3b1e Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Fri, 19 Sep 2025 09:10:06 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20refactor(laporan):=20kontrol=20a?= =?UTF-8?q?kses=20role,=20optimasi=20query,=20dan=20perbaikan=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Tambah role `pemohon-ao` & `pemohon-eo` untuk upload lampiran di LampiranDokumen.php - Implementasi kontrol akses role di lampiran-dokumen.blade.php & laporan/index.blade.php (logika khusus nilai_liquidasi) - Modifikasi query di LaporanController.php: hapus filter approval_eo_at & optimasi kondisi WHERE - Perbaikan formatting query dengan indentasi lebih rapi & maintainable - Standardisasi urutan class CSS di beberapa Blade (activity/index, penilaian/otorisator/index-sla & index) - Pisahkan logika generateLaporanButton jadi function terpisah di laporan/index.blade.php - Perbaikan tampilan tombol laporan berbasis role + cleanup baris kosong & indentasi - Konsistensi UI/UX: responsive design lebih baik, interface clean & styling konsisten dengan Tailwind - Tingkatkan security & maintainability: granular role access, query lebih efisien, code lebih terstruktur --- app/Http/Controllers/LaporanController.php | 5 +- app/Models/LampiranDokumen.php | 2 +- resources/views/activity/index.blade.php | 46 +++++++++---------- .../component/lampiran-dokumen.blade.php | 2 +- resources/views/laporan/index.blade.php | 38 ++++++++------- .../penilaian/otorisator/index-sla.blade.php | 18 ++++---- .../penilaian/otorisator/index.blade.php | 18 ++++---- .../views/penilaian/paparan-so.blade.php | 10 ++-- .../surveyor/components/bangunan.blade.php | 2 +- 9 files changed, 74 insertions(+), 67 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 660176e..9c53df4 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -75,7 +75,10 @@ class LaporanController extends Controller } // Retrieve data from the database - $query = Permohonan::query()->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan'])->whereNotNull('approval_so_at')->whereNotNull('approval_eo_at')->where(function ($q) { + $query = Permohonan::query()->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan']) + ->whereNotNull('approval_so_at') + //->whereNotNull('approval_eo_at') + ->where(function ($q) { $q->whereIn('nilai_plafond_id', [1,4]) ->whereNotNull('approval_dd_at') ->orWhereIn('nilai_plafond_id', [2,3]); diff --git a/app/Models/LampiranDokumen.php b/app/Models/LampiranDokumen.php index 7a0654d..8e492cd 100644 --- a/app/Models/LampiranDokumen.php +++ b/app/Models/LampiranDokumen.php @@ -27,7 +27,7 @@ class LampiranDokumen extends Base { $user = Auth::user(); - if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin','surveyor'])) { + if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin','surveyor','pemohon-ao','pemohon-eo'])) { $file = $fileData['file']; $fileName = $fileData['nama_file'] ?? time() . '_' . $file->getClientOriginalName(); $filePath = $file->storeAs('lampiran_dokumen', $fileName, 'public'); diff --git a/resources/views/activity/index.blade.php b/resources/views/activity/index.blade.php index 2f8d2df..57cc962 100644 --- a/resources/views/activity/index.blade.php +++ b/resources/views/activity/index.blade.php @@ -43,15 +43,15 @@ } @endpush -
-
+
+
-
+
Activity
-
+
@@ -64,30 +64,30 @@