IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some javascript clean up

Browse Source
This commit is contained in:
James Cole
2017-04-15 07:25:09 +02:00
parent 8dc56bcee0
commit 490733bdd1
6 changed files with 130 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
public/js/ff/firefly.js
View File

@@ -13,6 +13,8 @@
$(function () {
"use strict";
configAccounting(currencySymbol);
$.ajaxSetup({
headers: {
'X-CSRF-Token': $('meta[name="_token"]').attr('content')
@@ -108,22 +110,24 @@ function currencySelect(e) {
return false;
}
// Settings object that controls default parameters for library methods:
accounting.settings = {
currency: {
symbol: currencySymbol, // default currency symbol is '$'
format: accountingConfig, // controls output: %s = symbol, %v = value/number (can be object: see below)
decimal: mon_decimal_point, // decimal point separator
thousand: mon_thousands_sep, // thousands separator
precision: frac_digits // decimal places
},
number: {
precision: 0, // default precision on numbers is 0
thousand: ",",
decimal: "."
}
};
function configAccounting(customCurrency) {
// Settings object that controls default parameters for library methods:
accounting.settings = {
currency: {
symbol: customCurrency, // default currency symbol is '$'
format: accountingConfig, // controls output: %s = symbol, %v = value/number (can be object: see below)
decimal: mon_decimal_point, // decimal point separator
thousand: mon_thousands_sep, // thousands separator
precision: frac_digits // decimal places
},
number: {
precision: 0, // default precision on numbers is 0
thousand: ",",
decimal: "."
}
};
}
function listLengthInitial() {
"use strict";

87
public/js/ff/transactions/single/create.js
View File

@@ -26,7 +26,6 @@ $(document).ready(function () {
updateNativeCurrency();
// 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);
@@ -101,85 +100,83 @@ function updateForm() {
"use strict";
$('input[name="what"]').val(what);
var destName = $('#ffInput_destination_account_name');
var srcName = $('#ffInput_source_account_name');
switch (what) {
case 'withdrawal':
// show source_id and dest_name
$('#source_account_id_holder').show();
$('#destination_account_name_holder').show();
document.getElementById('source_account_id_holder').style.display = 'block';
document.getElementById('destination_account_name_holder').style.display = 'block';
// hide others:
$('#source_account_name_holder').hide();
$('#destination_account_id_holder').hide();
//
$('#budget_id_holder').show();
document.getElementById('source_account_name_holder').style.display = 'none';
document.getElementById('destination_account_id_holder').style.display = 'none';
document.getElementById('budget_id_holder').style.display = 'block';
// hide piggy bank:
$('#piggy_bank_id_holder').hide();
document.getElementById('piggy_bank_id_holder').style.display = 'none';
// copy destination account name to
// source account name:
if ($('#ffInput_destination_account_name').val().length > 0) {
$('#ffInput_source_account_name').val($('#ffInput_destination_account_name').val());
// copy destination account name to source account name:
if (destName.val().length > 0) {
srcName.val(destName.val());
}
// exchange / foreign currencies:
// hide explanation, hide source and destination amounts:
$('#exchange_rate_instruction_holder').hide();
$('#source_amount_holder').hide();
$('#destination_amount_holder').hide();
// show normal amount:
$('#amount_holder').show();
// hide explanation, hide source and destination amounts, show normal amount
document.getElementById('exchange_rate_instruction_holder').style.display = 'none';
document.getElementById('source_amount_holder').style.display = 'none';
document.getElementById('destination_amount_holder').style.display = 'none';
document.getElementById('amount_holder').style.display = 'block';
break;
case 'deposit':
// show source_name and dest_id:
$('#source_account_name_holder').show();
$('#destination_account_id_holder').show();
document.getElementById('source_account_name_holder').style.display = 'block';
document.getElementById('destination_account_id_holder').style.display = 'block';
// hide others:
$('#source_account_id_holder').hide();
$('#destination_account_name_holder').hide();
document.getElementById('source_account_id_holder').style.display = 'none';
document.getElementById('destination_account_name_holder').style.display = 'none';
// hide budget
$('#budget_id_holder').hide();
document.getElementById('budget_id_holder').style.display = 'none';
// hide piggy bank
$('#piggy_bank_id_holder').hide();
document.getElementById('piggy_bank_id_holder').style.display = 'none';
if ($('#ffInput_source_account_name').val().length > 0) {
$('#ffInput_destination_account_name').val($('#ffInput_source_account_name').val());
// copy name
if (srcName.val().length > 0) {
destName.val(srcName.val());
}
// exchange / foreign currencies:
// hide explanation, hide source and destination amounts:
$('#exchange_rate_instruction_holder').hide();
$('#source_amount_holder').hide();
$('#destination_amount_holder').hide();
// show normal amount:
$('#amount_holder').show();
// hide explanation, hide source and destination amounts, show amount
document.getElementById('exchange_rate_instruction_holder').style.display = 'none';
document.getElementById('source_amount_holder').style.display = 'none';
document.getElementById('destination_amount_holder').style.display = 'none';
document.getElementById('amount_holder').style.display = 'block';
break;
case 'transfer':
// show source_id and dest_id:
$('#source_account_id_holder').show();
$('#destination_account_id_holder').show();
document.getElementById('source_account_id_holder').style.display = 'block';
document.getElementById('destination_account_id_holder').style.display = 'block';
// hide others:
$('#source_account_name_holder').hide();
$('#destination_account_name_holder').hide();
document.getElementById('source_account_name_holder').style.display = 'none';
document.getElementById('destination_account_name_holder').style.display = 'none';
// hide budget
$('#budget_id_holder').hide();
document.getElementById('budget_id_holder').style.display = 'none';
// optional piggies
var showPiggies = 'block';
if (piggiesLength === 0) {
$('#piggy_bank_id_holder').hide();
} else {
$('#piggy_bank_id_holder').show();
showPiggies = 'none';
}
break;
default:
// no action.
document.getElementById('piggy_bank_id_holder').style.display = showPiggies;
break;
}
// update the amount thing:
updateNativeCurrency();
}

2
public/js/ff/transactions/single/edit.js
View File

@@ -49,6 +49,8 @@ function updateInitialPage() {
return;
}
$('#source_amount_holder').hide();
$('#destination_amount_holder').hide();
if (journalData.native_currency.id === journalData.currency.id) {