Skip to content

maybe fix for timezone #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GardKalland merged 2 commits into from
Sep 25, 2025
Merged

maybe fix for timezone #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9504de8
maybe fix for timezone
GardKalland Sep 25, 2025
dd710ed
lint fix
GardKalland Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions programmerbar-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
"date-fns": "4.1.0",
"date-fns-tz": "^3.2.0",
"drizzle-orm": "0.44.4",
"groq": "4.5.0",
"ky": "^1.9.0",
Expand Down
163 changes: 23 additions & 140 deletions programmerbar-web/src/lib/date.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,162 +1,45 @@
import { toZonedTime } from 'date-fns-tz';
import { format } from 'date-fns';

export type Dateish = string | Date | number;
export const OSLO_TIME_ZONE = 'Europe/Oslo';

const dateFormatter = new Intl.DateTimeFormat('nb-NO', {
day: '2-digit',
month: '2-digit',
year: 'numeric',
timeZone: OSLO_TIME_ZONE
});

const timeFormatter = new Intl.DateTimeFormat('nb-NO', {
hour: '2-digit',
minute: '2-digit',
hour12: false,
timeZone: OSLO_TIME_ZONE
});

const dateTimeFormatter = new Intl.DateTimeFormat('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
hour12: false,
timeZone: OSLO_TIME_ZONE
});

const dateTimeFormatterCache = new Map<string, Intl.DateTimeFormat>();

const timeZoneRegex = /(?:Z|[+-]\d{2}:?\d{2})$/i;

type DateTimeParts = {
year: string;
month: string;
day: string;
hour: string;
minute: string;
second: string;
};

const ensureDate = (date: Dateish): Date => {
return date instanceof Date ? date : new Date(date);
};

const getFormatterParts = (
date: Date,
formatter: Intl.DateTimeFormat
): Partial<Record<Intl.DateTimeFormatPartTypes, string>> => {
return formatter
.formatToParts(date)
.reduce<Partial<Record<Intl.DateTimeFormatPartTypes, string>>>((acc, part) => {
if (part.type !== 'literal') {
acc[part.type] = part.value;
}
return acc;
}, {});
};

const getDateTimeParts = (date: Date): DateTimeParts => {
const parts = getFormatterParts(date, dateTimeFormatter);
return {
year: parts.year ?? '0000',
month: parts.month ?? '01',
day: parts.day ?? '01',
hour: parts.hour ?? '00',
minute: parts.minute ?? '00',
second: parts.second ?? '00'
};
};

const getTimeZoneFormatter = (timeZone: string) => {
if (!dateTimeFormatterCache.has(timeZone)) {
dateTimeFormatterCache.set(
timeZone,
new Intl.DateTimeFormat('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
hour12: false,
timeZone
})
);
}

return dateTimeFormatterCache.get(timeZone)!;
};

const getTimeZoneOffset = (date: Date, timeZone: string): number => {
const formatter = getTimeZoneFormatter(timeZone);
const parts = getFormatterParts(date, formatter);
const inZoneUtc = Date.UTC(
Number(parts.year ?? '0'),
Number(parts.month ?? '1') - 1,
Number(parts.day ?? '1'),
Number(parts.hour ?? '0'),
Number(parts.minute ?? '0'),
Number(parts.second ?? '0')
);

return inZoneUtc - date.getTime();
};

export const formatDate = (date: Dateish) => {
return dateFormatter.format(ensureDate(date));
const utcDate = ensureDate(date);
const osloTime = toZonedTime(utcDate, OSLO_TIME_ZONE);
return format(osloTime, 'dd.MM.yyyy');
};

export const time = (date: Dateish) => {
return timeFormatter.format(ensureDate(date));
const utcDate = ensureDate(date);
const osloTime = toZonedTime(utcDate, OSLO_TIME_ZONE);
return format(osloTime, 'HH:mm');
};

export const normalDate = (date: Dateish) => {
return `${formatDate(date)} ${time(date)}`;
const utcDate = ensureDate(date);
const osloTime = toZonedTime(utcDate, OSLO_TIME_ZONE);
return format(osloTime, 'dd.MM.yyyy HH:mm');
};

export const ISOStandard = (date: Dateish) => {
const parts = getDateTimeParts(ensureDate(date));
return `${parts.year}-${parts.month}-${parts.day}T${parts.hour}:${parts.minute}`;
export const toLocalDateTimeString = (date: Dateish): string => {
const utcDate = ensureDate(date);
const osloTime = toZonedTime(utcDate, OSLO_TIME_ZONE);
return format(osloTime, "yyyy-MM-dd'T'HH:mm");
};

export const parseDateTimeLocal = (value: string, timeZone: string = OSLO_TIME_ZONE): Date => {
const trimmedValue = value.trim();

if (!trimmedValue) {
return new Date(trimmedValue);
}

if (timeZoneRegex.test(trimmedValue) || !trimmedValue.includes('T')) {
return new Date(trimmedValue);
}

const [datePart, timePart] = trimmedValue.split('T');
if (!datePart || !timePart) {
return new Date(trimmedValue);
}

const [year, month, day] = datePart.split('-').map((part) => Number(part));
const timeSegments = timePart.split(':');
const hour = Number(timeSegments[0] ?? '0');
const minute = Number(timeSegments[1] ?? '0');
const second = Number((timeSegments[2] ?? '0').split('.')[0]);

const targetUtc = Date.UTC(year, (month || 1) - 1, day || 1, hour, minute, second);
let result = new Date(targetUtc);
let offset = getTimeZoneOffset(result, timeZone);
let adjusted = targetUtc - offset;

if (adjusted !== targetUtc) {
result = new Date(adjusted);
offset = getTimeZoneOffset(result, timeZone);
adjusted = targetUtc - offset;
}
export const parseDateTimeLocal = (value: string): Date => {
return new Date(value);
};

return new Date(adjusted);
export const toUtcISOStringFromLocal = (value: string) => {
return new Date(value).toISOString();
};

export const toUtcISOStringFromLocal = (value: string, timeZone: string = OSLO_TIME_ZONE) => {
return parseDateTimeLocal(value, timeZone).toISOString();
export const ISOStandard = (date: Dateish) => {
return toLocalDateTimeString(date);
};
3 changes: 1 addition & 2 deletions programmerbar-web/src/routes/(portal)/portal/arrangementer/[id]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script lang="ts">
import { subHours } from 'date-fns';
import { formatDate, time } from '$lib/date';
import { capitalize } from '$lib/utils';
import { enhance } from '$app/forms';
Expand Down Expand Up @@ -111,7 +110,7 @@
<div>
<p class="text-sm text-gray-500">Tid</p>
<p class="font-medium">
{time(subHours(shift.startAt, 4))} - {time(subHours(shift.endAt, 4))}
{time(shift.startAt)} - {time(shift.endAt)}
</p>
</div>
</div>
Expand Down