From 1c73595d07184bf8081796004bb5966c4cebd408 Mon Sep 17 00:00:00 2001 From: Marc Rejohn Castillano Date: Thu, 12 Feb 2026 07:31:19 +0800 Subject: [PATCH] Time zone fix --- lib/screens/workforce/workforce_screen.dart | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/screens/workforce/workforce_screen.dart b/lib/screens/workforce/workforce_screen.dart index 8e983d7e..9295c7e9 100644 --- a/lib/screens/workforce/workforce_screen.dart +++ b/lib/screens/workforce/workforce_screen.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:geolocator/geolocator.dart'; +import 'package:timezone/timezone.dart' as tz; import '../../models/duty_schedule.dart'; import '../../models/profile.dart'; @@ -671,7 +672,14 @@ class _ShiftTemplate { final Duration duration; DateTime buildStart(DateTime day) { - return DateTime(day.year, day.month, day.day, startHour, startMinute); + return tz.TZDateTime( + tz.local, + day.year, + day.month, + day.day, + startHour, + startMinute, + ); } DateTime buildEnd(DateTime start) {