7 changed files with 67 additions and 58 deletions
--- a/src/Controller/EventController.php
+++ b/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
--- a/src/Controller/TransactionController.php
+++ b/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
--- a/src/Repository/EventRepository.php
+++ b/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);
    }
--- a/src/Repository/TransactionRepository.php
+++ b/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);
    }
--- a/views/communities/transactions.php
+++ b/views/communities/transactions.php
@ -13,13 +13,20 @@
    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug(), 'event' => isset($event) ? $event->getSlug() : null]) ?>">New transaction</a></p>

    <?php if ($numberOfTransactions > 0): ?>
-        <?php
-        $paginationRouteId = 'community.transactions';
-        $paginationRouteParams = ['communitySlug' => $community->getSlug()];
-        ?>
-
        <?php if ($pages > 1): ?>
-            @include(templates/pagination)
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
        <?php endif; ?>

        <?php foreach ($transactions as $transaction): ?>
@ -44,7 +51,19 @@
        <?php endforeach; ?>

        <?php if ($pages > 1): ?>
-            @include(templates/pagination)
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.transactions')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
        <?php endif; ?>

        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.transactions.new')->generateLink(['communitySlug' => $community->getSlug(), 'event' => isset($event) ? $event->getSlug() : null]) ?>">New transaction</a></p>
--- a/views/events/events.php
+++ b/views/events/events.php
@ -9,13 +9,20 @@
    <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.events.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New event</a></p>

    <?php if ($numberOfEvents > 0): ?>
-        <?php
-        $paginationRouteId = 'community.events';
-        $paginationRouteParams = ['communitySlug' => $community->getSlug()];
-        ?>
-
        <?php if ($pages > 1): ?>
-            @include(templates/pagination)
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
        <?php endif; ?>

        <?php foreach ($events as $event): ?>
@ -29,7 +36,19 @@
        <?php endforeach; ?>

        <?php if ($pages > 1): ?>
-            @include(templates/pagination)
+            <p class="paginateContainer marginTop">
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => 0]) ?>">«</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => max(0, $currentPage - 1)]) ?>">‹</a>
+                <?php for ($i = 0; $i < $pages; $i++): ?>
+                    <?php if ($currentPage == $i): ?>
+                        <span class="selected"><?= $i + 1 ?></span>
+                    <?php else: ?>
+                        <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $i]) ?>"><?= $i + 1 ?></a>
+                    <?php endif; ?>
+                <?php endfor; ?>
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => min($pages - 1, $currentPage + 1)]) ?>">›</a>
+                <a href="<?= Container::$routeCollection->getRoute('community.events')->generateLink(['communitySlug' => $community->getSlug(), 'page' => $pages - 1]) ?>">»</a>
+            </p>
        <?php endif; ?>

        <p class="marginTop"><a href="<?= Container::$routeCollection->getRoute('community.events.new')->generateLink(['communitySlug' => $community->getSlug()]) ?>">New event</a></p>
--- a/views/templates/pagination.php
+++ b/views/templates/pagination.php
@ -1,31 +0,0 @@
-<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' => max(1, $currentPage - 1)])) ?>">‹</a>
-    <?php
-    $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>
-        <?php else: ?>
-            <a href="<?= Container::$routeCollection->getRoute($paginationRouteId)->generateLink(array_merge($paginationRouteParams, ['page' => $i])) ?>"><?= $i ?></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' => $pages])) ?>">»</a>
-</p>