Browse Source

Remove current year from dateRange loop

pull/3393/head
Thomas Kaul 1 year ago
parent
commit
66e87edd9d
  1. 14
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

14
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

@ -19,7 +19,8 @@ import {
eachDayOfInterval, eachDayOfInterval,
eachYearOfInterval, eachYearOfInterval,
format, format,
isBefore isBefore,
isThisYear
} from 'date-fns'; } from 'date-fns';
import { cloneDeep, first, last, sortBy } from 'lodash'; import { cloneDeep, first, last, sortBy } from 'lodash';
@ -105,11 +106,6 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
} }
} }
console.log(
'Overall: totalTimeWeightedInvestmentValue',
totalTimeWeightedInvestment.toFixed()
);
return { return {
currentValueInBaseCurrency, currentValueInBaseCurrency,
grossPerformance, grossPerformance,
@ -865,7 +861,11 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
'mtd', 'mtd',
'wtd', 'wtd',
'ytd', 'ytd',
...eachYearOfInterval({ end, start }).map((date) => { ...eachYearOfInterval({ end, start })
.filter((date) => {
return !isThisYear(date);
})
.map((date) => {
return format(date, 'yyyy'); return format(date, 'yyyy');
}) })
]) { ]) {

Loading…
Cancel
Save