utc dates

This commit is contained in:
Fran Jurmanović
2025-05-29 01:27:46 +02:00
parent eecd2794a0
commit 93b5cfb331
4 changed files with 17 additions and 5 deletions

View File

@@ -1,7 +1,7 @@
<script lang="ts">
import Chart from 'chart.js/auto';
import { onMount, onDestroy } from 'svelte';
import { compareAsc } from 'date-fns';
import { compareAsc, isSameDay } from 'date-fns';
import { formatInTimeZone } from 'date-fns-tz';
import 'chartjs-adapter-date-fns';
import type { StateHistory } from '$models/config';
@@ -230,16 +230,18 @@
if (!acc[date]) {
acc[date] = {
count: 0,
sessions: [session]
sessions: []
};
}
// Check if this session is part of a sequence
if (index > 0) {
const prevSession = stateHistory[index - 1];
const prevDate = formatDate(prevSession.dateCreated, 'yyyy-MM-dd');
if (date === prevDate && prevSession.session === session.session) {
if (
isSameDay(session.dateCreated, prevSession.dateCreated) &&
prevSession.session === session.session
) {
return acc;
}
}
@@ -261,6 +263,7 @@
const sortedEntries = Object.entries(dailyActivity).sort(
([a], [b]) => new Date(a).getTime() - new Date(b).getTime()
);
console.log(sortedEntries);
return {
labels: sortedEntries.map(([date]) => formatDate(date, 'MMM dd')),

View File

@@ -7,12 +7,13 @@ import type { RequestEvent } from '@sveltejs/kit';
import { configFile, type Config, type Session } from '$models/config';
import { set } from 'lodash-es';
import { subDays, formatISO } from 'date-fns';
import { UTCDate } from '@date-fns/utc';
export const load = async (event: RequestEvent) => {
const isAuth = await checkAuth(event);
if (!isAuth) return redirect(308, '/login');
if (!event.params.id) return redirect(308, '/dashboard');
const today = new Date();
const today = new UTCDate();
const endDate = formatISO(today);
const startDate = formatISO(subDays(today, 30));