RVRNEXT-22 use pagination template for transactions

src/Controller/EventController.php

@@ -68,16 +68,17 @@ class EventController implements IAuthenticationRequired, ISecured
     {
         $itemsPerPage = 10;
         $numberOfEvents = $this->eventRepository->countAllByCommunity($this->community);
-        $currentPage = Container::$request->query('page') ?: 1;
+        $pages = ceil($numberOfEvents / $itemsPerPage);
+        $currentPage = Container::$request->query('page') ?: 0;
         $events = $this->eventRepository->getPagedByCommunity(
             $this->community,
-            $currentPage,
+            $currentPage * $itemsPerPage,
             $itemsPerPage
         );
 
         return new HtmlContent('events/events', [
             'community' => $this->community,
-            'pages' => ceil($numberOfEvents / $itemsPerPage),
+            'pages' => $pages,
             'currentPage' => $currentPage,
             'numberOfEvents' => $numberOfEvents,
             'events' => $events

src/Controller/TransactionController.php

@@ -84,18 +84,19 @@ class TransactionController implements IAuthenticationRequired, ISecured
         $numberOfTransactions = $event ?
             $this->transactionRepository->countAllByEvent($event) :
             $this->transactionRepository->countAllByCommunity($this->community);
-        $currentPage = Container::$request->query('page') ?: 1;
+        $pages = ceil($numberOfTransactions / $itemsPerPage);
+        $currentPage = Container::$request->query('page') ?: 0;
         $transactions = $event ?
             $this->transactionRepository->getPagedByEvent(
                 $event,
-                $currentPage,
+                $currentPage * $itemsPerPage,
                 $itemsPerPage,
                 true,
                 ['currency', 'payer_user', 'payee_user']
             ) :
             $this->transactionRepository->getPagedByCommunity(
                 $this->community,
-                $currentPage,
+                $currentPage * $itemsPerPage,
                 $itemsPerPage,
                 true,
                 ['event', 'currency', 'payer_user', 'payee_user']
@@ -105,7 +106,7 @@ class TransactionController implements IAuthenticationRequired, ISecured
             'community' => $this->community,
             'event' => $event,
             'exchangeRateCalculator' => $exchangeRateCalculator,
-            'pages' => ceil($numberOfTransactions / $itemsPerPage),
+            'pages' => $pages,
             'currentPage' => $currentPage,
             'numberOfTransactions' => $numberOfTransactions,
             'transactions' => $transactions

src/Repository/EventRepository.php

@@ -52,11 +52,11 @@ class EventRepository
         yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
     }
 
-    public function getPagedByCommunity(Community $community, int $page, int $itemsPerPage, bool $useRelations = false, array $withRelations = []): Generator
+    public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
     {
         $select = $this->selectAllByCommunity($community);
         $select->orderBy('start', 'DESC');
-        $select->paginate($page, $itemsPerPage);
+        $select->limit($limit, $start);
 
         yield from Container::$persistentDataManager->selectMultipleFromDb($select, Event::class, $useRelations, $withRelations);
     }

src/Repository/TransactionRepository.php

@@ -66,20 +66,20 @@ class TransactionRepository
         return $select->count() > 0;
     }
 
-    public function getPagedByCommunity(Community $community, int $page, int $itemsPerPage, bool $useRelations = false, array $withRelations = []): Generator
+    public function getPagedByCommunity(Community $community, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
     {
         $select = $this->selectAllByCommunity($community);
         $select->orderBy('time', 'DESC');
-        $select->paginate($page, $itemsPerPage);
+        $select->limit($limit, $start);
 
         yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
     }
 
-    public function getPagedByEvent(Event $event, int $page, int $itemsPerPage, bool $useRelations = false, array $withRelations = []): Generator
+    public function getPagedByEvent(Event $event, int $start, int $limit, bool $useRelations = false, array $withRelations = []): Generator
     {
         $select = $this->selectAllByEvent($event);
         $select->orderBy('time', 'DESC');
-        $select->paginate($page, $itemsPerPage);
+        $select->limit($limit, $start);
 
         yield from Container::$persistentDataManager->selectMultipleFromDb($select, Transaction::class, $useRelations, $withRelations);
     }

views/templates/pagination.php

@@ -1,31 +1,13 @@
 <p class="paginateContainer marginTop">
-    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => 1])) ?>">«</a>
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => 0])) ?>">«</a>
-    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => max(1, $currentPage - 1)])) ?>">‹</a>
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => max(0, $currentPage - 1)])) ?>">‹</a>
-    <?php
+    <?php for ($i = 0; $i < $pages; $i++): ?>
-    $maxPages = 7;
-    if ($pages <= $maxPages) {
-        $start = 1;
-        $end = $pages;
-    } else {
-        $maxAdditionalPages = $maxPages - 1;
-        $maxAdditionalPagesHalf = ceil($maxAdditionalPages / 2);
-        $start = $currentPage - $maxAdditionalPagesHalf > 1 ?
-            ($currentPage - $maxAdditionalPagesHalf < $pages - $maxAdditionalPages ?
-                $currentPage - $maxAdditionalPagesHalf :
-                $pages - $maxAdditionalPages) :
-            1;
-        $end = $start + $maxAdditionalPages < $pages ?
-            $start + $maxAdditionalPages :
-            $pages;
-    }
-    ?>
-    <?php for ($i = $start; $i <= $end; $i++): ?>
         <?php if ($currentPage == $i): ?>
-            <span class="selected"><?= $i ?></span>
+            <span class="selected"><?= $i + 1 ?></span>
         <?php else: ?>
-            <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => $i])) ?>"><?= $i ?></a>
+            <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => $i])) ?>"><?= $i + 1 ?></a>
         <?php endif; ?>
     <?php endfor; ?>
-    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => min($pages, $currentPage + 1)])) ?>">›</a>
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => min($pages - 1, $currentPage + 1)])) ?>">›</a>
-    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => $pages])) ?>">»</a>
+    <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => $pages - 1])) ?>">»</a>
 </p>