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

fix DST boundary issue in timesheets

Browse Source
This commit is contained in:
Gregor Vostrak
2026-05-12 17:25:46 +02:00
parent 221889ff87
commit 396e7b2b6b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/js/utils/timesheet/cellMath.ts
View File

@@ -26,6 +26,15 @@ interface Interval {
end: Dayjs; end: Dayjs;
} }
function localDayBounds(date: string, tz: string): { dayStart: Dayjs; dayEnd: Dayjs } {
const dayjs = getDayJsInstance();
const localDayStart = dayjs.tz(`${date} 00:00:00`, tz);
return {
dayStart: localDayStart.utc(),
dayEnd: localDayStart.add(1, 'day').utc(),
};
}
/** /**
* Collect entries that intersect the day `[dayStart, dayEnd)`, clipped * Collect entries that intersect the day `[dayStart, dayEnd)`, clipped
* to those bounds. Running entries use `nowDayjs` as their end. * to those bounds. Running entries use `nowDayjs` as their end.
@@ -76,8 +85,7 @@ export function findFreeWindowOnDay(
if (requiredSeconds <= 0) return null; if (requiredSeconds <= 0) return null;
const dayjs = getDayJsInstance(); const dayjs = getDayJsInstance();
const dayStart = dayjs.tz(`${date} 00:00:00`, tz).utc(); const { dayStart, dayEnd } = localDayBounds(date, tz);
const dayEnd = dayStart.add(1, 'day');
if (requiredSeconds > dayEnd.diff(dayStart, 'second')) return null; if (requiredSeconds > dayEnd.diff(dayStart, 'second')) return null;
@@ -149,8 +157,7 @@ export function freeGapSecondsAfter(
now?: string | Dayjs now?: string | Dayjs
): number { ): number {
const dayjs = getDayJsInstance(); const dayjs = getDayJsInstance();
const dayStart = dayjs.tz(`${date} 00:00:00`, tz).utc(); const { dayStart, dayEnd } = localDayBounds(date, tz);
const dayEnd = dayStart.add(1, 'day');
const cursorDjs = dayjs.utc(cursor); const cursorDjs = dayjs.utc(cursor);
if (cursorDjs.isSameOrAfter(dayEnd)) return 0; if (cursorDjs.isSameOrAfter(dayEnd)) return 0;