From 55f1b01556f793cc2c7e08019240593be3101013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Mon, 28 Oct 2024 09:47:42 +0100 Subject: [PATCH] feat: selectable items per page in pagination --- .../Admin/Application/IndexController.php | 2 +- src/Controller/Admin/Log/IndexController.php | 2 +- .../Admin/System/Availability/IndexController.php | 2 +- .../Administrative/Assignment/IndexController.php | 2 +- .../Administrative/Document/IndexController.php | 2 +- .../Administrative/Feedback/IndexController.php | 2 +- .../System/Destination/IndexController.php | 2 +- .../System/Document/IndexController.php | 2 +- .../Administrative/Teamer/IndexController.php | 2 +- .../HouseManager/Feedback/IndexController.php | 2 +- templates/paginator/sliding.html.twig | 15 +++++++++++++-- 11 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/Controller/Admin/Application/IndexController.php b/src/Controller/Admin/Application/IndexController.php index 8cd3d25..66206b1 100644 --- a/src/Controller/Admin/Application/IndexController.php +++ b/src/Controller/Admin/Application/IndexController.php @@ -30,7 +30,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'destination.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Admin/Log/IndexController.php b/src/Controller/Admin/Log/IndexController.php index c5fee9d..71ecb5e 100644 --- a/src/Controller/Admin/Log/IndexController.php +++ b/src/Controller/Admin/Log/IndexController.php @@ -31,7 +31,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $qb, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'log.timestamp', 'defaultSortDirection' => 'DESC', diff --git a/src/Controller/Admin/System/Availability/IndexController.php b/src/Controller/Admin/System/Availability/IndexController.php index 179b302..ff5c0f7 100644 --- a/src/Controller/Admin/System/Availability/IndexController.php +++ b/src/Controller/Admin/System/Availability/IndexController.php @@ -30,7 +30,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'availability.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Administrative/Assignment/IndexController.php b/src/Controller/Administrative/Assignment/IndexController.php index 9ef9284..53e03e2 100644 --- a/src/Controller/Administrative/Assignment/IndexController.php +++ b/src/Controller/Administrative/Assignment/IndexController.php @@ -34,7 +34,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'destination.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Administrative/Document/IndexController.php b/src/Controller/Administrative/Document/IndexController.php index c0cf949..7afcf0c 100644 --- a/src/Controller/Administrative/Document/IndexController.php +++ b/src/Controller/Administrative/Document/IndexController.php @@ -34,7 +34,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10 + $request->query->getInt('limit', 10), ); return $this->render('administrative/document/index.html.twig', [ diff --git a/src/Controller/Administrative/Feedback/IndexController.php b/src/Controller/Administrative/Feedback/IndexController.php index 594b414..e5923a9 100644 --- a/src/Controller/Administrative/Feedback/IndexController.php +++ b/src/Controller/Administrative/Feedback/IndexController.php @@ -30,7 +30,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'feedback.createdAt', 'defaultSortDirection' => 'desc', diff --git a/src/Controller/Administrative/System/Destination/IndexController.php b/src/Controller/Administrative/System/Destination/IndexController.php index 3ee9024..69d89e1 100644 --- a/src/Controller/Administrative/System/Destination/IndexController.php +++ b/src/Controller/Administrative/System/Destination/IndexController.php @@ -30,7 +30,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'destination.dateFrom', 'defaultSortDirection' => 'desc', diff --git a/src/Controller/Administrative/System/Document/IndexController.php b/src/Controller/Administrative/System/Document/IndexController.php index 1220fce..e32b6ff 100644 --- a/src/Controller/Administrative/System/Document/IndexController.php +++ b/src/Controller/Administrative/System/Document/IndexController.php @@ -27,7 +27,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'upload.originalFilename', 'defaultSortDirection' => 'asc', diff --git a/src/Controller/Administrative/Teamer/IndexController.php b/src/Controller/Administrative/Teamer/IndexController.php index c496fa3..205db85 100644 --- a/src/Controller/Administrative/Teamer/IndexController.php +++ b/src/Controller/Administrative/Teamer/IndexController.php @@ -38,7 +38,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10 + $request->query->getInt('limit', 10) ); return $this->render('administrative/teamer/index.html.twig', [ diff --git a/src/Controller/HouseManager/Feedback/IndexController.php b/src/Controller/HouseManager/Feedback/IndexController.php index 670a200..1516546 100644 --- a/src/Controller/HouseManager/Feedback/IndexController.php +++ b/src/Controller/HouseManager/Feedback/IndexController.php @@ -46,7 +46,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, + $request->query->getInt('limit', 10), [ 'defaultSortFieldName' => 'assignment.dateFrom', 'defaultSortDirection' => 'asc', diff --git a/templates/paginator/sliding.html.twig b/templates/paginator/sliding.html.twig index 8acd6d8..008383f 100644 --- a/templates/paginator/sliding.html.twig +++ b/templates/paginator/sliding.html.twig @@ -1,8 +1,19 @@ {% if pageCount > 0 %}
-
-

{{ 'paginator.info'|trans({ '{from}': firstItemNumber, '{to}': lastItemNumber, '{total}': totalCount })|raw }}

+
+
+ {{ 'paginator.info'|trans({ '{from}': firstItemNumber, '{to}': lastItemNumber, '{total}': totalCount })|raw }} +
+