IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #266 for period-chart.

Browse Source
This commit is contained in:
James Cole
2016-07-02 17:42:27 +02:00
parent 275d19e71d
commit 57b5981904
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,18 +254,24 @@ class CategoryController extends Controller
{ {
$categoryCollection = new Collection([$category]); $categoryCollection = new Collection([$category]);
$cache = new CacheProperties; $cache = new CacheProperties;
/** @var AccountCrudInterface $crud */
$crud = app(AccountCrudInterface::class);
$accounts = $crud->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
$cache->addProperty($accounts);
$cache->addProperty($category->id); $cache->addProperty($category->id);
$cache->addProperty('specific-period'); $cache->addProperty('specific-period');
if ($cache->has()) { if ($cache->has()) {
return $cache->get(); return $cache->get();
} }
$entries = new Collection; $entries = new Collection;
while ($start <= $end) { while ($start <= $end) {
$spent = $repository->spentInPeriod($categoryCollection, new Collection, $start, $start); $spent = $repository->spentInPeriod($categoryCollection, $accounts, $start, $start);
$earned = $repository->earnedInPeriod($categoryCollection, new Collection, $start, $start); $earned = $repository->earnedInPeriod($categoryCollection, $accounts, $start, $start);
$date = Navigation::periodShow($start, '1D'); $date = Navigation::periodShow($start, '1D');
$entries->push([clone $start, $date, $spent, $earned]); $entries->push([clone $start, $date, $spent, $earned]);
$start->addDay(); $start->addDay();