From c87a284c97e0962526decc913348d6047fd75197 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Wed, 30 Jun 2021 21:33:57 +0200 Subject: [PATCH] Clean up --- apps/api/src/app/portfolio/portfolio.service.ts | 2 -- apps/api/src/models/portfolio.ts | 1 - .../investment-chart/investment-chart.component.ts | 12 ++++++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 02762c48e..7c922c16b 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -20,7 +20,6 @@ import { getMonth, getYear, isAfter, - isBefore, isSameDay, parse, parseISO, @@ -28,7 +27,6 @@ import { setMonth, sub } from 'date-fns'; -import { port } from 'envalid'; import { isEmpty } from 'lodash'; import * as roundTo from 'round-to'; diff --git a/apps/api/src/models/portfolio.ts b/apps/api/src/models/portfolio.ts index 7a4e450df..9d0057dac 100644 --- a/apps/api/src/models/portfolio.ts +++ b/apps/api/src/models/portfolio.ts @@ -220,7 +220,6 @@ export class Portfolio implements PortfolioInterface { } return cloneDeep(this.portfolioItems); - // return []; } public getCommittedFunds() { diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.ts index bd323e76a..edeac621a 100644 --- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts +++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts @@ -89,12 +89,12 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy, OnInit { return position.investment; }), segment: { - borderColor: (ctx) => + borderColor: (context: unknown) => this.isInFuture( - ctx, + context, `rgba(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b}, 0.5)` ), - borderDash: (ctx) => this.isInFuture(ctx, [2, 2]) + borderDash: (context: unknown) => this.isInFuture(context, [2, 2]) }, stepped: true } @@ -154,9 +154,9 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy, OnInit { } } - private isInFuture(ctx, value) { - return isAfter(new Date(ctx?.p0?.parsed?.x), new Date()) - ? value + private isInFuture(aContext: any, aValue: any) { + return isAfter(new Date(aContext?.p0?.parsed?.x), new Date()) + ? aValue : undefined; } }