From 4a4f4c3fe467150f5593a710721c852e0ce2b3a6 Mon Sep 17 00:00:00 2001 From: Hareesh-Nandigrama Date: Sat, 29 Jul 2023 11:40:49 +0530 Subject: [PATCH] has left function corrected --- lib/functions/travel/has_left.dart | 16 ++++++++++++++-- lib/widgets/travel/next_time_card.dart | 5 ----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/functions/travel/has_left.dart b/lib/functions/travel/has_left.dart index c3e1ca11..da42611a 100644 --- 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, + ); +} \ No newline at end of file diff --git a/lib/widgets/travel/next_time_card.dart b/lib/widgets/travel/next_time_card.dart index cd364883..623e9950 100644 --- a/lib/widgets/travel/next_time_card.dart +++ b/lib/widgets/travel/next_time_card.dart @@ -62,7 +62,6 @@ class _NextTimeCardState extends State { } return nextTime(weekdaysTimes); } else { - // List ferryTimings = await APIService().getFerryTiming(); List ferryTimings = await DataProvider.getFerryTiming(); List weekdaysTimes= []; List weekendTimes=[]; @@ -79,10 +78,6 @@ class _NextTimeCardState extends State { 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());