Cleanup

Author: rolandgeider

lib/models/exercises/exercise_submission.dart

@@ -81,6 +81,8 @@ sealed class ExerciseSubmissionApi with _$ExerciseSubmissionApi {
 
     @JsonKey(name: 'license_author') required String author,
     @JsonKey(includeToJson: true, name: 'variation_group') String? variationGroup,
+
+    /// Exercise ID to connect to -- the server copies that exercise's variation group
     @JsonKey(includeToJson: true, name: 'variations_connect_to') int? variationConnectTo,
 
     required List<ExerciseTranslationSubmissionApi> translations,

lib/models/exercises/exercise_submission.freezed.dart

@@ -180,12 +180,12 @@ class _MarkdownEditorState extends State<MarkdownEditor> {
         IconButton(
           icon: const Icon(Icons.format_list_bulleted),
           tooltip: i18n.editorList,
-          onPressed: () => _surroundSelection('\n- ', '\n- \n- '),
+          onPressed: () => _surroundSelection('\n- ', ''),
         ),
         IconButton(
           icon: const Icon(Icons.format_list_numbered),
           tooltip: i18n.editorList,
-          onPressed: () => _surroundSelection('\n1. ', '\n1. \n1. '),
+          onPressed: () => _surroundSelection('\n1. ', ''),
         ),
       ],
     );

lib/widgets/add_exercise/add_exercise_text_area.dart

@@ -52,8 +52,7 @@ class Step2Variations extends StatelessWidget {
                         Consumer<AddExerciseProvider>(
                           builder: (ctx, provider, __) => Switch(
                             value: provider.variationGroup == key,
-                            onChanged: (state) =>
-                                provider.variationGroup = state ? key : null,
+                            onChanged: (state) => provider.variationGroup = state ? key : null,
                           ),
                         ),
                       ],

lib/widgets/add_exercise/steps/step_2_variations.dart

@@ -176,7 +176,7 @@ class MeasurementEntryForm extends StatelessWidget {
       _dateController.text = dateFormat.format(_entryData['date']);
     }
     if (_timeController.text.isEmpty) {
-      _timeController.text = TimeOfDay.fromDateTime(_entryData['date']).format(context);
+      _timeController.text = timeFormat.format(_entryData['date']);
     }
 
     final numberFormat = NumberFormat.decimalPattern(Localizations.localeOf(context).toString());
@@ -252,7 +252,16 @@ class MeasurementEntryForm extends StatelessWidget {
               );
 
               if (pickedTime != null) {
-                _timeController.text = pickedTime.format(context);
+                // Use DateFormat.Hm to stay consistent with onSaved parsing
+                final now = DateTime.now();
+                final dt = DateTime(
+                  now.year,
+                  now.month,
+                  now.day,
+                  pickedTime.hour,
+                  pickedTime.minute,
+                );
+                _timeController.text = timeFormat.format(dt);
               }
             },
             onSaved: (newValue) {

lib/widgets/measurements/forms.dart

@@ -21,9 +21,11 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
+import 'package:wger/models/measurements/measurement_entry.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/measurement_entries_screen.dart';
+import 'package:wger/widgets/measurements/forms.dart';
 
 import '../../test_data/measurements.dart';
 import '../nutrition/nutritional_plan_form_test.mocks.dart';
@@ -99,4 +101,118 @@ void main() {
     expect(find.text('10.9.2022 08:00'), findsWidgets);
     expect(find.text('5.10.2022 07:30'), findsWidgets);
   });
+
+  group('MeasurementEntryForm time format consistency', () {
+    Widget createFormScreen({
+      String locale = 'en',
+      MeasurementEntry? entry,
+    }) {
+      when(mockMeasurementProvider.categories).thenReturn(getMeasurementCategories());
+      return ChangeNotifierProvider<MeasurementProvider>(
+        create: (context) => mockMeasurementProvider,
+        child: MaterialApp(
+          locale: Locale(locale),
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: SingleChildScrollView(
+              child: MeasurementEntryForm(1, entry),
+            ),
+          ),
+        ),
+      );
+    }
+
+    testWidgets('Time field uses 24h format (HH:mm) for new entries - EN', (
+      WidgetTester tester,
+    ) async {
+      await tester.pumpWidget(createFormScreen(locale: 'en'));
+      await tester.pumpAndSettle();
+
+      // The time field should contain a time in HH:mm format (24h),
+      // not AM/PM format, to stay consistent with DateFormat.Hm parsing
+      final timeField = find.byWidgetPredicate(
+        (widget) => widget is TextFormField && widget.controller?.text != null,
+      );
+      expect(timeField, findsWidgets);
+
+      // Find the time controller text - it should match HH:mm pattern
+      final timeFields = tester.widgetList<TextFormField>(timeField);
+      final timeWidget = timeFields.where((w) {
+        final text = w.controller?.text ?? '';
+        // Time field contains a colon but no slash (date has slashes)
+        return text.contains(':') && !text.contains('/') && !text.contains('.');
+      });
+      expect(timeWidget, isNotEmpty, reason: 'Should find a time field with HH:mm format');
+
+      final timeText = timeWidget.first.controller!.text;
+      // Verify it does NOT contain AM/PM
+      expect(
+        timeText.contains('AM'),
+        isFalse,
+        reason: 'Time should be 24h format, not 12h with AM',
+      );
+      expect(
+        timeText.contains('PM'),
+        isFalse,
+        reason: 'Time should be 24h format, not 12h with PM',
+      );
+      // Verify it matches HH:mm pattern
+      expect(
+        RegExp(r'^\d{1,2}:\d{2}$').hasMatch(timeText),
+        isTrue,
+        reason: 'Time "$timeText" should match HH:mm pattern',
+      );
+    });
+
+    testWidgets('Time field uses 24h format for existing entries with PM time', (
+      WidgetTester tester,
+    ) async {
+      // Use an entry with a PM time (18:30) to verify it's not shown as "6:30 PM"
+      final pmEntry = MeasurementEntry(
+        id: 10,
+        category: 1,
+        date: DateTime(2023, 6, 15, 18, 30),
+        value: 25,
+        notes: '',
+      );
+      await tester.pumpWidget(createFormScreen(locale: 'en', entry: pmEntry));
+      await tester.pumpAndSettle();
+
+      // Should find "18:30" not "6:30 PM"
+      final allTextFields = tester.widgetList<TextFormField>(find.byType(TextFormField));
+      final timeTexts = allTextFields
+          .map((w) => w.controller?.text ?? '')
+          .where((t) => t.contains(':') && !t.contains('/') && !t.contains('.'));
+
+      expect(timeTexts, isNotEmpty);
+      final timeText = timeTexts.first;
+      expect(
+        timeText,
+        equals('18:30'),
+        reason: 'PM time should be displayed as 18:30, not 6:30 PM',
+      );
+    });
+
+    testWidgets('Time field uses 24h format - DE locale', (WidgetTester tester) async {
+      final entry = MeasurementEntry(
+        id: 10,
+        category: 1,
+        date: DateTime(2023, 6, 15, 14, 45),
+        value: 25,
+        notes: '',
+      );
+      await tester.pumpWidget(createFormScreen(locale: 'de', entry: entry));
+      await tester.pumpAndSettle();
+
+      final allTextFields = tester.widgetList<TextFormField>(find.byType(TextFormField));
+      final timeTexts = allTextFields
+          .map((w) => w.controller?.text ?? '')
+          .where((t) => t.contains(':') && !t.contains('/') && !t.contains('.'));
+
+      expect(timeTexts, isNotEmpty);
+      final timeText = timeTexts.first;
+      expect(timeText, equals('14:45'));
+    });
+  });
 }