adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-15 03:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

add Today option to Date Range Picker

Browse Source
This commit is contained in:
Gregor Vostrak
2024-12-03 16:21:59 +01:00
committed by Constantin Graf
parent e3f981aac2
commit ae7f5a98e7
5 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/js/packages/ui/src/utils/time.ts
View File

@@ -6,6 +6,7 @@ import isYesterday from 'dayjs/plugin/isYesterday';
import utc from 'dayjs/plugin/utc';
import timezone from 'dayjs/plugin/timezone';
import weekOfYear from 'dayjs/plugin/weekOfYear';
import { getUserTimezone, getWeekStart } from './settings';
import updateLocale from 'dayjs/plugin/updateLocale';
import { computed } from 'vue';
@@ -69,7 +70,7 @@ export function formatTime(date: string) {
return dayjs.utc(date).tz(getUserTimezone()).format('HH:mm');
}
export function getLocalizedDayJs(timestamp: string | null) {
export function getLocalizedDayJs(timestamp?: string | null) {
return dayjs.utc(timestamp).tz(getUserTimezone());
}
@@ -82,7 +83,20 @@ export function getLocalizedDateFromTimestamp(timestamp: string) {
* @param date - date in the format of 'YYYY-MM-DD'
*/
export function formatDate(date: string): string {
return dayjs(date).format('DD.MM.YYYY');
if (date?.includes('+')) {
console.warn(
'Date contains timezone information, use formatDateLocalized instead'
);
}
return getDayJsInstance()(date).format('DD.MM.YYYY');
}
/*
* Returns a formatted date.
* @param date - date in the format of 'YYYY-MM-DD'
*/
export function formatDateLocalized(date: string): string {
return getLocalizedDayJs(date).format('DD.MM.YYYY');
}
export function formatWeek(date: string | null): string {