Browse Source

Feature/use year-to-date as the fallback date range in the client

pull/8241/head
mister-ideas 5 days ago
parent
commit
799da6831d
  1. 4
      apps/client/src/app/components/home-holdings/home-holdings.component.ts
  2. 4
      apps/client/src/app/components/home-overview/home-overview.component.ts
  3. 12
      apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts

4
apps/client/src/app/components/home-holdings/home-holdings.component.ts

@ -1,7 +1,7 @@
import { UserService } from '@ghostfolio/client/services/user/user.service'; import { UserService } from '@ghostfolio/client/services/user/user.service';
import { import {
DEFAULT_CURRENCY, DEFAULT_CURRENCY,
DEFAULT_DATE_RANGE, DEFAULT_USER_DATE_RANGE,
DEFAULT_LOCALE DEFAULT_LOCALE
} from '@ghostfolio/common/config'; } from '@ghostfolio/common/config';
import { import {
@ -66,7 +66,7 @@ export class GfHomeHoldingsComponent implements OnInit {
}); });
protected readonly dateRange = computed(() => { protected readonly dateRange = computed(() => {
return this.user()?.settings?.dateRange ?? DEFAULT_DATE_RANGE; return this.user()?.settings?.dateRange ?? DEFAULT_USER_DATE_RANGE;
}); });
protected readonly deviceType = computed(() => { protected readonly deviceType = computed(() => {

4
apps/client/src/app/components/home-overview/home-overview.component.ts

@ -4,7 +4,7 @@ import { ImpersonationStorageService } from '@ghostfolio/client/services/imperso
import { UserService } from '@ghostfolio/client/services/user/user.service'; import { UserService } from '@ghostfolio/client/services/user/user.service';
import { import {
DEFAULT_CURRENCY, DEFAULT_CURRENCY,
DEFAULT_DATE_RANGE, DEFAULT_USER_DATE_RANGE,
DEFAULT_LOCALE, DEFAULT_LOCALE,
NUMERICAL_PRECISION_THRESHOLD_6_FIGURES NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
} from '@ghostfolio/common/config'; } from '@ghostfolio/common/config';
@ -191,7 +191,7 @@ export class GfHomeOverviewComponent implements OnInit {
this.dataService this.dataService
.fetchPortfolioPerformance({ .fetchPortfolioPerformance({
range: userSettings?.dateRange ?? DEFAULT_DATE_RANGE range: userSettings?.dateRange ?? DEFAULT_USER_DATE_RANGE
}) })
.pipe(takeUntilDestroyed(this.destroyRef)) .pipe(takeUntilDestroyed(this.destroyRef))
.subscribe(({ chart, errors, performance }) => { .subscribe(({ chart, errors, performance }) => {

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

@ -1,7 +1,7 @@
import { GfBenchmarkComparatorComponent } from '@ghostfolio/client/components/benchmark-comparator/benchmark-comparator.component'; import { GfBenchmarkComparatorComponent } from '@ghostfolio/client/components/benchmark-comparator/benchmark-comparator.component';
import { UserService } from '@ghostfolio/client/services/user/user.service'; import { UserService } from '@ghostfolio/client/services/user/user.service';
import { import {
DEFAULT_DATE_RANGE, DEFAULT_USER_DATE_RANGE,
NUMERICAL_PRECISION_THRESHOLD_6_FIGURES NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
} from '@ghostfolio/common/config'; } from '@ghostfolio/common/config';
import { SubscriptionType } from '@ghostfolio/common/enums'; import { SubscriptionType } from '@ghostfolio/common/enums';
@ -249,12 +249,12 @@ export class GfAnalysisPageComponent implements OnInit {
dividends: this.dataService.fetchDividends({ dividends: this.dataService.fetchDividends({
filters: this.userService.getFilters(), filters: this.userService.getFilters(),
groupBy: this.mode(), groupBy: this.mode(),
range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE range: this.user?.settings?.dateRange ?? DEFAULT_USER_DATE_RANGE
}), }),
investments: this.dataService.fetchInvestments({ investments: this.dataService.fetchInvestments({
filters: this.userService.getFilters(), filters: this.userService.getFilters(),
groupBy: this.mode(), groupBy: this.mode(),
range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE range: this.user?.settings?.dateRange ?? DEFAULT_USER_DATE_RANGE
}) })
}) })
.pipe(takeUntilDestroyed(this.destroyRef)) .pipe(takeUntilDestroyed(this.destroyRef))
@ -323,7 +323,7 @@ export class GfAnalysisPageComponent implements OnInit {
.fetchPortfolioPerformance({ .fetchPortfolioPerformance({
filters: this.userService.getFilters(), filters: this.userService.getFilters(),
groupBy: 'year', groupBy: 'year',
range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE range: this.user?.settings?.dateRange ?? DEFAULT_USER_DATE_RANGE
}) })
.pipe(takeUntilDestroyed(this.destroyRef)) .pipe(takeUntilDestroyed(this.destroyRef))
.subscribe(({ chart }) => { .subscribe(({ chart }) => {
@ -353,7 +353,7 @@ export class GfAnalysisPageComponent implements OnInit {
this.dataService this.dataService
.fetchPortfolioPerformance({ .fetchPortfolioPerformance({
filters: this.userService.getFilters(), filters: this.userService.getFilters(),
range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE range: this.user?.settings?.dateRange ?? DEFAULT_USER_DATE_RANGE
}) })
.pipe(takeUntilDestroyed(this.destroyRef)) .pipe(takeUntilDestroyed(this.destroyRef))
.subscribe(({ chart, dateOfFirstActivity, performance }) => { .subscribe(({ chart, dateOfFirstActivity, performance }) => {
@ -482,7 +482,7 @@ export class GfAnalysisPageComponent implements OnInit {
dataSource, dataSource,
symbol, symbol,
filters: this.userService.getFilters(), filters: this.userService.getFilters(),
range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE, range: this.user?.settings?.dateRange ?? DEFAULT_USER_DATE_RANGE,
startDate: this.dateOfFirstActivity startDate: this.dateOfFirstActivity
}) })
.pipe(takeUntilDestroyed(this.destroyRef)) .pipe(takeUntilDestroyed(this.destroyRef))

Loading…
Cancel
Save