fix: Display only unique calendar lesson events (#318)

0niel · May 23, 2023 · f2d8d29 · f2d8d29
1 parent 1ff92fc
commit f2d8d29
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/presentation/pages/schedule/widgets/schedule_page_view.dart b/lib/presentation/pages/schedule/widgets/schedule_page_view.dart
@@ -251,11 +251,22 @@ class _SchedulePageViewState extends State<SchedulePageView> {
             final int week = CalendarUtils.getCurrentWeek(mCurrentDate: day);
             final int weekday = day.weekday - 1;
 
-            var lessons = _getLessonsByWeek(week, widget.schedule);
+            final lessons = _getLessonsByWeek(week, widget.schedule);
             if (weekday == 6) {
               return [];
             } else {
-              return lessons[weekday];
+              final Map<String, Lesson> uniqueLessonEvents = {};
+
+              for (var lesson in lessons[weekday]) {
+                final lessonNameAndTime = '${lesson.name}${lesson.timeStart}';
+                if (uniqueLessonEvents.containsKey(lessonNameAndTime)) {
+                  continue;
+                }
+
+                uniqueLessonEvents[lessonNameAndTime] = lesson;
+              }
+
+              return uniqueLessonEvents.values.toList();
             }
           },
           locale: 'ru_RU',