Show only events starting in the future.

ICCM-EU · Dec 3, 2024 · 55dccad · 55dccad
1 parent 6317286
commit 55dccad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/lib/data/dataProviders/events_provider.dart b/lib/data/dataProviders/events_provider.dart
@@ -145,16 +145,24 @@ class EventsProvider with ChangeNotifier  {
 
   List<EventData> filterPastEvents({
     List<EventData>? items,
+    bool withCurrent = true,
   }) {
     items ??= _items;
     if (items.isEmpty) {
       return [];
     }
     final DateTime now = DateTime.now();
-    return items.where(
-            (item) =>
-        item.end.isAfter(now) ||
-            item.end.isAtSameMomentAs(now)).toList();
+    if (withCurrent) {
+      return items.where(
+              (item) =>
+          item.end.isAfter(now) ||
+              item.end.isAtSameMomentAs(now)).toList();
+    } else {
+      return items.where(
+              (item) =>
+          item.start.isAfter(now) ||
+              item.start.isAtSameMomentAs(now)).toList();
+    }
   }
 
   List<EventData> eventsByRoom({

diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
@@ -63,7 +63,8 @@ class HomePageState extends State<HomePage> {
     final EventsProvider eventsProvider = Provider.of<EventsProvider>(context);
     _nextEventTime = eventsProvider.nextStartTime();
     if (_remainingDuration <= Duration.zero) {
-      _upcomingEvents = eventsProvider.filterPastEvents().take(5).toList();
+      _upcomingEvents = eventsProvider.filterPastEvents(withCurrent: false).
+          take(5).toList();
     }
 
     return Scaffold(