kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Fixed the overview chart for categories, so it will properly reflect income and expenses. See bug #99

Browse Source
This commit is contained in:
James Cole
2015-07-31 14:26:22 +02:00
parent 96ddbe7227
commit ab22d2cbaa
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

@@ -29,19 +29,30 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
$format = Config::get('firefly.' . $dateFormat . '.' . $language);
$data = [
'count' => 1,
'count' => 2,
'labels' => [],
'datasets' => [
[
'label' => trans('firefly.spent'),
'data' => []
],
[
'label' => trans('firefly.earned'),
'data' => []
]
],
];
foreach ($entries as $entry) {
$data['labels'][] = $entry[0]->formatLocalized($format);
$data['datasets'][0]['data'][] = round($entry[1], 2);
$data['labels'][] = $entry[0]->formatLocalized($format);
$amount = round($entry[1], 2);
if ($amount > 0) {
$data['datasets'][0]['data'][] = null;
$data['datasets'][1]['data'][] = $amount;
} else {
$data['datasets'][0]['data'][] = $amount * -1;
$data['datasets'][1]['data'][] = null;
}
}
return $data;