kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Some fixes for budgets

Browse Source
This commit is contained in:
Sander Dorigo
2014-11-04 20:37:00 +01:00
parent 09e1f68c69
commit aaab7f8e0e
13 changed files with 676 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/GoogleChartController.php
View File

@@ -98,6 +98,7 @@ class GoogleChartController extends BaseController
return Response::json($chart->getData());
}
/**
* @param $year
*
@@ -112,7 +113,7 @@ class GoogleChartController extends BaseController
}
/** @var \Grumpydictator\Gchart\GChart $chart */
$chart = App::make('gchart');
$chart->addColumn('Month', 'string');
$chart->addColumn('Summary', 'string');
$chart->addColumn('Income', 'number');
$chart->addColumn('Expenses', 'number');
@@ -121,12 +122,12 @@ class GoogleChartController extends BaseController
$end = clone $start;
$end->endOfYear();
$income = 0;
$income = 0;
$expense = 0;
while ($start < $end) {
// total income:
$income += $tj->getSumOfIncomesByMonth($start);
$income += $tj->getSumOfIncomesByMonth($start);
$expense += $tj->getSumOfExpensesByMonth($start);
$start->addMonth();
@@ -134,7 +135,6 @@ class GoogleChartController extends BaseController
$chart->addRow('Sum', $income, $expense);
$chart->generate();
return Response::json($chart->getData());