expenditures: added badge for open approvals

This commit is contained in:
2025-02-19 14:49:21 +01:00
parent dd587f7603
commit 839f668b08
4 changed files with 31 additions and 6 deletions

View File

@@ -62,7 +62,11 @@ var badges = {
news: {
id: 'badge-more-news',
cnt: 0
}
},
expenditures: {
id: 'badge-more-expenditures',
cnt: 0
}
}
}
};
@@ -512,6 +516,24 @@ async function updateNewsBadge() {
updateBadge('more/news', sum);
}
async function updateExpendituresBadge() {
let allExps = await dbGetData('expenditures');
let sum = 0;
for (let i in allExps) {
let exp = allExps[i];
if (exp.approved == 0) {
if (exp.direction < 0 && exp.canceled == 0) sum++;
if (exp.direction > 0 && exp.canceled == 1) sum++;
}
}
updateBadge('more/expenditures', sum);
}
function updateBadges() {
updateNewsBadge();
updateExpendituresBadge();
}
var initRegatten = function() {
showLoader();
@@ -568,11 +590,11 @@ var onDatabaseLoaded = function() {
onServiceWorkerLoaded();
initPushSettings();
updateNewsBadge();
updateBadges();
}
var onAfterSync = function() {
updateNewsBadge();
updateBadges();
}
function sendErrorReport() {

View File

@@ -71,7 +71,7 @@
<a href="<?php echo LINK_PRE; ?>expenditures" class="show-loggedin">
<i class="fa font-14 fa-money-bill-wave rounded-s bg-highlight color-white"></i>
<span>Ausgaben-Verwaltung</span>
<!--<span id="badge-more-expenditures" class="badge bg-highlight color-white"></span>-->
<span id="badge-more-expenditures" class="badge bg-highlight color-white"></span>
<i class="fa fa-angle-right"></i>
</a>
<a href="<?php echo LINK_PRE; ?>trim_list">

View File

@@ -100,6 +100,7 @@ async function expendituresInitModals() {
},
success: async function (data, status, xhr) {
await sync();
updateExpendituresBadge();
$('#menu-add').hideMenu();
hideLoader();
toastOk('Ausgabe gespeichert. Betrag wurde durch ' + data.count + ' Personen geteilt.');
@@ -199,6 +200,7 @@ async function expendituresInitModals() {
},
success: async function (data, status, xhr) {
await sync();
updateExpendituresBadge();
$('#menu-add-transfer').hideMenu();
hideLoader();
toastOk(direction ? 'Geldtransfer gespeichert. ' + (await dbGetData('users', selectedUser)).username + ' muss dies noch bestätigen' : 'Geldtransfer wurde gespeichert');

View File

@@ -78,8 +78,9 @@ function expenditureAction(action, expId, successStr) {
}
hideLoader();
},
success: function (data, status, xhr) {
sync();
success: async function (data, status, xhr) {
await sync();
updateExpendituresBadge();
hideLoader();
toastOk(successStr);
}