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

Fixed missing chart data.

Browse Source
This commit is contained in:
James Cole
2016-12-23 15:52:05 +01:00
parent 315479fcd3
commit cde494d3ef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,8 +284,8 @@ class BudgetController extends Controller
foreach (array_keys($periods) as $period) { foreach (array_keys($periods) as $period) {
$label = $periods[$period]; $label = $periods[$period];
$spent = isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0'; $spent = isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0';
$limit = isset($entries[$period]) ? $budgeted[$period] : 0; $limit = isset($budgeted[$period]) ? $budgeted[$period] : 0;
$chartData[0]['entries'][$label] = bcmul($spent, '-1'); $chartData[0]['entries'][$label] = round(bcmul($spent, '-1'), 2);
$chartData[1]['entries'][$label] = $limit; $chartData[1]['entries'][$label] = $limit;
} }

2
app/Http/Controllers/Chart/BudgetReportController.php
View File

@@ -218,7 +218,7 @@ class BudgetReportController extends Controller
/** @var Budget $budget */ /** @var Budget $budget */
foreach ($budgets as $budget) { foreach ($budgets as $budget) {
$chartData[$budget->id]['entries'][$label] = $expenses[$budget->id] ?? '0'; $chartData[$budget->id]['entries'][$label] = round(($expenses[$budget->id] ?? '0'), 2);
} }
$currentStart = clone $currentEnd; $currentStart = clone $currentEnd;
$currentStart->addDay(); $currentStart->addDay();