diff --git a/server/scripts/expenditures-add.js b/server/scripts/expenditures-add.js index 2c18fd7..dc49a2b 100644 --- a/server/scripts/expenditures-add.js +++ b/server/scripts/expenditures-add.js @@ -307,15 +307,15 @@ async function expendituresShowAdd(defaultUser = 0) { $('#menu-add').showMenu(); } -async function expendituresShowAddTransfer(defaultUser = 0) { - $('#switch-add-transfer-received').prop('checked', true).parent().prev().text('Geld gegeben').prev().removeClass('fa-arrow-left').addClass('fa-arrow-right'); +async function expendituresShowAddTransfer(defaultUser = 0, defaultDirection = true, defaultAmount = '') { + $('#switch-add-transfer-received').prop('checked', defaultDirection).parent().prev().text(defaultDirection ? 'Geld gegeben' : 'Geld bekommen').prev().removeClass(defaultDirection ? 'fa-arrow-left' : 'fa-arrow-right').addClass(defaultDirection ? 'fa-arrow-right' : 'fa-arrow-left'); if (defaultUser == 0) { - $('#item-add-transfer-user').data('userid', 0).find('span').html('an: bitte auswählen'); + $('#item-add-transfer-user').data('userid', 0).find('span').html((defaultDirection ? 'an: ' : 'von: ') + 'bitte auswählen'); } else { - $('#item-add-transfer-user').data('userid', defaultUser).find('span').html('an: ' + (await dbGetData('users', defaultUser)).username); + $('#item-add-transfer-user').data('userid', defaultUser).find('span').html((defaultDirection ? 'an: ' : 'von: ') + (await dbGetData('users', defaultUser)).username); } $('#input-add-transfer-date').val(formatDate('Y-m-d')).trigger('focusin'); - $('#input-add-transfer-amount').val(''); + $('#input-add-transfer-amount').val(defaultAmount).trigger('focusin').trigger('focusout'); $('#input-add-transfer-purpose-text').val(''); $('#menu-add-transfer').showMenu(); } diff --git a/server/scripts/expenditures-user.js b/server/scripts/expenditures-user.js index 41d6e30..2dede7e 100644 --- a/server/scripts/expenditures-user.js +++ b/server/scripts/expenditures-user.js @@ -189,9 +189,16 @@ let siteScript = async function() { } let sumText = ''; - if (sum == 0) sumText = 'Du und ' + user.username + ' seid quitt.'; - else if (sum > 0) sumText = user.username + ' schuldet Dir noch ' + (sum / 100).toFixed(2) + ' €.'; // TODO: Ausgleichen Button? - else sumText = 'Du schuldest ' + user.username + ' noch ' + (-sum / 100).toFixed(2) + ' €.'; // TODO: Ausgleichen Button? + let sumButton = ''; + if (sum == 0) { + sumText = 'Du und ' + user.username + ' seid quitt.'; + } else if (sum > 0) { + sumText = user.username + ' schuldet Dir noch ' + (sum / 100).toFixed(2) + ' €.'; + sumButton = ' Ausgleichen'; + } else { + sumText = 'Du schuldest ' + user.username + ' noch ' + (-sum / 100).toFixed(2) + ' €.'; + sumButton = ' Ausgleichen'; + } results = exps.reverse(); @@ -200,6 +207,7 @@ let siteScript = async function() { let count = results.length; if (count > 0) { $('#p-count').text(sumText); + $('#p-count').html($('#p-count').html() + sumButton); $('#div-list').show(); $('#input-search').parent().show();