From 5fb2a5df0abea9bf27878b9d99457734cb9a191c Mon Sep 17 00:00:00 2001 From: JokoPrasetio Date: Fri, 6 Feb 2026 13:16:49 +0700 Subject: [PATCH] next -> persentasi --- app/Http/Controllers/DashboardController.php | 31 +++++++++++++++++-- public/js/pengajuanFile/index.js | 4 +-- resources/views/dataUmum/index.blade.php | 4 +-- .../views/dataUmum/modal/create.blade.php | 4 +-- resources/views/dataUnit/index.blade.php | 4 +-- .../views/dataUnit/modal/create.blade.php | 4 +-- .../views/pengajuanFile/modal/edit.blade.php | 4 +-- 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 42b7dce..07f1843 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -211,7 +211,7 @@ class DashboardController extends Controller $query = FileDirectory::where('statusenabled', true) ->where('status_action', 'approved') ->whereIn('id_unit_kerja', $unitIds) - ->orderBy('entry_at', 'desc'); + ->orderBy('master_kategori_directory_id', 'desc'); $rows = $query->get(); @@ -1144,13 +1144,38 @@ class DashboardController extends Controller } public function dataPdfV2($id){ - $data = FileDirectory::where('file_directory_id', $id)->first(); - return view('pdf.index', compact('id'), compact('data')); + // dd(auth()->user()->dataUser->mappingUnitKerjaPegawai->pluck('objectunitkerjapegawaifk')); + $file = FileDirectory::findOrFail($id); + // kalau file umum → bebas akses + if ($file->permission_file === true) { + return view('pdf.index', [ + 'id' => $id, + 'data' => $file + ]); + } + $userUnitIds = auth()->user() + ->dataUser + ->mappingUnitKerjaPegawai + ->pluck('objectunitkerjapegawaifk'); + + // cek apakah unit file termasuk unit user + if ($userUnitIds->contains($file->id_unit_kerja)) { + return view('pdf.index', [ + 'id' => $id, + 'data' => $file + ]); + } + abort(403, 'Anda tidak memiliki akses ke dokumen ini'); + // $akses = FileDirectory::findOrFail($id); + // dd($akses->where('permission_file', false)->first()); + // $data = FileDirectory::where('file_directory_id', $id)->first(); + // return view('pdf.index', compact('id'), compact('data')); } public function dataPdf($fileDirectoryId) { $data = FileDirectory::where('file_directory_id', $fileDirectoryId)->first(); + if (!$data) { abort(404, 'PDF Tidak ditemukan'); } diff --git a/public/js/pengajuanFile/index.js b/public/js/pengajuanFile/index.js index a246db7..e867025 100644 --- a/public/js/pengajuanFile/index.js +++ b/public/js/pengajuanFile/index.js @@ -684,11 +684,11 @@ document.addEventListener('DOMContentLoaded', () => {
- + + placeholder="Contoh: Panduan Mencuci Tangan" required>
diff --git a/resources/views/dataUmum/index.blade.php b/resources/views/dataUmum/index.blade.php index bbf255f..c0c4d9e 100644 --- a/resources/views/dataUmum/index.blade.php +++ b/resources/views/dataUmum/index.blade.php @@ -742,10 +742,10 @@
- + + placeholder="Contoh: 001/RS/IT/I/2026" required>
diff --git a/resources/views/dataUmum/modal/create.blade.php b/resources/views/dataUmum/modal/create.blade.php index 7ff649f..e1caf0c 100644 --- a/resources/views/dataUmum/modal/create.blade.php +++ b/resources/views/dataUmum/modal/create.blade.php @@ -50,8 +50,8 @@
- - + +
diff --git a/resources/views/dataUnit/index.blade.php b/resources/views/dataUnit/index.blade.php index 29377bc..3a82c54 100644 --- a/resources/views/dataUnit/index.blade.php +++ b/resources/views/dataUnit/index.blade.php @@ -720,11 +720,11 @@
- + + placeholder="Contoh: Panduan Mencuci Tangan" required>
diff --git a/resources/views/dataUnit/modal/create.blade.php b/resources/views/dataUnit/modal/create.blade.php index effcccd..ea5e2ab 100644 --- a/resources/views/dataUnit/modal/create.blade.php +++ b/resources/views/dataUnit/modal/create.blade.php @@ -50,8 +50,8 @@
- - + +
diff --git a/resources/views/pengajuanFile/modal/edit.blade.php b/resources/views/pengajuanFile/modal/edit.blade.php index e5c7a44..bbe8d1a 100644 --- a/resources/views/pengajuanFile/modal/edit.blade.php +++ b/resources/views/pengajuanFile/modal/edit.blade.php @@ -48,8 +48,8 @@
- - + +
-- 2.47.2