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

Optimised query.

Browse Source
This commit is contained in:
James Cole 2015-12-27 09:44:12 +01:00
parent f3f4e6b354
commit d0c7a5c076
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Generator/Chart/Account/ChartJsAccountChartGenerator.php
View File

@ -142,7 +142,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
// language: // language:
$format = trans('config.month_and_day'); $format = trans('config.month_and_day');
$data = [ $data = [
'count' => 1, 'count' => 1,
'labels' => [], 'labels' => [],
'datasets' => [ 'datasets' => [
@ -152,12 +152,17 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
] ]
], ],
]; ];
$range = Steam::balanceInRange($account, $start, $end);
$current = clone $start; $current = clone $start;
$previous = array_values($range)[0];
while ($end >= $current) { while ($end >= $current) {
$format = $current->format('Y-m-d');
$balance = isset($range[$format]) ? $range[$format] : $previous;
$data['labels'][] = $current->formatLocalized($format); $data['labels'][] = $current->formatLocalized($format);
$data['datasets'][0]['data'][] = Steam::balance($account, $current); $data['datasets'][0]['data'][] = $balance;
$previous = $balance;
$current->addDay(); $current->addDay();
} }