bastian/teamwallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/cash-flow-presentation'

Browse Source 
# Conflicts:
#	myteamwallet_frontend_modern/src/app/features/team/cashbox/cashbox.ts
#	myteamwallet_frontend_modern/src/app/features/team/overview/overview.spec.ts
#	myteamwallet_frontend_modern/src/app/features/team/overview/overview.ts
This commit is contained in:
Bastian Wagner
2026-08-02 09:49:30 +02:00
parent 26391b5b2c 367533f1f5
commit 6eeaa3a624
23 changed files with 546 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
myteamwallet_frontend_modern/src/app/features/team/cashbox/cashbox.ts
View File

@@ -24,9 +24,9 @@ import {
TeamActivity,
} from '../../../models/transaction.model';
import { ConfirmDialog, ConfirmDialogData } from '../../../shared/confirm-dialog/confirm-dialog';
import { splitAmounts } from './transaction-calculation';
import { signedTransactionAmount } from '../../../models/transaction-amount';
import { ContextHelp } from '../../../shared/context-help/context-help';
import { TransactionAmount } from '../../../shared/transaction-amount/transaction-amount';
import { splitAmounts } from './transaction-calculation';
registerLocaleData(localeDe);
@@ -48,6 +48,7 @@ const HIGH_AMOUNT_CONFIRM_THRESHOLD = 300;
MatSelectModule,
MatSnackBarModule,
ContextHelp,
TransactionAmount,
],
providers: [{ provide: LOCALE_ID, useValue: 'de-DE' }],
templateUrl: './cashbox.html',
@@ -64,9 +65,8 @@ export class Cashbox {
private readonly teamStore = inject(TeamStore);
private readonly transactionsApi = inject(TransactionsApi);
private loadedTeamId: number | null = null;
private pendingPenaltyId: number | null = Number(
this.route.snapshot.queryParamMap.get('penaltyId'),
) || null;
private pendingPenaltyId: number | null =
Number(this.route.snapshot.queryParamMap.get('penaltyId')) || null;
protected readonly team = this.teamStore.team;
protected readonly activities = signal<TeamActivity[]>([]);
@@ -241,10 +241,6 @@ export class Cashbox {
);
}
protected displayAmount(activity: TeamActivity): number {
return signedTransactionAmount(activity.amount, activity.type);
}
private createPlayerTransactions(transactions: CreatePlayerTransaction[]): void {
this.saving.set(true);
this.transactionsApi.createPlayerTransactions(transactions).subscribe({