Merge pull request #815 from Shininess8816/mealDateTime

Allow the logging on meals with date times #789

Author: rolandgeider

lib/providers/nutrition.dart

@@ -398,10 +398,10 @@ class NutritionPlansProvider with ChangeNotifier {
   }
 
   /// Log meal to nutrition diary
-  Future<void> logMealToDiary(Meal meal) async {
+  Future<void> logMealToDiary(Meal meal, DateTime mealDateTime) async {
     for (final item in meal.mealItems) {
       final plan = findById(meal.planId);
-      final Log log = Log.fromMealItem(item, plan.id!, meal.id);
+      final Log log = Log.fromMealItem(item, plan.id!, meal.id, mealDateTime);
 
       final data = await baseProvider.post(
         log.toJson(),

lib/screens/log_meal_screen.dart

@@ -18,6 +18,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:wger/helpers/json.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/meal.dart';
 import 'package:wger/providers/nutrition.dart';
@@ -42,6 +43,23 @@ class LogMealScreen extends StatefulWidget {
 
 class _LogMealScreenState extends State<LogMealScreen> {
   double portionPct = 100;
+  final _dateController = TextEditingController();
+  final _timeController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+
+    _dateController.text = dateToYYYYMMDD(DateTime.now())!;
+    _timeController.text = timeToString(TimeOfDay.now())!;
+  }
+
+  @override
+  void dispose() {
+    _dateController.dispose();
+    _timeController.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -87,6 +105,61 @@ class _LogMealScreenState extends State<LogMealScreen> {
                       ),
                     ],
                   ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  children: [
+                    const Padding(padding: EdgeInsets.symmetric(horizontal: 12)),
+                    Expanded(
+                      child: TextFormField(
+                        key: const ValueKey('field-date'),
+                        readOnly: true,
+                        decoration: InputDecoration(labelText: AppLocalizations.of(context).date),
+                        enableInteractiveSelection: false,
+                        controller: _dateController,
+                        onTap: () async {
+                          final pickedDate = await showDatePicker(
+                            context: context,
+                            initialDate: DateTime.now(),
+                            firstDate: DateTime(DateTime.now().year - 10),
+                            lastDate: DateTime.now(),
+                          );
+
+                          if (pickedDate != null) {
+                            _dateController.text = dateToYYYYMMDD(pickedDate)!;
+                          }
+                        },
+                        onSaved: (newValue) {
+                          _dateController.text = newValue!;
+                        },
+                      ),
+                    ),
+                    const Padding(padding: EdgeInsets.symmetric(horizontal: 12)),
+                    Expanded(
+                      child: TextFormField(
+                        key: const ValueKey('field-time'),
+                        readOnly: true,
+                        decoration: InputDecoration(labelText: AppLocalizations.of(context).time),
+                        controller: _timeController,
+                        onTap: () async {
+                          // Open time picker
+                          final pickedTime = await showTimePicker(
+                            context: context,
+                            initialTime: TimeOfDay.fromDateTime(DateTime.now()),
+                          );
+
+                          if (pickedTime != null) {
+                            _timeController.text = timeToString(pickedTime)!;
+                          }
+                        },
+                        onSaved: (newValue) {
+                          _timeController.text = newValue!;
+                        },
+                      ),
+                    ),
+                    const Padding(padding: EdgeInsets.symmetric(horizontal: 12)),
+                  ],
+                ),
+                const Padding(padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8)),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
@@ -97,7 +170,10 @@ class _LogMealScreenState extends State<LogMealScreen> {
                           await Provider.of<NutritionPlansProvider>(
                             context,
                             listen: false,
-                          ).logMealToDiary(meal);
+                          ).logMealToDiary(
+                            meal,
+                            DateTime.parse('${_dateController.text} ${_timeController.text}'),
+                          );
                           // ignore: use_build_context_synchronously
                           ScaffoldMessenger.of(context).showSnackBar(
                             SnackBar(

test/core/settings_test.mocks.dart

@@ -1007,10 +1007,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i20.NutritionPlans
       ) as _i18.Future<_i13.Ingredient?>);
 
   @override
-  _i18.Future<void> logMealToDiary(_i11.Meal? meal) => (super.noSuchMethod(
+  _i18.Future<void> logMealToDiary(
+    _i11.Meal? meal,
+    DateTime? mealDateTime,
+  ) =>
+      (super.noSuchMethod(
         Invocation.method(
           #logMealToDiary,
-          [meal],
+          [
+            meal,
+            mealDateTime,
+          ],
         ),
         returnValue: _i18.Future<void>.value(),
         returnValueForMissingStub: _i18.Future<void>.value(),

test/nutrition/nutritional_meal_form_test.mocks.dart

@@ -422,10 +422,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
       ) as _i9.Future<_i7.Ingredient?>);
 
   @override
-  _i9.Future<void> logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(
+  _i9.Future<void> logMealToDiary(
+    _i5.Meal? meal,
+    DateTime? mealDateTime,
+  ) =>
+      (super.noSuchMethod(
         Invocation.method(
           #logMealToDiary,
-          [meal],
+          [
+            meal,
+            mealDateTime,
+          ],
         ),
         returnValue: _i9.Future<void>.value(),
         returnValueForMissingStub: _i9.Future<void>.value(),

test/nutrition/nutritional_plan_form_test.mocks.dart

@@ -422,10 +422,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
       ) as _i9.Future<_i7.Ingredient?>);
 
   @override
-  _i9.Future<void> logMealToDiary(_i5.Meal? meal) => (super.noSuchMethod(
+  _i9.Future<void> logMealToDiary(
+    _i5.Meal? meal,
+    DateTime? mealDateTime,
+  ) =>
+      (super.noSuchMethod(
         Invocation.method(
           #logMealToDiary,
-          [meal],
+          [
+            meal,
+            mealDateTime,
+          ],
         ),
         returnValue: _i9.Future<void>.value(),
         returnValueForMissingStub: _i9.Future<void>.value(),

test/weight/weight_screen_test.mocks.dart

@@ -747,10 +747,17 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i16.NutritionPlans
       ) as _i11.Future<_i9.Ingredient?>);
 
   @override
-  _i11.Future<void> logMealToDiary(_i7.Meal? meal) => (super.noSuchMethod(
+  _i11.Future<void> logMealToDiary(
+    _i7.Meal? meal,
+    DateTime? mealDateTime,
+  ) =>
+      (super.noSuchMethod(
         Invocation.method(
           #logMealToDiary,
-          [meal],
+          [
+            meal,
+            mealDateTime,
+          ],
         ),
         returnValue: _i11.Future<void>.value(),
         returnValueForMissingStub: _i11.Future<void>.value(),