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', () => {