Fixed some JS bugs [skip ci]

This commit is contained in:
James Cole 2015-06-02 18:13:23 +02:00
parent be17e4481e
commit 2e75446665

View File

@ -2,43 +2,47 @@
function drawSpentBar() { function drawSpentBar() {
"use strict"; "use strict";
if ($('.spentBar').length > 0) {
var overspent = spent > budgeted;
var pct;
var overspent = spent > budgeted; if (overspent) {
var pct; // draw overspent bar
pct = (budgeted / spent) * 100;
if (overspent) { $('.spentBar .progress-bar-warning').css('width', pct + '%');
// draw overspent bar $('.spentBar .progress-bar-danger').css('width', (100 - pct) + '%');
pct = (budgeted / spent) * 100; } else {
$('.spentBar .progress-bar-warning').css('width', pct + '%'); // draw normal bar:
$('.spentBar .progress-bar-danger').css('width', (100 - pct) + '%'); pct = (spent / budgeted) * 100;
} else { $('.spentBar .progress-bar-info').css('width', pct + '%');
// draw normal bar: }
pct = (spent / budgeted) * 100;
$('.spentBar .progress-bar-info').css('width', pct + '%');
} }
} }
function drawBudgetedBar() { function drawBudgetedBar() {
"use strict"; "use strict";
var budgetedMuch = budgeted > budgetIncomeTotal;
// recalculate percentage: if ($('.budgetedBar').length > 0) {
var budgetedMuch = budgeted > budgetIncomeTotal;
var pct; // recalculate percentage:
if (budgetedMuch) {
// budgeted too much. var pct;
pct = (budgetIncomeTotal / budgeted) * 100; if (budgetedMuch) {
$('.budgetedBar .progress-bar-warning').css('width', pct + '%'); // budgeted too much.
$('.budgetedBar .progress-bar-danger').css('width', (100 - pct) + '%'); pct = (budgetIncomeTotal / budgeted) * 100;
$('.budgetedBar .progress-bar-info').css('width', 0); $('.budgetedBar .progress-bar-warning').css('width', pct + '%');
} else { $('.budgetedBar .progress-bar-danger').css('width', (100 - pct) + '%');
pct = (budgeted / budgetIncomeTotal) * 100; $('.budgetedBar .progress-bar-info').css('width', 0);
$('.budgetedBar .progress-bar-warning').css('width', 0); } else {
$('.budgetedBar .progress-bar-danger').css('width', 0); pct = (budgeted / budgetIncomeTotal) * 100;
$('.budgetedBar .progress-bar-info').css('width', pct + '%'); $('.budgetedBar .progress-bar-warning').css('width', 0);
$('.budgetedBar .progress-bar-danger').css('width', 0);
$('.budgetedBar .progress-bar-info').css('width', pct + '%');
}
$('#budgetedAmount').html(currencySymbol + ' ' + budgeted.toFixed(2));
} }
$('#budgetedAmount').html(currencySymbol + ' ' + budgeted.toFixed(2));
} }
function updateBudgetedAmounts(e) { function updateBudgetedAmounts(e) {