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

fix last 7 days statistic labels

Browse Source
This commit is contained in:
Gregor Vostrak
2025-07-07 14:03:02 +02:00
parent 47aa65d959
commit 5daa6f2a25
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,12 +160,29 @@ export function formatWeek(date: string | null): string {
* @param date - date in the format of 'YYYY-MM-DD' * @param date - date in the format of 'YYYY-MM-DD'
*/ */
export function formatHumanReadableDate(date: string) { export function formatHumanReadableDate(date: string) {
if (dayjs(date).isToday()) { const dateObj = dayjs(date);
const today = dayjs();
if (dateObj.isToday()) {
return 'Today'; return 'Today';
} else if (dayjs(date).isYesterday()) { } else if (dateObj.isYesterday()) {
return 'Yesterday'; return 'Yesterday';
} }
return dayjs(date).fromNow();
// Calculate difference in days
const diffInDays = today.diff(dateObj, 'day');
if (diffInDays > 0 && diffInDays <= 30) {
// For dates in the past (2-30 days ago)
return `${diffInDays} ${diffInDays === 1 ? 'day' : 'days'} ago`;
} else if (diffInDays < 0 && diffInDays >= -30) {
// For dates in the future (within 30 days)
const futureDays = Math.abs(diffInDays);
return `In ${futureDays} ${futureDays === 1 ? 'day' : 'days'}`;
}
// For dates older than 30 days, show the actual date
return dateObj.format('MMM D, YYYY');
} }
export function formatWeekday(date: string) { export function formatWeekday(date: string) {