kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 12:11:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #1016 and #968

Browse Source
This commit is contained in:
James Cole
2017-11-24 17:05:22 +01:00
parent 1aa325053e
commit 7a1f698d5e
3 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
public/js/ff/budgets/index.js vendored
View File

@@ -38,7 +38,7 @@ $(function () {
/*
When the input changes, update the percentages for the budgeted bar:
*/
$('input[type="number"]').on('input', updateBudgetedAmounts);
$('input[type="number"]').on('change', updateBudgetedAmounts);
//
$('.selectPeriod').change(function (e) {
@@ -104,46 +104,55 @@ function updateBudgetedAmounts(e) {
"use strict";
var target = $(e.target);
var id = target.data('id');
var leftCell = $('td[class$="left"][data-id="' + id + '"]');
var link = $('a[data-id="'+id+'"][class="budget-link"]');
var value = target.val();
var original = target.data('original');
var difference = value - original;
var spentCell = $('td[class="spent"][data-id="' + id + '"]');
var leftCell = $('td[class="left"][data-id="' + id + '"]');
var spentAmount = parseFloat(spentCell.data('spent'));
var newAmountLeft = spentAmount + parseFloat(value);
var amountLeftString = accounting.formatMoney(newAmountLeft);
if (newAmountLeft < 0) {
leftCell.html('<span class="text-danger">' + amountLeftString + '</span>');
}
if (newAmountLeft > 0) {
leftCell.html('<span class="text-success">' + amountLeftString + '</span>');
}
if (newAmountLeft === 0.0) {
leftCell.html('<span style="color:#999">' + amountLeftString + '</span>');
}
// disable input
target.prop('disabled', true);
if (difference !== 0) {
// add difference to 'budgeted' var
// replace link (for now)
link.attr('href','#');
// replace "left" with spinner.
leftCell.empty().html('<i class="fa fa-fw fa-spin fa-spinner"></i>');
// send a post to Firefly to update the amount:
var newUri = budgetAmountUri.replace("REPLACE", id);
$.post(newUri, {amount: value, start: periodStart, end: periodEnd}).done(function (data) {
// difference between new value and original value
var difference = value - original;
// update budgeted value
budgeted = budgeted + difference;
// update original:
target.data('original', value);
// fill in "left" value:
leftCell.html(data.left);
// update "budgeted" input:
target.val(data.amount);
// enable thing again
target.prop('disabled', false);
// set new original value:
target.data('original', data.amount);
// run drawBudgetedBar() again:
drawBudgetedBar();
// send a post to Firefly to update the amount:
var newUri = budgetAmountUri.replace("REPLACE", id);
$.post(newUri, {amount: value, start: periodStart, end: periodEnd}).done(function (data) {
// update the link if relevant:
if (data.repetition > 0) {
$('.budget-link[data-id="' + id + '"]').attr('href', 'budgets/show/' + id + '/' + data.repetition);
} else {
$('.budget-link[data-id="' + id + '"]').attr('href', 'budgets/show/' + id);
}
});
}
// update the link if relevant:
link.attr('href', 'budgets/show/' + id);
if (data.limit > 0) {
link.attr('href', 'budgets/show/' + id + '/' + data.limit);
}
});
return;
}
/**