Remove model from view

ApplETS · Nov 30, 2024 · e0f8594 · e0f8594
1 parent 25e15a7
commit e0f8594
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/lib/features/dashboard/dashboard_view.dart b/lib/features/dashboard/dashboard_view.dart
@@ -273,15 +273,7 @@ class _DashboardViewState extends State<DashboardView>
             padding: const EdgeInsets.fromLTRB(16, 8, 16, 8),
             child: Builder(
               builder: (context) {
-                final upcomingEvents = model.importantDates.asMap().entries.where((entry) {
-                  DateTime date = entry.value;
-                  DateTime now = DateTime.now();
-
-                  return now.isAfter(date.subtract(const Duration(days: 3))) &&
-                      now.isBefore(date.add(const Duration(days: 1)));
-                }).toList();
-
-                if (upcomingEvents.isEmpty) return const SizedBox.shrink();
+                if (model.upcomingEvents.isEmpty) return const SizedBox.shrink();
                 final currentLocale = AppIntl.of(context)!.localeName;
 
                 return Column(
@@ -298,7 +290,7 @@ class _DashboardViewState extends State<DashboardView>
                       alignment: Alignment.centerLeft,
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
-                        children: upcomingEvents.map((entry) {
+                        children: model.upcomingEvents.map((entry) {
                           int index = entry.key;
                           DateTime date = entry.value;
 

diff --git a/lib/features/dashboard/dashboard_viewmodel.dart b/lib/features/dashboard/dashboard_viewmodel.dart
@@ -45,7 +45,7 @@ class DashboardViewModel extends FutureViewModel<Map<PreferencesFlag, int>> {
   double _progress = 0.0;
 
   /// Session important days
-  List<DateTime> _importantDates = [];
+  List<MapEntry<int, DateTime>> _upcomingEvents = [];
 
   /// Numbers of days elapsed and total number of days of the current session
   List<int> _sessionDays = [0, 0];
@@ -63,7 +63,7 @@ class DashboardViewModel extends FutureViewModel<Map<PreferencesFlag, int>> {
 
   List<int> get sessionDays => _sessionDays;
 
-  List<DateTime> get importantDates => _importantDates;
+  List<MapEntry<int, DateTime>> get upcomingEvents => _upcomingEvents;
 
   /// Activities for today
   List<CourseActivity> _todayDateEvents = [];
@@ -303,9 +303,16 @@ class DashboardViewModel extends FutureViewModel<Map<PreferencesFlag, int>> {
 
       setBusyForObject(progress, true);
       final sessions = await _courseRepository.getSessions();
+      final List<DateTime> importantDates = [sessions[1].startDate, sessions[1].endDate, sessions[1].startDateRegistration];
       _sessionDays = getSessionDays();
       _progress = getSessionProgress();
-      _importantDates = [sessions[1].startDate, sessions[1].endDate, sessions[1].startDateRegistration];
+
+      _upcomingEvents = importantDates.asMap().entries.where((entry) {
+        DateTime date = entry.value;
+        DateTime now = DateTime.now();
+
+        return now.isAfter(date.subtract(const Duration(days: 3))) && now.isBefore(date.add(const Duration(days: 1)));
+      }).toList();
 
       return sessions;
     } catch (error) {