Browse Source

feat(client): implement default date range

pull/6927/head
KenTandrian 2 days ago
parent
commit
d5e8c13158
  1. 3
      apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
  2. 7
      apps/client/src/app/components/home-overview/home-overview.component.ts
  3. 3
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
  4. 3
      libs/common/src/lib/config.ts
  5. 2
      libs/common/src/lib/types/date-range.type.ts

3
apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@ -1,6 +1,7 @@
import { GfInvestmentChartComponent } from '@ghostfolio/client/components/investment-chart/investment-chart.component';
import { UserService } from '@ghostfolio/client/services/user/user.service';
import {
DEFAULT_DATE_RANGE,
DEFAULT_PAGE_SIZE,
NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
} from '@ghostfolio/common/config';
@ -330,7 +331,7 @@ export class GfAccountDetailDialogComponent implements OnInit {
type: 'ACCOUNT'
}
],
range: 'max',
range: DEFAULT_DATE_RANGE,
withExcludedAccounts: true,
withItems: true
})

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

@ -2,7 +2,10 @@ import { GfPortfolioPerformanceComponent } from '@ghostfolio/client/components/p
import { LayoutService } from '@ghostfolio/client/core/layout.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
import { UserService } from '@ghostfolio/client/services/user/user.service';
import { NUMERICAL_PRECISION_THRESHOLD_6_FIGURES } from '@ghostfolio/common/config';
import {
DEFAULT_DATE_RANGE,
NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
} from '@ghostfolio/common/config';
import {
AssetProfileIdentifier,
LineChartItem,
@ -115,7 +118,7 @@ export class GfHomeOverviewComponent implements OnInit {
this.dataService
.fetchPortfolioPerformance({
range: this.user?.settings?.dateRange
range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE
})
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe(({ chart, errors, performance }) => {

3
apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

@ -9,6 +9,7 @@ import { Activity, PortfolioPosition } from '@ghostfolio/common/interfaces';
import { GfSymbolPipe } from '@ghostfolio/common/pipes';
import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
import { GfDialogFooterComponent } from '@ghostfolio/ui/dialog-footer';
import { DEFAULT_DATE_RANGE } from '@ghostfolio/common/config';
import { GfDialogHeaderComponent } from '@ghostfolio/ui/dialog-header';
import { DataService } from '@ghostfolio/ui/services';
@ -145,7 +146,7 @@ export class GfImportActivitiesDialogComponent {
type: 'ASSET_CLASS'
}
],
range: 'max'
range: DEFAULT_DATE_RANGE
})
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe(({ holdings }) => {

3
libs/common/src/lib/config.ts

@ -2,7 +2,7 @@ import { AssetClass, AssetSubClass, DataSource, Type } from '@prisma/client';
import { JobOptions, JobStatus } from 'bull';
import ms from 'ms';
import { ColorScheme } from './types';
import { ColorScheme, DateRange } from './types';
export const ghostfolioPrefix = 'GF';
export const ghostfolioScraperApiSymbolPrefix = `_${ghostfolioPrefix}_`;
@ -81,6 +81,7 @@ export const STATISTICS_GATHERING_QUEUE = 'STATISTICS_GATHERING_QUEUE';
export const DEFAULT_COLOR_SCHEME: ColorScheme = 'LIGHT';
export const DEFAULT_CURRENCY = 'USD';
export const DEFAULT_DATE_RANGE: DateRange = 'max';
export const DEFAULT_DATE_FORMAT_MONTH_YEAR = 'MMM yyyy';
export const DEFAULT_HOST = '0.0.0.0';
export const DEFAULT_LANGUAGE_CODE = 'en';

2
libs/common/src/lib/types/date-range.type.ts

@ -6,4 +6,4 @@ export type DateRange =
| 'mtd'
| 'wtd'
| 'ytd'
| string; // '2024', '2023', '2022', etc.
| `${number}`; // '2024', '2023', '2022', etc.

Loading…
Cancel
Save