From 80132ba267609e8c9f6e40ad7048d521c7eb51ed Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Fri, 15 Apr 2022 18:04:59 +0200 Subject: [PATCH] Do not show total value if sell activity --- .../activities-table.component.html | 32 +++++++++++++------ .../activities-table.component.ts | 20 ++++++++++++ 2 files changed, 42 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 388a7e420..a7449a0be 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -268,11 +268,17 @@ > - + +
+ +
+ @@ -294,11 +300,17 @@ > - + +
+ +
+
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 2f0ff77f1..c76d4c6a8 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -79,6 +79,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { public searchKeywords: string[] = []; public separatorKeysCodes: number[] = [ENTER, COMMA]; public totalFees: number; + public totalValue: number; private allFilters: string[]; private unsubscribeSubject = new Subject(); @@ -251,6 +252,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { return activity.isDraft === true; }); this.totalFees = this.getTotalFees(); + this.totalValue = this.getTotalValue(); } private getSearchableFieldValues(activities: OrderWithAccount[]): string[] { @@ -314,4 +316,22 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { return totalFees.toNumber(); } + + private getTotalValue() { + let totalValue = new Big(0); + + for (const activity of this.dataSource.filteredData) { + if (isNumber(activity.valueInBaseCurrency)) { + if (activity.type === 'BUY' || activity.type === 'ITEM') { + totalValue = totalValue.plus(activity.valueInBaseCurrency); + } else if (activity.type === 'SELL') { + return null; + } + } else { + return null; + } + } + + return totalValue.toNumber(); + } }