diff --git a/CHANGELOG.md b/CHANGELOG.md index 26f436279..e95a21f0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added + +- Added the total value in the create or edit transaction dialog + ### Changed - Upgraded `@angular/cdk` and `@angular/material` from version `11.0.4` to `12.0.6` diff --git a/apps/client/src/app/pages/account/account-page.component.ts b/apps/client/src/app/pages/account/account-page.component.ts index 1cca28ef4..9ae85c5e0 100644 --- a/apps/client/src/app/pages/account/account-page.component.ts +++ b/apps/client/src/app/pages/account/account-page.component.ts @@ -12,7 +12,7 @@ import { import { DataService } from '@ghostfolio/client/services/data.service'; import { UserService } from '@ghostfolio/client/services/user/user.service'; import { WebAuthnService } from '@ghostfolio/client/services/web-authn.service'; -import { baseCurrency, DEFAULT_DATE_FORMAT } from '@ghostfolio/common/config'; +import { DEFAULT_DATE_FORMAT, baseCurrency } from '@ghostfolio/common/config'; import { Access, User } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { Currency } from '@prisma/client'; diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts index cf942cc9c..d6fc7e8c8 100644 --- a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts +++ b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts @@ -23,7 +23,7 @@ import { CreateOrUpdateTransactionDialogParams } from './interfaces/interfaces'; @Component({ host: { class: 'h-100' }, - selector: 'create-or-update-transaction-dialog', + selector: 'gf-create-or-update-transaction-dialog', changeDetection: ChangeDetectionStrategy.OnPush, styleUrls: ['./create-or-update-transaction-dialog.scss'], templateUrl: 'create-or-update-transaction-dialog.html' diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html index 738fc68f5..eb4205a73 100644 --- a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html +++ b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html @@ -2,6 +2,22 @@

Update transaction

Add transaction

+
+ + Account + + {{ account.name }} + + +
Symbol or ISIN @@ -42,7 +58,7 @@
-
+
Currency
+
+
+
- - Account - - {{ account.name }} - - + +
-
- - -
diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts index b9a3c08ee..72d6d687b 100644 --- a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts +++ b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts @@ -9,6 +9,7 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatSelectModule } from '@angular/material/select'; +import { GfValueModule } from '@ghostfolio/client/components/value/value.module'; import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module'; import { CreateOrUpdateTransactionDialog } from './create-or-update-transaction-dialog.component'; @@ -19,6 +20,7 @@ import { CreateOrUpdateTransactionDialog } from './create-or-update-transaction- imports: [ CommonModule, GfSymbolModule, + GfValueModule, FormsModule, MatAutocompleteModule, MatButtonModule, diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss index fb2501ff3..b5f424dcf 100644 --- a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss +++ b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss @@ -1,6 +1,12 @@ :host { display: block; + .mat-dialog-actions { + gf-value { + font-size: 0.9rem; + } + } + .mat-dialog-content { max-height: unset; diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts index 89223e404..291b488cb 100644 --- a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts +++ b/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts @@ -1,7 +1,8 @@ +import { User } from '@ghostfolio/common/interfaces'; import { Account, Order } from '@prisma/client'; export interface CreateOrUpdateTransactionDialogParams { accountId: string; - accounts: Account[]; transaction: Order; + user: User; } diff --git a/apps/client/src/app/pages/transactions/transactions-page.component.ts b/apps/client/src/app/pages/transactions/transactions-page.component.ts index 684535d6b..79888ca51 100644 --- a/apps/client/src/app/pages/transactions/transactions-page.component.ts +++ b/apps/client/src/app/pages/transactions/transactions-page.component.ts @@ -141,7 +141,6 @@ export class TransactionsPageComponent implements OnInit { }: OrderModel): void { const dialogRef = this.dialog.open(CreateOrUpdateTransactionDialog, { data: { - accounts: this.user.accounts, transaction: { accountId, currency, @@ -153,7 +152,8 @@ export class TransactionsPageComponent implements OnInit { symbol, type, unitPrice - } + }, + user: this.user }, height: this.deviceType === 'mobile' ? '97.5vh' : '80vh', width: this.deviceType === 'mobile' ? '100vw' : '50rem' @@ -182,7 +182,6 @@ export class TransactionsPageComponent implements OnInit { private openCreateTransactionDialog(aTransaction?: OrderModel): void { const dialogRef = this.dialog.open(CreateOrUpdateTransactionDialog, { data: { - accounts: this.user?.accounts, transaction: { accountId: aTransaction?.accountId ?? @@ -197,7 +196,8 @@ export class TransactionsPageComponent implements OnInit { symbol: aTransaction?.symbol ?? null, type: aTransaction?.type ?? 'BUY', unitPrice: null - } + }, + user: this.user }, height: this.deviceType === 'mobile' ? '97.5vh' : '80vh', width: this.deviceType === 'mobile' ? '100vw' : '50rem'