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

Optimise some charts [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-06-27 22:11:03 +02:00
parent 94be5244fe
commit 2c2ed26c38
5 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

@@ -80,27 +80,28 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
$left = [];
$spent = [];
$overspent = [];
$amount = [];
$expenses = [];
foreach ($entries as $entry) {
if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) {
$left[] = round($entry[1], 2);
$spent[] = round($entry[2], 2);
$overspent[] = round($entry[3], 2);
$amount[] = round($entry[4], 2);
$expenses[] = round($entry[5], 2);
//$data['count']++;
}
}
$data['datasets'][] = [
'label' => 'Amount',
'data' => $amount,
'label' => trans('firefly.left'),
'data' => $left,
];
$data['datasets'][] = [
'label' => 'Spent',
'data' => $expenses,
'label' => trans('firefly.spent'),
'data' => $spent,
];
$data['datasets'][] = [
'label' => trans('firefly.overspent'),
'data' => $overspent,
];
$data['count'] = count($data['datasets']);
return $data;
}
@@ -140,23 +141,5 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
}
return $data;
$chart = new GChart;
// add columns:
$chart->addColumn(trans('firefly.month'), 'date');
foreach ($budgets as $budget) {
$chart->addColumn($budget->name, 'number');
}
/** @var array $entry */
foreach ($entries as $entry) {
$chart->addRowArray($entry);
}
$chart->generate();
return $chart->getData();
}
}