Merge pull request #144 from venkylm10/timetable

fixed homescreen TT and navigation between TT and exam schedule
swciitg · Oct 11, 2023 · b7f9f47 · b7f9f47
2 parents 12abe02 + ec5a8b4
commit b7f9f47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/pages/timetable/timetable.dart b/lib/pages/timetable/timetable.dart
@@ -37,7 +37,9 @@ class _TimeTableTabState extends State<TimeTableTab> {
                       Expanded(
                         child: TextButton(
                           onPressed: () {
-                            (store.setTT());
+                            if (!(store.isTimetable)) {
+                              store.setTT();
+                            }
                           },
                           child: ClipRRect(
                             borderRadius: const BorderRadius.all(
@@ -59,7 +61,9 @@ class _TimeTableTabState extends State<TimeTableTab> {
                       Expanded(
                         child: TextButton(
                           onPressed: () {
-                            (store.setTT());
+                            if (store.isTimetable) {
+                              store.setTT();
+                            }
                           },
                           child: ClipRRect(
                             borderRadius: const BorderRadius.all(

diff --git a/lib/stores/timetable_store.dart b/lib/stores/timetable_store.dart
@@ -124,7 +124,7 @@ abstract class _TimetableStore with Store {
       ...allTimetableCourses[current.weekday - 1]
           .morning
           .where((e) =>
-              dateFormat.parse(e.timings![kworkingDays[selectedDay]]).hour >=
+              dateFormat.parse(e.timings![day]).hour >=
               DateTime.now().hour)
           .toList()
           .map((e) => TimetableTile(
@@ -135,7 +135,7 @@ abstract class _TimetableStore with Store {
       ...allTimetableCourses[current.weekday - 1]
           .afternoon
           .where((e) =>
-              dateFormat.parse(e.timings![kworkingDays[selectedDay]]).hour >=
+              dateFormat.parse(e.timings![day]).hour >=
               DateTime.now().hour)
           .toList()
           .map((e) => TimetableTile(