@@ -, +, @@ jQuery - totalExceedsBudget - budgetExceedsParent - checkBudgetParent --- koha-tmpl/intranet-tmpl/prog/js/acq.js | 112 +++++++++++++-------------------- 1 file changed, 44 insertions(+), 68 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/js/acq.js +++ a/koha-tmpl/intranet-tmpl/prog/js/acq.js @@ -242,29 +242,24 @@ function getAuthValueDropbox( name, cat, destination, selected ) { //USED BY NEWORDEREMPTY.PL function totalExceedsBudget(budgetId, total) { - var xmlhttp = null; - xmlhttp = new XMLHttpRequest(); - if ( typeof xmlhttp.overrideMimeType != 'undefined') { - xmlhttp.overrideMimeType('text/xml'); - } - var url = '../acqui/check_budget_total.pl?budget_id=' + budgetId + "&total=" + total; - xmlhttp.open('GET', url, false); - xmlhttp.send(null); - - xmlhttp.onreadystatechange = function() { - if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { - + var ret = undefined; + jQuery.ajax({ + url: url, + mimeType: 'text/xml', + async: false, // non-async because we need to return a value based on the result + success: function(data, textStatus, xmlhttp) { actTotal = eval ( xmlhttp.responseText ); if ( Math.abs(actTotal) < Math.abs(total) ) { // if budget is to low :( - return true ; + ret = true ; } else { - return false; + ret = false; } } - } + }); + return ret; } @@ -272,42 +267,31 @@ function totalExceedsBudget(budgetId, total) { function budgetExceedsParent(budgetTotal, budgetId, newBudgetParent, periodID) { - var xmlhttp = null; - xmlhttp = new XMLHttpRequest(); - if ( typeof xmlhttp.overrideMimeType != 'undefined') { - xmlhttp.overrideMimeType('text/xml'); - } - // make the call... yawn // var url = '../admin/check_parent_total.pl?budget_id=' + budgetId + '&parent_id=' + newBudgetParent + "&total=" + budgetTotal + "&period_id="+ periodID ; var url = '../admin/check_parent_total.pl?total=' + budgetTotal + "&period_id="+ periodID ; - if (budgetId ) { url += '&budget_id=' + budgetId }; if ( newBudgetParent ) { url += '&parent_id=' + newBudgetParent}; - - - xmlhttp.open('GET', url, false); - xmlhttp.send(null); - - xmlhttp.onreadystatechange = function() { - if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { - // stupid JS... - } else { - // wait for the call to complete + var ret = undefined; + jQuery.ajax({ + url: url, + mimeType: 'text/xml', + async: false, // non-async because we need to return a value based on the result + success: function(data, textStatus, xmlhttp) { + var result = eval ( xmlhttp.responseText ); + + if (result == '1') { + ret = MSG_BUDGET_PARENT_ALLOCATIONl; + } else if (result == '2') { + ret = MSG_BUDGET_PERIOD_ALLOCATION; + } else { + ret = false; + } } - }; - - var result = eval ( xmlhttp.responseText ); - - if (result == '1') { - return MSG_BUDGET_PARENT_ALLOCATION; - } else if (result == '2') { - return MSG_BUDGET_PERIOD_ALLOCATION; - } else { - return false; - } + }); + return ret; } @@ -315,33 +299,25 @@ if ( newBudgetParent ) { url += '&parent_id=' + newBudgetParent}; //USED BY AQBUDGETS.TMPL function checkBudgetParent(budgetId, newBudgetParent) { - var xmlhttp = null; - xmlhttp = new XMLHttpRequest(); - if ( typeof xmlhttp.overrideMimeType != 'undefined') { - xmlhttp.overrideMimeType('text/xml'); - } - var url = '../admin/check_budget_parent.pl?budget_id=' + budgetId + '&new_parent=' + newBudgetParent; - xmlhttp.open('GET', url, false); - xmlhttp.send(null); - - xmlhttp.onreadystatechange = function() { - if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { - // do something with the results - } else { - // wait for the call to complete + var ret = undefined; + jQuery.ajax({ + url: url, + mimeType: 'text/xml', + async: false, // non-async because we need to return a value based on the result + success: function(data, textStatus, xmlhttp) { + var result = eval ( xmlhttp.responseText ); + + if (result == '1') { + ret = MSG_PARENT_BENEATH_BUDGET; +// } else if (result == '2') { +// ret = "- New budget-parent has insufficent funds\n"; +// } else { +// ret = false; + } } - }; - - var result = eval ( xmlhttp.responseText ); - - if (result == '1') { - return MSG_PARENT_BENEATH_BUDGET; -// } else if (result == '2') { -// return "- New budget-parent has insufficent funds\n"; -// } else { -// return false; - } + }); + return ret; } function hideColumn(num) { --