Bugfix/fix date conversion of two digit year (#1529)
* Fix date conversion of two digit year * Update changelog
This commit is contained in:
parent
49ce4803ce
commit
16118d635c
@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
- Removed the data source type `RAKUTEN`
|
- Removed the data source type `RAKUTEN`
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed the date conversion for years with only two digits
|
||||||
|
|
||||||
## 1.220.0 - 2022-12-23
|
## 1.220.0 - 2022-12-23
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
@ -2,7 +2,7 @@ import { Platform } from '@angular/cdk/platform';
|
|||||||
import { Inject, forwardRef } from '@angular/core';
|
import { Inject, forwardRef } from '@angular/core';
|
||||||
import { MAT_DATE_LOCALE, NativeDateAdapter } from '@angular/material/core';
|
import { MAT_DATE_LOCALE, NativeDateAdapter } from '@angular/material/core';
|
||||||
import { getDateFormatString } from '@ghostfolio/common/helper';
|
import { getDateFormatString } from '@ghostfolio/common/helper';
|
||||||
import { format, parse } from 'date-fns';
|
import { addYears, format, getYear, parse } from 'date-fns';
|
||||||
|
|
||||||
export class CustomDateAdapter extends NativeDateAdapter {
|
export class CustomDateAdapter extends NativeDateAdapter {
|
||||||
public constructor(
|
public constructor(
|
||||||
@ -31,6 +31,16 @@ export class CustomDateAdapter extends NativeDateAdapter {
|
|||||||
* Parses a date from a provided value
|
* Parses a date from a provided value
|
||||||
*/
|
*/
|
||||||
public parse(aValue: string): Date {
|
public parse(aValue: string): Date {
|
||||||
return parse(aValue, getDateFormatString(this.locale), new Date());
|
let date = parse(aValue, getDateFormatString(this.locale), new Date());
|
||||||
|
|
||||||
|
if (getYear(date) < 1900) {
|
||||||
|
if (getYear(date) > Number(format(new Date(), 'yy')) + 1) {
|
||||||
|
date = addYears(date, 1900);
|
||||||
|
} else {
|
||||||
|
date = addYears(date, 2000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return date;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user