Merge pull request #794 from wger-project/fix/gym-mode-time

rolandgeider · web-flow · commit 07f38a8d6093 · 2025-04-18T00:47:18.000+02:00
Fix gym mode start time problem
diff --git a/lib/helpers/json.dart b/lib/helpers/json.dart
@@ -62,6 +62,14 @@ TimeOfDay stringToTime(String? time) {
   return TimeOfDay.fromDateTime(DateTime.parse('2020-01-01 $out'));
 }
 
+TimeOfDay? stringToTimeNull(String? time) {
+  if (time == null) {
+    return null;
+  }
+
+  return TimeOfDay.fromDateTime(DateTime.parse('2020-01-01 $time'));
+}
+
 /*
  * Converts a datetime to time.
  */
diff --git a/lib/models/nutrition/meal.dart b/lib/models/nutrition/meal.dart
@@ -35,7 +35,7 @@ class Meal {
   @JsonKey(name: 'plan')
   late int planId;
 
-  @JsonKey(toJson: timeToString, fromJson: stringToTime)
+  @JsonKey(toJson: timeToString, fromJson: stringToTimeNull)
   TimeOfDay? time;
 
   @JsonKey(name: 'name')
diff --git a/lib/models/nutrition/meal.g.dart b/lib/models/nutrition/meal.g.dart
diff --git a/lib/models/workouts/session.dart b/lib/models/workouts/session.dart
@@ -36,16 +36,16 @@ class WorkoutSession {
   @JsonKey(required: true, toJson: dateToYYYYMMDD)
   late DateTime date;
 
-  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
-  late num impression;
+  @JsonKey(required: true, fromJson: int.parse, toJson: numToString)
+  late int impression;
 
   @JsonKey(required: false, defaultValue: '')
   late String notes;
 
-  @JsonKey(required: true, name: 'time_start', toJson: timeToString, fromJson: stringToTime)
+  @JsonKey(required: true, name: 'time_start', toJson: timeToString, fromJson: stringToTimeNull)
   late TimeOfDay? timeStart;
 
-  @JsonKey(required: true, name: 'time_end', toJson: timeToString, fromJson: stringToTime)
+  @JsonKey(required: true, name: 'time_end', toJson: timeToString, fromJson: stringToTimeNull)
   late TimeOfDay? timeEnd;
 
   @JsonKey(required: false, includeToJson: false, defaultValue: [])
diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart
diff --git a/lib/providers/gym_state.dart b/lib/providers/gym_state.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:wger/models/exercises/exercise.dart';
@@ -14,15 +15,18 @@ class GymState {
   final bool showExercisePages;
   final int currentPage;
   final int? dayId;
+  late TimeOfDay startTime;
   late DateTime validUntil;
 
   GymState(
       {this.exercisePages = const {},
       this.showExercisePages = true,
       this.currentPage = 0,
       this.dayId,
-      DateTime? validUntil}) {
+      DateTime? validUntil,
+      TimeOfDay? startTime}) {
     this.validUntil = validUntil ?? DateTime.now().add(DEFAULT_DURATION);
+    this.startTime = startTime ?? TimeOfDay.now();
   }
 
   GymState copyWith({
@@ -31,13 +35,15 @@ class GymState {
     int? currentPage,
     int? dayId,
     DateTime? validUntil,
+    TimeOfDay? startTime,
   }) {
     return GymState(
       exercisePages: exercisePages ?? this.exercisePages,
       showExercisePages: showExercisePages ?? this.showExercisePages,
       currentPage: currentPage ?? this.currentPage,
       dayId: dayId ?? this.dayId,
       validUntil: validUntil ?? this.validUntil.add(DEFAULT_DURATION),
+      startTime: startTime ?? this.startTime,
     );
   }
 
@@ -49,6 +55,7 @@ class GymState {
         'exercisePages: ${exercisePages.length} exercises, '
         'dayId: $dayId, '
         'validUntil: $validUntil '
+        'startTime: $startTime, '
         ')';
   }
 }
@@ -86,6 +93,7 @@ class GymStateNotifier extends StateNotifier<GymState> {
       currentPage: 0,
       dayId: null,
       validUntil: DateTime.now().add(DEFAULT_DURATION),
+      startTime: TimeOfDay.now(),
     );
   }
 }
diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart
@@ -74,7 +74,7 @@ class MealForm extends StatelessWidget {
                 }
               },
               onSaved: (newValue) {
-                _meal.time = stringToTime(newValue);
+                _meal.time = stringToTimeNull(newValue);
               },
             ),
             TextFormField(
diff --git a/lib/widgets/routines/gym_mode/gym_mode.dart b/lib/widgets/routines/gym_mode/gym_mode.dart
@@ -36,12 +36,9 @@ class GymMode extends ConsumerStatefulWidget {
   final DayData _dayDataGym;
   final DayData _dayDataDisplay;
   final int _iteration;
-  late final TimeOfDay _start;
   final _logger = Logger('GymMode');
 
-  GymMode(this._dayDataGym, this._dayDataDisplay, this._iteration) {
-    _start = TimeOfDay.now();
-  }
+  GymMode(this._dayDataGym, this._dayDataDisplay, this._iteration);
 
   @override
   ConsumerState<GymMode> createState() => _GymModeState();
@@ -78,11 +75,12 @@ class _GymModeState extends ConsumerState<GymMode> {
     final validUntil = ref.read(gymStateProvider).validUntil;
     final currentPage = ref.read(gymStateProvider).currentPage;
     final savedDayId = ref.read(gymStateProvider).dayId;
-
     final newDayId = widget._dayDataGym.day!.id!;
-    final shouldReset =
-        widget._dayDataGym.day!.id != savedDayId || validUntil.isBefore(DateTime.now());
-    widget._logger.fine('Day ID mismatch or expired validUntil date. Resetting to page 0.');
+
+    final shouldReset = newDayId != savedDayId || validUntil.isBefore(DateTime.now());
+    if (shouldReset) {
+      widget._logger.fine('Day ID mismatch or expired validUntil date. Resetting to page 0.');
+    }
     final initialPage = shouldReset ? 0 : currentPage;
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -118,8 +116,8 @@ class _GymModeState extends ConsumerState<GymMode> {
 
   List<Widget> getContent() {
     final state = ref.watch(gymStateProvider);
-    final exerciseProvider = provider.Provider.of<ExercisesProvider>(context, listen: false);
-    final workoutProvider = provider.Provider.of<RoutinesProvider>(context, listen: false);
+    final exerciseProvider = context.read<ExercisesProvider>();
+    final routinesProvider = context.read<RoutinesProvider>();
     var currentElement = 1;
     final List<Widget> out = [];
 
@@ -144,7 +142,7 @@ class _GymModeState extends ConsumerState<GymMode> {
           config,
           slotData,
           exercise,
-          workoutProvider.findById(widget._dayDataGym.day!.routineId),
+          routinesProvider.findById(widget._dayDataGym.day!.routineId),
           ratioCompleted,
           state.exercisePages,
           widget._iteration,
@@ -192,10 +190,9 @@ class _GymModeState extends ConsumerState<GymMode> {
           StartPage(_controller, widget._dayDataDisplay, _exercisePages),
           ...getContent(),
           SessionPage(
-            provider.Provider.of<RoutinesProvider>(context, listen: false)
-                .findById(widget._dayDataGym.day!.routineId),
+            context.read<RoutinesProvider>().findById(widget._dayDataGym.day!.routineId),
             _controller,
-            widget._start,
+            ref.read(gymStateProvider).startTime,
             _exercisePages,
           ),
         ];
diff --git a/lib/widgets/routines/gym_mode/session_page.dart b/lib/widgets/routines/gym_mode/session_page.dart
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart' as provider;
 import 'package:wger/exceptions/http_exception.dart';
@@ -33,8 +34,8 @@ class SessionPage extends StatefulWidget {
   final Routine _routine;
   late WorkoutSession _session;
   final PageController _controller;
-  final TimeOfDay _start;
   final Map<Exercise, int> _exercisePages;
+  final TimeOfDay _start;
 
   SessionPage(
     this._routine,
@@ -43,11 +44,11 @@ class SessionPage extends StatefulWidget {
     this._exercisePages,
   ) {
     _session = _routine.sessions.map((sessionApi) => sessionApi.session).firstWhere(
-          (session) => session.date.isSameDayAs(DateTime.now()),
+          (session) => session.date.isSameDayAs(clock.now()),
           orElse: () => WorkoutSession(
             routineId: _routine.id!,
             impression: DEFAULT_IMPRESSION,
-            date: DateTime.now(),
+            date: clock.now(),
             timeEnd: TimeOfDay.now(),
             timeStart: _start,
           ),
@@ -65,17 +66,18 @@ class _SessionPageState extends State<SessionPage> {
   final timeStartController = TextEditingController();
   final timeEndController = TextEditingController();
 
-  // final _session = WorkoutSession.now();
-
   /// Selected impression: bad, neutral, good
-  var selectedImpression = [false, true, false];
+  var selectedImpression = [false, false, false];
 
   @override
   void initState() {
     super.initState();
 
-    timeStartController.text = timeToString(widget._session.timeStart)!;
-    timeEndController.text = timeToString(widget._session.timeEnd)!;
+    timeStartController.text = timeToString(widget._session.timeStart ?? widget._start)!;
+    timeEndController.text = timeToString(widget._session.timeEnd ?? TimeOfDay.now())!;
+    notesController.text = widget._session.notes;
+
+    selectedImpression[widget._session.impression - 1] = true;
   }
 
   @override
@@ -212,6 +214,7 @@ class _SessionPageState extends State<SessionPage> {
                   ],
                 ),
                 ElevatedButton(
+                  key: const ValueKey('save-button'),
                   child: Text(AppLocalizations.of(context).save),
                   onPressed: () async {
                     // Validate and save the current values to the weightEntry
diff --git a/test/workout/gym_mode_screen_test.dart b/test/workout/gym_mode_screen_test.dart
@@ -22,6 +22,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/helpers/json.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/exercises.dart';
@@ -263,6 +264,13 @@ void main() {
     expect(find.byIcon(Icons.sentiment_very_dissatisfied), findsOneWidget);
     expect(find.byIcon(Icons.sentiment_neutral), findsOneWidget);
     expect(find.byIcon(Icons.sentiment_very_satisfied), findsOneWidget);
+    expect(
+      find.text(timeToString(TimeOfDay.now())!),
+      findsNWidgets(2),
+      reason: 'start and end time are the same',
+    );
+    final toggleButtons = tester.widget<ToggleButtons>(find.byType(ToggleButtons));
+    expect(toggleButtons.isSelected[1], isTrue);
     expect(find.byIcon(Icons.chevron_left), findsOneWidget);
     expect(find.byIcon(Icons.close), findsOneWidget);
     expect(find.byIcon(Icons.chevron_right), findsNothing);
diff --git a/test/workout/gym_mode_session_screen_test.dart b/test/workout/gym_mode_session_screen_test.dart
@@ -0,0 +1,109 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (C) wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wger Workout Manager is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:clock/clock.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:wger/helpers/json.dart';
+import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/workouts/routine.dart';
+import 'package:wger/providers/routines.dart';
+import 'package:wger/widgets/routines/gym_mode/session_page.dart';
+
+import '../../test_data/routines.dart';
+import 'gym_mode_session_screen_test.mocks.dart';
+
+@GenerateMocks([RoutinesProvider])
+void main() {
+  final mockRoutinesProvider = MockRoutinesProvider();
+  late Routine testRoutine;
+
+  setUp(() {
+    testRoutine = getTestRoutine();
+  });
+
+  Widget renderSessionPage({locale = 'en'}) {
+    return ChangeNotifierProvider<RoutinesProvider>(
+      create: (context) => mockRoutinesProvider,
+      child: MaterialApp(
+        locale: Locale(locale),
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: SessionPage(
+            testRoutine,
+            PageController(),
+            const TimeOfDay(hour: 13, minute: 35),
+            const {},
+          ),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('Test that data from  session is loaded', (WidgetTester tester) async {
+    withClock(Clock.fixed(DateTime(2021, 5, 1)), () async {
+      await tester.pumpWidget(renderSessionPage());
+      expect(find.text('10:00'), findsOneWidget);
+      expect(find.text('12:34'), findsOneWidget);
+      expect(find.text('This is a note'), findsOneWidget);
+      final toggleButtons = tester.widget<ToggleButtons>(find.byType(ToggleButtons));
+      expect(toggleButtons.isSelected[2], isTrue);
+    });
+  });
+
+  testWidgets('Test that data from  session is loaded - null times', (WidgetTester tester) async {
+    testRoutine.sessions[0].session.timeStart = null;
+    testRoutine.sessions[0].session.timeEnd = null;
+    final timeNow = timeToString(TimeOfDay.now())!;
+
+    withClock(Clock.fixed(DateTime(2021, 5, 1)), () async {
+      await tester.pumpWidget(renderSessionPage());
+      expect(find.text('13:35'), findsOneWidget);
+      expect(find.text(timeNow), findsOneWidget);
+    });
+  });
+
+  testWidgets('Test correct default data (no existing session)', (WidgetTester tester) async {
+    testRoutine.sessions = [];
+    final timeNow = timeToString(TimeOfDay.now())!;
+
+    await tester.pumpWidget(renderSessionPage());
+    expect(find.text('13:35'), findsOneWidget);
+    expect(find.text(timeNow), findsOneWidget);
+    final toggleButtons = tester.widget<ToggleButtons>(find.byType(ToggleButtons));
+    expect(toggleButtons.isSelected[1], isTrue);
+  });
+
+  testWidgets('Test that correct data is send to server', (WidgetTester tester) async {
+    withClock(Clock.fixed(DateTime(2021, 5, 1)), () async {
+      await tester.pumpWidget(renderSessionPage());
+      await tester.tap(find.byKey(const ValueKey('save-button')));
+      final captured = verify(mockRoutinesProvider.editSession(captureAny)).captured.single;
+
+      expect(captured.id, 1);
+      expect(captured.impression, 3);
+      expect(captured.notes, equals('This is a note'));
+      expect(captured.timeStart, equals(const TimeOfDay(hour: 10, minute: 0)));
+      expect(captured.timeEnd, equals(const TimeOfDay(hour: 12, minute: 34)));
+    });
+  });
+}
diff --git a/test/workout/gym_mode_session_screen_test.mocks.dart b/test/workout/gym_mode_session_screen_test.mocks.dart

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class MealForm extends StatelessWidget {`
`74`	`74`	`}`
`75`	`75`	`},`
`76`	`76`	`onSaved: (newValue) {`
`77`		`- _meal.time = stringToTime(newValue);`
	`77`	`+ _meal.time = stringToTimeNull(newValue);`
`78`	`78`	`},`
`79`	`79`	`),`
`80`	`80`	`TextFormField(`