diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index cf99421aee..285db761b9 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -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; $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'; $return[$name] = [ 'left' => $left, diff --git a/public/js/ff/charts.js b/public/js/ff/charts.js index d402ab67f8..52ce69aba2 100644 --- a/public/js/ff/charts.js +++ b/public/js/ff/charts.js @@ -207,6 +207,7 @@ function stackedColumnChart(URI, container) { var options = defaultChartOptions; options.stacked = true; options.scales.xAxes[0].stacked = true; + options.scales.yAxes[0].stacked = true; var chartType = 'bar';