diff --git a/lib/Screens/userManagement/create_user/create_user.dart b/lib/Screens/userManagement/create_user/create_user.dart index 92869b6..da6bfb4 100644 --- a/lib/Screens/userManagement/create_user/create_user.dart +++ b/lib/Screens/userManagement/create_user/create_user.dart @@ -700,6 +700,47 @@ class _CreateUserFormDetialsState extends State { print("USERDETAILS : $data"); + // block-submit-here + + // Additional validation starts - travelDetailsData passport + DateTime? start_Date = travelDetailsData?['date_of_issue']; + DateTime? end_Date = travelDetailsData?['date_of_expiry']; + + if (start_Date != null && end_Date != null && start_Date.toString().isNotEmpty && end_Date.toString().isNotEmpty) { + try { + final format = DateFormat("dd-MM-yyyy"); + final checkStartDate = format.parse("$start_Date"); + final checkEndDate = format.parse("$end_Date"); + + if (checkEndDate.isBefore(checkStartDate)) { + // return "End date cannot be earlier than start date";; + return ; + } + } catch (e) { // return "End date cannot be earlier than start date"; + return ; + // errorMessages["end_date"] = "Invalid date format"; + } + } + // valid_from: 20-06-2025, valid_upto: 19-06-2025 + DateTime? valid_from = data?['valid_from']; + DateTime? valid_upto = data?['valid_upto']; + + if (valid_from != null && valid_upto != null && valid_from.toString().isNotEmpty && valid_upto.toString().isNotEmpty) { + try { + final format = DateFormat("dd-MM-yyyy"); + final checkValidFrom = format.parse("$valid_from"); + final checkValidUpto = format.parse("$valid_upto"); + + if (checkValidUpto.isBefore(checkValidFrom)) { + // return "valid upto cannot be earlier than valid from"; + return ; + } + } catch (e) { // return "valid upto cannot be earlier than valid from"; + return ; + // errorMessages["end_date"] = "Invalid date format"; + } + } + // Map data = userDetials; if (!isValidData(data) && isValidDataTwo(data)) { diff --git a/lib/Screens/userManagement/create_user/office_details.dart b/lib/Screens/userManagement/create_user/office_details.dart index cd69508..a015f23 100644 --- a/lib/Screens/userManagement/create_user/office_details.dart +++ b/lib/Screens/userManagement/create_user/office_details.dart @@ -692,6 +692,9 @@ class _OfficeDetailsState extends State { enabled: !widget.isViewMode, popupProps: PopupProps.menu( + menuProps: const MenuProps( + backgroundColor: Colors.white, + ), showSearchBox: true, fit: FlexFit.loose, // Allows flexible height itemBuilder: