From 2e75446665018dd05b087e00d8a0cae0112fbd23 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 2 Jun 2015 18:13:23 +0200 Subject: [PATCH] Fixed some JS bugs [skip ci] --- public/js/budgets.js | 60 +++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/public/js/budgets.js b/public/js/budgets.js index 52e80dff01..ee4ecceb21 100644 --- a/public/js/budgets.js +++ b/public/js/budgets.js @@ -2,43 +2,47 @@ function drawSpentBar() { "use strict"; + if ($('.spentBar').length > 0) { + var overspent = spent > budgeted; + var pct; - var overspent = spent > budgeted; - var pct; - - if (overspent) { - // draw overspent bar - pct = (budgeted / spent) * 100; - $('.spentBar .progress-bar-warning').css('width', pct + '%'); - $('.spentBar .progress-bar-danger').css('width', (100 - pct) + '%'); - } else { - // draw normal bar: - pct = (spent / budgeted) * 100; - $('.spentBar .progress-bar-info').css('width', pct + '%'); + if (overspent) { + // draw overspent bar + pct = (budgeted / spent) * 100; + $('.spentBar .progress-bar-warning').css('width', pct + '%'); + $('.spentBar .progress-bar-danger').css('width', (100 - pct) + '%'); + } else { + // draw normal bar: + pct = (spent / budgeted) * 100; + $('.spentBar .progress-bar-info').css('width', pct + '%'); + } } } function drawBudgetedBar() { "use strict"; - var budgetedMuch = budgeted > budgetIncomeTotal; - // recalculate percentage: + if ($('.budgetedBar').length > 0) { + var budgetedMuch = budgeted > budgetIncomeTotal; - var pct; - if (budgetedMuch) { - // budgeted too much. - pct = (budgetIncomeTotal / budgeted) * 100; - $('.budgetedBar .progress-bar-warning').css('width', pct + '%'); - $('.budgetedBar .progress-bar-danger').css('width', (100 - pct) + '%'); - $('.budgetedBar .progress-bar-info').css('width', 0); - } else { - pct = (budgeted / budgetIncomeTotal) * 100; - $('.budgetedBar .progress-bar-warning').css('width', 0); - $('.budgetedBar .progress-bar-danger').css('width', 0); - $('.budgetedBar .progress-bar-info').css('width', pct + '%'); + // recalculate percentage: + + var pct; + if (budgetedMuch) { + // budgeted too much. + pct = (budgetIncomeTotal / budgeted) * 100; + $('.budgetedBar .progress-bar-warning').css('width', pct + '%'); + $('.budgetedBar .progress-bar-danger').css('width', (100 - pct) + '%'); + $('.budgetedBar .progress-bar-info').css('width', 0); + } else { + pct = (budgeted / budgetIncomeTotal) * 100; + $('.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) {