Merge remote-tracking branch 'origin/main'

swciitg · Jul 31, 2023 · acb8399 · acb8399
2 parents bda264f + 0de30c1
commit acb8399
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/functions/travel/has_left.dart b/lib/functions/travel/has_left.dart
@@ -1,5 +1,17 @@
 bool hasLeft(DateTime s) {
-  DateTime x = DateTime.now();
-  return x.isAfter(s.toLocal());
+  DateTime now = DateTime.now();
+  return now.isAfter(updateDate(s));
 }
 
+DateTime updateDate(DateTime input) {
+  input = input.toLocal();
+  DateTime now = DateTime.now();
+  return DateTime(
+    now.year,
+  now.month,
+ now.day,
+input.hour,
+ input.minute,
+ input.second,
+  );
+}
diff --git a/lib/widgets/travel/next_time_card.dart b/lib/widgets/travel/next_time_card.dart
@@ -62,7 +62,6 @@ class _NextTimeCardState extends State<NextTimeCard> {
         }
         return nextTime(weekdaysTimes);
       } else {
-        // List<TravelTiming> ferryTimings = await APIService().getFerryTiming();
         List<TravelTiming> ferryTimings = await DataProvider.getFerryTiming();
         List<DateTime> weekdaysTimes= [];
         List<DateTime> weekendTimes=[];
@@ -79,10 +78,6 @@ class _NextTimeCardState extends State<NextTimeCard> {
           weekendTimes.add(requiredModel.weekend.fromCampus[i]);
         }
         weekendTimes.sort((a, b) => a.compareTo(b));
-        // var ferryTimes = await DataProvider.getFerryTimings();
-        // var requiredModel = ferryTimes.firstWhere((element) =>
-        //     element.name ==
-        //     mapStore.allLocationData[mapStore.selectedCarouselIndex]['name']);
         if (today == 'Sat') {
           return nextTime(weekdaysTimes,
               firstTime: weekendTimes[0].toString());