diff --git a/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart b/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart index ce7d9662..310c91dd 100644 --- a/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart +++ b/lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart @@ -66,11 +66,9 @@ class _ExternalMaintenanceRequestState extends State showShadow: false, showCancel: true, onSelect: (supplier) { - if (supplier != requestDetailProvider.activityMaintenanceHelperModel?.supplier) { - requestDetailProvider.activityMaintenanceHelperModel?.supplier = supplier; - requestDetailProvider.activityMaintenanceHelperModel?.supEngineer = null; - setState(() {}); - } + requestDetailProvider.activityMaintenanceHelperModel?.supplier = supplier; + requestDetailProvider.activityMaintenanceHelperModel?.supEngineer = null; + setState(() {}); }, ), 8.height, @@ -187,13 +185,12 @@ class _ExternalMaintenanceRequestState extends State ).then((selectedTime) { // Handle the selected date and time here. if (selectedTime != null) { - final TimeOfDay now = TimeOfDay.now(); - final bool isBeforeNow = Utils.isBeforeOrEqualCurrentTime(selectedTime, now); - if (!isBeforeNow) { - "Please select a time before the current time.".showToast; - return; - } + final bool isBeforeNow = Utils.isBeforeOrEqualCurrentTime(selectedTime, now); + if (!isBeforeNow) { + "Please select a time before the current time.".showToast; + return; + } DateTime selectedDateTime = DateTime( selectedDate.year, selectedDate.month, @@ -245,5 +242,4 @@ class _ExternalMaintenanceRequestState extends State ); }); } - } diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart index ecd2422a..8f4a24d8 100644 --- a/lib/new_views/pages/land_page/land_page.dart +++ b/lib/new_views/pages/land_page/land_page.dart @@ -18,6 +18,7 @@ import 'package:test_sa/new_views/pages/land_page/create_request-type_bottomshee import 'package:test_sa/new_views/pages/land_page/my_request/my_requests_page.dart'; import 'package:test_sa/new_views/pages/login_page.dart'; import 'package:test_sa/new_views/pages/settings_page.dart'; +import 'package:test_sa/providers/work_order/vendor_provider.dart'; import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; import '../../../controllers/providers/settings/setting_provider.dart'; @@ -107,6 +108,7 @@ class _LandPageState extends State { _userProvider!.getSwipeLastTransaction(userId: _userProvider!.user!.userID!); }); } + Provider.of(context, listen: false).getDate(); _pages = [ DashboardView(onDrawerPress: (() { _scaffoldKey.currentState!.isDrawerOpen ? _scaffoldKey.currentState!.closeDrawer() : _scaffoldKey.currentState!.openDrawer(); @@ -154,7 +156,6 @@ class _LandPageState extends State { selectedIndex: currentPageIndex, onPressed: (index) { bool isEngineer = _userProvider!.user!.type == UsersTypes.engineer; - print("index:$index"); if (index == 2) { showModalBottomSheet( context: context,