RVRNEXT-22 use the new repository methods in controllers
All checks were successful
rvr-nextgen/pipeline/pr-master This commit looks good

This commit is contained in:
Bence Pőcze 2023-05-28 20:33:44 +02:00
parent 9929e00a3f
commit d1c926541a
Signed by: bence
GPG Key ID: DC5BD6E95A333E6D
2 changed files with 7 additions and 9 deletions

View File

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

View File

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