Browse Source
Merge branch 'main' into feature/clean-up-void-return-types
pull/3018/head
Thomas Kaul
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
11 additions and
6 deletions
-
CHANGELOG.md
-
apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
-
apps/client/src/app/pages/public/public-page.html
-
libs/ui/src/lib/holdings-table/holdings-table.component.html
-
libs/ui/src/lib/holdings-table/holdings-table.component.ts
|
|
@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 |
|
|
|
|
|
|
|
### Changed |
|
|
|
|
|
|
|
- Improved the usability of the holdings table |
|
|
|
- Improved the language localization for German (`de`) |
|
|
|
- Upgraded `ng-extract-i18n-merge` from version `2.9.1` to `2.10.0` |
|
|
|
|
|
|
|
|
|
@ -77,6 +77,7 @@ |
|
|
|
<gf-holdings-table |
|
|
|
[baseCurrency]="user?.settings?.baseCurrency" |
|
|
|
[deviceType]="data.deviceType" |
|
|
|
[hasPermissionToOpenDetails]="false" |
|
|
|
[holdings]="holdings" |
|
|
|
[locale]="user?.settings?.locale" |
|
|
|
/> |
|
|
|
|
|
@ -132,6 +132,7 @@ |
|
|
|
<div class="col-lg"> |
|
|
|
<gf-holdings-table |
|
|
|
[deviceType]="deviceType" |
|
|
|
[hasPermissionToOpenDetails]="false" |
|
|
|
[hasPermissionToShowValues]="false" |
|
|
|
[holdings]="holdings" |
|
|
|
[pageSize]="7" |
|
|
|
|
|
@ -137,12 +137,11 @@ |
|
|
|
mat-row |
|
|
|
[ngClass]="{ |
|
|
|
'cursor-pointer': |
|
|
|
hasPermissionToShowValues && |
|
|
|
hasPermissionToOpenDetails && |
|
|
|
!ignoreAssetSubClasses.includes(row.assetSubClass) |
|
|
|
}" |
|
|
|
(click)=" |
|
|
|
hasPermissionToShowValues && |
|
|
|
!ignoreAssetSubClasses.includes(row.assetSubClass) && |
|
|
|
!ignoreAssetSubClasses.includes(row.assetSubClass) && |
|
|
|
onOpenPositionDialog({ |
|
|
|
dataSource: row.dataSource, |
|
|
|
symbol: row.symbol |
|
|
|
|
|
@ -26,6 +26,7 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit { |
|
|
|
@Input() baseCurrency: string; |
|
|
|
@Input() deviceType: string; |
|
|
|
@Input() hasPermissionToCreateActivity: boolean; |
|
|
|
@Input() hasPermissionToOpenDetails = true; |
|
|
|
@Input() hasPermissionToShowValues = true; |
|
|
|
@Input() holdings: PortfolioPosition[]; |
|
|
|
@Input() locale: string; |
|
|
@ -69,9 +70,11 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit { |
|
|
|
} |
|
|
|
|
|
|
|
public onOpenPositionDialog({ dataSource, symbol }: UniqueAsset) { |
|
|
|
this.router.navigate([], { |
|
|
|
queryParams: { dataSource, symbol, positionDetailDialog: true } |
|
|
|
}); |
|
|
|
if (this.hasPermissionToOpenDetails) { |
|
|
|
this.router.navigate([], { |
|
|
|
queryParams: { dataSource, symbol, positionDetailDialog: true } |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public onShowAllPositions() { |
|
|
|