Broken Access

lib/Screens/authentication/login/login_widget.dart

@@ -406,8 +406,10 @@ class _LoginWidgetState extends State<LoginWidget> {
     }
   }
 
-  void _clearAllFields() {
+  Future<void> _clearAllFields() async {
     print("CLEAR ALL Fields");
+    final prefs = await SharedPreferences.getInstance();
+    prefs.clear();
 
     _emailController.clear();
     _passwordController.clear();

lib/Screens/costCenter/costCenter_list.dart

@@ -78,7 +78,9 @@ class CostCenterListState extends State<CostCenterList> {
     if (!mounted) return;
     try {
       futureCostCenter = fetchGetCostCenter();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureCostCenter?.then((object) {
           setState(() {
             allCostCenter = object;
@@ -88,6 +90,9 @@ class CostCenterListState extends State<CostCenterList> {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           loadInitialData();
         });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/department/department_list.dart

@@ -78,7 +78,9 @@ class DepartmentListState extends State<DepartmentList> {
     if (!mounted) return;
     try {
       futureDepartment = fetchGetDepartment();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureDepartment?.then((object) {
           setState(() {
             allDepartment = object;
@@ -88,6 +90,9 @@ class DepartmentListState extends State<DepartmentList> {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           loadInitialData();
         });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/group/group.dart

@@ -146,7 +146,9 @@ class _groupState extends State<Group> {
 
       orgId = await getOrgId();
       userId = await getUserId();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         setState(() {
           apiAllPolicy = result;
 
@@ -158,6 +160,9 @@ class _groupState extends State<Group> {
         print("Fetched services: $apiAllPolicy");
         print("Domestic policies: $apiForDomestic");
         print("International policies: $apiForInternational");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print('Error fetching role list: $e');
     }

lib/Screens/group/groupDetails.dart

@@ -180,7 +180,9 @@ class GroupDataState extends State<GroupData> {
       final result = await apiService.fetchAllPolicy(context);
 
       userId = await getUserId();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         setState(() {
           apiForDomestic =
               result.where((policy) => policy["domestic"] == "1").toList();
@@ -189,6 +191,9 @@ class GroupDataState extends State<GroupData> {
         });
         print("Domestic policies: $apiForDomestic");
         print("International policies: $apiForInternational");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print('Error fetching role list: $e');
     }

lib/Screens/group/groupList.dart

@@ -124,6 +124,9 @@ class _GroupListState extends State<GroupList> {
 
   Future<void> loadAllGroups() async {
     try {
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         final result = await apiService.fetchAllGroup(context);
         setState(() {
           allGroups = result;
@@ -131,6 +134,9 @@ class _GroupListState extends State<GroupList> {
           searchController.text = "";
         });
         print("Fetched services: $allGroups");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print('Error fetching role list: $e');
     }

lib/Screens/hotels/hotels_list.dart

@@ -82,7 +82,9 @@ class HotelsDataListState extends State<HotelsDataList> {
     if (!mounted) return;
     try {
       futureHotels = fetchGetHotels();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureHotels?.then((objects) {
           setState(() {
             allHotels = objects;
@@ -93,6 +95,9 @@ class HotelsDataListState extends State<HotelsDataList> {
           fetchCountryList();
           loadInitialData();
         });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/myTemplates/template.dart

@@ -140,6 +140,9 @@ class TemplateState extends State<Template> {
     }
     if (!mounted) return;
     try {
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         for (var field in dataHeader) {
           controllers[field] = TextEditingController();
         }
@@ -147,6 +150,9 @@ class TemplateState extends State<Template> {
         updateData();
         loadinitializeData();
         loadInitialData();
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/myTemplates/templateForex.dart

@@ -151,6 +151,9 @@ class TemplateForexState extends State<TemplateForex> {
     }
     if (!mounted) return;
     try {
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         for (var field in dataHeader) {
           controllers[field] = TextEditingController();
         }
@@ -158,6 +161,9 @@ class TemplateForexState extends State<TemplateForex> {
         updateData();
         loadinitializeData();
         loadInitialData();
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/myTemplates/templatesList.dart

@@ -80,7 +80,9 @@ class TemplatesListState extends State<TemplatesList> {
     if (!mounted) return;
     try {
       futureTemplates = fetchGetForex();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureTemplates?.then((users) {
           setState(() {
             allTemplate = users;
@@ -91,6 +93,9 @@ class TemplatesListState extends State<TemplatesList> {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           loadInitialData();
         });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/organization/orgSetup.dart

@@ -70,7 +70,7 @@ class _OrgSetUpState extends State<OrgSetUp> {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -78,10 +78,14 @@ class _OrgSetUpState extends State<OrgSetUp> {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    if (roleUser != null && (roleUser == 'Org Admin')) {
       loadAllServices();
       getOrganizationData();
       initializeData();
       loadInitialData();
+    } else {
+      apiService.logout(context);
+    }
   }
 
   void loadInitialData() async {

lib/Screens/perdiem_amount/forex_list.dart

@@ -81,7 +81,9 @@ class ForexDataListState extends State<ForexDataList> {
     if (!mounted) return;
     try {
       futureForex = fetchGetForex();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureForex?.then((users) {
           setState(() {
             allForex = users;
@@ -92,6 +94,9 @@ class ForexDataListState extends State<ForexDataList> {
           fetchCountryList();
           loadInitialData();
         });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/plans/create_plans.dart

@@ -682,11 +682,19 @@ class CreateNewPlansState extends State<CreateNewPlan> {
   void handleUpdateData() {
     if (widget.selectedPlanData != null) {
       setState(() {
+        print("updatedPlanDAta - ${widget.selectedPlanData}");
         statusValue = widget.selectedPlanData['status_value'] ?? '';
 
         print("STATUS____ : $statusValue");
+        print("STATUSplanUsrId____ : ${widget.selectedPlanData['user_id']}");
+
+        planUsrId =
+            widget.selectedPlanData['user_id'] != '0'
+                ? widget.selectedPlanData['user_id']
+                : widget.selectedPlanData['traveller_id'];
+
+        print("STATUSplanUsrId____1 : $planUsrId");
 
-        planUsrId = widget.selectedPlanData['user_id'] ?? '';
         _tripTitleController.text = widget.selectedPlanData['trip_title'] ?? '';
         _descriptionController.text =
             widget.selectedPlanData['description'] ?? '';
@@ -1168,12 +1176,19 @@ class CreateNewPlansState extends State<CreateNewPlan> {
   }
 
   Future<void> fetchTrainFlightClass(int tripId) async {
+    // final userId =
+    //     (planUsrId?.toString().isNotEmpty == true)
+    //         ? planUsrId.toString()
+    //         : (planTravlrId?.toString().isNotEmpty == true)
+    //         ? planTravlrId.toString()
+    //         : '';
+
+    print("TfetchTrainFlightClass");
+
     final userId =
-        (planUsrId?.toString().isNotEmpty == true)
+        (planUsrId?.toString().isNotEmpty == true) ? planUsrId.toString() : '';
-            ? planUsrId.toString()
+
-            : (planTravlrId?.toString().isNotEmpty == true)
+    print("TfetchTrainFlightClass - $userId");
-            ? planTravlrId.toString()
-            : '';
 
     // final String apiUrldata = '$apiUrl/api/getDropdownMaster';
     final String apiUrldata =

lib/Screens/plans/list_plans.dart

@@ -91,8 +91,19 @@ class _ListPlansState extends State<ListPlans> {
       if (!msUser) {
         _popStateListener = html.window.onPopState.listen((event) {
           if (!_dialogShown && mounted) {
+            print("locationLPw - 1");
+            print("locationLPw - ${html.window.location}");
+            final fullUrl = html.window.location.href;
+            final hashPart =
+                fullUrl.split('#/').last; // → "OrganizationSettings"
+
+            print("Current route: $hashPart");
+            if (hashPart.contains('/listPlan')) {
+              print("locationLPw - 2r");
               _showBackConfirmationDialog();
             }
+            print("locationLPw - 2");
+          }
 
           // Re-push to prevent leaving
           html.window.history.pushState(null, '', html.window.location.href);
@@ -109,7 +120,7 @@ class _ListPlansState extends State<ListPlans> {
 
   void _showBackConfirmationDialog() {
     print('List planstt');
-    if (!mounted) return;
+    // if (!mounted) return;
 
     _dialogShown = true;
 

lib/Screens/policy/policy.dart

@@ -187,6 +187,10 @@ class _PolicyState extends State<Policy> {
     }
     if (!mounted) return;
     try {
+      final roleUser = await getRoleUser();
+
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         loadinitializeData();
 
         await updateSelectedServices();
@@ -212,6 +216,9 @@ class _PolicyState extends State<Policy> {
         //
         //   policyCriteriaKey.currentState?.fetchTrainFlightClass();
         // }
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/policy/policy_list.dart

@@ -74,6 +74,10 @@ class _PolicyListState extends State<PolicyList> {
     }
     if (!mounted) return;
     try {
+      final roleUser = await getRoleUser();
+
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futurePolicy = fetchPolicy();
 
         futurePolicy?.then((object) {
@@ -84,6 +88,9 @@ class _PolicyListState extends State<PolicyList> {
 
         loadInitialData();
         fetchPolicy();
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/purposeOfTravel/purpose_of_travel_list.dart

@@ -79,6 +79,9 @@ class PurposeOfTravelListState extends State<PurposeOfTravelList> {
     try {
       futurePurposeOfTravel = fetchGetPurposeOfTravel();
 
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futurePurposeOfTravel?.then((object) {
           setState(() {
             allPurposeOfTravel = object;
@@ -88,6 +91,9 @@ class PurposeOfTravelListState extends State<PurposeOfTravelList> {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           loadInitialData();
         });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/reports/advancePurchase.dart

@@ -185,7 +185,7 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -193,10 +193,17 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
           loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("advance report : $e");

lib/Screens/reports/guestHouse.dart

@@ -149,7 +149,7 @@ class _GuestHouseState extends State<GuestHouse>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -157,10 +157,17 @@ class _GuestHouseState extends State<GuestHouse>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
           loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("guest report : $e");

lib/Screens/reports/misAir.dart

@@ -150,7 +150,7 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -158,10 +158,17 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
           loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("Air report : $e");

lib/Screens/reports/misForex.dart

@@ -120,7 +120,7 @@ class _MISforexState extends State<MISforex>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -128,10 +128,17 @@ class _MISforexState extends State<MISforex>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
           loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("Forex report : $e");

lib/Screens/reports/misHotel.dart

@@ -134,7 +134,7 @@ class _MIShotelState extends State<MIShotel>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -142,10 +142,17 @@ class _MIShotelState extends State<MIShotel>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
           loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("hotel report : $e");

lib/Screens/reports/reportList.dart

@@ -47,7 +47,7 @@ class _ReportListState extends State<ReportList> {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -55,10 +55,17 @@ class _ReportListState extends State<ReportList> {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
           loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("service report : $e");

lib/Screens/reports/servicesAnalysis.dart

@@ -163,7 +163,7 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -171,10 +171,16 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
           loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("service report : $e");

lib/Screens/traveller/travellerList.dart

@@ -78,7 +78,9 @@ class TravellerListState extends State<TravellerList> {
     if (!mounted) return;
     try {
       futureTraveller = fetchGetTraveller();
-
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureTraveller?.then((object) {
           setState(() {
             allTraveller = object;
@@ -88,6 +90,9 @@ class TravellerListState extends State<TravellerList> {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           loadInitialData();
         });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }

lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart

@@ -355,6 +355,7 @@ class _CreateTravelAgentFormDetialsState
   }
 
   void _checkAuthAndLoadData() async {
+    final roleUser = await getRoleUser();
     setState(() {
       isCheckingToken = true;
     });
@@ -367,6 +368,8 @@ class _CreateTravelAgentFormDetialsState
       return;
     }
 
+    if (roleUser != null &&
+        (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
       setState(() {
         isCheckingToken = false;
       });
@@ -388,7 +391,8 @@ class _CreateTravelAgentFormDetialsState
         final extraData = GoRouterState.of(context).extra;
         if (extraData != null && extraData is Map<String, dynamic>) {
           setState(() {
-          apiselectedUser = extraData['selectedUser'] as Map<String, dynamic>?;
+            apiselectedUser =
+                extraData['selectedUser'] as Map<String, dynamic>?;
             isViewMode = extraData['isViewMode'] ?? false;
             isEditProfile = extraData['isEditProfile'] ?? false;
           });
@@ -405,6 +409,9 @@ class _CreateTravelAgentFormDetialsState
       fetchUsers();
       fetchRoles();
       loadInitialData();
+    } else {
+      apiService.logout(context);
+    }
   }
 
   void _checkAuthAndLoadData22() async {

lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart

@@ -66,7 +66,7 @@ class _TravelAgentListScreenState extends State<TravelAgentListScreen> {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -75,7 +75,8 @@ class _TravelAgentListScreenState extends State<TravelAgentListScreen> {
       return;
     } else {
       futureUsers = fetchUsers();
-
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureUsers.then((users) {
           setState(() {
             allUsers = users;
@@ -87,6 +88,9 @@ class _TravelAgentListScreenState extends State<TravelAgentListScreen> {
         //   fetchCountryList();
         //   loadInitialData();
         // });
+      } else {
+        apiService.logout(context);
+      }
     }
   }
 

lib/Screens/userManagement/create_user/create_user.dart

@@ -445,6 +445,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
   }
 
   void _checkAuthAndLoadData() async {
+    final roleUser = await getRoleUser();
     setState(() {
       isCheckingToken = true;
     });
@@ -457,6 +458,8 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
       return;
     }
 
+    if (roleUser != null &&
+        (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
       setState(() {
         isCheckingToken = false;
       });
@@ -478,7 +481,8 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
         final extraData = GoRouterState.of(context).extra;
         if (extraData != null && extraData is Map<String, dynamic>) {
           setState(() {
-          apiselectedUser = extraData['selectedUser'] as Map<String, dynamic>?;
+            apiselectedUser =
+                extraData['selectedUser'] as Map<String, dynamic>?;
             isViewMode = extraData['isViewMode'] ?? false;
             isEditProfile = extraData['isEditProfile'] ?? false;
           });
@@ -495,6 +499,9 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
       fetchUsers();
       fetchRoles();
       loadInitialData();
+    } else {
+      apiService.logout(context);
+    }
   }
 
   void _checkAuthAndLoadData22() async {

lib/Screens/userManagement/create_user/traveller_details.dart

@@ -1347,7 +1347,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
     List<String> nationalityOptions = [
       "Indian",
       "International",
-      "other nationality",
+      "Other Nationality",
     ];
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,

lib/Screens/userManagement/user_List.dart

@@ -51,7 +51,7 @@ class _UserListScreenState extends State<UserListScreen> {
   @override
   void initState() {
     super.initState();
-    // futureUsers = fetchUsers();
+    futureUsers = fetchUsers();
     //
     // futureUsers.then((users) {
     //   setState(() {
@@ -63,12 +63,13 @@ class _UserListScreenState extends State<UserListScreen> {
     //   fetchCountryList();
     //   loadInitialData();
     // });
+
     _checkAuthAndLoadData();
   }
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -76,6 +77,8 @@ class _UserListScreenState extends State<UserListScreen> {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     } else {
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
         futureUsers = fetchUsers();
 
         futureUsers.then((users) {
@@ -85,6 +88,9 @@ class _UserListScreenState extends State<UserListScreen> {
         });
         fetchCountryList();
         loadInitialData();
+      } else {
+        apiService.logout(context);
+      }
       // WidgetsBinding.instance.addPostFrameCallback((_) {
       //   fetchCountryList();
       //   loadInitialData();

lib/app.dart

@@ -35,8 +35,8 @@ class _MyAppState extends State<MyApp> {
   void initState() {
     super.initState();
 
-    // SemanticsBinding.instance
+    SemanticsBinding.instance
-    //     .ensureSemantics(); //  -only for testing uncomment, Otherwise Email Template wont allow to type
+        .ensureSemantics(); //  -NOTE:only for testing uncomment, Otherwise Email Template wont allow to type
     if (kIsWeb) {
       final uri = Uri.parse(html.window.location.href);
       print("URI - $uri");

lib/services/apiService.dart

@@ -893,7 +893,7 @@ class ApiService {
   }) async {
     try {
       Map<String, dynamic> planData = await getViewPlanEdit(planId, context);
-      print("ViewAAA - $planData");
+      print("ViewAAA API Service - $planData");
 
       context.go(
         isMyTrips ? '/createPlan' : '/allTrips/trips',

lib/utils/travelAgent_remarks.dart

@@ -83,6 +83,7 @@ class CommentModalState extends State<CommentModal> {
         throw Exception('Invalid user ID format.');
       }
 
+      if (role != null && (role == 'Org Admin' || role == 'Travel Admin')) {
         final data = await getRemarks(userId);
 
         setState(() {
@@ -92,6 +93,9 @@ class CommentModalState extends State<CommentModal> {
         });
         print("Remarks -");
         print("Remarks - ${jsonEncode(remarksData)}");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       setState(() {
         errorMessage = e.toString();
@@ -208,7 +212,7 @@ class CommentModalState extends State<CommentModal> {
         await apiService.logout(context);
         return null;
         // throw Exception('Failed to load users');
-      }else {
+      } else {
         print("Failed to submit plan. Status: ${response.statusCode}");
         print("Error: ${response.body}");
       }