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

Report remembers budgets and categories.

Browse Source
This commit is contained in:
James Cole
2015-12-16 16:19:15 +01:00
parent 32e92c2a16
commit 3fe57b7983
3 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,11 +180,15 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
// then, loop all entries and create datasets:
foreach ($entries as $entry) {
$name = $entry['name'];
$spent = $entry['spent'];
$earned = $entry['earned'];
$data['datasets'][] = ['label' => 'Spent in category ' . $name, 'data' => array_values($spent)];
$data['datasets'][] = ['label' => 'Earned in category ' . $name, 'data' => array_values($earned)];
$name = $entry['name'];
$spent = $entry['spent'];
$earned = $entry['earned'];
if (array_sum(array_values($spent)) != 0) {
$data['datasets'][] = ['label' => 'Spent in category ' . $name, 'data' => array_values($spent)];
}
if (array_sum(array_values($earned)) != 0) {
$data['datasets'][] = ['label' => 'Earned in category ' . $name, 'data' => array_values($earned)];
}
}
$data['count'] = count($data['datasets']);