From e4074f95c9c644907e915b6b8d5ed39587af0fe5 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 25 Aug 2024 10:03:40 +0200 Subject: [PATCH] Feature/handle activities of excluded accounts (#3697) * Handle activities of excluded accounts --- .../lib/activities-table/activities-table.component.html | 8 +++----- .../lib/activities-table/activities-table.component.ts | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html index 679f44790..cb8115d3e 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -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)" > diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index 2531e9142..482305bb7 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -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,