Skip to content

Commit b7a2830

Browse files
committed
show kcal consumed vs planned, on meal tiles
1 parent 6b2a7e5 commit b7a2830

File tree

5 files changed

+11
-1
lines changed

5 files changed

+11
-1
lines changed

lib/widgets/nutrition/helpers.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import 'package:flutter/cupertino.dart';
2020
import 'package:flutter/material.dart';
2121
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
22+
import 'package:wger/models/nutrition/meal.dart';
2223
import 'package:wger/models/nutrition/nutritional_values.dart';
2324
import 'package:wger/widgets/core/core.dart';
2425

@@ -49,3 +50,12 @@ String getShortNutritionValues(NutritionalValues values, BuildContext context) {
4950
final f = '${loc.fatShort} ${loc.gValue(values.fat.toStringAsFixed(0))}';
5051
return '$e / $p / $c / $f';
5152
}
53+
54+
String getKcalConsumedVsPlanned(Meal meal, BuildContext context) {
55+
final planned = meal.plannedNutritionalValues.energy;
56+
final consumed =
57+
meal.diaryEntriesToday.map((e) => e.nutritionalValues.energy).fold(0.0, (a, b) => a + b);
58+
final loc = AppLocalizations.of(context);
59+
60+
return '${consumed.toStringAsFixed(0)} / ${planned.toStringAsFixed(0)} ${loc.kcal}';
61+
}

lib/widgets/nutrition/meal.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ class MealHeader extends StatelessWidget {
323323
),
324324
if (_meal.isRealMeal)
325325
Text(
326-
getShortNutritionValues(_meal.plannedNutritionalValues, context),
326+
getKcalConsumedVsPlanned(_meal, context),
327327
style: Theme.of(context).textTheme.titleSmall,
328328
),
329329
],
-4.07 KB
Loading
-4.09 KB
Loading
-2.29 KB
Loading

0 commit comments

Comments
 (0)