IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-08 23:24:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Also add stuff not in budgets.

Browse Source
This commit is contained in:
Sander Dorigo 2014-11-08 09:15:03 +01:00
parent ab4f34a96b
commit 6d8f84654f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/GoogleChartController.php
View File

@ -169,6 +169,7 @@ class GoogleChartController extends BaseController
foreach ($budgets as $budget) { foreach ($budgets as $budget) {
$chart->addColumn($budget->name, 'number'); $chart->addColumn($budget->name, 'number');
} }
$chart->addColumn('No budget','number');
/* /*
* Loop budgets this year. * Loop budgets this year.
@ -182,6 +183,14 @@ class GoogleChartController extends BaseController
$row[] = $bdt->spentInMonth($budget, $start); $row[] = $bdt->spentInMonth($budget, $start);
} }
/*
* Without a budget:
*/
$endOfMonth = clone $start;
$endOfMonth->endOfMonth();
$set = $bdt->transactionsWithoutBudgetInDateRange($start, $endOfMonth);
$row[] = floatval($set->sum('amount')) * -1;
$chart->addRowArray($row); $chart->addRowArray($row);
$start->addMonth(); $start->addMonth();
} }