Skip to content

double timezone conversion was happening #363

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
CropWatchDevelopment merged 1 commit into from
Nov 19, 2025
Merged

double timezone conversion was happening #363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions src/routes/api/devices/[devEui]/pdf/+server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,10 @@ export const GET: RequestHandler = async ({ params, url, locals: { supabase } })
const userEnd = DateTime.fromJSDate(endDate).setZone(timezoneParam).endOf('day');
const startLabel = userStart.toFormat('yyyy-MM-dd HH:mm');
const endLabel = userEnd.toFormat('yyyy-MM-dd HH:mm');
startDate = userStart.toUTC().toJSDate();
endDate = userEnd.toUTC().toJSDate();
const startDateUtc = userStart.toUTC().toJSDate();
const endDateUtc = userEnd.toUTC().toJSDate();
const startDateLocal = userStart.toJSDate();
const endDateLocal = userEnd.toJSDate();

const selectedKeys = dataKeysParam
.split(',')
Expand Down Expand Up @@ -181,16 +183,21 @@ export const GET: RequestHandler = async ({ params, url, locals: { supabase } })
const deviceDataResponse = isReport
? await deviceDataService.getDeviceDataForReport({
devEui,
startDate,
endDate,
startDate: startDateUtc,
endDate: endDateUtc,
timezone: timezoneParam,
columns: requestedAlertPoints.map((p) => p.data_point_key as string),
ops: requestedAlertPoints.map((p) => p.operator as string),
mins: requestedAlertPoints.map((p) => (p.min ?? p.value) as number),
maxs: requestedAlertPoints.map((p) => p.max ?? null),
intervalMinutes: 30
})
: await deviceDataService.getDeviceDataByDateRange(devEui, startDate, endDate, timezoneParam);
: await deviceDataService.getDeviceDataByDateRange(
devEui,
startDateLocal,
endDateLocal,
timezoneParam
);

let deviceData: DeviceDataRecord[] = [];
let alertPoints: ReportAlertPoint[] = requestedAlertPoints;
Expand Down
Loading