Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/improve color assignment with annualized performance in treemap chart (#3657)
Thomas Kaulc34959896c35
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 34846d6917..74600ab0d5 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Improved the color assignment in the chart of the holdings tab on the home page (experimental)- Enabled Catalan (`ca`) as an option in the user settings (experimental)- Enabled Polish (`pl`) as an option in the user settings (experimental)- Improved the language localization for Portuguese (`pt`)diff --git a/apps/api/src/app/benchmark/benchmark.controller.ts b/apps/api/src/app/benchmark/benchmark.controller.tsindex ea9ba8025a..66c268b9b6 100644--- a/apps/api/src/app/benchmark/benchmark.controller.ts+++ b/apps/api/src/app/benchmark/benchmark.controller.ts@@ -1,8 +1,8 @@import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';-import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor';+import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import type {AssetProfileIdentifier,BenchmarkMarketDataDetails,@@ -113,7 +113,7 @@ export class BenchmarkController {@Param('symbol') symbol: string,@Query('range') dateRange: DateRange = 'max'): Promise<BenchmarkMarketDataDetails> {- const { endDate, startDate } = getInterval(+ const { endDate, startDate } = getIntervalFromDateRange(dateRange,new Date(startDateString));diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.tsindex af8a1e2964..7a9cf3d174 100644--- a/apps/api/src/app/order/order.controller.ts+++ b/apps/api/src/app/order/order.controller.ts@@ -1,12 +1,12 @@import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';-import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor';import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor';import { ApiService } from '@ghostfolio/api/services/api/api.service';import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';+import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import {DATA_GATHERING_QUEUE_PRIORITY_HIGH,HEADER_KEY_IMPERSONATION@@ -110,7 +110,7 @@ export class OrderController {let startDate: Date;if (dateRange) {- ({ endDate, startDate } = getInterval(dateRange));+ ({ endDate, startDate } = getIntervalFromDateRange(dateRange));}const filters = this.apiService.buildFiltersFromQueryParams({diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex 8c9342e399..697496a1c6 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -4,13 +4,11 @@ import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolimport { TransactionPointSymbol } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point-symbol.interface';import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import {- getFactor,- getInterval-} from '@ghostfolio/api/helper/portfolio.helper';+import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';+import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import { MAX_CHART_ITEMS } from '@ghostfolio/common/config';import {DATE_FORMAT,@@ -133,7 +131,7 @@ export abstract class PortfolioCalculator {this.useCache = useCache;this.userId = userId;- const { endDate, startDate } = getInterval(dateRange);+ const { endDate, startDate } = getIntervalFromDateRange(dateRange);this.endDate = endDate;this.startDate = startDate;@@ -303,7 +301,7 @@ export abstract class PortfolioCalculator {const feeInBaseCurrency = item.fee.mul(exchangeRatesByCurrency[`${item.currency}${this.currency}`]?.[lastTransactionPoint.date- ]+ ] ?? 1);const marketPriceInBaseCurrency = (@@ -433,7 +431,10 @@ export abstract class PortfolioCalculator {dateRange?: DateRange;withDataDecimation?: boolean;}): Promise<HistoricalDataItem[]> {- const { endDate, startDate } = getInterval(dateRange, this.getStartDate());+ const { endDate, startDate } = getIntervalFromDateRange(+ dateRange,+ this.getStartDate()+ );const daysInMarket = differenceInDays(endDate, startDate) + 1;const step = withDataDecimationdiff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.tsindex 3c7993c612..7ce0b08473 100644--- a/apps/api/src/app/portfolio/portfolio.controller.ts+++ b/apps/api/src/app/portfolio/portfolio.controller.ts@@ -7,7 +7,6 @@ import {hasNotDefinedValuesInObject,nullifyValuesInObject} from '@ghostfolio/api/helper/object.helper';-import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor';import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor';@@ -15,6 +14,7 @@ import { ApiService } from '@ghostfolio/api/services/api/api.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';+import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import {DEFAULT_CURRENCY,HEADER_KEY_IMPERSONATION@@ -247,7 +247,7 @@ export class PortfolioController {await this.impersonationService.validateImpersonationId(impersonationId);const userCurrency = this.request.user.Settings.settings.baseCurrency;- const { endDate, startDate } = getInterval(dateRange);+ const { endDate, startDate } = getIntervalFromDateRange(dateRange);const { activities } = await this.orderService.getOrders({endDate,diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex 67529cc676..52543c16c4 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -4,10 +4,7 @@ import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-detailsimport { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';import { OrderService } from '@ghostfolio/api/app/order/order.service';import { UserService } from '@ghostfolio/api/app/user/user.service';-import {- getFactor,- getInterval-} from '@ghostfolio/api/helper/portfolio.helper';+import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/base-currency-current-investment';@@ -18,7 +15,10 @@ import { DataProviderService } from '@ghostfolio/api/services/data-provider/dataimport { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';-import { getAnnualizedPerformancePercent } from '@ghostfolio/common/calculation-helper';+import {+ getAnnualizedPerformancePercent,+ getIntervalFromDateRange+} from '@ghostfolio/common/calculation-helper';import {DEFAULT_CURRENCY,EMERGENCY_FUND_TAG_ID,@@ -912,7 +912,7 @@ export class PortfolioService {const userId = await this.getUserId(impersonationId, this.request.user.id);const user = await this.userService.user({ id: userId });- const { endDate } = getInterval(dateRange);+ const { endDate } = getIntervalFromDateRange(dateRange);const { activities } = await this.orderService.getOrders({endDate,@@ -1089,7 +1089,7 @@ export class PortfolioService {));- const { endDate } = getInterval(dateRange);+ const { endDate } = getIntervalFromDateRange(dateRange);const { activities } = await this.orderService.getOrders({endDate,diff --git a/apps/api/src/helper/portfolio.helper.ts b/apps/api/src/helper/portfolio.helper.tsindex 21b111395e..6ebe48d3c7 100644--- a/apps/api/src/helper/portfolio.helper.ts+++ b/apps/api/src/helper/portfolio.helper.ts@@ -1,17 +1,4 @@-import { resetHours } from '@ghostfolio/common/helper';-import { DateRange } from '@ghostfolio/common/types';-import { Type as ActivityType } from '@prisma/client';-import {- endOfDay,- max,- subDays,- startOfMonth,- startOfWeek,- startOfYear,- subYears,- endOfYear-} from 'date-fns';export function getFactor(activityType: ActivityType) {let factor: number;@@ -30,61 +17,3 @@ export function getFactor(activityType: ActivityType) {return factor;}--export function getInterval(- aDateRange: DateRange,- portfolioStart = new Date(0)-) {- let endDate = endOfDay(new Date(Date.now()));- let startDate = portfolioStart;-- switch (aDateRange) {- case '1d':- startDate = max([- startDate,- subDays(resetHours(new Date(Date.now())), 1)- ]);- break;- case 'mtd':- startDate = max([- startDate,- subDays(startOfMonth(resetHours(new Date(Date.now()))), 1)- ]);- break;- case 'wtd':- startDate = max([- startDate,- subDays(- startOfWeek(resetHours(new Date(Date.now())), { weekStartsOn: 1 }),- 1- )- ]);- break;- case 'ytd':- startDate = max([- startDate,- subDays(startOfYear(resetHours(new Date(Date.now()))), 1)- ]);- break;- case '1y':- startDate = max([- startDate,- subYears(resetHours(new Date(Date.now())), 1)- ]);- break;- case '5y':- startDate = max([- startDate,- subYears(resetHours(new Date(Date.now())), 5)- ]);- break;- case 'max':- break;- default:- // '2024', '2023', '2022', etc.- endDate = endOfYear(new Date(aDateRange));- startDate = max([startDate, new Date(aDateRange)]);- }-- return { endDate, startDate };-}diff --git a/apps/client/src/app/components/home-holdings/home-holdings.html b/apps/client/src/app/components/home-holdings/home-holdings.htmlindex b3ebe941c7..bd9e57bb28 100644--- a/apps/client/src/app/components/home-holdings/home-holdings.html+++ b/apps/client/src/app/components/home-holdings/home-holdings.html@@ -38,6 +38,7 @@<gf-treemap-chartclass="mt-3"cursor="pointer"+ [dateRange]="user?.settings?.dateRange"[holdings]="holdings"(treemapChartClicked)="onSymbolClicked($event)"/>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.tsindex 429eaae6f7..15a4a6f9a7 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@@ -14,7 +14,7 @@ import {} from '@ghostfolio/common/helper';import { LineChartItem } from '@ghostfolio/common/interfaces';import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';-import { ColorScheme, DateRange, GroupBy } from '@ghostfolio/common/types';+import { ColorScheme, GroupBy } from '@ghostfolio/common/types';import {ChangeDetectionStrategy,@@ -58,7 +58,6 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {@Input() isInPercent = false;@Input() isLoading = false;@Input() locale = getLocale();- @Input() range: DateRange = 'max';@Input() savingsRate = 0;@ViewChild('chartCanvas') chartCanvas;diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.htmlindex 970a89f75c..73817bdcbd 100644--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html@@ -282,7 +282,6 @@[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"[isLoading]="isLoadingInvestmentChart"[locale]="user?.settings?.locale"- [range]="user?.settings?.dateRange"/></div></div>@@ -340,7 +339,6 @@[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"[isLoading]="isLoadingInvestmentTimelineChart"[locale]="user?.settings?.locale"- [range]="user?.settings?.dateRange"[savingsRate]="savingsRate"/></div>@@ -377,7 +375,6 @@[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"[isLoading]="isLoadingDividendTimelineChart"[locale]="user?.settings?.locale"- [range]="user?.settings?.dateRange"/></div></div>diff --git a/libs/common/src/lib/calculation-helper.ts b/libs/common/src/lib/calculation-helper.tsindex 7d2ec9099e..825282579c 100644--- a/libs/common/src/lib/calculation-helper.ts+++ b/libs/common/src/lib/calculation-helper.ts@@ -1,6 +1,19 @@import { Big } from 'big.js';+import {+ endOfDay,+ endOfYear,+ max,+ startOfMonth,+ startOfWeek,+ startOfYear,+ subDays,+ subYears+} from 'date-fns';import { isNumber } from 'lodash';+import { resetHours } from './helper';+import { DateRange } from './types';+export function getAnnualizedPerformancePercent({daysInMarket,netPerformancePercentage@@ -18,3 +31,61 @@ export function getAnnualizedPerformancePercent({return new Big(0);}++export function getIntervalFromDateRange(+ aDateRange: DateRange,+ portfolioStart = new Date(0)+) {+ let endDate = endOfDay(new Date(Date.now()));+ let startDate = portfolioStart;++ switch (aDateRange) {+ case '1d':+ startDate = max([+ startDate,+ subDays(resetHours(new Date(Date.now())), 1)+ ]);+ break;+ case 'mtd':+ startDate = max([+ startDate,+ subDays(startOfMonth(resetHours(new Date(Date.now()))), 1)+ ]);+ break;+ case 'wtd':+ startDate = max([+ startDate,+ subDays(+ startOfWeek(resetHours(new Date(Date.now())), { weekStartsOn: 1 }),+ 1+ )+ ]);+ break;+ case 'ytd':+ startDate = max([+ startDate,+ subDays(startOfYear(resetHours(new Date(Date.now()))), 1)+ ]);+ break;+ case '1y':+ startDate = max([+ startDate,+ subYears(resetHours(new Date(Date.now())), 1)+ ]);+ break;+ case '5y':+ startDate = max([+ startDate,+ subYears(resetHours(new Date(Date.now())), 5)+ ]);+ break;+ case 'max':+ break;+ default:+ // '2024', '2023', '2022', etc.+ endDate = endOfYear(new Date(aDateRange));+ startDate = max([startDate, new Date(aDateRange)]);+ }++ return { endDate, startDate };+}diff --git a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts b/libs/ui/src/lib/treemap-chart/treemap-chart.component.tsindex f65894da30..8915707fa0 100644--- a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts+++ b/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts@@ -1,8 +1,12 @@-import { getAnnualizedPerformancePercent } from '@ghostfolio/common/calculation-helper';+import {+ getAnnualizedPerformancePercent,+ getIntervalFromDateRange+} from '@ghostfolio/common/calculation-helper';import {AssetProfileIdentifier,PortfolioPosition} from '@ghostfolio/common/interfaces';+import { DateRange } from '@ghostfolio/common/types';import { CommonModule } from '@angular/common';import {@@ -23,7 +27,7 @@ import { ChartConfiguration } from 'chart.js';import { LinearScale } from 'chart.js';import { Chart } from 'chart.js';import { TreemapController, TreemapElement } from 'chartjs-chart-treemap';-import { differenceInDays } from 'date-fns';+import { differenceInDays, max } from 'date-fns';import { orderBy } from 'lodash';import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';@@ -41,6 +45,7 @@ export class GfTreemapChartComponentimplements AfterViewInit, OnChanges, OnDestroy{@Input() cursor: string;+ @Input() dateRange: DateRange;@Input() holdings: PortfolioPosition[];@Output() treemapChartClicked = new EventEmitter<AssetProfileIdentifier>();@@ -75,6 +80,8 @@ export class GfTreemapChartComponentprivate initialize() {this.isLoading = true;+ const { endDate, startDate } = getIntervalFromDateRange(this.dateRange);+const data: ChartConfiguration['data'] = <any>{datasets: [{@@ -82,8 +89,11 @@ export class GfTreemapChartComponentconst annualizedNetPerformancePercentWithCurrencyEffect =getAnnualizedPerformancePercent({daysInMarket: differenceInDays(- new Date(),- ctx.raw._data.dateOfFirstActivity+ endDate,+ max([+ ctx.raw._data.dateOfFirstActivity ?? new Date(0),+ startDate+ ])),netPerformancePercentage: new Big(ctx.raw._data.netPerformancePercentWithCurrencyEffectdiff --git a/libs/ui/src/lib/trend-indicator/trend-indicator.component.html b/libs/ui/src/lib/trend-indicator/trend-indicator.component.htmlindex 761b3f2328..b9f65a2eaa 100644--- a/libs/ui/src/lib/trend-indicator/trend-indicator.component.html+++ b/libs/ui/src/lib/trend-indicator/trend-indicator.component.html@@ -8,9 +8,9 @@}"/>} @else {- @if (marketState === 'closed' && range === '1d') {+ @if (marketState === 'closed' && dateRange === '1d') {<ion-icon class="text-muted" name="pause-circle-outline" [size]="size" />- } @else if (marketState === 'delayed' && range === '1d') {+ } @else if (marketState === 'delayed' && dateRange === '1d') {<ion-icon class="text-muted" name="time-outline" [size]="size" />} @else if (value <= -0.0005) {<ion-icondiff --git a/libs/ui/src/lib/trend-indicator/trend-indicator.component.ts b/libs/ui/src/lib/trend-indicator/trend-indicator.component.tsindex d03ee8cf4c..dcf32ab370 100644--- a/libs/ui/src/lib/trend-indicator/trend-indicator.component.ts+++ b/libs/ui/src/lib/trend-indicator/trend-indicator.component.ts@@ -19,9 +19,9 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';templateUrl: './trend-indicator.component.html'})export class GfTrendIndicatorComponent {+ @Input() dateRange: DateRange;@Input() isLoading = false;@Input() marketState: MarketState = 'open';- @Input() range: DateRange = 'max';@Input() size: 'large' | 'medium' | 'small' = 'small';@Input() value = 0;