Browse Source

Merge branch 'main' into task/disable-selection-of-future-dates-in-account-balance-management

pull/7003/head
Thomas Kaul 15 hours ago
committed by GitHub
parent
commit
82c266d2f8
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      CHANGELOG.md
  2. 1
      apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
  3. 13
      libs/ui/src/lib/account-balances/account-balances.component.ts

1
CHANGELOG.md

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Prefilled the form in the account balance management with the current cash balance
- Disabled the selection of future dates in the account balance management - Disabled the selection of future dates in the account balance management
## 3.8.0 - 2026-06-07 ## 3.8.0 - 2026-06-07

1
apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@ -148,6 +148,7 @@
[accountBalances]="accountBalances" [accountBalances]="accountBalances"
[accountCurrency]="currency" [accountCurrency]="currency"
[accountId]="data.accountId" [accountId]="data.accountId"
[currentBalance]="balance"
[locale]="user?.settings?.locale" [locale]="user?.settings?.locale"
[showActions]=" [showActions]="
!data.hasImpersonationId && !data.hasImpersonationId &&

13
libs/ui/src/lib/account-balances/account-balances.component.ts

@ -13,6 +13,7 @@ import {
OnChanges, OnChanges,
OnInit, OnInit,
Output, Output,
effect,
inject, inject,
input, input,
viewChild viewChild
@ -70,6 +71,7 @@ export class GfAccountBalancesComponent implements OnChanges, OnInit {
input.required<AccountBalancesResponse['balances']>(); input.required<AccountBalancesResponse['balances']>();
public readonly accountCurrency = input.required<string>(); public readonly accountCurrency = input.required<string>();
public readonly accountId = input.required<string>(); public readonly accountId = input.required<string>();
public readonly currentBalance = input<number | null>();
public readonly displayedColumns: string[] = ['date', 'value', 'actions']; public readonly displayedColumns: string[] = ['date', 'value', 'actions'];
public readonly locale = input(getLocale()); public readonly locale = input(getLocale());
public readonly showActions = input(true); public readonly showActions = input(true);
@ -90,6 +92,17 @@ export class GfAccountBalancesComponent implements OnChanges, OnInit {
public constructor() { public constructor() {
addIcons({ calendarClearOutline, ellipsisHorizontal, trashOutline }); addIcons({ calendarClearOutline, ellipsisHorizontal, trashOutline });
effect(() => {
const currentBalance = this.currentBalance();
if (
this.accountBalanceForm.controls.balance.pristine &&
typeof currentBalance === 'number'
) {
this.accountBalanceForm.controls.balance.setValue(currentBalance);
}
});
} }
public ngOnInit() { public ngOnInit() {

Loading…
Cancel
Save