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

Expand view + JS for view to cope with new factory

Browse Source
This commit is contained in:
James Cole
2018-02-24 09:17:48 +01:00
parent 166cdad58b
commit 6fe5b50410
3 changed files with 73 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
public/js/ff/transactions/single/create.js vendored
View File

@@ -23,7 +23,7 @@
$(document).ready(function () {
"use strict";
// hide ALL exchange things and AMOUNT things
// hide ALL exchange things and AMOUNT fields
$('#exchange_rate_instruction_holder').hide();
$('#native_amount_holder').hide();
$('#amount_holder').hide();
@@ -38,8 +38,19 @@ $(document).ready(function () {
// when user changes source account or destination, native currency may be different.
$('select[name="source_account_id"]').on('change', updateNativeCurrency);
$('select[name="destination_account_id"]').on('change', updateNativeCurrency);
$('select[name="source_account_id"]').on('change', function() {
selectsDifferentSource();
// do something for transfers:
validateCurrencyForTransfer();
});
$('select[name="destination_account_id"]').on('change', function() {
selectsDifferentDestination();
// do something for transfers:
validateCurrencyForTransfer();
});
//$('select[name="source_account_id"]').on('change', updateNativeCurrency);
//$('select[name="destination_account_id"]').on('change', updateNativeCurrency);
// convert foreign currency to native currency (when input changes, exchange rate)
$('#ffInput_amount').on('change', convertForeignToNative);
@@ -52,6 +63,55 @@ $(document).ready(function () {
$('#ffInput_description').focus();
});
/**
* The user selects a different source account. Applies to withdrawals
* and transfers.
*/
function selectsDifferentSource() {
if (what === "deposit") {
console.log('User is making a deposit. Don\'t bother with source.');
$('input[name="source_account_currency"]').val("0");
return;
}
// store original currency ID of the selected account in a separate var:
var sourceId = $('select[name="source_account_id"]').val();
var sourceCurrency = accountInfo[sourceId].preferredCurrency;
$('input[name="source_account_currency"]').val(sourceCurrency);
console.log('Set source account currency to ' + sourceCurrency);
// change input thing:
$('.currency-option[data-id="' + sourceCurrency + '"]').click();
$('[data-toggle="dropdown"]').parent().removeClass('open');
$('select[name="source_account_id"]').focus();
return;
}
/**
* The user selects a different source account. Applies to withdrawals
* and transfers.
*/
function selectsDifferentDestination() {
if (what === "withdrawal") {
console.log('User is making a withdrawal. Don\'t bother with destination.');
$('input[name="destination_account_currency"]').val("0");
return;
}
// store original currency ID of the selected account in a separate var:
var destinationId = $('select[name="destination_account_id"]').val();
var destinationCurrency = accountInfo[destinationId].preferredCurrency;
$('input[name="destination_account_currency"]').val(destinationCurrency);
console.log('Set destinationId account currency to ' + destinationCurrency);
// change input thing:
$('.currency-option[data-id="' + destinationCurrency + '"]').click();
$('[data-toggle="dropdown"]').parent().removeClass('open');
$('select[name="destination_account_id"]').focus();
return;
}
/**
* This function generates a small helper text to explain the user
* that they have selected a foreign currency.
@@ -68,31 +128,6 @@ function getExchangeInstructions() {
return text;
}
/**
* There is an input that shows the currency symbol that is native to the selected
* acccount. So when the user changes the selected account, the native currency is updated:
*/
function updateNativeCurrency(useAccountCurrency) {
var nativeCurrencyId;
if (useAccountCurrency) {
var newAccountId = getAccountId();
nativeCurrencyId = accountInfo[newAccountId].preferredCurrency;
}
if (!useAccountCurrency) {
nativeCurrencyId = overruleCurrency;
}
$('.currency-option[data-id="' + nativeCurrencyId + '"]').click();
$('[data-toggle="dropdown"]').parent().removeClass('open');
if (what === 'withdrawal') {
$('select[name="source_account_id"]').focus();
}
if (what === 'deposit') {
$('select[name="destination_account_id"]').focus();
}
validateCurrencyForTransfer();
}
/**
*
*/
@@ -202,8 +237,14 @@ function updateForm() {
break;
}
// get instructions all the time.
updateNativeCurrency(useAccountCurrency);
//updateNativeCurrency(useAccountCurrency);
console.log('End of update form');
selectsDifferentSource();
selectsDifferentDestination();
selectsForeignCurrency();
// do something for transfers:
validateCurrencyForTransfer();
}
/**