Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

expenditures: Ausgleichen-Button

Browse Source
This commit is contained in:
Timon Ostertun
2025-02-19 15:05:19 +01:00
parent 839f668b08
commit a221c86431
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/scripts/expenditures-add.js
View File

@@ -307,15 +307,15 @@ async function expendituresShowAdd(defaultUser = 0) {
$('#menu-add').showMenu(); $('#menu-add').showMenu();
} }
async function expendituresShowAddTransfer(defaultUser = 0) { async function expendituresShowAddTransfer(defaultUser = 0, defaultDirection = true, defaultAmount = '') {
$('#switch-add-transfer-received').prop('checked', true).parent().prev().text('Geld gegeben').prev().removeClass('fa-arrow-left').addClass('fa-arrow-right'); $('#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) { if (defaultUser == 0) {
$('#item-add-transfer-user').data('userid', 0).find('span').html('an: <font style="font-style:italic;">bitte auswählen</font>'); $('#item-add-transfer-user').data('userid', 0).find('span').html((defaultDirection ? 'an: ' : 'von: ') + '<font style="font-style:italic;">bitte auswählen</font>');
} else { } 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-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(''); $('#input-add-transfer-purpose-text').val('');
$('#menu-add-transfer').showMenu(); $('#menu-add-transfer').showMenu();
} }

14
server/scripts/expenditures-user.js
View File

@@ -189,9 +189,16 @@ let siteScript = async function() {
} }
let sumText = ''; let sumText = '';
if (sum == 0) sumText = 'Du und ' + user.username + ' seid quitt.'; let sumButton = '';
else if (sum > 0) sumText = user.username + ' schuldet Dir noch ' + (sum / 100).toFixed(2) + ' €.'; // TODO: Ausgleichen Button? if (sum == 0) {
else sumText = 'Du schuldest ' + user.username + ' noch ' + (-sum / 100).toFixed(2) + ' €.'; // TODO: Ausgleichen Button? sumText = 'Du und ' + user.username + ' seid quitt.';
} else if (sum > 0) {
sumText = user.username + ' schuldet Dir noch ' + (sum / 100).toFixed(2) + ' €.';
sumButton = '&emsp;<a href="#" onclick="expendituresShowAddTransfer(' + user.id + ', false, ' + (sum/100) + '); return false;">Ausgleichen</a>';
} else {
sumText = 'Du schuldest ' + user.username + ' noch ' + (-sum / 100).toFixed(2) + ' €.';
sumButton = '&emsp;<a href="#" onclick="expendituresShowAddTransfer(' + user.id + ', true, ' + (-sum/100) + '); return false;">Ausgleichen</a>';
}
results = exps.reverse(); results = exps.reverse();
@@ -200,6 +207,7 @@ let siteScript = async function() {
let count = results.length; let count = results.length;
if (count > 0) { if (count > 0) {
$('#p-count').text(sumText); $('#p-count').text(sumText);
$('#p-count').html($('#p-count').html() + sumButton);
$('#div-list').show(); $('#div-list').show();
$('#input-search').parent().show(); $('#input-search').parent().show();