Skip to content
Snippets Groups Projects
Commit bdfdddae authored by doodlezucc's avatar doodlezucc
Browse files

move timetable iterable merge to timetable class

parent 92a83c8b
No related branches found
No related tags found
No related merge requests found
...@@ -105,8 +105,6 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -105,8 +105,6 @@ class _MyHomePageState extends State<MyHomePage> {
Future<void> fetchTimetable() async { Future<void> fetchTimetable() async {
final date = appContext.date.value; final date = appContext.date.value;
TimetableData? merged;
final profile = await appContext.profile.firstNotNull; final profile = await appContext.profile.firstNotNull;
final selectedClasses = profile.selectedClasses; final selectedClasses = profile.selectedClasses;
...@@ -114,16 +112,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -114,16 +112,8 @@ class _MyHomePageState extends State<MyHomePage> {
return Future(() => untis.timetableOf(classid, date).fetched); return Future(() => untis.timetableOf(classid, date).fetched);
})); }));
for (final fetched in allTimetables) {
if (merged == null) {
merged = fetched;
} else {
merged = TimetableData.merge(merged, fetched);
}
}
setState(() { setState(() {
timetable = merged; timetable = TimetableData.mergeAll(allTimetables);
}); });
} }
......
...@@ -20,4 +20,18 @@ class TimetableData { ...@@ -20,4 +20,18 @@ class TimetableData {
rooms: a.rooms.union(b.rooms), rooms: a.rooms.union(b.rooms),
); );
} }
static TimetableData? mergeAll(Iterable<TimetableData> all) {
TimetableData? merged;
for (final fetched in all) {
if (merged == null) {
merged = fetched;
} else {
merged = TimetableData.merge(merged, fetched);
}
}
return merged;
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment