kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 18:40:12 +00:00
Code Issues Projects Releases Wiki Activity

Take page size into account.

Browse Source
This commit is contained in:
James Cole
2016-04-21 08:59:31 +02:00
parent b097e29104
commit e293d69798
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AccountController.php
View File

@@ -189,9 +189,10 @@ class AccountController extends Controller
public function show(ARI $repository, Account $account) public function show(ARI $repository, Account $account)
{ {
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
$pageSize = Preferences::get('transactionPageSize', 50)->data;
$subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type); $subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type);
$what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
$journals = $repository->getJournals($account, $page); $journals = $repository->getJournals($account, $page, $pageSize);
$subTitle = trans('firefly.details_for_' . $what, ['name' => $account->name]); $subTitle = trans('firefly.details_for_' . $what, ['name' => $account->name]);
$journals->setPath('accounts/show/' . $account->id); $journals->setPath('accounts/show/' . $account->id);

9
app/Repositories/Account/AccountRepository.php
View File

@@ -282,12 +282,13 @@ class AccountRepository implements AccountRepositoryInterface
/** /**
* @param Account $account * @param Account $account
* @param int $page * @param int $page
* @param int $pageSize
* *
* @return LengthAwarePaginator * @return LengthAwarePaginator
*/ */
public function getJournals(Account $account, int $page): LengthAwarePaginator public function getJournals(Account $account, int $page, int $pageSize = 50): LengthAwarePaginator
{ {
$offset = ($page - 1) * 50; $offset = ($page - 1) * $pageSize;
$query = $this->user $query = $this->user
->transactionJournals() ->transactionJournals()
->expanded() ->expanded()
@@ -298,8 +299,8 @@ class AccountRepository implements AccountRepositoryInterface
->orderBy('transaction_journals.id', 'DESC'); ->orderBy('transaction_journals.id', 'DESC');
$count = $query->count(); $count = $query->count();
$set = $query->take(50)->offset($offset)->get(TransactionJournal::QUERYFIELDS); $set = $query->take($pageSize)->offset($offset)->get(TransactionJournal::QUERYFIELDS);
$paginator = new LengthAwarePaginator($set, $count, 50, $page); $paginator = new LengthAwarePaginator($set, $count, $pageSize, $page);
return $paginator; return $paginator;

6
app/Repositories/Account/AccountRepositoryInterface.php
View File

@@ -123,11 +123,11 @@ interface AccountRepositoryInterface
/** /**
* @param Account $account * @param Account $account
* @param $page * @param int $page
* * @param int $pageSize
* @return LengthAwarePaginator * @return LengthAwarePaginator
*/ */
public function getJournals(Account $account, int $page): LengthAwarePaginator; public function getJournals(Account $account, int $page, int $pageSize = 50): LengthAwarePaginator;
/** /**
* @param Account $account * @param Account $account