davidl/asset-management-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply settings-driven pagination/QR behavior and update landing/menu routes

Browse Source
This commit is contained in:
Arya Dwi Putra
2025-12-02 08:30:09 +07:00
parent 82d55313fc
commit 556985f35f
6 changed files with 77 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/ReportController.php
View File

@@ -40,7 +40,7 @@ class ReportController extends Controller
->when($filters['person_in_charge_id'] ?? null, fn($q, $v) => $q->where('person_in_charge_id', $v))
->when($filters['warranty_id'] ?? null, fn($q, $v) => $q->where('warranty_id', $v));
$assets = $query->paginate(20)->withQueryString();
$assets = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString();
if ($request->get('export') === 'excel') {
$assetsCollection = $query->get();
@@ -150,7 +150,7 @@ class ReportController extends Controller
->when($filters['department_id'] ?? null, fn($q, $v) => $q->where('to_department_id', $v))
->when($filters['asset_user_id'] ?? null, fn($q, $v) => $q->where('to_asset_user_id', $v));
$items = $query->paginate(20)->withQueryString();
$items = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString();
if ($request->get('export') === 'excel') {
$rows = $query->get()->map(fn($m) => [
@@ -196,7 +196,7 @@ class ReportController extends Controller
$v === 'reversed' ? $q->whereNotNull('reversed_at') : $q->whereNull('reversed_at');
});
$items = $query->paginate(20)->withQueryString();
$items = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString();
if ($request->get('export') === 'excel') {
$rows = $query->get()->map(fn($d) => [
@@ -234,7 +234,7 @@ class ReportController extends Controller
->when($filters['status'] ?? null, fn($q, $v) => $q->where('status', $v))
->when($filters['location_id'] ?? null, fn($q, $v) => $q->where('location_id', $v));
$items = $query->paginate(20)->withQueryString();
$items = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString();
if ($request->get('export') === 'excel') {
$rows = $query->get()->map(fn($a) => [