mirror of
https://github.com/umami-software/umami.git
synced 2026-02-06 05:37:20 +01:00
Merge branch 'master' into dev
This commit is contained in:
commit
bdf1de424a
4 changed files with 15 additions and 21 deletions
|
|
@ -78,7 +78,9 @@ export function parseDateRange(value, locale = 'en-US') {
|
|||
const endDate = new Date(+endTime);
|
||||
|
||||
return {
|
||||
...getDateRangeValues(startDate, endDate),
|
||||
startDate,
|
||||
endDate,
|
||||
unit: getMinimumUnit(startDate, endDate),
|
||||
value,
|
||||
};
|
||||
}
|
||||
|
|
@ -255,14 +257,6 @@ export function getMinimumUnit(startDate, endDate) {
|
|||
return 'year';
|
||||
}
|
||||
|
||||
export function getDateRangeValues(startDate, endDate) {
|
||||
return {
|
||||
startDate: startOfDay(startDate),
|
||||
endDate: endOfDay(endDate),
|
||||
unit: getMinimumUnit(startDate, endDate),
|
||||
};
|
||||
}
|
||||
|
||||
export function getDateFromString(str) {
|
||||
const [ymd, hms] = str.split(' ');
|
||||
const [year, month, day] = ymd.split('-');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue