kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-26 15:23:30 +00:00
Code Issues Projects Releases Wiki Activity

Include budgeted info as well. [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-12-15 09:54:10 +01:00
parent 7cf38bb01e
commit e1b6df6fb1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ class BudgetController extends Controller
if ($reps->count() === 0) { if ($reps->count() === 0) {
$row = $this->spentInPeriodSingle($repository, $budget, $start, $end); $row = $this->spentInPeriodSingle($repository, $budget, $start, $end);
if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) { if (bccomp($row['spent'], '0') !== 0 || bccomp($row['repetition_left'], '0') !== 0) {
$chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1'); $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
$chartData[1]['entries'][$row['name']] = $row['repetition_left']; $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
$chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1'); $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
@@ -199,7 +199,7 @@ class BudgetController extends Controller
} }
$rows = $this->spentInPeriodMulti($repository, $budget, $reps); $rows = $this->spentInPeriodMulti($repository, $budget, $reps);
foreach ($rows as $row) { foreach ($rows as $row) {
if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) { if (bccomp($row['spent'], '0') !== 0 || bccomp($row['repetition_left'], '0') !== 0) {
$chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1'); $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
$chartData[1]['entries'][$row['name']] = $row['repetition_left']; $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
$chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1'); $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
@@ -210,7 +210,7 @@ class BudgetController extends Controller
} }
// for no budget: // for no budget:
$row = $this->spentInPeriodWithout($start, $end); $row = $this->spentInPeriodWithout($start, $end);
if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) { if (bccomp($row['spent'], '0') !== 0 || bccomp($row['repetition_left'], '0') !== 0) {
$chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1'); $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
$chartData[1]['entries'][$row['name']] = $row['repetition_left']; $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
$chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1'); $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');