Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/fix date picker date format (#912)
Thomas Kauld5c96d1cb725
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 7e260a0131..a12d937d6c 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### Fixed+- Fixed the date format of the date picker and support manual changes- Fixed the state of the account delete button (disable if account contains activities)- Fixed an issue in the activities filter component (typing a search term)diff --git a/apps/client/src/app/adapter/custom-date-adapter.ts b/apps/client/src/app/adapter/custom-date-adapter.tsindex 5c5be28f93..74bf7dd7a2 100644--- a/apps/client/src/app/adapter/custom-date-adapter.ts+++ b/apps/client/src/app/adapter/custom-date-adapter.ts@@ -1,14 +1,15 @@import { Platform } from '@angular/cdk/platform';import { Inject, forwardRef } from '@angular/core';import { MAT_DATE_LOCALE, NativeDateAdapter } from '@angular/material/core';-import { format, isValid } from 'date-fns';-import * as deDateFnsLocale from 'date-fns/locale/de/index';+import { getDateFormatString } from '@ghostfolio/common/helper';+import { format, parse } from 'date-fns';export class CustomDateAdapter extends NativeDateAdapter {/*** @constructor*/public constructor(+ @Inject(MAT_DATE_LOCALE) public locale: string,@Inject(forwardRef(() => MAT_DATE_LOCALE)) matDateLocale: string,platform: Platform) {@@ -16,50 +17,23 @@ export class CustomDateAdapter extends NativeDateAdapter {}/**- * Sets the first day of the week to Monday+ * Formats a date as a string*/- public getFirstDayOfWeek(): number {- return 1;+ public format(aDate: Date, aParseFormat: string): string {+ return format(aDate, getDateFormatString(this.locale));}/**- * Formats a date as a string according to the given format+ * Sets the first day of the week to Monday*/- public format(aDate: Date, aParseFormat: string): string {- return format(aDate, aParseFormat, {- locale: <any>deDateFnsLocale- });+ public getFirstDayOfWeek(): number {+ return 1;}/*** Parses a date from a provided value*/- public parse(aValue: any): Date {- let date: Date;-- try {- // TODO- // Native date parser from the following formats:- // - 'd.M.yyyy'- // - 'dd.MM.yyyy'- // https://github.com/you-dont-need/You-Dont-Need-Momentjs#string--date-format- const datePattern = /^(\d{1,2}).(\d{1,2}).(\d{4})$/;- const [, day, month, year] = datePattern.exec(aValue);-- date = new Date(- parseInt(year, 10),- parseInt(month, 10) - 1, // monthIndex- parseInt(day, 10)- );- } catch (error) {- } finally {- const isDateValid = date && isValid(date);-- if (isDateValid) {- return date;- }-- return null;- }+ public parse(aValue: string): Date {+ return parse(aValue, getDateFormatString(this.locale), new Date());}}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.tsindex f28253b909..b4a715a95b 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,11 +8,13 @@ import {Output} from '@angular/core';import { MatDialog } from '@angular/material/dialog';+import { UserService } from '@ghostfolio/client/services/user/user.service';import {DATE_FORMAT,getDateFormatString,getLocale} from '@ghostfolio/common/helper';+import { User } from '@ghostfolio/common/interfaces';import { LineChartItem } from '@ghostfolio/ui/line-chart/interfaces/line-chart.interface';import { DataSource, MarketData } from '@prisma/client';import {@@ -53,14 +55,24 @@ export class AdminMarketDataDetailComponent implements OnChanges, OnInit {[day: string]: Pick<MarketData, 'date' | 'marketPrice'> & { day: number };};} = {};+ public user: User;private unsubscribeSubject = new Subject<void>();public constructor(private deviceService: DeviceDetectorService,- private dialog: MatDialog+ private dialog: MatDialog,+ private userService: UserService) {this.deviceType = this.deviceService.getDeviceInfo().deviceType;++ this.userService.stateChanged+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe((state) => {+ if (state?.user) {+ this.user = state.user;+ }+ });}public ngOnInit() {}@@ -145,7 +157,8 @@ export class AdminMarketDataDetailComponent implements OnChanges, OnInit {date,marketPrice,dataSource: this.dataSource,- symbol: this.symbol+ symbol: this.symbol,+ user: this.user},height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',width: this.deviceType === 'mobile' ? '100vw' : '50rem'diff --git a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.tsindex a6f5437896..81360878bc 100644--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.ts+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.ts@@ -1,3 +1,4 @@+import { User } from '@ghostfolio/common/interfaces';import { DataSource } from '@prisma/client';export interface MarketDataDetailDialogParams {@@ -5,4 +6,5 @@ export interface MarketDataDetailDialogParams {date: Date;marketPrice: number;symbol: string;+ user: User;}diff --git a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.ts b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.tsindex 01b1f47186..8c761ccdbb 100644--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.ts+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.ts@@ -5,6 +5,7 @@ import {Inject,OnDestroy} from '@angular/core';+import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';import { AdminService } from '@ghostfolio/client/services/admin.service';import { Subject, takeUntil } from 'rxjs';@@ -24,11 +25,16 @@ export class MarketDataDetailDialog implements OnDestroy {public constructor(private adminService: AdminService,private changeDetectorRef: ChangeDetectorRef,+ @Inject(MAT_DIALOG_DATA) public data: MarketDataDetailDialogParams,+ private dateAdapter: DateAdapter<any>,public dialogRef: MatDialogRef<MarketDataDetailDialog>,- @Inject(MAT_DIALOG_DATA) public data: MarketDataDetailDialogParams+ @Inject(MAT_DATE_LOCALE) private locale: string) {}- public ngOnInit() {}+ public ngOnInit() {+ this.locale = this.data.user?.settings?.locale;+ this.dateAdapter.setLocale(this.locale);+ }public onCancel(): void {this.dialogRef.close({ withRefresh: false });diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.tsindex b4794a043d..52fc2f3676 100644--- a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts@@ -8,6 +8,7 @@ import {} from '@angular/core';import { FormBuilder, FormGroup, Validators } from '@angular/forms';import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';+import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';import { UpdateOrderDto } from '@ghostfolio/api/app/order/update-order.dto';@@ -54,13 +55,18 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {public constructor(private changeDetectorRef: ChangeDetectorRef,+ @Inject(MAT_DIALOG_DATA) public data: CreateOrUpdateTransactionDialogParams,private dataService: DataService,+ private dateAdapter: DateAdapter<any>,public dialogRef: MatDialogRef<CreateOrUpdateTransactionDialog>,private formBuilder: FormBuilder,- @Inject(MAT_DIALOG_DATA) public data: CreateOrUpdateTransactionDialogParams+ @Inject(MAT_DATE_LOCALE) private locale: string) {}public ngOnInit() {+ this.locale = this.data.user?.settings?.locale;+ this.dateAdapter.setLocale(this.locale);+const { currencies, platforms } = this.dataService.fetchInfo();this.currencies = currencies;