Fix timetable loading issues

DislikesSchool · Dec 26, 2023 · cecdca8 · cecdca8
1 parent af367ed
commit cecdca8
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/lib/timetable.dart b/lib/timetable.dart
@@ -176,8 +176,12 @@ TimeTableData processTimeTable(TimeTableData tt) {
     }
   }
 
-  classes.sort((a, b) =>
-      int.parse(a.startPeriod!.id).compareTo(int.parse(b.startPeriod!.id)));
+  classes.sort((a, b) {
+    int? sp = int.tryParse(a.startPeriod!.id);
+    int? ep = int.tryParse(b.endPeriod!.id);
+    if (sp == null || ep == null) return 0;
+    return sp.compareTo(ep);
+  });
   periods.sort((a, b) => a.startTime.compareTo(b.startTime));
 
   List<TimeTableClass> newClasses = [];
@@ -208,8 +212,12 @@ TimeTableData processTimeTable(TimeTableData tt) {
   }
 
   classes.addAll(newClasses);
-  classes.sort((a, b) =>
-      int.parse(a.startPeriod!.id).compareTo(int.parse(b.startPeriod!.id)));
+  classes.sort((a, b) {
+    int? sp = int.tryParse(a.startPeriod!.id);
+    int? ep = int.tryParse(b.endPeriod!.id);
+    if (sp == null || ep == null) return 0;
+    return sp.compareTo(ep);
+  });
 
   return TimeTableData(tt.date, classes, periods);
 }