kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

This should fix #266

Browse Source
This commit is contained in:
James Cole
2016-05-24 16:08:43 +02:00
parent ada43bc0dd
commit 2e26193333
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,9 @@ namespace FireflyIII\Http\Controllers;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Crud\Account\AccountCrudInterface;
use FireflyIII\Http\Requests\CategoryFormRequest; use FireflyIII\Http\Requests\CategoryFormRequest;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI; use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
@@ -157,11 +159,12 @@ class CategoryController extends Controller
/** /**
* @param CRI $repository * @param CRI $repository
* @param AccountCrudInterface $crud
* @param Category $category * @param Category $category
* *
* @return \Illuminate\View\View * @return View
*/ */
public function show(CRI $repository, Category $category) public function show(CRI $repository, AccountCrudInterface $crud, Category $category)
{ {
/** @var Carbon $carbon */ /** @var Carbon $carbon */
$range = Preferences::get('viewRange', '1M')->data; $range = Preferences::get('viewRange', '1M')->data;
@@ -205,12 +208,12 @@ class CategoryController extends Controller
$categoryCollection = new Collection([$category]); $categoryCollection = new Collection([$category]);
$empty = new Collection; $accounts = $crud->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
while ($end >= $start) { while ($end >= $start) {
$end = Navigation::startOfPeriod($end, $range); $end = Navigation::startOfPeriod($end, $range);
$currentEnd = Navigation::endOfPeriod($end, $range); $currentEnd = Navigation::endOfPeriod($end, $range);
$spent = $repository->spentInPeriod($categoryCollection, $empty, $end, $currentEnd); $spent = $repository->spentInPeriod($categoryCollection, $accounts, $end, $currentEnd);
$earned = $repository->earnedInPeriod($categoryCollection, $empty, $end, $currentEnd); $earned = $repository->earnedInPeriod($categoryCollection, $accounts, $end, $currentEnd);
$dateStr = $end->format('Y-m-d'); $dateStr = $end->format('Y-m-d');
$dateName = Navigation::periodShow($end, $range); $dateName = Navigation::periodShow($end, $range);
$entries->push([$dateStr, $dateName, $spent, $earned]); $entries->push([$dateStr, $dateName, $spent, $earned]);