fix: resolve client-side table search limitation across all 7 paginated views with global server search and per-page selector
This commit is contained in:
@@ -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', '!=', '')
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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'));
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user