Browse Source
Feature/handle activities of excluded accounts (#3697)
* Handle activities of excluded accounts
pull/3699/head
Thomas Kaul
5 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
6 additions and
10 deletions
-
libs/ui/src/lib/activities-table/activities-table.component.html
-
libs/ui/src/lib/activities-table/activities-table.component.ts
|
|
@ -466,11 +466,9 @@ |
|
|
|
[ngClass]="{ |
|
|
|
'cursor-pointer': |
|
|
|
hasPermissionToOpenDetails && |
|
|
|
!row.isDraft && |
|
|
|
row.type !== 'FEE' && |
|
|
|
row.type !== 'INTEREST' && |
|
|
|
row.type !== 'ITEM' && |
|
|
|
row.type !== 'LIABILITY' |
|
|
|
row.Account?.isExcluded !== true && |
|
|
|
row.isDraft === false && |
|
|
|
['BUY', 'DIVIDEND', 'SELL'].includes(row.type) |
|
|
|
}" |
|
|
|
(click)="onClickActivity(row)" |
|
|
|
></tr> |
|
|
|
|
|
@ -199,11 +199,9 @@ export class GfActivitiesTableComponent |
|
|
|
} |
|
|
|
} else if ( |
|
|
|
this.hasPermissionToOpenDetails && |
|
|
|
!activity.isDraft && |
|
|
|
activity.type !== 'FEE' && |
|
|
|
activity.type !== 'INTEREST' && |
|
|
|
activity.type !== 'ITEM' && |
|
|
|
activity.type !== 'LIABILITY' |
|
|
|
activity.Account?.isExcluded !== true && |
|
|
|
activity.isDraft === false && |
|
|
|
['BUY', 'DIVIDEND', 'SELL'].includes(activity.type) |
|
|
|
) { |
|
|
|
this.onOpenPositionDialog({ |
|
|
|
dataSource: activity.SymbolProfile.dataSource, |
|
|
|