kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +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

5
app/Http/Controllers/CategoryController.php
View File

@@ -226,10 +226,11 @@ class CategoryController extends Controller
$hideCategory = true; // used in list. $hideCategory = true; // used in list.
$page = intval(Input::get('page')); $page = intval(Input::get('page'));
$pageSize = Preferences::get('transactionPageSize', 50)->data;
$set = $repository->getJournalsInRange($category, $page, $start, $end); $set = $repository->getJournalsInRange($category, $start, $end, $page, $pageSize);
$count = $repository->countJournalsInRange($category, $start, $end); $count = $repository->countJournalsInRange($category, $start, $end);
$journals = new LengthAwarePaginator($set, $count, 50, $page); $journals = new LengthAwarePaginator($set, $count, $pageSize, $page);
$journals->setPath('categories/show/' . $category->id . '/' . $date); $journals->setPath('categories/show/' . $category->id . '/' . $date);
return view('categories.show_with_date', compact('category', 'journals', 'hideCategory', 'subTitle', 'carbon')); return view('categories.show_with_date', compact('category', 'journals', 'hideCategory', 'subTitle', 'carbon'));

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

@@ -178,21 +178,23 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
/** /**
* @param Category $category * @param Category $category
* @param int $page
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* @param int $page
* @param int $pageSize
*
* *
* @return Collection * @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() return $category->transactionjournals()
->after($start) ->after($start)
->before($end) ->before($end)
->expanded() ->expanded()
->take(50) ->take($pageSize)
->offset($offset) ->offset($offset)
->get(TransactionJournal::QUERYFIELDS); ->get(TransactionJournal::QUERYFIELDS);
} }

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

@@ -93,14 +93,15 @@ interface SingleCategoryRepositoryInterface
/** /**
* @param Category $category * @param Category $category
* @param int $page
*
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* @param int $page
* @param int $pageSize
*
* *
* @return Collection * @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 * @param Category $category