From 17545af7e16cd2b5a32b8070ce6055cf47d0f6e9 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 6 Jan 2025 10:07:52 +0300 Subject: [PATCH] swipe improvements. --- .../swipe_module/swipe_history_view.dart | 91 ++++++++++--------- .../utils/swipe_general_utils.dart | 3 - 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/lib/new_views/swipe_module/swipe_history_view.dart b/lib/new_views/swipe_module/swipe_history_view.dart index f3f56030..65d1592d 100644 --- a/lib/new_views/swipe_module/swipe_history_view.dart +++ b/lib/new_views/swipe_module/swipe_history_view.dart @@ -57,29 +57,32 @@ class _SwipeHistoryViewState extends State { label: context.translation.from, date: dateFrom, from: DateTime(DateTime.now().year - 5, DateTime.now().month, DateTime.now().day), - formatDateWithTime: true, + formatDateWithTime: false, onDatePicker: (selectedDate) { if (selectedDate != null) { - showTimePicker( - context: context, - initialTime: TimeOfDay.now(), - ).then((selectedTime) { - // Handle the selected date and time here. - if (selectedTime != null) { - DateTime selectedDateTime = DateTime( - selectedDate.year, - selectedDate.month, - selectedDate.day, - selectedTime.hour, - selectedTime.minute, - ); - if (selectedDateTime != null) { - setState(() { - dateFrom = selectedDateTime; - }); - } - } + setState(() { + dateFrom = selectedDate; }); + // showTimePicker( + // context: context, + // initialTime: TimeOfDay.now(), + // ).then((selectedTime) { + // // Handle the selected date and time here. + // if (selectedTime != null) { + // DateTime selectedDateTime = DateTime( + // selectedDate.year, + // selectedDate.month, + // selectedDate.day, + // selectedTime.hour, + // selectedTime.minute, + // ); + // if (selectedDateTime != null) { + // setState(() { + // dateFrom = selectedDateTime; + // }); + // } + // } + // }); } }, ).expanded, @@ -88,31 +91,35 @@ class _SwipeHistoryViewState extends State { label: context.translation.to, date: dateTo, from: DateTime(DateTime.now().year - 5, DateTime.now().month, DateTime.now().day), - formatDateWithTime: true, + formatDateWithTime: false, onDatePicker: (selectedDate) { if (selectedDate != null) { - showTimePicker( - context: context, - initialTime: TimeOfDay.now(), - ).then((selectedTime) { - // Handle the selected date and time here. - if (selectedTime != null) { - DateTime selectedDateTime = DateTime( - selectedDate.year, - selectedDate.month, - selectedDate.day, - selectedTime.hour, - selectedTime.minute, - ); - if (selectedDateTime != null) { - setState(() { - dateTo = selectedDateTime; - - }); - - } - } + setState(() { + dateTo = selectedDate; + }); + // showTimePicker( + // context: context, + // initialTime: TimeOfDay.now(), + // ).then((selectedTime) { + // // Handle the selected date and time here. + // if (selectedTime != null) { + // DateTime selectedDateTime = DateTime( + // selectedDate.year, + // selectedDate.month, + // selectedDate.day, + // selectedTime.hour, + // selectedTime.minute, + // ); + // if (selectedDateTime != null) { + // setState(() { + // dateTo = selectedDateTime; + // + // }); + // + // } + // } + // }); } }, ).expanded, diff --git a/lib/new_views/swipe_module/utils/swipe_general_utils.dart b/lib/new_views/swipe_module/utils/swipe_general_utils.dart index 37b1e06e..4f7a398d 100644 --- a/lib/new_views/swipe_module/utils/swipe_general_utils.dart +++ b/lib/new_views/swipe_module/utils/swipe_general_utils.dart @@ -404,9 +404,6 @@ class SwipeGeneralUtils { handleSwipe(swipeType: SwipeTypeEnum.QR, isEnable: userProvider.user.enableQR, context: navigatorKey.currentState.overlay.context); }, context)); } - if (kDebugMode) { - userProvider.user.enableWifi = true; - } if (userProvider.user.enableWifi) { availableMethods.add(attendanceTypeCard(SwipeTypeEnum.Wifi.name, 'wifi_icon', userProvider.user.enableWifi, () {