Browse Source

Clean up

pull/187/head
Thomas 4 years ago
parent
commit
c87a284c97
  1. 2
      apps/api/src/app/portfolio/portfolio.service.ts
  2. 1
      apps/api/src/models/portfolio.ts
  3. 12
      apps/client/src/app/components/investment-chart/investment-chart.component.ts

2
apps/api/src/app/portfolio/portfolio.service.ts

@ -20,7 +20,6 @@ import {
getMonth, getMonth,
getYear, getYear,
isAfter, isAfter,
isBefore,
isSameDay, isSameDay,
parse, parse,
parseISO, parseISO,
@ -28,7 +27,6 @@ import {
setMonth, setMonth,
sub sub
} from 'date-fns'; } from 'date-fns';
import { port } from 'envalid';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import * as roundTo from 'round-to'; import * as roundTo from 'round-to';

1
apps/api/src/models/portfolio.ts

@ -220,7 +220,6 @@ export class Portfolio implements PortfolioInterface {
} }
return cloneDeep(this.portfolioItems); return cloneDeep(this.portfolioItems);
// return [];
} }
public getCommittedFunds() { public getCommittedFunds() {

12
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; return position.investment;
}), }),
segment: { segment: {
borderColor: (ctx) => borderColor: (context: unknown) =>
this.isInFuture( this.isInFuture(
ctx, context,
`rgba(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b}, 0.5)` `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 stepped: true
} }
@ -154,9 +154,9 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy, OnInit {
} }
} }
private isInFuture(ctx, value) { private isInFuture(aContext: any, aValue: any) {
return isAfter(new Date(ctx?.p0?.parsed?.x), new Date()) return isAfter(new Date(aContext?.p0?.parsed?.x), new Date())
? value ? aValue
: undefined; : undefined;
} }
} }

Loading…
Cancel
Save