kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +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 09:10:37 +02:00
parent 23c0bb49c4
commit 2bb883219c
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Repositories/Category/SingleCategoryRepository.php
View File

@@ -178,21 +178,23 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
/**
* @param Category $category
* @param int $page
* @param Carbon $start
* @param Carbon $end
* @param int $page
* @param int $pageSize
*
*
* @return Collection
*/
public function getJournalsInRange(Category $category, $page, Carbon $start, Carbon $end): Collection
public function getJournalsInRange(Category $category, Carbon $start, Carbon $end, int $page, int $pageSize = 50): Collection
{
$offset = $page > 0 ? $page * 50 : 0;
$offset = $page > 0 ? $page * $pageSize : 0;
return $category->transactionjournals()
->after($start)
->before($end)
->expanded()
->take(50)
->take($pageSize)
->offset($offset)
->get(TransactionJournal::QUERYFIELDS);
}

7
app/Repositories/Category/SingleCategoryRepositoryInterface.php
View File

@@ -93,14 +93,15 @@ interface SingleCategoryRepositoryInterface
/**
* @param Category $category
* @param int $page
*
* @param Carbon $start
* @param Carbon $end
* @param int $page
* @param int $pageSize
*
*
* @return Collection
*/
public function getJournalsInRange(Category $category, $page, Carbon $start, Carbon $end): Collection;
public function getJournalsInRange(Category $category, Carbon $start, Carbon $end, int $page, int $pageSize = 50): Collection;
/**
* @param Category $category