kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-22 20:36:43 +00:00
Code Issues Projects Releases Wiki Activity

Some cleaning up, and I hope simplification.

Browse Source
This commit is contained in:
James Cole
2015-12-30 08:15:04 +01:00
parent 39b88e8207
commit a3d2a9e00b
4 changed files with 114 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -129,7 +129,6 @@ class CategoryController extends Controller
}
/**
* @param CategoryRepositoryInterface $repository
* @param $reportType
* @param Carbon $start
* @param Carbon $end
@@ -140,9 +139,9 @@ class CategoryController extends Controller
*/
public function multiYear($reportType, Carbon $start, Carbon $end, Collection $accounts, Collection $categories)
{
/** @var CategoryRepositoryInterface $repository */
/** @var CRI $repository */
$repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
/** @var SingleCategoryRepositoryInterface $singleRepository */
/** @var SCRI $singleRepository */
$singleRepository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
// chart properties for cache:
@@ -182,8 +181,8 @@ class CategoryController extends Controller
// get data:
if (is_null($category->id)) {
$name = trans('firefly.noCategory');
$spent = $repository->spentNoCategoryForAccounts($accounts, $currentStart, $currentEnd);
$earned = $repository->earnedNoCategoryForAccounts($accounts, $currentStart, $currentEnd);
$spent = $repository->sumSpentNoCategory($accounts, $currentStart, $currentEnd);
$earned = $repository->sumEarnedNoCategory($accounts, $currentStart, $currentEnd);
} else {
$name = $category->name;
$spent = $singleRepository->spentInPeriodForAccounts($category, $accounts, $currentStart, $currentEnd);