Filter at parse lever

NIAEFEUP · Aug 24, 2023 · 437f379 · 437f379
1 parent 0aa828b
commit 437f379
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/uni/lib/controller/parsers/parser_calendar.dart b/uni/lib/controller/parsers/parser_calendar.dart
@@ -7,12 +7,21 @@ Future<List<CalendarEvent>> getCalendarFromHtml(Response response) async {
 
   final calendarHtml = document.querySelectorAll('tr');
 
-  return calendarHtml
+  final eventList = calendarHtml
       .map(
         (event) => CalendarEvent(
           event.children[0].innerHtml,
           event.children[1].innerHtml,
         ),
       )
       .toList();
+
+  final filteredCalendar = eventList
+      .where(
+        (event) =>
+            event.name.trim() != '&nbsp;' && event.date.trim() != '&nbsp;',
+      )
+      .toList();
+
+  return filteredCalendar;
 }
diff --git a/uni/lib/view/calendar/calendar.dart b/uni/lib/view/calendar/calendar.dart
@@ -46,14 +46,6 @@ class CalendarPageViewState extends GeneralPageViewState<CalendarPageView> {
   }
 
   Widget getTimeline(BuildContext context, List<CalendarEvent> calendar) {
-    // Filter out events where name or date is a non-breaking space
-    final filteredCalendar = calendar
-        .where(
-          (event) =>
-              event.name.trim() != '&nbsp;' && event.date.trim() != '&nbsp;',
-        )
-        .toList();
-
     return FixedTimeline.tileBuilder(
       theme: TimelineTheme.of(context).copyWith(
         connectorTheme: TimelineTheme.of(context)
@@ -68,7 +60,7 @@ class CalendarPageViewState extends GeneralPageViewState<CalendarPageView> {
         contentsBuilder: (context, index) => Padding(
           padding: const EdgeInsets.all(24),
           child: Text(
-            filteredCalendar[index].name,
+            calendar[index].name,
             style: Theme.of(context)
                 .textTheme
                 .titleLarge
@@ -78,13 +70,13 @@ class CalendarPageViewState extends GeneralPageViewState<CalendarPageView> {
         oppositeContentsBuilder: (context, index) => Padding(
           padding: const EdgeInsets.all(24),
           child: Text(
-            filteredCalendar[index].date,
+            calendar[index].date,
             style: Theme.of(context).textTheme.titleMedium?.copyWith(
                   fontStyle: FontStyle.italic,
                 ),
           ),
         ),
-        itemCount: filteredCalendar.length,
+        itemCount: calendar.length,
       ),
     );
   }