show charts for all nutritional plans + more elegant filtering

Author: Dieterbe

lib/providers/nutrition.dart

@@ -88,6 +88,7 @@ class NutritionPlansProvider with ChangeNotifier {
     }
 
     // Sort by creation date (newest first) and return the first one
+    // TODO: this should already be done on _plans. this whole function can be a firstWhere() ?
     activePlans.sort((a, b) => b.creationDate.compareTo(a.creationDate));
     return activePlans.first;
   }

lib/widgets/measurements/entries.dart

@@ -36,7 +36,7 @@ class EntriesList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final plan = Provider.of<NutritionPlansProvider>(context, listen: false).currentPlan;
+    final plans = Provider.of<NutritionPlansProvider>(context, listen: false).items;
 
     final entriesAll =
         _category.entries.map((e) => MeasurementChartEntry(e.value, e.date)).toList();
@@ -47,7 +47,7 @@ class EntriesList extends StatelessWidget {
         _category.name,
         entriesAll,
         entries7dAvg,
-        plan,
+        plans,
         _category.unit,
         context,
       ),

lib/widgets/measurements/helpers.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:wger/helpers/measurements.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/nutrition/nutritional_plan.dart';
 import 'package:wger/widgets/measurements/charts.dart';
@@ -19,7 +20,16 @@ List<Widget> getOverviewWidgets(
     Container(
       padding: const EdgeInsets.all(15),
       height: 220,
-      child: MeasurementChartWidgetFl(raw, unit, avgs: avg),
+      child: raw.isEmpty
+          ? Center(
+              child: Text(
+                'No data available',
+                style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                      color: Theme.of(context).colorScheme.secondary.withValues(alpha: 0.7),
+                    ),
+              ),
+            )
+          : MeasurementChartWidgetFl(raw, unit, avgs: avg),
     ),
     if (avg.isNotEmpty) MeasurementOverallChangeWidget(avg.first, avg.last, unit),
     const SizedBox(height: 8),
@@ -34,16 +44,11 @@ List<Widget> getOverviewWidgetsSeries(
   String name,
   List<MeasurementChartEntry> entriesAll,
   List<MeasurementChartEntry> entries7dAvg,
-  NutritionalPlan? plan,
+  List<NutritionalPlan> plans,
   String unit,
   BuildContext context,
 ) {
   final monthAgo = DateTime.now().subtract(const Duration(days: 30));
-  final showPlan = plan != null &&
-      entriesAll.any((e) =>
-          e.date.isAfter(plan.startDate) &&
-          (plan.endDate == null || e.date.isBefore(plan.endDate!)));
-
   return [
     ...getOverviewWidgets(
       AppLocalizations.of(context).chartAllTimeTitle(name),
@@ -52,39 +57,25 @@ List<Widget> getOverviewWidgetsSeries(
       unit,
       context,
     ),
-    if (showPlan)
+    // Show overview widgets for each plan in plans
+    for (final plan in plans)
       ...getOverviewWidgets(
         AppLocalizations.of(context).chartDuringPlanTitle(name, plan.description),
-        entriesAll
-            .where((e) =>
-                e.date.isAfter(plan.startDate) &&
-                (plan.endDate == null || e.date.isBefore(plan.endDate!)))
-            .toList(),
-        entries7dAvg
-            .where((e) =>
-                e.date.isAfter(plan.startDate) &&
-                (plan.endDate == null || e.date.isBefore(plan.endDate!)))
-            .toList(),
+        entriesAll.whereDate(plan.startDate, plan.endDate),
+        entries7dAvg.whereDate(plan.startDate, plan.endDate),
         unit,
         context,
       ),
     // if all time is significantly longer than 30 days (let's say > 75 days)
-    // and any plan was also > 75 days,
     // then let's show a separate chart just focusing on the last 30 days,
     // if there is data for it.
     if (entriesAll.isNotEmpty &&
         entriesAll.first.date.isBefore(entriesAll.last.date.subtract(const Duration(days: 75))) &&
-        (plan == null ||
-            (showPlan &&
-                entriesAll
-                    .firstWhere((e) => e.date.isAfter(plan.startDate))
-                    .date
-                    .isBefore(entriesAll.last.date.subtract(const Duration(days: 30))))) &&
         entriesAll.any((e) => e.date.isAfter(monthAgo)))
       ...getOverviewWidgets(
         AppLocalizations.of(context).chart30DaysTitle(name),
-        entriesAll.where((e) => e.date.isAfter(monthAgo)).toList(),
-        entries7dAvg.where((e) => e.date.isAfter(monthAgo)).toList(),
+        entriesAll.whereDate(monthAgo, null),
+        entries7dAvg.whereDate(monthAgo, null),
         unit,
         context,
       ),
@@ -119,16 +110,16 @@ List<Widget> getOverviewWidgetsSeries(
   final twoMonthsAgo = DateTime.now().subtract(const Duration(days: 61));
   final fourMonthsAgo = DateTime.now().subtract(const Duration(days: 122));
 
-  if (entriesAll.where((e) => e.date.isAfter(twoMonthsAgo)).length > 4) {
+  if (entriesAll.whereDate(twoMonthsAgo, null).length > 4) {
     return (
-      entriesAll.where((e) => e.date.isAfter(twoMonthsAgo)).toList(),
-      entries7dAvg.where((e) => e.date.isAfter(twoMonthsAgo)).toList(),
+      entriesAll.whereDate(twoMonthsAgo, null),
+      entries7dAvg.whereDate(twoMonthsAgo, null),
     );
   }
-  if (entriesAll.where((e) => e.date.isAfter(fourMonthsAgo)).length > 4) {
+  if (entriesAll.whereDate(fourMonthsAgo, null).length > 4) {
     return (
-      entriesAll.where((e) => e.date.isAfter(fourMonthsAgo)).toList(),
-      entries7dAvg.where((e) => e.date.isAfter(fourMonthsAgo)).toList(),
+      entriesAll.whereDate(fourMonthsAgo, null),
+      entries7dAvg.whereDate(fourMonthsAgo, null),
     );
   }
   return (entriesAll, entries7dAvg);

lib/widgets/weight/weight_overview.dart

@@ -37,7 +37,7 @@ class WeightOverview extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final profile = context.read<UserProvider>().profile;
-    final plan = Provider.of<NutritionPlansProvider>(context, listen: false).currentPlan;
+    final plans = Provider.of<NutritionPlansProvider>(context, listen: false).items;
 
     final entriesAll = _provider.items.map((e) => MeasurementChartEntry(e.weight, e.date)).toList();
     final entries7dAvg = moving7dAverage(entriesAll);
@@ -50,7 +50,7 @@ class WeightOverview extends StatelessWidget {
           AppLocalizations.of(context).weight,
           entriesAll,
           entries7dAvg,
-          plan,
+          plans,
           unit,
           context,
         ),