diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index 178b865..c95403d 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -143,7 +143,12 @@ class EmployeeController extends Controller */ public function index(Request $request): View { - $employees = $this->getFilteredEmployees($request)->paginate(20)->withQueryString(); + $perPage = (int) $request->input('per_page', 20); + if (!in_array($perPage, [20, 50, 100])) { + $perPage = 20; + } + + $employees = $this->getFilteredEmployees($request)->paginate($perPage)->withQueryString(); $employeeTypes = Employee::whereNotNull('employee_type') ->where('employee_type', '!=', '') diff --git a/app/Http/Controllers/Pg/VerificationLogController.php b/app/Http/Controllers/Pg/VerificationLogController.php index 6cc0eae..df26e2d 100644 --- a/app/Http/Controllers/Pg/VerificationLogController.php +++ b/app/Http/Controllers/Pg/VerificationLogController.php @@ -122,7 +122,12 @@ class VerificationLogController extends Controller */ public function index(Request $request): View { - $activities = $this->getVerificationLogsQuery($request)->paginate(20)->withQueryString(); + $perPage = (int) $request->input('per_page', 20); + if (!in_array($perPage, [20, 50, 100])) { + $perPage = 20; + } + + $activities = $this->getVerificationLogsQuery($request)->paginate($perPage)->withQueryString(); $gates = Gate::where('is_active', true)->orderBy('name')->get(); $guards = SecurityGuard::orderBy('name')->get(); diff --git a/app/Http/Controllers/Qma/ActivityLogController.php b/app/Http/Controllers/Qma/ActivityLogController.php index 8c71592..6fc01e9 100644 --- a/app/Http/Controllers/Qma/ActivityLogController.php +++ b/app/Http/Controllers/Qma/ActivityLogController.php @@ -105,7 +105,12 @@ class ActivityLogController extends Controller $startDate = $request->input('start_date', $today); $endDate = $request->input('end_date', $today); - $activities = $this->getFilteredActivityQuery($request)->paginate(20)->withQueryString(); + $perPage = (int) $request->input('per_page', 20); + if (!in_array($perPage, [20, 50, 100])) { + $perPage = 20; + } + + $activities = $this->getFilteredActivityQuery($request)->paginate($perPage)->withQueryString(); $gates = Gate::where('is_active', true)->orderBy('name')->get(); return view('qma.activity_log', compact('activities', 'gates', 'startDate', 'endDate')); diff --git a/app/Http/Controllers/Qma/P2hInspectionController.php b/app/Http/Controllers/Qma/P2hInspectionController.php index 2f2d7fa..a4976fe 100644 --- a/app/Http/Controllers/Qma/P2hInspectionController.php +++ b/app/Http/Controllers/Qma/P2hInspectionController.php @@ -58,7 +58,12 @@ class P2hInspectionController extends Controller */ public function index(Request $request): View { - $records = $this->getFilteredP2hQuery($request)->paginate(15)->withQueryString(); + $perPage = (int) $request->input('per_page', 15); + if (!in_array($perPage, [15, 50, 100])) { + $perPage = 15; + } + + $records = $this->getFilteredP2hQuery($request)->paginate($perPage)->withQueryString(); // Statistik Ringkasan P2H $totalP2h = P2hRecord::count(); diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index 28940af..9b74ee3 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -125,8 +125,13 @@ class SupportTimesheetController extends Controller // Jika user belum mengisi filter tanggal dan ingin semua, bisa dikosongkan. // Tapi default awal memuat hari ini agar cepat dan relevan. + $perPage = (int) $request->input('per_page', 15); + if (!in_array($perPage, [15, 50, 100])) { + $perPage = 15; + } + $query = $this->getFilteredQuery($request); - $timesheets = $query->paginate(15)->withQueryString(); + $timesheets = $query->paginate($perPage)->withQueryString(); // KPI Ringkasan Data Terfilter $statsQuery = clone $this->getFilteredQuery($request); diff --git a/app/Http/Controllers/Qma/VehicleController.php b/app/Http/Controllers/Qma/VehicleController.php index 9338557..799dd15 100644 --- a/app/Http/Controllers/Qma/VehicleController.php +++ b/app/Http/Controllers/Qma/VehicleController.php @@ -115,7 +115,12 @@ class VehicleController extends Controller */ public function indexLv(Request $request): View { - $vehicles = $this->getFilteredLvQuery($request)->paginate(15)->withQueryString(); + $perPage = (int) $request->input('per_page', 15); + if (!in_array($perPage, [15, 50, 100])) { + $perPage = 15; + } + + $vehicles = $this->getFilteredLvQuery($request)->paginate($perPage)->withQueryString(); // Statistik Ringkasan Khusus LV $totalLv = Vehicle::lightVehicles()->count(); @@ -303,7 +308,12 @@ class VehicleController extends Controller }); } - $vehicles = $query->orderBy('code')->paginate(15)->withQueryString(); + $perPage = (int) $request->input('per_page', 15); + if (!in_array($perPage, [15, 50, 100])) { + $perPage = 15; + } + + $vehicles = $query->orderBy('code')->paginate($perPage)->withQueryString(); // Statistik Ringkasan Khusus Heavy Equipment $totalSupport = Vehicle::unitSupportCategories()->count(); @@ -386,7 +396,12 @@ class VehicleController extends Controller }); } - $units = $query->paginate(15)->withQueryString(); + $perPage = (int) $request->input('per_page', 15); + if (!in_array($perPage, [15, 50, 100])) { + $perPage = 15; + } + + $units = $query->paginate($perPage)->withQueryString(); $totalUnits = $category->units()->count(); $totalOperation = $category->units()->where('status', 'Operation')->count(); diff --git a/resources/views/hse/employees_index.blade.php b/resources/views/hse/employees_index.blade.php index 82b95c7..96e1f83 100644 --- a/resources/views/hse/employees_index.blade.php +++ b/resources/views/hse/employees_index.blade.php @@ -71,7 +71,7 @@ -