diff --git a/lib/controllers/providers/api/user_provider.dart b/lib/controllers/providers/api/user_provider.dart index 89afd486..557fe25a 100644 --- a/lib/controllers/providers/api/user_provider.dart +++ b/lib/controllers/providers/api/user_provider.dart @@ -25,7 +25,6 @@ class UserProvider extends ChangeNotifier { swipeTransactionModel = null; } - bool showSwipeOnly = true; // contain user data // when user not login or register _user = null @@ -190,7 +189,7 @@ class UserProvider extends ChangeNotifier { if (response.statusCode >= 200 && response.statusCode < 300) { isUserConfirmSwipe = true; await getSwipeLastTransaction(userId: user.userID); - if(showSwipeOnly){ + if(user.onlySwipe){ await getSwipeTransactionHistory(userId: user.userID,dateFrom: DateTime.now(),dateTo: DateTime.now()); } notifyListeners(); diff --git a/lib/models/user.dart b/lib/models/user.dart index bc2c1c82..8967dc18 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -14,7 +14,7 @@ class User { bool enableWifi; bool enableNFC; bool enableQR; - + bool onlySwipe; String username; String userID; String email; @@ -58,6 +58,7 @@ class User { this.enableNFC, this.enableQR, this.enableWifi, + this.onlySwipe, this.roles, this.userRoles, this.tokenlife, @@ -141,6 +142,7 @@ class User { map['enableWifi'] = enableWifi; map['enableNFC'] = enableNFC; map['enableQR'] = enableQR; + map['onlySwipe'] = onlySwipe; map['roles'] = roles; if (userRoles != null) { map['userRoles'] = userRoles.map((v) => v.toJson()).toList(); @@ -195,6 +197,7 @@ class User { enableWifi = json['enableWifi']; enableNFC = json['enableNFC']; enableQR = json['enableQR']; + onlySwipe = json['onlySwipe']; roles = json['roles']; if (json['userRoles'] != null) { userRoles = []; diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart index 3767e831..bd5ab93b 100644 --- a/lib/new_views/common_widgets/app_drawer.dart +++ b/lib/new_views/common_widgets/app_drawer.dart @@ -78,7 +78,7 @@ class AppDrawer extends StatelessWidget { // 18.height, drawerItem("setting", context.translation.settings, context).onPress(() => Navigator.of(context).pushNamed(SettingsPage.id)), 18.height, - if(userProvider.user!=null&&!userProvider.user.employeeIsHMG&& !userProvider.showSwipeOnly) + if(userProvider.user!=null&&!userProvider.user.employeeIsHMG&& !userProvider.user.onlySwipe) drawerItem("swipe", "Swipe History", context) .onPress(() => Navigator.of(context).pushNamed(SwipeHistoryView.routeName)), // 18.height, // drawerItem("whats_new", context.translation.whatsNew, context), diff --git a/lib/new_views/pages/login_page.dart b/lib/new_views/pages/login_page.dart index d325c654..5101ea7c 100644 --- a/lib/new_views/pages/login_page.dart +++ b/lib/new_views/pages/login_page.dart @@ -159,7 +159,7 @@ class _LoginPageState extends State { (await SharedPreferences.getInstance()).remove(ASettings.localAuth); await _settingProvider.setRememberMe(_user.userName, _user.password, rememberMe); - if(_userProvider.showSwipeOnly){ + if(_userProvider.user.onlySwipe){ Navigator.pushReplacementNamed(context, SwipeView.routeName); } else{ diff --git a/lib/new_views/pages/splash_page.dart b/lib/new_views/pages/splash_page.dart index ef533aaf..4f27f82a 100644 --- a/lib/new_views/pages/splash_page.dart +++ b/lib/new_views/pages/splash_page.dart @@ -67,8 +67,8 @@ class _SplashPageState extends State { if (isSuccess) { _userProvider.user = _settingProvider.user; - if(_userProvider.showSwipeOnly){ - Navigator.pushNamedAndRemoveUntil(context, SwipeView.routeName, (routes) => true); + if(_userProvider.user.onlySwipe){ + Navigator.of(context).pushNamedAndRemoveUntil(SwipeView.routeName, (routes) => true); }else{ Navigator.of(context).pushNamedAndRemoveUntil(LandPage.routeName, (routes) => true); } diff --git a/lib/new_views/swipe_module/swipe_history_view.dart b/lib/new_views/swipe_module/swipe_history_view.dart index a6704125..f91cb032 100644 --- a/lib/new_views/swipe_module/swipe_history_view.dart +++ b/lib/new_views/swipe_module/swipe_history_view.dart @@ -10,7 +10,6 @@ import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; -import 'package:test_sa/views/widgets/loaders/no_item_found.dart'; import 'models/swipe_transaction_history.dart'; @@ -56,7 +55,6 @@ class _SwipeHistoryViewState extends State { children: [ ADatePicker( label: context.translation.from, - showDateOnly: true, date: dateFrom, from: DateTime(DateTime.now().year - 5, DateTime.now().month, DateTime.now().day), formatDateWithTime: false, @@ -158,10 +156,11 @@ class SwipeHistoryList extends StatelessWidget { shrinkWrap: true, padding: EdgeInsets.only(top: 12.toScreenHeight), itemBuilder: (cxt, index) { - if (isLoading) + if (isLoading) { return const SizedBox( height: 20, ).toRequestShimmer(cxt, isLoading); + } return SwipeHistoryCard(list[index]); }, separatorBuilder: (cxt, index) => 12.height, diff --git a/lib/new_views/swipe_module/swipe_view.dart b/lib/new_views/swipe_module/swipe_view.dart index 481fc6ea..de92893f 100644 --- a/lib/new_views/swipe_module/swipe_view.dart +++ b/lib/new_views/swipe_module/swipe_view.dart @@ -96,7 +96,6 @@ class _SwipeViewState extends State { ), ), ).onPress(() { - print('on press called...'); _scaffoldKey.currentState.isDrawerOpen ? _scaffoldKey.currentState.closeDrawer() : _scaffoldKey.currentState.openDrawer(); }); }), @@ -110,6 +109,7 @@ class _SwipeViewState extends State { mainAxisSize: MainAxisSize.min, children: [ Column( + mainAxisSize: MainAxisSize.min, children: [ Text( context.translation.welcome, @@ -120,7 +120,8 @@ class _SwipeViewState extends State { style: AppTextStyles.heading2.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50, fontWeight: FontWeight.w600), ), ], - ).paddingOnly(start: 16, end: 16, top: 8, bottom: 8), + ).paddingOnly(start: 16, end: 16, top: 8, bottom: 4), + SwipeHistoryView(showAppBar: false).expanded, ], ), diff --git a/lib/views/widgets/date_and_time/date_picker.dart b/lib/views/widgets/date_and_time/date_picker.dart index 8cbd7142..983163bc 100644 --- a/lib/views/widgets/date_and_time/date_picker.dart +++ b/lib/views/widgets/date_and_time/date_picker.dart @@ -12,7 +12,7 @@ class ADatePicker extends StatelessWidget { final DateTime to; final String label; final Function(DateTime) onDatePicker; - final bool enable, withBorder,showDateOnly; + final bool enable, withBorder; final Color backgroundColor; final bool formatDateWithTime; @@ -23,7 +23,6 @@ class ADatePicker extends StatelessWidget { this.backgroundColor, this.date, this.formatDateWithTime = false, - this.showDateOnly = false, this.onDatePicker, this.from, this.to,