Skip to content

fix(sessions): resolve cross-midnight split bug by migrating to full DateTime (wger-project/wger#2379) #1248

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

Open
pankaj-basnet wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(sessions): resolve cross-midnight split bug by migrating to full DateTime (wger-project/wger#2379) #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec11509
refactor(models): update workout session time tracking to DateTime
pankaj-basnet Jul 1, 2026
13218a2
feat(database): upgrade session time tracking to full DateTime
pankaj-basnet Jul 1, 2026
2fbe9d5
Merge remote-tracking branch 'origin/master' into fix/midnight-workou…
rolandgeider Aug 10, 2026
8fb4b12
Rename the session times to datetimeStart and datetimeEnd
rolandgeider Aug 10, 2026
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
2 changes: 1 addition & 1 deletion lib/core/network/auth_notifier.g.dart
View file
Open in desktop

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

7 changes: 4 additions & 3 deletions lib/core/widgets/dashboard/calendar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,12 @@ class _DashboardCalendarWidgetState extends riverpod.ConsumerState<DashboardCale
}

for (final session in sessions) {
final date = DateFormatLists.format(session.date);
final date = DateFormatLists.format(session.localDay);
events.putIfAbsent(date, () => []);
var time = '';
if (session.timeStart != null && session.timeEnd != null) {
time = '(${timeToString(session.timeStart)} - ${timeToString(session.timeEnd)})';
if (session.datetimeEnd != null) {
time =
'(${timeToString(TimeOfDay.fromDateTime(session.datetimeStart))} - ${timeToString(TimeOfDay.fromDateTime(session.datetimeEnd!))})';
}
events[date]!.add(
Event(
Expand Down
15 changes: 15 additions & 0 deletions lib/database/converters/date_only_text_converter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,18 @@ class DateOnlyTextConverter extends TypeConverter<DateTime, String> {
'${value.month.toString().padLeft(2, '0')}-'
'${value.day.toString().padLeft(2, '0')}';
}

/// Stores a moment as UTC ISO8601, the same wire format the server speaks.
///
/// Keeping every row in UTC with an identical layout means a plain string
/// comparison on the column is also a comparison in time, which the session
/// lookup in the log repository relies on.
class DateTimeTextConverter extends TypeConverter<DateTime, String> {
const DateTimeTextConverter();

@override
DateTime fromSql(String fromDb) => DateTime.parse(fromDb).toLocal();

@override
String toSql(DateTime value) => value.toUtc().toIso8601String();
}
Loading
Loading