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

Fix for #1364

Browse Source
This commit is contained in:
James Cole
2018-04-22 09:16:51 +02:00
parent f16b2257c6
commit 01c10e320c
4 changed files with 143 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
public/js/ff/transactions/split/edit.js vendored
View File

@@ -19,7 +19,7 @@
*/
/** global: originalSum, accounting, what, Modernizr, currencySymbol */
/** global: originalSum,originalForeignSum, accounting, what, Modernizr, currencySymbol, foreignCurrencySymbol */
var destAccounts = {};
var srcAccounts = {};
@@ -69,7 +69,8 @@ $(document).ready(function () {
});
$('input[name$="][amount]"]').on('input', calculateSum);
$('input[name$="][amount]"]').on('change', calculateBothSums);
$('input[name$="][foreign_amount]"]').on('change', calculateBothSums);
if (!Modernizr.inputtypes.date) {
$('input[type="date"]').datepicker(
@@ -80,6 +81,12 @@ $(document).ready(function () {
}
});
function calculateBothSums() {
console.log("Now in calculateBothSums()");
calculateSum();
calculateForeignSum();
}
/**
* New and cool
* @param e
@@ -113,8 +120,8 @@ function cloneDivRow() {
source.removeClass('initial-row');
source.find('.count').text('#' + count);
source.find('input[name$="][amount]"]').val("").on('input', calculateSum);
source.find('input[name$="][foreign_amount]"]').val("").on('input', calculateSum);
source.find('input[name$="][amount]"]').val("").on('change', calculateBothSums);
source.find('input[name$="][foreign_amount]"]').val("").on('change', calculateBothSums);
if (destAccounts.length > 0) {
source.find('input[name$="destination_account_name]"]').typeahead({source: destAccounts, autoSelect: false});
}
@@ -134,7 +141,7 @@ function cloneDivRow() {
// remove original click things, add them again:
$('.remove-current-split').unbind('click').click(removeDivRow);
calculateSum();
calculateBothSums();
resetDivSplits();
return false;
@@ -166,16 +173,10 @@ function resetDivSplits() {
$.each($('.remove-current-split'), function (i, v) {
var button = $(v);
button.attr('data-split', i);
button.find('i').attr('data-split', i);
button.find('span').text(' #' + (i + 1));
});
// loop each indicator (#) and update it:
$.each($('td.count'), function (i, v) {
var cell = $(v);
var index = i + 1;
cell.text('#' + index);
});
// loop each possible field.
@@ -234,6 +235,7 @@ function resetDivSplits() {
function calculateSum() {
"use strict";
console.log("Now in calculateSum()");
var left = originalSum * -1;
var sum = 0;
var set = $('input[name$="][amount]"]');
@@ -245,14 +247,43 @@ function calculateSum() {
sum = Math.round(sum * 100) / 100;
left = Math.round(left * 100) / 100;
console.log("Sum is " + sum + ", left is " + left);
$('.amount-warning').remove();
if (sum !== originalSum) {
var holder = $('#journal_amount_holder');
var par = holder.find('p.form-control-static');
$('<span>').text(' (' + accounting.formatMoney(sum, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(par);
console.log("Is different from original sum " + originalSum);
var paragraph = $('#journal_amount_holder').find('p.form-control-static');
$('<span>').text(' (' + accounting.formatMoney(sum, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(paragraph);
// also add what's left to divide (or vice versa)
$('<span>').text(' (' + accounting.formatMoney(left, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(par);
$('<span>').text(' (' + accounting.formatMoney(left, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(paragraph);
}
}
function calculateForeignSum() {
// "use strict";
var left = originalForeignSum * -1;
var sum = 0;
var set = $('input[name$="][foreign_amount]"]');
for (var i = 0; i < set.length; i++) {
var current = $(set[i]);
sum += (current.val() === "" ? 0 : parseFloat(current.val()));
left += (current.val() === "" ? 0 : parseFloat(current.val()));
}
sum = Math.round(sum * 100) / 100;
left = Math.round(left * 100) / 100;
$('.amount-warning-foreign').remove();
if (sum !== originalForeignSum) {
var paragraph = $('#journal_foreign_amount_holder').find('p.form-control-static');
$('<span>').text(' (' + accounting.formatMoney(sum, foreignCurrencySymbol) + ')').addClass('text-danger amount-warning-foreign').appendTo(paragraph);
// also add what's left to divide (or vice versa)
$('<span>').text(' (' + accounting.formatMoney(left, foreignCurrencySymbol) + ')').addClass('text-danger amount-warning-foreign').appendTo(paragraph);
}
}