Browse Source

Use Time-Weighted for performance graph

pull/5027/head
Dan 2 months ago
parent
commit
96186dd4d8
  1. 9
      apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html
  2. 8
      apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts

9
apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html

@ -3,7 +3,14 @@
<div <div
class="align-items-center d-flex flex-grow-1 h5 mb-0 py-2 text-truncate" class="align-items-center d-flex flex-grow-1 h5 mb-0 py-2 text-truncate"
> >
<span i18n>Performance</span> <span i18n
>Performance
{{
user?.settings?.performanceCalculationType === 'ROI'
? '(Time-Weighted)'
: ''
}}</span
>
@if (user?.subscription?.type === 'Basic') { @if (user?.subscription?.type === 'Basic') {
<gf-premium-indicator class="ml-1" /> <gf-premium-indicator class="ml-1" />
} }

8
apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts

@ -17,6 +17,7 @@ import type {
DateRange, DateRange,
GroupBy GroupBy
} from '@ghostfolio/common/types'; } from '@ghostfolio/common/types';
import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
import { translate } from '@ghostfolio/ui/i18n'; import { translate } from '@ghostfolio/ui/i18n';
import { Clipboard } from '@angular/cdk/clipboard'; import { Clipboard } from '@angular/cdk/clipboard';
@ -305,6 +306,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
{ {
date, date,
netPerformanceInPercentageWithCurrencyEffect, netPerformanceInPercentageWithCurrencyEffect,
timeWeightedPerformanceInPercentageWithCurrencyEffect,
totalInvestmentValueWithCurrencyEffect, totalInvestmentValueWithCurrencyEffect,
valueInPercentage, valueInPercentage,
valueWithCurrencyEffect valueWithCurrencyEffect
@ -325,7 +327,11 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
} }
this.performanceDataItemsInPercentage.push({ this.performanceDataItemsInPercentage.push({
date, date,
value: netPerformanceInPercentageWithCurrencyEffect value:
this.user?.settings?.performanceCalculationType ===
PerformanceCalculationType.ROI
? timeWeightedPerformanceInPercentageWithCurrencyEffect
: netPerformanceInPercentageWithCurrencyEffect
}); });
} }

Loading…
Cancel
Save