Commit WIP for nutrition page rework

wger-project · Oct 17, 2023 · 68f0ad4 · 68f0ad4
1 parent 0bf324f
commit 68f0ad4
Show file tree

Hide file tree

Showing 46 changed files with 629 additions and 225 deletions.
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -271,6 +271,14 @@
   "@noNutritionalPlans": {
     "description": "Message shown when the user has no nutritional plans"
   },
+  "onlyLogging": "Only track calories",
+  "onlyLoggingHelpText": "Check the box if you only want to log your calories and don't want to setup a detailed nutritional plan with specific meals",
+  "addGoalsToPlan": "Add goals to this plan",
+  "addGoalsToPlanHelpText": "This allows you to set general goals for energy, protein, carbohydrates or fat for the plan. Note that if you set-up a detailed meal plan, these values will take precedence.",
+  "goalEnergy": "Energy goal",
+  "goalProtein": "Protein goal",
+  "goalCarbohydrates": "Carbohydrates goal",
+  "goalFat": "Fat goal",
   "anErrorOccurred": "An Error Occurred!",
   "@anErrorOccurred": {},
   "weight": "Weight",

diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart
diff --git a/lib/models/exercises/base.g.dart b/lib/models/exercises/base.g.dart
diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart
diff --git a/lib/models/exercises/image.g.dart b/lib/models/exercises/image.g.dart
diff --git a/lib/models/exercises/translation.g.dart b/lib/models/exercises/translation.g.dart
diff --git a/lib/models/measurements/measurement_category.g.dart b/lib/models/measurements/measurement_category.g.dart
diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart
diff --git a/lib/models/nutrition/image.g.dart b/lib/models/nutrition/image.g.dart
diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart
diff --git a/lib/models/nutrition/ingredient_weight_unit.g.dart b/lib/models/nutrition/ingredient_weight_unit.g.dart
diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart
diff --git a/lib/models/nutrition/nutritional_plan.dart b/lib/models/nutrition/nutritional_plan.dart
@@ -39,6 +39,21 @@ class NutritionalPlan {
   @JsonKey(required: true, name: 'creation_date', toJson: toDate)
   late DateTime creationDate;
 
+  @JsonKey(required: true, name: 'only_logging')
+  late bool onlyLogging;
+
+  @JsonKey(required: true, name: 'goal_energy')
+  late num? goalEnergy;
+
+  @JsonKey(required: true, name: 'goal_protein')
+  late num? goalProtein;
+
+  @JsonKey(required: true, name: 'goal_carbohydrates')
+  late num? goalCarbohydrates;
+
+  @JsonKey(required: true, name: 'goal_fat')
+  late num? goalFat;
+
   @JsonKey(includeFromJson: false, includeToJson: false, defaultValue: [])
   List<Meal> meals = [];
 
@@ -47,6 +62,11 @@ class NutritionalPlan {
 
   NutritionalPlan({
     this.id,
+    this.onlyLogging = false,
+    this.goalEnergy,
+    this.goalProtein,
+    this.goalCarbohydrates,
+    this.goalFat,
     required this.description,
     required this.creationDate,
     List<Meal>? meals,
@@ -67,7 +87,9 @@ class NutritionalPlan {
   Map<String, dynamic> toJson() => _$NutritionalPlanToJson(this);
 
   String getLabel(BuildContext context) {
-    return description != '' ? description : AppLocalizations.of(context).nutritionalPlan;
+    return description != '' ? description : AppLocalizations
+        .of(context)
+        .nutritionalPlan;
   }
 
   /// Calculations

diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart
diff --git a/lib/models/nutrition/weight_unit.g.dart b/lib/models/nutrition/weight_unit.g.dart
diff --git a/lib/models/user/profile.g.dart b/lib/models/user/profile.g.dart
diff --git a/lib/models/workouts/repetition_unit.g.dart b/lib/models/workouts/repetition_unit.g.dart
diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart
diff --git a/lib/models/workouts/weight_unit.g.dart b/lib/models/workouts/weight_unit.g.dart
diff --git a/lib/models/workouts/workout_plan.g.dart b/lib/models/workouts/workout_plan.g.dart
diff --git a/lib/screens/home_tabs_screen.dart b/lib/screens/home_tabs_screen.dart
@@ -100,19 +100,29 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
 
       // Plans, weight and gallery
       log('Loading plans, weight, measurements and gallery');
-      await Future.wait([
-        galleryProvider.fetchAndSetGallery(),
-        nutritionPlansProvider.fetchAndSetAllPlansSparse(),
-        workoutPlansProvider.fetchAndSetAllPlansSparse(),
-        weightProvider.fetchAndSetEntries(),
-        measurementProvider.fetchAndSetAllCategoriesAndEntries(),
-      ]);
+      try {
+        await Future.wait([
+          galleryProvider.fetchAndSetGallery(),
+          nutritionPlansProvider.fetchAndSetAllPlansSparse(),
+          workoutPlansProvider.fetchAndSetAllPlansSparse(),
+          weightProvider.fetchAndSetEntries(),
+          measurementProvider.fetchAndSetAllCategoriesAndEntries(),
+        ]);
+      } catch (e) {
+        log('fire! fire!');
+        log(e.toString());
+      }
 
       // Current nutritional plan
       log('Loading current nutritional plan');
-      if (nutritionPlansProvider.currentPlan != null) {
-        final plan = nutritionPlansProvider.currentPlan!;
-        await nutritionPlansProvider.fetchAndSetPlanFull(plan.id!);
+      try {
+        if (nutritionPlansProvider.currentPlan != null) {
+          final plan = nutritionPlansProvider.currentPlan!;
+          await nutritionPlansProvider.fetchAndSetPlanFull(plan.id!);
+        }
+      } catch (e) {
+        log('fire! fire!');
+        log(e.toString());
       }
 
       // Current workout plan

diff --git a/lib/screens/update_app_screen.dart b/lib/screens/update_app_screen.dart
@@ -28,7 +28,13 @@ class UpdateAppScreen extends StatelessWidget {
           AppLocalizations.of(context).appUpdateTitle,
           style: Theme.of(context).textTheme.headline5,
         ),
-        content: Text(AppLocalizations.of(context).appUpdateContent),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(AppLocalizations.of(context).appUpdateContent),
+            Text(AppLocalizations.of(context).appUpdateContent),
+          ],
+        ),
         actions: null,
       ),
     );