split external amount in expenses and gains
Build Docker Image / Docker-Build (push) Failing after 4m57s
Build Docker Image / Clean-Registry (push) Failing after 6s

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
2026-06-25 13:04:53 +02:00
parent 1d7b47aaa0
commit 097336d66d
3 changed files with 14 additions and 5 deletions
@@ -19,6 +19,7 @@
function calcSums(){ function calcSums(){
let sums = {}; let sums = {};
sums[ 0] = 0; sums[ 0] = 0;
sums[-1] = 0;
for (let user of Object.values(users)) sums[user.id] = 0; for (let user of Object.values(users)) sums[user.id] = 0;
for (let transaction of filtered) { for (let transaction of filtered) {
for (let user of Object.values(users)){ for (let user of Object.values(users)){
@@ -26,7 +27,7 @@
if (user.id == transaction.source.id) sums[user.id] -= transaction.amount; if (user.id == transaction.source.id) sums[user.id] -= transaction.amount;
} }
if (!transaction.destination.id) sums[ 0] += transaction.amount; if (!transaction.destination.id) sums[ 0] += transaction.amount;
if (!transaction.source.id) sums[0] -= transaction.amount; if (!transaction.source.id) sums[-1] += transaction.amount;
} }
return sums; return sums;
} }
@@ -154,10 +155,14 @@
</th> </th>
{/each} {/each}
<td class="amount"> <td class="amount">
<br/> {t('external gains')}<br/>
{sums[0].toFixed(2)}&nbsp;{account.currency} {sums[0].toFixed(2)}&nbsp;{account.currency}
</td> </td>
<td colspan="3"></td> <td class="amount">
{t('external expenses')}<br/>
{sums[-1].toFixed(2)}&nbsp;{account.currency}
</td>
<td colspan="2"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
+2
View File
@@ -126,6 +126,8 @@
"evaluate": "auswerten", "evaluate": "auswerten",
"expand_on_click": "Anklicken zum Anzeigen", "expand_on_click": "Anklicken zum Anzeigen",
"extended_settings": "erweiterte Einstellungen", "extended_settings": "erweiterte Einstellungen",
"external expenses": "externe Ausgaben",
"external gains": "externe Einnahmen",
"failed": "fehlgeschlagen", "failed": "fehlgeschlagen",
"failed_login_attempts" : "Account nach {attempts} fehlgeschlagenen Logins gesperrt bis {release_time}", "failed_login_attempts" : "Account nach {attempts} fehlgeschlagenen Logins gesperrt bis {release_time}",
+2
View File
@@ -126,6 +126,8 @@
"evaluate": "evaluate", "evaluate": "evaluate",
"expand_on_click": "click to expand", "expand_on_click": "click to expand",
"extended_settings": "extended settings", "extended_settings": "extended settings",
"external expenses": "external expenses",
"external gains": "external gains",
"failed": "failed", "failed": "failed",
"failed_login_attempts" : "account locked until {release_time} after {attempts} failed login attempts", "failed_login_attempts" : "account locked until {release_time} after {attempts} failed login attempts",