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

Fixes #593

Browse Source
This commit is contained in:
James Cole 2017-02-23 17:43:29 +01:00
parent fc36f9cd8c
commit 063ca3121a
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,9 +386,14 @@ class BudgetController extends Controller
] ]
); );
} }
/*
* amount: amount of budget limit
* left: amount of budget limit min spent, or 0 when < 0.
* spent: spent, or amount of budget limit when > amount
*/
$amount = $budgetLimit->amount; $amount = $budgetLimit->amount;
$left = bccomp(bcadd($amount, $expenses), '0') < 1 ? '0' : bcadd($amount, $expenses); $left = bccomp(bcadd($amount, $expenses), '0') < 1 ? '0' : bcadd($amount, $expenses);
$spent = $expenses; $spent = bccomp($expenses, $amount) === 1 ? $expenses : bcmul($amount, '-1');
$overspent = bccomp(bcadd($amount, $expenses), '0') < 1 ? bcadd($amount, $expenses) : '0'; $overspent = bccomp(bcadd($amount, $expenses), '0') < 1 ? bcadd($amount, $expenses) : '0';
$return[$name] = [ $return[$name] = [
'left' => $left, 'left' => $left,

1
public/js/ff/charts.js
View File

@ -207,6 +207,7 @@ function stackedColumnChart(URI, container) {
var options = defaultChartOptions; var options = defaultChartOptions;
options.stacked = true; options.stacked = true;
options.scales.xAxes[0].stacked = true; options.scales.xAxes[0].stacked = true;
options.scales.yAxes[0].stacked = true;
var chartType = 'bar'; var chartType = 'bar';