This commit is contained in:
James Cole 2020-10-03 15:16:42 +02:00
parent 5ed3d52e9a
commit f2550a7861
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 10 additions and 5 deletions

View File

@ -241,13 +241,13 @@ function drawBudgetedBars() {
if (budgetedTooMuch) {
// budgeted too much.
pct = (available / budgeted) * 100;
bar.find('.progress-bar-warning').css('width', pct + '%');
bar.find('.progress-bar-danger').css('width', (100 - pct) + '%');
bar.find('.progress-bar-danger').css('width', pct + '%');
bar.find('.progress-bar-warning').css('width', (100 - pct) + '%');
bar.find('.progress-bar-info').css('width', 0);
} else {
pct = (budgeted / available) * 100;
bar.find('.progress-bar-warning').css('width', 0);
bar.find('.progress-bar-danger').css('width', 0);
bar.find('.progress-bar-warning').css('width', 0);
bar.find('.progress-bar-info').css('width', pct + '%');
}
//$('#budgetedAmount').html(currencySymbol + ' ' + budgeted.toFixed(2));

View File

@ -147,12 +147,17 @@
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="progress budgeted_bar" data-id="{{ budget.id }}" data-budgeted="{{ budget.budgeted }}"
data-available="{{ budget.amount }}" data-currency="{{ budget.transaction_currency.id }}">
<div class="progress-bar progress-bar-danger" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="0"
{# red: the exact amount of the available budget, if more has budgeted. #}
<div class="progress-bar progress-bar-danger" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="10"
aria-valuemin="0"
aria-valuemax="100" style="width: 0;"></div>
<div class="progress-bar progress-bar-warning" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="10"
{# orange: overbudgeted amount #}
<div class="progress-bar progress-bar-warning" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="0"
aria-valuemin="0"
aria-valuemax="100" style="width: 0;"></div>
{# budgeted amount if enough or les #}
<div class="progress-bar progress-bar-info" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="0"
aria-valuemin="0"
aria-valuemax="100" style="width: 0;"></div>