diff --git a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html index 02b8934d9..7264be84d 100644 --- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html +++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html @@ -25,7 +25,7 @@ }" [title]=" (itemByMonth.key + '-' + (i + 1 < 10 ? '0' + (i + 1) : i + 1) - | date: dateFormat) ?? '' + | date: defaultDateFormat) ?? '' " (click)=" onOpenMarketDataDetail({ diff --git a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts index d182e6375..f28253b90 100644 --- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts +++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts @@ -8,7 +8,11 @@ import { Output } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { DATE_FORMAT, getDateFormatString } from '@ghostfolio/common/helper'; +import { + DATE_FORMAT, + getDateFormatString, + getLocale +} from '@ghostfolio/common/helper'; import { LineChartItem } from '@ghostfolio/ui/line-chart/interfaces/line-chart.interface'; import { DataSource, MarketData } from '@prisma/client'; import { @@ -34,13 +38,14 @@ import { MarketDataDetailDialog } from './market-data-detail-dialog/market-data- export class AdminMarketDataDetailComponent implements OnChanges, OnInit { @Input() dataSource: DataSource; @Input() dateOfFirstActivity: string; + @Input() locale = getLocale(); @Input() marketData: MarketData[]; @Input() symbol: string; @Output() marketDataChanged = new EventEmitter(); - public dateFormat = getDateFormatString(); public days = Array(31); + public defaultDateFormat: string; public deviceType: string; public historicalDataItems: LineChartItem[]; public marketDataByMonth: { @@ -61,6 +66,8 @@ export class AdminMarketDataDetailComponent implements OnChanges, OnInit { public ngOnInit() {} public ngOnChanges() { + this.defaultDateFormat = getDateFormatString(this.locale); + this.historicalDataItems = this.marketData.map((marketDataItem) => { return { date: format(marketDataItem.date, DATE_FORMAT), diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts index 8368b6f9c..2229a3609 100644 --- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts +++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts @@ -8,6 +8,7 @@ import { import { AdminService } from '@ghostfolio/client/services/admin.service'; import { DataService } from '@ghostfolio/client/services/data.service'; import { UserService } from '@ghostfolio/client/services/user/user.service'; +import { getDateFormatString } from '@ghostfolio/common/helper'; import { UniqueAsset, User } from '@ghostfolio/common/interfaces'; import { AdminMarketDataItem } from '@ghostfolio/common/interfaces/admin-market-data.interface'; import { DataSource, MarketData } from '@prisma/client'; @@ -23,6 +24,7 @@ import { takeUntil } from 'rxjs/operators'; export class AdminMarketDataComponent implements OnDestroy, OnInit { public currentDataSource: DataSource; public currentSymbol: string; + public defaultDateFormat: string; public marketData: AdminMarketDataItem[] = []; public marketDataDetails: MarketData[] = []; public user: User; @@ -43,6 +45,10 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit { .subscribe((state) => { if (state?.user) { this.user = state.user; + + this.defaultDateFormat = getDateFormatString( + this.user.settings.locale + ); } }); } diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html index 874b01767..725c75e22 100644 --- a/apps/client/src/app/components/admin-market-data/admin-market-data.html +++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html @@ -21,10 +21,7 @@ {{ item.symbol }} {{ item.dataSource }} - + {{ (item.date | date: defaultDateFormat) ?? '' }} {{ item.activityCount }} {{ item.marketDataItemCount }} @@ -68,6 +65,7 @@
- Valid until - + Valid until {{ user?.subscription?.expiresAt | date: + defaultDateFormat }}
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html index 01cfdbdf5..cbcb7da9c 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -71,7 +71,7 @@
- + {{ element.date | date: defaultDateFormat }}
Total diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index cf27e387d..52bc841ff 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -20,6 +20,7 @@ import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { Router } from '@angular/router'; import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface'; +import { getDateFormatString } from '@ghostfolio/common/helper'; import { UniqueAsset } from '@ghostfolio/common/interfaces'; import { OrderWithAccount } from '@ghostfolio/common/types'; import Big from 'big.js'; @@ -62,6 +63,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { @ViewChild(MatSort) sort: MatSort; public dataSource: MatTableDataSource = new MatTableDataSource(); + public defaultDateFormat: string; public displayedColumns = []; public endOfToday = endOfToday(); public filters$: Subject = new BehaviorSubject([]); @@ -151,6 +153,8 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { this.isLoading = true; + this.defaultDateFormat = getDateFormatString(this.locale); + if (this.activities) { this.dataSource = new MatTableDataSource(this.activities); this.dataSource.filterPredicate = (data, filter) => {