Correctly set the start and end time to null, if this is what comes from the API

Author: rolandgeider

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.
  */

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')

lib/models/nutrition/meal.g.dart

@@ -42,10 +42,10 @@ class WorkoutSession {
   @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: [])

lib/models/workouts/session.dart

@@ -74,7 +74,7 @@ class MealForm extends StatelessWidget {
                 }
               },
               onSaved: (newValue) {
-                _meal.time = stringToTime(newValue);
+                _meal.time = stringToTimeNull(newValue);
               },
             ),
             TextFormField(

lib/models/workouts/session.g.dart

@@ -75,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((_) {

lib/widgets/nutrition/forms.dart

@@ -35,11 +35,12 @@ class SessionPage extends StatefulWidget {
   late WorkoutSession _session;
   final PageController _controller;
   final Map<Exercise, int> _exercisePages;
+  final TimeOfDay _start;
 
   SessionPage(
     this._routine,
     this._controller,
-    start,
+    this._start,
     this._exercisePages,
   ) {
     _session = _routine.sessions.map((sessionApi) => sessionApi.session).firstWhere(
@@ -49,7 +50,7 @@ class SessionPage extends StatefulWidget {
             impression: DEFAULT_IMPRESSION,
             date: clock.now(),
             timeEnd: TimeOfDay.now(),
-            timeStart: start,
+            timeStart: _start,
           ),
         );
   }
@@ -72,8 +73,8 @@ class _SessionPageState extends State<SessionPage> {
   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;

lib/widgets/routines/gym_mode/gym_mode.dart

@@ -22,7 +22,9 @@ 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';
 
@@ -32,8 +34,11 @@ import 'gym_mode_session_screen_test.mocks.dart';
 @GenerateMocks([RoutinesProvider])
 void main() {
   final mockRoutinesProvider = MockRoutinesProvider();
+  late Routine testRoutine;
 
-  final testRoutine = getTestRoutine();
+  setUp(() {
+    testRoutine = getTestRoutine();
+  });
 
   Widget renderSessionPage({locale = 'en'}) {
     return ChangeNotifierProvider<RoutinesProvider>(
@@ -46,7 +51,7 @@ void main() {
           body: SessionPage(
             testRoutine,
             PageController(),
-            const TimeOfDay(hour: 12, minute: 34),
+            const TimeOfDay(hour: 13, minute: 35),
             const {},
           ),
         ),
@@ -65,6 +70,29 @@ void main() {
     });
   });
 
+  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());