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

Trying to fix chart.

Browse Source
This commit is contained in:
James Cole 2015-09-29 09:28:16 +02:00
parent 103de5e18a
commit da50f9e419
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Generator/Chart/Report/ChartJsReportChartGenerator.php
View File

@ -43,7 +43,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
foreach ($entries as $entry) {
$data['labels'][] = $entry[0]->formatLocalized($format);
$data['datasets'][0]['data'][] = round($entry[1], 2);
$data['datasets'][1]['data'][] = round(($entry[2] * -1), 2);
$data['datasets'][1]['data'][] = round($entry[2], 2);
}
return $data;

4
app/Http/Controllers/Chart/ReportController.php
View File

@ -63,8 +63,8 @@ class ReportController extends Controller
$month = clone $start;
$month->endOfMonth();
// total income and total expenses:
$incomeSum = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount');
$expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount');
$incomeSum = $query->incomeInPeriodCorrected($start, $month, $shared)->sum('amount_positive');
$expenseSum = $query->expenseInPeriodCorrected($start, $month, $shared)->sum('amount_positive');
$entries->push([clone $start, $incomeSum, $expenseSum]);
$start->addMonth();