mirror of
https://github.com/freqtrade/frequi.git
synced 2024-11-10 10:21:55 +00:00
Add timerange datefformatter
This commit is contained in:
parent
edc365afc1
commit
72ca12e035
|
@ -68,6 +68,15 @@ export function timestampToDateString(ts: number | Date): string {
|
||||||
return formatDate(toDate(ts), 'yyyy-MM-dd');
|
return formatDate(toDate(ts), 'yyyy-MM-dd');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts timestamp or Date object to yyyyMMdd format.
|
||||||
|
* Used for timerange displays
|
||||||
|
* @param ts
|
||||||
|
*/
|
||||||
|
export function timestampToTimeRangeString(ts: number | Date): string {
|
||||||
|
return formatDate(toDate(ts), 'yyyyMMdd');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts a String of the format yyyy-MM-dd to YYYYMMDD. To be used as timerange.
|
* Converts a String of the format yyyy-MM-dd to YYYYMMDD. To be used as timerange.
|
||||||
* @param datestring Input string (in the format yyyy-MM-dd)
|
* @param datestring Input string (in the format yyyy-MM-dd)
|
||||||
|
|
|
@ -5,6 +5,7 @@ import {
|
||||||
timestampmsWithTimezone,
|
timestampmsWithTimezone,
|
||||||
setTimezone,
|
setTimezone,
|
||||||
timestampToDateString,
|
timestampToDateString,
|
||||||
|
timestampToTimeRangeString,
|
||||||
dateStringToTimeRange,
|
dateStringToTimeRange,
|
||||||
timestampHour,
|
timestampHour,
|
||||||
dateFromString,
|
dateFromString,
|
||||||
|
@ -51,6 +52,7 @@ describe('timeformatter.ts', () => {
|
||||||
expect(timestampmsOrNa(0)).toEqual('N/A');
|
expect(timestampmsOrNa(0)).toEqual('N/A');
|
||||||
expect(timestampmsOrNa(null)).toEqual('N/A');
|
expect(timestampmsOrNa(null)).toEqual('N/A');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('timestampToDateString converts to date', () => {
|
it('timestampToDateString converts to date', () => {
|
||||||
expect(timestampToDateString(1651057500000)).toEqual('2022-04-27');
|
expect(timestampToDateString(1651057500000)).toEqual('2022-04-27');
|
||||||
|
|
||||||
|
@ -62,10 +64,24 @@ describe('timeformatter.ts', () => {
|
||||||
setTimezone('CET');
|
setTimezone('CET');
|
||||||
expect(timestampToDateString(timestamp)).toEqual('2022-04-28');
|
expect(timestampToDateString(timestamp)).toEqual('2022-04-28');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('timestampToDateString converts to date', () => {
|
||||||
|
expect(timestampToTimeRangeString(1651057500000)).toEqual('20220427');
|
||||||
|
|
||||||
|
// Set close to midnight - so timezone matters
|
||||||
|
// 2022-04-27T11:26:19 UTC
|
||||||
|
const timestamp = 1651101979000;
|
||||||
|
setTimezone('UTC');
|
||||||
|
expect(timestampToTimeRangeString(timestamp)).toEqual('20220427');
|
||||||
|
setTimezone('CET');
|
||||||
|
expect(timestampToTimeRangeString(timestamp)).toEqual('20220428');
|
||||||
|
});
|
||||||
|
|
||||||
it('dateStringToTimeRange converts to correct timerange', () => {
|
it('dateStringToTimeRange converts to correct timerange', () => {
|
||||||
expect(dateStringToTimeRange('2022-04-28')).toEqual('20220428');
|
expect(dateStringToTimeRange('2022-04-28')).toEqual('20220428');
|
||||||
expect(dateStringToTimeRange('2019-04-01')).toEqual('20190401');
|
expect(dateStringToTimeRange('2019-04-01')).toEqual('20190401');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('timestampHour converts', () => {
|
it('timestampHour converts', () => {
|
||||||
// Hour conversion
|
// Hour conversion
|
||||||
setTimezone('UTC');
|
setTimezone('UTC');
|
||||||
|
@ -73,6 +89,7 @@ describe('timeformatter.ts', () => {
|
||||||
setTimezone('CET');
|
setTimezone('CET');
|
||||||
expect(timestampHour(1651057500000)).toEqual(13);
|
expect(timestampHour(1651057500000)).toEqual(13);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('dateFromString converts correctly', () => {
|
it('dateFromString converts correctly', () => {
|
||||||
expect(dateFromString('2022-04-04', 'yyyy-MM-dd')).toEqual(
|
expect(dateFromString('2022-04-04', 'yyyy-MM-dd')).toEqual(
|
||||||
new Date('2022-04-04T00:00:00.000Z'),
|
new Date('2022-04-04T00:00:00.000Z'),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user