diff --git a/lib/Screens/costCenter/costCenterDetails.dart b/lib/Screens/costCenter/costCenterDetails.dart
index 12d24d3..697e3c8 100644
--- a/lib/Screens/costCenter/costCenterDetails.dart
+++ b/lib/Screens/costCenter/costCenterDetails.dart
@@ -36,11 +36,12 @@ class CostCenterDataState extends State<CostCenterData> {
   final ApiService apiService = ApiService();
   Map<String, dynamic>? apiData;
 
-  final Map<String, FocusNode> focusNodes = {
-    "name": FocusNode(),
-    "description": FocusNode(),
-  };
-
+  // final Map<String, FocusNode> focusNodes = {
+  //   "name": FocusNode(),
+  //   "description": FocusNode(),
+  // };
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
   final Map<String, TextEditingController> controllers = {};
   Map<String, String> errorMessages = {};
 
@@ -70,6 +71,15 @@ class CostCenterDataState extends State<CostCenterData> {
     apiData = null;
     for (var field in dataHeader) {
       controllers[field] = TextEditingController();
+      focusNodes["${field}FocusNode"] = FocusNode();
+      focusStates["${field}Focused"] = false;
+    }
+    for (var key in focusNodes.keys) {
+      _addFocusListener(focusNodes[key]!, (focus) {
+        setState(() {
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
+        });
+      });
     }
 
     if (widget.costcenterId != null) {
@@ -89,8 +99,18 @@ class CostCenterDataState extends State<CostCenterData> {
     for (var controller in controllers.values) {
       controller.dispose();
     }
+    for (var node in focusNodes.values) {
+      node.dispose();
+    }
     super.dispose();
   }
+  void _addFocusListener(FocusNode node, Function(bool) updateState) {
+    node.addListener(() {
+      setState(() {
+        updateState(node.hasFocus);
+      });
+    });
+  }
 
   void updateCostCenterDetails() {
     print("Inside Update Function - ${widget.costcenterData}");
@@ -129,10 +149,10 @@ class CostCenterDataState extends State<CostCenterData> {
       if (data[field] == null || data[field]!.trim().isEmpty) {
         errorMessages[field] = "Required";
 
-        if (!hasFocused) {
-          focusNodes[field]?.requestFocus();
-          hasFocused = true;
-        }
+        // if (!hasFocused) {
+        //   focusNodes[field]?.requestFocus();
+        //   hasFocused = true;
+        // }
       }
     }
 
@@ -258,14 +278,14 @@ class CostCenterDataState extends State<CostCenterData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                isFocused: focusStates["nameFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 40,
                   child: TextField(
                     controller: controllers["name"],
-                    focusNode: focusNodes["name"],
+                    focusNode: focusNodes["nameFocusNode"],
                     style: const TextStyle(fontSize: 12),
                     decoration: const InputDecoration(
                       labelText: "Name",
@@ -300,14 +320,14 @@ class CostCenterDataState extends State<CostCenterData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                isFocused: focusStates["descriptionFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 100,
                   child: TextField(
                     controller: controllers["description"],
-                    focusNode: focusNodes["description"],
+                    focusNode: focusNodes["descriptionFocusNode"],
                     style: const TextStyle(fontSize: 12),
                     maxLines: null,
                     expands: true,
diff --git a/lib/Screens/department/departmentDetails.dart b/lib/Screens/department/departmentDetails.dart
index 4d461fb..dbb9e7a 100644
--- a/lib/Screens/department/departmentDetails.dart
+++ b/lib/Screens/department/departmentDetails.dart
@@ -36,26 +36,27 @@ class DepartmentDataState extends State<DepartmentData> {
   final ApiService apiService = ApiService();
   Map<String, dynamic>? apiData;
 
-  final Map<String, FocusNode> focusNodes = {
-    "name": FocusNode(),
-    "description": FocusNode(),
-  };
+  // final Map<String, FocusNode> focusNodes = {
+  //   "name": FocusNode(),
+  //   "description": FocusNode(),
+  // };
 
   final Map<String, TextEditingController> controllers = {};
   Map<String, String> errorMessages = {};
-
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
   String? selectedName;
   String? selectedDescription;
   String? userId;
   int? departmentDataId;
   late String isActive = "1";
 
-  List<String> dataHeader = ["name", "description"];
+  List<String> dataHeader = ["dropdown_value", "description"];
 
   Map<String, dynamic> departmentDetails() {
     final data = {
       // "department_id": int.parse(departmentId),
-      "name": controllers["name"]?.text,
+      "dropdown_value": controllers["dropdown_value"]?.text,
       "description": controllers["description"]?.text,
       "created_by": userId,
       "is_active": isActive,
@@ -70,6 +71,15 @@ class DepartmentDataState extends State<DepartmentData> {
     apiData = null;
     for (var field in dataHeader) {
       controllers[field] = TextEditingController();
+      focusNodes["${field}FocusNode"] = FocusNode();
+      focusStates["${field}Focused"] = false;
+    }
+    for (var key in focusNodes.keys) {
+      _addFocusListener(focusNodes[key]!, (focus) {
+        setState(() {
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
+        });
+      });
     }
 
     if (widget.departmentId != null) {
@@ -89,8 +99,18 @@ class DepartmentDataState extends State<DepartmentData> {
     for (var controller in controllers.values) {
       controller.dispose();
     }
+    for (var node in focusNodes.values) {
+      node.dispose();
+    }
     super.dispose();
   }
+  void _addFocusListener(FocusNode node, Function(bool) updateState) {
+    node.addListener(() {
+      setState(() {
+        updateState(node.hasFocus);
+      });
+    });
+  }
 
   void updateDepartmentDetails() {
     print("Inside Update Function - ${widget.departmentData}");
@@ -99,10 +119,10 @@ class DepartmentDataState extends State<DepartmentData> {
 
     if (data == null) return;
     setState(() {
-      controllers['name']?.text = data['name'] ?? '';
-      controllers['description']?.text = data['description'].toString();
+      controllers['dropdown_value']?.text = data['dropdown_value'] ?? '';
+      // controllers['description']?.text = data['description'].toString();
       isActive = data["is_active"];
-      final departmentId = int.tryParse(data['department_id'].toString());
+      final departmentId = int.tryParse(data['id'].toString());
       departmentDataId = departmentId;
     });
   }
@@ -117,11 +137,11 @@ class DepartmentDataState extends State<DepartmentData> {
     errorMessages.clear();
 
     final data = {
-      "name": controllers["name"]?.text,
-      "description": controllers["description"]?.text,
+      "dropdown_value": controllers["dropdown_value"]?.text,
+      // "description": controllers["description"]?.text,
     };
 
-    final requiredFields = ["name", "description"];
+    final requiredFields = ["dropdown_value"];
     bool hasFocused = false;
 
     // Check validation for each field
@@ -129,10 +149,10 @@ class DepartmentDataState extends State<DepartmentData> {
       if (data[field] == null || data[field]!.trim().isEmpty) {
         errorMessages[field] = "Required";
 
-        if (!hasFocused) {
-          focusNodes[field]?.requestFocus();
-          hasFocused = true;
-        }
+        // if (!hasFocused) {
+        //   focusNodes[field]?.requestFocus();
+        //   hasFocused = true;
+        // }
       }
     }
 
@@ -165,7 +185,7 @@ class DepartmentDataState extends State<DepartmentData> {
     if (departmentDataId != null) {
       print("for edit department id - $departmentDataId");
       apiUrldata = '$apiUrl/api/updateDepartment/$departmentDataId';
-      departmentData["department_id"] = departmentDataId.toString();
+      departmentData["id"] = departmentDataId.toString();
       departmentData["updated_by"] = userId;
       (departmentData.containsKey("created_by"))
           ? departmentData.remove("created_by")
@@ -261,14 +281,14 @@ class DepartmentDataState extends State<DepartmentData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                isFocused: focusStates["dropdown_valueFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 40,
                   child: TextField(
-                    controller: controllers["name"],
-                    focusNode: focusNodes["name"],
+                    controller: controllers["dropdown_value"],
+                    focusNode: focusNodes["dropdown_valueFocusNode"],
                     style: const TextStyle(fontSize: 12),
                     decoration: const InputDecoration(
                       labelText: "Name",
@@ -280,60 +300,60 @@ class DepartmentDataState extends State<DepartmentData> {
                   ),
                 ),
               ),
-              if (errorMessages["name"] != null) ...[
+              if (errorMessages["dropdown_value"] != null) ...[
                 SizedBox(height: 5), // Space before error message
                 Text(
-                  errorMessages["name"]!,
-                  style: TextStyle(color: Colors.red, fontSize: 12),
-                ),
-              ],
-            ],
-          ),
-          SizedBox(height: 15),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                "Description *",
-                style: GoogleFonts.poppins(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w600,
-                  color: Color(0xFF575A74),
-                ),
-              ),
-              SizedBox(height: 5),
-              CustomTextFieldForexWrapper(
-                isFocused: false,
-                isDesktop: widget.isDesktop,
-                color: Colors.transparent,
-                child: SizedBox(
-                  height: 100,
-                  child: TextField(
-                    controller: controllers["description"],
-                    focusNode: focusNodes["description"],
-                    style: const TextStyle(fontSize: 12),
-                    maxLines: null,
-                    expands: true,
-                    decoration: const InputDecoration(
-                      labelText: "Description",
-                      labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
-                      floatingLabelBehavior: FloatingLabelBehavior.never,
-                      border: InputBorder.none,
-                      contentPadding: EdgeInsets.symmetric(vertical: 16),
-                    ),
-                  ),
-                ),
-              ),
-              if (errorMessages["description"] != null) ...[
-                SizedBox(height: 5), // Space before error message
-                Text(
-                  errorMessages["description"]!,
+                  errorMessages["dropdown_value"]!,
                   style: TextStyle(color: Colors.red, fontSize: 12),
                 ),
               ],
             ],
           ),
           SizedBox(height: 15),
+          // Column(
+          //   crossAxisAlignment: CrossAxisAlignment.start,
+          //   children: [
+          //     Text(
+          //       "Description *",
+          //       style: GoogleFonts.poppins(
+          //         fontSize: 12,
+          //         fontWeight: FontWeight.w600,
+          //         color: Color(0xFF575A74),
+          //       ),
+          //     ),
+          //     SizedBox(height: 5),
+          //     CustomTextFieldForexWrapper(
+          //       isFocused: focusStates["descriptionFocused"] ?? false,
+          //       isDesktop: widget.isDesktop,
+          //       color: Colors.transparent,
+          //       child: SizedBox(
+          //         height: 100,
+          //         child: TextField(
+          //           controller: controllers["description"],
+          //           focusNode: focusNodes["descriptionFocusNode"],
+          //           style: const TextStyle(fontSize: 12),
+          //           maxLines: null,
+          //           expands: true,
+          //           decoration: const InputDecoration(
+          //             labelText: "Description",
+          //             labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
+          //             floatingLabelBehavior: FloatingLabelBehavior.never,
+          //             border: InputBorder.none,
+          //             contentPadding: EdgeInsets.symmetric(vertical: 16),
+          //           ),
+          //         ),
+          //       ),
+          //     ),
+          //     if (errorMessages["description"] != null) ...[
+          //       SizedBox(height: 5), // Space before error message
+          //       Text(
+          //         errorMessages["description"]!,
+          //         style: TextStyle(color: Colors.red, fontSize: 12),
+          //       ),
+          //     ],
+          //   ],
+          // ),
+          // SizedBox(height: 15),
           if (departmentDataId != null)
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
diff --git a/lib/Screens/department/department_list.dart b/lib/Screens/department/department_list.dart
index 28737f9..8766693 100644
--- a/lib/Screens/department/department_list.dart
+++ b/lib/Screens/department/department_list.dart
@@ -180,13 +180,13 @@ class DepartmentListState extends State<DepartmentList> {
           allDepartment.where((object) {
             final isActiveStatus =
                 object['is_active'] == "1" ? "active" : "inactive";
-            return (object['department_id']?.toLowerCase().contains(
+            return (object['id']?.toLowerCase().contains(
                       lowerQuery,
                     ) ??
                     false) ||
-                (object['name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['description']?.toLowerCase().contains(lowerQuery) ??
-                    false) ||
+                (object['dropdown_value']?.toLowerCase().contains(lowerQuery) ?? false) ||
+                // (object['description']?.toLowerCase().contains(lowerQuery) ??
+                //     false) ||
                 (isActiveStatus.contains(lowerQuery));
           }).toList();
       currentPage = 0;
@@ -550,15 +550,15 @@ class DepartmentListState extends State<DepartmentList> {
                                 ),
                               ),
                             ),
-                            DataColumn(
-                              label: Text(
-                                'Description',
-                                style: GoogleFonts.poppins(
-                                  fontSize: 13,
-                                  fontWeight: FontWeight.w600,
-                                ),
-                              ),
-                            ),
+                            // DataColumn(
+                            //   label: Text(
+                            //     'Description',
+                            //     style: GoogleFonts.poppins(
+                            //       fontSize: 13,
+                            //       fontWeight: FontWeight.w600,
+                            //     ),
+                            //   ),
+                            // ),
                             DataColumn(
                               label: Text(
                                 'Status',
@@ -581,7 +581,7 @@ class DepartmentListState extends State<DepartmentList> {
                           rows:
                               paginatedDepartment.map((tableObject) {
                                 String departmentId =
-                                    tableObject['department_id']
+                                    tableObject['id']
                                         .toString(); // Get user ID
                                 bool isSelected =
                                     selectedDepartmentId == departmentId;
@@ -590,24 +590,24 @@ class DepartmentListState extends State<DepartmentList> {
                                   cells: [
                                     DataCell(
                                       Text(
-                                        tableObject['name'] ?? '',
+                                        tableObject['dropdown_value'] ?? '',
                                         style: TextStyle(
                                           fontSize: 13,
                                           fontFamily: "Inter",
                                         ),
                                       ),
                                     ),
-                                    DataCell(
-                                      Text(
-                                        tableObject['description'] ?? 'N/A',
-                                        style: TextStyle(
-                                          fontSize: 13,
-                                          fontFamily: "Inter",
-                                        ),
-                                        softWrap: true,
-                                        overflow: TextOverflow.ellipsis,
-                                      ),
-                                    ),
+                                    // DataCell(
+                                    //   Text(
+                                    //     tableObject['description'] ?? 'N/A',
+                                    //     style: TextStyle(
+                                    //       fontSize: 13,
+                                    //       fontFamily: "Inter",
+                                    //     ),
+                                    //     softWrap: true,
+                                    //     overflow: TextOverflow.ellipsis,
+                                    //   ),
+                                    // ),
                                     DataCell(
                                       Text(
                                         tableObject['is_active'] == "1"
@@ -645,7 +645,7 @@ class DepartmentListState extends State<DepartmentList> {
                                           // final usersData = await getUserDetails(userId);
                                           //
                                           final departmentId = int.tryParse(
-                                            tableObject['department_id']
+                                            tableObject['id']
                                                 .toString(),
                                           );
 
@@ -716,7 +716,7 @@ class DepartmentListState extends State<DepartmentList> {
                                       MainAxisAlignment.spaceBetween,
                                   children: [
                                     Text(
-                                      cardObject['name'] ?? 'N/A',
+                                      cardObject['dropdown_value'] ?? 'N/A',
                                       style: GoogleFonts.poppins(
                                         fontSize: 10,
                                         color: Colors.black87,
@@ -738,7 +738,7 @@ class DepartmentListState extends State<DepartmentList> {
                                         // final usersData = await getUserDetails(userId);
                                         //
                                         final departmentId = int.tryParse(
-                                          cardObject['department_id']
+                                          cardObject['id']
                                               .toString(),
                                         );
 
@@ -852,37 +852,37 @@ class DepartmentListState extends State<DepartmentList> {
                                 SizedBox(height: 2),
                                 // Trip Id and Trip Name
                                 // Name
-                                Row(
-                                  children: [
-                                    Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        Text(
-                                          cardObject['description'] ?? '',
-                                          style: GoogleFonts.poppins(
-                                            fontSize: 10,
-                                            color: Colors.black87,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                    SizedBox(width: 10),
-                                    Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        Text(
-                                          cardObject['description'] ?? '',
-                                          style: GoogleFonts.poppins(
-                                            fontSize: 10,
-                                            color: Colors.black87,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ],
-                                ),
+                                // Row(
+                                //   children: [
+                                //     Column(
+                                //       crossAxisAlignment:
+                                //           CrossAxisAlignment.start,
+                                //       children: [
+                                //         Text(
+                                //           cardObject['description'] ?? '',
+                                //           style: GoogleFonts.poppins(
+                                //             fontSize: 10,
+                                //             color: Colors.black87,
+                                //           ),
+                                //         ),
+                                //       ],
+                                //     ),
+                                //     SizedBox(width: 10),
+                                //     Column(
+                                //       crossAxisAlignment:
+                                //           CrossAxisAlignment.start,
+                                //       children: [
+                                //         Text(
+                                //           cardObject['description'] ?? '',
+                                //           style: GoogleFonts.poppins(
+                                //             fontSize: 10,
+                                //             color: Colors.black87,
+                                //           ),
+                                //         ),
+                                //       ],
+                                //     ),
+                                //   ],
+                                // ),
                                 // Actions
                                 // Actions
                               ],
diff --git a/lib/Screens/hotels/hotelsDetails.dart b/lib/Screens/hotels/hotelsDetails.dart
index a230726..4439c91 100644
--- a/lib/Screens/hotels/hotelsDetails.dart
+++ b/lib/Screens/hotels/hotelsDetails.dart
@@ -42,6 +42,8 @@ class HotelsDataState extends State<HotelsData> {
   Map<String, dynamic>? apiData;
   final Map<String, TextEditingController> controllers = {};
   Map<String, String> errorMessages = {};
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
 
   List<dynamic> countryList = [];
   String? selectedCountry;
@@ -83,6 +85,15 @@ class HotelsDataState extends State<HotelsData> {
     apiData = null;
     for (var field in dataHeader) {
       controllers[field] = TextEditingController();
+      focusNodes["${field}FocusNode"] = FocusNode();
+      focusStates["${field}Focused"] = false;
+    }
+    for (var key in focusNodes.keys) {
+      _addFocusListener(focusNodes[key]!, (focus) {
+        setState(() {
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
+        });
+      });
     }
     fetchCountries();
     if (widget.hotelsId != null) {
@@ -103,8 +114,18 @@ class HotelsDataState extends State<HotelsData> {
     for (var controller in controllers.values) {
       controller.dispose();
     }
+    for (var node in focusNodes.values) {
+      node.dispose();
+    }
     super.dispose();
   }
+  void _addFocusListener(FocusNode node, Function(bool) updateState) {
+    node.addListener(() {
+      setState(() {
+        updateState(node.hasFocus);
+      });
+    });
+  }
 
   void updateHotelsDetails() {
     print("Update - ${widget.hotelsData}");
@@ -312,12 +333,14 @@ class HotelsDataState extends State<HotelsData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                // isFocused: false,
+                isFocused: focusStates["hotel_nameFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 40,
                   child: TextField(
+                    focusNode: focusNodes["hotel_nameFocusNode"],
                     controller: controllers["hotel_name"],
                     style: const TextStyle(fontSize: 12),
                     decoration: const InputDecoration(
@@ -353,12 +376,13 @@ class HotelsDataState extends State<HotelsData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                isFocused: focusStates["hotel_chainFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 40,
                   child: TextField(
+                    focusNode: focusNodes["hotel_chainFocusNode"],
                     controller: controllers["hotel_chain"],
                     style: const TextStyle(fontSize: 12),
                     decoration: const InputDecoration(
@@ -394,12 +418,14 @@ class HotelsDataState extends State<HotelsData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                // isFocused: false,
+                isFocused: focusStates["categoryFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 40,
                   child: TextField(
+                    focusNode: focusNodes["categoryFocusNode"],
                     controller: controllers["category"],
                     inputFormatters: [
                       FilteringTextInputFormatter.allow(RegExp(r'[a-zA-Z0-9 ]')),
@@ -432,61 +458,102 @@ class HotelsDataState extends State<HotelsData> {
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
                 isFocused: false,
+                padding: const EdgeInsets.symmetric(horizontal: 0),
                 isDesktop: widget.isDesktop,
                 child: SizedBox(
                   height: 40,
-                  child: DropdownSearch<String>(
-                    selectedItem: countryMap[selectedCountry],
-                    popupProps: PopupProps.menu(
-                      showSearchBox: true, // Enables search functionality
-                      menuProps: const MenuProps(backgroundColor: Colors.white),
-                      constraints: BoxConstraints(maxHeight: 250),
-                      itemBuilder:
-                          (context, item, isSelected) => Padding(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 8.0,
-                              vertical: 6.0,
+                    width: double.infinity,
+                    child: Focus(
+                      focusNode: focusNodes["country_codeFocusNode"],
+                      onFocusChange: (hasFocus) {
+                        setState(() {
+                          focusStates["country_codeFocused"] = hasFocus;
+                        });
+                      },
+                      child: GestureDetector(
+                        onTap: () {
+                          // Request focus when user taps
+                          focusNodes["country_codeFocusNode"]?.requestFocus();
+                        },
+                        child: DropdownSearch<String>(
+                            selectedItem: countryMap[selectedCountry],
+                            popupProps: PopupProps.menu(
+                              showSearchBox: true, // Enables search functionality
+                              menuProps: const MenuProps(backgroundColor: Colors.white),
+                              constraints: BoxConstraints(maxHeight: 200),
+                              itemBuilder:
+                                  (context, item, isSelected) => Padding(
+                                    padding: const EdgeInsets.symmetric(
+                                      horizontal: 10.0,
+                                      vertical: 8.0,
+                                    ),
+                                    child: Text(
+                                      item,
+                                      style: GoogleFonts.poppins(fontSize: 11.5),
+                                    ),
+                                  ),
+                              searchFieldProps: TextFieldProps(
+                                decoration: InputDecoration(
+                                  hintText: "Search ...",
+                                  hintStyle: GoogleFonts.poppins(fontSize: 11),
+                                  contentPadding: EdgeInsets.symmetric(horizontal: 4),
+                                ),
+                              ),
                             ),
-                            child: Text(
-                              item,
-                              style: GoogleFonts.poppins(fontSize: 11.5),
+                            items: countryMap.values.toList(),
+                            dropdownDecoratorProps: DropDownDecoratorProps(
+                              dropdownSearchDecoration: InputDecoration(
+                                // border: InputBorder.none,
+                                border: OutlineInputBorder(
+                                  borderRadius: BorderRadius.circular(8),
+                                  borderSide: BorderSide(
+                                    color:
+                                    (focusStates["country_codeFocused"] ?? false)
+                                        ? widget.layoutColor!
+                                        : Colors.white,
+                                    // width: 0.5,
+                                  ),
+                                ),
+                                enabledBorder: OutlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color:
+                                    (focusStates["country_codeFocused"] ?? false)
+                                        ? widget.layoutColor!
+                                        : Colors.white,
+                                        // : const Color(0xFFD6D5E6),
+                                    // width: 0.5,
+                                    // const Color(0xFFD6D5E6),
+                                  ),
+                                ),
+                                focusedBorder: OutlineInputBorder(
+                                  borderSide: BorderSide(color: widget.layoutColor!, width: 1),
+                                ),
+                                contentPadding: EdgeInsets.symmetric(horizontal: 10.0,
+                                  vertical: 8.0,),
+                              ),
                             ),
+                            dropdownBuilder:
+                                (context, selectedItem) => Align(
+                                  // Center-align selected item
+                                  alignment: Alignment.centerLeft,
+                                  child: Text(
+                                    selectedItem ?? "Select ",
+                                    style: GoogleFonts.poppins(fontSize: 11),
+                                  ),
+                                ),
+                            onChanged: (String? newValue) {
+                              setState(() {
+                                // Find the country_code based on selected country_name
+                                selectedCountry =
+                                    countryMap.entries
+                                        .firstWhere((entry) => entry.value == newValue)
+                                        .key;
+                                selectedCountryName = newValue;
+                              });
+                            },
                           ),
-                      searchFieldProps: TextFieldProps(
-                        decoration: InputDecoration(
-                          hintText: "Search ...",
-                          hintStyle: GoogleFonts.poppins(fontSize: 11),
-                          contentPadding: EdgeInsets.symmetric(horizontal: 4),
-                        ),
-                      ),
-                    ),
-                    items: countryMap.values.toList(),
-                    dropdownDecoratorProps: DropDownDecoratorProps(
-                      dropdownSearchDecoration: InputDecoration(
-                        border: InputBorder.none,
-                        contentPadding: EdgeInsets.symmetric(horizontal: 1),
-                      ),
-                    ),
-                    dropdownBuilder:
-                        (context, selectedItem) => Align(
-                          // Center-align selected item
-                          alignment: Alignment.centerLeft,
-                          child: Text(
-                            selectedItem ?? "Select ",
-                            style: GoogleFonts.poppins(fontSize: 11),
-                          ),
-                        ),
-                    onChanged: (String? newValue) {
-                      setState(() {
-                        // Find the country_code based on selected country_name
-                        selectedCountry =
-                            countryMap.entries
-                                .firstWhere((entry) => entry.value == newValue)
-                                .key;
-                        selectedCountryName = newValue;
-                      });
-                    },
-                  ),
+                      )
+                    )
                 ),
               ),
               if (errorMessages["country_code"] != null) ...[
@@ -512,12 +579,13 @@ class HotelsDataState extends State<HotelsData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                isFocused: focusStates["cityFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 40,
                   child: TextField(
+                    focusNode: focusNodes["cityFocusNode"],
                     controller: controllers["city"],
                     style: const TextStyle(fontSize: 12),
                     decoration: const InputDecoration(
diff --git a/lib/Screens/myTemplates/template.dart b/lib/Screens/myTemplates/template.dart
index 5e0f4bd..b1eb202 100644
--- a/lib/Screens/myTemplates/template.dart
+++ b/lib/Screens/myTemplates/template.dart
@@ -33,6 +33,7 @@ import '../../routes/custom_appBar.dart';
 import '../../routes/custom_drawer.dart';
 import '../../services/apiService.dart';
 import '../../utils/auth_utils.dart';
+import '../../widgets/custom_breadcrumb_navigation.dart';
 import '../../widgets/custom_user_travel.dart';
 import 'dialog_placeholders.dart';
 
@@ -60,6 +61,8 @@ class TemplateState extends State<Template> {
   final Map<String, TextEditingController> controllers = {};
   List<String> dataHeader = ["subject"];
   List<String> placeholders = [];
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
 
   late QuillController _controller = QuillController.basic();
   final FocusNode _focusNode = FocusNode();
@@ -103,6 +106,15 @@ class TemplateState extends State<Template> {
   void initState() {
     super.initState();
     _checkAuthAndLoadData();
+      focusNodes["subjectFocusNode"] = FocusNode();
+      focusStates["subjectFocused"] = false;
+    for (var key in focusNodes.keys) {
+      _addFocusListener(focusNodes[key]!, (focus) {
+        setState(() {
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
+        });
+      });
+    }
     //
     // for (var field in dataHeader) {
     //   controllers[field] = TextEditingController();
@@ -144,6 +156,13 @@ class TemplateState extends State<Template> {
   //   _editorFocusNode.dispose();
   //   super.dispose();
   // }
+  void _addFocusListener(FocusNode node, Function(bool) updateState) {
+    node.addListener(() {
+      setState(() {
+        updateState(node.hasFocus);
+      });
+    });
+  }
   void loadinitializeData() async {
     orgId = await getOrgId();
     userId = await getUserId();
@@ -529,15 +548,40 @@ class TemplateState extends State<Template> {
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisAlignment: MainAxisAlignment.start,
           children: [
-            Text(
-              formatTemplateName(templateName),
-              style: GoogleFonts.poppins(
-                fontSize: 18,
-                fontWeight: FontWeight.w400,
-                color: Colors.black,
-              ),
+            // Text(
+            //   formatTemplateName(templateName),
+            //   style: GoogleFonts.poppins(
+            //     fontSize: 18,
+            //     fontWeight: FontWeight.w400,
+            //     color: Colors.black,
+            //   ),
+            // ),
+            Row(
+              children: [
+                BreadcrumbNavigation(
+                  isDesktop: isDesktop,
+                  breadcrumbItems: [
+                    BreadcrumbItem(
+                        title: 'Organization Settings',
+                        tooltip: 'Go To Organization Settings',
+                        onTap: (context) {
+                          context.go("/OrganizationSettings");
+                        }
+                    ),
+                    BreadcrumbItem(
+                        title: 'Templates',
+                        tooltip: 'Go To Templates',
+                        onTap: (context) {
+                          context.go("/templateList");
+                        }
+                    ),
+                    BreadcrumbItem(
+                      title: formatTemplateName(templateName),
+                    ),
+                  ],
+                ),
+              ],
             ),
-
             SizedBox(height: 10),
             buildTempalteSubject(isDesktop),
 
@@ -565,7 +609,8 @@ class TemplateState extends State<Template> {
         ),
         SizedBox(height: 5),
         CustomTextFieldUserTravellerWrapper(
-          isFocused: false,
+          // isFocused: false,
+          isFocused: focusStates["subjectFocused"] ?? false,
           color: Colors.white,
           width: isDesktop ? MediaQuery.of(context).size.width * 0.8 : null,
           isDesktop: isDesktop,
@@ -573,6 +618,7 @@ class TemplateState extends State<Template> {
             height: 40,
             child: TextField(
               style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              focusNode: focusNodes["subjectNode"],
               controller: controllers["subject"],
               onChanged: (value) {
                 // _clearError("local_id_num");
diff --git a/lib/Screens/myTemplates/templatesList.dart b/lib/Screens/myTemplates/templatesList.dart
index ca70c34..5839aee 100644
--- a/lib/Screens/myTemplates/templatesList.dart
+++ b/lib/Screens/myTemplates/templatesList.dart
@@ -14,6 +14,7 @@ import '../../routes/custom_drawer.dart';
 import '../../services/apiService.dart';
 import '../../utils/auth_utils.dart';
 import '../../utils/pagination.dart';
+import '../../widgets/custom_breadcrumb_navigation.dart';
 import '../../widgets/popup_userList_action.dart';
 
 class TemplatesList extends StatefulWidget {
@@ -432,12 +433,29 @@ class TemplatesListState extends State<TemplatesList> {
                 children: [
                   Row(
                     children: [
-                      Text(
-                        'Templates',
-                        style: GoogleFonts.poppins(
-                          fontSize: isDesktop ? 16 : 14,
-                          fontWeight: FontWeight.w600,
-                          color: Colors.black,
+                      // Text(
+                      //   'Templates',
+                      //   style: GoogleFonts.poppins(
+                      //     fontSize: isDesktop ? 16 : 14,
+                      //     fontWeight: FontWeight.w600,
+                      //     color: Colors.black,
+                      //   ),
+                      // ),
+                      Container(
+                        child: BreadcrumbNavigation(
+                          isDesktop: isDesktop,
+                          breadcrumbItems: [
+                            BreadcrumbItem(
+                                title: 'Organization Settings',
+                                tooltip: 'Go To Organization Settings',
+                                onTap: (context) {
+                                  context.go("/OrganizationSettings");
+                                }
+                            ),
+                            BreadcrumbItem(
+                              title: 'Templates',
+                            ),
+                          ],
                         ),
                       ),
                     ],
diff --git a/lib/Screens/perdiem_amount/forexDetails.dart b/lib/Screens/perdiem_amount/forexDetails.dart
index a25e338..3415f68 100644
--- a/lib/Screens/perdiem_amount/forexDetails.dart
+++ b/lib/Screens/perdiem_amount/forexDetails.dart
@@ -42,6 +42,8 @@ class ForexDataState extends State<ForexData> {
   Map<String, dynamic>? apiData;
   final Map<String, TextEditingController> controllers = {};
   Map<String, String> errorMessages = {};
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
 
   List<dynamic> countryList = [];
   String? selectedCountry;
@@ -89,6 +91,15 @@ class ForexDataState extends State<ForexData> {
     apiData = null;
     for (var field in dataHeader) {
       controllers[field] = TextEditingController();
+      focusNodes["${field}FocusNode"] = FocusNode();
+      focusStates["${field}Focused"] = false;
+    }
+    for (var key in focusNodes.keys) {
+      _addFocusListener(focusNodes[key]!, (focus) {
+        setState(() {
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
+        });
+      });
     }
     fetchCountries();
 
@@ -113,8 +124,18 @@ class ForexDataState extends State<ForexData> {
     for (var controller in controllers.values) {
       controller.dispose();
     }
+    for (var node in focusNodes.values) {
+      node.dispose();
+    }
     super.dispose();
   }
+  void _addFocusListener(FocusNode node, Function(bool) updateState) {
+    node.addListener(() {
+      setState(() {
+        updateState(node.hasFocus);
+      });
+    });
+  }
 
   void updateForexDetails() {
     print("Updateeee - ${widget.forexData}");
@@ -383,62 +404,103 @@ class ForexDataState extends State<ForexData> {
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
                 isFocused: false,
+                padding: const EdgeInsets.symmetric(horizontal: 0),
                 isDesktop: widget.isDesktop,
                 child: SizedBox(
                   height: 40,
-                  child: DropdownSearch<String>(
-                    selectedItem: countryMap[selectedCountry],
-                    popupProps: PopupProps.menu(
-                      showSearchBox: true, // Enables search functionality
-                      menuProps: const MenuProps(backgroundColor: Colors.white),
-                      constraints: BoxConstraints(maxHeight: 250),
-                      itemBuilder:
-                          (context, item, isSelected) => Padding(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 8.0,
-                              vertical: 6.0,
+                    width: double.infinity,
+                    child: Focus(
+                        focusNode: focusNodes["country_codeFocusNode"],
+                        onFocusChange: (hasFocus) {
+                          setState(() {
+                            focusStates["country_codeFocused"] = hasFocus;
+                          });
+                        },
+                        child: GestureDetector(
+                          onTap: () {
+                            // Request focus when user taps
+                            focusNodes["country_codeFocusNode"]?.requestFocus();
+                          },
+                          child: DropdownSearch<String>(
+                            selectedItem: countryMap[selectedCountry],
+                            popupProps: PopupProps.menu(
+                              showSearchBox: true, // Enables search functionality
+                              menuProps: const MenuProps(backgroundColor: Colors.white),
+                              constraints: BoxConstraints(maxHeight: 250),
+                              itemBuilder:
+                                  (context, item, isSelected) => Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 10.0,
+                                  vertical: 8.0,
+                                ),
+                                child: Text(
+                                  item,
+                                  style: GoogleFonts.poppins(fontSize: 11.5),
+                                ),
+                              ),
+                              searchFieldProps: TextFieldProps(
+                                decoration: InputDecoration(
+                                  hintText: "Search ...",
+                                  hintStyle: GoogleFonts.poppins(fontSize: 11),
+                                  contentPadding: EdgeInsets.symmetric(horizontal: 4),
+                                ),
+                              ),
                             ),
-                            child: Text(
-                              item,
-                              style: GoogleFonts.poppins(fontSize: 11.5),
+                            items: countryMap.values.toList(),
+                            dropdownDecoratorProps: DropDownDecoratorProps(
+                              dropdownSearchDecoration: InputDecoration(
+                                // border: InputBorder.none,
+                                border: OutlineInputBorder(
+                                  borderRadius: BorderRadius.circular(8),
+                                  borderSide: BorderSide(
+                                    color:
+                                    (focusStates["country_codeFocused"] ?? false)
+                                        ? widget.layoutColor!
+                                        : Colors.white,
+                                    // width: 0.5,
+                                  ),
+                                ),
+                                enabledBorder: OutlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color:
+                                    (focusStates["country_codeFocused"] ?? false)
+                                        ? widget.layoutColor!
+                                        : Colors.white,
+                                    // : const Color(0xFFD6D5E6),
+                                    // width: 0.5,
+                                    // const Color(0xFFD6D5E6),
+                                  ),
+                                ),
+                                focusedBorder: OutlineInputBorder(
+                                  borderSide: BorderSide(color: widget.layoutColor!, width: 1),
+                                ),
+                                contentPadding: EdgeInsets.symmetric(horizontal: 10.0,
+                                  vertical: 8.0,),
+                              ),
                             ),
+                            dropdownBuilder:
+                                (context, selectedItem) => Align(
+                              // Center-align selected item
+                              alignment: Alignment.centerLeft,
+                              child: Text(
+                                selectedItem ?? "Select ",
+                                style: GoogleFonts.poppins(fontSize: 11),
+                              ),
+                            ),
+                            onChanged: (String? newValue) {
+                              setState(() {
+                                // Find the country_code based on selected country_name
+                                selectedCountry =
+                                    countryMap.entries
+                                        .firstWhere((entry) => entry.value == newValue)
+                                        .key;
+                                selectedCountryName = newValue;
+                                setCurrencyFromSelectedCountry(selectedCountry!);
+                              });
+                            },
                           ),
-                      searchFieldProps: TextFieldProps(
-                        decoration: InputDecoration(
-                          hintText: "Search ...",
-                          hintStyle: GoogleFonts.poppins(fontSize: 11),
-                          contentPadding: EdgeInsets.symmetric(horizontal: 4),
-                        ),
-                      ),
-                    ),
-                    items: countryMap.values.toList(),
-                    dropdownDecoratorProps: DropDownDecoratorProps(
-                      dropdownSearchDecoration: InputDecoration(
-                        border: InputBorder.none,
-                        contentPadding: EdgeInsets.symmetric(horizontal: 1),
-                      ),
-                    ),
-                    dropdownBuilder:
-                        (context, selectedItem) => Align(
-                          // Center-align selected item
-                          alignment: Alignment.centerLeft,
-                          child: Text(
-                            selectedItem ?? "Select ",
-                            style: GoogleFonts.poppins(fontSize: 11),
-                          ),
-                        ),
-                    onChanged: (String? newValue) {
-                      setState(() {
-                        // Find the country_code based on selected country_name
-                        selectedCountry =
-                            countryMap.entries
-                                .firstWhere((entry) => entry.value == newValue)
-                                .key;
-                        selectedCountryName = newValue;
-                        setCurrencyFromSelectedCountry(selectedCountry!);
-                      });
-                    },
-                  ),
+                        )
+                    )
                 ),
               ),
               if (errorMessages["country_code"] != null) ...[
@@ -464,7 +526,7 @@ class ForexDataState extends State<ForexData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                isFocused: focusStates["currencyFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
 
@@ -474,6 +536,7 @@ class ForexDataState extends State<ForexData> {
                 child: SizedBox(
                   height: 40,
                   child: TextField(
+                    focusNode: focusNodes["currencyFocusNode"],
                     controller: controllers["currency"],
                     style: GoogleFonts.poppins(
                       fontSize: 11,
@@ -518,7 +581,7 @@ class ForexDataState extends State<ForexData> {
                   ),
                   SizedBox(height: 5),
                   CustomTextFieldForexWrapper(
-                    isFocused: false,
+                    isFocused: focusStates["cashFocused"] ?? false,
                     isDesktop: widget.isDesktop,
                     color: Colors.transparent,
                     width:
@@ -528,6 +591,7 @@ class ForexDataState extends State<ForexData> {
                     child: SizedBox(
                       height: 40,
                       child: TextField(
+                        focusNode: focusNodes["cashFocusNode"],
                         controller: controllers["cash"],
                         keyboardType: TextInputType.number,
                         inputFormatters: [
@@ -570,7 +634,7 @@ class ForexDataState extends State<ForexData> {
                   ),
                   SizedBox(height: 5),
                   CustomTextFieldForexWrapper(
-                    isFocused: false,
+                    isFocused: focusStates["cardFocused"] ?? false,
                     isDesktop: widget.isDesktop,
                     color: Colors.transparent,
                     width:
@@ -580,6 +644,7 @@ class ForexDataState extends State<ForexData> {
                     child: SizedBox(
                       height: 40,
                       child: TextField(
+                        focusNode: focusNodes["cardFocusNode"],
                         controller: controllers["card"],
                         keyboardType: TextInputType.number,
                         inputFormatters: [
@@ -624,12 +689,13 @@ class ForexDataState extends State<ForexData> {
               ),
               SizedBox(height: 5),
               CustomTextFieldForexWrapper(
-                isFocused: false,
+                isFocused: focusStates["perdiemAmountFocused"] ?? false,
                 isDesktop: widget.isDesktop,
                 color: Colors.transparent,
                 child: SizedBox(
                   height: 40,
                   child: TextField(
+                    focusNode: focusNodes["perdiemAmountFocusNode"],
                     controller: controllers["perdiemAmount"],
                     style: const TextStyle(fontSize: 12),
                     decoration: const InputDecoration(
diff --git a/lib/Screens/policy/policy.dart b/lib/Screens/policy/policy.dart
index d9469fc..b9a65c5 100644
--- a/lib/Screens/policy/policy.dart
+++ b/lib/Screens/policy/policy.dart
@@ -57,6 +57,8 @@ class _PolicyState extends State<Policy> {
   // ValueNotifier<String> selectedService = ValueNotifier("Train");
   bool isViewMode = false;
 
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
   Map<String, String> errorMessages = {};
 
   String? selectedPolicyId;
@@ -68,7 +70,7 @@ class _PolicyState extends State<Policy> {
   String? userId;
 
   bool showClass = true;
-  bool showCost = true;
+  bool showCost = false; // bool showCost = true; // on 21st june
 
   List<dynamic>? selectedAllServices;
   List<Map<String, String>> selectedOrgServiceIds = [];
@@ -97,6 +99,7 @@ class _PolicyState extends State<Policy> {
           });
         }).toList();
 
+
     Map<String, dynamic> data = {
       "name": _policyController.text,
       "domestic": SelectedDomestic,
@@ -115,6 +118,10 @@ class _PolicyState extends State<Policy> {
   void initState() {
     super.initState();
     _checkAuthAndLoadData();
+    // for (var field in dataHeader) {
+    //   focusNodes["${field}FocusNode"] = FocusNode();
+    //   focusStates["${field}Focused"] = false;
+    // }
     // WidgetsFlutterBinding.ensureInitialized();
 
     // WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -1104,18 +1111,21 @@ class _PolicyState extends State<Policy> {
                         // policyCriteriaKey.currentState?.fieldForPolicy();
                         // policyCriteriaKey.currentState
                         //     ?.addOrUpdatePolicy(selectedServiceIndex.value);
+                        print("policyselectedService - $selectedService");
                         if (selectedService == "Flight" ||
-                            selectedService == "Train") {
-                          showClass = true;
-                          showCost = true;
-                          int serviceCode = selectedService == "Flight" ? 1 : 2;
-
-                          policyCriteriaKey.currentState
-                              ?.fetchTrainFlightClass();
-                        } else if (selectedService == "Accommodation") {
+                            selectedService == "Train" || selectedService == "Accomodation") {
                           showClass = true;
                           showCost = false;
-                        } else {
+                          int serviceCode = selectedService == "Flight" ? 1 : 2;
+                          print("policyselectedService1 - $selectedService");
+                          policyCriteriaKey.currentState
+                              ?.fetchTrainFlightClass();
+                        }
+                        // else if (selectedService == "Accommodation") {
+                        //   showClass = true;
+                        //   showCost = false;
+                        // }
+                        else {
                           showClass = false;
                           showCost = false;
                         }
@@ -1330,7 +1340,7 @@ class _PolicyState extends State<Policy> {
             Text(
               "Domestic",
               style: GoogleFonts.poppins(
-                color: _selectedTripType == "1" ? Colors.white : Colors.black,
+                color: _selectedTripType == "1" ? Colors.black : Colors.black,
                 fontWeight: _selectedTripType == "1" ? FontWeight.w600 : null,
                 fontSize: 13,
               ),
@@ -1356,13 +1366,13 @@ class _PolicyState extends State<Policy> {
                   borderRadius: BorderRadius.circular(4), // Rounded rectangle
                   border: Border.all(
                     color:
-                        _selectedTripType == "1" ? Colors.white : Colors.black,
+                        _selectedTripType == "1" ? Colors.green : Colors.black,
                     width: _selectedTripType == "1" ? 2 : 1,
                   ),
                 ),
                 child:
                     _selectedTripType == "1"
-                        ? Icon(Icons.rectangle, size: 8, color: Colors.white)
+                        ? Icon(Icons.rectangle, size: 8, color: Colors.green)
                         : null, // Add checkmark if selected
               ),
             ),
@@ -1387,7 +1397,7 @@ class _PolicyState extends State<Policy> {
               "International",
               style: GoogleFonts.poppins(
                 fontSize: 13,
-                color: _selectedTripType == "2" ? Colors.white : Colors.black,
+                color: _selectedTripType == "2" ? Colors.black : Colors.black,
                 fontWeight: _selectedTripType == "2" ? FontWeight.w600 : null,
               ),
             ),
@@ -1412,13 +1422,13 @@ class _PolicyState extends State<Policy> {
                   borderRadius: BorderRadius.circular(4), // Rounded rectangle
                   border: Border.all(
                     color:
-                        _selectedTripType == "2" ? Colors.white : Colors.black,
+                        _selectedTripType == "2" ? Colors.green : Colors.black,
                     width: _selectedTripType == "2" ? 2 : 1,
                   ),
                 ),
                 child:
                     _selectedTripType == "2"
-                        ? Icon(Icons.rectangle, size: 8, color: Colors.white)
+                        ? Icon(Icons.rectangle, size: 8, color: Colors.green)
                         : null, // Add checkmark if selected
               ),
             ),
diff --git a/lib/Screens/policy/policyCriteria.dart b/lib/Screens/policy/policyCriteria.dart
index 3cec293..e021f4b 100644
--- a/lib/Screens/policy/policyCriteria.dart
+++ b/lib/Screens/policy/policyCriteria.dart
@@ -36,6 +36,7 @@ class PolicyCriteria extends StatefulWidget {
 
 class PolicyCriteriaState extends State<PolicyCriteria> {
   String? ServiceId = "1";
+  String? ServiceIndxId = "1";
 
   String? orgId;
   String? userId;
@@ -59,6 +60,18 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
   Map<String, String?> SecondApproverAction = {};
   Map<String, String?> ThirdApproverAction = {};
   Map<String, String?> SelectedParallelProcess = {};
+
+
+  Map<String, String?> FirstExceptionalApproverAction = {};
+  Map<String, String?> SecondExceptionalApproverAction = {};
+  Map<String, String?> ThirdExceptionalApproverAction = {};
+  Map<String, String?> SelectedParallelExceptionalProcess = {};
+
+
+  Map<String, String?> FirstAmendApproverAction = {};
+  Map<String, String?> SecondAmendApproverAction = {};
+  Map<String, String?> ThirdAmendApproverAction = {};
+  Map<String, String?> SelectedParallelAmendProcess = {};
   Map<String, String> policyDetailsIdMap = {}; // new
   Map<String, String> policyIdMap = {}; // new
 
@@ -88,8 +101,16 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
     super.initState();
     fieldForPolicy();
 
+
+
     widget.selectedTabNotifier.addListener(() {
       print("selectedTab changed: ${widget.selectedTabNotifier.value}");
+setState(() {
+  ServiceIndxId = widget.selectedTabNotifier.value ?? "1";
+
+  print("ServiceIndxId changed: $ServiceIndxId");
+});
+
       fieldForPolicy();
       fetchTrainFlightClass();
     });
@@ -136,6 +157,16 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
       ThirdApproverAction.putIfAbsent(id, () => "None");
       SelectedParallelProcess.putIfAbsent(id, () => "3");
 
+      FirstExceptionalApproverAction.putIfAbsent(id, () => "None");
+      SecondExceptionalApproverAction.putIfAbsent(id, () => "None");
+      ThirdExceptionalApproverAction.putIfAbsent(id, () => "None");
+      SelectedParallelExceptionalProcess.putIfAbsent(id, () => "3");
+
+      FirstAmendApproverAction.putIfAbsent(id, () => "None");
+      SecondAmendApproverAction.putIfAbsent(id, () => "None");
+      ThirdAmendApproverAction.putIfAbsent(id, () => "None");
+      SelectedParallelAmendProcess.putIfAbsent(id, () => "3");
+
       // Step 5: Add default policy entry
       policyData?.add({
         "service_id": int.parse(id),
@@ -145,6 +176,14 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
         "a2_action": SecondApproverAction[id],
         "a3_action": ThirdApproverAction[id],
         "parallel_process_from": SelectedParallelProcess[id],
+        "a1_exceptional_action": FirstExceptionalApproverAction[id],
+        "a2_exceptional_action": SecondExceptionalApproverAction[id],
+        "a3_exceptional_action": ThirdExceptionalApproverAction[id],
+        "exceptional_parallel_process_from": SelectedParallelExceptionalProcess[id],
+        "a1_amendment_action": FirstAmendApproverAction[id],
+        "a2_amendment_action": SecondAmendApproverAction[id],
+        "a3_amendment_action": ThirdAmendApproverAction[id],
+        "amendment_parallel_process_from": SelectedParallelAmendProcess[id],
         "created_by": widget.userId,
       });
     }
@@ -171,6 +210,18 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
       SelectedParallelProcess[serviceId] =
           item['parallel_process_from']?.toString() ?? "3";
 
+      FirstExceptionalApproverAction[serviceId] = item['a1_exceptional_action']?.toString();
+      SecondExceptionalApproverAction[serviceId] = item['a2_exceptional_action']?.toString();
+      ThirdExceptionalApproverAction[serviceId] = item['a3_exceptional_action']?.toString();
+      SelectedParallelExceptionalProcess[serviceId] =
+          item['exceptional_parallel_process_from']?.toString() ?? "3";
+
+      FirstAmendApproverAction[serviceId] = item['a1_amendment_action']?.toString();
+      SecondAmendApproverAction[serviceId] = item['a2_amendment_action']?.toString();
+      ThirdAmendApproverAction[serviceId] = item['a3_amendment_action']?.toString();
+      SelectedParallelAmendProcess[serviceId] =
+          item['amendment_parallel_process_from']?.toString() ?? "3";
+
       if (item['policy_details_id'] != null) {
         policyDetailsIdMap[serviceId] = item['policy_details_id'].toString();
       }
@@ -209,6 +260,14 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
       "a2_action": SecondApproverAction[serviceId],
       "a3_action": ThirdApproverAction[serviceId],
       "parallel_process_from": SelectedParallelProcess[serviceId],
+      "a1_exceptional_action": FirstExceptionalApproverAction[serviceId],
+      "a2_exceptional_action": SecondExceptionalApproverAction[serviceId],
+      "a3_exceptional_action": ThirdExceptionalApproverAction[serviceId],
+      "exceptional_parallel_process_from": SelectedParallelExceptionalProcess[serviceId],
+      "a1_amendment_action": FirstAmendApproverAction[serviceId],
+      "a2_amendment_action": SecondAmendApproverAction[serviceId],
+      "a3_amendment_action": ThirdAmendApproverAction[serviceId],
+      "amendment_parallel_process_from": SelectedParallelAmendProcess[serviceId],
       "created_by": widget.userId
     };
 
@@ -220,6 +279,13 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
     final a2 = SecondApproverAction[serviceId];
     final a3 = ThirdApproverAction[serviceId];
 
+    final ae1 = FirstExceptionalApproverAction[serviceId];
+    final ae2 = SecondExceptionalApproverAction[serviceId];
+    final ae3 = ThirdExceptionalApproverAction[serviceId];
+
+    final aa1 = FirstAmendApproverAction[serviceId];
+    final aa2 = SecondAmendApproverAction[serviceId];
+    final aa3 = ThirdAmendApproverAction[serviceId];
     // bool hasValue = cost.trim().isNotEmpty;
     // bool hasValue = cost.trim().isNotEmpty || travelClass!.isNotEmpty;
     bool hasValue =
@@ -229,12 +295,28 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
     bool someActionsMissing = [a1, a2, a3].where((a) => a != null).length > 0 &&
         [a1, a2, a3].where((a) => a == null).length > 0;
 
+    bool allExceptionalActionsNull = ae1 == null && ae2 == null && ae3 == null;
+    bool someExceptionalActionsMissing = [ae1, ae2, ae3].where((a) => a != null).length > 0 &&
+        [ae1, ae2, ae3].where((a) => a == null).length > 0;
+
+    bool allAmendActionsNull = aa1 == null && aa2 == null && aa3 == null;
+    bool someAmendActionsMissing = [aa1, aa2, aa3].where((a) => a != null).length > 0 &&
+        [aa1, aa2, aa3].where((a) => a == null).length > 0;
+
     if (someActionsMissing) {
       validationErrors[serviceId] = "All 3 approver actions must be selected.";
       return;
     }
+    if (someExceptionalActionsMissing) {
+      validationErrors[serviceId] = "All 3 exceptional approver actions must be selected.";
+      return;
+    }
+    if (someAmendActionsMissing) {
+      validationErrors[serviceId] = "All 3 amendment approver actions must be selected.";
+      return;
+    }
 
-    if (hasValue && allActionsNull) {
+    if (hasValue && allActionsNull && allExceptionalActionsNull && allAmendActionsNull ) {
       validationErrors[serviceId] = "Please select all actions.";
       return;
     } else {
@@ -360,6 +442,17 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
       SecondApproverAction.putIfAbsent(ServiceId!, () => "None");
       ThirdApproverAction.putIfAbsent(ServiceId!, () => "None");
       SelectedParallelProcess.putIfAbsent(ServiceId!, () => "3");
+
+      FirstExceptionalApproverAction.putIfAbsent(ServiceId!, () => "None");
+      SecondExceptionalApproverAction.putIfAbsent(ServiceId!, () => "None");
+      ThirdExceptionalApproverAction.putIfAbsent(ServiceId!, () => "None");
+      SelectedParallelExceptionalProcess.putIfAbsent(ServiceId!, () => "3");
+
+
+      FirstAmendApproverAction.putIfAbsent(ServiceId!, () => "None");
+      SecondAmendApproverAction.putIfAbsent(ServiceId!, () => "None");
+      ThirdAmendApproverAction.putIfAbsent(ServiceId!, () => "None");
+      SelectedParallelAmendProcess.putIfAbsent(ServiceId!, () => "3");
     });
 
     widget.onPolicyDataChanged(policyData);
@@ -449,467 +542,1453 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
             // color: Colors.brown.shade200,
           ),
           child: Container(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            child: Row(
               children: [
-                Container(
-                    // color: Colors.grey.shade100,
-                    width: widget.isDesktop
-                        ? MediaQuery.of(context).size.width * 0.56
-                        : 600,
-                    height: widget.isDesktop
-                        ? MediaQuery.of(context).size.height * 0.56
-                        : null,
-                    child: Column(
-                      children: [
-                        Container(
-                          margin: const EdgeInsets.only(right: 0),
-                          decoration: BoxDecoration(
-                              // color: Colors.grey.shade100,
-                              // border: Border.all(
-                              //     color: Colors.grey.shade100,
-                              //     ),
-                              ),
-                          padding: const EdgeInsets.only(
-                              top: 10, bottom: 0, left: 0, right: 35),
-                          child: Row(
-                            mainAxisAlignment: widget.isDesktop
-                                ? MainAxisAlignment.spaceAround
-                                : MainAxisAlignment.spaceBetween,
-                            children: [
-                              Expanded(
-                                flex: 2,
-                                child: Text(
-                                  "Approver",
-                                  style: GoogleFonts.poppins(
-                                      color: Color(0xFF9E9DBD),
-                                      fontWeight: FontWeight.bold,
-                                      fontSize: 12),
-                                ),
-                              ),
-                              Expanded(
-                                flex: 2,
-                                child: Text(
-                                  "Actions",
-                                  style: GoogleFonts.poppins(
-                                      color: Color(0xFF9E9DBD),
-                                      fontWeight: FontWeight.bold,
-                                      fontSize: 12),
-                                ),
-                              ),
-                              Text(
-                                "Parallel Action",
-                                style: GoogleFonts.poppins(
-                                    color: Color(0xFF9E9DBD),
-                                    fontWeight: FontWeight.bold,
-                                    fontSize: 12),
-                              )
-                            ],
-                          ),
-                        ),
-                        Divider(
-                          thickness: 0.2,
-                          color: Colors.grey,
-                        ),
-                        SizedBox(
-                          // height: 180,
+                Column(
+                  // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Container(
 
-                          // scrollDirection: Axis.vertical,
-                          child: Container(
-                            // height: MediaQuery.of(context).size.height * 3,
-                            // color: Colors.grey,
-                            margin: const EdgeInsets.only(right: 20, left: 0),
-                            // color: Colors.grey.shade100,
-                            child: Column(children: [
-                              Container(
-                                padding: const EdgeInsets.all(10),
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.end,
-                                  children: [
-                                    Text(
-                                      "Approver 1",
-                                      style: GoogleFonts.poppins(fontSize: 13),
-                                    ),
-                                    Spacer(),
-                                    CustomTextFieldUserWrapper(
-                                      isFocused: false,
-                                      isDesktop: widget.isDesktop,
-                                      child: SizedBox(
-                                        height: 35,
-                                        child: DropdownSearch<String>(
-                                          selectedItem:
-                                              FirstApproverAction[ServiceId],
-                                          // enabled: !isViewMode,
-                                          popupProps: PopupProps.menu(
-                                            // showSearchBox: true,
-                                            fit: FlexFit
-                                                .loose, // Allows flexible height
-                                            constraints:
-                                                BoxConstraints(maxHeight: 250),
-                                            itemBuilder:
-                                                (context, item, isSelected) =>
-                                                    Padding(
-                                              padding:
-                                                  const EdgeInsets.symmetric(
-                                                      horizontal: 16.0,
-                                                      vertical: 8.0),
-                                              child: Text(
-                                                item,
-                                                style: GoogleFonts.poppins(
-                                                  fontSize:
-                                                      12, // 👈 Smaller text size here
-                                                  color: Colors
-                                                      .black, // You can customize this
-                                                ),
-                                              ),
-                                            ),
-                                          ),
-                                          items: [
-                                            "Approval",
-                                            "Notification",
-                                            "None"
-                                          ],
-                                          dropdownDecoratorProps:
-                                              DropDownDecoratorProps(
-                                            dropdownSearchDecoration:
-                                                InputDecoration(
-                                              border: InputBorder.none,
-                                              contentPadding:
-                                                  EdgeInsets.symmetric(
-                                                      horizontal: 1,
-                                                      vertical: 5),
-                                            ),
-                                          ),
-                                          dropdownBuilder:
-                                              (context, selectedItem) => Text(
-                                            selectedItem ?? "Select",
+
+                        // color: Colors.yellow,
+                        width: widget.isDesktop
+                            ? MediaQuery.of(context).size.width * 0.18
+                            : 600,
+                        height: widget.isDesktop
+                            ? MediaQuery.of(context).size.height * 0.56
+                            : null,
+                        child:
+                            Column(
+                              children: [
+                                Container(
+                                  margin: const EdgeInsets.only(right: 0),
+                                  decoration: BoxDecoration(
+                                      // color: Colors.grey.shade100,
+                                      // border: Border.all(
+                                      //     color: Colors.grey.shade100,
+                                      //     ),
+                                      ),
+                                  padding: const EdgeInsets.only(
+                                      top: 10, bottom: 0, left: 0, right: 35),
+                                  child: Row(
+                                    mainAxisAlignment: widget.isDesktop
+                                        ? MainAxisAlignment.spaceAround
+                                        : MainAxisAlignment.spaceBetween,
+                                    children: [
+                                      Expanded(
+                                        flex: 3,
+                                        child: Align(
+                                          alignment: Alignment.center,
+                                          child: Text(
+                                            "Approver",
                                             style: GoogleFonts.poppins(
-                                                fontSize: 12,
-                                                color: Color(0xFF114D8B)),
+                                                color: Color(0xFF9E9DBD),
+                                                fontWeight: FontWeight.bold,
+                                                fontSize: 12),
                                           ),
+                                        ),
+                                      ),
+                                      // Expanded(
+                                      //   flex: 2,
+                                      //   child: Text(
+                                      //     "Actions",
+                                      //     style: GoogleFonts.poppins(
+                                      //         color: Color(0xFF9E9DBD),
+                                      //         fontWeight: FontWeight.bold,
+                                      //         fontSize: 12),
+                                      //   ),
+                                      // ),
+                                      // Text(
+                                      //   "Parallel Action",
+                                      //   style: GoogleFonts.poppins(
+                                      //       color: Color(0xFF9E9DBD),
+                                      //       fontWeight: FontWeight.bold,
+                                      //       fontSize: 12),
+                                      // )
+                                    ],
+                                  ),
+                                ),
+                                Divider(
+                                  thickness: 0.2,
+                                  color: Colors.grey,
+                                ),
+                                SizedBox(
+                                  // height: 180,
 
-                                          onChanged: (String? newValue) {
-                                            setState(() {
-                                              // Find the country_code based on selected country_name
-                                              FirstApproverAction[ServiceId!] =
-                                                  newValue;
-
-                                              // print("selectedUserType - $selectedUserType");
-
-                                              // if (selectedCountry!.isNotEmpty) {
-                                              //   errorMessages.remove("country_code");
-                                              // }
-                                            });
-                                          },
+                                  // scrollDirection: Axis.vertical,
+                                  child: Container(
+                                    // height: MediaQuery.of(context).size.height * 3,
+                                    // color: Colors.grey,
+                                    decoration: BoxDecoration(
+                                      border: Border(
+                                        right: BorderSide(
+                                          color: Colors.blueGrey.shade50, // Change this to your desired color
+                                          width: 1.0,          // Change this to your desired width
                                         ),
                                       ),
                                     ),
-                                    Spacer(),
-                                    GestureDetector(
-                                      onTap: () {
-                                        setState(() {
-                                          SelectedParallelProcess[ServiceId!] =
-                                              "1";
-                                        });
 
-                                        print(
-                                            "SelectedParallelProcess - $SelectedParallelProcess");
-                                      },
-                                      child: Container(
-                                          height: 25,
-                                          width: 25,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            border: Border.all(
-                                                color: (SelectedParallelProcess[
-                                                            ServiceId] ==
-                                                        "1")
-                                                    ? Colors.green
-                                                    : Colors.grey,
-                                                width: 2),
-                                          ),
-                                          child: Icon(
-                                            Icons.check_circle,
-                                            size: 20,
-                                            color: (SelectedParallelProcess[
-                                                        ServiceId] ==
-                                                    "1")
-                                                ? Colors.green
-                                                : Colors.grey,
-                                            // color: Colors.grey,
-                                          )),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              Container(
-                                padding: const EdgeInsets.all(10),
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.end,
-                                  children: [
-                                    Text(
-                                      "Approver 2",
-                                      style: GoogleFonts.poppins(fontSize: 13),
-                                    ),
-                                    Spacer(),
-                                    CustomTextFieldUserWrapper(
-                                      isFocused: false,
-                                      isDesktop: widget.isDesktop,
-                                      child: SizedBox(
-                                        height: 35,
-                                        child: DropdownSearch<String>(
-                                          selectedItem:
-                                              SecondApproverAction[ServiceId],
-                                          // enabled: !isViewMode,
-                                          popupProps: PopupProps.menu(
-                                            // showSearchBox: true,
-                                            fit: FlexFit
-                                                .loose, // Allows flexible height
-                                            constraints:
-                                                BoxConstraints(maxHeight: 250),
-                                            itemBuilder:
-                                                (context, item, isSelected) =>
-                                                    Padding(
-                                              padding:
-                                                  const EdgeInsets.symmetric(
-                                                      horizontal: 16.0,
-                                                      vertical: 8.0),
-                                              child: Text(
-                                                item,
-                                                style: TextStyle(
-                                                  fontSize:
-                                                      12, // 👈 Smaller text size here
-                                                  color: Colors
-                                                      .black, // You can customize this
+                                    margin: const EdgeInsets.only(right: 5, left: 0),
+                                    // color: Colors.grey.shade100,
+                                    child: Column(children: [
+                                      Container(
+                                        padding: const EdgeInsets.all(10),
+                                        child: Row(
+                                          mainAxisAlignment: MainAxisAlignment.end,
+                                          children: [
+                                            Text(
+                                              // "Approver 1",
+                                              "A1",
+                                              style: GoogleFonts.poppins(fontSize: 13),
+                                            ),
+                                            Spacer(),
+                                            CustomTextFieldUserWrapper(
+                                              width:MediaQuery.of(context).size.width * 0.12,
+                                              isFocused: false,
+                                              isDesktop: widget.isDesktop,
+                                              child: SizedBox(
+                                                height: 35,
+                                                child: DropdownSearch<String>(
+                                                  selectedItem:
+                                                      FirstApproverAction[ServiceId],
+                                                  // enabled: !isViewMode,
+                                                  popupProps: PopupProps.menu(
+                                                    // showSearchBox: true,
+                                                    fit: FlexFit
+                                                        .loose, // Allows flexible height
+                                                    constraints:
+                                                        BoxConstraints(maxHeight: 250),
+                                                    itemBuilder:
+                                                        (context, item, isSelected) =>
+                                                            Padding(
+                                                      padding:
+                                                          const EdgeInsets.symmetric(
+                                                              horizontal: 16.0,
+                                                              vertical: 8.0),
+                                                      child: Text(
+                                                        item,
+                                                        style: GoogleFonts.poppins(
+                                                          fontSize:
+                                                              12, // 👈 Smaller text size here
+                                                          color: Colors
+                                                              .black, // You can customize this
+                                                        ),
+                                                      ),
+                                                    ),
+                                                  ),
+                                                  items: [
+                                                    "Approval",
+                                                    "Notification",
+                                                    "None"
+                                                  ],
+                                                  dropdownDecoratorProps:
+                                                      DropDownDecoratorProps(
+                                                    dropdownSearchDecoration:
+                                                        InputDecoration(
+                                                      border: InputBorder.none,
+                                                      contentPadding:
+                                                          EdgeInsets.symmetric(
+                                                              horizontal: 1,
+                                                              vertical: 5),
+                                                    ),
+                                                  ),
+                                                  dropdownBuilder:
+                                                      (context, selectedItem) => Text(
+                                                    selectedItem ?? "Select",
+                                                    style: GoogleFonts.poppins(
+                                                        fontSize: 12,
+                                                        color: Color(0xFF114D8B)),
+                                                  ),
+
+                                                  onChanged: (String? newValue) {
+                                                    setState(() {
+                                                      // Find the country_code based on selected country_name
+                                                      FirstApproverAction[ServiceId!] =
+                                                          newValue;
+
+                                                      // print("selectedUserType - $selectedUserType");
+
+                                                      // if (selectedCountry!.isNotEmpty) {
+                                                      //   errorMessages.remove("country_code");
+                                                      // }
+                                                    });
+                                                  },
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                          items: [
-                                            "Approval",
-                                            "Notification",
-                                            "None"
-                                          ],
-                                          dropdownDecoratorProps:
-                                              DropDownDecoratorProps(
-                                            dropdownSearchDecoration:
-                                                InputDecoration(
-                                              border: InputBorder.none,
-                                              contentPadding:
-                                                  EdgeInsets.symmetric(
-                                                      horizontal: 1,
-                                                      vertical: 5),
-                                            ),
-                                          ),
-                                          dropdownBuilder:
-                                              (context, selectedItem) => Text(
-                                            selectedItem ?? "Select",
-                                            style: GoogleFonts.poppins(
-                                                fontSize: 12,
-                                                color: Color(0xFF114D8B)),
-                                          ),
+                                            Spacer(),
+                                            GestureDetector(
+                                              onTap: () {
+                                                setState(() {
+                                                  SelectedParallelProcess[ServiceId!] =
+                                                      "1";
+                                                });
 
-                                          onChanged: (String? newValue) {
-                                            setState(() {
-                                              // Find the country_code based on selected country_name
-                                              SecondApproverAction[ServiceId!] =
-                                                  newValue;
-
-                                              // print("selectedUserType - $selectedUserType");
-
-                                              // if (selectedCountry!.isNotEmpty) {
-                                              //   errorMessages.remove("country_code");
-                                              // }
-                                            });
-                                          },
-                                        ),
-                                      ),
-                                    ),
-                                    Spacer(),
-                                    GestureDetector(
-                                      onTap: () {
-                                        setState(() {
-                                          SelectedParallelProcess[ServiceId!] =
-                                              "2";
-                                        });
-
-                                        print(
-                                            "SelectedParallelProcess - $SelectedParallelProcess");
-                                      },
-                                      child: Container(
-                                          height: 25,
-                                          width: 25,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            border: Border.all(
-                                                color: ((SelectedParallelProcess[
+                                                print(
+                                                    "SelectedParallelProcess - $SelectedParallelProcess");
+                                              },
+                                              child: Container(
+                                                  height: 25,
+                                                  width: 25,
+                                                  decoration: BoxDecoration(
+                                                    shape: BoxShape.circle,
+                                                    border: Border.all(
+                                                        color: (SelectedParallelProcess[
+                                                                    ServiceId] ==
+                                                                "1")
+                                                            ? Colors.green
+                                                            : Colors.grey,
+                                                        width: 2),
+                                                  ),
+                                                  child: Icon(
+                                                    Icons.check_circle,
+                                                    size: 20,
+                                                    color: (SelectedParallelProcess[
                                                                 ServiceId] ==
-                                                            "1") ||
-                                                        (SelectedParallelProcess[
-                                                                ServiceId] ==
-                                                            "2"))
-                                                    ? Colors.green
-                                                    : Colors.grey,
-                                                width: 2),
-                                          ),
-                                          child: Icon(
-                                            Icons.check_circle,
-                                            size: 20,
-                                            color: ((SelectedParallelProcess[
-                                                            ServiceId] ==
-                                                        "1") ||
-                                                    (SelectedParallelProcess[
-                                                            ServiceId] ==
-                                                        "2"))
-                                                ? Colors.green
-                                                : Colors.grey,
-                                            // color: Colors.grey,
-                                          )),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              Container(
-                                padding: const EdgeInsets.all(10),
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.end,
-                                  children: [
-                                    Text(
-                                      "Approver 3",
-                                      style: GoogleFonts.poppins(fontSize: 13),
-                                    ),
-                                    Spacer(),
-                                    CustomTextFieldUserWrapper(
-                                      isFocused: false,
-                                      isDesktop: widget.isDesktop,
-                                      child: SizedBox(
-                                        height: 35,
-                                        child: DropdownSearch<String>(
-                                          selectedItem:
-                                              ThirdApproverAction[ServiceId],
-                                          // enabled: !isViewMode,
-                                          popupProps: PopupProps.menu(
-                                            // showSearchBox: true,
-                                            fit: FlexFit
-                                                .loose, // Allows flexible height
-                                            constraints:
-                                                BoxConstraints(maxHeight: 250),
-                                            itemBuilder:
-                                                (context, item, isSelected) =>
-                                                    Padding(
-                                              padding:
-                                                  const EdgeInsets.symmetric(
-                                                      horizontal: 16.0,
-                                                      vertical: 8.0),
-                                              child: Text(
-                                                item,
-                                                style: GoogleFonts.poppins(
-                                                  fontSize:
-                                                      12, // 👈 Smaller text size here
-                                                  color: Colors
-                                                      .black, // You can customize this
+                                                            "1")
+                                                        ? Colors.green
+                                                        : Colors.grey,
+                                                    // color: Colors.grey,
+                                                  )),
+                                            ),
+                                          ],
+                                        ),
+                                      ),
+                                      Container(
+                                        padding: const EdgeInsets.all(10),
+                                        child: Row(
+                                          mainAxisAlignment: MainAxisAlignment.end,
+                                          children: [
+                                            Text(
+                                              // "Approver 2",
+                                              "A2",
+                                              style: GoogleFonts.poppins(fontSize: 13),
+                                            ),
+                                            Spacer(),
+                                            CustomTextFieldUserWrapper(
+                                              width:MediaQuery.of(context).size.width * 0.12,
+                                              isFocused: false,
+                                              isDesktop: widget.isDesktop,
+                                              child: SizedBox(
+                                                height: 35,
+                                                child: DropdownSearch<String>(
+                                                  selectedItem:
+                                                      SecondApproverAction[ServiceId],
+                                                  // enabled: !isViewMode,
+                                                  popupProps: PopupProps.menu(
+                                                    // showSearchBox: true,
+                                                    fit: FlexFit
+                                                        .loose, // Allows flexible height
+                                                    constraints:
+                                                        BoxConstraints(maxHeight: 250),
+                                                    itemBuilder:
+                                                        (context, item, isSelected) =>
+                                                            Padding(
+                                                      padding:
+                                                          const EdgeInsets.symmetric(
+                                                              horizontal: 16.0,
+                                                              vertical: 8.0),
+                                                      child: Text(
+                                                        item,
+                                                        style: TextStyle(
+                                                          fontSize:
+                                                              12, // 👈 Smaller text size here
+                                                          color: Colors
+                                                              .black, // You can customize this
+                                                        ),
+                                                      ),
+                                                    ),
+                                                  ),
+                                                  items: [
+                                                    "Approval",
+                                                    "Notification",
+                                                    "None"
+                                                  ],
+                                                  dropdownDecoratorProps:
+                                                      DropDownDecoratorProps(
+                                                    dropdownSearchDecoration:
+                                                        InputDecoration(
+                                                      border: InputBorder.none,
+                                                      contentPadding:
+                                                          EdgeInsets.symmetric(
+                                                              horizontal: 1,
+                                                              vertical: 5),
+                                                    ),
+                                                  ),
+                                                  dropdownBuilder:
+                                                      (context, selectedItem) => Text(
+                                                    selectedItem ?? "Select",
+                                                    style: GoogleFonts.poppins(
+                                                        fontSize: 12,
+                                                        color: Color(0xFF114D8B)),
+                                                  ),
+
+                                                  onChanged: (String? newValue) {
+                                                    setState(() {
+                                                      // Find the country_code based on selected country_name
+                                                      SecondApproverAction[ServiceId!] =
+                                                          newValue;
+
+                                                      // print("selectedUserType - $selectedUserType");
+
+                                                      // if (selectedCountry!.isNotEmpty) {
+                                                      //   errorMessages.remove("country_code");
+                                                      // }
+                                                    });
+                                                  },
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                          items: [
-                                            "Approval",
-                                            "Notification",
-                                            "None"
-                                          ],
-                                          dropdownDecoratorProps:
-                                              DropDownDecoratorProps(
-                                            dropdownSearchDecoration:
-                                                InputDecoration(
-                                              border: InputBorder.none,
-                                              contentPadding:
-                                                  EdgeInsets.symmetric(
-                                                      horizontal: 1,
-                                                      vertical: 5),
-                                            ),
-                                          ),
-                                          dropdownBuilder:
-                                              (context, selectedItem) =>
-                                                  // Center-align selected item
-                                                  Text(
-                                            selectedItem ?? "Select",
-                                            style: GoogleFonts.poppins(
-                                                fontSize: 12,
-                                                color: Color(0xFF114D8B)),
-                                          ),
+                                            Spacer(),
+                                            GestureDetector(
+                                              onTap: () {
+                                                setState(() {
+                                                  SelectedParallelProcess[ServiceId!] =
+                                                      "2";
+                                                });
 
-                                          onChanged: (String? newValue) {
-                                            setState(() {
-                                              // Find the country_code based on selected country_name
-                                              ThirdApproverAction[ServiceId!] =
-                                                  newValue;
-
-                                              // print("selectedUserType - $selectedUserType");
-
-                                              // if (selectedCountry!.isNotEmpty) {
-                                              //   errorMessages.remove("country_code");
-                                              // }
-                                            });
-                                          },
-                                        ),
-                                      ),
-                                    ),
-                                    Spacer(),
-                                    GestureDetector(
-                                      onTap: () {
-                                        setState(() {
-                                          SelectedParallelProcess[ServiceId!] =
-                                              "3";
-                                        });
-                                        print(
-                                            "SelectedParallelProcess - $SelectedParallelProcess[ServiceId]");
-                                      },
-                                      child: Container(
-                                          height: 25,
-                                          width: 25,
-                                          decoration: BoxDecoration(
-                                            shape: BoxShape.circle,
-                                            border: Border.all(
-                                                color:
-                                                    ((SelectedParallelProcess[
+                                                print(
+                                                    "SelectedParallelProcess - $SelectedParallelProcess");
+                                              },
+                                              child: Container(
+                                                  height: 25,
+                                                  width: 25,
+                                                  decoration: BoxDecoration(
+                                                    shape: BoxShape.circle,
+                                                    border: Border.all(
+                                                        color: ((SelectedParallelProcess[
+                                                                        ServiceId] ==
+                                                                    "1") ||
+                                                                (SelectedParallelProcess[
+                                                                        ServiceId] ==
+                                                                    "2"))
+                                                            ? Colors.green
+                                                            : Colors.grey,
+                                                        width: 2),
+                                                  ),
+                                                  child: Icon(
+                                                    Icons.check_circle,
+                                                    size: 20,
+                                                    color: ((SelectedParallelProcess[
                                                                     ServiceId] ==
                                                                 "1") ||
                                                             (SelectedParallelProcess[
                                                                     ServiceId] ==
-                                                                "2") ||
-                                                            (SelectedParallelProcess[
-                                                                    ServiceId] ==
-                                                                "3"))
+                                                                "2"))
                                                         ? Colors.green
                                                         : Colors.grey,
-                                                width: 2),
-                                          ),
-                                          child: Icon(
-                                            Icons.check_circle,
-                                            size: 20,
-                                            color:
-                                                ((SelectedParallelProcess[
-                                                                ServiceId] ==
-                                                            "1") ||
-                                                        (SelectedParallelProcess[
-                                                                ServiceId] ==
-                                                            "2") ||
-                                                        (SelectedParallelProcess[
-                                                                ServiceId] ==
-                                                            "3"))
-                                                    ? Colors.green
-                                                    : Colors.grey,
-                                            // color: Colors.grey,
-                                          )),
+                                                    // color: Colors.grey,
+                                                  )),
+                                            ),
+                                          ],
+                                        ),
+                                      ),
+                                      Container(
+                                        padding: const EdgeInsets.all(10),
+                                        child: Row(
+                                          mainAxisAlignment: MainAxisAlignment.end,
+                                          children: [
+                                            Text(
+                                              "A3",
+                                              style: GoogleFonts.poppins(fontSize: 13),
+                                            ),
+                                            Spacer(),
+                                            CustomTextFieldUserWrapper(
+                                              width:MediaQuery.of(context).size.width * 0.12,
+                                              isFocused: false,
+                                              isDesktop: widget.isDesktop,
+                                              child: SizedBox(
+                                                height: 35,
+                                                child: DropdownSearch<String>(
+                                                  selectedItem:
+                                                      ThirdApproverAction[ServiceId],
+                                                  // enabled: !isViewMode,
+                                                  popupProps: PopupProps.menu(
+                                                    // showSearchBox: true,
+                                                    fit: FlexFit
+                                                        .loose, // Allows flexible height
+                                                    constraints:
+                                                        BoxConstraints(maxHeight: 250),
+                                                    itemBuilder:
+                                                        (context, item, isSelected) =>
+                                                            Padding(
+                                                      padding:
+                                                          const EdgeInsets.symmetric(
+                                                              horizontal: 16.0,
+                                                              vertical: 8.0),
+                                                      child: Text(
+                                                        item,
+                                                        style: GoogleFonts.poppins(
+                                                          fontSize:
+                                                              12, // 👈 Smaller text size here
+                                                          color: Colors
+                                                              .black, // You can customize this
+                                                        ),
+                                                      ),
+                                                    ),
+                                                  ),
+                                                  items: [
+                                                    "Approval",
+                                                    "Notification",
+                                                    "None"
+                                                  ],
+                                                  dropdownDecoratorProps:
+                                                      DropDownDecoratorProps(
+                                                    dropdownSearchDecoration:
+                                                        InputDecoration(
+                                                      border: InputBorder.none,
+                                                      contentPadding:
+                                                          EdgeInsets.symmetric(
+                                                              horizontal: 1,
+                                                              vertical: 5),
+                                                    ),
+                                                  ),
+                                                  dropdownBuilder:
+                                                      (context, selectedItem) =>
+                                                          // Center-align selected item
+                                                          Text(
+                                                    selectedItem ?? "Select",
+                                                    style: GoogleFonts.poppins(
+                                                        fontSize: 12,
+                                                        color: Color(0xFF114D8B)),
+                                                  ),
+
+                                                  onChanged: (String? newValue) {
+                                                    setState(() {
+                                                      // Find the country_code based on selected country_name
+                                                      ThirdApproverAction[ServiceId!] =
+                                                          newValue;
+
+                                                      // print("selectedUserType - $selectedUserType");
+
+                                                      // if (selectedCountry!.isNotEmpty) {
+                                                      //   errorMessages.remove("country_code");
+                                                      // }
+                                                    });
+                                                  },
+                                                ),
+                                              ),
+                                            ),
+                                            Spacer(),
+                                            GestureDetector(
+                                              onTap: () {
+                                                setState(() {
+                                                  SelectedParallelProcess[ServiceId!] =
+                                                      "3";
+                                                });
+                                                print(
+                                                    "SelectedParallelProcess - $SelectedParallelProcess[ServiceId]");
+                                              },
+                                              child: Container(
+                                                  height: 25,
+                                                  width: 25,
+                                                  decoration: BoxDecoration(
+                                                    shape: BoxShape.circle,
+                                                    border: Border.all(
+                                                        color:
+                                                            ((SelectedParallelProcess[
+                                                                            ServiceId] ==
+                                                                        "1") ||
+                                                                    (SelectedParallelProcess[
+                                                                            ServiceId] ==
+                                                                        "2") ||
+                                                                    (SelectedParallelProcess[
+                                                                            ServiceId] ==
+                                                                        "3"))
+                                                                ? Colors.green
+                                                                : Colors.grey,
+                                                        width: 2),
+                                                  ),
+                                                  child: Icon(
+                                                    Icons.check_circle,
+                                                    size: 20,
+                                                    color:
+                                                        ((SelectedParallelProcess[
+                                                                        ServiceId] ==
+                                                                    "1") ||
+                                                                (SelectedParallelProcess[
+                                                                        ServiceId] ==
+                                                                    "2") ||
+                                                                (SelectedParallelProcess[
+                                                                        ServiceId] ==
+                                                                    "3"))
+                                                            ? Colors.green
+                                                            : Colors.grey,
+                                                    // color: Colors.grey,
+                                                  )),
+                                            ),
+                                          ],
+                                        ),
+                                      ),
+                                    ]),
+                                  ),
+                                ),
+                              ],
+                            ),
+
+                         ),
+
+                  ],
+                ),
+                
+                Column(
+                  // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Container(
+
+                      width: widget.isDesktop
+                          ? MediaQuery.of(context).size.width * 0.18
+                          : 600,
+                      height: widget.isDesktop
+                          ? MediaQuery.of(context).size.height * 0.56
+                          : null,
+                      child:
+                      Column(
+                        children: [
+                          Container(
+                            margin: const EdgeInsets.only(right: 0),
+                            decoration: BoxDecoration(
+                              // color: Colors.grey.shade100,
+                              // border: Border.all(
+                              //     color: Colors.grey.shade100,
+                              //     ),
+                            ),
+                            padding: const EdgeInsets.only(
+                                top: 10, bottom: 0, left: 0, right: 35),
+                            child: Row(
+                              mainAxisAlignment: widget.isDesktop
+                                  ? MainAxisAlignment.spaceAround
+                                  : MainAxisAlignment.spaceBetween,
+                              children: [
+                                Expanded(
+                                  flex: 3,
+                                  child: Align(
+                                    alignment: Alignment.center,
+                                    child: Text(
+                                      "Exceptional Approver",
+                                      style: GoogleFonts.poppins(
+                                          color: Color(0xFF9E9DBD),
+                                          fontWeight: FontWeight.bold,
+                                          fontSize: 12),
                                     ),
-                                  ],
+                                  ),
+                                ),
+                                // Expanded(
+                                //   flex: 2,
+                                //   child: Text(
+                                //     "Actions",
+                                //     style: GoogleFonts.poppins(
+                                //         color: Color(0xFF9E9DBD),
+                                //         fontWeight: FontWeight.bold,
+                                //         fontSize: 12),
+                                //   ),
+                                // ),
+                                // Text(
+                                //   "Parallel Action",
+                                //   style: GoogleFonts.poppins(
+                                //       color: Color(0xFF9E9DBD),
+                                //       fontWeight: FontWeight.bold,
+                                //       fontSize: 12),
+                                // )
+                              ],
+                            ),
+                          ),
+                          Divider(
+                            thickness: 0.2,
+                            color: Colors.grey,
+                          ),
+                          SizedBox(
+                            // height: 180,
+
+                            // scrollDirection: Axis.vertical,
+                            child: Container(
+                              // height: MediaQuery.of(context).size.height * 3,
+                              // color: Colors.grey,
+                              decoration: BoxDecoration(
+                                border: Border(
+                                  right: BorderSide(
+                                    color: Colors.blueGrey.shade50, // Change this to your desired color
+                                    width: 1.0,          // Change this to your desired width
+                                  ),
                                 ),
                               ),
-                            ]),
+                              margin: const EdgeInsets.only(right: 5, left: 0),
+                              // color: Colors.grey.shade100,
+                              child: Column(children: [
+                                Container(
+                                  padding: const EdgeInsets.all(10),
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Text(
+                                        // "Approver 1",
+                                        "A1",
+                                        style: GoogleFonts.poppins(fontSize: 13),
+                                      ),
+                                      Spacer(),
+                                      CustomTextFieldUserWrapper(
+                                        width:MediaQuery.of(context).size.width * 0.12,
+                                        isFocused: false,
+                                        isDesktop: widget.isDesktop,
+                                        child: SizedBox(
+                                          height: 35,
+                                          child: DropdownSearch<String>(
+                                            selectedItem:
+                                            FirstExceptionalApproverAction[ServiceId],
+                                            // enabled: !isViewMode,
+                                            popupProps: PopupProps.menu(
+                                              // showSearchBox: true,
+                                              fit: FlexFit
+                                                  .loose, // Allows flexible height
+                                              constraints:
+                                              BoxConstraints(maxHeight: 250),
+                                              itemBuilder:
+                                                  (context, item, isSelected) =>
+                                                  Padding(
+                                                    padding:
+                                                    const EdgeInsets.symmetric(
+                                                        horizontal: 16.0,
+                                                        vertical: 8.0),
+                                                    child: Text(
+                                                      item,
+                                                      style: GoogleFonts.poppins(
+                                                        fontSize:
+                                                        12, // 👈 Smaller text size here
+                                                        color: Colors
+                                                            .black, // You can customize this
+                                                      ),
+                                                    ),
+                                                  ),
+                                            ),
+                                            items: [
+                                              "Approval",
+                                              "Notification",
+                                              "None"
+                                            ],
+                                            dropdownDecoratorProps:
+                                            DropDownDecoratorProps(
+                                              dropdownSearchDecoration:
+                                              InputDecoration(
+                                                border: InputBorder.none,
+                                                contentPadding:
+                                                EdgeInsets.symmetric(
+                                                    horizontal: 1,
+                                                    vertical: 5),
+                                              ),
+                                            ),
+                                            dropdownBuilder:
+                                                (context, selectedItem) => Text(
+                                              selectedItem ?? "Select",
+                                              style: GoogleFonts.poppins(
+                                                  fontSize: 12,
+                                                  color: Color(0xFF114D8B)),
+                                            ),
+
+                                            onChanged: (String? newValue) {
+                                              setState(() {
+                                                // Find the country_code based on selected country_name
+                                                FirstExceptionalApproverAction[ServiceId!] =
+                                                    newValue;
+
+                                                // print("selectedUserType - $selectedUserType");
+
+                                                // if (selectedCountry!.isNotEmpty) {
+                                                //   errorMessages.remove("country_code");
+                                                // }
+                                              });
+                                            },
+                                          ),
+                                        ),
+                                      ),
+                                      Spacer(),
+                                      GestureDetector(
+                                        onTap: () {
+                                          setState(() {
+                                            SelectedParallelExceptionalProcess[ServiceId!] =
+                                            "1";
+                                          });
+
+                                          print(
+                                              "SelectedParallelExceptionalProcess - $SelectedParallelExceptionalProcess");
+                                        },
+                                        child: Container(
+                                            height: 25,
+                                            width: 25,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              border: Border.all(
+                                                  color: (SelectedParallelExceptionalProcess[
+                                                  ServiceId] ==
+                                                      "1")
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                                  width: 2),
+                                            ),
+                                            child: Icon(
+                                              Icons.check_circle,
+                                              size: 20,
+                                              color: (SelectedParallelExceptionalProcess[
+                                              ServiceId] ==
+                                                  "1")
+                                                  ? Colors.green
+                                                  : Colors.grey,
+                                              // color: Colors.grey,
+                                            )),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                Container(
+                                  padding: const EdgeInsets.all(10),
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Text(
+                                        // "Approver 2",
+                                        "A2",
+                                        style: GoogleFonts.poppins(fontSize: 13),
+                                      ),
+                                      Spacer(),
+                                      CustomTextFieldUserWrapper(
+                                        width:MediaQuery.of(context).size.width * 0.12,
+                                        isFocused: false,
+                                        isDesktop: widget.isDesktop,
+                                        child: SizedBox(
+                                          height: 35,
+                                          child: DropdownSearch<String>(
+                                            selectedItem:
+                                            SecondExceptionalApproverAction[ServiceId],
+                                            // enabled: !isViewMode,
+                                            popupProps: PopupProps.menu(
+                                              // showSearchBox: true,
+                                              fit: FlexFit
+                                                  .loose, // Allows flexible height
+                                              constraints:
+                                              BoxConstraints(maxHeight: 250),
+                                              itemBuilder:
+                                                  (context, item, isSelected) =>
+                                                  Padding(
+                                                    padding:
+                                                    const EdgeInsets.symmetric(
+                                                        horizontal: 16.0,
+                                                        vertical: 8.0),
+                                                    child: Text(
+                                                      item,
+                                                      style: TextStyle(
+                                                        fontSize:
+                                                        12, // 👈 Smaller text size here
+                                                        color: Colors
+                                                            .black, // You can customize this
+                                                      ),
+                                                    ),
+                                                  ),
+                                            ),
+                                            items: [
+                                              "Approval",
+                                              "Notification",
+                                              "None"
+                                            ],
+                                            dropdownDecoratorProps:
+                                            DropDownDecoratorProps(
+                                              dropdownSearchDecoration:
+                                              InputDecoration(
+                                                border: InputBorder.none,
+                                                contentPadding:
+                                                EdgeInsets.symmetric(
+                                                    horizontal: 1,
+                                                    vertical: 5),
+                                              ),
+                                            ),
+                                            dropdownBuilder:
+                                                (context, selectedItem) => Text(
+                                              selectedItem ?? "Select",
+                                              style: GoogleFonts.poppins(
+                                                  fontSize: 12,
+                                                  color: Color(0xFF114D8B)),
+                                            ),
+
+                                            onChanged: (String? newValue) {
+                                              setState(() {
+                                                // Find the country_code based on selected country_name
+                                                SecondExceptionalApproverAction[ServiceId!] =
+                                                    newValue;
+
+                                                // print("selectedUserType - $selectedUserType");
+
+                                                // if (selectedCountry!.isNotEmpty) {
+                                                //   errorMessages.remove("country_code");
+                                                // }
+                                              });
+                                            },
+                                          ),
+                                        ),
+                                      ),
+                                      Spacer(),
+                                      GestureDetector(
+                                        onTap: () {
+                                          setState(() {
+                                            SelectedParallelExceptionalProcess[ServiceId!] =
+                                            "2";
+                                          });
+
+                                          print(
+                                              "SelectedParallelExceptionalProcess - $SelectedParallelExceptionalProcess");
+                                        },
+                                        child: Container(
+                                            height: 25,
+                                            width: 25,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              border: Border.all(
+                                                  color: ((SelectedParallelExceptionalProcess[
+                                                  ServiceId] ==
+                                                      "1") ||
+                                                      (SelectedParallelExceptionalProcess[
+                                                      ServiceId] ==
+                                                          "2"))
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                                  width: 2),
+                                            ),
+                                            child: Icon(
+                                              Icons.check_circle,
+                                              size: 20,
+                                              color: ((SelectedParallelExceptionalProcess[
+                                              ServiceId] ==
+                                                  "1") ||
+                                                  (SelectedParallelExceptionalProcess[
+                                                  ServiceId] ==
+                                                      "2"))
+                                                  ? Colors.green
+                                                  : Colors.grey,
+                                              // color: Colors.grey,
+                                            )),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                Container(
+                                  padding: const EdgeInsets.all(10),
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Text(
+                                        "A3",
+                                        style: GoogleFonts.poppins(fontSize: 13),
+                                      ),
+                                      Spacer(),
+                                      CustomTextFieldUserWrapper(
+                                        width:MediaQuery.of(context).size.width * 0.12,
+                                        isFocused: false,
+                                        isDesktop: widget.isDesktop,
+                                        child: SizedBox(
+                                          height: 35,
+                                          child: DropdownSearch<String>(
+                                            selectedItem:
+                                            ThirdExceptionalApproverAction[ServiceId],
+                                            // enabled: !isViewMode,
+                                            popupProps: PopupProps.menu(
+                                              // showSearchBox: true,
+                                              fit: FlexFit
+                                                  .loose, // Allows flexible height
+                                              constraints:
+                                              BoxConstraints(maxHeight: 250),
+                                              itemBuilder:
+                                                  (context, item, isSelected) =>
+                                                  Padding(
+                                                    padding:
+                                                    const EdgeInsets.symmetric(
+                                                        horizontal: 16.0,
+                                                        vertical: 8.0),
+                                                    child: Text(
+                                                      item,
+                                                      style: GoogleFonts.poppins(
+                                                        fontSize:
+                                                        12, // 👈 Smaller text size here
+                                                        color: Colors
+                                                            .black, // You can customize this
+                                                      ),
+                                                    ),
+                                                  ),
+                                            ),
+                                            items: [
+                                              "Approval",
+                                              "Notification",
+                                              "None"
+                                            ],
+                                            dropdownDecoratorProps:
+                                            DropDownDecoratorProps(
+                                              dropdownSearchDecoration:
+                                              InputDecoration(
+                                                border: InputBorder.none,
+                                                contentPadding:
+                                                EdgeInsets.symmetric(
+                                                    horizontal: 1,
+                                                    vertical: 5),
+                                              ),
+                                            ),
+                                            dropdownBuilder:
+                                                (context, selectedItem) =>
+                                            // Center-align selected item
+                                            Text(
+                                              selectedItem ?? "Select",
+                                              style: GoogleFonts.poppins(
+                                                  fontSize: 12,
+                                                  color: Color(0xFF114D8B)),
+                                            ),
+
+                                            onChanged: (String? newValue) {
+                                              setState(() {
+                                                // Find the country_code based on selected country_name
+                                                ThirdExceptionalApproverAction[ServiceId!] =
+                                                    newValue;
+
+                                                // print("selectedUserType - $selectedUserType");
+
+                                                // if (selectedCountry!.isNotEmpty) {
+                                                //   errorMessages.remove("country_code");
+                                                // }
+                                              });
+                                            },
+                                          ),
+                                        ),
+                                      ),
+                                      Spacer(),
+                                      GestureDetector(
+                                        onTap: () {
+                                          setState(() {
+                                            SelectedParallelExceptionalProcess[ServiceId!] =
+                                            "3";
+                                          });
+                                          print(
+                                              "SelectedParallelExceptionalProcess - $SelectedParallelExceptionalProcess[ServiceId]");
+                                        },
+                                        child: Container(
+                                            height: 25,
+                                            width: 25,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              border: Border.all(
+                                                  color:
+                                                  ((SelectedParallelExceptionalProcess[
+                                                  ServiceId] ==
+                                                      "1") ||
+                                                      (SelectedParallelExceptionalProcess[
+                                                      ServiceId] ==
+                                                          "2") ||
+                                                      (SelectedParallelExceptionalProcess[
+                                                      ServiceId] ==
+                                                          "3"))
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                                  width: 2),
+                                            ),
+                                            child: Icon(
+                                              Icons.check_circle,
+                                              size: 20,
+                                              color:
+                                              ((SelectedParallelExceptionalProcess[
+                                              ServiceId] ==
+                                                  "1") ||
+                                                  (SelectedParallelExceptionalProcess[
+                                                  ServiceId] ==
+                                                      "2") ||
+                                                  (SelectedParallelExceptionalProcess[
+                                                  ServiceId] ==
+                                                      "3"))
+                                                  ? Colors.green
+                                                  : Colors.grey,
+                                              // color: Colors.grey,
+                                            )),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ]),
+                            ),
                           ),
-                        ),
-                      ],
-                    )),
+                        ],
+                      ),
+
+                    ),
+
+                  ],
+                ),
+                Column(
+                  // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Container(
+                      //color: Colors.grey.shade100,
+                      width: widget.isDesktop
+                          ? MediaQuery.of(context).size.width * 0.18
+                          : 600,
+                      height: widget.isDesktop
+                          ? MediaQuery.of(context).size.height * 0.56
+                          : null,
+                      child:
+                      Column(
+                        children: [
+                          Container(
+                            margin: const EdgeInsets.only(right: 0),
+                            decoration: BoxDecoration(
+                              // color: Colors.grey.shade100,
+                              // border: Border.all(
+                              //     color: Colors.grey.shade100,
+                              //     ),
+                            ),
+                            padding: const EdgeInsets.only(
+                                top: 10, bottom: 0, left: 0, right: 35),
+                            child: Row(
+                              mainAxisAlignment: widget.isDesktop
+                                  ? MainAxisAlignment.spaceAround
+                                  : MainAxisAlignment.spaceBetween,
+                              children: [
+                                Expanded(
+                                  flex: 3,
+                                  child: Align(
+                                    alignment: Alignment.center,
+                                    child: Text(
+                                      "Amendment Approver",
+                                      style: GoogleFonts.poppins(
+                                          color: Color(0xFF9E9DBD),
+                                          fontWeight: FontWeight.bold,
+                                          fontSize: 12),
+                                    ),
+                                  ),
+                                ),
+                                // Expanded(
+                                //   flex: 2,
+                                //   child: Text(
+                                //     "Actions",
+                                //     style: GoogleFonts.poppins(
+                                //         color: Color(0xFF9E9DBD),
+                                //         fontWeight: FontWeight.bold,
+                                //         fontSize: 12),
+                                //   ),
+                                // ),
+                                // Text(
+                                //   "Parallel Action",
+                                //   style: GoogleFonts.poppins(
+                                //       color: Color(0xFF9E9DBD),
+                                //       fontWeight: FontWeight.bold,
+                                //       fontSize: 12),
+                                // )
+                              ],
+                            ),
+                          ),
+                          Divider(
+                            thickness: 0.2,
+                            color: Colors.grey,
+                          ),
+                          SizedBox(
+                            // height: 180,
+
+                            // scrollDirection: Axis.vertical,
+                            child: Container(
+                              // height: MediaQuery.of(context).size.height * 3,
+                              // color: Colors.grey,
+                              margin: const EdgeInsets.only(right: 5, left: 0),
+                              // color: Colors.grey.shade100,
+                              child: Column(children: [
+                                Container(
+                                  padding: const EdgeInsets.all(10),
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Text(
+                                        // "Approver 1",
+                                        "A1",
+                                        style: GoogleFonts.poppins(fontSize: 13),
+                                      ),
+                                      Spacer(),
+                                      CustomTextFieldUserWrapper(
+                                        width:MediaQuery.of(context).size.width * 0.12,
+                                        isFocused: false,
+                                        isDesktop: widget.isDesktop,
+                                        child: SizedBox(
+                                          height: 35,
+                                          child: DropdownSearch<String>(
+                                            selectedItem:
+                                            FirstAmendApproverAction[ServiceId],
+                                            // enabled: !isViewMode,
+                                            popupProps: PopupProps.menu(
+                                              // showSearchBox: true,
+                                              fit: FlexFit
+                                                  .loose, // Allows flexible height
+                                              constraints:
+                                              BoxConstraints(maxHeight: 250),
+                                              itemBuilder:
+                                                  (context, item, isSelected) =>
+                                                  Padding(
+                                                    padding:
+                                                    const EdgeInsets.symmetric(
+                                                        horizontal: 16.0,
+                                                        vertical: 8.0),
+                                                    child: Text(
+                                                      item,
+                                                      style: GoogleFonts.poppins(
+                                                        fontSize:
+                                                        12, // 👈 Smaller text size here
+                                                        color: Colors
+                                                            .black, // You can customize this
+                                                      ),
+                                                    ),
+                                                  ),
+                                            ),
+                                            items: [
+                                              "Approval",
+                                              "Notification",
+                                              "None"
+                                            ],
+                                            dropdownDecoratorProps:
+                                            DropDownDecoratorProps(
+                                              dropdownSearchDecoration:
+                                              InputDecoration(
+                                                border: InputBorder.none,
+                                                contentPadding:
+                                                EdgeInsets.symmetric(
+                                                    horizontal: 1,
+                                                    vertical: 5),
+                                              ),
+                                            ),
+                                            dropdownBuilder:
+                                                (context, selectedItem) => Text(
+                                              selectedItem ?? "Select",
+                                              style: GoogleFonts.poppins(
+                                                  fontSize: 12,
+                                                  color: Color(0xFF114D8B)),
+                                            ),
+
+                                            onChanged: (String? newValue) {
+                                              setState(() {
+                                                // Find the country_code based on selected country_name
+                                                FirstAmendApproverAction[ServiceId!] =
+                                                    newValue;
+
+                                                // print("selectedUserType - $selectedUserType");
+
+                                                // if (selectedCountry!.isNotEmpty) {
+                                                //   errorMessages.remove("country_code");
+                                                // }
+                                              });
+                                            },
+                                          ),
+                                        ),
+                                      ),
+                                      Spacer(),
+                                      GestureDetector(
+                                        onTap: () {
+                                          setState(() {
+                                            SelectedParallelAmendProcess[ServiceId!] =
+                                            "1";
+                                          });
+
+                                          print(
+                                              "SelectedParallelAmendProcess - $SelectedParallelAmendProcess");
+                                        },
+                                        child: Container(
+                                            height: 25,
+                                            width: 25,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              border: Border.all(
+                                                  color: (SelectedParallelAmendProcess[
+                                                  ServiceId] ==
+                                                      "1")
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                                  width: 2),
+                                            ),
+                                            child: Icon(
+                                              Icons.check_circle,
+                                              size: 20,
+                                              color: (SelectedParallelAmendProcess[
+                                              ServiceId] ==
+                                                  "1")
+                                                  ? Colors.green
+                                                  : Colors.grey,
+                                              // color: Colors.grey,
+                                            )),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                Container(
+                                  padding: const EdgeInsets.all(10),
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Text(
+                                        // "Approver 2",
+                                        "A2",
+                                        style: GoogleFonts.poppins(fontSize: 13),
+                                      ),
+                                      Spacer(),
+                                      CustomTextFieldUserWrapper(
+                                        width:MediaQuery.of(context).size.width * 0.12,
+                                        isFocused: false,
+                                        isDesktop: widget.isDesktop,
+                                        child: SizedBox(
+                                          height: 35,
+                                          child: DropdownSearch<String>(
+                                            selectedItem:
+                                            SecondAmendApproverAction[ServiceId],
+                                            // enabled: !isViewMode,
+                                            popupProps: PopupProps.menu(
+                                              // showSearchBox: true,
+                                              fit: FlexFit
+                                                  .loose, // Allows flexible height
+                                              constraints:
+                                              BoxConstraints(maxHeight: 250),
+                                              itemBuilder:
+                                                  (context, item, isSelected) =>
+                                                  Padding(
+                                                    padding:
+                                                    const EdgeInsets.symmetric(
+                                                        horizontal: 16.0,
+                                                        vertical: 8.0),
+                                                    child: Text(
+                                                      item,
+                                                      style: TextStyle(
+                                                        fontSize:
+                                                        12, // 👈 Smaller text size here
+                                                        color: Colors
+                                                            .black, // You can customize this
+                                                      ),
+                                                    ),
+                                                  ),
+                                            ),
+                                            items: [
+                                              "Approval",
+                                              "Notification",
+                                              "None"
+                                            ],
+                                            dropdownDecoratorProps:
+                                            DropDownDecoratorProps(
+                                              dropdownSearchDecoration:
+                                              InputDecoration(
+                                                border: InputBorder.none,
+                                                contentPadding:
+                                                EdgeInsets.symmetric(
+                                                    horizontal: 1,
+                                                    vertical: 5),
+                                              ),
+                                            ),
+                                            dropdownBuilder:
+                                                (context, selectedItem) => Text(
+                                              selectedItem ?? "Select",
+                                              style: GoogleFonts.poppins(
+                                                  fontSize: 12,
+                                                  color: Color(0xFF114D8B)),
+                                            ),
+
+                                            onChanged: (String? newValue) {
+                                              setState(() {
+                                                // Find the country_code based on selected country_name
+                                                SecondAmendApproverAction[ServiceId!] =
+                                                    newValue;
+
+                                                // print("selectedUserType - $selectedUserType");
+
+                                                // if (selectedCountry!.isNotEmpty) {
+                                                //   errorMessages.remove("country_code");
+                                                // }
+                                              });
+                                            },
+                                          ),
+                                        ),
+                                      ),
+                                      Spacer(),
+                                      GestureDetector(
+                                        onTap: () {
+                                          setState(() {
+                                            SelectedParallelAmendProcess[ServiceId!] =
+                                            "2";
+                                          });
+
+                                          print(
+                                              "SelectedParallelAmendProcess - $SelectedParallelAmendProcess");
+                                        },
+                                        child: Container(
+                                            height: 25,
+                                            width: 25,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              border: Border.all(
+                                                  color: ((SelectedParallelAmendProcess[
+                                                  ServiceId] ==
+                                                      "1") ||
+                                                      (SelectedParallelAmendProcess[
+                                                      ServiceId] ==
+                                                          "2"))
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                                  width: 2),
+                                            ),
+                                            child: Icon(
+                                              Icons.check_circle,
+                                              size: 20,
+                                              color: ((SelectedParallelAmendProcess[
+                                              ServiceId] ==
+                                                  "1") ||
+                                                  (SelectedParallelAmendProcess[
+                                                  ServiceId] ==
+                                                      "2"))
+                                                  ? Colors.green
+                                                  : Colors.grey,
+                                              // color: Colors.grey,
+                                            )),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                Container(
+                                  padding: const EdgeInsets.all(10),
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      Text(
+                                        "A3",
+                                        style: GoogleFonts.poppins(fontSize: 13),
+                                      ),
+                                      Spacer(),
+                                      CustomTextFieldUserWrapper(
+                                        width:MediaQuery.of(context).size.width * 0.12,
+                                        isFocused: false,
+                                        isDesktop: widget.isDesktop,
+                                        child: SizedBox(
+                                          height: 35,
+                                          child: DropdownSearch<String>(
+                                            selectedItem:
+                                            ThirdAmendApproverAction[ServiceId],
+                                            // enabled: !isViewMode,
+                                            popupProps: PopupProps.menu(
+                                              // showSearchBox: true,
+                                              fit: FlexFit
+                                                  .loose, // Allows flexible height
+                                              constraints:
+                                              BoxConstraints(maxHeight: 250),
+                                              itemBuilder:
+                                                  (context, item, isSelected) =>
+                                                  Padding(
+                                                    padding:
+                                                    const EdgeInsets.symmetric(
+                                                        horizontal: 16.0,
+                                                        vertical: 8.0),
+                                                    child: Text(
+                                                      item,
+                                                      style: GoogleFonts.poppins(
+                                                        fontSize:
+                                                        12, // 👈 Smaller text size here
+                                                        color: Colors
+                                                            .black, // You can customize this
+                                                      ),
+                                                    ),
+                                                  ),
+                                            ),
+                                            items: [
+                                              "Approval",
+                                              "Notification",
+                                              "None"
+                                            ],
+                                            dropdownDecoratorProps:
+                                            DropDownDecoratorProps(
+                                              dropdownSearchDecoration:
+                                              InputDecoration(
+                                                border: InputBorder.none,
+                                                contentPadding:
+                                                EdgeInsets.symmetric(
+                                                    horizontal: 1,
+                                                    vertical: 5),
+                                              ),
+                                            ),
+                                            dropdownBuilder:
+                                                (context, selectedItem) =>
+                                            // Center-align selected item
+                                            Text(
+                                              selectedItem ?? "Select",
+                                              style: GoogleFonts.poppins(
+                                                  fontSize: 12,
+                                                  color: Color(0xFF114D8B)),
+                                            ),
+
+                                            onChanged: (String? newValue) {
+                                              setState(() {
+                                                // Find the country_code based on selected country_name
+                                                ThirdAmendApproverAction[ServiceId!] =
+                                                    newValue;
+
+                                                // print("selectedUserType - $selectedUserType");
+
+                                                // if (selectedCountry!.isNotEmpty) {
+                                                //   errorMessages.remove("country_code");
+                                                // }
+                                              });
+                                            },
+                                          ),
+                                        ),
+                                      ),
+                                      Spacer(),
+                                      GestureDetector(
+                                        onTap: () {
+                                          setState(() {
+                                            SelectedParallelAmendProcess[ServiceId!] =
+                                            "3";
+                                          });
+                                          print(
+                                              "SelectedParallelAmendProcess - $SelectedParallelAmendProcess[ServiceId]");
+                                        },
+                                        child: Container(
+                                            height: 25,
+                                            width: 25,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              border: Border.all(
+                                                  color:
+                                                  ((SelectedParallelAmendProcess[
+                                                  ServiceId] ==
+                                                      "1") ||
+                                                      (SelectedParallelAmendProcess[
+                                                      ServiceId] ==
+                                                          "2") ||
+                                                      (SelectedParallelAmendProcess[
+                                                      ServiceId] ==
+                                                          "3"))
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                                  width: 2),
+                                            ),
+                                            child: Icon(
+                                              Icons.check_circle,
+                                              size: 20,
+                                              color:
+                                              ((SelectedParallelAmendProcess[
+                                              ServiceId] ==
+                                                  "1") ||
+                                                  (SelectedParallelAmendProcess[
+                                                  ServiceId] ==
+                                                      "2") ||
+                                                  (SelectedParallelAmendProcess[
+                                                  ServiceId] ==
+                                                      "3"))
+                                                  ? Colors.green
+                                                  : Colors.grey,
+                                              // color: Colors.grey,
+                                            )),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ]),
+                            ),
+                          ),
+                        ],
+                      ),
+
+                    ),
+
+                  ],
+                ),
               ],
             ),
           ),
@@ -920,13 +1999,25 @@ class PolicyCriteriaState extends State<PolicyCriteria> {
 
   Widget buildClassWidget(isDesktop) {
     List<dynamic> purposeList = [];
-    if (ServiceId != null) {
-      purposeList = (ServiceId == "1")
+    // if (ServiceId != null) {
+    //   purposeList = (ServiceId == "1")
+    //       ? (apiDataForClass?['flight_class'] ?? [])
+    //       : (apiDataForClass?['train_class'] ?? []);
+    // }
+
+
+
+    if (ServiceIndxId != null) {
+      purposeList = (ServiceIndxId == "1")
           ? (apiDataForClass?['flight_class'] ?? [])
+          : (ServiceIndxId == "2")
+          ? (apiDataForClass?['hotel_class'] ?? [])
           : (apiDataForClass?['train_class'] ?? []);
     }
 
-    print("CLASS1 - ");
+
+    print("CLASSServiceId- $ServiceId");
+    print("CLASSpurposeList - $purposeList");
 
     List<DropdownMenuItem<String>> dropdownItems = purposeList
         .map((item) => DropdownMenuItem<String>(
diff --git a/lib/Screens/reports/advancePurchase.dart b/lib/Screens/reports/advancePurchase.dart
index 4bfd681..c44c7a8 100644
--- a/lib/Screens/reports/advancePurchase.dart
+++ b/lib/Screens/reports/advancePurchase.dart
@@ -66,13 +66,36 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
     super.initState();
     loadInitialData();
     _checkAuthAndLoadData();
-    if (!textControllers.containsKey("from_date")) { textControllers["from_date"] = TextEditingController(); }
-    if (!textControllers.containsKey("to_date")) { textControllers["to_date"] = TextEditingController(); }
-    if (!focusNodes.containsKey("from_date")) { focusNodes["from_date"] = FocusNode(); }
-    if (!focusNodes.containsKey("to_date")) { focusNodes["to_date"] = FocusNode(); }
-    if (!focusStates.containsKey("to_date")) { focusStates["to_date"] = false; }
-    if (!focusStates.containsKey("from_date")) { focusStates["from_date"] = false; }
-
+    if (!textControllers.containsKey("from_date")) {
+      textControllers["from_date"] = TextEditingController();
+    }
+    if (!textControllers.containsKey("to_date")) {
+      textControllers["to_date"] = TextEditingController();
+    }
+    if (!focusNodes.containsKey("from_date")) {
+      focusNodes["from_date"] = FocusNode();
+    }
+    if (!focusNodes.containsKey("to_date")) {
+      focusNodes["to_date"] = FocusNode();
+    }
+    if (!focusStates.containsKey("to_date")) {
+      focusStates["to_date"] = false;
+    }
+    if (!focusStates.containsKey("from_date")) {
+      focusStates["from_date"] = false;
+    }
+    // Listen to focus changes
+    focusNodes["from_date"]!.addListener(() {
+      setState(() {
+        focusStates["from_date"] = focusNodes["from_date"]!.hasFocus;
+      });
+    });
+    // Listen to focus changes
+    focusNodes["to_date"]!.addListener(() {
+      setState(() {
+        focusStates["to_date"] = focusNodes["to_date"]!.hasFocus;
+      });
+    });
     _tabController = TabController(length: 2, vsync: this);
 
     _tabController.addListener(() {
@@ -89,7 +112,8 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
     focusNodes.forEach((key, focusNode) {
       _addFocusListener(focusNode, (focus) {
         setState(() {
-          focusStates[key] = focus;
+          // focusStates[key] = focus;
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
         });
       });
     });
@@ -98,11 +122,24 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
     // fetchAdvancePurchaseReport();
   }
 
+  void dispose() {
+    focusNodes["from_date"]?.dispose();
+    focusNodes["to_date"]?.dispose();
+
+    for (var controller in textControllers.values) {
+      controller.dispose();
+    }
+    super.dispose();
+  }
+
   String getTabName(int index) {
     switch (index) {
-      case 0: return "domestic";
-      case 1: return "international";
-      default: return "domestic"; // return "Unknown";
+      case 0:
+        return "domestic";
+      case 1:
+        return "international";
+      default:
+        return "domestic"; // return "Unknown";
     }
   }
 
@@ -262,7 +299,6 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
         );
         filteredDomestic = domesticData;
 
-
         internationalData = List<Map<String, dynamic>>.from(
           result['status'] == 'success'
               ? result['data']['international'] ?? []
@@ -320,32 +356,45 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
       excelName,
     );
 
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Colors.green,
-        content: Text(result as String),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
+    // ScaffoldMessenger.of(context).showSnackBar(
+    //   SnackBar(
+    //     backgroundColor: result['status'] ? Colors.green : Colors.red,
+    //     content: Text(result['message']),
+    //     behavior: SnackBarBehavior.floating,
+    //   ),
+    // );
   }
 
   void handleDomesticFilter(String query) {
-
     final lowerQuery = query.toLowerCase();
     setState(() {
       filteredDomestic =
           domesticData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['sector']?.toLowerCase().contains(lowerQuery));
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['Service']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['created_on']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['FirstTravelDt']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['AdvPurch']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage1 = 0;
     });
-    print("handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}");
+    print(
+      "handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}",
+    );
   }
 
   void handleInternationalFilter(String query) {
@@ -353,17 +402,31 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
     setState(() {
       filteredInternational =
           internationalData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['sector']?.toLowerCase().contains(lowerQuery));
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['Service']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['created_on']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['FirstTravelDt']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['AdvPurch']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage2 = 0;
     });
-    print("handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}");
+    print(
+      "handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}",
+    );
   }
 
   @override
@@ -430,52 +493,52 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
           Container(
             color: Colors.white,
             child:
-            isDesktop
-            ? Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  buildTitle(isDesktop),
-                  Spacer(),
-                  buildExports(isDesktop)
-                ],
-              )
-            : Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildTitle(isDesktop),
-                SizedBox(height: 8),
-                buildExports(isDesktop)
-              ],
-              )
+                isDesktop
+                    ? Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        buildTitle(isDesktop),
+                        Spacer(),
+                        buildExports(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildTitle(isDesktop),
+                        SizedBox(height: 8),
+                        buildExports(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
           // ------------------- Second Row -------------------
-           Container(
-                    color: Colors.white,
-                    child:
-                    isDesktop
-                        ? Row(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                  buildFromDateField(isDesktop),
-                                  Spacer(),
-                                  buildToDateField(isDesktop),
-                                  Spacer(), // Space after Last Name
-                                  buildSearchButton(isDesktop),
-                              ],
-                          )
-                        : Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                                  buildFromDateField(isDesktop),
-                                  SizedBox(height: 8), // Vertical space
-                                  buildToDateField(isDesktop),
-                                  SizedBox(height: 8),
-                                  buildSearchButton(isDesktop),
-                            ],
-                          ),
-           ),
+          Container(
+            color: Colors.white,
+            child:
+                isDesktop
+                    ? Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        Spacer(),
+                        buildToDateField(isDesktop),
+                        Spacer(), // Space after Last Name
+                        buildSearchButton(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        SizedBox(height: 8), // Vertical space
+                        buildToDateField(isDesktop),
+                        SizedBox(height: 8),
+                        buildSearchButton(isDesktop),
+                      ],
+                    ),
+          ),
           SizedBox(height: 5),
 
           // ------------------- Third Row -------------------
@@ -503,13 +566,34 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                           : domesticData.isEmpty
                           ? Center(
                             child: Padding(
-                              padding: EdgeInsets.all(16),
-                              child: Text(
-                                "No data found",
-                                style: GoogleFonts.poppins(
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                           )
@@ -542,7 +626,9 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                                     ),
                                     SizedBox(width: 16),
                                     Container(
-                                      width: MediaQuery.of(context).size.width * 0.2,
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
                                       height: 40,
                                       child: TextField(
                                         controller: searchDomesticController,
@@ -559,24 +645,32 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                                             size: 18,
                                           ),
                                           border: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                           ),
                                           enabledBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade200,
                                               width: 0.5,
                                             ),
                                           ),
                                           focusedBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade300,
                                               width: 1,
                                             ),
                                           ),
                                         ),
-                                        style: GoogleFonts.poppins(fontSize: 12),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
+                                        ),
                                       ),
                                     ),
                                     // /// Buttons on the right
@@ -657,9 +751,9 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                               //         DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //         DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //         DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                              //         DataColumn(label: Text('Flight Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Service', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //         DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                              //         DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('AdvPurch', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //       ],
                               //       rows: domesticData.map((entry) {
                               //         return DataRow(cells: [
@@ -667,9 +761,9 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                               //           DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //           DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //           DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
-                              //           DataCell(Text('${entry['flight_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['Service']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //           DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                              //           DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['AdvPurch']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //         ]);
                               //       }).toList(),
                               //     ),
@@ -683,245 +777,315 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
 
-
-                                    List<Map<String, dynamic>> newDomesticData =filteredDomestic.isNotEmpty ? filteredDomestic : domesticData;
-
+                                    List<Map<String, dynamic>> newDomesticData =
+                                        filteredDomestic.isNotEmpty
+                                            ? filteredDomestic
+                                            : domesticData;
 
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedDomestic =
-                                             newDomesticData
+                                        newDomesticData
                                             .skip(currentPage1 * itemsPerPage1)
                                             .take(itemsPerPage1)
                                             .toList();
 
-                                    return (
-                                        (searchDomesticController.text.isNotEmpty && filteredDomestic.isEmpty)
+                                    return ((searchDomesticController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredDomestic.isEmpty)
                                         ? Center(
-                                                child: Text(
-                                                  "No data found",
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
                                                   style: GoogleFonts.poppins(
-                                                    fontSize: 14,
+                                                    fontSize: 20,
                                                     fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
                                                   ),
                                                 ),
-                                          )
-                                        : Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
-                                              child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
                                                   ),
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Id',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        )
+                                        : Column(
+                                          children: [
+                                            Expanded(
+                                              child: SingleChildScrollView(
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
+                                                  ),
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Employee Code',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'SO Number',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Department',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Flight Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Sector',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedDomestic.map((
-                                                        entry,
-                                                      ) {
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_id']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Service',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Created on',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'First Travel Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Advance Purchase',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedDomestic.map((
+                                                            entry,
+                                                          ) {
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['employee_code']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['so_number']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['functional_department']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['Service']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['sector']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['created_on']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['FirstTravelDt']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['AdvPurch']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
+                                                            );
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage1,
-                                          itemsPerPage: itemsPerPage1,
-                                          totalItems: newDomesticData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage1 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage1 = items;
-                                              currentPage1 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage1,
+                                              itemsPerPage: itemsPerPage1,
+                                              totalItems:
+                                                  newDomesticData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage1 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage1 = items;
+                                                  currentPage1 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -932,13 +1096,34 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                       internationalData.isEmpty
                           ? Center(
                             child: Padding(
-                              padding: EdgeInsets.all(16),
-                              child: Text(
-                                "No data found",
-                                style: GoogleFonts.poppins(
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                           )
@@ -1044,9 +1229,9 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                               //         DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //         DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //         DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                              //         DataColumn(label: Text('Flight Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Service', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //         DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                              //         DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('AdvPurch', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
                               //       ],
                               //       rows: internationalData.map((entry) {
                               //         return DataRow(cells: [
@@ -1054,9 +1239,9 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                               //           DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //           DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //           DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
-                              //           DataCell(Text('${entry['flight_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['Service']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //           DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                              //           DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['AdvPurch']}', style: GoogleFonts.poppins(fontSize: 12))),
                               //         ]);
                               //       }).toList(),
                               //     ),
@@ -1069,63 +1254,77 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                                   vertical: 8,
                                 ),
                                 child: Row(
-                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                    crossAxisAlignment: CrossAxisAlignment.center,
-                                     children: [
-                                       /// Title on the left
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  children: [
+                                    /// Title on the left
                                     Expanded(
-                                            child: Text(
-                                                        "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
-                                                      style: GoogleFonts.poppins(
-                                                              fontSize: 13,
-                                                              fontWeight: FontWeight.w500,
-                                                              color: Colors.grey[700],
-                                                      ),
-                                                      overflow: TextOverflow.ellipsis, // Ensures title doesn't overflow
-                                                    ),
+                                      child: Text(
+                                        "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 13,
+                                          fontWeight: FontWeight.w500,
+                                          color: Colors.grey[700],
                                         ),
+                                        overflow:
+                                            TextOverflow
+                                                .ellipsis, // Ensures title doesn't overflow
+                                      ),
+                                    ),
 
-
-                                         SizedBox(width: 16),
-                                         Container(
-                                           width: MediaQuery.of(context).size.width * 0.2,
-                                           height: 40,
-                                           child: TextField(
-                                             controller: searchInternationalController,
-                                             onChanged: handleInternationalFilter,
-                                             decoration: InputDecoration(
-                                               hintText: "Search ...",
-                                               hintStyle: TextStyle(
-                                                 fontSize: 12,
-                                                 color: Color(0xFF9E9DBD),
-                                               ),
-                                               prefixIcon: Icon(
-                                                 Icons.search,
-                                                 color: Color(0xFF9E9DBD),
-                                                 size: 18,
-                                               ),
-                                               border: OutlineInputBorder(
-                                                 borderRadius: BorderRadius.circular(12),
-                                               ),
-                                               enabledBorder: OutlineInputBorder(
-                                                 borderRadius: BorderRadius.circular(12),
-                                                 borderSide: BorderSide(
-                                                   color: Colors.grey.shade200,
-                                                   width: 0.5,
-                                                 ),
-                                               ),
-                                               focusedBorder: OutlineInputBorder(
-                                                 borderRadius: BorderRadius.circular(12),
-                                                 borderSide: BorderSide(
-                                                   color: Colors.grey.shade300,
-                                                   width: 1,
-                                                 ),
-                                               ),
-                                             ),
-                                             style: GoogleFonts.poppins(fontSize: 12),
-                                           ),
-                                         ),
-                                        ])
+                                    SizedBox(width: 16),
+                                    Container(
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
+                                      height: 40,
+                                      child: TextField(
+                                        controller:
+                                            searchInternationalController,
+                                        onChanged: handleInternationalFilter,
+                                        decoration: InputDecoration(
+                                          hintText: "Search ...",
+                                          hintStyle: TextStyle(
+                                            fontSize: 12,
+                                            color: Color(0xFF9E9DBD),
+                                          ),
+                                          prefixIcon: Icon(
+                                            Icons.search,
+                                            color: Color(0xFF9E9DBD),
+                                            size: 18,
+                                          ),
+                                          border: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                          ),
+                                          enabledBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade200,
+                                              width: 0.5,
+                                            ),
+                                          ),
+                                          focusedBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade300,
+                                              width: 1,
+                                            ),
+                                          ),
+                                        ),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
                               ),
                               Container(
                                 height:
@@ -1138,241 +1337,315 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                                   builder: (context, constraints) {
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
-                                    List<Map<String, dynamic>> newInternationalData =filteredInternational.isNotEmpty ? filteredInternational : internationalData;
+                                    List<Map<String, dynamic>>
+                                    newInternationalData =
+                                        filteredInternational.isNotEmpty
+                                            ? filteredInternational
+                                            : internationalData;
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedInternational =
-                                    newInternationalData
+                                        newInternationalData
                                             .skip(currentPage2 * itemsPerPage2)
                                             .take(itemsPerPage2)
                                             .toList();
 
-                                    return ((searchInternationalController.text.isNotEmpty && filteredInternational.isEmpty)
+                                    return ((searchInternationalController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredInternational.isEmpty)
                                         ? Center(
-                                              child: Text(
-                                                "No data found",
-                                                style: GoogleFonts.poppins(
-                                                  fontSize: 14,
-                                                  fontWeight: FontWeight.w500,
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
                                                 ),
-                                              ),
-                                          )
-                                        :Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
-                                              child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
                                                   ),
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Id',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        )
+                                        : Column(
+                                          children: [
+                                            Expanded(
+                                              child: SingleChildScrollView(
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
+                                                  ),
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Employee Code',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'SO Number',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Department',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Flight Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Sector',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedInternational.map((
-                                                        entry,
-                                                      ) {
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_id']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Service',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Created on',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'First Travel Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Advance Purchase',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedInternational.map((
+                                                            entry,
+                                                          ) {
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['employee_code']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['so_number']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['functional_department']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['Service']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['sector']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['created_on']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['FirstTravelDt']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['AdvPurch']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
+                                                            );
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage2,
-                                          itemsPerPage: itemsPerPage2,
-                                          totalItems: newInternationalData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage2 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage2 = items;
-                                              currentPage2 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage2,
+                                              itemsPerPage: itemsPerPage2,
+                                              totalItems:
+                                                  newInternationalData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage2 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage2 = items;
+                                                  currentPage2 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -1390,29 +1663,27 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
     );
   }
 
-  Widget buildTitle(bool isDesktop){
+  Widget buildTitle(bool isDesktop) {
     return // Left side: Breadcrumb inside a Container (optional)
-      Container(
-        child: BreadcrumbNavigation(
-          isDesktop: isDesktop,
-          breadcrumbItems: [
-            BreadcrumbItem(
-                title: 'Report List',
-                tooltip: 'Go To Report List',
-                onTap: (context) {
-                  // Navigator.pushNamed(context, '/report');
-                  context.go("/report");
-                }
-            ),
-            BreadcrumbItem(
-              title: 'Advance Purchase',
-            ),
-          ],
-        ),
-      );
+    Container(
+      child: BreadcrumbNavigation(
+        isDesktop: isDesktop,
+        breadcrumbItems: [
+          BreadcrumbItem(
+            title: 'Report List',
+            tooltip: 'Go To Report List',
+            onTap: (context) {
+              // Navigator.pushNamed(context, '/report');
+              context.go("/report");
+            },
+          ),
+          BreadcrumbItem(title: 'Advance Purchase'),
+        ],
+      ),
+    );
   }
 
-  Widget buildExports(bool isDesktop){
+  Widget buildExports(bool isDesktop) {
     return Row(
       children: [
         ElevatedButton(
@@ -1422,10 +1693,7 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
               borderRadius: BorderRadius.circular(8),
               side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
-            padding: EdgeInsets.symmetric(
-              horizontal: 20,
-              vertical: 12,
-            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
           ),
           onPressed: handleDownload,
           child: Row(
@@ -1438,11 +1706,7 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                 ),
               ),
               SizedBox(width: 8),
-              Icon(
-                Icons.file_present_outlined,
-                size: 15,
-                color: Colors.white,
-              ),
+              Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
             ],
           ),
         ),
@@ -1475,89 +1739,86 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
         // ),
       ],
     );
-
   }
 
   Widget buildFromDateField(bool isDesktop) {
     return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text( "From Date *",
-            style: GoogleFonts.poppins(
-              fontSize: 12,
-              fontWeight: FontWeight.w600,
-              color: Color(0xFF575A74),
-            ),
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "From Date *",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
           ),
-          SizedBox(height: 5),
-          CustomTextFieldWrapper(
-            isFocused: focusStates["from_date"] ?? false,
-            // isDesktop: isDesktop ? MediaQuery.of(context).size.height * 0.51 : 200,
-            isDesktop: isDesktop,
-            width: isDesktop ? null : double.infinity,
-            child: SizedBox(
-              height: 40,
-              child: GestureDetector(
-                onTap: () async {
-                  final pickedDate = await showDatePicker(
-                    context: context,
-                    initialDate: DateTime.now(),
-                    firstDate: DateTime(2000),
-                    lastDate: DateTime(2100),
-                    initialEntryMode: DatePickerEntryMode.calendarOnly,
-                  );
-                  if (pickedDate != null) {
-                    textControllers["from_date"]?.text = DateFormat(
-                      'dd-MM-yyyy',
-                    ).format(pickedDate);
-                  }
-                },
-                child: AbsorbPointer(
-                  child: TextField(
-                    focusNode: focusNodes["from_date"],
-                    controller: textControllers["from_date"],
-                    readOnly: true,
-                    style: const TextStyle(fontSize: 12),
-                    decoration: InputDecoration(
-                      labelText: "Select Date",
-                      labelStyle: const TextStyle(
-                        fontSize: 12,
-                        color: Colors.grey,
-                      ),
-                      floatingLabelBehavior:
-                      FloatingLabelBehavior.never,
-                      border: InputBorder.none,
-                      contentPadding: const EdgeInsets.symmetric(
-                        vertical: 16,
-                      ),
-                      suffixIcon: const Icon(
-                        Icons.calendar_today,
-                        size: 16,
-                        color: Colors.grey,
-                      ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldWrapper(
+          isFocused: focusStates["from_date"] ?? false,
+          // isDesktop: isDesktop ? MediaQuery.of(context).size.height * 0.51 : 200,
+          isDesktop: isDesktop,
+          width: isDesktop ? null : double.infinity,
+          child: SizedBox(
+            height: 40,
+            child: GestureDetector(
+              onTap: () async {
+                final pickedDate = await showDatePicker(
+                  context: context,
+                  initialDate: DateTime.now(),
+                  firstDate: DateTime(2000),
+                  lastDate: DateTime(2100),
+                  initialEntryMode: DatePickerEntryMode.calendarOnly,
+                );
+                if (pickedDate != null) {
+                  textControllers["from_date"]?.text = DateFormat(
+                    'dd-MM-yyyy',
+                  ).format(pickedDate);
+                }
+              },
+              child: AbsorbPointer(
+                child: TextField(
+                  focusNode: focusNodes["from_date"],
+                  controller: textControllers["from_date"],
+                  readOnly: true,
+                  style: const TextStyle(fontSize: 12),
+                  decoration: InputDecoration(
+                    labelText: "Select Date",
+                    labelStyle: const TextStyle(
+                      fontSize: 12,
+                      color: Colors.grey,
+                    ),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
+                    border: InputBorder.none,
+                    contentPadding: const EdgeInsets.symmetric(vertical: 16),
+                    suffixIcon: const Icon(
+                      Icons.calendar_today,
+                      size: 16,
+                      color: Colors.grey,
                     ),
                   ),
                 ),
               ),
             ),
           ),
-          if (errorMessages["from_date"] != null) ...[
-            SizedBox(height: 5), // Space before error message
-            Text(
-              errorMessages["from_date"]!,
-              style: TextStyle(color: Colors.red, fontSize: 12),
-            ),
-          ],
+        ),
+        if (errorMessages["from_date"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            errorMessages["from_date"]!,
+            style: TextStyle(color: Colors.red, fontSize: 12),
+          ),
         ],
-      );
+      ],
+    );
   }
 
-
   Widget buildToDateField(bool isDesktop) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "To Date *",
+        Text(
+          "To Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1573,13 +1834,11 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
             height: 40,
             child: GestureDetector(
               onTap: () async {
-                final fromDateText =
-                    textControllers["from_date"]?.text;
+                focusNodes["to_date"]?.requestFocus();
+                final fromDateText = textControllers["from_date"]?.text;
                 DateTime? mintoDate;
                 if (fromDateText != null && fromDateText.isNotEmpty) {
-                  mintoDate = DateFormat(
-                    'dd-MM-yyyy',
-                  ).parse(fromDateText);
+                  mintoDate = DateFormat('dd-MM-yyyy').parse(fromDateText);
                 }
 
                 final pickedDate = await showDatePicker(
@@ -1604,16 +1863,10 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
                   style: const TextStyle(fontSize: 12),
                   decoration: const InputDecoration(
                     labelText: "Select Date",
-                    labelStyle: TextStyle(
-                      fontSize: 12,
-                      color: Colors.grey,
-                    ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    labelStyle: TextStyle(fontSize: 12, color: Colors.grey),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1632,8 +1885,7 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
             style: const TextStyle(color: Colors.red, fontSize: 12),
             maxLines: 2, // Allow it to wrap onto two lines
             overflow:
-            TextOverflow
-                .ellipsis, // Add ellipsis if it still overflows
+                TextOverflow.ellipsis, // Add ellipsis if it still overflows
           ),
         ],
       ],
@@ -1641,48 +1893,39 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
   }
 
   Widget buildSearchButton(bool isDesktop) {
-    return
-      Padding(
-        padding: isDesktop
-            ? const EdgeInsets.only(top: 22)
-            : EdgeInsets.zero,
-          child: SizedBox(
-            // width: isDesktop ? null : MediaQuery.of(context).size.width * 0.5, // don't delete
-            width: isDesktop ? null : double.infinity,
-            child: ElevatedButton(
-              style: ElevatedButton.styleFrom(
-                backgroundColor: Color(0xFF114D8B),
-                foregroundColor: Colors.white,
-                disabledBackgroundColor: Color(0xFF114D8B),
-                disabledForegroundColor: Colors.white,
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(8),
-                  side: BorderSide(color: Color(0xFF114D8B), width: 2),
-                ),
-                padding: EdgeInsets.symmetric(
-                  horizontal: 20,
-                  vertical: 12,
-                ),
-              ),
-              onPressed: () {
-                handleSubmit();
-              },
-              child: Row(
-                mainAxisSize:
-                MainAxisSize.min, // Ensures content fits nicely
-                children: [
-                  Text(
-                    "Search",
-                    style: GoogleFonts.poppins(
-                      fontSize: isDesktop ? 13 : 11,
-                    ),
-                  ),
-                  SizedBox(width: 8), // spacing between icon and text
-                  Icon(Icons.search, size: 15, color: Colors.white),
-                ],
-              ),
+    return Padding(
+      padding: isDesktop ? const EdgeInsets.only(top: 22) : EdgeInsets.zero,
+      child: SizedBox(
+        // width: isDesktop ? null : MediaQuery.of(context).size.width * 0.5, // don't delete
+        width: isDesktop ? null : double.infinity,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Color(0xFF114D8B),
+            foregroundColor: Colors.white,
+            disabledBackgroundColor: Color(0xFF114D8B),
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
           ),
+          onPressed: () {
+            handleSubmit();
+          },
+          child: Row(
+            mainAxisSize: MainAxisSize.min, // Ensures content fits nicely
+            children: [
+              Text(
+                "Search",
+                style: GoogleFonts.poppins(fontSize: isDesktop ? 13 : 11),
+              ),
+              SizedBox(width: 8), // spacing between icon and text
+              Icon(Icons.search, size: 15, color: Colors.white),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/lib/Screens/reports/guestHouse.dart b/lib/Screens/reports/guestHouse.dart
index f13cd19..225a20d 100644
--- a/lib/Screens/reports/guestHouse.dart
+++ b/lib/Screens/reports/guestHouse.dart
@@ -112,9 +112,12 @@ class _GuestHouseState extends State<GuestHouse>
 
   String getTabName(int index) {
     switch (index) {
-      case 0: return "domestic";
-      case 1: return "international";
-      default: return "domestic"; // return "Unknown";
+      case 0:
+        return "domestic";
+      case 1:
+        return "international";
+      default:
+        return "domestic"; // return "Unknown";
     }
   }
 
@@ -332,35 +335,62 @@ class _GuestHouseState extends State<GuestHouse>
       excelName,
     );
 
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Colors.green,
-        content: Text(result as String),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
+    // ScaffoldMessenger.of(context).showSnackBar(
+    //   SnackBar(
+    //     backgroundColor: result['status'] ? Colors.green : Colors.red,
+    //     content: Text(result['message']),
+    //     behavior: SnackBarBehavior.floating,
+    //   ),
+    // );
   }
 
   void handleDomesticFilter(String query) {
-
     final lowerQuery = query.toLowerCase();
     setState(() {
       filteredDomestic =
           domesticData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['customer_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_class']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_travel_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
+            final travelDateRaw = object['flight_travel_date'];
+            String formattedDate = '';
+
+            if (travelDateRaw != null && travelDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(travelDateRaw);
+                formattedDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                formattedDate = travelDateRaw;
+              }
+            }
+
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['customer_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['flight_trip_type']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['flight_class']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (formattedDate.toLowerCase().contains(lowerQuery)) ||
                 (object['sector']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage1 = 0;
     });
-    print("handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}");
+    print(
+      "handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}",
+    );
   }
 
   void handleInternationalFilter(String query) {
@@ -368,23 +398,49 @@ class _GuestHouseState extends State<GuestHouse>
     setState(() {
       filteredInternational =
           internationalData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['customer_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_class']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_travel_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
+            final travelDateRaw = object['flight_travel_date'];
+            String formattedDate = '';
+
+            if (travelDateRaw != null && travelDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(travelDateRaw);
+                formattedDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                formattedDate = travelDateRaw;
+              }
+            }
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['customer_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['flight_trip_type']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['flight_class']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (formattedDate.toLowerCase().contains(lowerQuery)) ||
                 (object['sector']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage2 = 0;
     });
-    print("handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}");
+    print(
+      "handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}",
+    );
   }
 
-
   @override
   // Widget build(BuildContext context) {
   //   // TODO: implement build
@@ -448,25 +504,25 @@ class _GuestHouseState extends State<GuestHouse>
           // ------------------- First Row -------------------
           // ------------------- First Row -------------------
           Container(
-              color: Colors.white,
-              child:
-              isDesktop
-                  ? Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  buildTitle(isDesktop),
-                  Spacer(),
-                  buildExports(isDesktop)
-                ],
-              )
-                  : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  buildTitle(isDesktop),
-                  SizedBox(height: 8),
-                  buildExports(isDesktop)
-                ],
-              )
+            color: Colors.white,
+            child:
+                isDesktop
+                    ? Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        buildTitle(isDesktop),
+                        Spacer(),
+                        buildExports(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildTitle(isDesktop),
+                        SizedBox(height: 8),
+                        buildExports(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -474,27 +530,27 @@ class _GuestHouseState extends State<GuestHouse>
           Container(
             color: Colors.white,
             child:
-            isDesktop
-                ? Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                Spacer(),
-                buildToDateField(isDesktop),
-                Spacer(), // Space after Last Name
-                buildSearchButton(isDesktop),
-              ],
-            )
-                : Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                SizedBox(height: 8), // Vertical space
-                buildToDateField(isDesktop),
-                SizedBox(height: 8),
-                buildSearchButton(isDesktop),
-              ],
-            ),
+                isDesktop
+                    ? Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        Spacer(),
+                        buildToDateField(isDesktop),
+                        Spacer(), // Space after Last Name
+                        buildSearchButton(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        SizedBox(height: 8), // Vertical space
+                        buildToDateField(isDesktop),
+                        SizedBox(height: 8),
+                        buildSearchButton(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -523,13 +579,34 @@ class _GuestHouseState extends State<GuestHouse>
                           : domesticData.isEmpty
                           ? Center(
                             child: Padding(
-                              padding: EdgeInsets.all(16),
-                              child: Text(
-                                "No data found",
-                                style: GoogleFonts.poppins(
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                           )
@@ -561,7 +638,9 @@ class _GuestHouseState extends State<GuestHouse>
                                       ),
                                     ),
                                     Container(
-                                      width: MediaQuery.of(context).size.width * 0.2,
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
                                       height: 40,
                                       child: TextField(
                                         controller: searchDomesticController,
@@ -578,24 +657,32 @@ class _GuestHouseState extends State<GuestHouse>
                                             size: 18,
                                           ),
                                           border: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                           ),
                                           enabledBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade200,
                                               width: 0.5,
                                             ),
                                           ),
                                           focusedBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade300,
                                               width: 1,
                                             ),
                                           ),
                                         ),
-                                        style: GoogleFonts.poppins(fontSize: 12),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
+                                        ),
                                       ),
                                     ),
                                     // SizedBox(width: 16),
@@ -703,296 +790,323 @@ class _GuestHouseState extends State<GuestHouse>
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
 
-                                    List<Map<String, dynamic>> newDomesticData =filteredDomestic.isNotEmpty ? filteredDomestic : domesticData;
-
+                                    List<Map<String, dynamic>> newDomesticData =
+                                        filteredDomestic.isNotEmpty
+                                            ? filteredDomestic
+                                            : domesticData;
 
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedDomestic =
-                                    newDomesticData
-                                        .skip(currentPage1 * itemsPerPage1)
-                                        .take(itemsPerPage1)
-                                        .toList();
+                                        newDomesticData
+                                            .skip(currentPage1 * itemsPerPage1)
+                                            .take(itemsPerPage1)
+                                            .toList();
 
-                                    return (
-                                        (searchDomesticController.text.isNotEmpty && filteredDomestic.isEmpty)
-                                            ? Center(
-                                          child: Text(
-                                            "No data found",
-                                            style: GoogleFonts.poppins(
-                                              fontSize: 14,
-                                              fontWeight: FontWeight.w500,
+                                    return ((searchDomesticController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredDomestic.isEmpty)
+                                        ? Center(
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
                                             ),
                                           ),
                                         )
-                                            :  Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
+                                        : Column(
+                                          children: [
+                                            Expanded(
                                               child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
                                                   ),
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Id',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Employee Code',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'SO Number',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Department',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Flight Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Sector',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Class',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Travel Date',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedDomestic.map((
-                                                        entry,
-                                                      ) {
-                                                        final flightTravelDate =
-                                                            DateFormat(
-                                                              'yyyy-MM-dd',
-                                                            ).format(
-                                                              DateTime.parse(
-                                                                entry['flight_travel_date'],
-                                                              ),
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Flight Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Sector',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Class',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Travel Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedDomestic.map((
+                                                            entry,
+                                                          ) {
+                                                            final flightTravelDate =
+                                                                DateFormat(
+                                                                  'yyyy-MM-dd',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['flight_travel_date'],
+                                                                  ),
+                                                                );
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['sector']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_class']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    flightTravelDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
                                                             );
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_id']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['employee_code']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['so_number']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['functional_department']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['sector']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_class']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                flightTravelDate,
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage1,
-                                          itemsPerPage: itemsPerPage1,
-                                          totalItems: newDomesticData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage1 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage1 = items;
-                                              currentPage1 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage1,
+                                              itemsPerPage: itemsPerPage1,
+                                              totalItems:
+                                                  newDomesticData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage1 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage1 = items;
+                                                  currentPage1 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -1003,13 +1117,34 @@ class _GuestHouseState extends State<GuestHouse>
                       internationalData.isEmpty
                           ? Center(
                             child: Padding(
-                              padding: EdgeInsets.all(16),
-                              child: Text(
-                                "No data found",
-                                style: GoogleFonts.poppins(
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                           )
@@ -1139,64 +1274,78 @@ class _GuestHouseState extends State<GuestHouse>
                                   horizontal: 16.0,
                                   vertical: 8,
                                 ),
-                                  child: Row(
-                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                      crossAxisAlignment: CrossAxisAlignment.center,
-                                      children: [
-                                        /// Title on the left
-                                        Expanded(
-                                          child: Text(
-                                            "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
-                                            style: GoogleFonts.poppins(
-                                              fontSize: 13,
-                                              fontWeight: FontWeight.w500,
-                                              color: Colors.grey[700],
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  children: [
+                                    /// Title on the left
+                                    Expanded(
+                                      child: Text(
+                                        "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 13,
+                                          fontWeight: FontWeight.w500,
+                                          color: Colors.grey[700],
+                                        ),
+                                        overflow:
+                                            TextOverflow
+                                                .ellipsis, // Ensures title doesn't overflow
+                                      ),
+                                    ),
+
+                                    SizedBox(width: 16),
+                                    Container(
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
+                                      height: 40,
+                                      child: TextField(
+                                        controller:
+                                            searchInternationalController,
+                                        onChanged: handleInternationalFilter,
+                                        decoration: InputDecoration(
+                                          hintText: "Search ...",
+                                          hintStyle: TextStyle(
+                                            fontSize: 12,
+                                            color: Color(0xFF9E9DBD),
+                                          ),
+                                          prefixIcon: Icon(
+                                            Icons.search,
+                                            color: Color(0xFF9E9DBD),
+                                            size: 18,
+                                          ),
+                                          border: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                          ),
+                                          enabledBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade200,
+                                              width: 0.5,
+                                            ),
+                                          ),
+                                          focusedBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade300,
+                                              width: 1,
                                             ),
-                                            overflow: TextOverflow.ellipsis, // Ensures title doesn't overflow
                                           ),
                                         ),
-
-
-                                        SizedBox(width: 16),
-                                        Container(
-                                          width: MediaQuery.of(context).size.width * 0.2,
-                                          height: 40,
-                                          child: TextField(
-                                            controller: searchInternationalController,
-                                            onChanged: handleInternationalFilter,
-                                            decoration: InputDecoration(
-                                              hintText: "Search ...",
-                                              hintStyle: TextStyle(
-                                                fontSize: 12,
-                                                color: Color(0xFF9E9DBD),
-                                              ),
-                                              prefixIcon: Icon(
-                                                Icons.search,
-                                                color: Color(0xFF9E9DBD),
-                                                size: 18,
-                                              ),
-                                              border: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                              ),
-                                              enabledBorder: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                                borderSide: BorderSide(
-                                                  color: Colors.grey.shade200,
-                                                  width: 0.5,
-                                                ),
-                                              ),
-                                              focusedBorder: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                                borderSide: BorderSide(
-                                                  color: Colors.grey.shade300,
-                                                  width: 1,
-                                                ),
-                                              ),
-                                            ),
-                                            style: GoogleFonts.poppins(fontSize: 12),
-                                          ),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
                                         ),
-                                      ])
+                                      ),
+                                    ),
+                                  ],
+                                ),
                               ),
                               Container(
                                 height:
@@ -1209,303 +1358,333 @@ class _GuestHouseState extends State<GuestHouse>
                                   builder: (context, constraints) {
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
-                                    List<Map<String, dynamic>> newInternationalData =filteredInternational.isNotEmpty ? filteredInternational : internationalData;
+                                    List<Map<String, dynamic>>
+                                    newInternationalData =
+                                        filteredInternational.isNotEmpty
+                                            ? filteredInternational
+                                            : internationalData;
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedInternational =
-                                    newInternationalData
+                                        newInternationalData
                                             .skip(currentPage2 * itemsPerPage2)
                                             .take(itemsPerPage2)
                                             .toList();
 
-                                    return ((searchInternationalController.text.isNotEmpty && filteredInternational.isEmpty)
+                                    return ((searchInternationalController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredInternational.isEmpty)
                                         ? Center(
-                                      child: Text(
-                                        "No data found",
-                                        style: GoogleFonts.poppins(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.w500,
-                                        ),
-                                      ),
-                                    )
-                                        :Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
-                                              child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
                                                   ),
-                                                  columns: [
-                                                    // "plan_id": "17",
-                                                    // "employee_code": "TS_004",
-                                                    // "customer_name": "sangeetha E",
-                                                    // "so_number": "12345",
-                                                    // "functional_department": "HR",
-                                                    // "flight_trip_type": "Roundtrip",
-                                                    // "plan_trip_type": "international",
-                                                    // "sector": "Rajiv Gandhi International (Hyderabad) - Canadian Rockies Intl (Cranbrook)",
-                                                    // "flight_class": "Business",
-                                                    // "flight_travel_date": "2025-06-11"
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Id',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        )
+                                        : Column(
+                                          children: [
+                                            Expanded(
+                                              child: SingleChildScrollView(
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
+                                                  ),
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Employee Code',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'SO Number',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Department',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Flight Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Sector',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Class',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Travel Date',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedInternational.map((
-                                                        entry,
-                                                      ) {
-                                                        final flightTravelDate =
-                                                            DateFormat(
-                                                              'yyyy-MM-dd',
-                                                            ).format(
-                                                              DateTime.parse(
-                                                                entry['flight_travel_date'],
-                                                              ),
+                                                      columns: [
+                                                        // "plan_id": "17",
+                                                        // "employee_code": "TS_004",
+                                                        // "customer_name": "sangeetha E",
+                                                        // "so_number": "12345",
+                                                        // "functional_department": "HR",
+                                                        // "flight_trip_type": "Roundtrip",
+                                                        // "plan_trip_type": "international",
+                                                        // "sector": "Rajiv Gandhi International (Hyderabad) - Canadian Rockies Intl (Cranbrook)",
+                                                        // "flight_class": "Business",
+                                                        // "flight_travel_date": "2025-06-11"
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Flight Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Sector',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Class',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Travel Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedInternational.map((
+                                                            entry,
+                                                          ) {
+                                                            final flightTravelDate =
+                                                                DateFormat(
+                                                                  'yyyy-MM-dd',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['flight_travel_date'],
+                                                                  ),
+                                                                );
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['sector']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_class']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    flightTravelDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
                                                             );
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_id']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['employee_code']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['so_number']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['functional_department']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['sector']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_class']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                flightTravelDate,
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage2,
-                                          itemsPerPage: itemsPerPage2,
-                                          totalItems: newInternationalData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage2 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage2 = items;
-                                              currentPage2 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage2,
+                                              itemsPerPage: itemsPerPage2,
+                                              totalItems:
+                                                  newInternationalData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage2 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage2 = items;
+                                                  currentPage2 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -1523,29 +1702,27 @@ class _GuestHouseState extends State<GuestHouse>
     );
   }
 
-  Widget buildTitle(bool isDesktop){
+  Widget buildTitle(bool isDesktop) {
     return // Left side: Breadcrumb inside a Container (optional)
-      Container(
-        child: BreadcrumbNavigation(
-          isDesktop: isDesktop,
-          breadcrumbItems: [
-            BreadcrumbItem(
-                title: 'Report List',
-                tooltip: 'Go To Report List',
-                onTap: (context) {
-                  // Navigator.pushNamed(context, '/report');
-                  context.go("/report");
-                }
-            ),
-            BreadcrumbItem(
-              title: 'Guest House',
-            ),
-          ],
-        ),
-      );
+    Container(
+      child: BreadcrumbNavigation(
+        isDesktop: isDesktop,
+        breadcrumbItems: [
+          BreadcrumbItem(
+            title: 'Report List',
+            tooltip: 'Go To Report List',
+            onTap: (context) {
+              // Navigator.pushNamed(context, '/report');
+              context.go("/report");
+            },
+          ),
+          BreadcrumbItem(title: 'Guest House'),
+        ],
+      ),
+    );
   }
 
-  Widget buildExports(bool isDesktop){
+  Widget buildExports(bool isDesktop) {
     return Row(
       children: [
         ElevatedButton(
@@ -1555,10 +1732,7 @@ class _GuestHouseState extends State<GuestHouse>
               borderRadius: BorderRadius.circular(8),
               side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
-            padding: EdgeInsets.symmetric(
-              horizontal: 20,
-              vertical: 12,
-            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
           ),
           onPressed: handleDownload,
           child: Row(
@@ -1571,11 +1745,7 @@ class _GuestHouseState extends State<GuestHouse>
                 ),
               ),
               SizedBox(width: 8),
-              Icon(
-                Icons.file_present_outlined,
-                size: 15,
-                color: Colors.white,
-              ),
+              Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
             ],
           ),
         ),
@@ -1608,14 +1778,14 @@ class _GuestHouseState extends State<GuestHouse>
         // ),
       ],
     );
-
   }
 
   Widget buildFromDateField(bool isDesktop) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "From Date *",
+        Text(
+          "From Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1657,12 +1827,9 @@ class _GuestHouseState extends State<GuestHouse>
                       fontSize: 12,
                       color: Colors.grey,
                     ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: const EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: const EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: const Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1689,7 +1856,8 @@ class _GuestHouseState extends State<GuestHouse>
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "To Date *",
+        Text(
+          "To Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1705,13 +1873,10 @@ class _GuestHouseState extends State<GuestHouse>
             height: 40,
             child: GestureDetector(
               onTap: () async {
-                final fromDateText =
-                    textControllers["from_date"]?.text;
+                final fromDateText = textControllers["from_date"]?.text;
                 DateTime? mintoDate;
                 if (fromDateText != null && fromDateText.isNotEmpty) {
-                  mintoDate = DateFormat(
-                    'dd-MM-yyyy',
-                  ).parse(fromDateText);
+                  mintoDate = DateFormat('dd-MM-yyyy').parse(fromDateText);
                 }
 
                 final pickedDate = await showDatePicker(
@@ -1735,16 +1900,10 @@ class _GuestHouseState extends State<GuestHouse>
                   style: const TextStyle(fontSize: 12),
                   decoration: const InputDecoration(
                     labelText: "Select Date",
-                    labelStyle: TextStyle(
-                      fontSize: 12,
-                      color: Colors.grey,
-                    ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    labelStyle: TextStyle(fontSize: 12, color: Colors.grey),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1763,8 +1922,7 @@ class _GuestHouseState extends State<GuestHouse>
             style: const TextStyle(color: Colors.red, fontSize: 12),
             maxLines: 2, // Allow it to wrap onto two lines
             overflow:
-            TextOverflow
-                .ellipsis, // Add ellipsis if it still overflows
+                TextOverflow.ellipsis, // Add ellipsis if it still overflows
           ),
         ],
       ],
@@ -1772,47 +1930,38 @@ class _GuestHouseState extends State<GuestHouse>
   }
 
   Widget buildSearchButton(bool isDesktop) {
-    return
-      Padding(
-        padding: isDesktop
-            ? const EdgeInsets.only(top: 22)
-            : EdgeInsets.zero,
-        child: SizedBox(
-          width: isDesktop ? null : double.infinity,
-          child: ElevatedButton(
-            style: ElevatedButton.styleFrom(
-              backgroundColor: Color(0xFF114D8B),
-              foregroundColor: Colors.white,
-              disabledBackgroundColor: Color(0xFF114D8B),
-              disabledForegroundColor: Colors.white,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(8),
-                side: BorderSide(color: Color(0xFF114D8B), width: 2),
-              ),
-              padding: EdgeInsets.symmetric(
-                horizontal: 20,
-                vertical: 12,
-              ),
-            ),
-            onPressed: () {
-              handleSubmit();
-            },
-            child: Row(
-              mainAxisSize:
-              MainAxisSize.min, // Ensures content fits nicely
-              children: [
-                Text(
-                  "Search",
-                  style: GoogleFonts.poppins(
-                    fontSize: isDesktop ? 13 : 11,
-                  ),
-                ),
-                SizedBox(width: 8), // spacing between icon and text
-                Icon(Icons.search, size: 15, color: Colors.white),
-              ],
+    return Padding(
+      padding: isDesktop ? const EdgeInsets.only(top: 22) : EdgeInsets.zero,
+      child: SizedBox(
+        width: isDesktop ? null : double.infinity,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Color(0xFF114D8B),
+            foregroundColor: Colors.white,
+            disabledBackgroundColor: Color(0xFF114D8B),
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+          ),
+          onPressed: () {
+            handleSubmit();
+          },
+          child: Row(
+            mainAxisSize: MainAxisSize.min, // Ensures content fits nicely
+            children: [
+              Text(
+                "Search",
+                style: GoogleFonts.poppins(fontSize: isDesktop ? 13 : 11),
+              ),
+              SizedBox(width: 8), // spacing between icon and text
+              Icon(Icons.search, size: 15, color: Colors.white),
+            ],
           ),
         ),
-      );
+      ),
+    );
   }
 }
diff --git a/lib/Screens/reports/misAir.dart b/lib/Screens/reports/misAir.dart
index ef6c403..79d0c42 100644
--- a/lib/Screens/reports/misAir.dart
+++ b/lib/Screens/reports/misAir.dart
@@ -111,9 +111,12 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
 
   String getTabName(int index) {
     switch (index) {
-      case 0: return "domestic";
-      case 1: return "international";
-      default: return "domestic"; // return "Unknown";
+      case 0:
+        return "domestic";
+      case 1:
+        return "international";
+      default:
+        return "domestic"; // return "Unknown";
     }
   }
 
@@ -331,13 +334,13 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
       excelName,
     );
 
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Colors.green,
-        content: Text(result as String),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
+    // ScaffoldMessenger.of(context).showSnackBar(
+    //   SnackBar(
+    //     backgroundColor: result['status'] ? Colors.green : Colors.red,
+    //     content: Text(result['message']),
+    //     behavior: SnackBarBehavior.floating,
+    //   ),
+    // );
   }
 
   void handleDomesticFilter(String query) {
@@ -345,20 +348,48 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
     setState(() {
       filteredDomestic =
           domesticData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['customer_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_class']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_travel_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
+            final travelDateRaw = object['flight_travel_date'];
+            String formattedDate = '';
+
+            if (travelDateRaw != null && travelDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(travelDateRaw);
+                formattedDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                formattedDate = travelDateRaw;
+              }
+            }
+
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['customer_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['flight_trip_type']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['flight_class']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (formattedDate.toLowerCase().contains(lowerQuery)) ||
                 (object['sector']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage1 = 0;
     });
-    print("handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}");
+    print(
+      "handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}",
+    );
   }
 
   void handleInternationalFilter(String query) {
@@ -366,23 +397,50 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
     setState(() {
       filteredInternational =
           internationalData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['customer_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_class']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_travel_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
+            final travelDateRaw = object['flight_travel_date'];
+            String formattedDate = '';
+
+            if (travelDateRaw != null && travelDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(travelDateRaw);
+                formattedDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                formattedDate = travelDateRaw;
+              }
+            }
+
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['customer_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['flight_trip_type']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['flight_class']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (formattedDate.toLowerCase().contains(lowerQuery)) ||
                 (object['sector']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage2 = 0;
     });
-    print("handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}");
+    print(
+      "handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}",
+    );
   }
 
-
   @override
   // Widget build(BuildContext context) {
   //   // TODO: implement build
@@ -446,25 +504,25 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
           // ------------------- First Row -------------------
           // ------------------- First Row -------------------
           Container(
-              color: Colors.white,
-              child:
-              isDesktop
-                  ? Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  buildTitle(isDesktop),
-                  Spacer(),
-                  buildExports(isDesktop)
-                ],
-              )
-                  : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  buildTitle(isDesktop),
-                  SizedBox(height: 8),
-                  buildExports(isDesktop)
-                ],
-              )
+            color: Colors.white,
+            child:
+                isDesktop
+                    ? Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        buildTitle(isDesktop),
+                        Spacer(),
+                        buildExports(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildTitle(isDesktop),
+                        SizedBox(height: 8),
+                        buildExports(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -472,27 +530,27 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
           Container(
             color: Colors.white,
             child:
-            isDesktop
-                ? Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                Spacer(),
-                buildToDateField(isDesktop),
-                Spacer(), // Space after Last Name
-                buildSearchButton(isDesktop),
-              ],
-            )
-                : Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                SizedBox(height: 8), // Vertical space
-                buildToDateField(isDesktop),
-                SizedBox(height: 8),
-                buildSearchButton(isDesktop),
-              ],
-            ),
+                isDesktop
+                    ? Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        Spacer(),
+                        buildToDateField(isDesktop),
+                        Spacer(), // Space after Last Name
+                        buildSearchButton(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        SizedBox(height: 8), // Vertical space
+                        buildToDateField(isDesktop),
+                        SizedBox(height: 8),
+                        buildSearchButton(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -521,13 +579,34 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                           : domesticData.isEmpty
                           ? Center(
                             child: Padding(
-                              padding: EdgeInsets.all(16),
-                              child: Text(
-                                "No data found",
-                                style: GoogleFonts.poppins(
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                           )
@@ -559,7 +638,9 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                                       ),
                                     ),
                                     Container(
-                                      width: MediaQuery.of(context).size.width * 0.2,
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
                                       height: 40,
                                       child: TextField(
                                         controller: searchDomesticController,
@@ -576,24 +657,32 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                                             size: 18,
                                           ),
                                           border: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                           ),
                                           enabledBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade200,
                                               width: 0.5,
                                             ),
                                           ),
                                           focusedBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade300,
                                               width: 1,
                                             ),
                                           ),
                                         ),
-                                        style: GoogleFonts.poppins(fontSize: 12),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
+                                        ),
                                       ),
                                     ),
                                     // SizedBox(width: 16),
@@ -701,296 +790,323 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
 
-                                    List<Map<String, dynamic>> newDomesticData =filteredDomestic.isNotEmpty ? filteredDomestic : domesticData;
-
+                                    List<Map<String, dynamic>> newDomesticData =
+                                        filteredDomestic.isNotEmpty
+                                            ? filteredDomestic
+                                            : domesticData;
 
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedDomestic =
-                                    newDomesticData
-                                        .skip(currentPage1 * itemsPerPage1)
-                                        .take(itemsPerPage1)
-                                        .toList();
+                                        newDomesticData
+                                            .skip(currentPage1 * itemsPerPage1)
+                                            .take(itemsPerPage1)
+                                            .toList();
 
-                                    return (
-                                        (searchDomesticController.text.isNotEmpty && filteredDomestic.isEmpty)
-                                            ? Center(
-                                          child: Text(
-                                            "No data found",
-                                            style: GoogleFonts.poppins(
-                                              fontSize: 14,
-                                              fontWeight: FontWeight.w500,
+                                    return ((searchDomesticController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredDomestic.isEmpty)
+                                        ? Center(
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
                                             ),
                                           ),
                                         )
-                                            : Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
+                                        : Column(
+                                          children: [
+                                            Expanded(
                                               child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
                                                   ),
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Id',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Employee Code',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'SO Number',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Department',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Flight Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Sector',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Class',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Travel Date',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedDomestic.map((
-                                                        entry,
-                                                      ) {
-                                                        final TravelDate =
-                                                            DateFormat(
-                                                              'dd-MM-yyyy',
-                                                            ).format(
-                                                              DateTime.parse(
-                                                                entry['flight_travel_date'],
-                                                              ),
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Flight Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Sector',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Class',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Travel Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedDomestic.map((
+                                                            entry,
+                                                          ) {
+                                                            final TravelDate =
+                                                                DateFormat(
+                                                                  'dd-MM-yyyy',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['flight_travel_date'],
+                                                                  ),
+                                                                );
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['sector']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_class']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    TravelDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
                                                             );
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_id']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['employee_code']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['so_number']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['functional_department']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['sector']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_class']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                TravelDate,
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage1,
-                                          itemsPerPage: itemsPerPage1,
-                                          totalItems: newDomesticData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage1 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage1 = items;
-                                              currentPage1 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage1,
+                                              itemsPerPage: itemsPerPage1,
+                                              totalItems:
+                                                  newDomesticData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage1 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage1 = items;
+                                                  currentPage1 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -1137,64 +1253,78 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                                   horizontal: 16.0,
                                   vertical: 8,
                                 ),
-                                  child: Row(
-                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                      crossAxisAlignment: CrossAxisAlignment.center,
-                                      children: [
-                                        /// Title on the left
-                                        Expanded(
-                                          child: Text(
-                                            "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
-                                            style: GoogleFonts.poppins(
-                                              fontSize: 13,
-                                              fontWeight: FontWeight.w500,
-                                              color: Colors.grey[700],
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  children: [
+                                    /// Title on the left
+                                    Expanded(
+                                      child: Text(
+                                        "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 13,
+                                          fontWeight: FontWeight.w500,
+                                          color: Colors.grey[700],
+                                        ),
+                                        overflow:
+                                            TextOverflow
+                                                .ellipsis, // Ensures title doesn't overflow
+                                      ),
+                                    ),
+
+                                    SizedBox(width: 16),
+                                    Container(
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
+                                      height: 40,
+                                      child: TextField(
+                                        controller:
+                                            searchInternationalController,
+                                        onChanged: handleInternationalFilter,
+                                        decoration: InputDecoration(
+                                          hintText: "Search ...",
+                                          hintStyle: TextStyle(
+                                            fontSize: 12,
+                                            color: Color(0xFF9E9DBD),
+                                          ),
+                                          prefixIcon: Icon(
+                                            Icons.search,
+                                            color: Color(0xFF9E9DBD),
+                                            size: 18,
+                                          ),
+                                          border: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                          ),
+                                          enabledBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade200,
+                                              width: 0.5,
+                                            ),
+                                          ),
+                                          focusedBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade300,
+                                              width: 1,
                                             ),
-                                            overflow: TextOverflow.ellipsis, // Ensures title doesn't overflow
                                           ),
                                         ),
-
-
-                                        SizedBox(width: 16),
-                                        Container(
-                                          width: MediaQuery.of(context).size.width * 0.2,
-                                          height: 40,
-                                          child: TextField(
-                                            controller: searchInternationalController,
-                                            onChanged: handleInternationalFilter,
-                                            decoration: InputDecoration(
-                                              hintText: "Search ...",
-                                              hintStyle: TextStyle(
-                                                fontSize: 12,
-                                                color: Color(0xFF9E9DBD),
-                                              ),
-                                              prefixIcon: Icon(
-                                                Icons.search,
-                                                color: Color(0xFF9E9DBD),
-                                                size: 18,
-                                              ),
-                                              border: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                              ),
-                                              enabledBorder: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                                borderSide: BorderSide(
-                                                  color: Colors.grey.shade200,
-                                                  width: 0.5,
-                                                ),
-                                              ),
-                                              focusedBorder: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                                borderSide: BorderSide(
-                                                  color: Colors.grey.shade300,
-                                                  width: 1,
-                                                ),
-                                              ),
-                                            ),
-                                            style: GoogleFonts.poppins(fontSize: 12),
-                                          ),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
                                         ),
-                                      ])
+                                      ),
+                                    ),
+                                  ],
+                                ),
                               ),
                               Container(
                                 height:
@@ -1207,293 +1337,296 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                                   builder: (context, constraints) {
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
-                                    List<Map<String, dynamic>> newInternationalData =filteredInternational.isNotEmpty ? filteredInternational : internationalData;
+                                    List<Map<String, dynamic>>
+                                    newInternationalData =
+                                        filteredInternational.isNotEmpty
+                                            ? filteredInternational
+                                            : internationalData;
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedInternational =
-                                    newInternationalData
+                                        newInternationalData
                                             .skip(currentPage2 * itemsPerPage2)
                                             .take(itemsPerPage2)
                                             .toList();
 
-                                    return ((searchInternationalController.text.isNotEmpty && filteredInternational.isEmpty)
+                                    return ((searchInternationalController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredInternational.isEmpty)
                                         ? Center(
-                                      child: Text(
-                                        "No data found",
-                                        style: GoogleFonts.poppins(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.w500,
-                                        ),
-                                      ),
-                                    )
+                                          child: Text(
+                                            "No data found",
+                                            style: GoogleFonts.poppins(
+                                              fontSize: 14,
+                                              fontWeight: FontWeight.w500,
+                                            ),
+                                          ),
+                                        )
                                         : Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
+                                          children: [
+                                            Expanded(
                                               child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
                                                   ),
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Id',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Employee Code',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'SO Number',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Department',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Flight Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Sector',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Class',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Travel Date',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedInternational.map((
-                                                        entry,
-                                                      ) {
-                                                        final TravelDate =
-                                                            DateFormat(
-                                                              'dd-MM-yyyy',
-                                                            ).format(
-                                                              DateTime.parse(
-                                                                entry['flight_travel_date'],
-                                                              ),
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Flight Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Sector',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Class',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Travel Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedInternational.map((
+                                                            entry,
+                                                          ) {
+                                                            final TravelDate =
+                                                                DateFormat(
+                                                                  'dd-MM-yyyy',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['flight_travel_date'],
+                                                                  ),
+                                                                );
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['sector']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['flight_class']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    TravelDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
                                                             );
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_id']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['employee_code']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['so_number']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['functional_department']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['sector']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_class']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                TravelDate,
-                                                                style:
-                                                                    GoogleFonts.poppins(
-                                                                      fontSize:
-                                                                          12,
-                                                                    ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage2,
-                                          itemsPerPage: itemsPerPage2,
-                                          totalItems: internationalData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage2 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage2 = items;
-                                              currentPage2 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage2,
+                                              itemsPerPage: itemsPerPage2,
+                                              totalItems:
+                                                  internationalData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage2 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage2 = items;
+                                                  currentPage2 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -1510,28 +1643,28 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
       ),
     );
   }
-  Widget buildTitle(bool isDesktop){
+
+  Widget buildTitle(bool isDesktop) {
     return // Left side: Breadcrumb inside a Container (optional)
-      Container(
-        child: BreadcrumbNavigation(
-          isDesktop: isDesktop,
-          breadcrumbItems: [
-            BreadcrumbItem(
-                title: 'Report List',
-                tooltip: 'Go To Report List',
-                onTap: (context) {
-                  // Navigator.pushNamed(context, '/report');
-                  context.go("/report");
-                }
-            ),
-            BreadcrumbItem(
-              title: 'MIS Air Report ',
-            ),
-          ],
-        ),
-      );
+    Container(
+      child: BreadcrumbNavigation(
+        isDesktop: isDesktop,
+        breadcrumbItems: [
+          BreadcrumbItem(
+            title: 'Report List',
+            tooltip: 'Go To Report List',
+            onTap: (context) {
+              // Navigator.pushNamed(context, '/report');
+              context.go("/report");
+            },
+          ),
+          BreadcrumbItem(title: 'MIS Air Report '),
+        ],
+      ),
+    );
   }
-  Widget buildExports(bool isDesktop){
+
+  Widget buildExports(bool isDesktop) {
     return Row(
       children: [
         ElevatedButton(
@@ -1541,10 +1674,7 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
               borderRadius: BorderRadius.circular(8),
               side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
-            padding: EdgeInsets.symmetric(
-              horizontal: 20,
-              vertical: 12,
-            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
           ),
           onPressed: handleDownload,
           child: Row(
@@ -1557,11 +1687,7 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                 ),
               ),
               SizedBox(width: 8),
-              Icon(
-                Icons.file_present_outlined,
-                size: 15,
-                color: Colors.white,
-              ),
+              Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
             ],
           ),
         ),
@@ -1594,14 +1720,14 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
         // ),
       ],
     );
-
   }
 
   Widget buildFromDateField(bool isDesktop) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "From Date *",
+        Text(
+          "From Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1643,12 +1769,9 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                       fontSize: 12,
                       color: Colors.grey,
                     ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: const EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: const EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: const Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1675,7 +1798,8 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "To Date *",
+        Text(
+          "To Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1691,13 +1815,10 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
             height: 40,
             child: GestureDetector(
               onTap: () async {
-                final fromDateText =
-                    textControllers["from_date"]?.text;
+                final fromDateText = textControllers["from_date"]?.text;
                 DateTime? mintoDate;
                 if (fromDateText != null && fromDateText.isNotEmpty) {
-                  mintoDate = DateFormat(
-                    'dd-MM-yyyy',
-                  ).parse(fromDateText);
+                  mintoDate = DateFormat('dd-MM-yyyy').parse(fromDateText);
                 }
 
                 final pickedDate = await showDatePicker(
@@ -1722,16 +1843,10 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
                   style: const TextStyle(fontSize: 12),
                   decoration: const InputDecoration(
                     labelText: "Select Date",
-                    labelStyle: TextStyle(
-                      fontSize: 12,
-                      color: Colors.grey,
-                    ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    labelStyle: TextStyle(fontSize: 12, color: Colors.grey),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1750,8 +1865,7 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
             style: const TextStyle(color: Colors.red, fontSize: 12),
             maxLines: 2, // Allow it to wrap onto two lines
             overflow:
-            TextOverflow
-                .ellipsis, // Add ellipsis if it still overflows
+                TextOverflow.ellipsis, // Add ellipsis if it still overflows
           ),
         ],
       ],
@@ -1759,47 +1873,38 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
   }
 
   Widget buildSearchButton(bool isDesktop) {
-    return
-      Padding(
-        padding: isDesktop
-            ? const EdgeInsets.only(top: 22)
-            : EdgeInsets.zero,
-        child: SizedBox(
-          width: isDesktop ? null : double.infinity,
-          child: ElevatedButton(
-            style: ElevatedButton.styleFrom(
-              backgroundColor: Color(0xFF114D8B),
-              foregroundColor: Colors.white,
-              disabledBackgroundColor: Color(0xFF114D8B),
-              disabledForegroundColor: Colors.white,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(8),
-                side: BorderSide(color: Color(0xFF114D8B), width: 2),
-              ),
-              padding: EdgeInsets.symmetric(
-                horizontal: 20,
-                vertical: 12,
-              ),
-            ),
-            onPressed: () {
-              handleSubmit();
-            },
-            child: Row(
-              mainAxisSize:
-              MainAxisSize.min, // Ensures content fits nicely
-              children: [
-                Text(
-                  "Search",
-                  style: GoogleFonts.poppins(
-                    fontSize: isDesktop ? 13 : 11,
-                  ),
-                ),
-                SizedBox(width: 8), // spacing between icon and text
-                Icon(Icons.search, size: 15, color: Colors.white),
-              ],
+    return Padding(
+      padding: isDesktop ? const EdgeInsets.only(top: 22) : EdgeInsets.zero,
+      child: SizedBox(
+        width: isDesktop ? null : double.infinity,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Color(0xFF114D8B),
+            foregroundColor: Colors.white,
+            disabledBackgroundColor: Color(0xFF114D8B),
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+          ),
+          onPressed: () {
+            handleSubmit();
+          },
+          child: Row(
+            mainAxisSize: MainAxisSize.min, // Ensures content fits nicely
+            children: [
+              Text(
+                "Search",
+                style: GoogleFonts.poppins(fontSize: isDesktop ? 13 : 11),
+              ),
+              SizedBox(width: 8), // spacing between icon and text
+              Icon(Icons.search, size: 15, color: Colors.white),
+            ],
           ),
         ),
-      );
+      ),
+    );
   }
 }
diff --git a/lib/Screens/reports/misForex.dart b/lib/Screens/reports/misForex.dart
index 09c3b83..8b4ce5d 100644
--- a/lib/Screens/reports/misForex.dart
+++ b/lib/Screens/reports/misForex.dart
@@ -78,7 +78,6 @@ class _MISforexState extends State<MISforex>
       focusStates["from_date"] = false;
     }
 
-
     // Add focus listeners
     focusNodes.forEach((key, focusNode) {
       _addFocusListener(focusNode, (focus) {
@@ -92,7 +91,6 @@ class _MISforexState extends State<MISforex>
     // fetchMISforexReport();
   }
 
-
   void _addFocusListener(FocusNode node, Function(bool) updateState) {
     node.addListener(() {
       setState(() {
@@ -243,9 +241,7 @@ class _MISforexState extends State<MISforex>
       setState(() {
         // domesticData = List<Map<String, dynamic>>.from(result['data']['domestic'] ?? []);
         internationalData = List<Map<String, dynamic>>.from(
-          result['status'] == 'success'
-              ? result['data'] ?? []
-              : [],
+          result['status'] == 'success' ? result['data'] ?? [] : [],
         );
 
         filteredInternational = internationalData;
@@ -299,13 +295,13 @@ class _MISforexState extends State<MISforex>
       excelName,
     );
 
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Colors.green,
-        content: Text(result as String),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
+    // ScaffoldMessenger.of(context).showSnackBar(
+    //   SnackBar(
+    //     backgroundColor: result['status'] ? Colors.green : Colors.red,
+    //     content: Text(result['message']),
+    //     behavior: SnackBarBehavior.floating,
+    //   ),
+    // );
   }
 
   void handleInternationalFilter(String query) {
@@ -313,19 +309,60 @@ class _MISforexState extends State<MISforex>
     setState(() {
       filteredInternational =
           internationalData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['passenger_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['visiting_country']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['amount']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['forex_from_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['forex_to_date']?.toLowerCase().contains(lowerQuery));
+            final fromDateRaw = object['forex_from_date'];
+            String newFromDate = '';
+
+            if (fromDateRaw != null && fromDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(fromDateRaw);
+                newFromDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                newFromDate = fromDateRaw;
+              }
+            }
+
+            final toDateRaw = object['flight_travel_date'];
+            String newToDate = '';
+
+            if (toDateRaw != null && toDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(toDateRaw);
+                newToDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                newToDate = toDateRaw;
+              }
+            }
+
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['passenger_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['visiting_country']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['amount']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (newFromDate.toLowerCase().contains(lowerQuery)) ||
+                (newToDate.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage = 0;
     });
-    print("handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}");
+    print(
+      "handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}",
+    );
   }
 
   @override
@@ -391,25 +428,25 @@ class _MISforexState extends State<MISforex>
           // ------------------- First Row -------------------
           // ------------------- First Row -------------------
           Container(
-              color: Colors.white,
-              child:
-              isDesktop
-                  ? Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  buildTitle(isDesktop),
-                  Spacer(),
-                  buildExports(isDesktop)
-                ],
-              )
-                  : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  buildTitle(isDesktop),
-                  SizedBox(height: 8),
-                  buildExports(isDesktop)
-                ],
-              )
+            color: Colors.white,
+            child:
+                isDesktop
+                    ? Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        buildTitle(isDesktop),
+                        Spacer(),
+                        buildExports(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildTitle(isDesktop),
+                        SizedBox(height: 8),
+                        buildExports(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -417,27 +454,27 @@ class _MISforexState extends State<MISforex>
           Container(
             color: Colors.white,
             child:
-            isDesktop
-                ? Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                Spacer(),
-                buildToDateField(isDesktop),
-                Spacer(), // Space after Last Name
-                buildSearchButton(isDesktop),
-              ],
-            )
-                : Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                SizedBox(height: 8), // Vertical space
-                buildToDateField(isDesktop),
-                SizedBox(height: 8),
-                buildSearchButton(isDesktop),
-              ],
-            ),
+                isDesktop
+                    ? Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        Spacer(),
+                        buildToDateField(isDesktop),
+                        Spacer(), // Space after Last Name
+                        buildSearchButton(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        SizedBox(height: 8), // Vertical space
+                        buildToDateField(isDesktop),
+                        SizedBox(height: 8),
+                        buildSearchButton(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -450,13 +487,34 @@ class _MISforexState extends State<MISforex>
                     internationalData.isEmpty
                         ? Center(
                           child: Padding(
-                            padding: EdgeInsets.all(16),
-                            child: Text(
-                              "No data found",
-                              style: GoogleFonts.poppins(
-                                fontSize: 14,
-                                fontWeight: FontWeight.w500,
-                              ),
+                            padding: const EdgeInsets.all(16.0),
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                SizedBox(
+                                  height:
+                                      MediaQuery.of(context).size.height / 4,
+                                ),
+                                Text(
+                                  "No Records Found",
+                                  textAlign: TextAlign.center,
+                                  style: GoogleFonts.poppins(
+                                    fontSize: 20,
+                                    fontWeight: FontWeight.w500,
+                                    color: Colors.black54,
+                                  ),
+                                ),
+                                const SizedBox(height: 10),
+                                Text(
+                                  "Please ensure the selected dates contain report data.",
+                                  textAlign: TextAlign.center,
+                                  style: GoogleFonts.poppins(
+                                    fontSize: 12,
+                                    fontWeight: FontWeight.w500,
+                                    color: Colors.black54,
+                                  ),
+                                ),
+                              ],
                             ),
                           ),
                         )
@@ -469,64 +527,74 @@ class _MISforexState extends State<MISforex>
                                 horizontal: 16.0,
                                 vertical: 8,
                               ),
-                                child: Row(
-                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                    crossAxisAlignment: CrossAxisAlignment.center,
-                                    children: [
-                                      /// Title on the left
-                                      Expanded(
-                                        child: Text(
-                                          "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
-                                          style: GoogleFonts.poppins(
-                                            fontSize: 13,
-                                            fontWeight: FontWeight.w500,
-                                            color: Colors.grey[700],
+                              child: Row(
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceBetween,
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                children: [
+                                  /// Title on the left
+                                  Expanded(
+                                    child: Text(
+                                      "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                                      style: GoogleFonts.poppins(
+                                        fontSize: 13,
+                                        fontWeight: FontWeight.w500,
+                                        color: Colors.grey[700],
+                                      ),
+                                      overflow:
+                                          TextOverflow
+                                              .ellipsis, // Ensures title doesn't overflow
+                                    ),
+                                  ),
+
+                                  SizedBox(width: 16),
+                                  Container(
+                                    width:
+                                        MediaQuery.of(context).size.width * 0.2,
+                                    height: 40,
+                                    child: TextField(
+                                      controller: searchInternationalController,
+                                      onChanged: handleInternationalFilter,
+                                      decoration: InputDecoration(
+                                        hintText: "Search ...",
+                                        hintStyle: TextStyle(
+                                          fontSize: 12,
+                                          color: Color(0xFF9E9DBD),
+                                        ),
+                                        prefixIcon: Icon(
+                                          Icons.search,
+                                          color: Color(0xFF9E9DBD),
+                                          size: 18,
+                                        ),
+                                        border: OutlineInputBorder(
+                                          borderRadius: BorderRadius.circular(
+                                            12,
+                                          ),
+                                        ),
+                                        enabledBorder: OutlineInputBorder(
+                                          borderRadius: BorderRadius.circular(
+                                            12,
+                                          ),
+                                          borderSide: BorderSide(
+                                            color: Colors.grey.shade200,
+                                            width: 0.5,
+                                          ),
+                                        ),
+                                        focusedBorder: OutlineInputBorder(
+                                          borderRadius: BorderRadius.circular(
+                                            12,
+                                          ),
+                                          borderSide: BorderSide(
+                                            color: Colors.grey.shade300,
+                                            width: 1,
                                           ),
-                                          overflow: TextOverflow.ellipsis, // Ensures title doesn't overflow
                                         ),
                                       ),
-
-
-                                      SizedBox(width: 16),
-                                      Container(
-                                        width: MediaQuery.of(context).size.width * 0.2,
-                                        height: 40,
-                                        child: TextField(
-                                          controller: searchInternationalController,
-                                          onChanged: handleInternationalFilter,
-                                          decoration: InputDecoration(
-                                            hintText: "Search ...",
-                                            hintStyle: TextStyle(
-                                              fontSize: 12,
-                                              color: Color(0xFF9E9DBD),
-                                            ),
-                                            prefixIcon: Icon(
-                                              Icons.search,
-                                              color: Color(0xFF9E9DBD),
-                                              size: 18,
-                                            ),
-                                            border: OutlineInputBorder(
-                                              borderRadius: BorderRadius.circular(12),
-                                            ),
-                                            enabledBorder: OutlineInputBorder(
-                                              borderRadius: BorderRadius.circular(12),
-                                              borderSide: BorderSide(
-                                                color: Colors.grey.shade200,
-                                                width: 0.5,
-                                              ),
-                                            ),
-                                            focusedBorder: OutlineInputBorder(
-                                              borderRadius: BorderRadius.circular(12),
-                                              borderSide: BorderSide(
-                                                color: Colors.grey.shade300,
-                                                width: 1,
-                                              ),
-                                            ),
-                                          ),
-                                          style: GoogleFonts.poppins(fontSize: 12),
-                                        ),
-                                      ),
-                                    ])
+                                      style: GoogleFonts.poppins(fontSize: 12),
+                                    ),
+                                  ),
+                                ],
+                              ),
                             ),
                             // Table container
                             Container(
@@ -539,286 +607,335 @@ class _MISforexState extends State<MISforex>
                                 builder: (context, constraints) {
                                   final double minWidth =
                                       isDesktop ? constraints.maxWidth : 1300;
-                                  List<Map<String, dynamic>> newInternationalData =filteredInternational.isNotEmpty ? filteredInternational : internationalData;
+                                  List<Map<String, dynamic>>
+                                  newInternationalData =
+                                      filteredInternational.isNotEmpty
+                                          ? filteredInternational
+                                          : internationalData;
                                   // Pagination logic
                                   List<Map<String, dynamic>>
                                   paginatedInternational =
-                                  newInternationalData
+                                      newInternationalData
                                           .skip(currentPage * itemsPerPage)
                                           .take(itemsPerPage)
                                           .toList();
 
-                                  return ((searchInternationalController.text.isNotEmpty && filteredInternational.isEmpty)
+                                  return ((searchInternationalController
+                                              .text
+                                              .isNotEmpty &&
+                                          filteredInternational.isEmpty)
                                       ? Center(
-                                    child: Text(
-                                      "No data found",
-                                      style: GoogleFonts.poppins(
-                                        fontSize: 14,
-                                        fontWeight: FontWeight.w500,
-                                      ),
-                                    ),
-                                  )
-                                      :Column(
-                                    children: [
-                                      Expanded(
-                                        child: SingleChildScrollView(
-                                          scrollDirection: Axis.horizontal,
-                                          child: ConstrainedBox(
-                                            constraints: BoxConstraints(
-                                              minWidth: minWidth,
-                                            ),
+                                        child: Padding(
+                                          padding: const EdgeInsets.all(16.0),
+                                          child: Column(
+                                            mainAxisSize: MainAxisSize.min,
+                                            children: [
+                                              SizedBox(
+                                                height:
+                                                    MediaQuery.of(
+                                                      context,
+                                                    ).size.height /
+                                                    4,
+                                              ),
+                                              Text(
+                                                "No Records Found",
+                                                textAlign: TextAlign.center,
+                                                style: GoogleFonts.poppins(
+                                                  fontSize: 20,
+                                                  fontWeight: FontWeight.w500,
+                                                  color: Colors.black54,
+                                                ),
+                                              ),
+                                              const SizedBox(height: 10),
+                                              Text(
+                                                "Please ensure the selected dates contain report data.",
+                                                textAlign: TextAlign.center,
+                                                style: GoogleFonts.poppins(
+                                                  fontSize: 12,
+                                                  fontWeight: FontWeight.w500,
+                                                  color: Colors.black54,
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                        ),
+                                      )
+                                      : Column(
+                                        children: [
+                                          Expanded(
                                             child: SingleChildScrollView(
-                                              scrollDirection: Axis.vertical,
-                                              child: DataTable(
-                                                dividerThickness: 0.5,
-                                                columnSpacing:
-                                                    isDesktop ? 30.0 : 24.0,
-                                                border: TableBorder(
-                                                  horizontalInside: BorderSide(
-                                                    width: 0.5,
-                                                    color: Colors.grey.shade200,
+                                              scrollDirection: Axis.horizontal,
+                                              child: ConstrainedBox(
+                                                constraints: BoxConstraints(
+                                                  minWidth: minWidth,
+                                                ),
+                                                child: SingleChildScrollView(
+                                                  scrollDirection:
+                                                      Axis.vertical,
+                                                  child: DataTable(
+                                                    dividerThickness: 0.5,
+                                                    columnSpacing:
+                                                        isDesktop ? 30.0 : 24.0,
+                                                    border: TableBorder(
+                                                      horizontalInside:
+                                                          BorderSide(
+                                                            width: 0.5,
+                                                            color:
+                                                                Colors
+                                                                    .grey
+                                                                    .shade200,
+                                                          ),
+                                                    ),
+                                                    columns: [
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'Plan Id',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'Employee Code',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'Passenger Name',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'SO Number',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'Department',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'Country',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'From Date',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'To Date',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                      DataColumn(
+                                                        label: Text(
+                                                          'Amount',
+                                                          style:
+                                                              GoogleFonts.poppins(
+                                                                fontSize: 12,
+                                                                fontWeight:
+                                                                    FontWeight
+                                                                        .w600,
+                                                              ),
+                                                        ),
+                                                      ),
+                                                    ],
+                                                    rows:
+                                                        paginatedInternational.map((
+                                                          entry,
+                                                        ) {
+                                                          final forexFromDate =
+                                                              DateFormat(
+                                                                'dd-MM-yyyy',
+                                                              ).format(
+                                                                DateTime.parse(
+                                                                  entry['forex_from_date'],
+                                                                ),
+                                                              );
+                                                          final forexToDate =
+                                                              DateFormat(
+                                                                'dd-MM-yyyy',
+                                                              ).format(
+                                                                DateTime.parse(
+                                                                  entry['forex_to_date'],
+                                                                ),
+                                                              );
+                                                          return DataRow(
+                                                            cells: [
+                                                              DataCell(
+                                                                Text(
+                                                                  '${entry['plan_id']}',
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  '${entry['employee_code']}',
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  '${entry['passenger_name']}',
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  '${entry['so_number']}',
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  '${entry['functional_department']}',
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  '${entry['visiting_country']}',
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  forexFromDate,
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  forexToDate,
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                              DataCell(
+                                                                Text(
+                                                                  '${entry['amount']}',
+                                                                  style:
+                                                                      GoogleFonts.poppins(
+                                                                        fontSize:
+                                                                            12,
+                                                                      ),
+                                                                ),
+                                                              ),
+                                                            ],
+                                                          );
+                                                        }).toList(),
                                                   ),
                                                 ),
-                                                columns: [
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'Plan Id',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'Employee Code',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'Passenger Name',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'SO Number',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'Department',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'Country',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'From Date',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'To Date',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                  DataColumn(
-                                                    label: Text(
-                                                      'Amount',
-                                                      style:
-                                                          GoogleFonts.poppins(
-                                                            fontSize: 12,
-                                                            fontWeight:
-                                                                FontWeight.w600,
-                                                          ),
-                                                    ),
-                                                  ),
-                                                ],
-                                                rows:
-                                                    paginatedInternational.map((
-                                                      entry,
-                                                    ) {
-                                                      final forexFromDate =
-                                                          DateFormat(
-                                                            'dd-MM-yyyy',
-                                                          ).format(
-                                                            DateTime.parse(
-                                                              entry['forex_from_date'],
-                                                            ),
-                                                          );
-                                                      final forexToDate =
-                                                          DateFormat(
-                                                            'dd-MM-yyyy',
-                                                          ).format(
-                                                            DateTime.parse(
-                                                              entry['forex_to_date'],
-                                                            ),
-                                                          );
-                                                      return DataRow(
-                                                        cells: [
-                                                          DataCell(
-                                                            Text(
-                                                              '${entry['plan_id']}',
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              '${entry['employee_code']}',
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              '${entry['passenger_name']}',
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              '${entry['so_number']}',
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              '${entry['functional_department']}',
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              '${entry['visiting_country']}',
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              forexFromDate,
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              forexToDate,
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                          DataCell(
-                                                            Text(
-                                                              '${entry['amount']}',
-                                                              style:
-                                                                  GoogleFonts.poppins(
-                                                                    fontSize:
-                                                                        12,
-                                                                  ),
-                                                            ),
-                                                          ),
-                                                        ],
-                                                      );
-                                                    }).toList(),
                                               ),
                                             ),
                                           ),
-                                        ),
-                                      ),
-                                      PaginationControls(
-                                        currentPage: currentPage,
-                                        itemsPerPage: itemsPerPage,
-                                        totalItems: newInternationalData.length,
-                                        activeColor: layoutColor,
-                                        onPageChanged: (page) {
-                                          setState(() {
-                                            currentPage = page;
-                                          });
-                                        },
-                                        onItemsPerPageChanged: (items) {
-                                          setState(() {
-                                            itemsPerPage = items;
-                                            currentPage = 0;
-                                          });
-                                        },
-                                      ),
-                                    ],
-                                  ));
+                                          PaginationControls(
+                                            currentPage: currentPage,
+                                            itemsPerPage: itemsPerPage,
+                                            totalItems:
+                                                newInternationalData.length,
+                                            activeColor: layoutColor,
+                                            onPageChanged: (page) {
+                                              setState(() {
+                                                currentPage = page;
+                                              });
+                                            },
+                                            onItemsPerPageChanged: (items) {
+                                              setState(() {
+                                                itemsPerPage = items;
+                                                currentPage = 0;
+                                              });
+                                            },
+                                          ),
+                                        ],
+                                      ));
                                 },
                               ),
                             ),
@@ -832,28 +949,28 @@ class _MISforexState extends State<MISforex>
       ),
     );
   }
-  Widget buildTitle(bool isDesktop){
+
+  Widget buildTitle(bool isDesktop) {
     return // Left side: Breadcrumb inside a Container (optional)
-      Container(
-        child: BreadcrumbNavigation(
-          isDesktop: isDesktop,
-          breadcrumbItems: [
-            BreadcrumbItem(
-                title: 'Report List',
-                tooltip: 'Go To Report List',
-                onTap: (context) {
-                  // Navigator.pushNamed(context, '/report');
-                  context.go("/report");
-                }
-            ),
-            BreadcrumbItem(
-              title: 'MIS Forex Report ',
-            ),
-          ],
-        ),
-      );
+    Container(
+      child: BreadcrumbNavigation(
+        isDesktop: isDesktop,
+        breadcrumbItems: [
+          BreadcrumbItem(
+            title: 'Report List',
+            tooltip: 'Go To Report List',
+            onTap: (context) {
+              // Navigator.pushNamed(context, '/report');
+              context.go("/report");
+            },
+          ),
+          BreadcrumbItem(title: 'MIS Forex Report '),
+        ],
+      ),
+    );
   }
-  Widget buildExports(bool isDesktop){
+
+  Widget buildExports(bool isDesktop) {
     return Row(
       children: [
         ElevatedButton(
@@ -863,10 +980,7 @@ class _MISforexState extends State<MISforex>
               borderRadius: BorderRadius.circular(8),
               side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
-            padding: EdgeInsets.symmetric(
-              horizontal: 20,
-              vertical: 12,
-            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
           ),
           onPressed: handleDownload,
           child: Row(
@@ -879,11 +993,7 @@ class _MISforexState extends State<MISforex>
                 ),
               ),
               SizedBox(width: 8),
-              Icon(
-                Icons.file_present_outlined,
-                size: 15,
-                color: Colors.white,
-              ),
+              Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
             ],
           ),
         ),
@@ -916,14 +1026,14 @@ class _MISforexState extends State<MISforex>
         // ),
       ],
     );
-
   }
 
   Widget buildFromDateField(bool isDesktop) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "From Date *",
+        Text(
+          "From Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -965,12 +1075,9 @@ class _MISforexState extends State<MISforex>
                       fontSize: 12,
                       color: Colors.grey,
                     ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: const EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: const EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: const Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -997,7 +1104,8 @@ class _MISforexState extends State<MISforex>
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "To Date *",
+        Text(
+          "To Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1013,13 +1121,10 @@ class _MISforexState extends State<MISforex>
             height: 40,
             child: GestureDetector(
               onTap: () async {
-                final fromDateText =
-                    textControllers["from_date"]?.text;
+                final fromDateText = textControllers["from_date"]?.text;
                 DateTime? mintoDate;
                 if (fromDateText != null && fromDateText.isNotEmpty) {
-                  mintoDate = DateFormat(
-                    'dd-MM-yyyy',
-                  ).parse(fromDateText);
+                  mintoDate = DateFormat('dd-MM-yyyy').parse(fromDateText);
                 }
 
                 final pickedDate = await showDatePicker(
@@ -1044,16 +1149,10 @@ class _MISforexState extends State<MISforex>
                   style: const TextStyle(fontSize: 12),
                   decoration: const InputDecoration(
                     labelText: "Select Date",
-                    labelStyle: TextStyle(
-                      fontSize: 12,
-                      color: Colors.grey,
-                    ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    labelStyle: TextStyle(fontSize: 12, color: Colors.grey),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1072,8 +1171,7 @@ class _MISforexState extends State<MISforex>
             style: const TextStyle(color: Colors.red, fontSize: 12),
             maxLines: 2, // Allow it to wrap onto two lines
             overflow:
-            TextOverflow
-                .ellipsis, // Add ellipsis if it still overflows
+                TextOverflow.ellipsis, // Add ellipsis if it still overflows
           ),
         ],
       ],
@@ -1081,47 +1179,38 @@ class _MISforexState extends State<MISforex>
   }
 
   Widget buildSearchButton(bool isDesktop) {
-    return
-      Padding(
-        padding: isDesktop
-            ? const EdgeInsets.only(top: 22)
-            : EdgeInsets.zero,
-        child: SizedBox(
-          width: isDesktop ? null : double.infinity,
-          child: ElevatedButton(
-            style: ElevatedButton.styleFrom(
-              backgroundColor: Color(0xFF114D8B),
-              foregroundColor: Colors.white,
-              disabledBackgroundColor: Color(0xFF114D8B),
-              disabledForegroundColor: Colors.white,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(8),
-                side: BorderSide(color: Color(0xFF114D8B), width: 2),
-              ),
-              padding: EdgeInsets.symmetric(
-                horizontal: 20,
-                vertical: 12,
-              ),
-            ),
-            onPressed: () {
-              handleSubmit();
-            },
-            child: Row(
-              mainAxisSize:
-              MainAxisSize.min, // Ensures content fits nicely
-              children: [
-                Text(
-                  "Search",
-                  style: GoogleFonts.poppins(
-                    fontSize: isDesktop ? 13 : 11,
-                  ),
-                ),
-                SizedBox(width: 8), // spacing between icon and text
-                Icon(Icons.search, size: 15, color: Colors.white),
-              ],
+    return Padding(
+      padding: isDesktop ? const EdgeInsets.only(top: 22) : EdgeInsets.zero,
+      child: SizedBox(
+        width: isDesktop ? null : double.infinity,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Color(0xFF114D8B),
+            foregroundColor: Colors.white,
+            disabledBackgroundColor: Color(0xFF114D8B),
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+          ),
+          onPressed: () {
+            handleSubmit();
+          },
+          child: Row(
+            mainAxisSize: MainAxisSize.min, // Ensures content fits nicely
+            children: [
+              Text(
+                "Search",
+                style: GoogleFonts.poppins(fontSize: isDesktop ? 13 : 11),
+              ),
+              SizedBox(width: 8), // spacing between icon and text
+              Icon(Icons.search, size: 15, color: Colors.white),
+            ],
           ),
         ),
-      );
+      ),
+    );
   }
 }
diff --git a/lib/Screens/reports/misHotel.dart b/lib/Screens/reports/misHotel.dart
index b47891f..989a77f 100644
--- a/lib/Screens/reports/misHotel.dart
+++ b/lib/Screens/reports/misHotel.dart
@@ -36,7 +36,6 @@ class _MIShotelState extends State<MIShotel>
   String? roleUser;
   String? token;
 
-
   Color? layoutColor;
   Color? bodyColor;
 
@@ -113,9 +112,12 @@ class _MIShotelState extends State<MIShotel>
 
   String getTabName(int index) {
     switch (index) {
-      case 0: return "domestic";
-      case 1: return "international";
-      default: return "domestic"; // return "Unknown";
+      case 0:
+        return "domestic";
+      case 1:
+        return "international";
+      default:
+        return "domestic"; // return "Unknown";
     }
   }
 
@@ -126,6 +128,7 @@ class _MIShotelState extends State<MIShotel>
       });
     });
   }
+
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
 
@@ -138,7 +141,6 @@ class _MIShotelState extends State<MIShotel>
     }
     if (!mounted) return;
     try {
-
       WidgetsBinding.instance.addPostFrameCallback((_) {
         loadInitialData();
       });
@@ -146,19 +148,22 @@ class _MIShotelState extends State<MIShotel>
       print("hotel report : $e");
     }
   }
+
   void loadInitialData() async {
     String? layoutString = await getLayoutColor();
     String? bodyStringColor = await getBodyColor();
 
-
     setState(() {
-      layoutColor = layoutString != null ? Color(int.parse(layoutString))
-          : Colors.redAccent;
+      layoutColor =
+          layoutString != null
+              ? Color(int.parse(layoutString))
+              : Colors.redAccent;
 
-      bodyColor = bodyStringColor != null ? Color(int.parse(bodyStringColor))
-          : Colors.white;
+      bodyColor =
+          bodyStringColor != null
+              ? Color(int.parse(bodyStringColor))
+              : Colors.white;
     });
-
   }
 
   Future<void> initializeData() async {
@@ -167,14 +172,12 @@ class _MIShotelState extends State<MIShotel>
     orgId = await getOrgId();
     roleUser = await getRoleUser();
 
-
     if (token == null || userId == null) {
       print("Token or USerId missing");
       return;
     }
   }
 
-
   Future<String?> getUserId() async {
     final prefs = await SharedPreferences.getInstance();
     final String? userDataString = prefs.getString('user_data');
@@ -210,7 +213,6 @@ class _MIShotelState extends State<MIShotel>
     return prefs.getString('auth_token');
   }
 
-
   Future<void> handleSubmit() async {
     errorMessages.remove("from_date");
     errorMessages.remove("to_date");
@@ -225,10 +227,16 @@ class _MIShotelState extends State<MIShotel>
     final fromDateText = textControllers["from_date"]?.text;
     final toDateText = textControllers["to_date"]?.text;
 
-    if (fromDateText == null || fromDateText.isEmpty ||
-        toDateText == null || toDateText.isEmpty) {
-      fromDateText == null || fromDateText.isEmpty ? errorMessages["from_date"] = "Required" : errorMessages.remove("from_date");
-      toDateText == null || toDateText.isEmpty ? errorMessages["to_date"] = "Required" : errorMessages.remove("to_date");
+    if (fromDateText == null ||
+        fromDateText.isEmpty ||
+        toDateText == null ||
+        toDateText.isEmpty) {
+      fromDateText == null || fromDateText.isEmpty
+          ? errorMessages["from_date"] = "Required"
+          : errorMessages.remove("from_date");
+      toDateText == null || toDateText.isEmpty
+          ? errorMessages["to_date"] = "Required"
+          : errorMessages.remove("to_date");
       setState(() {});
       return;
     }
@@ -244,7 +252,9 @@ class _MIShotelState extends State<MIShotel>
       setState(() {});
       return;
     }
-    setState(() { loaderFlag = true; });
+    setState(() {
+      loaderFlag = true;
+    });
 
     // Format for API request
     final formattedfromDate = DateFormat('yyyy-MM-dd').format(fromDate);
@@ -256,16 +266,21 @@ class _MIShotelState extends State<MIShotel>
     try {
       final result = await apiService.CallReports(
         'misHotelReport',
-        jsonEncode({"fromDate":'$formattedfromDate',"toDate":'$formattedtoDate'}),
+        jsonEncode({
+          "fromDate": '$formattedfromDate',
+          "toDate": '$formattedtoDate',
+        }),
       );
       setState(() {
         // domesticData = List<Map<String, dynamic>>.from(result['data']['domestic'] ?? []);
         domesticData = List<Map<String, dynamic>>.from(
-            result['status'] == 'success' ? result['data']['domestic'] ?? [] : []
+          result['status'] == 'success' ? result['data']['domestic'] ?? [] : [],
         );
 
         internationalData = List<Map<String, dynamic>>.from(
-            result['status'] == 'success' ? result['data']['international'] ?? [] : []
+          result['status'] == 'success'
+              ? result['data']['international'] ?? []
+              : [],
         );
 
         filteredDomestic = domesticData;
@@ -282,12 +297,11 @@ class _MIShotelState extends State<MIShotel>
     }
   }
 
-
-
   Future<void> handleDownload() async {
     final dateFormat = DateFormat('dd-MM-yyyy');
 
-    if (textControllers["from_date"]!.text.isEmpty || textControllers["to_date"]!.text.isEmpty) {
+    if (textControllers["from_date"]!.text.isEmpty ||
+        textControllers["to_date"]!.text.isEmpty) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
           backgroundColor: Colors.redAccent,
@@ -298,7 +312,9 @@ class _MIShotelState extends State<MIShotel>
       return;
     }
 
-    final DateTime fromDate = dateFormat.parse(textControllers["from_date"]!.text);
+    final DateTime fromDate = dateFormat.parse(
+      textControllers["from_date"]!.text,
+    );
     final DateTime toDate = dateFormat.parse(textControllers["to_date"]!.text);
 
     final formattedFromDate = DateFormat('yyyy-MM-dd').format(fromDate);
@@ -310,7 +326,7 @@ class _MIShotelState extends State<MIShotel>
     final excelName = '$safeName';
 
     final result = await apiService.reportExcelDownload(
-        'misHotelReport',
+      'misHotelReport',
       jsonEncode({
         "fromDate": formattedFromDate,
         "toDate": formattedToDate,
@@ -319,35 +335,72 @@ class _MIShotelState extends State<MIShotel>
       excelName,
     );
 
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Colors.green,
-        content: Text(result as String),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
+    // ScaffoldMessenger.of(context).showSnackBar(
+    //   SnackBar(
+    //     backgroundColor: result['status'] ? Colors.green : Colors.red,
+    //     content: Text(result['message']),
+    //     behavior: SnackBarBehavior.floating,
+    //   ),
+    // );
   }
 
   void handleDomesticFilter(String query) {
-
     final lowerQuery = query.toLowerCase();
     setState(() {
       filteredDomestic =
           domesticData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['hotel_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['check_in_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['check_out_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
+            final fromDateRaw = object['check_in_date'];
+            String newFromDate = '';
+
+            if (fromDateRaw != null && fromDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(fromDateRaw);
+                newFromDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                newFromDate = fromDateRaw;
+              }
+            }
+
+            final toDateRaw = object['check_out_date'];
+            String newToDate = '';
+
+            if (toDateRaw != null && toDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(toDateRaw);
+                newToDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                newToDate = toDateRaw;
+              }
+            }
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['hotel_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (newFromDate.toLowerCase().contains(lowerQuery)) ||
+                (newToDate.toLowerCase().contains(lowerQuery)) ||
                 (object['hotel_city']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage1 = 0;
     });
-    print("handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}");
+    print(
+      "handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}",
+    );
   }
 
   void handleInternationalFilter(String query) {
@@ -355,33 +408,69 @@ class _MIShotelState extends State<MIShotel>
     setState(() {
       filteredInternational =
           internationalData.where((object) {
-            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_code']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['employee_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['so_number']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['functional_department']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['hotel_name']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['check_in_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['check_out_date']?.toLowerCase().contains(lowerQuery) ?? false) ||
+            final fromDateRaw = object['check_in_date'];
+            String newFromDate = '';
+            if (fromDateRaw != null && fromDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(fromDateRaw);
+                newFromDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                newFromDate = fromDateRaw;
+              }
+            }
+
+            final toDateRaw = object['check_out_date'];
+            String newToDate = '';
+
+            if (toDateRaw != null && toDateRaw is String) {
+              try {
+                final parsedDate = DateTime.parse(toDateRaw);
+                newToDate =
+                    '${parsedDate.day.toString().padLeft(2, '0')}-${parsedDate.month.toString().padLeft(2, '0')}-${parsedDate.year}';
+              } catch (e) {
+                // fallback if date is not parsable
+                newToDate = toDateRaw;
+              }
+            }
+            return (object['plan_id']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_code']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['employee_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['so_number']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['functional_department']?.toLowerCase().contains(
+                      lowerQuery,
+                    ) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['hotel_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (newFromDate.toLowerCase().contains(lowerQuery)) ||
+                (newToDate.toLowerCase().contains(lowerQuery)) ||
                 (object['hotel_city']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage2 = 0;
     });
-    print("handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}");
+    print(
+      "handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}",
+    );
   }
 
-
   @override
   // Widget build(BuildContext context) {
   //   // TODO: implement build
   //   throw UnimplementedError();
   // }
-
   Widget build(BuildContext context) {
     return ResponsiveBuilder(
       builder: (context, sizingInfo) {
-        bool isDesktop = sizingInfo.deviceScreenType == DeviceScreenType.desktop;
+        bool isDesktop =
+            sizingInfo.deviceScreenType == DeviceScreenType.desktop;
 
         return Scaffold(
           backgroundColor: Color(0xFFf5f5f5),
@@ -389,21 +478,21 @@ class _MIShotelState extends State<MIShotel>
           drawer: CustomDrawer(isDesktop: false),
           body: Padding(
             padding:
-            isDesktop
-                ? EdgeInsets.symmetric(
-              horizontal:
-              MediaQuery.of(context).size.width *
-                  0.1, // 30% of screen width as horizontal padding
-              vertical:
-              MediaQuery.of(context).size.height *
-                  0, // 5% of screen height as vertical padding
-            )
-                : EdgeInsets.all(0),
+                isDesktop
+                    ? EdgeInsets.symmetric(
+                      horizontal:
+                          MediaQuery.of(context).size.width *
+                          0.1, // 30% of screen width as horizontal padding
+                      vertical:
+                          MediaQuery.of(context).size.height *
+                          0, // 5% of screen height as vertical padding
+                    )
+                    : EdgeInsets.all(0),
             child: Row(
               children: [
                 // if (isDesktop) CustomDrawer(isDesktop: true),
                 // const Expanded(child: Center(child: Text("User Page Content"))),
-                Expanded(child: buildMIShotelLayout(isDesktop))
+                Expanded(child: buildMIShotelLayout(isDesktop)),
               ],
             ),
           ),
@@ -413,7 +502,7 @@ class _MIShotelState extends State<MIShotel>
   }
 
   Widget buildMIShotelLayout(bool isDesktop) {
-    return Container( child: buildMIShotelFormLayout(isDesktop) );
+    return Container(child: buildMIShotelFormLayout(isDesktop));
   }
 
   Widget buildMIShotelFormLayout(bool isDesktop) {
@@ -421,13 +510,12 @@ class _MIShotelState extends State<MIShotel>
       margin: isDesktop ? EdgeInsets.all(10.0) : null,
       padding: const EdgeInsets.only(top: 5, bottom: 5, left: 20, right: 20),
       // color: Colors.brown,
-      height: isDesktop
-          ? MediaQuery.of(context).size.height * 1
-          : MediaQuery.of(context).size.height,
+      height:
+          isDesktop
+              ? MediaQuery.of(context).size.height * 1
+              : MediaQuery.of(context).size.height,
       decoration: BoxDecoration(
-        border: isDesktop
-            ? Border.all(width: 2, color: Colors.white)
-            : null,
+        border: isDesktop ? Border.all(width: 2, color: Colors.white) : null,
         color: isDesktop ? Colors.white : Color(0xFFFCFCFC),
       ),
       child: Column(
@@ -435,25 +523,25 @@ class _MIShotelState extends State<MIShotel>
         children: [
           // ------------------- First Row -------------------
           Container(
-              color: Colors.white,
-              child:
-              isDesktop
-                  ? Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  buildTitle(isDesktop),
-                  Spacer(),
-                  buildExports(isDesktop)
-                ],
-              )
-                  : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  buildTitle(isDesktop),
-                  SizedBox(height: 8),
-                  buildExports(isDesktop)
-                ],
-              )
+            color: Colors.white,
+            child:
+                isDesktop
+                    ? Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        buildTitle(isDesktop),
+                        Spacer(),
+                        buildExports(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildTitle(isDesktop),
+                        SizedBox(height: 8),
+                        buildExports(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -461,27 +549,27 @@ class _MIShotelState extends State<MIShotel>
           Container(
             color: Colors.white,
             child:
-            isDesktop
-                ? Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                Spacer(),
-                buildToDateField(isDesktop),
-                Spacer(), // Space after Last Name
-                buildSearchButton(isDesktop),
-              ],
-            )
-                : Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                SizedBox(height: 8), // Vertical space
-                buildToDateField(isDesktop),
-                SizedBox(height: 8),
-                buildSearchButton(isDesktop),
-              ],
-            ),
+                isDesktop
+                    ? Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        Spacer(),
+                        buildToDateField(isDesktop),
+                        Spacer(), // Space after Last Name
+                        buildSearchButton(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        SizedBox(height: 8), // Vertical space
+                        buildToDateField(isDesktop),
+                        SizedBox(height: 8),
+                        buildSearchButton(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -495,10 +583,7 @@ class _MIShotelState extends State<MIShotel>
                   labelColor: Colors.black,
                   unselectedLabelColor: Colors.grey,
                   indicatorColor: Color(0xFF114D8B),
-                  tabs: [
-                    Tab(text: "Domestic"),
-                    Tab(text: "International"),
-                  ],
+                  tabs: [Tab(text: "Domestic"), Tab(text: "International")],
                 ),
                 SizedBox(height: 5),
                 Container(
@@ -512,420 +597,757 @@ class _MIShotelState extends State<MIShotel>
                           ? Center(child: CircularProgressIndicator())
                           : domesticData.isEmpty
                           ? Center(
-                        child: Padding(
-                          padding: EdgeInsets.all(16),
-                          child: Text(
-                            "No data found",
-                            style: GoogleFonts.poppins(fontSize: 14, fontWeight: FontWeight.w500),
-                          ),
-                        ),
-                      )
-                          : Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                /// Title on the left
-                                Expanded(
-                                  child: Text(
-                                    "Domestic Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                            child: Padding(
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
                                     style: GoogleFonts.poppins(
-                                      fontSize: 13,
+                                      fontSize: 20,
                                       fontWeight: FontWeight.w500,
-                                      color: Colors.grey[700],
+                                      color: Colors.black54,
                                     ),
-                                    overflow: TextOverflow.ellipsis,  // Ensures title doesn't overflow
                                   ),
-                                ),
-                                Container(
-                                  width: MediaQuery.of(context).size.width * 0.2,
-                                  height: 40,
-                                  child: TextField(
-                                    controller: searchDomesticController,
-                                    onChanged: handleDomesticFilter,
-                                    decoration: InputDecoration(
-                                      hintText: "Search ...",
-                                      hintStyle: TextStyle(
-                                        fontSize: 12,
-                                        color: Color(0xFF9E9DBD),
-                                      ),
-                                      prefixIcon: Icon(
-                                        Icons.search,
-                                        color: Color(0xFF9E9DBD),
-                                        size: 18,
-                                      ),
-                                      border: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(12),
-                                      ),
-                                      enabledBorder: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(12),
-                                        borderSide: BorderSide(
-                                          color: Colors.grey.shade200,
-                                          width: 0.5,
-                                        ),
-                                      ),
-                                      focusedBorder: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(12),
-                                        borderSide: BorderSide(
-                                          color: Colors.grey.shade300,
-                                          width: 1,
-                                        ),
-                                      ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
                                     ),
-                                    style: GoogleFonts.poppins(fontSize: 12),
                                   ),
-                                ),
-                                // SizedBox(width: 16),
-                                // /// Buttons on the right
-                                // Row(
-                                //   children: [
-                                //     ElevatedButton(
-                                //       style: ElevatedButton.styleFrom(
-                                //         backgroundColor: Color(0xFF114D8B),
-                                //         shape: RoundedRectangleBorder(
-                                //           borderRadius: BorderRadius.circular(8),
-                                //           side: BorderSide(color: Color(0xFF114D8B), width: 2),
-                                //         ),
-                                //         padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
-                                //       ),
-                                //       onPressed: handleDownload,
-                                //       child: Row(
-                                //         children: [
-                                //           Text(
-                                //             "Excel",
-                                //             style: GoogleFonts.poppins(
-                                //               fontSize: isDesktop ? 13 : 11,
-                                //               color: Colors.white,
-                                //             ),
-                                //           ),
-                                //           SizedBox(width: 8),
-                                //           Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
-                                //         ],
-                                //       ),
-                                //     ),
-                                //     SizedBox(width: 10),
-                                //     ElevatedButton(
-                                //       style: ElevatedButton.styleFrom(
-                                //         backgroundColor: Color(0xFF114D8B),
-                                //         shape: RoundedRectangleBorder(
-                                //           borderRadius: BorderRadius.circular(8),
-                                //           side: BorderSide(color: Color(0xFF114D8B), width: 2),
-                                //         ),
-                                //         padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
-                                //       ),
-                                //       onPressed: handleDownload,
-                                //       child: Row(
-                                //         children: [
-                                //           Text(
-                                //             "PDF",
-                                //             style: GoogleFonts.poppins(
-                                //               fontSize: isDesktop ? 13 : 11,
-                                //               color: Colors.white,
-                                //             ),
-                                //           ),
-                                //           SizedBox(width: 8),
-                                //           Icon(Icons.picture_as_pdf_outlined, size: 15, color: Colors.white),
-                                //         ],
-                                //       ),
-                                //     ),
-                                //   ],
-                                // ),
-                              ],
+                                ],
+                              ),
                             ),
-                          ),
-
-                          /* For pagination for list ... */
-                          // Expanded(
-                          //   child: SingleChildScrollView(
-                          //     scrollDirection: Axis.horizontal,
-                          //     child: SingleChildScrollView(
-                          //       scrollDirection: Axis.vertical,
-                          //         child: DataTable(
-                          //       dividerThickness: 0.5,
-                          //       columnSpacing: isDesktop ? 30.0 : 24.0,
-                          //       border: TableBorder(
-                          //         horizontalInside: BorderSide(
-                          //           width: 0.5,
-                          //           color: Colors.grey.shade200,
-                          //         ),
-                          //       ),
-                          //       columns: [
-                          //         DataColumn(label: Text('Plan Id', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Flight Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //       ],
-                          //       rows: domesticData.map((entry) {
-                          //         return DataRow(cells: [
-                          //           DataCell(Text('${entry['plan_id']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['flight_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //         ]);
-                          //       }).toList(),
-                          //     ),
-                          //     ),
-                          //   ),
-                          // ),
-                          // -------- Table with Pagination --------
-                          Expanded(
-                            child: LayoutBuilder(
-                              builder: (context, constraints) {
-                                final double minWidth = isDesktop ? constraints.maxWidth : 1300;
-
-                                List<Map<String, dynamic>> newDomesticData =filteredDomestic.isNotEmpty ? filteredDomestic : domesticData;
-
-
-                                // Pagination logic
-                                List<Map<String, dynamic>>
-                                paginatedDomestic =
-                                newDomesticData
-                                    .skip(currentPage1 * itemsPerPage1)
-                                    .take(itemsPerPage1)
-                                    .toList();
-
-                                return (
-                                    (searchDomesticController.text.isNotEmpty && filteredDomestic.isEmpty)
-                                        ? Center(
-                                      child: Text(
-                                        "No data found",
-                                        style: GoogleFonts.poppins(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.w500,
-                                        ),
-                                      ),
-                                    )
-                                        :  Column(
+                          )
+                          : Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 16.0,
+                                  vertical: 8,
+                                ),
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  crossAxisAlignment: CrossAxisAlignment.center,
                                   children: [
+                                    /// Title on the left
                                     Expanded(
-                                      child: SingleChildScrollView(
-                                        scrollDirection: Axis.horizontal,
-                                        child: ConstrainedBox(
-                                          constraints: BoxConstraints(minWidth: minWidth),
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.vertical,
-                                            child: DataTable(
-                                              dividerThickness: 0.5,
-                                              columnSpacing: isDesktop ? 30.0 : 24.0,
-                                              border: TableBorder(
-                                                horizontalInside: BorderSide(
-                                                  width: 0.5,
-                                                  color: Colors.grey.shade200,
-                                                ),
-                                              ),
-                                              // rows: paginatedDomestic
-                                              columns: [
-                                                DataColumn(label: Text('Plan Id', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Employee Name', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Hotel Name', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Hotel City', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Check In Date', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Check Out Date', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                              ],
-                                              rows: paginatedDomestic.map((entry) {
-                                                final checkInDate = DateFormat('dd-MM-yyyy').format(DateTime.parse(entry['check_in_date']));
-                                                final checkOutDate = DateFormat('dd-MM-yyyy').format(DateTime.parse(entry['check_out_date']));
-
-                                                return DataRow(cells: [
-                                                  DataCell(Text('${entry['plan_id']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['employee_name']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['hotel_name']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['hotel_city']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text(checkInDate, style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text(checkOutDate, style: GoogleFonts.poppins(fontSize: 12))),
-
-                                                ]);
-                                              }).toList(),
-
+                                      child: Text(
+                                        "Domestic Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 13,
+                                          fontWeight: FontWeight.w500,
+                                          color: Colors.grey[700],
+                                        ),
+                                        overflow:
+                                            TextOverflow
+                                                .ellipsis, // Ensures title doesn't overflow
+                                      ),
+                                    ),
+                                    Container(
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
+                                      height: 40,
+                                      child: TextField(
+                                        controller: searchDomesticController,
+                                        onChanged: handleDomesticFilter,
+                                        decoration: InputDecoration(
+                                          hintText: "Search ...",
+                                          hintStyle: TextStyle(
+                                            fontSize: 12,
+                                            color: Color(0xFF9E9DBD),
+                                          ),
+                                          prefixIcon: Icon(
+                                            Icons.search,
+                                            color: Color(0xFF9E9DBD),
+                                            size: 18,
+                                          ),
+                                          border: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                          ),
+                                          enabledBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade200,
+                                              width: 0.5,
+                                            ),
+                                          ),
+                                          focusedBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade300,
+                                              width: 1,
                                             ),
                                           ),
                                         ),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
+                                        ),
                                       ),
                                     ),
-
-                                    // Pagination controls
-                                    PaginationControls(
-                                      currentPage: currentPage1,
-                                      itemsPerPage: itemsPerPage1,
-                                      totalItems: newDomesticData.length,
-                                      activeColor: layoutColor,
-                                      onPageChanged: (page) {
-                                        setState(() {
-                                          currentPage1 = page;
-                                        });
-                                      },
-                                      onItemsPerPageChanged: (items) {
-                                        setState(() {
-                                          itemsPerPage1 = items;
-                                          currentPage1 = 0;
-                                        });
-                                      },
-                                    ),
+                                    // SizedBox(width: 16),
+                                    // /// Buttons on the right
+                                    // Row(
+                                    //   children: [
+                                    //     ElevatedButton(
+                                    //       style: ElevatedButton.styleFrom(
+                                    //         backgroundColor: Color(0xFF114D8B),
+                                    //         shape: RoundedRectangleBorder(
+                                    //           borderRadius: BorderRadius.circular(8),
+                                    //           side: BorderSide(color: Color(0xFF114D8B), width: 2),
+                                    //         ),
+                                    //         padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                                    //       ),
+                                    //       onPressed: handleDownload,
+                                    //       child: Row(
+                                    //         children: [
+                                    //           Text(
+                                    //             "Excel",
+                                    //             style: GoogleFonts.poppins(
+                                    //               fontSize: isDesktop ? 13 : 11,
+                                    //               color: Colors.white,
+                                    //             ),
+                                    //           ),
+                                    //           SizedBox(width: 8),
+                                    //           Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
+                                    //         ],
+                                    //       ),
+                                    //     ),
+                                    //     SizedBox(width: 10),
+                                    //     ElevatedButton(
+                                    //       style: ElevatedButton.styleFrom(
+                                    //         backgroundColor: Color(0xFF114D8B),
+                                    //         shape: RoundedRectangleBorder(
+                                    //           borderRadius: BorderRadius.circular(8),
+                                    //           side: BorderSide(color: Color(0xFF114D8B), width: 2),
+                                    //         ),
+                                    //         padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                                    //       ),
+                                    //       onPressed: handleDownload,
+                                    //       child: Row(
+                                    //         children: [
+                                    //           Text(
+                                    //             "PDF",
+                                    //             style: GoogleFonts.poppins(
+                                    //               fontSize: isDesktop ? 13 : 11,
+                                    //               color: Colors.white,
+                                    //             ),
+                                    //           ),
+                                    //           SizedBox(width: 8),
+                                    //           Icon(Icons.picture_as_pdf_outlined, size: 15, color: Colors.white),
+                                    //         ],
+                                    //       ),
+                                    //     ),
+                                    //   ],
+                                    // ),
                                   ],
-                                ));
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
+                                ),
+                              ),
 
+                              /* For pagination for list ... */
+                              // Expanded(
+                              //   child: SingleChildScrollView(
+                              //     scrollDirection: Axis.horizontal,
+                              //     child: SingleChildScrollView(
+                              //       scrollDirection: Axis.vertical,
+                              //         child: DataTable(
+                              //       dividerThickness: 0.5,
+                              //       columnSpacing: isDesktop ? 30.0 : 24.0,
+                              //       border: TableBorder(
+                              //         horizontalInside: BorderSide(
+                              //           width: 0.5,
+                              //           color: Colors.grey.shade200,
+                              //         ),
+                              //       ),
+                              //       columns: [
+                              //         DataColumn(label: Text('Plan Id', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Flight Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //       ],
+                              //       rows: domesticData.map((entry) {
+                              //         return DataRow(cells: [
+                              //           DataCell(Text('${entry['plan_id']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['flight_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //         ]);
+                              //       }).toList(),
+                              //     ),
+                              //     ),
+                              //   ),
+                              // ),
+                              // -------- Table with Pagination --------
+                              Expanded(
+                                child: LayoutBuilder(
+                                  builder: (context, constraints) {
+                                    final double minWidth =
+                                        isDesktop ? constraints.maxWidth : 1300;
+
+                                    List<Map<String, dynamic>> newDomesticData =
+                                        filteredDomestic.isNotEmpty
+                                            ? filteredDomestic
+                                            : domesticData;
+
+                                    // Pagination logic
+                                    List<Map<String, dynamic>>
+                                    paginatedDomestic =
+                                        newDomesticData
+                                            .skip(currentPage1 * itemsPerPage1)
+                                            .take(itemsPerPage1)
+                                            .toList();
+
+                                    return ((searchDomesticController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredDomestic.isEmpty)
+                                        ? Center(
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        )
+                                        : Column(
+                                          children: [
+                                            Expanded(
+                                              child: SingleChildScrollView(
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
+                                                  ),
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
+                                                            ),
+                                                      ),
+                                                      // rows: paginatedDomestic
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Name',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Sector',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Hotel Name',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Hotel City',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Check In Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Check Out Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedDomestic.map((
+                                                            entry,
+                                                          ) {
+                                                            final checkInDate =
+                                                                DateFormat(
+                                                                  'dd-MM-yyyy',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['check_in_date'],
+                                                                  ),
+                                                                );
+                                                            final checkOutDate =
+                                                                DateFormat(
+                                                                  'dd-MM-yyyy',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['check_out_date'],
+                                                                  ),
+                                                                );
+
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_name']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['sector']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['hotel_name']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['hotel_city']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    checkInDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    checkOutDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
+                                                            );
+                                                          }).toList(),
+                                                    ),
+                                                  ),
+                                                ),
+                                              ),
+                                            ),
+
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage1,
+                                              itemsPerPage: itemsPerPage1,
+                                              totalItems:
+                                                  newDomesticData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage1 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage1 = items;
+                                                  currentPage1 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
+                                  },
+                                ),
+                              ),
+                            ],
+                          ),
 
                       // International Tab
                       internationalData.isEmpty
                           ? Center(
-                        child: Padding(
-                          padding: EdgeInsets.all(16),
-                          child: Text(
-                            "No data found",
-                            style: GoogleFonts.poppins(fontSize: 14, fontWeight: FontWeight.w500),
-                          ),
-                        ),
-                      )
+                            child: Padding(
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          )
                           : Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          // Padding(
-                          //   padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
-                          //   child: Row(
-                          //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          //     crossAxisAlignment: CrossAxisAlignment.center,
-                          //     children: [
-                          //       /// Title on the left
-                          //       Expanded(
-                          //         child: Text(
-                          //           "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
-                          //           style: GoogleFonts.poppins(
-                          //             fontSize: 13,
-                          //             fontWeight: FontWeight.w500,
-                          //             color: Colors.grey[700],
-                          //           ),
-                          //           overflow: TextOverflow.ellipsis,  // Ensures title doesn't overflow
-                          //         ),
-                          //       ),
-                          //       SizedBox(width: 16),
-                          //       /// Buttons on the right
-                          //       Row(
-                          //         children: [
-                          //           ElevatedButton(
-                          //             style: ElevatedButton.styleFrom(
-                          //               backgroundColor: Color(0xFF114D8B),
-                          //               shape: RoundedRectangleBorder(
-                          //                 borderRadius: BorderRadius.circular(8),
-                          //                 side: BorderSide(color: Color(0xFF114D8B), width: 2),
-                          //               ),
-                          //               padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
-                          //             ),
-                          //             onPressed: () {
-                          //               // Excel export logic
-                          //             },
-                          //             child: Row(
-                          //               children: [
-                          //                 Text(
-                          //                   "Excel",
-                          //                   style: GoogleFonts.poppins(
-                          //                     fontSize: isDesktop ? 13 : 11,
-                          //                     color: Colors.white,
-                          //                   ),
-                          //                 ),
-                          //                 SizedBox(width: 8),
-                          //                 Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
-                          //               ],
-                          //             ),
-                          //           ),
-                          //           SizedBox(width: 10),
-                          //           ElevatedButton(
-                          //             style: ElevatedButton.styleFrom(
-                          //               backgroundColor: Color(0xFF114D8B),
-                          //               shape: RoundedRectangleBorder(
-                          //                 borderRadius: BorderRadius.circular(8),
-                          //                 side: BorderSide(color: Color(0xFF114D8B), width: 2),
-                          //               ),
-                          //               padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
-                          //             ),
-                          //             onPressed: () {
-                          //               // PDF export logic
-                          //             },
-                          //             child: Row(
-                          //               children: [
-                          //                 Text(
-                          //                   "PDF",
-                          //                   style: GoogleFonts.poppins(
-                          //                     fontSize: isDesktop ? 13 : 11,
-                          //                     color: Colors.white,
-                          //                   ),
-                          //                 ),
-                          //                 SizedBox(width: 8),
-                          //                 Icon(Icons.picture_as_pdf_outlined, size: 15, color: Colors.white),
-                          //               ],
-                          //             ),
-                          //           ),
-                          //         ],
-                          //       ),
-                          //     ],
-                          //   ),
-                          // ),
-                          // Expanded(
-                          //   child: SingleChildScrollView(
-                          //   scrollDirection: Axis.horizontal,
-                          //   child: SingleChildScrollView(
-                          //     scrollDirection: Axis.vertical,
-                          //     child: DataTable(
-                          //       dividerThickness: 0.5,
-                          //       columnSpacing: isDesktop ? 24.0 : 16.0,
-                          //       border: TableBorder(
-                          //         horizontalInside: BorderSide(
-                          //           width: 0.5,
-                          //           color: Colors.grey.shade200,
-                          //         ),
-                          //       ),
-                          //       columns: [
-                          //         DataColumn(label: Text('Plan Id', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Flight Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //         DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                          //       ],
-                          //       rows: internationalData.map((entry) {
-                          //         return DataRow(cells: [
-                          //           DataCell(Text('${entry['plan_id']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['flight_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //           DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
-                          //         ]);
-                          //       }).toList(),
-                          //     ),
-                          //   ),
-                          //   ),
-                          // ),
-                          Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
-                              child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              // Padding(
+                              //   padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
+                              //   child: Row(
+                              //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              //     crossAxisAlignment: CrossAxisAlignment.center,
+                              //     children: [
+                              //       /// Title on the left
+                              //       Expanded(
+                              //         child: Text(
+                              //           "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                              //           style: GoogleFonts.poppins(
+                              //             fontSize: 13,
+                              //             fontWeight: FontWeight.w500,
+                              //             color: Colors.grey[700],
+                              //           ),
+                              //           overflow: TextOverflow.ellipsis,  // Ensures title doesn't overflow
+                              //         ),
+                              //       ),
+                              //       SizedBox(width: 16),
+                              //       /// Buttons on the right
+                              //       Row(
+                              //         children: [
+                              //           ElevatedButton(
+                              //             style: ElevatedButton.styleFrom(
+                              //               backgroundColor: Color(0xFF114D8B),
+                              //               shape: RoundedRectangleBorder(
+                              //                 borderRadius: BorderRadius.circular(8),
+                              //                 side: BorderSide(color: Color(0xFF114D8B), width: 2),
+                              //               ),
+                              //               padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                              //             ),
+                              //             onPressed: () {
+                              //               // Excel export logic
+                              //             },
+                              //             child: Row(
+                              //               children: [
+                              //                 Text(
+                              //                   "Excel",
+                              //                   style: GoogleFonts.poppins(
+                              //                     fontSize: isDesktop ? 13 : 11,
+                              //                     color: Colors.white,
+                              //                   ),
+                              //                 ),
+                              //                 SizedBox(width: 8),
+                              //                 Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
+                              //               ],
+                              //             ),
+                              //           ),
+                              //           SizedBox(width: 10),
+                              //           ElevatedButton(
+                              //             style: ElevatedButton.styleFrom(
+                              //               backgroundColor: Color(0xFF114D8B),
+                              //               shape: RoundedRectangleBorder(
+                              //                 borderRadius: BorderRadius.circular(8),
+                              //                 side: BorderSide(color: Color(0xFF114D8B), width: 2),
+                              //               ),
+                              //               padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                              //             ),
+                              //             onPressed: () {
+                              //               // PDF export logic
+                              //             },
+                              //             child: Row(
+                              //               children: [
+                              //                 Text(
+                              //                   "PDF",
+                              //                   style: GoogleFonts.poppins(
+                              //                     fontSize: isDesktop ? 13 : 11,
+                              //                     color: Colors.white,
+                              //                   ),
+                              //                 ),
+                              //                 SizedBox(width: 8),
+                              //                 Icon(Icons.picture_as_pdf_outlined, size: 15, color: Colors.white),
+                              //               ],
+                              //             ),
+                              //           ),
+                              //         ],
+                              //       ),
+                              //     ],
+                              //   ),
+                              // ),
+                              // Expanded(
+                              //   child: SingleChildScrollView(
+                              //   scrollDirection: Axis.horizontal,
+                              //   child: SingleChildScrollView(
+                              //     scrollDirection: Axis.vertical,
+                              //     child: DataTable(
+                              //       dividerThickness: 0.5,
+                              //       columnSpacing: isDesktop ? 24.0 : 16.0,
+                              //       border: TableBorder(
+                              //         horizontalInside: BorderSide(
+                              //           width: 0.5,
+                              //           color: Colors.grey.shade200,
+                              //         ),
+                              //       ),
+                              //       columns: [
+                              //         DataColumn(label: Text('Plan Id', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Flight Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //         DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
+                              //       ],
+                              //       rows: internationalData.map((entry) {
+                              //         return DataRow(cells: [
+                              //           DataCell(Text('${entry['plan_id']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['flight_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //           DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
+                              //         ]);
+                              //       }).toList(),
+                              //     ),
+                              //   ),
+                              //   ),
+                              // ),
+                              Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 16.0,
+                                  vertical: 8,
+                                ),
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
                                   crossAxisAlignment: CrossAxisAlignment.center,
                                   children: [
                                     /// Title on the left
@@ -937,17 +1359,21 @@ class _MIShotelState extends State<MIShotel>
                                           fontWeight: FontWeight.w500,
                                           color: Colors.grey[700],
                                         ),
-                                        overflow: TextOverflow.ellipsis, // Ensures title doesn't overflow
+                                        overflow:
+                                            TextOverflow
+                                                .ellipsis, // Ensures title doesn't overflow
                                       ),
                                     ),
 
-
                                     SizedBox(width: 16),
                                     Container(
-                                      width: MediaQuery.of(context).size.width * 0.2,
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
                                       height: 40,
                                       child: TextField(
-                                        controller: searchInternationalController,
+                                        controller:
+                                            searchInternationalController,
                                         onChanged: handleInternationalFilter,
                                         decoration: InputDecoration(
                                           hintText: "Search ...",
@@ -961,131 +1387,421 @@ class _MIShotelState extends State<MIShotel>
                                             size: 18,
                                           ),
                                           border: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                           ),
                                           enabledBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade200,
                                               width: 0.5,
                                             ),
                                           ),
                                           focusedBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade300,
                                               width: 1,
                                             ),
                                           ),
                                         ),
-                                        style: GoogleFonts.poppins(fontSize: 12),
-                                      ),
-                                    ),
-                                  ])
-                          ),
-                          Container(
-                            height : isDesktop ? MediaQuery.of(context).size.height * 0.51 : 200,
-                            // color:Colors.amberAccent,
-                            child: LayoutBuilder(
-                              builder: (context, constraints) {
-                                final double minWidth = isDesktop ? constraints.maxWidth : 1300;
-                                List<Map<String, dynamic>> newInternationalData =filteredInternational.isNotEmpty ? filteredInternational : internationalData;
-                                // Pagination logic
-                                List<Map<String, dynamic>> paginatedInternational = newInternationalData
-                                    .skip(currentPage2 * itemsPerPage2)
-                                    .take(itemsPerPage2)
-                                    .toList();
-
-                                return ((searchInternationalController.text.isNotEmpty && filteredInternational.isEmpty)
-                                    ? Center(
-                                  child: Text(
-                                    "No data found",
-                                    style: GoogleFonts.poppins(
-                                      fontSize: 14,
-                                      fontWeight: FontWeight.w500,
-                                    ),
-                                  ),
-                                )
-                                    : Column(
-                                  children: [
-                                    Expanded(
-                                      child: SingleChildScrollView(
-                                        scrollDirection: Axis.horizontal,
-                                        child: ConstrainedBox(
-                                          constraints: BoxConstraints(minWidth: minWidth),
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.vertical,
-                                            child: DataTable(
-                                              dividerThickness: 0.5,
-                                              columnSpacing: isDesktop ? 30.0 : 24.0,
-                                              border: TableBorder(
-                                                horizontalInside: BorderSide(
-                                                  width: 0.5,
-                                                  color: Colors.grey.shade200,
-                                                ),
-                                              ),
-                                              // rows: paginatedInternational
-                                              columns: [
-                                                DataColumn(label: Text('Plan Id', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Employee Code', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Employee Name', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('SO Number', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Department', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Plan Trip Type', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Sector', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Hotel Name', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Hotel City', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Check In Date', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                                DataColumn(label: Text('Check Out Date', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))),
-                                              ],
-                                              rows: paginatedInternational.map((entry) {
-                                                final checkInDate = DateFormat('dd-MM-yyyy').format(DateTime.parse(entry['check_in_date']));
-                                                final checkOutDate = DateFormat('dd-MM-yyyy').format(DateTime.parse(entry['check_out_date']));
-                                                return DataRow(cells: [
-                                                  DataCell(Text('${entry['plan_id']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['employee_code']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['employee_name']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['so_number']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['functional_department']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['plan_trip_type']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['sector']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['hotel_name']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text('${entry['hotel_city']}', style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text(checkInDate, style: GoogleFonts.poppins(fontSize: 12))),
-                                                  DataCell(Text(checkOutDate, style: GoogleFonts.poppins(fontSize: 12))),
-                                                ]);
-                                              }).toList(),
-                                            ),
-                                          ),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
                                         ),
                                       ),
                                     ),
-
-                                    // Pagination controls
-                                    PaginationControls(
-                                      currentPage: currentPage2,
-                                      itemsPerPage: itemsPerPage2,
-                                      totalItems: newInternationalData.length,
-                                      activeColor: layoutColor,
-                                      onPageChanged: (page) {
-                                        setState(() {
-                                          currentPage2 = page;
-                                        });
-                                      },
-                                      onItemsPerPageChanged: (items) {
-                                        setState(() {
-                                          itemsPerPage2 = items;
-                                          currentPage2 = 0;
-                                        });
-                                      },
-                                    ),
                                   ],
-                                ));
-                              },
-                            ),
+                                ),
+                              ),
+                              Container(
+                                height:
+                                    isDesktop
+                                        ? MediaQuery.of(context).size.height *
+                                            0.51
+                                        : 200,
+                                // color:Colors.amberAccent,
+                                child: LayoutBuilder(
+                                  builder: (context, constraints) {
+                                    final double minWidth =
+                                        isDesktop ? constraints.maxWidth : 1300;
+                                    List<Map<String, dynamic>>
+                                    newInternationalData =
+                                        filteredInternational.isNotEmpty
+                                            ? filteredInternational
+                                            : internationalData;
+                                    // Pagination logic
+                                    List<Map<String, dynamic>>
+                                    paginatedInternational =
+                                        newInternationalData
+                                            .skip(currentPage2 * itemsPerPage2)
+                                            .take(itemsPerPage2)
+                                            .toList();
+
+                                    return ((searchInternationalController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredInternational.isEmpty)
+                                        ? Center(
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        )
+                                        : Column(
+                                          children: [
+                                            Expanded(
+                                              child: SingleChildScrollView(
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
+                                                  ),
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
+                                                            ),
+                                                      ),
+                                                      // rows: paginatedInternational
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Id',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Code',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Employee Name',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'SO Number',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Department',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Sector',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Hotel Name',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Hotel City',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Check In Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Check Out Date',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedInternational.map((
+                                                            entry,
+                                                          ) {
+                                                            final checkInDate =
+                                                                DateFormat(
+                                                                  'dd-MM-yyyy',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['check_in_date'],
+                                                                  ),
+                                                                );
+                                                            final checkOutDate =
+                                                                DateFormat(
+                                                                  'dd-MM-yyyy',
+                                                                ).format(
+                                                                  DateTime.parse(
+                                                                    entry['check_out_date'],
+                                                                  ),
+                                                                );
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_id']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_code']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['employee_name']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['so_number']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['functional_department']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['sector']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['hotel_name']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['hotel_city']}',
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    checkInDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    checkOutDate,
+                                                                    style: GoogleFonts.poppins(
+                                                                      fontSize:
+                                                                          12,
+                                                                    ),
+                                                                  ),
+                                                                ),
+                                                              ],
+                                                            );
+                                                          }).toList(),
+                                                    ),
+                                                  ),
+                                                ),
+                                              ),
+                                            ),
+
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage2,
+                                              itemsPerPage: itemsPerPage2,
+                                              totalItems:
+                                                  newInternationalData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage2 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage2 = items;
+                                                  currentPage2 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
+                                  },
+                                ),
+                              ),
+                            ],
                           ),
-                        ],
-                      ),
                     ],
                   ),
                 ),
@@ -1097,28 +1813,28 @@ class _MIShotelState extends State<MIShotel>
       ),
     );
   }
-  Widget buildTitle(bool isDesktop){
+
+  Widget buildTitle(bool isDesktop) {
     return // Left side: Breadcrumb inside a Container (optional)
-      Container(
-        child: BreadcrumbNavigation(
-          isDesktop: isDesktop,
-          breadcrumbItems: [
-            BreadcrumbItem(
-                title: 'Report List',
-                tooltip: 'Go To Report List',
-                onTap: (context) {
-                  // Navigator.pushNamed(context, '/report');
-                  context.go("/report");
-                }
-            ),
-            BreadcrumbItem(
-              title: 'MIS Hotel Report ',
-            ),
-          ],
-        ),
-      );
+    Container(
+      child: BreadcrumbNavigation(
+        isDesktop: isDesktop,
+        breadcrumbItems: [
+          BreadcrumbItem(
+            title: 'Report List',
+            tooltip: 'Go To Report List',
+            onTap: (context) {
+              // Navigator.pushNamed(context, '/report');
+              context.go("/report");
+            },
+          ),
+          BreadcrumbItem(title: 'MIS Hotel Report '),
+        ],
+      ),
+    );
   }
-  Widget buildExports(bool isDesktop){
+
+  Widget buildExports(bool isDesktop) {
     return Row(
       children: [
         ElevatedButton(
@@ -1128,10 +1844,7 @@ class _MIShotelState extends State<MIShotel>
               borderRadius: BorderRadius.circular(8),
               side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
-            padding: EdgeInsets.symmetric(
-              horizontal: 20,
-              vertical: 12,
-            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
           ),
           onPressed: handleDownload,
           child: Row(
@@ -1144,11 +1857,7 @@ class _MIShotelState extends State<MIShotel>
                 ),
               ),
               SizedBox(width: 8),
-              Icon(
-                Icons.file_present_outlined,
-                size: 15,
-                color: Colors.white,
-              ),
+              Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
             ],
           ),
         ),
@@ -1181,14 +1890,14 @@ class _MIShotelState extends State<MIShotel>
         // ),
       ],
     );
-
   }
 
   Widget buildFromDateField(bool isDesktop) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "From Date *",
+        Text(
+          "From Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1230,12 +1939,9 @@ class _MIShotelState extends State<MIShotel>
                       fontSize: 12,
                       color: Colors.grey,
                     ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: const EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: const EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: const Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1262,7 +1968,8 @@ class _MIShotelState extends State<MIShotel>
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "To Date *",
+        Text(
+          "To Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1278,13 +1985,10 @@ class _MIShotelState extends State<MIShotel>
             height: 40,
             child: GestureDetector(
               onTap: () async {
-                final fromDateText =
-                    textControllers["from_date"]?.text;
+                final fromDateText = textControllers["from_date"]?.text;
                 DateTime? mintoDate;
                 if (fromDateText != null && fromDateText.isNotEmpty) {
-                  mintoDate = DateFormat(
-                    'dd-MM-yyyy',
-                  ).parse(fromDateText);
+                  mintoDate = DateFormat('dd-MM-yyyy').parse(fromDateText);
                 }
 
                 final pickedDate = await showDatePicker(
@@ -1309,16 +2013,10 @@ class _MIShotelState extends State<MIShotel>
                   style: const TextStyle(fontSize: 12),
                   decoration: const InputDecoration(
                     labelText: "Select Date",
-                    labelStyle: TextStyle(
-                      fontSize: 12,
-                      color: Colors.grey,
-                    ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    labelStyle: TextStyle(fontSize: 12, color: Colors.grey),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1337,8 +2035,7 @@ class _MIShotelState extends State<MIShotel>
             style: const TextStyle(color: Colors.red, fontSize: 12),
             maxLines: 2, // Allow it to wrap onto two lines
             overflow:
-            TextOverflow
-                .ellipsis, // Add ellipsis if it still overflows
+                TextOverflow.ellipsis, // Add ellipsis if it still overflows
           ),
         ],
       ],
@@ -1346,47 +2043,38 @@ class _MIShotelState extends State<MIShotel>
   }
 
   Widget buildSearchButton(bool isDesktop) {
-    return
-      Padding(
-        padding: isDesktop
-            ? const EdgeInsets.only(top: 22)
-            : EdgeInsets.zero,
-        child: SizedBox(
-          width: isDesktop ? null : double.infinity,
-          child: ElevatedButton(
-            style: ElevatedButton.styleFrom(
-              backgroundColor: Color(0xFF114D8B),
-              foregroundColor: Colors.white,
-              disabledBackgroundColor: Color(0xFF114D8B),
-              disabledForegroundColor: Colors.white,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(8),
-                side: BorderSide(color: Color(0xFF114D8B), width: 2),
-              ),
-              padding: EdgeInsets.symmetric(
-                horizontal: 20,
-                vertical: 12,
-              ),
-            ),
-            onPressed: () {
-              handleSubmit();
-            },
-            child: Row(
-              mainAxisSize:
-              MainAxisSize.min, // Ensures content fits nicely
-              children: [
-                Text(
-                  "Search",
-                  style: GoogleFonts.poppins(
-                    fontSize: isDesktop ? 13 : 11,
-                  ),
-                ),
-                SizedBox(width: 8), // spacing between icon and text
-                Icon(Icons.search, size: 15, color: Colors.white),
-              ],
+    return Padding(
+      padding: isDesktop ? const EdgeInsets.only(top: 22) : EdgeInsets.zero,
+      child: SizedBox(
+        width: isDesktop ? null : double.infinity,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Color(0xFF114D8B),
+            foregroundColor: Colors.white,
+            disabledBackgroundColor: Color(0xFF114D8B),
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+          ),
+          onPressed: () {
+            handleSubmit();
+          },
+          child: Row(
+            mainAxisSize: MainAxisSize.min, // Ensures content fits nicely
+            children: [
+              Text(
+                "Search",
+                style: GoogleFonts.poppins(fontSize: isDesktop ? 13 : 11),
+              ),
+              SizedBox(width: 8), // spacing between icon and text
+              Icon(Icons.search, size: 15, color: Colors.white),
+            ],
           ),
         ),
-      );
+      ),
+    );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Screens/reports/servicesAnalysis.dart b/lib/Screens/reports/servicesAnalysis.dart
index 057894e..a4b170e 100644
--- a/lib/Screens/reports/servicesAnalysis.dart
+++ b/lib/Screens/reports/servicesAnalysis.dart
@@ -112,9 +112,12 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
 
   String getTabName(int index) {
     switch (index) {
-      case 0: return "domestic";
-      case 1: return "international";
-      default: return "domestic"; // return "Unknown";
+      case 0:
+        return "domestic";
+      case 1:
+        return "international";
+      default:
+        return "domestic"; // return "Unknown";
     }
   }
 
@@ -331,13 +334,13 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
       excelName,
     );
 
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Colors.green,
-        content: Text(result as String),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
+    // ScaffoldMessenger.of(context).showSnackBar(
+    //   SnackBar(
+    //     backgroundColor: result['status'] ? Colors.green : Colors.red,
+    //     content: Text(result['message']),
+    //     behavior: SnackBarBehavior.floating,
+    //   ),
+    // );
   }
 
   void handleDomesticFilter(String query) {
@@ -345,13 +348,17 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
     setState(() {
       filteredDomestic =
           domesticData.where((object) {
-            return (object['Service']?.toLowerCase().contains(lowerQuery) ?? false) ||
-                (object['flight_service_count']?.toLowerCase().contains(lowerQuery) ?? false) ||
+            return (object['Service']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['service_count']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
                 (object['plan_trip_type']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage1 = 0;
     });
-    print("handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}");
+    print(
+      "handleDomesticFilter > Total entries: ${filteredDomestic?.length ?? 0}",
+    );
   }
 
   void handleInternationalFilter(String query) {
@@ -359,16 +366,19 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
     setState(() {
       filteredInternational =
           internationalData.where((object) {
-            return (object['Service']?.toLowerCase().contains(lowerQuery) ?? false) ||
-            (object['flight_service_count']?.toLowerCase().contains(lowerQuery) ?? false) ||
-            (object['plan_trip_type']?.toLowerCase().contains(lowerQuery));
+            return (object['Service']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['service_count']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (object['plan_trip_type']?.toLowerCase().contains(lowerQuery));
           }).toList();
       currentPage2 = 0;
     });
-    print("handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}");
+    print(
+      "handleInternationalFilter > Total entries: ${filteredInternational?.length ?? 0}",
+    );
   }
 
-
   @override
   // Widget build(BuildContext context) {
   //   // TODO: implement build
@@ -429,28 +439,27 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          // ------------------- First Row -------------------
           // ------------------- First Row -------------------
           Container(
-              color: Colors.white,
-              child:
-              isDesktop
-                  ? Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  buildTitle(isDesktop),
-                  Spacer(),
-                  buildExports(isDesktop)
-                ],
-              )
-                  : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  buildTitle(isDesktop),
-                  SizedBox(height: 8),
-                  buildExports(isDesktop)
-                ],
-              )
+            color: Colors.white,
+            child:
+                isDesktop
+                    ? Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        buildTitle(isDesktop),
+                        Spacer(),
+                        buildExports(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildTitle(isDesktop),
+                        SizedBox(height: 8),
+                        buildExports(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -458,27 +467,27 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
           Container(
             color: Colors.white,
             child:
-            isDesktop
-                ? Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                Spacer(),
-                buildToDateField(isDesktop),
-                Spacer(), // Space after Last Name
-                buildSearchButton(isDesktop),
-              ],
-            )
-                : Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                buildFromDateField(isDesktop),
-                SizedBox(height: 8), // Vertical space
-                buildToDateField(isDesktop),
-                SizedBox(height: 8),
-                buildSearchButton(isDesktop),
-              ],
-            ),
+                isDesktop
+                    ? Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        Spacer(),
+                        buildToDateField(isDesktop),
+                        Spacer(), // Space after Last Name
+                        buildSearchButton(isDesktop),
+                      ],
+                    )
+                    : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        buildFromDateField(isDesktop),
+                        SizedBox(height: 8), // Vertical space
+                        buildToDateField(isDesktop),
+                        SizedBox(height: 8),
+                        buildSearchButton(isDesktop),
+                      ],
+                    ),
           ),
           SizedBox(height: 5),
 
@@ -507,13 +516,34 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                           : domesticData.isEmpty
                           ? Center(
                             child: Padding(
-                              padding: EdgeInsets.all(16),
-                              child: Text(
-                                "No data found",
-                                style: GoogleFonts.poppins(
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                           )
@@ -545,7 +575,9 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                                       ),
                                     ),
                                     Container(
-                                      width: MediaQuery.of(context).size.width * 0.2,
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
                                       height: 40,
                                       child: TextField(
                                         controller: searchDomesticController,
@@ -562,24 +594,32 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                                             size: 18,
                                           ),
                                           border: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                           ),
                                           enabledBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade200,
                                               width: 0.5,
                                             ),
                                           ),
                                           focusedBorder: OutlineInputBorder(
-                                            borderRadius: BorderRadius.circular(12),
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
                                             borderSide: BorderSide(
                                               color: Colors.grey.shade300,
                                               width: 1,
                                             ),
                                           ),
                                         ),
-                                        style: GoogleFonts.poppins(fontSize: 12),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
+                                        ),
                                       ),
                                     ),
                                     // SizedBox(width: 16),
@@ -687,156 +727,189 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
 
-                                    List<Map<String, dynamic>> newDomesticData =filteredDomestic.isNotEmpty ? filteredDomestic : domesticData;
-
+                                    List<Map<String, dynamic>> newDomesticData =
+                                        filteredDomestic.isNotEmpty
+                                            ? filteredDomestic
+                                            : domesticData;
 
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedDomestic =
-                                    newDomesticData
-                                        .skip(currentPage1 * itemsPerPage1)
-                                        .take(itemsPerPage1)
-                                        .toList();
+                                        newDomesticData
+                                            .skip(currentPage1 * itemsPerPage1)
+                                            .take(itemsPerPage1)
+                                            .toList();
 
-                                    return (
-                                        (searchDomesticController.text.isNotEmpty && filteredDomestic.isEmpty)
-                                            ? Center(
-                                          child: Text(
-                                            "No data found",
-                                            style: GoogleFonts.poppins(
-                                              fontSize: 14,
-                                              fontWeight: FontWeight.w500,
+                                    return ((searchDomesticController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredDomestic.isEmpty)
+                                        ? Center(
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
                                             ),
                                           ),
                                         )
-                                            :  Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
+                                        : Column(
+                                          children: [
+                                            Expanded(
                                               child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
                                                   ),
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Service',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Count',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedDomestic.map((
-                                                        entry,
-                                                      ) {
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['Service']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Service',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Count',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedDomestic.map((
+                                                            entry,
+                                                          ) {
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['Service']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_service_count']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['service_count']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                                  ),
+                                                                ),
+                                                              ],
+                                                            );
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage1,
-                                          itemsPerPage: itemsPerPage1,
-                                          totalItems: newDomesticData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage1 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage1 = items;
-                                              currentPage1 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage1,
+                                              itemsPerPage: itemsPerPage1,
+                                              totalItems:
+                                                  newDomesticData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage1 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage1 = items;
+                                                  currentPage1 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -847,13 +920,34 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                       internationalData.isEmpty
                           ? Center(
                             child: Padding(
-                              padding: EdgeInsets.all(16),
-                              child: Text(
-                                "No data found",
-                                style: GoogleFonts.poppins(
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                              padding: const EdgeInsets.all(16.0),
+                              child: Column(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  SizedBox(
+                                    height:
+                                        MediaQuery.of(context).size.height / 4,
+                                  ),
+                                  Text(
+                                    "No Records Found",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 20,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 10),
+                                  Text(
+                                    "Please ensure the selected dates contain report data.",
+                                    textAlign: TextAlign.center,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                           )
@@ -983,64 +1077,78 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                                   horizontal: 16.0,
                                   vertical: 8,
                                 ),
-                                  child: Row(
-                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                      crossAxisAlignment: CrossAxisAlignment.center,
-                                      children: [
-                                        /// Title on the left
-                                        Expanded(
-                                          child: Text(
-                                            "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
-                                            style: GoogleFonts.poppins(
-                                              fontSize: 13,
-                                              fontWeight: FontWeight.w500,
-                                              color: Colors.grey[700],
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  children: [
+                                    /// Title on the left
+                                    Expanded(
+                                      child: Text(
+                                        "International Report (From: ${textControllers["from_date"]?.text} To: ${textControllers["to_date"]?.text})",
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 13,
+                                          fontWeight: FontWeight.w500,
+                                          color: Colors.grey[700],
+                                        ),
+                                        overflow:
+                                            TextOverflow
+                                                .ellipsis, // Ensures title doesn't overflow
+                                      ),
+                                    ),
+
+                                    SizedBox(width: 16),
+                                    Container(
+                                      width:
+                                          MediaQuery.of(context).size.width *
+                                          0.2,
+                                      height: 40,
+                                      child: TextField(
+                                        controller:
+                                            searchInternationalController,
+                                        onChanged: handleInternationalFilter,
+                                        decoration: InputDecoration(
+                                          hintText: "Search ...",
+                                          hintStyle: TextStyle(
+                                            fontSize: 12,
+                                            color: Color(0xFF9E9DBD),
+                                          ),
+                                          prefixIcon: Icon(
+                                            Icons.search,
+                                            color: Color(0xFF9E9DBD),
+                                            size: 18,
+                                          ),
+                                          border: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                          ),
+                                          enabledBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade200,
+                                              width: 0.5,
+                                            ),
+                                          ),
+                                          focusedBorder: OutlineInputBorder(
+                                            borderRadius: BorderRadius.circular(
+                                              12,
+                                            ),
+                                            borderSide: BorderSide(
+                                              color: Colors.grey.shade300,
+                                              width: 1,
                                             ),
-                                            overflow: TextOverflow.ellipsis, // Ensures title doesn't overflow
                                           ),
                                         ),
-
-
-                                        SizedBox(width: 16),
-                                        Container(
-                                          width: MediaQuery.of(context).size.width * 0.2,
-                                          height: 40,
-                                          child: TextField(
-                                            controller: searchInternationalController,
-                                            onChanged: handleInternationalFilter,
-                                            decoration: InputDecoration(
-                                              hintText: "Search ...",
-                                              hintStyle: TextStyle(
-                                                fontSize: 12,
-                                                color: Color(0xFF9E9DBD),
-                                              ),
-                                              prefixIcon: Icon(
-                                                Icons.search,
-                                                color: Color(0xFF9E9DBD),
-                                                size: 18,
-                                              ),
-                                              border: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                              ),
-                                              enabledBorder: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                                borderSide: BorderSide(
-                                                  color: Colors.grey.shade200,
-                                                  width: 0.5,
-                                                ),
-                                              ),
-                                              focusedBorder: OutlineInputBorder(
-                                                borderRadius: BorderRadius.circular(12),
-                                                borderSide: BorderSide(
-                                                  color: Colors.grey.shade300,
-                                                  width: 1,
-                                                ),
-                                              ),
-                                            ),
-                                            style: GoogleFonts.poppins(fontSize: 12),
-                                          ),
+                                        style: GoogleFonts.poppins(
+                                          fontSize: 12,
                                         ),
-                                      ])
+                                      ),
+                                    ),
+                                  ],
+                                ),
                               ),
                               Container(
                                 height:
@@ -1053,153 +1161,189 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                                   builder: (context, constraints) {
                                     final double minWidth =
                                         isDesktop ? constraints.maxWidth : 1300;
-                                    List<Map<String, dynamic>> newInternationalData =filteredInternational.isNotEmpty ? filteredInternational : internationalData;
+                                    List<Map<String, dynamic>>
+                                    newInternationalData =
+                                        filteredInternational.isNotEmpty
+                                            ? filteredInternational
+                                            : internationalData;
                                     // Pagination logic
                                     List<Map<String, dynamic>>
                                     paginatedInternational =
-                                    newInternationalData
+                                        newInternationalData
                                             .skip(currentPage2 * itemsPerPage2)
                                             .take(itemsPerPage2)
                                             .toList();
 
-                                    return ((searchInternationalController.text.isNotEmpty && filteredInternational.isEmpty)
+                                    return ((searchInternationalController
+                                                .text
+                                                .isNotEmpty &&
+                                            filteredInternational.isEmpty)
                                         ? Center(
-                                      child: Text(
-                                        "No data found",
-                                        style: GoogleFonts.poppins(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.w500,
-                                        ),
-                                      ),
-                                    )
-                                        : Column(
-                                      children: [
-                                        Expanded(
-                                          child: SingleChildScrollView(
-                                            scrollDirection: Axis.horizontal,
-                                            child: ConstrainedBox(
-                                              constraints: BoxConstraints(
-                                                minWidth: minWidth,
-                                              ),
-                                              child: SingleChildScrollView(
-                                                scrollDirection: Axis.vertical,
-                                                child: DataTable(
-                                                  dividerThickness: 0.5,
-                                                  columnSpacing:
-                                                      isDesktop ? 30.0 : 24.0,
-                                                  border: TableBorder(
-                                                    horizontalInside:
-                                                        BorderSide(
-                                                          width: 0.5,
-                                                          color:
-                                                              Colors
-                                                                  .grey
-                                                                  .shade200,
-                                                        ),
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(16.0),
+                                            child: Column(
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                SizedBox(
+                                                  height:
+                                                      MediaQuery.of(
+                                                        context,
+                                                      ).size.height /
+                                                      4,
+                                                ),
+                                                Text(
+                                                  "No Records Found",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 20,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
                                                   ),
-                                                  columns: [
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Service',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
+                                                ),
+                                                const SizedBox(height: 10),
+                                                Text(
+                                                  "Please ensure the selected dates contain report data.",
+                                                  textAlign: TextAlign.center,
+                                                  style: GoogleFonts.poppins(
+                                                    fontSize: 12,
+                                                    fontWeight: FontWeight.w500,
+                                                    color: Colors.black54,
+                                                  ),
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        )
+                                        : Column(
+                                          children: [
+                                            Expanded(
+                                              child: SingleChildScrollView(
+                                                scrollDirection:
+                                                    Axis.horizontal,
+                                                child: ConstrainedBox(
+                                                  constraints: BoxConstraints(
+                                                    minWidth: minWidth,
+                                                  ),
+                                                  child: SingleChildScrollView(
+                                                    scrollDirection:
+                                                        Axis.vertical,
+                                                    child: DataTable(
+                                                      dividerThickness: 0.5,
+                                                      columnSpacing:
+                                                          isDesktop
+                                                              ? 30.0
+                                                              : 24.0,
+                                                      border: TableBorder(
+                                                        horizontalInside:
+                                                            BorderSide(
+                                                              width: 0.5,
+                                                              color:
+                                                                  Colors
+                                                                      .grey
+                                                                      .shade200,
                                                             ),
                                                       ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Count',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                    DataColumn(
-                                                      label: Text(
-                                                        'Plan Trip Type',
-                                                        style:
-                                                            GoogleFonts.poppins(
-                                                              fontSize: 12,
-                                                              fontWeight:
-                                                                  FontWeight
-                                                                      .w600,
-                                                            ),
-                                                      ),
-                                                    ),
-                                                  ],
-                                                  rows:
-                                                      paginatedInternational.map((
-                                                        entry,
-                                                      ) {
-                                                        return DataRow(
-                                                          cells: [
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['Service']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                      columns: [
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Service',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Count',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                        DataColumn(
+                                                          label: Text(
+                                                            'Plan Trip Type',
+                                                            style:
+                                                                GoogleFonts.poppins(
+                                                                  fontSize: 12,
+                                                                  fontWeight:
+                                                                      FontWeight
+                                                                          .w600,
+                                                                ),
+                                                          ),
+                                                        ),
+                                                      ],
+                                                      rows:
+                                                          paginatedInternational.map((
+                                                            entry,
+                                                          ) {
+                                                            return DataRow(
+                                                              cells: [
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['Service']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['flight_service_count']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['service_count']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                            DataCell(
-                                                              Text(
-                                                                '${entry['plan_trip_type']}',
-                                                                style:
-                                                                    GoogleFonts.poppins(
+                                                                  ),
+                                                                ),
+                                                                DataCell(
+                                                                  Text(
+                                                                    '${entry['plan_trip_type']}',
+                                                                    style: GoogleFonts.poppins(
                                                                       fontSize:
                                                                           12,
                                                                     ),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        );
-                                                      }).toList(),
+                                                                  ),
+                                                                ),
+                                                              ],
+                                                            );
+                                                          }).toList(),
+                                                    ),
+                                                  ),
                                                 ),
                                               ),
                                             ),
-                                          ),
-                                        ),
 
-                                        // Pagination controls
-                                        PaginationControls(
-                                          currentPage: currentPage2,
-                                          itemsPerPage: itemsPerPage2,
-                                          totalItems: newInternationalData.length,
-                                          activeColor: layoutColor,
-                                          onPageChanged: (page) {
-                                            setState(() {
-                                              currentPage2 = page;
-                                            });
-                                          },
-                                          onItemsPerPageChanged: (items) {
-                                            setState(() {
-                                              itemsPerPage2 = items;
-                                              currentPage2 = 0;
-                                            });
-                                          },
-                                        ),
-                                      ],
-                                    ));
+                                            // Pagination controls
+                                            PaginationControls(
+                                              currentPage: currentPage2,
+                                              itemsPerPage: itemsPerPage2,
+                                              totalItems:
+                                                  newInternationalData.length,
+                                              activeColor: layoutColor,
+                                              onPageChanged: (page) {
+                                                setState(() {
+                                                  currentPage2 = page;
+                                                });
+                                              },
+                                              onItemsPerPageChanged: (items) {
+                                                setState(() {
+                                                  itemsPerPage2 = items;
+                                                  currentPage2 = 0;
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ));
                                   },
                                 ),
                               ),
@@ -1217,29 +1361,27 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
     );
   }
 
-  Widget buildTitle(bool isDesktop){
+  Widget buildTitle(bool isDesktop) {
     return // Left side: Breadcrumb inside a Container (optional)
-      Container(
-          child: BreadcrumbNavigation(
-            isDesktop: isDesktop,
-            breadcrumbItems: [
-              BreadcrumbItem(
-                  title: 'Report List',
-                  tooltip: 'Go To Report List',
-                  onTap: (context) {
-                    // Navigator.pushNamed(context, '/report');
-                    context.go("/report");
-                  }
-              ),
-              BreadcrumbItem(
-                title: 'Service Analysis Report',
-              ),
-            ],
-          )
-      );
+    Container(
+      child: BreadcrumbNavigation(
+        isDesktop: isDesktop,
+        breadcrumbItems: [
+          BreadcrumbItem(
+            title: 'Report List',
+            tooltip: 'Go To Report List',
+            onTap: (context) {
+              // Navigator.pushNamed(context, '/report');
+              context.go("/report");
+            },
+          ),
+          BreadcrumbItem(title: 'Service Analysis Report'),
+        ],
+      ),
+    );
   }
 
-  Widget buildExports(bool isDesktop){
+  Widget buildExports(bool isDesktop) {
     return Row(
       children: [
         ElevatedButton(
@@ -1249,10 +1391,7 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
               borderRadius: BorderRadius.circular(8),
               side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
-            padding: EdgeInsets.symmetric(
-              horizontal: 20,
-              vertical: 12,
-            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
           ),
           onPressed: handleDownload,
           child: Row(
@@ -1265,11 +1404,7 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                 ),
               ),
               SizedBox(width: 8),
-              Icon(
-                Icons.file_present_outlined,
-                size: 15,
-                color: Colors.white,
-              ),
+              Icon(Icons.file_present_outlined, size: 15, color: Colors.white),
             ],
           ),
         ),
@@ -1302,14 +1437,14 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
         // ),
       ],
     );
-
   }
 
   Widget buildFromDateField(bool isDesktop) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "From Date *",
+        Text(
+          "From Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1350,12 +1485,9 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                       fontSize: 12,
                       color: Colors.grey,
                     ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: const EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: const EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: const Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1382,7 +1514,8 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text( "To Date *",
+        Text(
+          "To Date *",
           style: GoogleFonts.poppins(
             fontSize: 12,
             fontWeight: FontWeight.w600,
@@ -1398,13 +1531,10 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
             height: 40,
             child: GestureDetector(
               onTap: () async {
-                final fromDateText =
-                    textControllers["from_date"]?.text;
+                final fromDateText = textControllers["from_date"]?.text;
                 DateTime? mintoDate;
                 if (fromDateText != null && fromDateText.isNotEmpty) {
-                  mintoDate = DateFormat(
-                    'dd-MM-yyyy',
-                  ).parse(fromDateText);
+                  mintoDate = DateFormat('dd-MM-yyyy').parse(fromDateText);
                 }
 
                 final pickedDate = await showDatePicker(
@@ -1429,16 +1559,10 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
                   style: const TextStyle(fontSize: 12),
                   decoration: const InputDecoration(
                     labelText: "Select Date",
-                    labelStyle: TextStyle(
-                      fontSize: 12,
-                      color: Colors.grey,
-                    ),
-                    floatingLabelBehavior:
-                    FloatingLabelBehavior.never,
+                    labelStyle: TextStyle(fontSize: 12, color: Colors.grey),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
                     border: InputBorder.none,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 16,
-                    ),
+                    contentPadding: EdgeInsets.symmetric(vertical: 16),
                     suffixIcon: Icon(
                       Icons.calendar_today,
                       size: 16,
@@ -1457,8 +1581,7 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
             style: const TextStyle(color: Colors.red, fontSize: 12),
             maxLines: 2, // Allow it to wrap onto two lines
             overflow:
-            TextOverflow
-                .ellipsis, // Add ellipsis if it still overflows
+                TextOverflow.ellipsis, // Add ellipsis if it still overflows
           ),
         ],
       ],
@@ -1466,48 +1589,38 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
   }
 
   Widget buildSearchButton(bool isDesktop) {
-    return
-      Padding(
-        padding: isDesktop
-            ? const EdgeInsets.only(top: 22)
-            : EdgeInsets.zero,
-        child: SizedBox(
-          width: isDesktop ? null : double.infinity,
-          child: ElevatedButton(
-            style: ElevatedButton.styleFrom(
-              backgroundColor: Color(0xFF114D8B),
-              foregroundColor: Colors.white,
-              disabledBackgroundColor: Color(0xFF114D8B),
-              disabledForegroundColor: Colors.white,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(8),
-                side: BorderSide(color: Color(0xFF114D8B), width: 2),
-              ),
-              padding: EdgeInsets.symmetric(
-                horizontal: 20,
-                vertical: 12,
-              ),
-            ),
-            onPressed: () {
-              handleSubmit();
-            },
-            child: Row(
-              mainAxisSize:
-              MainAxisSize.min, // Ensures content fits nicely
-              children: [
-                Text(
-                  "Search",
-                  style: GoogleFonts.poppins(
-                    fontSize: isDesktop ? 13 : 11,
-                  ),
-                ),
-                SizedBox(width: 8), // spacing between icon and text
-                Icon(Icons.search, size: 15, color: Colors.white),
-              ],
+    return Padding(
+      padding: isDesktop ? const EdgeInsets.only(top: 22) : EdgeInsets.zero,
+      child: SizedBox(
+        width: isDesktop ? null : double.infinity,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor: Color(0xFF114D8B),
+            foregroundColor: Colors.white,
+            disabledBackgroundColor: Color(0xFF114D8B),
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: Color(0xFF114D8B), width: 2),
             ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+          ),
+          onPressed: () {
+            handleSubmit();
+          },
+          child: Row(
+            mainAxisSize: MainAxisSize.min, // Ensures content fits nicely
+            children: [
+              Text(
+                "Search",
+                style: GoogleFonts.poppins(fontSize: isDesktop ? 13 : 11),
+              ),
+              SizedBox(width: 8), // spacing between icon and text
+              Icon(Icons.search, size: 15, color: Colors.white),
+            ],
           ),
         ),
-      );
+      ),
+    );
   }
-
 }
diff --git a/lib/Screens/traveller/travellerDetails.dart b/lib/Screens/traveller/travellerDetails.dart
index 31ac927..b3bca8e 100644
--- a/lib/Screens/traveller/travellerDetails.dart
+++ b/lib/Screens/traveller/travellerDetails.dart
@@ -36,11 +36,12 @@ class TravellerDataState extends State<TravellerData> {
   final ApiService apiService = ApiService();
   Map<String, dynamic>? apiData;
 
-  final Map<String, FocusNode> focusNodes = {
-    "name": FocusNode(),
-    "description": FocusNode(),
-  };
-
+  // final Map<String, FocusNode> focusNodes = {
+  //   "name": FocusNode(),
+  //   "description": FocusNode(),
+  // };
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
   final Map<String, TextEditingController> controllers = {};
   Map<String, String> errorMessages = {};
 
@@ -71,6 +72,15 @@ class TravellerDataState extends State<TravellerData> {
     apiData = null;
     for (var field in dataHeader) {
       controllers[field] = TextEditingController();
+      focusNodes["${field}FocusNode"] = FocusNode();
+      focusStates["${field}Focused"] = false;
+    }
+    for (var key in focusNodes.keys) {
+      _addFocusListener(focusNodes[key]!, (focus) {
+        setState(() {
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
+        });
+      });
     }
 
     if (widget.travellerId != null) {
@@ -90,8 +100,18 @@ class TravellerDataState extends State<TravellerData> {
     for (var controller in controllers.values) {
       controller.dispose();
     }
+    for (var node in focusNodes.values) {
+      node.dispose();
+    }
     super.dispose();
   }
+  void _addFocusListener(FocusNode node, Function(bool) updateState) {
+    node.addListener(() {
+      setState(() {
+        updateState(node.hasFocus);
+      });
+    });
+  }
 
   void updateTravellerDetails() {
     print("Inside Update Function - ${widget.travellerData}");
@@ -134,10 +154,10 @@ class TravellerDataState extends State<TravellerData> {
       if (data[field] == null || data[field]!.trim().isEmpty) {
         errorMessages[field] = "Required";
 
-        if (!hasFocused) {
-          focusNodes[field]?.requestFocus();
-          hasFocused = true;
-        }
+        // if (!hasFocused) {
+        //   focusNodes[field]?.requestFocus();
+        //   hasFocused = true;
+        // }
       }
     }
 
@@ -286,14 +306,14 @@ class TravellerDataState extends State<TravellerData> {
                   ),
                   SizedBox(height: 5),
                   CustomTextFieldForexWrapper(
-                    isFocused: false,
+                    isFocused: focusStates["first_nameFocused"] ?? false,
                     isDesktop: widget.isDesktop,
                     color: Colors.transparent,
                     child: SizedBox(
                       height: 40,
                       child: TextField(
                         controller: controllers["first_name"],
-                        focusNode: focusNodes["first_name"],
+                        focusNode: focusNodes["first_nameFocusNode"],
                         style: const TextStyle(fontSize: 12),
                         decoration: const InputDecoration(
                           labelText: "First Name",
@@ -331,14 +351,14 @@ class TravellerDataState extends State<TravellerData> {
                   ),
                   SizedBox(height: 5),
                   CustomTextFieldForexWrapper(
-                    isFocused: false,
+                    isFocused: focusStates["last_nameFocused"] ?? false,
                     isDesktop: widget.isDesktop,
                     color: Colors.transparent,
                     child: SizedBox(
                       height: 40,
                       child: TextField(
                         controller: controllers["last_name"],
-                        focusNode: focusNodes["last_name"],
+                        focusNode: focusNodes["last_nameFocusNode"],
                         style: const TextStyle(fontSize: 12),
                         decoration: const InputDecoration(
                           labelText: "Last Name",
@@ -376,14 +396,14 @@ class TravellerDataState extends State<TravellerData> {
                   ),
                   SizedBox(height: 5),
                   CustomTextFieldForexWrapper(
-                    isFocused: false,
+                    isFocused: focusStates["emailFocused"] ?? false,
                     isDesktop: widget.isDesktop,
                     color: Colors.transparent,
                     child: SizedBox(
                       height: 40,
                       child: TextField(
                         controller: controllers["email"],
-                        focusNode: focusNodes["email"],
+                        focusNode: focusNodes["emailFocusNode"],
                         style: const TextStyle(fontSize: 12),
                         decoration: const InputDecoration(
                           labelText: "Email",
@@ -421,14 +441,14 @@ class TravellerDataState extends State<TravellerData> {
                   ),
                   SizedBox(height: 5),
                   CustomTextFieldForexWrapper(
-                    isFocused: false,
+                    isFocused: focusStates["mobileFocused"] ?? false,
                     isDesktop: widget.isDesktop,
                     color: Colors.transparent,
                     child: SizedBox(
                       height: 40,
                       child: TextField(
                         controller: controllers["mobile"],
-                        focusNode: focusNodes["mobile"],
+                        focusNode: focusNodes["mobileFocusNode"],
                         style: const TextStyle(fontSize: 12),
                         decoration: const InputDecoration(
                           labelText: "Mobile",
diff --git a/lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart b/lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart
new file mode 100644
index 0000000..f5a5536
--- /dev/null
+++ b/lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart
@@ -0,0 +1,1772 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:html' as html;
+import 'dart:typed_data'; // Import for Uint8List
+
+import 'package:bcrypt/bcrypt.dart';
+import 'package:dropdown_search/dropdown_search.dart';
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
+
+
+import 'package:frontend/utils/auth_utils.dart';
+import 'package:go_router/go_router.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:http/http.dart' as http;
+import 'package:http_parser/http_parser.dart' as http_parser;
+import 'package:intl/intl.dart';
+import 'package:responsive_builder/responsive_builder.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:http_parser/http_parser.dart';
+
+import '../../../config/apiUrl.dart';
+import '../../../routes/custom_appBar.dart';
+import '../../../routes/custom_drawer.dart';
+import '../../../services/apiService.dart';
+import '../../../widgets/custom_breadcrumb_navigation.dart';
+import '../../../widgets/custom_text_field.dart';
+import '../../../widgets/custom_text_forex.dart';
+import '../../../widgets/custom_user_form.dart';
+import '../../../widgets/saving_loader.dart';
+import '../../userManagement/create_traveller_agent/personalDetailsTravelAgent.dart';
+import 'package:universal_html/html.dart' as html;
+
+class CreateTravelAgentFormDetials extends StatefulWidget {
+  @override
+  _CreateTravelAgentFormDetialsState createState() => _CreateTravelAgentFormDetialsState();
+}
+
+class _CreateTravelAgentFormDetialsState extends State<CreateTravelAgentFormDetials> {
+  final ApiService apiService = ApiService();
+
+  final GlobalKey<PersonalDetailsState> personalDetailsKey =
+      GlobalKey<PersonalDetailsState>();
+
+  // late List<Map<String, dynamic>?> travelDetailsData;
+  Map<String, dynamic>? travelDetailsData;
+  Map<String, dynamic>? travelDetailsDataFromAPI;
+  Map<String, String> errorMessagesTravel = {};
+  late TabController _tabController;
+
+  String? userId;
+  String? orgId;
+  String? userIdApi;
+
+  bool isCheckingToken = false;
+
+  String? token;
+
+  late bool isapiselectedUser = false;
+
+  // Map to store controllers dynamically
+  final Map<String, TextEditingController> controllers = {};
+  bool isViewMode = false;
+  bool isEditProfile = false;
+
+  // late final List<dynamic>? apiCountryData ;
+
+  late List<dynamic>? apiCountryData;
+  late List<dynamic>? apiCostData;
+  late List<dynamic>? apiRoleData;
+  late List<dynamic>? apiUserData;
+  Map<String, dynamic>? apiselectedUser;
+  List<Map<String, dynamic>> selectedServiceIds = [];
+
+  late List<dynamic> userList;
+  late Future<List<dynamic>> futureUsers;
+
+  List<dynamic>? resolvedUserData;
+  late List<String> userIdsApi;
+  late Map<String, String> userMap;
+
+  Map<String, String> errorMessages = {};
+
+  String? selectedTab;
+
+  String? selectedCountry;
+  String? selectedGender;
+
+  // String? selectedGender = personalDetailsKey.currentState?.selectedGender;
+
+  String? selectedUserType;
+  String? selectedRole = "5"; // here only harded // hardcoded due to travel agent
+  String? selectedLevel;
+  String? selectedDepartment;
+  String? selectedFirstApprover;
+  String? selectedSecondApprover;
+  String? selectedThirdApprover;
+  String? selectedSubstituteApprover;
+
+  String? selectedFileNames;
+  Uint8List? passportDocumentBytes;
+  String? passportFileUrlFromApi;
+  String? base64PDF;
+
+  html.File? passportFile;
+
+  List<String> dataHeader = [
+    "Fname",
+    "Lname",
+    "email",
+    "password",
+    "dob",
+    "gender",
+    "mobileNumber",
+    "alternateMobile",
+    "address",
+    "postalCode",
+    "country",
+    // "passportNumber",
+    // "placeOfIssue",
+    // "passportDoc",
+    "userType",
+    "roleId",
+    "deptId",
+    "levelId",
+    "firstApproval",
+    "secondApproval",
+    "thirdApproval",
+    "employeeCode",
+    "delegationStartDate",
+    "delegationEndDate",
+    // "dateOfIssue",
+    // "dateOfExpiry",
+    "changePassword",
+  ];
+
+  Color? layoutColor;
+  Color? bodyColor;
+
+  bool setSelectesUserType = false;
+
+  Map<String, dynamic> get userDetials {
+    Map<String, dynamic> data = {
+      "first_name": controllers["Fname"]?.text,
+      "last_name": controllers["Lname"]?.text,
+      "email": controllers["email"]?.text,
+      "password": controllers["password"]?.text,
+      "mobile_no": controllers["mobileNumber"]?.text,
+      "alternate_mobile_no": controllers["alternateMobile"]?.text,
+      "date_of_birth": controllers["dob"]?.text,
+      "address": controllers["address"]?.text,
+      "gender": selectedGender,
+
+      // "gender": personalDetailsKey.currentState?.selectedGender,
+      // "agent_supported_service_ids": selectedServiceIds,
+      "agent_supported_service_ids": selectedServiceIds,
+      "postal_code": controllers["postalCode"]?.text,
+      "country_code": selectedCountry,
+      "employee_code": controllers["employeeCode"]?.text,
+      "delegation_start_date": controllers["delegationStartDate"]?.text,
+      "delegation_end_date": controllers["delegationEndDate"]?.text,
+      "user_type": selectedUserType,
+      "role_id": selectedRole,
+      "department_id": selectedDepartment,
+
+      "group_id": selectedLevel,
+
+      "first_approver": selectedFirstApprover,
+      "second_approver": selectedSecondApprover,
+      "third_approver": selectedThirdApprover,
+      "delegated_to_user_id": selectedSubstituteApprover,
+      // "passport_number": controllers["passportNumber"]?.text,
+      // "place_of_issue": controllers["placeOfIssue"]?.text,
+      // "passport_document": passportFile,
+
+      // "date_of_issue": controllers["dateOfIssue"]?.text,
+      // "date_of_expiry": controllers["dateOfExpiry"]?.text,
+      "created_by": userId,
+      "is_active": "1",
+      "org_id": orgId,
+      "travel_details": travelDetailsData ?? {},
+      // "passport_fileData": passportFile,
+    };
+    return data;
+  }
+
+  void handleUserTypeChange(bool isTravelAgent) {
+    print("handleUserTypeChange- $isTravelAgent");
+
+    setState(() {
+      setSelectesUserType = isTravelAgent;
+    });
+  }
+
+  Future<void> updateData() async {
+    // Ensure apiselectedUser is not null before printing
+    if (apiselectedUser != null) {
+      print("API Selected User Has Data - $widget.apiselectedUser");
+      setState(() {
+        // ✅ Wrap in setState to update the UI
+
+        if (apiselectedUser != null && apiselectedUser!.isNotEmpty) {
+          isapiselectedUser = true;
+
+          print("API Selected User Has Data - $apiselectedUser");
+        }
+        userIdApi = apiselectedUser?["user_id"] ?? "";
+        controllers["Fname"]?.text = apiselectedUser?["first_name"] ?? "";
+        controllers["Lname"]?.text = apiselectedUser?["last_name"] ?? "";
+        controllers["email"]?.text = apiselectedUser?["email"] ?? "";
+        controllers["password"]?.text = "";
+        // controllers["password"]?.text = apiselectedUser?["password"] ?? "";
+        controllers["mobileNumber"]?.text = apiselectedUser?["mobile_no"] ?? "";
+        controllers["alternateMobile"]?.text =
+            apiselectedUser?["alternate_mobile_no"] ?? "";
+
+        controllers["dob"]?.text = apiselectedUser?["date_of_birth"] ?? "";
+
+        controllers["address"]?.text = apiselectedUser?["address"] ?? "";
+        controllers["postalCode"]?.text = apiselectedUser?["postal_code"] ?? "";
+        controllers["employeeCode"]?.text =
+            apiselectedUser?["employee_code"] ?? "";
+
+        controllers["delegationStartDate"]?.text =
+            apiselectedUser?["delegation_start_date"] ?? "";
+
+        controllers["delegationEndDate"]?.text =
+            apiselectedUser?["delegation_end_date"] ?? "";
+
+        controllers["passportNumber"]?.text =
+            apiselectedUser?["passport_number"] ?? "";
+
+        controllers["placeOfIssue"]?.text =
+            apiselectedUser?["place_of_issue"] ?? "";
+
+        if (apiselectedUser?["date_of_issue"] != null) {
+          controllers["dateOfIssue"]?.text =
+              apiselectedUser?["date_of_issue"] ?? "";
+        }
+
+        if (apiselectedUser?["date_of_expiry"] != null) {
+          controllers["dateOfExpiry"]?.text =
+              apiselectedUser?["date_of_expiry"] ?? "";
+        }
+
+        if (apiselectedUser?["country_code"] != null) {
+          selectedCountry = apiselectedUser?["country_code"]?.toString() ?? "";
+        }
+        if (apiselectedUser?["gender"] != null) {
+          selectedGender = apiselectedUser?["gender"]?.toString().trim() ?? "";
+        }
+        if (apiselectedUser?["user_type"] != null) {
+          selectedUserType =
+              apiselectedUser?["user_type"]?.toString().trim() ?? "";
+        }
+
+        if (apiselectedUser?["role_id"] != null) {
+          selectedRole = apiselectedUser?["role_id"]?.toString().trim() ?? "";
+        }
+        if (apiselectedUser?["group_id"] != null) {
+          selectedLevel = apiselectedUser?["group_id"]?.toString().trim() ?? "";
+        }
+        // selectedDepartment =
+        //     apiselectedUser?["department_id"]?.toString().trim() ?? "";
+
+        if (apiselectedUser?["department_id"] != null) {
+          selectedDepartment = apiselectedUser!["department_id"].toString();
+        }
+        // print(
+        //     "selectedDepartment - $selectedDepartment  - ${apiselectedUser?["department_id"]} ");
+        if (apiselectedUser?["level_id"] != null) {
+          selectedLevel = apiselectedUser?["level_id"]?.toString().trim() ?? "";
+        }
+        if (apiselectedUser?["first_approver"] != null) {
+          selectedFirstApprover =
+              apiselectedUser?["first_approver"]?.toString() ?? "";
+        }
+
+        if (apiselectedUser?["second_approver"] != null) {
+          selectedSecondApprover =
+              apiselectedUser?["second_approver"]?.toString() ?? "";
+        }
+
+        if (apiselectedUser?["third_approver"] != null) {
+          selectedThirdApprover =
+              apiselectedUser?["third_approver"]?.toString() ?? "";
+        }
+
+        if (apiselectedUser?["delegated_to_user_id"] != null) {
+          print(
+            "UPDADele- ${apiselectedUser?["delegated_to_user_id"]?.toString()}",
+          );
+          selectedSubstituteApprover =
+              apiselectedUser?["delegated_to_user_id"]?.toString() ?? "";
+
+          print("UPDADele1- $selectedSubstituteApprover");
+        }
+        try {
+          final raw = apiselectedUser!["agent_supported_service_ids"];
+
+          // Fix the invalid JSON (dangerous if the format changes)
+          final fixedJson = raw.replaceAllMapped(
+            RegExp(r'(\w+):'), // matches `service_id:`
+            (match) => '"${match.group(1)}":',
+          );
+
+          List<dynamic> decodedList = jsonDecode(fixedJson);
+
+          selectedServiceIds =
+              decodedList.map<Map<String, dynamic>>((item) {
+                final map = Map<String, dynamic>.from(item);
+                return {"service_id": map['service_id'].toString()};
+              }).toList();
+        } catch (e) {
+          print("❌ Error decoding fixed agent_supported_service_ids: $e");
+          selectedServiceIds = [];
+        }
+
+        print("Updated selectedGender: $selectedGender"); // Debugging
+
+        travelDetailsDataFromAPI = apiselectedUser?["travel_details"];
+
+        print("travelDetailsDataFromAPI00 - $travelDetailsDataFromAPI");
+        // if (travelDetails != null) {
+        //   WidgetsBinding.instance.addPostFrameCallback((_) {
+        //     // Safe to call updateTravel now
+        //     travellerDetailsKey.currentState?.updateTravel();
+        //   });
+        // }
+
+        // Optionally load other travel-related fields like meal/seat preferences, etc.
+      });
+    } else {
+      print("API Selected User Has Data - No data available yet");
+    }
+  }
+
+  @override
+  // void initState() {
+  //   super.initState();
+  //   prepareForNewEntry();
+  //   selectedTab = "personal";
+  //
+  //   // WidgetsFlutterBinding.ensureInitialized();
+  //
+  //   // Step 1: Set 'reloaded' flag before page unload
+  //   // html.window.onBeforeUnload.listen((event) {
+  //   //   html.window.localStorage['reloaded'] = 'true';
+  //   // });
+  //
+  //   apiCountryData = null;
+  //   apiUserData = null;
+  //   // apiselectedUser = null;
+  //   apiCostData = null;
+  //   apiRoleData = null;
+  //
+  //   // Initialize controllers for each field
+  //
+  //   WidgetsBinding.instance.addPostFrameCallback((_) async {
+  //     // final wasReloaded = html.window.localStorage['reloaded'] == 'true';
+  //     //
+  //     // if (wasReloaded) {
+  //     //   html.window.localStorage.remove('reloaded'); // Clear it
+  //     //   context.go('/listUser'); // Navigate using go_router
+  //     // }
+  //
+  //     final extraData =
+  //         GoRouterState.of(context).extra as Map<String, dynamic>?;
+  //
+  //     if (extraData != null) {
+  //       print("extraData: ${extraData['selectedUser']}");
+  //
+  //       setState(() {
+  //         // apiCountryData = extraData['apiCountryData'];
+  //         // apiUserData = extraData['apiUserData'];
+  //         //
+  //         // userList = apiUserData ?? [];
+  //         // userMap = {
+  //         //   for (var user in userList)
+  //         //     user['user_id'].toString(): "${user['first_name']} ${user['last_name']}"
+  //         // };
+  //         // userIdsApi = userMap.keys.toList();
+  //
+  //         // Handle selectedUser as a Map (not a List)
+  //         apiselectedUser =
+  //             extraData['selectedUser']
+  //                 as Map<String, dynamic>?; // Cast it as a Map
+  //         isViewMode = extraData['isViewMode'] ?? false;
+  //         isEditProfile = extraData['isEditProfile'] ?? false;
+  //       });
+  //
+  //       print("selectedUser: $apiselectedUser");
+  //
+  //       // Add another post-frame callback to check after setState
+  //       // await Future.delayed(Duration(
+  //       //     milliseconds: 100)); // Optional delay to ensure UI has updated
+  //       updateData();
+  //     }
+  //
+  //     initializeData();
+  //     fetchCountries();
+  //     fetchDepartment();
+  //     fetchUsers();
+  //     fetchRoles();
+  //     loadInitialData();
+  //   });
+  //
+  //   for (var field in dataHeader) {
+  //     controllers[field] = TextEditingController();
+  //   }
+  // }
+  void initState() {
+    super.initState();
+    setState(() {
+      isCheckingToken = true;
+    });
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _checkAuthAndLoadData(); // Safe place to use context
+    });
+  }
+
+  void _checkAuthAndLoadData() async {
+    setState(() {
+      isCheckingToken = true;
+    });
+
+    final String? token = await getToken();
+    if (!mounted) return;
+
+    if (token == null || token.isEmpty) {
+      context.go("/");
+      return;
+    }
+
+    setState(() {
+      isCheckingToken = false;
+    });
+
+    prepareForNewEntry();
+    selectedTab = "personal";
+
+    apiCountryData = null;
+    apiUserData = null;
+    apiCostData = null;
+    apiRoleData = null;
+
+    for (var field in dataHeader) {
+      controllers[field] = TextEditingController();
+    }
+
+    /// ✅ Now this is safe here
+    try {
+      final extraData = GoRouterState.of(context).extra;
+      if (extraData != null && extraData is Map<String, dynamic>) {
+        setState(() {
+          apiselectedUser = extraData['selectedUser'] as Map<String, dynamic>?;
+          isViewMode = extraData['isViewMode'] ?? false;
+          isEditProfile = extraData['isEditProfile'] ?? false;
+        });
+        updateData();
+      }
+    } catch (e) {
+      print("Router extra error: $e");
+    }
+
+    // Final async data fetches
+    initializeData();
+    fetchCountries();
+    fetchDepartment();
+    fetchUsers();
+    fetchRoles();
+    loadInitialData();
+  }
+
+  void _checkAuthAndLoadData22() async {
+    final String? token = await getToken(); // Your async function to get token
+
+    if (!mounted) return;
+
+    if (token == null || token.isEmpty) {
+      // Token doesn't exist → redirect to login
+      context.go(
+        "/",
+      ); // or use: router.go("/") if you're using `GoRouter` directly
+      setState(() {
+        isCheckingToken = false;
+      });
+
+      return;
+    } else {
+      if (!mounted) return;
+
+      // Future.microtask(() {
+      prepareForNewEntry();
+      selectedTab = "personal";
+
+      // WidgetsFlutterBinding.ensureInitialized();
+
+      // Step 1: Set 'reloaded' flag before page unload
+      // html.window.onBeforeUnload.listen((event) {
+      //   html.window.localStorage['reloaded'] = 'true';
+      // });
+
+      apiCountryData = null;
+      apiUserData = null;
+      // apiselectedUser = null;
+      apiCostData = null;
+      apiRoleData = null;
+
+      // Initialize controllers for each field
+
+      // WidgetsBinding.instance.addPostFrameCallback((_) async {
+      // if (!mounted) return;
+      // final wasReloaded = html.window.localStorage['reloaded'] == 'true';
+      //
+      // if (wasReloaded) {
+      //   html.window.localStorage.remove('reloaded'); // Clear it
+      //   context.go('/listUser'); // Navigate using go_router
+      // }
+
+      final extraData =
+          GoRouterState.of(context).extra as Map<String, dynamic>?;
+
+      if (extraData != null) {
+        print("extraData: ${extraData['selectedUser']}");
+
+        setState(() {
+          // apiCountryData = extraData['apiCountryData'];
+          // apiUserData = extraData['apiUserData'];
+          //
+          // userList = apiUserData ?? [];
+          // userMap = {
+          //   for (var user in userList)
+          //     user['user_id'].toString(): "${user['first_name']} ${user['last_name']}"
+          // };
+          // userIdsApi = userMap.keys.toList();
+
+          // Handle selectedUser as a Map (not a List)
+          apiselectedUser =
+              extraData['selectedUser']
+                  as Map<String, dynamic>?; // Cast it as a Map
+          isViewMode = extraData['isViewMode'] ?? false;
+          isEditProfile = extraData['isEditProfile'] ?? false;
+        });
+
+        print("selectedUser: $apiselectedUser");
+
+        // Add another post-frame callback to check after setState
+        // await Future.delayed(Duration(
+        //     milliseconds: 100)); // Optional delay to ensure UI has updated
+        updateData();
+      }
+
+      initializeData();
+      fetchCountries();
+      fetchDepartment();
+      fetchUsers();
+      fetchRoles();
+      loadInitialData();
+
+      for (var field in dataHeader) {
+        controllers[field] = TextEditingController();
+      }
+
+      setState(() {
+        isCheckingToken = false;
+      });
+
+      // });
+    }
+  }
+
+  Future<void> fetchCountries() async {
+    try {
+      List<dynamic> countries = await apiService.fetchCountryList();
+      setState(() {
+        apiCountryData = countries;
+      });
+    } catch (e) {
+      print('Error fetching country list: $e');
+    }
+  }
+
+  Future<void> fetchDepartment() async {
+    try {
+      List<dynamic> department = await apiService.fetchCostCenter();
+      setState(() {
+        apiCostData = department;
+      });
+    } catch (e) {
+      print('Error fetching department list: $e');
+    }
+  }
+
+  Future<void> fetchUsers() async {
+    try {
+      List<dynamic> users = await apiService.fetchUsers();
+      setState(() {
+        // apiUserData = users;
+
+        apiUserData = users.where((user) => user["role_id"] == "4").toList();
+
+        print("APIUSerDATa - $apiUserData");
+
+        userList = apiUserData ?? [];
+        userMap = {
+          for (var user in userList)
+            user['user_id'].toString():
+                "${user['first_name']} ${user['last_name']}",
+        };
+        userIdsApi = userMap.keys.toList();
+      });
+    } catch (e) {
+      print('Error fetching country list: $e');
+    }
+  }
+
+  Future<void> fetchRoles() async {
+    try {
+      final response = await apiService.fetchMasterDropdown();
+
+      if (response is Map<String, dynamic> && response.containsKey("role")) {
+        List<dynamic> roleList = response["role"]; // Extract the list
+        setState(() {
+          apiRoleData = roleList;
+        });
+        print("APIROLEData - $apiRoleData");
+      } else {
+        print("Error: 'role' key not found or response is not a Map.");
+      }
+    } catch (e) {
+      print('Error fetching role list: $e');
+    }
+  }
+
+  void printFormData() {
+    for (var field in dataHeader) {
+      print("$field: ${controllers[field]?.text}");
+    }
+  }
+
+  void loadInitialData() async {
+    String? layoutString = await getLayoutColor();
+    String? bodyStringColor = await getBodyColor();
+
+    setState(() {
+      layoutColor =
+          layoutString != null
+              ? Color(int.parse(layoutString))
+              : Colors.redAccent;
+
+      bodyColor =
+          bodyStringColor != null
+              ? Color(int.parse(bodyStringColor))
+              : Colors.white;
+    });
+  }
+
+  Future<void> initializeData() async {
+    token = await getToken();
+    userId = await getUserId();
+
+    if (token == null || userId == null) {
+      print("Token or USerId missing");
+      print("Retrieved Token: $token");
+      print("Retrieved UserId: $userId");
+      return;
+    } else {
+      setState(() {});
+    }
+  }
+
+  Future<String?> getToken() async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getString('auth_token');
+  }
+
+  Future<String?> getUserId() async {
+    final prefs = await SharedPreferences.getInstance();
+    final userData = prefs.getString('user_data');
+
+    if (userData != null) {
+      final decodedData = jsonDecode(userData);
+
+      // Return the user_id from the decoded data
+      return decodedData['user_id']?.toString();
+    }
+    return null;
+  }
+
+  @override
+  void dispose() {
+    // Dispose all controllers to prevent memory leaks
+    for (var controller in controllers.values) {
+      controller.dispose();
+    }
+    super.dispose();
+  }
+
+  void prepareForNewEntry() {
+    for (var controller in controllers.values) {
+      controller.clear();
+    }
+  }
+
+  void handleGoBack() async {
+    print("hello, please Go Back");
+    printFormData();
+  }
+
+  void handleBack() async {
+    print("USR Detail back");
+
+    final tabs = {
+      "personal": "Personal Details",
+      "office": "Office Details",
+      "travel": "Travel Details",
+    };
+
+    final tabKeys = tabs.keys.toList(); // ["personal", "office", "travel"]
+
+    final currentIndex = tabKeys.indexOf(selectedTab ?? "travel");
+
+    print("currentIndex - $currentIndex");
+
+    if (currentIndex > 0) {
+      // Move to next tab
+      setState(() {
+        selectedTab = tabKeys[currentIndex - 1];
+      });
+    } else {
+      // Final step — submit or show done
+      print("All tabs completed!");
+      // Submit the full form here
+    }
+  }
+
+  void handleNext() async {
+    print("USR Detail Next");
+    printFormData();
+
+    Map<String, dynamic> data = userDetials;
+
+    print("USERDETAILS : $data");
+
+    final tabs = { "personal": "Personal Details" };
+
+    final tabKeys = tabs.keys.toList(); // ["personal", "office", "travel"]
+
+    final currentIndex = tabKeys.indexOf(selectedTab ?? "personal");
+
+    print("currentIndex - $currentIndex");
+
+    bool isValid = false;
+
+    final currentTab = tabKeys[currentIndex];
+    if (currentTab == "personal") {
+      isValid = isValidData(userDetials);
+    } else if (currentTab == "office") {
+      isValid = isValidDataTwo(userDetials);
+    } else {
+      isValid = true; // Travel tab might not need validation at this point
+    }
+
+    if (!isValid) {
+      print("Validation Failed on $currentTab: $userDetials");
+      setState(() {}); // To trigger UI update showing errors
+      return;
+    }
+
+    if (currentIndex < tabKeys.length - 1) {
+      // Move to next tab
+      setState(() {
+        selectedTab = tabKeys[currentIndex + 1];
+      });
+    } else {
+      // Final step — submit or show done
+      print("All tabs completed!");
+      // Submit the full form here
+    }
+
+    // if (!isValidData(data))
+    // {
+    //   print("USERDETAILS : $userDetials");
+    //   print("Validation Failed: Required fields are missing.");
+    //   setState(() {});
+    //   return; // Stop execution if validation fails
+    // } else
+    // {
+    //   print("USERDETAILS : $userDetials");
+    //
+    //   if (currentIndex < tabKeys.length - 1) {
+    //     // Move to next tab
+    //     setState(() {
+    //       selectedTab = tabKeys[currentIndex + 1];
+    //     });
+    //   } else {
+    //     // Already at last tab (travel), maybe submit form or show done message
+    //     print("All tabs completed!");
+    //     // You can trigger full form submit here
+    //   }
+    // }
+  }
+
+  void handleSubmit() async {
+    print("travel gnt Detail Submit");
+    // printFormData();
+    print("travel validation");
+    bool isValid =  false;
+
+    print("Start loader at: ${DateTime.now()}");
+    showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (context) => const SavingLoader(),
+    );
+    if (selectedRole == "5") {
+      print("NO validation");
+
+      Map<String, dynamic> data = userDetials;
+
+      if (!isValidData(data)) {
+        print("USERDETAILS : $userDetials");
+        print("Validation Failed: Required fields are missing.");
+        setState(() {});
+        return; // Stop execution if validation fails
+      } else {
+        print("USERDETAILS : $userDetials");
+        orgId = await getOrgId();
+
+        CreateTravelAgentData(userDetials);
+      }
+    } else {
+      print("isValid- $isValid");
+      if (!isValid) {
+        print("Validation failed. Please check the inputs.");
+        setState(() {});
+        return; // ❌ STOP execution here if not valid
+      }
+
+      // travelDetailsData = travellerDetailsKey.currentState?.travel_Detials;
+      // print("travelDetailsData - $travelDetailsData");
+
+      // print("travelDetailsData - $travelDetailsData");
+      // errorMessagesTravel = travellerDetailsKey.currentState!.errorMessages;
+
+      // print("TRAVEL DETAILS FROM CHILD");
+      // print("TRAVEL DETAILS FROM CHILD: $travelDetailsData");
+
+      // passportFile = travellerDetailsKey.currentState?.passportFile;
+
+      // print("passportFile : $passportFile");
+
+      Map<String, dynamic> data = userDetials;
+
+      print("USERDETAILS : $data");
+
+      // block-submit-here
+
+      final format = DateFormat("dd-MM-yyyy");
+
+      DateTime? start_Date;
+      DateTime? end_Date;
+
+      try {
+        if (travelDetailsData?['date_of_issue'] != null &&
+            travelDetailsData!['date_of_issue'].toString().isNotEmpty) {
+          start_Date = format.parse(travelDetailsData!['date_of_issue']);
+        }
+        if (travelDetailsData?['date_of_expiry'] != null &&
+            travelDetailsData!['date_of_expiry'].toString().isNotEmpty) {
+          end_Date = format.parse(travelDetailsData!['date_of_expiry']);
+        }
+
+        if (start_Date != null &&
+            end_Date != null &&
+            end_Date.isBefore(start_Date)) {
+          print("Invalid date range");
+          return;
+        }
+      } catch (e) {
+        print("Invalid passport date format");
+        return;
+      }
+
+      // 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<String, dynamic> data = userDetials;
+
+      if (!isValidData(data) && isValidDataTwo(data)) {
+        print("USERDETAILS : $userDetials");
+        print("Validation Failed: Required fields are missing.");
+        setState(() {});
+        return; // Stop execution if validation fails
+      } else {
+        print("USERDETAILS : $userDetials");
+        orgId = await getOrgId();
+
+        CreateTravelAgentData(userDetials);
+      }
+    }
+
+    if (mounted) Navigator.of(context, rootNavigator: true).pop();
+  }
+
+  bool isValidData(Map<String, dynamic> data) {
+    errorMessages.clear(); // Reset errors
+
+    // Required fields that must not be empty
+    List<String> requiredFields = [
+      "first_name",
+      "last_name",
+      "email",
+      "mobile_no",
+      "role_id",
+      // "employeeCode",
+    ];
+
+    if (apiselectedUser == null) {
+      requiredFields.add("password");
+    }
+
+    // Check validation for each field
+    for (String field in requiredFields) {
+      if (data[field] == null || data[field].toString().trim().isEmpty) {
+        errorMessages[field] = "Required";
+      }
+    }
+
+    // Mobile number validation for both mobile_no and alternate_mobile_no
+    if (data["mobile_no"] != null && data["mobile_no"].toString().isNotEmpty) {
+      if (!RegExp(r"^\d{10}$").hasMatch(data["mobile_no"].toString())) {
+        errorMessages["mobile_no"] =
+            "Enter 10 digits"; // Invalid mobile number format
+      }
+    }
+
+    if (data["alternate_mobile_no"] != null &&
+        data["alternate_mobile_no"].toString().isNotEmpty) {
+      if (!RegExp(
+        r"^\d{10}$",
+      ).hasMatch(data["alternate_mobile_no"].toString())) {
+        errorMessages["alternate_mobile_no"] =
+            "Enter 10 digits"; // Invalid mobile number format
+      }
+    }
+
+    // Email validation
+    if (data["email"] != null && data["email"].toString().isNotEmpty) {
+      if (!RegExp(
+        r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$",
+      ).hasMatch(data["email"].toString())) {
+        errorMessages["email"] = "Invalid email format"; // Invalid email format
+      }
+    }
+    return errorMessages.isEmpty; // Valid if there are no errors
+  }
+
+  bool isValidDataTwo(Map<String, dynamic> data) {
+    errorMessages.clear(); // Reset errors
+
+    // Required fields that must not be empty
+    List<String> requiredFields = ["employee_code"];
+
+    // Check validation for each field
+    for (String field in requiredFields) {
+      if (data[field] == null || data[field].toString().trim().isEmpty) {
+        errorMessages[field] = "Required";
+      }
+    }
+
+    return errorMessages.isEmpty; // Valid if there are no errors
+  }
+
+  void _clearError(String field) {
+    if (mounted && errorMessages.containsKey(field)) {
+      setState(() {
+        errorMessages.remove(field);
+      });
+    }
+  }
+
+  void pickPDFWeb() {
+    html.FileUploadInputElement uploadInput = html.FileUploadInputElement();
+    uploadInput.accept = '.pdf';
+    uploadInput.click();
+
+    uploadInput.onChange.listen((e) {
+      final file = uploadInput.files!.first;
+
+      // Ensure the file is a PDF
+      if (!file.type.contains("pdf")) {
+        print("Error: Not a PDF file");
+        return;
+      }
+
+      // 🔹 File size check: Ensure it does not exceed 3MB
+      int maxFileSize = 3 * 1024 * 1024; // 3MB in bytes
+      if (file.size > maxFileSize) {
+        print('Error: File size exceeds 3MB');
+        return;
+      }
+
+      setState(() {
+        selectedFileNames = file.name;
+        passportFile = file;
+        passportFileUrlFromApi = null;
+      });
+
+      print('PDF File selected: ${file.name}');
+    });
+  }
+
+  Future<void> CreateTravelAgentData(Map<String, dynamic> userData) async {
+    final bool isUpdating =
+        apiselectedUser != null && apiselectedUser!.isNotEmpty;
+    final uri = Uri.parse(
+      isUpdating
+          ? '$apiUrl/api/users/update/${apiselectedUser?["user_id"]}'
+          : '$apiUrl/api/users/create',
+    );
+
+    if (token == null) {
+      throw Exception('Token not found. Please log in.');
+    }
+
+    // Use MultipartRequest (POST only)
+    final request = http.MultipartRequest('POST', uri);
+    request.headers['Authorization'] = 'Bearer $token';
+
+    // If updating, spoof the method Laravel-style
+    if (isUpdating) {
+      request.fields['_method'] = 'PUT';
+      request.fields['user_id'] = apiselectedUser!["user_id"].toString();
+    }
+
+    // userData.forEach((key, value) {
+    //   // if (value == null) {
+    //   //   // skip nulls
+    //   //   return;
+    //   // }
+    //
+    //   if (key == 'travel_details' && value is Map<String, dynamic>) {
+    //     // Encode travel_details map as JSON string
+    //     request.fields[key] = jsonEncode(value);
+    //     print("✅ Encoded travel_details: ${request.fields[key]}");
+    //   } else {
+    //     // If the value is empty or only whitespace, add it as empty string
+    //     if (value.toString().trim().isEmpty) {
+    //       request.fields[key] = '';
+    //     } else {
+    //       // Otherwise add the actual string value
+    //       request.fields[key] = value.toString();
+    //     }
+    //   }
+    // });
+
+    userData.forEach((key, value) {
+      // if (value != null && value.toString().trim().isNotEmpty) {
+      if (key == 'travel_details' && value is Map<String, dynamic>) {
+        // ✅ Encode travel_details as a proper JSON string
+        request.fields[key] = jsonEncode(value);
+
+        print("✅ Encoded travel_details1: ${request.fields[key]}");
+      } else if (key == 'agent_supported_service_ids' && value is List) {
+        request.fields[key] = jsonEncode(value);
+        print("✅ Encoded agent_supported_service_ids: ${request.fields[key]}");
+      } else {
+        // request.fields[key] = jsonEncode(value);
+        print("✅ Encoded travel_details:${key} - ${value}");
+        request.fields[key] = value.toString();
+        print("✅ Encoded travel_details2: ${request.fields[key]}");
+      }
+      // }
+    });
+
+    // Attach file if selected
+    if (passportFile != null) {
+      try {
+        final reader = html.FileReader();
+        reader.readAsArrayBuffer(passportFile!);
+        await reader.onLoad.first;
+
+        final data = reader.result as Uint8List;
+
+        final multipartFile = http.MultipartFile.fromBytes(
+          'passport_document',
+          data,
+          filename: passportFile!.name,
+        );
+
+        request.files.add(multipartFile);
+        print("📎 File attached: ${passportFile!.name}");
+      } catch (e) {
+        print("❌ Failed to read file: $e");
+      }
+    } else {
+      print("⚠️ No passport file selected.");
+    }
+
+    print("🚀 Sending request with fields: ${request.fields}");
+
+    try {
+      final streamedResponse = await request.send();
+      final response = await http.Response.fromStream(streamedResponse);
+      print("Response status: ${response.statusCode}");
+      print("Response body: ${response.body}");
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        dispose();
+        print("✅ Travel Agent submitted successfully!");
+
+        print("📨 Response: ${response.body}");
+        context.go('/listTravelAgent');
+      } else {
+        print("❌ Submission failed. Status: ${response.statusCode}");
+        print("📨 Body: ${response.body}");
+
+        showDialog(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertDialog(
+              title: Text("Travel Agent Creation Failed"),
+              content: Text(
+                "There was a problem in creating Travel Agent. Please try again.",
+              ),
+              actions: [
+                TextButton(
+                  child: Text("OK"),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
+                ),
+              ],
+            );
+          },
+        );
+      }
+    } catch (e) {
+      print("🔥 Error submitting Travel Agent: $e");
+    }
+  }
+
+  void handleChangePassword(String enteredPassword) {
+    var hashedPassword = apiselectedUser?["password"]; // Get stored bcrypt hash
+
+    print("HAshPAssword - $hashedPassword ");
+    print("enteredPassword - $enteredPassword ");
+
+    if (hashedPassword != null && hashedPassword.isNotEmpty) {
+      bool isMatch = BCrypt.checkpw(
+        enteredPassword,
+        hashedPassword,
+      ); // Compare passwords
+
+      setState(() {
+        // ✅ Ensure UI updates
+        if (isMatch) {
+          errorMessages["password"] =
+              "New password is not similar to old password";
+          print(" Password match!");
+        } else {
+          print(" Password NOT match!");
+          errorMessages.remove(
+            "password",
+          ); // Clear error if password is different
+        }
+      });
+    } else {
+      print("No stored password found.");
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ResponsiveBuilder(
+      builder: (context, sizingInfo) {
+        bool isDesktop =
+            sizingInfo.deviceScreenType == DeviceScreenType.desktop;
+
+        if (isCheckingToken) {
+          return Center(child: CircularProgressIndicator());
+        }
+
+        return Scaffold(
+          backgroundColor: Color(0xFFf5f5f5),
+          // appBar: isDesktop ? null : const CustomAppBar(title: 'Create User '),
+          // drawer: isDesktop ? null : CustomDrawer(isDesktop: false),
+          appBar: CustomAppBar(isDesktop: isDesktop),
+          drawer: CustomDrawer(isDesktop: false),
+          body: Padding(
+            padding:
+                isDesktop
+                    ? EdgeInsets.symmetric(
+                      horizontal:
+                          MediaQuery.of(context).size.width *
+                          0.1, // 30% of screen width as horizontal padding
+                      vertical:
+                          MediaQuery.of(context).size.height *
+                          0, // 5% of screen height as vertical padding
+                    )
+                    : EdgeInsets.all(0),
+            child: Row(
+              children: [Expanded(child: buildData(isDesktop, context))],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget buildData(bool isDesktop, context) {
+    return Container(
+      margin: isDesktop ? const EdgeInsets.only(top: 10.0, bottom: 10.0) : null,
+      padding: const EdgeInsets.only(left: 10, right: 10, top: 5),
+      decoration: BoxDecoration(
+        color: isDesktop ? Colors.white : Color(0xFFFCFCFC),
+      ),
+      child: Column(
+        children: [
+          Expanded(
+            child: Container(
+              height:
+                  isDesktop
+                      ? MediaQuery.of(context).size.height * 0.88
+                      : MediaQuery.of(context).size.height,
+              child: Padding(
+                padding: EdgeInsets.all(0.0),
+                child: _buildUserDetails(isDesktop),
+              ),
+            ),
+          ),
+          Container(
+            color: Colors.white,
+            child: Padding(
+              padding: const EdgeInsets.all(5.0),
+              child:
+                  isDesktop
+                      ? Row(
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children: [
+                          if (selectedTab != "personal")
+                            ..._buildBack(isDesktop, layoutColor!),
+                          Spacer(), // spacing between buttons
+                          // Next or Submit based on role or user type
+                          if (selectedTab == "travel" ||
+                              selectedRole == "5" ||
+                              setSelectesUserType == true)
+                            ..._buildSubmit(isDesktop, layoutColor!)
+                          else
+                            ..._buildNext(isDesktop, layoutColor!),
+                          // (selectedTab == "travel" ||
+                          //         selectedRole == "5" ||
+                          //         setSelectesUserType == true)
+                          //     ? _buildSubmit(isDesktop, layoutColor!)
+                          //     : _buildNext(
+                          //       isDesktop,
+                          //       layoutColor!,
+                          //     ), // _buildGoBack(isDesktop, layoutColor!),
+                        ],
+                      )
+                      : Row(
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children:
+                            (selectedTab == "travel" ||
+                                    selectedRole == "5" ||
+                                    setSelectesUserType == true)
+                                ? _buildSubmit(isDesktop, layoutColor!)
+                                : _buildNext(isDesktop, layoutColor!),
+                      ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUserDetails(bool isDesktop) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Container(
+                    child: BreadcrumbNavigation(
+                      isDesktop: isDesktop,
+                      breadcrumbItems: [
+                        BreadcrumbItem(
+                            title: 'Organization Settings',
+                            tooltip: 'Go To Organization Settings',
+                            onTap: (context) {
+                              context.go("/OrganizationSettings");
+                            }
+                        ),
+                        BreadcrumbItem(
+                            title: 'Travel Agent',
+                            tooltip: 'Go To Travel Agent',
+                            onTap: (context) {
+                              context.go("/listTravelAgent");
+                            }
+                        ),
+                        BreadcrumbItem(
+                          title: apiselectedUser != null ? "Edit Travel Agent" : "Create Travel Agent",
+                        ),
+                      ],
+                    ),
+                  ),
+                  // if (isEditProfile)
+                  //   IconButton(
+                  //       icon: Icon(
+                  //         Icons.edit,
+                  //         color: Color(0xFF114D8B),
+                  //         size: 14,
+                  //       ),
+                  //       onPressed: () {
+                  //         setState(() {
+                  //           isViewMode = !isViewMode;
+                  //         });
+                  //       })
+                ],
+              ),
+              SizedBox(height: 18),
+              isDesktop
+                  ? buildTabsForUser()
+                  : SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
+                    child: buildTabsForUser(),
+                  ),
+              Container(
+                // color: Colors.yellow.shade50,
+                height: MediaQuery.of(context).size.height * 0.64,
+                child: Row(
+                  children: [
+                    Expanded(child: buildTabContents(isDesktop, isViewMode)),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildTabContents(isDesktop, isViewMode) {
+    switch (selectedTab) {
+      case "personal":
+        return PersonalDetails(
+          personalDetailsKey: personalDetailsKey,
+          isDesktop: isDesktop, // pass isDesktop as a named argument
+          isViewMode: isViewMode,
+          userIdApi: userIdApi,
+          controllers: controllers,
+          errorMessages: errorMessages,
+          selectedGender: selectedGender,
+          selectedCountry: selectedCountry,
+          selectedRole: selectedRole,
+          apiselectedUser: isapiselectedUser,
+          onUserTypeChanged: handleUserTypeChange,
+          onGenderChanged: (gender) {
+            setState(() {
+              selectedGender = gender;
+            });
+          },
+          onCountryChanged: (country) {
+            setState(() {
+              selectedCountry = country;
+            });
+          },
+          onRoleChanged: (role) {
+            setState(() {
+              selectedRole = role;
+            });
+          },
+
+          onServiceIdsChanged: (List<Map<String, dynamic>> updatedList) {
+            setState(() {
+              selectedServiceIds = updatedList;
+            });
+          },
+          initialSelectedServices: selectedServiceIds,
+        );
+      // case "office":
+      //   return OfficeDetails(
+      //     isDesktop: isDesktop, // pass isDesktop as a named argument
+      //     isViewMode: isViewMode,
+      //     userIdApi: userIdApi,
+      //     controllers: controllers,
+      //     errorMessages: errorMessages,
+      //     selectedLevel: selectedLevel,
+      //     selectedDepartment: selectedDepartment,
+      //     selectedFirstApprover: selectedFirstApprover,
+      //     selectedSecondApprover: selectedSecondApprover,
+      //     selectedThirdApprover: selectedThirdApprover,
+      //     selectedSubstituteApprover: selectedSubstituteApprover,
+      //     onLevelChanged: (gender) {
+      //       setState(() {
+      //         selectedLevel = gender;
+      //       });
+      //     },
+      //     onDepartmentChanged: (country) {
+      //       setState(() {
+      //         selectedDepartment = country;
+      //       });
+      //     },
+      //     onFirstApproverChanged: (role) {
+      //       setState(() {
+      //         selectedFirstApprover = role;
+      //       });
+      //     },
+      //     onSecondApproverChanged: (role) {
+      //       setState(() {
+      //         selectedSecondApprover = role;
+      //       });
+      //     },
+      //     onThirdApproverChanged: (role) {
+      //       setState(() {
+      //         selectedThirdApprover = role;
+      //       });
+      //     },
+      //     onFirstSubsApproverChanged: (role) {
+      //       setState(() {
+      //         selectedSubstituteApprover = role;
+      //
+      //         print("onFirstSubsApproverChanged - $selectedSubstituteApprover");
+      //       });
+      //     },
+      //   );
+      // case "travel":
+      //   final fullName =
+      //       "${controllers["Fname"]?.text ?? ""} ${controllers["Lname"]?.text ?? ""}"
+      //           .trim();
+      //   return TravellerDetails(
+      //     key: travellerDetailsKey,
+      //     isDesktop: isDesktop,
+      //     isViewMode: isViewMode,
+      //     controllers: controllers,
+      //     errorMessages: errorMessages,
+      //     travelDetails: travelDetailsDataFromAPI, // 👈 Pass this down
+      //     passportFileUrlFromApi: passportFileUrlFromApi,
+      //     userIdApi: userIdApi,
+      //     fullName: fullName,
+      //   );
+      default:
+        return PersonalDetails(
+          personalDetailsKey: personalDetailsKey,
+          isDesktop: isDesktop, // pass isDesktop as a named argument
+          isViewMode: isViewMode,
+          userIdApi: userIdApi,
+          controllers: controllers,
+          errorMessages: errorMessages,
+          selectedGender: selectedGender,
+          selectedCountry: selectedCountry,
+          apiselectedUser: isapiselectedUser,
+          onUserTypeChanged: handleUserTypeChange,
+          onServiceIdsChanged: (List<Map<String, dynamic>> updatedList) {
+            setState(() {
+              selectedServiceIds = updatedList;
+            });
+          },
+        );
+    }
+  }
+
+  Widget buildTabsForUser() {
+    // final tabs = {
+    //   "personal": "Personal Details",
+    //   "office": "Office Details",
+    //   "travel": "Travel Details",
+    // };
+
+    final Map<String, String> allTabs = {
+      "personal": "Personal Details",
+      // "office": "Office Details",
+      // "travel": "Travel Details",
+    };
+
+    Map<String, String> getTabs(bool setSelectesUserType) {
+      // print(setSelectesUserType);
+      // if (setSelectesUserType || selectedRole == "5") {
+        return {"personal": "Personal Details"};
+      // } else {
+      //   return allTabs;
+      // }
+    }
+
+    final tabs = getTabs(setSelectesUserType);
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.end, // important
+      children:
+          tabs.entries.map((entry) {
+            final targetTab = entry.key;
+
+            print("TargetsTAb: $targetTab");
+
+            final isSelected = selectedTab == entry.key;
+            print("isSelected: $isSelected");
+
+            return GestureDetector(
+              onTap: () {
+                setState(() {
+                  bool isValid = false;
+
+                  final currentTab = selectedTab;
+                  if (currentTab == "personal") {
+                    isValid = isValidData(userDetials);
+
+                    if (isValid) {
+                      selectedTab = entry.key;
+                    }
+                  } else if (currentTab == "office" &&
+                      targetTab == "personal") {
+                    selectedTab = entry.key;
+                  } else if (currentTab == "office") {
+                    isValid = isValidDataTwo(userDetials);
+                    if (isValid) {
+                      selectedTab = entry.key;
+                    }
+                  } else {
+                    isValid =
+                        true; // Travel tab might not need validation at this point
+                    selectedTab = entry.key;
+                  }
+                });
+              },
+              child: Padding(
+                padding: const EdgeInsets.only(
+                  right: 24.0,
+                ), // space between tabs
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(
+                      entry.value,
+                      style: GoogleFonts.poppins(
+                        fontSize: 12,
+                        fontWeight: FontWeight.w600,
+                        color:
+                            isSelected ? Color(0xFF114D8B) : Color(0xFF475569),
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    AnimatedContainer(
+                      duration: Duration(milliseconds: 300),
+                      height: 2,
+                      width: isSelected ? 50 : 0, // small line
+                      color: Color(0xFF114D8B),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          }).toList(),
+    );
+  }
+
+  // ---- Submit ---------------------------------------
+
+  List<Widget> _buildGoBack(isDesktop, Color layoutColor) {
+    return [
+      MouseRegion(
+        cursor:
+            isViewMode
+                ? SystemMouseCursors.forbidden
+                : SystemMouseCursors.click,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor:
+                isViewMode ? layoutColor : layoutColor, // Keep original color
+            foregroundColor:
+                isViewMode ? Colors.white : Colors.white, // Keep original color
+            disabledBackgroundColor:
+                layoutColor, // Ensure color remains when disabled
+            disabledForegroundColor: Colors.white,
+
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: layoutColor, width: 2),
+            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+          ),
+          onPressed: handleGoBack,
+          child: Text("Back"),
+        ),
+      ),
+    ];
+  }
+
+  List<Widget> _buildNext(isDesktop, Color layoutColor) {
+    return [
+      MouseRegion(
+        cursor:
+            isViewMode
+                ? SystemMouseCursors.forbidden
+                : SystemMouseCursors.click,
+        child: ElevatedButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor:
+                isViewMode ? layoutColor : layoutColor, // Keep original color
+            foregroundColor:
+                isViewMode ? Colors.white : Colors.white, // Keep original color
+            disabledBackgroundColor:
+                layoutColor, // Ensure color remains when disabled
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: layoutColor, width: 2),
+            ),
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+          ),
+          onPressed: handleNext,
+          // onPressed:
+          //   isViewMode ? null : handleNext, // Disable when in view mode
+          child: Text("Next"),
+        ),
+      ),
+    ];
+  }
+
+  List<Widget> _buildBack(isDesktop, Color layoutColor) {
+    return [
+      MouseRegion(
+        cursor:
+            isViewMode
+                ? SystemMouseCursors.forbidden
+                : SystemMouseCursors.click,
+        child: TextButton(
+          style: ElevatedButton.styleFrom(
+            backgroundColor:
+                isViewMode ? Colors.white : Colors.white, // Keep original color
+            foregroundColor:
+                isViewMode ? layoutColor : layoutColor, // Keep original color
+            disabledBackgroundColor:
+                layoutColor, // Ensure color remains when disabled
+            disabledForegroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(8),
+              side: BorderSide(color: layoutColor, width: 2),
+            ),
+
+            padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+          ),
+          onPressed: handleBack,
+          // onPressed:
+          //   isViewMode ? null : handleNext, // Disable when in view mode
+          child: Text("Back"),
+        ),
+      ),
+    ];
+  }
+
+  List<Widget> _buildSubmit(isDesktop, Color layoutColor) {
+    return [
+      ElevatedButton(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: Colors.white,
+          foregroundColor: layoutColor,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(8),
+            side: BorderSide(color: layoutColor, width: 2),
+          ),
+          padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+        ),
+        onPressed: () {
+          // isEditProfile ? context.go('/listPlan') : context.go('/listTravelAgent');
+          context.go('/listTravelAgent');
+        },
+        child: Text("Cancel"),
+      ),
+      SizedBox(width: 20),
+      if (!isViewMode)
+        MouseRegion(
+          cursor:
+              isViewMode
+                  ? SystemMouseCursors.forbidden
+                  : SystemMouseCursors.click,
+          child: ElevatedButton(
+            style: ElevatedButton.styleFrom(
+              backgroundColor:
+                  isViewMode ? layoutColor : layoutColor, // Keep original color
+              foregroundColor:
+                  isViewMode
+                      ? Colors.white
+                      : Colors.white, // Keep original color
+              disabledBackgroundColor:
+                  layoutColor, // Ensure color remains when disabled
+              disabledForegroundColor: Colors.white,
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(8),
+                side: BorderSide(color: layoutColor, width: 2),
+              ),
+              padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+            ),
+            onPressed:
+                isViewMode ? null : handleSubmit, // Disable when in view mode
+            child: Text("Submit"),
+          ),
+        ),
+    ];
+  }
+}
+
+class DatabaseHelper {
+  // Example: Singleton pattern to ensure only one instance of the class exists
+  static final DatabaseHelper _instance = DatabaseHelper._internal();
+
+  // Private constructor to prevent external instantiation
+  DatabaseHelper._internal();
+
+  // Public method to access the instance
+  static DatabaseHelper get instance => _instance;
+
+  // Add your database methods here
+  Future<void> fetchData() async {
+    // Implement data fetching logic
+  }
+}
diff --git a/lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart b/lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart
new file mode 100644
index 0000000..aa01cca
--- /dev/null
+++ b/lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart
@@ -0,0 +1,1279 @@
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:frontend/utils/auth_utils.dart';
+import 'package:go_router/go_router.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:http/http.dart' as http;
+import 'package:responsive_builder/responsive_builder.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'dart:typed_data';
+import 'package:universal_html/html.dart' as html;
+import 'package:http_parser/http_parser.dart' as http_parser;
+
+import '../../../config/apiUrl.dart';
+import '../../../routes/custom_appBar.dart';
+import '../../../routes/custom_drawer.dart';
+import '../../../services/apiService.dart';
+import '../../../utils/pagination.dart';
+import '../../../widgets/custom_breadcrumb_navigation.dart';
+import '../../../widgets/popup_travelAgentList_action.dart';
+/// import '../../../widgets/custom_popup.dart';
+/// import '../../../../widgets/popup_TravelAgentList_action.dart';
+
+
+class TravelAgentListScreen extends StatefulWidget {
+  @override
+  _TravelAgentListScreenState createState() => _TravelAgentListScreenState();
+}
+
+class _TravelAgentListScreenState extends State<TravelAgentListScreen> {
+  final ApiService apiService = ApiService();
+  late Future<List<dynamic>> futureUsers;
+
+  late Map<String, dynamic> userSingleData;
+  List<dynamic>? apiCountryData;
+  String? selectedUserId;
+  String? orgId;
+
+  Color? layoutColor;
+  Color? bodyColor;
+
+  List allUsers = [];
+  List filteredUsers = [];
+  TextEditingController searchController = TextEditingController();
+
+  int currentPage = 0;
+  int itemsPerPage = 10;
+
+  @override
+  void initState() {
+    super.initState();
+    // futureUsers = fetchUsers();
+    //
+    // futureUsers.then((users) {
+    //   setState(() {
+    //     allUsers = users;
+    //   });
+    // });
+    //
+    // WidgetsBinding.instance.addPostFrameCallback((_) {
+    //   fetchCountryList();
+    //   loadInitialData();
+    // });
+    _checkAuthAndLoadData();
+  }
+
+  void _checkAuthAndLoadData() async {
+    final String? token = await getToken(); // Your async function to get token
+
+    if (token == null || token.isEmpty) {
+      // Token doesn't exist → redirect to login
+      context.go(
+        "/",
+      ); // or use: router.go("/") if you're using `GoRouter` directly
+      return;
+    } else {
+      futureUsers = fetchUsers();
+
+      futureUsers.then((users) {
+        setState(() {
+          allUsers = users;
+        });
+      });
+      fetchCountryList();
+      loadInitialData();
+      // WidgetsBinding.instance.addPostFrameCallback((_) {
+      //   fetchCountryList();
+      //   loadInitialData();
+      // });
+    }
+  }
+
+  void loadInitialData() async {
+    String? layoutString = await getLayoutColor();
+    String? bodyStringColor = await getBodyColor();
+
+    setState(() {
+      layoutColor =
+          layoutString != null
+              ? Color(int.parse(layoutString))
+              : Colors.redAccent;
+
+      bodyColor =
+          bodyStringColor != null
+              ? Color(int.parse(bodyStringColor))
+              : Colors.white;
+    });
+  }
+
+  Future<String?> getToken() async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getString('auth_token');
+  }
+
+  // Future<List<dynamic>> fetchSingleUsers(userId) async {
+  //   orgId = await getOrgId();
+  //   final String apiUrlData = '$apiUrl/api/users/find/$userId';
+  //
+  //   final String? token = await getToken();
+  //
+  //   print("Fetch Users");
+  //   print("TOEKRWE: $token");
+  //
+  //   if (token == null) {
+  //     throw Exception('Token not found. Please log in.');
+  //   }
+  //
+  //   final response = await http.get(
+  //     Uri.parse(apiUrlData),
+  //     headers: {
+  //       'Authorization': 'Bearer $token',
+  //       'Content-Type': 'application/json',
+  //     },
+  //   );
+  //
+  //   if (response.statusCode == 200) {
+  //     final data = json.decode(response.body);
+  //     return data['data']; // Returning raw JSON list
+  //   } else {
+  //     throw Exception('Failed to load users');
+  //   }
+  // }
+
+  Future<List<dynamic>> fetchUsers() async {
+    orgId = await getOrgId();
+    final String apiUrlData = '$apiUrl/api/agentList?org_id=$orgId&for=table_view';
+    final String? token = await getToken();
+
+    print("Fetch Users");
+    print("TOEKRWE: $token");
+
+    if (token == null) {
+      throw Exception('Token not found. Please log in.');
+    }
+
+    final response = await http.get(
+      Uri.parse(apiUrlData),
+      headers: {
+        'Authorization': 'Bearer $token',
+        'Content-Type': 'application/json',
+      },
+    );
+
+    if (response.statusCode == 200) {
+      final data = json.decode(response.body);
+      return data['data']; // Returning raw JSON list
+    } else {
+      throw Exception('Failed to load users');
+    }
+  }
+
+  Future<void> fetchCountryList() async {
+    final String apiUrldata = '$apiUrl/api/getcountryMaster';
+
+    final token = await getToken();
+
+    if (token == null) {
+      throw Exception('Token not found. Please log in.');
+    }
+
+    final response = await http.get(
+      Uri.parse(apiUrldata),
+      headers: {
+        'Authorization': 'Bearer $token',
+        'Content-Type': 'application/json',
+      },
+    );
+
+    if (response.statusCode == 200) {
+      try {
+        final data = json.decode(response.body);
+        print("Country - $data");
+
+        if (!data.containsKey('data') || data['data'] is! List) {
+          throw Exception(
+            "Invalid response format: 'data' field is missing or not a List",
+          );
+        }
+
+        List<dynamic> plansJson = data['data']; // 'data' is a Map, not a List
+
+        if (data['data'] is List) {
+          List<dynamic> plansJson = data['data'];
+          print("plansJson.length - ${plansJson.length}");
+        } else {
+          print("The 'data' key does not contain a list.");
+        }
+
+        setState(() {
+          apiCountryData = plansJson; // Store API response in state
+        });
+        print('plansJSONContry - $plansJson');
+      } catch (e) {
+        throw Exception('Error parsing response: $e');
+      }
+    } else {
+      throw Exception('Failed to load plans');
+    }
+  }
+
+  void handleDelete(userId) {
+    print("handDel - $userId");
+  }
+
+  Future<void> createUserData(
+    Map<String, dynamic> userData,
+    String userId,
+    String newStatus,
+  ) async {
+    final uri = Uri.parse('$apiUrl/api/users/update/$userId');
+
+    final String? token = await getToken();
+    if (token == null) {
+      throw Exception('Token not found. Please log in.');
+    }
+
+    // Use MultipartRequest (POST only)
+    final request = http.MultipartRequest('POST', uri);
+    request.headers['Authorization'] = 'Bearer $token';
+
+    // If updating, spoof the method Laravel-style
+
+    request.fields['_method'] = 'PUT';
+    request.fields['user_id'] = userId;
+
+    print("STatus 2 - $newStatus");
+
+    // Add all non-null and non-empty user data fields
+    userData.forEach((key, value) {
+      if (value != null && value.toString().trim().isNotEmpty) {
+        request.fields[key] = value.toString();
+      }
+    });
+
+    request.fields['is_active'] = newStatus;
+
+    print("🚀 Sending request with fields: ${request.fields}");
+
+    try {
+      final streamedResponse = await request.send();
+      final response = await http.Response.fromStream(streamedResponse);
+      print("Response status: ${response.statusCode}");
+      print("Response body: ${response.body}");
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        print("✅ User Status submitted successfully! ");
+        print("📨 Response: ${response.body}");
+
+        refreshTravelAgentList();
+      } else {
+        print("❌ Submission failed. Status: ${response.statusCode}");
+        print("📨 Body: ${response.body}");
+      }
+    } catch (e) {
+      print("🔥 Error submitting user: $e");
+    }
+  }
+
+  void handleToggleUserStatus(
+    String userId,
+    String currentStatus,
+    Map<String, dynamic> userData,
+  ) async {
+    print("Toggling user status - $userId (Current: $currentStatus)");
+
+    final String apiUrlData =
+        '$apiUrl/api/users/update/$userId'; // API for updating user
+    final String? token = await getToken();
+
+    if (token == null) {
+      print("Error: Token not found");
+      return;
+    }
+
+    // Toggle status: If active ("1"), set to inactive ("0"); otherwise, activate ("1")
+    String newStatus = (currentStatus == "1") ? "0" : "1";
+
+    print("STatus 1 - $newStatus");
+
+    createUserData(userData, userId, newStatus);
+
+    // try {
+    //   final response = await http.put(
+    //     Uri.parse(apiUrlData),
+    //     headers: {
+    //       'Authorization': 'Bearer $token',
+    //       'Content-Type': 'application/json',
+    //     },
+    //     body: jsonEncode({
+    //       "is_active": newStatus // Set new status dynamically
+    //     }),
+    //   );
+    //
+    //   if (response.statusCode == 200) {
+    //     print("User status updated successfully to $newStatus!");
+    //     refreshTravelAgentList(); // Refresh users list after update
+    //   } else {
+    //     print("Failed to update user status. Status: ${response.statusCode}");
+    //     print("Error: ${response.body}");
+    //   }
+    // } catch (e) {
+    //   print("Error updating user status: $e");
+    // }
+  }
+
+  // Refresh user list after update
+  void refreshTravelAgentList() {
+    setState(() {
+      print("Search cleared 1");
+      searchController.clear(); // or wrap in setState if needed
+      print("Search cleared - ${searchController.text}");
+      filteredUsers = [];
+      futureUsers = fetchUsers();
+
+      futureUsers.then((users) {
+        setState(() {
+          allUsers = users;
+        });
+      }); // Re-fetch users after status update
+      // Wait for futurePlans to be fetched and update allPlans
+    });
+  }
+
+  void filterUsers(String query) {
+    print("allUsers before filtering: $query");
+    final lowerQuery = query.toLowerCase();
+    setState(() {
+      filteredUsers =
+          allUsers.where((user) {
+            return (user['first_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (user['last_name']?.toLowerCase().contains(lowerQuery) ??
+                    false) ||
+                (user['email']?.toLowerCase().contains(lowerQuery) ?? false) ||
+                (user['role_value']?.toLowerCase().contains(lowerQuery) ??
+                    false);
+          }).toList();
+
+      currentPage = 0;
+    });
+    print("filteredPlans: $filteredUsers");
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ResponsiveBuilder(
+      builder: (context, sizingInfo) {
+        bool isDesktop =
+            sizingInfo.deviceScreenType == DeviceScreenType.desktop;
+
+        return Scaffold(
+          backgroundColor: Color(0xFFf5f5f5),
+          // appBar: isDesktop ? null : const CustomAppBar(title: 'User Management'),
+          // drawer: isDesktop ? null : CustomDrawer(isDesktop: false),
+          appBar: CustomAppBar(isDesktop: isDesktop),
+          drawer: CustomDrawer(isDesktop: false),
+          body: Padding(
+            padding:
+                isDesktop
+                    ? EdgeInsets.symmetric(
+                      horizontal:
+                          MediaQuery.of(context).size.width *
+                          0.1, // 30% of screen width as horizontal padding
+                      vertical:
+                          MediaQuery.of(context).size.height *
+                          0, // 5% of screen height as vertical padding
+                    )
+                    : EdgeInsets.all(0),
+            child: Row(
+              children: [
+                // if (isDesktop) CustomDrawer(isDesktop: true),
+                // const Expanded(child: Center(child: Text("User Page Content"))),
+                Expanded(child: buildGroupList(isDesktop)),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget buildGroupList(bool isDesktop) {
+    return Container(
+      margin: isDesktop ? const EdgeInsets.only(top: 10.0, bottom: 10.0) : null,
+      padding: const EdgeInsets.all(1),
+      decoration: BoxDecoration(
+        color: isDesktop ? Colors.white : Color(0xFFFCFCFC),
+      ),
+      // decoration: BoxDecoration(
+      //     // color: Colors.amber,
+      //     // color: bodyColor,
+      //     color: Color(0xFFE1F5FE),
+      //     border: Border.all(
+      //         color: Colors.white,
+      //         // color: Color(0xFFF7F7FB),
+      //         width: 3.5)),
+      child: buildUserTable(isDesktop),
+    );
+  }
+
+  Widget buildUserTable(bool isDesktop) {
+    return Container(
+      // margin: isDesktop
+      //     ? EdgeInsets.all(10.0)
+      //     : EdgeInsets.only(left: 20.0, bottom: 20.0, top: 10.0, right: 20.0),
+      // padding: const EdgeInsets.all(10),
+      height:
+          isDesktop
+              ? MediaQuery.of(context).size.height * 0.98
+              : MediaQuery.of(context).size.height,
+
+      child: Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: Container(
+          color: Colors.white,
+          padding: const EdgeInsets.all(10.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              // Divider(
+              //   thickness: 0.2, // how "thick" the line is
+              //   color: Colors.grey, // optional
+              // ),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Row(
+                    children: [
+                      // Left side: Breadcrumb inside a Container (optional)
+                      Container(
+                        child: BreadcrumbNavigation(
+                          isDesktop: isDesktop,
+                          breadcrumbItems: [
+                            BreadcrumbItem(
+                                title: 'Organization Settings',
+                                tooltip: 'Go To Organization Settings',
+                                onTap: (context) {
+                                  context.go("/OrganizationSettings");
+                                }
+                            ),
+                            BreadcrumbItem(
+                              title: 'Travel Agent',
+                            ),
+                          ],
+                        ),
+                      ),
+                      // Text(
+                      //   'Traveller Details',
+                      //   style: GoogleFonts.poppins(
+                      //     fontSize: isDesktop ? 16 : 14,
+                      //     fontWeight: FontWeight.w600,
+                      //     color: Colors.black,
+                      //   ),
+                      // ),
+                    ],
+                  ),
+                  if (isDesktop)
+                    SizedBox(width: MediaQuery.of(context).size.width * 0.23),
+
+                  // SizedBox(width: MediaQuery.of(context).size.width * 0.15),
+                  if (isDesktop)
+                    Container(
+                      width: MediaQuery.of(context).size.width * 0.2,
+                      height: 40,
+                      child: TextField(
+                        controller: searchController,
+                        onChanged: filterUsers,
+                        decoration: InputDecoration(
+                          hintText: "Search for a Travel Agent",
+                          hintStyle: TextStyle(
+                            fontSize: 12,
+                            color: Color(0xFF9E9DBD),
+                          ),
+                          prefixIcon: Icon(
+                            Icons.search,
+                            color: Color(0xFF9E9DBD),
+                            size: 18,
+                          ),
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          enabledBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.grey.shade200,
+                              width: 0.5,
+                            ),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: Colors.grey.shade300,
+                              width: 1,
+                            ),
+                          ),
+                        ),
+                        style: GoogleFonts.poppins(fontSize: 12),
+                      ),
+                    ),
+                  // SizedBox(width: 16),
+                  // Spacer(),
+                  SizedBox(width: 5),
+                  ElevatedButton(
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: Color(0xFF114D8B),
+                      foregroundColor: Colors.white,
+                      disabledBackgroundColor: Color(0xFF114D8B),
+                      disabledForegroundColor: Colors.white,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(8),
+                        side: BorderSide(color: Color(0xFF114D8B), width: 2),
+                      ),
+                      padding: EdgeInsets.symmetric(
+                        horizontal: 20,
+                        vertical: 12,
+                      ),
+                    ),
+                    onPressed: () async {
+                      List<dynamic> users = await futureUsers;
+
+                      // Print the resolved value
+                      print("CREATELIAS - $users");
+
+                      context.go(
+                        "/CreateTravelAgent",
+                        //     extra: {
+                        //   // 'apiCountryData': apiCountryData,
+                        //   'apiUserData': users,
+                        // }
+                      );
+                    },
+                    child: Row(
+                      mainAxisSize:
+                          MainAxisSize.min, // Ensures content fits nicely
+                      children: [
+                        Text(
+                          "Add New Travel Agent",
+                          style: GoogleFonts.poppins(
+                            fontSize: isDesktop ? 13 : 11,
+                          ),
+                        ),
+                        SizedBox(width: 8), // spacing between icon and text
+                        Icon(
+                          Icons.add_circle_outline_rounded,
+                          size: 15,
+                          color: Colors.white,
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+
+              if (!isDesktop) SizedBox(height: 5),
+              isDesktop
+                  ? SizedBox.shrink()
+                  : Row(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    children: [
+                      Container(
+                        width: MediaQuery.of(context).size.width * 0.8,
+                        height: 35,
+                        child: TextField(
+                          controller: searchController,
+                          onChanged: filterUsers,
+                          decoration: InputDecoration(
+                            hintText: "Search for a Travel Agent",
+                            hintStyle: TextStyle(
+                              fontSize: 12,
+                              color: Color(0xFF9E9DBD),
+                            ),
+                            prefixIcon: Icon(
+                              Icons.search,
+                              color: Color(0xFF9E9DBD),
+                              size: 18,
+                            ),
+                            border: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(12),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(12),
+                              borderSide: BorderSide(
+                                color: Colors.grey.shade200,
+                                width: 0.5,
+                              ),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(12),
+                              borderSide: BorderSide(
+                                color: Colors.grey.shade300,
+                                width: 1,
+                              ),
+                            ),
+                          ),
+                          style: GoogleFonts.poppins(fontSize: 12),
+                        ),
+                      ),
+                      // SizedBox(width: 16),
+                    ],
+                  ),
+              const SizedBox(height: 10),
+              FutureBuilder<List<dynamic>>(
+                future: futureUsers,
+                builder: (context, snapshot) {
+                  if (snapshot.connectionState == ConnectionState.waiting) {
+                    return const Center(child: CircularProgressIndicator());
+                  } else if (snapshot.hasError ||
+                      !snapshot.hasData ||
+                      snapshot.data!.isEmpty) {
+                    return Center(
+                      child: Padding(
+                        padding: const EdgeInsets.all(16.0),
+                        child: Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            // const Icon(Icons.error_outline,
+                            //     color: Colors.redAccent, size: 60),
+                            // const SizedBox(height: 16),
+                            // Text(
+                            //   "Oops!",
+                            //   style: GoogleFonts.poppins(
+                            //       fontSize: 20,
+                            //       fontWeight: FontWeight.bold,
+                            //       color: Colors.redAccent),
+                            // ),
+                            const SizedBox(height: 8),
+                            Text(
+                              "No Travel Agent Found",
+                              textAlign: TextAlign.center,
+                              style: GoogleFonts.poppins(
+                                fontSize: 20,
+                                fontWeight: FontWeight.bold,
+                                color: Colors.grey,
+                              ),
+                            ),
+                            const SizedBox(height: 20),
+                            Text(
+                              "Please Create Travel Agent",
+                              textAlign: TextAlign.center,
+                              style: GoogleFonts.poppins(
+                                fontSize: 16,
+                                color: Colors.grey,
+                              ),
+                            ),
+                            const SizedBox(height: 20),
+                          ],
+                        ),
+                      ),
+                    );
+                  }
+
+                  List<dynamic> users =
+                      filteredUsers.isNotEmpty ? filteredUsers : allUsers;
+
+                  users.sort((a, b) {
+                    DateTime dateA = DateTime.parse(a['created_on']);
+                    DateTime dateB = DateTime.parse(b['created_on']);
+
+                    return dateB.compareTo(dateA); // Descending: newest first
+                  });
+
+                  List paginatedUser =
+                      users
+                          .skip(currentPage * itemsPerPage)
+                          .take(itemsPerPage)
+                          .toList();
+
+                  Widget table = LayoutBuilder(
+                    builder: (context, constraints) {
+                      double minWidth = isDesktop ? constraints.maxWidth : 1300;
+
+                      return ConstrainedBox(
+                        constraints: BoxConstraints(minWidth: minWidth),
+                        child: DataTable(
+                          dividerThickness: 0.5,
+                          columnSpacing: isDesktop ? 24.0 : 16.0,
+                          border: TableBorder(
+                            horizontalInside: BorderSide(
+                              width: 0.5,
+                              color: Colors.grey.shade200,
+                            ),
+                          ),
+                          columns: [
+                            DataColumn(
+                              label: Text(
+                                'Name',
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                            ),
+                            DataColumn(
+                              label: Text(
+                                'Email ID',
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                            ),
+                            DataColumn(
+                              label: Text(
+                                'Role',
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                            ),
+                            DataColumn(
+                              label: Text(
+                                'Status',
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                            ),
+                            DataColumn(
+                              label: Text(
+                                'Actions',
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                            ),
+                          ],
+                          rows:
+                              paginatedUser.map((user) {
+                                String userId =
+                                    user['user_id'].toString(); // Get user ID
+                                bool isSelected = selectedUserId == userId;
+
+                                return DataRow(
+                                  cells: [
+                                    DataCell(
+                                      Text(
+                                        "${user['first_name'] ?? ''} ${user['last_name'] ?? ''}",
+                                        style: TextStyle(
+                                          fontSize: 13,
+                                          fontFamily: "Inter",
+                                        ),
+                                      ),
+                                    ),
+                                    DataCell(
+                                      Text(
+                                        user['email'] ?? '',
+                                        style: TextStyle(
+                                          fontSize: 13,
+                                          fontFamily: "Inter",
+                                        ),
+                                      ),
+                                    ),
+                                    DataCell(
+                                      Text(
+                                        user['role_value'] ?? 'N/A',
+                                        style: TextStyle(
+                                          fontSize: 13,
+                                          fontFamily: "Inter",
+                                        ),
+                                        softWrap: true,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    ),
+                                    DataCell(
+                                      MouseRegion(
+                                        cursor: SystemMouseCursors.click,
+                                        child: GestureDetector(
+                                          onTap: () {
+                                            handleToggleUserStatus(
+                                              user['user_id'],
+                                              user['is_active'],
+                                              user,
+                                            );
+                                          },
+                                          child: Text(
+                                            user['is_active'] == "1"
+                                                ? "Active"
+                                                : "Inactive",
+                                            style: TextStyle(
+                                              color:
+                                                  user['is_active'] == "1"
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                              fontFamily: "Inter",
+                                              fontWeight: FontWeight.w400,
+                                            ),
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                    DataCell(
+                                      UserActionsMenu(
+                                        user: user,
+                                        getUserDetails:
+                                            (id) =>
+                                                apiService.getSingleUser(id),
+                                      ),
+                                      // PopupMenuButton<int>(
+                                      //   color: Colors.white,
+                                      //   padding: EdgeInsets.zero,
+                                      //   offset: Offset(0, 30),
+                                      //   icon: Icon(
+                                      //     Icons.more_vert,
+                                      //     color: Color(0xFF475569),
+                                      //     size: 14,
+                                      //   ),
+                                      //   itemBuilder: (context) => [
+                                      //     CustomPopupMenuEntry(
+                                      //       child: Container(
+                                      //         padding: EdgeInsets.symmetric(
+                                      //             horizontal: 8, vertical: 8),
+                                      //         child: Row(
+                                      //           mainAxisSize: MainAxisSize.min,
+                                      //           mainAxisAlignment:
+                                      //               MainAxisAlignment.center,
+                                      //           children: [
+                                      //             IconButton(
+                                      //                 icon: Icon(
+                                      //                     Icons.remove_red_eye,
+                                      //                     color:
+                                      //                         Color(0xFF475569),
+                                      //                     size: 18),
+                                      //                 onPressed: () async {
+                                      //                   print(
+                                      //                       "USerDAta1 - $user");
+                                      //                   // Fetch the user data properly with await
+                                      //                   Map<String, dynamic>
+                                      //                       usersData =
+                                      //                       await apiService
+                                      //                           .getSingleUser(user[
+                                      //                                       'user_id']
+                                      //                                   is String
+                                      //                               ? int.parse(user[
+                                      //                                   'user_id'])
+                                      //                               : user[
+                                      //                                   'user_id']);
+                                      //
+                                      //                   print(
+                                      //                       "USerDAta2 - $usersData");
+                                      //
+                                      //                   // userSingleData =
+                                      //                   //     await apiService
+                                      //                   //         .getSingleUser(user[
+                                      //                   //             'user_id']);
+                                      //
+                                      //                   context.go(
+                                      //                     "/CreateTravelAgent",
+                                      //                     extra: {
+                                      //                       "selectedUser":
+                                      //                           usersData,
+                                      //                       "isViewMode": true
+                                      //                     },
+                                      //                   );
+                                      //                 }),
+                                      //             IconButton(
+                                      //               icon: Image.asset(
+                                      //                   'assets/images/IconsImg/edit.png',
+                                      //                   width: 20,
+                                      //                   height: 15),
+                                      //               onPressed: () async {
+                                      //                 // Fetch the user data properly with await
+                                      //                 Map<String, dynamic>
+                                      //                     usersData =
+                                      //                     await apiService
+                                      //                         .getSingleUser(user[
+                                      //                                     'user_id']
+                                      //                                 is String
+                                      //                             ? int.parse(user[
+                                      //                                 'user_id'])
+                                      //                             : user[
+                                      //                                 'user_id']);
+                                      //
+                                      //                 print(
+                                      //                     "USerDAta2 - $usersData");
+                                      //                 context.go(
+                                      //                   "/CreateTravelAgent",
+                                      //                   extra: {
+                                      //                     "selectedUser":
+                                      //                         usersData,
+                                      //                     "isViewMode": false
+                                      //                   },
+                                      //                 );
+                                      //               },
+                                      //             ),
+                                      //           ],
+                                      //         ),
+                                      //       ),
+                                      //     ),
+                                      //   ],
+                                      // ),
+                                      // Row(
+                                      //   children: [
+                                      //     MouseRegion(
+                                      //       cursor: user['is_active'] == "0"
+                                      //           ? SystemMouseCursors.forbidden
+                                      //           : SystemMouseCursors.click,
+                                      //       child: IconButton(
+                                      //         icon: Icon(Icons.remove_red_eye,
+                                      //             size: 18,
+                                      //             color: user['is_active'] == "0"
+                                      //                 ? Colors.grey
+                                      //                 : Color(0xFF475569)),
+                                      //         onPressed: user['is_active'] == "0"
+                                      //             ? null
+                                      //             : () {
+                                      //                 context.go(
+                                      //                   "/CreateTravelAgent",
+                                      //                   extra: {
+                                      //                     "selectedUser": user,
+                                      //                     "isViewMode": true
+                                      //                   },
+                                      //                 );
+                                      //               },
+                                      //       ),
+                                      //     ),
+                                      //
+                                      //     MouseRegion(
+                                      //       cursor: user['is_active'] == "0"
+                                      //           ? SystemMouseCursors.forbidden
+                                      //           : SystemMouseCursors.click,
+                                      //       child: GestureDetector(
+                                      //         onTap: user['is_active'] == "0"
+                                      //             ? null
+                                      //             : () {
+                                      //
+                                      //               },
+                                      //         child: Image.asset(
+                                      //             'assets/images/IconsImg/edit.png',
+                                      //             width: 20,
+                                      //             height: 15),
+                                      //       ),
+                                      //     ),
+                                      //
+                                      //     // MouseRegion(
+                                      //     //   cursor: user['is_active'] == "0"
+                                      //     //       ? SystemMouseCursors
+                                      //     //           .forbidden
+                                      //     //       : SystemMouseCursors.click,
+                                      //     //   child: IconButton(
+                                      //     //     icon: Icon(Icons.edit,
+                                      //     //         color:
+                                      //     //             user['is_active'] ==
+                                      //     //                     "0"
+                                      //     //                 ? Colors.grey
+                                      //     //                 : Colors.green),
+                                      //     //     onPressed:
+                                      //     //         user['is_active'] == "0"
+                                      //     //             ? null
+                                      //     //             : () {
+                                      //     //                 print(
+                                      //     //                     "USER: $user");
+                                      //     //
+                                      //     //                 // final userJson = jsonEncode(
+                                      //     //                 //     user); // Convert user map to string
+                                      //     //                 // final encodedUser =
+                                      //     //                 //     Uri.encodeComponent(
+                                      //     //                 //         userJson);
+                                      //     //
+                                      //     //                 context.go(
+                                      //     //                   "/CreateTravelAgent",
+                                      //     //                   extra: {
+                                      //     //                     "selectedUser":
+                                      //     //                         user,
+                                      //     //                     "isViewMode":
+                                      //     //                         false
+                                      //     //                   },
+                                      //     //                 );
+                                      //     //               },
+                                      //     //   ),
+                                      //     // ),
+                                      //   ],
+                                      // ),
+                                    ),
+                                  ],
+                                );
+                              }).toList(),
+                        ),
+                      );
+                    },
+                  );
+
+                  Widget buildMobileCardView(List<dynamic> paginatedUser) {
+                    return ListView.builder(
+                      itemCount: paginatedUser.length,
+                      itemBuilder: (context, index) {
+                        final user = paginatedUser[index];
+                        return Card(
+                          color: Colors.white,
+                          margin: EdgeInsets.symmetric(
+                            horizontal: 12,
+                            vertical: 6,
+                          ),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          elevation: 3,
+                          child: Padding(
+                            padding: const EdgeInsets.all(12.0),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                // Status and Employee Code
+                                Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Text(
+                                      user['role_value'] ?? 'N/A',
+                                      style: GoogleFonts.poppins(
+                                        fontSize: 10,
+                                        color: Colors.black87,
+                                        fontWeight: FontWeight.w700,
+                                      ),
+                                    ),
+
+                                    UserActionsMenu(
+                                      user: user,
+                                      getUserDetails:
+                                          (id) => apiService.getSingleUser(id),
+                                    ),
+                                    // PopupMenuButton<int>(
+                                    //   color: Colors.white,
+                                    //   padding: EdgeInsets.zero,
+                                    //   offset: Offset(0, 30),
+                                    //   icon: Icon(
+                                    //     Icons.more_vert,
+                                    //     color: Color(0xFF475569),
+                                    //     size: 14,
+                                    //   ),
+                                    //   itemBuilder: (context) => [
+                                    //     CustomPopupMenuEntry(
+                                    //       child: Container(
+                                    //         padding: EdgeInsets.symmetric(
+                                    //             horizontal: 8, vertical: 8),
+                                    //         child: Row(
+                                    //           mainAxisSize:
+                                    //               MainAxisSize.min,
+                                    //           mainAxisAlignment:
+                                    //               MainAxisAlignment.center,
+                                    //           children: [
+                                    //             IconButton(
+                                    //                 icon: Icon(
+                                    //                     Icons
+                                    //                         .remove_red_eye,
+                                    //                     color: Color(
+                                    //                         0xFF475569),
+                                    //                     size: 18),
+                                    //                 onPressed: () {
+                                    //                   print(
+                                    //                       "USerDAta - $user");
+                                    //                   // dynamic usersData = apiService
+                                    //                   //     .getSingleUser(user[
+                                    //                   //                 'user_id']
+                                    //                   //             is String
+                                    //                   //         ? int.parse(user[
+                                    //                   //             'user_id'])
+                                    //                   //         : user[
+                                    //                   //             'user_id']);
+                                    //                   //
+                                    //                   // print(
+                                    //                   //     "USerDAta - $usersData");
+                                    //
+                                    //                   context.go(
+                                    //                     "/CreateTravelAgent",
+                                    //                     extra: {
+                                    //                       "selectedUser":
+                                    //                           user,
+                                    //                       "isViewMode": true
+                                    //                     },
+                                    //                   );
+                                    //                 }),
+                                    //             IconButton(
+                                    //               icon: Image.asset(
+                                    //                   'assets/images/IconsImg/edit.png',
+                                    //                   width: 20,
+                                    //                   height: 15),
+                                    //               onPressed: () {
+                                    //                 context.go(
+                                    //                   "/CreateTravelAgent",
+                                    //                   extra: {
+                                    //                     "selectedUser":
+                                    //                         user,
+                                    //                     "isViewMode": false
+                                    //                   },
+                                    //                 );
+                                    //               },
+                                    //             ),
+                                    //           ],
+                                    //         ),
+                                    //       ),
+                                    //     ),
+                                    //   ],
+                                    // ),
+                                  ],
+                                ),
+
+                                SizedBox(height: 2),
+                                // Trip Id and Trip Name
+                                Row(
+                                  children: [
+                                    Column(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: [
+                                        Text(
+                                          "${user['first_name'] ?? ''} ${user['last_name'] ?? ''}",
+                                          style: GoogleFonts.poppins(
+                                            fontSize: 12,
+                                            color: Colors.black87,
+                                            fontWeight: FontWeight.w500,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ],
+                                ),
+                                SizedBox(height: 2),
+
+                                // Name
+                                Row(
+                                  children: [
+                                    Column(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: [
+                                        Text(
+                                          user['email'] ?? '',
+                                          style: GoogleFonts.poppins(
+                                            fontSize: 10,
+                                            color: Colors.black87,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                    Spacer(),
+                                    Column(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: [
+                                        GestureDetector(
+                                          onTap: () {
+                                            handleToggleUserStatus(
+                                              user['user_id'],
+                                              user['is_active'],
+                                              user,
+                                            );
+                                          },
+                                          child: Text(
+                                            user['is_active'] == "1"
+                                                ? "Active"
+                                                : "Inactive",
+                                            style: TextStyle(
+                                              color:
+                                                  user['is_active'] == "1"
+                                                      ? Colors.green
+                                                      : Colors.grey,
+                                              fontFamily: "Inter",
+                                              fontSize: 11,
+                                              fontWeight: FontWeight.w400,
+                                            ),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ],
+                                ),
+                                // Actions
+                                // Actions
+                              ],
+                            ),
+                          ),
+                        );
+                      },
+                    );
+                  }
+
+                  return Expanded(
+                    child: Column(
+                      // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        // Expanded(
+                        //   child:
+                        //       isDesktop
+                        //           ? SingleChildScrollView(
+                        //             scrollDirection: Axis.vertical,
+                        //             child: table, // <-- your existing table
+                        //           )
+                        //           : buildMobileCardView(paginatedUser),
+                        // ),
+                        Expanded(
+                          child:
+                              isDesktop
+                                  ? (searchController.text.isNotEmpty &&
+                                          filteredUsers.isEmpty
+                                      ? Center(
+                                        child: Text(
+                                          "No Travel Agents found",
+                                          style: GoogleFonts.poppins(
+                                            fontSize: 14,
+                                            color: Colors.grey,
+                                          ),
+                                        ),
+                                      )
+                                      : SingleChildScrollView(
+                                        scrollDirection: Axis.vertical,
+                                        child: table,
+                                      ))
+                                  : (searchController.text.isNotEmpty &&
+                                          filteredUsers.isEmpty
+                                      ? Center(
+                                        child: Text(
+                                          "No Travel Agents found",
+                                          style: GoogleFonts.poppins(
+                                            fontSize: 14,
+                                            color: Colors.grey,
+                                          ),
+                                        ),
+                                      )
+                                      : buildMobileCardView(paginatedUser)),
+                          // child: isDesktop
+                          //     ? SingleChildScrollView(
+                          //         scrollDirection: Axis.vertical,
+                          //         child: table, // <-- your existing table
+                          //       )
+                          //     : buildMobileCardView(paginatedPlans),
+                        ),
+
+                        PaginationControls(
+                          currentPage: currentPage,
+                          itemsPerPage: itemsPerPage,
+                          totalItems: users.length,
+                          activeColor: layoutColor, // your theme color
+                          onPageChanged: (page) {
+                            setState(() {
+                              currentPage = page;
+                            });
+                          },
+                          onItemsPerPageChanged: (items) {
+                            setState(() {
+                              itemsPerPage = items;
+                              currentPage = 0;
+                            });
+                          },
+                        ),
+                      ],
+                    ),
+                  );
+                },
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/Screens/userManagement/create_traveller_agent/personalDetailsTravelAgent.dart b/lib/Screens/userManagement/create_traveller_agent/personalDetailsTravelAgent.dart
new file mode 100644
index 0000000..87abaf7
--- /dev/null
+++ b/lib/Screens/userManagement/create_traveller_agent/personalDetailsTravelAgent.dart
@@ -0,0 +1,1554 @@
+import 'dart:convert';
+import 'dart:io' as html;
+
+import 'package:dropdown_search/dropdown_search.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:http/http.dart' as http;
+import 'package:intl/intl.dart';
+
+import '../../../services/apiService.dart';
+import '../../../utils/auth_utils.dart';
+import '../../../widgets/custom_user_form.dart';
+import '../../../config/apiUrl.dart';
+import '../create_user/change_password.dart';
+
+class PersonalDetails extends StatefulWidget {
+  final GlobalKey<PersonalDetailsState> personalDetailsKey;
+  final Map<String, TextEditingController> controllers;
+  final Map<String, String> errorMessages;
+  final bool isDesktop;
+  final bool isViewMode;
+  final bool apiselectedUser;
+
+  final Function(List<Map<String, dynamic>>)? onServiceIdsChanged;
+
+  final ValueChanged<String?>? onGenderChanged;
+  final ValueChanged<String?>? onCountryChanged;
+  final ValueChanged<String?>? onRoleChanged;
+  final void Function(bool)? onUserTypeChanged;
+  final List<Map<String, dynamic>>? initialSelectedServices;
+
+  final String? selectedGender;
+  final String? selectedCountry;
+  final String? selectedRole;
+  final String? userIdApi;
+
+  // const PersonalDetails(this.isDesktop, this.isViewMode, {super.key},);
+  const PersonalDetails({
+    Key? key,
+    this.selectedGender,
+    this.selectedCountry,
+    this.selectedRole,
+    this.onServiceIdsChanged,
+    required this.personalDetailsKey,
+    this.initialSelectedServices,
+    required this.controllers,
+    required this.errorMessages,
+    required this.isDesktop,
+    required this.isViewMode,
+    required this.apiselectedUser,
+    this.onGenderChanged,
+    this.onCountryChanged,
+    this.onRoleChanged,
+    this.onUserTypeChanged,
+    this.userIdApi,
+  }) : super(key: key);
+
+  @override
+  PersonalDetailsState createState() => PersonalDetailsState();
+}
+
+class PersonalDetailsState extends State<PersonalDetails> {
+  final ApiService apiService = ApiService();
+
+  late Map<String, String> countryMap; // Mapping country_code -> country_name
+  late List<String> countryCodes; // List of country codes
+  late List<dynamic>? apiCountryData;
+  late List<dynamic>? apiRoleData;
+  List<dynamic>? apiAllServices;
+  Map<String, dynamic>? selectedOrg;
+  List<Map<String, dynamic>> selectedServiceIds = [];
+  Map<String, FocusNode> focusNodes = {};
+  Map<String, bool> focusStates = {};
+
+  String? get selectedGenderValue => selectedGender;
+  String? get selectedCountryValue => selectedCountry;
+  String? get selectedRoleValue => selectedRole;
+
+  late bool isTravelAgent = false;
+
+  String? selectedTab;
+
+  String? selectedCountry;
+  String? selectedGender;
+
+  String? selectedUserType;
+  String? selectedRole;
+  String? selectedLevel;
+  String? selectedDepartment;
+  String? selectedFirstApprover;
+  String? selectedSecondApprover;
+  String? selectedThirdApprover;
+
+  String? selectedFileNames;
+  Uint8List? passportDocumentBytes;
+  String? passportFileUrlFromApi;
+  String? base64PDF;
+
+  html.File? passportFile;
+
+  List<String> dataHeader = [
+    "Fname",
+    "Lname",
+    "email",
+    "password",
+    "dob",
+    "gender",
+    "mobileNumber",
+    "alternateMobile",
+    "address",
+    "postalCode",
+    "country",
+    "passportNumber",
+    "placeOfIssue",
+    "passportDoc",
+    "userType",
+    "roleId",
+    "deptId",
+    "levelId",
+    "firstApproval",
+    "secondApproval",
+    "thirdApproval",
+    "employeeCode",
+    "dateOfIssue",
+    "dateOfExpiry",
+    "changePassword",
+  ];
+
+  Color? layoutColor;
+  Color? bodyColor;
+
+  final Map<String, TextEditingController> controllers = {};
+  Map<String, String> errorMessages2 = {};
+
+  @override
+  void initState() {
+    super.initState();
+
+    apiCountryData = null;
+
+    apiRoleData = null;
+    selectedGender = widget.selectedGender;
+    selectedCountry = widget.selectedCountry;
+    selectedRole = widget.selectedRole;
+    fetchRoles();
+    fetchCountries();
+    selectedServiceIds = List<Map<String, dynamic>>.from(
+      widget.initialSelectedServices ?? [],
+    );
+
+    print("selectedServiceIdsAPI - $selectedServiceIds");
+
+    for (var field in dataHeader) {
+      focusNodes["${field}FocusNode"] = FocusNode();
+      focusStates["${field}Focused"] = false;
+    }
+
+    for (var key in focusNodes.keys) {
+      _addFocusListener(focusNodes[key]!, (focus) {
+        setState(() {
+          focusStates[key.replaceFirst("FocusNode", "Focused")] = focus;
+        });
+      });
+    }
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      loadAllServices();
+      getOrganizationData();
+      loadInitialData();
+    });
+  }
+
+  @override
+  void dispose() {
+    for (var node in focusNodes.values) {
+      node.dispose();
+    }
+
+    super.dispose();
+  }
+
+  void _addFocusListener(FocusNode node, Function(bool) updateState) {
+    node.addListener(() {
+      setState(() {
+        updateState(node.hasFocus);
+      });
+    });
+  }
+
+  Future<void> apiCheckDuplicate(
+    String label,
+    String field,
+    String value,
+    String? userId,
+  ) async {
+    try {
+      // Basic validation: Check mobile number length
+      if (field == "mobile_no" && value.length != 10) {
+        _clearError(field);
+        widget.errorMessages[field] = "$label is invalid";
+        print("Validation failed: $label is too short.");
+        return; // Skip the API call if input is invalid
+      }
+
+      final response = await apiService.CheckDuplicate(
+        label,
+        field,
+        value,
+        userId,
+      );
+      if (response.isNotEmpty) {
+        _clearError(field);
+        widget.errorMessages[field] =
+            response['message'] ?? "$label Already Exists";
+        print("Duplicate found: ${response['message']}");
+        return;
+      } else {
+        _clearError(field);
+        print("No duplicates found.");
+      }
+    } catch (e) {
+      print("Error in checkDuplicate: $e");
+    }
+  }
+
+  void _clearError(String field) {
+    setState(() {
+      widget.errorMessages.remove(field);
+    });
+  }
+
+  void loadInitialData() async {
+    String? layoutString = await getLayoutColor();
+    String? bodyStringColor = await getBodyColor();
+
+    setState(() {
+      layoutColor =
+          layoutString != null
+              ? Color(int.parse(layoutString))
+              : Colors.redAccent;
+
+      bodyColor =
+          bodyStringColor != null
+              ? Color(int.parse(bodyStringColor))
+              : Colors.white;
+    });
+  }
+
+  Future<void> fetchRoles() async {
+    try {
+      final response = await apiService.fetchMasterDropdown();
+
+      if (response is Map<String, dynamic> && response.containsKey("role")) {
+        List<dynamic> roleList = response["role"]; // Extract the list
+
+        if (!mounted) return;
+        setState(() {
+          final filteredRole = roleList.where((item) => item['dropdown_key'] == '5').toList();
+          apiRoleData = filteredRole;
+        });
+        print("APIROLEData - $apiRoleData");
+      } else {
+        print("Error: 'role' key not found or response is not a Map.");
+      }
+    } catch (e) {
+      print('Error fetching role list: $e');
+    }
+  }
+
+  Future<void> fetchCountries() async {
+    try {
+      List<dynamic> countries = await apiService.fetchCountryList();
+      setState(() {
+        apiCountryData = countries;
+      });
+    } catch (e) {
+      print('Error fetching country list: $e');
+    }
+  }
+
+  Future<void> getOrganizationData() async {
+    try {
+      print("getUpdatedServices");
+
+      final result = await apiService.fetchOrganization();
+      print("UUPdatedServices - $result");
+      setState(() {
+        final servicesRaw = selectedOrg?['services_ids'];
+
+        List<dynamic> services;
+
+        if (servicesRaw is String) {
+          try {
+            services = jsonDecode(servicesRaw);
+          } catch (e) {
+            print('❌ Failed to decode services_ids: $e');
+            services = [];
+          }
+        } else if (servicesRaw is List) {
+          services = servicesRaw;
+        } else {
+          services = [];
+        }
+
+        if (selectedServiceIds.isEmpty && services.isNotEmpty) {
+          selectedServiceIds =
+              services.map<Map<String, dynamic>>((item) {
+                final map = Map<String, dynamic>.from(item);
+                return {"service_id": map['service_id'].toString()};
+              }).toList();
+        }
+
+        // selectedServiceIds = services.map<Map<String, dynamic>>((item) {
+        //   // force cast or copy to a regular map
+        //   final map = Map<String, dynamic>.from(item);
+        //   return {
+        //     "service_id": map['service_id'].toString(),
+        //   };
+        // }).toList();
+      });
+
+      // orgId = await getOrgId();
+
+      print("selectedOrg - $selectedOrg");
+    } catch (e) {
+      print('Error fetching updatedServices list: $e');
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: MediaQuery.of(context).size.height,
+      decoration: BoxDecoration(
+        border: Border(
+          top: BorderSide(
+            color: Colors.blueGrey.shade300, // Set your desired color
+            width: 0.09, // Set border thickness
+          ),
+        ),
+      ),
+      child: SingleChildScrollView(
+        scrollDirection: Axis.vertical,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            SizedBox(height: 10),
+            _buildFirstRow(widget.isDesktop),
+            SizedBox(height: 10),
+            _buildSecondRow(widget.isDesktop),
+            SizedBox(height: 10),
+            _buildThirdRow(widget.isDesktop),
+            SizedBox(height: 10),
+            _buildForthRow(widget.isDesktop),
+            SizedBox(height: 10),
+            _buildServices(widget.isDesktop),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> loadAllServices() async {
+    try {
+      final result = await apiService.fetchAllServices();
+      setState(() {
+        // apiAllServices = result;
+        setState(() {
+          apiAllServices =
+              result
+                ..sort((a, b) => (a['order'] ?? 0).compareTo(b['order'] ?? 0));
+        });
+      });
+      print("Fetched services: $apiAllServices");
+    } catch (e) {
+      print('Error fetching role list: $e');
+    }
+  }
+
+  Widget _buildServices(bool isDesktop) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Services",
+          style: GoogleFonts.poppins(
+            fontSize: 14,
+            fontWeight: FontWeight.w400,
+            color: Colors.black,
+          ),
+          // style: TextStyle(
+          //     fontFamily: "Archivo",
+          //     fontSize: 14,
+          //     fontWeight: FontWeight.w600,
+          //     color: Color(0xFF212121)),
+        ),
+        SizedBox(height: 10),
+        Container(
+          decoration: BoxDecoration(
+            border: Border.all(color: Color(0xFFF4F4FB)),
+            borderRadius: BorderRadius.circular(1),
+            // color: bodyColor,
+            // color: Color(0xFFF5F5F5),
+            color: Colors.white,
+          ),
+          padding: EdgeInsets.only(left: 5, right: 5, top: 15, bottom: 5),
+          child:
+              isDesktop
+                  ? Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    // mainAxisSize: MainAxisSize.min,
+                    children: _buildOptions(),
+                  )
+                  : Expanded(
+                    child: SingleChildScrollView(
+                      scrollDirection: Axis.horizontal,
+                      child: Row(children: _buildOptions()),
+                    ),
+                  ),
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildOptions() {
+    if (apiAllServices == null) return [];
+
+    return apiAllServices!.map((service) {
+      return Padding(
+        padding: const EdgeInsets.only(right: 20.0),
+        child: _buildOption(service),
+      );
+    }).toList();
+  }
+
+  Widget _buildOption(Map<String, dynamic> service) {
+    String name = service['name'];
+    String iconUrl = service['icon']; // Can be empty string
+
+    IconData fallbackIcon = _getLocalIconForService(name);
+
+    String serviceId = service['service_id'].toString();
+    // bool isSelected = selectedServiceIds.contains(serviceId);
+    bool isSelected = selectedServiceIds.any(
+      (item) => item["service_id"] == serviceId,
+    );
+
+    return GestureDetector(
+      onTap: () {
+        setState(() {
+          String serviceId = service['service_id'].toString();
+
+          // Check if already selected
+          int existingIndex = selectedServiceIds.indexWhere(
+            (item) => item["service_id"] == serviceId,
+          );
+
+          if (existingIndex != -1) {
+            selectedServiceIds.removeAt(existingIndex);
+          } else {
+            selectedServiceIds.add({"service_id": serviceId});
+          }
+          print("selectedServiceIdsUser --- $selectedServiceIds");
+          print(
+            "selectedServiceIdsUser1 --- ${json.encode(selectedServiceIds)}",
+          );
+          // Call the parent's callback
+          widget.onServiceIdsChanged!(selectedServiceIds);
+          // widget.onServiceIdsChanged!(selectedServiceIds);
+        });
+      },
+      child: Row(
+        children: [
+          iconUrl.isNotEmpty
+              ? Image.network(
+                iconUrl,
+                width: 18,
+                height: 18,
+                errorBuilder: (context, error, stackTrace) {
+                  return Icon(
+                    fallbackIcon,
+                    size: 18,
+                    color:
+                        isSelected == name
+                            ? Color(0xFF114D8B)
+                            : Color(0xFF475569),
+                  );
+                },
+              )
+              : Icon(
+                fallbackIcon,
+                size: 18,
+                color:
+                    isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569),
+              ),
+
+          SizedBox(width: 5),
+
+          SizedBox(width: 5),
+          Text(
+            name,
+            style: GoogleFonts.poppins(
+              fontSize: 12,
+              color: isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569),
+              fontWeight:
+                  isSelected == name ? FontWeight.bold : FontWeight.w500,
+            ),
+          ),
+
+          SizedBox(width: 5),
+          // if (selectedListOption == title && widget.isViewMode == false)
+          Container(
+            height: 15,
+            width: 15,
+            decoration: BoxDecoration(
+              shape: BoxShape.rectangle,
+              border: Border.all(
+                color: isSelected ? Colors.green : Colors.grey.shade400,
+                width: isSelected ? 2 : 1,
+              ),
+            ),
+            child: Icon(
+              Icons.check,
+              size: 10,
+
+              color: isSelected ? Colors.green : Colors.white10,
+              // color: Colors.grey,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  IconData _getLocalIconForService(String name) {
+    switch (name.toLowerCase()) {
+      case 'flight':
+        return Icons.flight_takeoff_outlined;
+      case 'train':
+        return Icons.train_outlined;
+      case 'bus':
+        return Icons.bus_alert_outlined;
+      case 'taxi':
+        return Icons.local_taxi_outlined;
+      case 'accomodation':
+        return Icons.local_hotel_outlined;
+      case 'forex':
+        return Icons.attach_money_outlined;
+      case 'insurance':
+        return Icons.list_alt_outlined;
+      case 'visa':
+        return Icons.badge_outlined;
+      case 'miscellaneous':
+        return Icons.card_giftcard_outlined;
+      default:
+        return Icons.circle_notifications;
+    }
+  }
+
+  Widget _buildFirstRow(bool isDesktop) {
+    return Container(
+      color: Colors.white,
+      child:
+          widget.isDesktop
+              ? Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  buildFirstNameField(),
+                  Spacer(),
+                  buildLastNameField(),
+                  Spacer(), // Space after Last Name
+                  buildGenderField(),
+                  SizedBox(width: 15),
+                  buildDobField(),
+                ],
+              )
+              : Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  buildFirstNameField(),
+                  SizedBox(height: 8), // Vertical space
+                  buildLastNameField(),
+                  SizedBox(height: 8),
+                  buildGenderField(),
+                  SizedBox(height: 8),
+                  buildDobField(),
+                ],
+              ),
+    );
+  }
+
+  Widget _buildSecondRow(bool isDesktop) {
+    return Container(
+      color: Colors.white,
+      child:
+          widget.isDesktop
+              ? Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  buildEmailField(),
+                  Spacer(),
+                  buildMobileField(),
+                  Spacer(), // Space after Last Name
+                  buildAlternateMobileField(),
+                ],
+              )
+              : Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  buildMobileField(),
+                  SizedBox(height: 8), // Vertical space
+                  buildAlternateMobileField(),
+                  SizedBox(height: 8),
+                  buildEmailField(),
+                ],
+              ),
+    );
+  }
+
+  Widget _buildThirdRow(bool isDesktop) {
+    void _openPopup() {
+      final emailValue = widget.controllers["email"]?.text ?? "";
+      final updaterUserId = widget.userIdApi ?? "";
+
+      showDialog(
+        context: context,
+        builder: (context) {
+          return ChangePasswordDialogData(
+            updaterEmail: emailValue,
+            updaterUserId: updaterUserId,
+            layoutColor: layoutColor,
+            isDesktop: widget.isDesktop,
+          );
+        },
+      );
+    }
+
+    return Container(
+      color: Colors.white,
+      child:
+          isDesktop
+              ? !widget.apiselectedUser
+                  ? Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if (!widget.apiselectedUser) ...[
+                        buildPassword(),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width * 0.015,
+                        ),
+                        buildRole(),
+                      ]
+                    ],
+                  )
+                  : Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Container(
+                        width:
+                            isDesktop
+                                ? MediaQuery.of(context).size.width * 0.25
+                                : MediaQuery.of(context).size.width * 0.8,
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.end,
+                          children: [
+                            TextButton(
+                              onPressed: () => _openPopup(),
+                              style: TextButton.styleFrom(
+                                foregroundColor: Color(0xFF114D8B),
+                                textStyle: GoogleFonts.poppins(
+                                  fontSize: 12,
+                                  fontWeight: FontWeight.w400,
+                                ),
+                              ),
+                              child: Text("Change Password"),
+                            ),
+                          ],
+                        ),
+                      ),
+
+                      SizedBox(height: 1),
+                      buildRole(),
+                    ],
+                  )
+              : Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  if (!widget.apiselectedUser) ...[
+                    buildPassword(),
+                    SizedBox(height: 8),
+                    buildRole(),
+                  ] else ...[
+                    Container(
+                      width:
+                          isDesktop
+                              ? MediaQuery.of(context).size.width * 0.25
+                              : MediaQuery.of(context).size.width * 0.8,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children: [
+                          TextButton(
+                            onPressed: () => _openPopup(),
+                            style: TextButton.styleFrom(
+                              foregroundColor: Color(0xFF114D8B),
+                              textStyle: GoogleFonts.poppins(
+                                fontSize: 12,
+                                fontWeight: FontWeight.w400,
+                              ),
+                            ),
+                            child: Text("Change Password"),
+                          ),
+                        ],
+                      ),
+                    ),
+                    SizedBox(height: 1),
+                    buildRole(),
+                  ],
+                ],
+              ),
+    );
+  }
+
+  Widget _buildForthRow(bool isDesktop) {
+    return Container(
+      color: Colors.white,
+      child:
+          isDesktop
+              ? Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  buildAddress(),
+                  Spacer(),
+                  // SizedBox(width: 15),
+                  buildCountryField(),
+                  Spacer(),
+                  // SizedBox(width: 15),
+                  buildPostalCodeField(),
+                ],
+              )
+              : Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  buildAddress(),
+                  SizedBox(height: 8), //
+                  buildCountryField(),
+                  SizedBox(height: 8), // Vertical space
+                  buildPostalCodeField(),
+                ],
+              ),
+    );
+  }
+
+  Widget buildFirstNameField() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "First Name *",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: focusStates["FnameFocused"] ?? false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: TextField(
+              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              focusNode: focusNodes["FnameFocusNode"],
+              controller: widget.controllers["Fname"],
+              enabled: !widget.isViewMode,
+              onChanged: (value) {
+                _clearError("first_name");
+              },
+              decoration: InputDecoration(
+                labelText: "FirstName",
+                labelStyle: GoogleFonts.poppins(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w400,
+                  color: Colors.grey,
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.symmetric(vertical: 16),
+              ),
+            ),
+          ),
+        ),
+        if (widget.errorMessages["first_name"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            widget.errorMessages["first_name"]!,
+            style: GoogleFonts.poppins(color: Colors.red, fontSize: 12),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget buildLastNameField() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Last Name*",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: focusStates["LnameFocused"] ?? false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: TextField(
+              style: TextStyle(fontSize: 12, color: Colors.black),
+              focusNode: focusNodes["LnameFocusNode"],
+              controller: widget.controllers["Lname"],
+              enabled: !widget.isViewMode,
+              onChanged: (value) {
+                _clearError("last_name");
+              },
+              decoration: InputDecoration(
+                labelText: "LastName",
+                labelStyle: TextStyle(fontSize: 12, color: Colors.grey),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.symmetric(vertical: 16),
+              ),
+            ),
+          ),
+        ),
+        if (widget.errorMessages["last_name"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            widget.errorMessages["last_name"]!,
+            style: GoogleFonts.poppins(color: Colors.red, fontSize: 12),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget buildGenderField() {
+    List<String> genderOptions = ["Male", "Female"];
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Gender",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          width:
+              widget.isDesktop
+                  ? MediaQuery.of(context).size.width * 0.12
+                  : null,
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: DropdownSearch<String>(
+              selectedItem: selectedGender,
+              enabled: !widget.isViewMode,
+
+              popupProps: PopupProps.menu(
+                showSearchBox: false, // Set true if you want search
+                fit: FlexFit.loose,
+                constraints: BoxConstraints(maxHeight: 200),
+                itemBuilder:
+                    (context, item, isSelected) => Container(
+                      color: Colors.white,
+                      padding: EdgeInsets.symmetric(
+                        horizontal: 10,
+                        vertical: 6,
+                      ),
+                      child: Text(
+                        item,
+                        style: GoogleFonts.poppins(fontSize: 11.5),
+                      ),
+                    ),
+              ),
+              items: genderOptions,
+              dropdownDecoratorProps: DropDownDecoratorProps(
+                dropdownSearchDecoration: InputDecoration(
+                  border: InputBorder.none,
+                  contentPadding: EdgeInsets.symmetric(horizontal: 1),
+                ),
+              ),
+              dropdownBuilder:
+                  (context, selectedItem) => Align(
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      selectedItem ?? "Select Gender",
+                      style: GoogleFonts.poppins(
+                        fontSize: 12,
+                        color: Colors.black,
+                      ),
+                    ),
+                  ),
+              onChanged:
+                  widget.isViewMode
+                      ? null
+                      : (String? newValue) {
+                        setState(() {
+                          selectedGender = newValue;
+                          print("selectedGender - $selectedGender");
+                        });
+                        widget.onGenderChanged?.call(newValue);
+                      },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildDobField() {
+    DateTime? _selectedDateOfBirth;
+
+    Future<void> _selectCheckDateOfBirth(BuildContext context) async {
+      DateTime now = DateTime.now();
+      DateTime today = DateTime(now.year, now.month, now.day);
+
+      DateTime? pickedDate = await showDatePicker(
+        context: context,
+        initialDate:
+            _selectedDateOfBirth != null && _selectedDateOfBirth!.isAfter(today)
+                ? _selectedDateOfBirth!
+                : today,
+        firstDate: DateTime(1900),
+        // lastDate: DateTime(2100),
+        lastDate: today,
+        initialEntryMode: DatePickerEntryMode.calendarOnly,
+      );
+
+      if (pickedDate != null && pickedDate != _selectedDateOfBirth) {
+        setState(() {
+          _selectedDateOfBirth = pickedDate;
+          widget.controllers["dob"]?.text = DateFormat(
+            'dd-MM-yyyy',
+          ).format(pickedDate);
+        });
+      }
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Date of Birth",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          width:
+              widget.isDesktop
+                  ? MediaQuery.of(context).size.width * 0.12
+                  : null,
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: GestureDetector(
+              onTap:
+                  widget.isViewMode
+                      ? null
+                      : () async {
+                        await _selectCheckDateOfBirth(context);
+                        if (widget.controllers["dob"]!.text.isNotEmpty) {
+                          setState(() {
+                            // errorMessages.remove("start_date");
+                          });
+                        }
+                      },
+              child: AbsorbPointer(
+                child: TextField(
+                  controller: widget.controllers["dob"],
+                  readOnly: true,
+                  style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+                  decoration: InputDecoration(
+                    labelText: "Select Date",
+                    labelStyle: GoogleFonts.poppins(
+                      fontSize: 12,
+                      fontWeight: FontWeight.w400,
+                      color: Colors.grey,
+                    ),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
+                    border: InputBorder.none,
+                    contentPadding: EdgeInsets.symmetric(vertical: 16),
+                    suffixIcon: Icon(
+                      Icons.calendar_today,
+                      size: 16,
+                      color: Color(0xFF8B8FB2),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildEmailField() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Email *",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: TextField(
+              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              controller: widget.controllers["email"],
+              onChanged: (value) {
+                _clearError("email");
+                apiCheckDuplicate("Email", "email", value, widget.userIdApi);
+              },
+              enabled: !widget.isViewMode,
+              decoration: InputDecoration(
+                labelText: "Email",
+                labelStyle: GoogleFonts.poppins(
+                  fontSize: 12,
+                  color: Colors.grey,
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.symmetric(vertical: 16),
+              ),
+            ),
+          ),
+        ),
+        if (widget.errorMessages["email"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            widget.errorMessages["email"]!,
+            style: GoogleFonts.poppins(color: Colors.red, fontSize: 12),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget buildMobileField() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Mobile Number *",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: TextField(
+              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              controller: widget.controllers["mobileNumber"],
+              enabled: !widget.isViewMode,
+              onChanged: (value) {
+                _clearError("mobile_no");
+                apiCheckDuplicate(
+                  "Mobile Number",
+                  "mobile_no",
+                  value,
+                  widget.userIdApi,
+                );
+              },
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
+              inputFormatters: [
+                FilteringTextInputFormatter.allow(
+                  RegExp(r'^\d*\.?\d*$'),
+                ), // Allow only positive numbers with optional decimal
+              ],
+              decoration: InputDecoration(
+                labelText: "Mobile Number",
+                labelStyle: GoogleFonts.poppins(
+                  fontSize: 12,
+                  color: Colors.grey,
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.symmetric(vertical: 16),
+              ),
+            ),
+          ),
+        ),
+        if (widget.errorMessages["mobile_no"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            widget.errorMessages["mobile_no"]!,
+            style: GoogleFonts.poppins(color: Colors.red, fontSize: 12),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget buildAlternateMobileField() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Alternate Mobile Number",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: TextField(
+              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              controller: widget.controllers["alternateMobile"],
+              enabled: !widget.isViewMode,
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
+              inputFormatters: [
+                FilteringTextInputFormatter.allow(
+                  RegExp(r'^\d*\.?\d*$'),
+                ), // Allow only positive numbers with optional decimal
+              ],
+              decoration: InputDecoration(
+                labelText: "Alternate Number",
+                labelStyle: GoogleFonts.poppins(
+                  fontSize: 12,
+                  color: Colors.grey,
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.symmetric(vertical: 16),
+              ),
+            ),
+          ),
+        ),
+        if (widget.errorMessages["alternate_mobile_no"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            widget.errorMessages["alternate_mobile_no"]!,
+            style: GoogleFonts.poppins(color: Colors.red, fontSize: 12),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget buildCountryField() {
+    late Map<String, String> countryMap; // Mapping country_code -> country_name
+    late List<String> countryCodes; // List of country codes
+    List<dynamic> countryList = apiCountryData ?? [];
+
+    countryList = apiCountryData ?? [];
+
+    // Map country codes to country names
+    countryMap = {
+      for (var item in countryList)
+        item['country_code'] as String: item['country_name'] as String,
+        // item['currency'] as String
+    };
+
+    // Extract only country codes for processing
+    countryCodes = countryMap.keys.toList();
+
+    selectedCountry ??= null;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Country",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: DropdownSearch<String>(
+              selectedItem: countryMap[selectedCountry],
+              enabled: !widget.isViewMode,
+              popupProps: PopupProps.menu(
+                showSearchBox: true, // Enables search functionality
+                fit: FlexFit.loose, // Allows flexible height
+                menuProps: const MenuProps(backgroundColor: Colors.white),
+                itemBuilder:
+                    (context, item, isSelected) => Container(
+                      padding: EdgeInsets.symmetric(
+                        horizontal: 10,
+                        vertical: 6,
+                      ),
+                      child: Text(
+                        item,
+                        style: GoogleFonts.poppins(fontSize: 11.5),
+                      ),
+                    ),
+                constraints: BoxConstraints(maxHeight: 200),
+                searchFieldProps: TextFieldProps(
+                  decoration: InputDecoration(
+                    hintText: "Search Country...",
+                    contentPadding: EdgeInsets.symmetric(horizontal: 10),
+                  ),
+                ),
+              ),
+              items: countryMap.values.toList(),
+              dropdownDecoratorProps: DropDownDecoratorProps(
+                dropdownSearchDecoration: InputDecoration(
+                  border: InputBorder.none,
+                  contentPadding: EdgeInsets.symmetric(horizontal: 1),
+                ),
+              ),
+              dropdownBuilder:
+                  (context, selectedItem) => Align(
+                    // Center-align selected item
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      selectedItem ?? "Select Country",
+                      style: GoogleFonts.poppins(
+                        fontSize: 12,
+                        color: Colors.black,
+                      ),
+                    ),
+                  ),
+
+              // onChanged: widget.isViewMode
+              //     ? null
+              //     : (String? newValue) {
+              //         setState(() {
+              //           // Find the country_code based on selected country_name
+              //           selectedCountry = countryMap.entries
+              //               .firstWhere((entry) => entry.value == newValue)
+              //               .key;
+              //
+              //           // if (selectedCountry!.isNotEmpty) {
+              //           //   errorMessages.remove("country_code");
+              //           // }
+              //         });
+              //         widget.onCountryChanged?.call(newValue);
+              //       },
+              onChanged:
+                  widget.isViewMode
+                      ? null
+                      : (String? newValue) {
+                        if (newValue == null) return;
+
+                        final countryCode =
+                            countryMap.entries
+                                .firstWhere((entry) => entry.value == newValue)
+                                .key;
+
+                        setState(() {
+                          selectedCountry = countryCode;
+                        });
+
+                        widget.onCountryChanged?.call(
+                          countryCode,
+                        ); // ✅ send code not name
+                      },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildPostalCodeField() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Postal Code",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: TextField(
+              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              controller: widget.controllers["postalCode"],
+              enabled: !widget.isViewMode,
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
+              inputFormatters: [
+                FilteringTextInputFormatter.allow(
+                  RegExp(r'^\d*\.?\d*$'),
+                ), // Allow only positive numbers with optional decimal
+              ],
+              decoration: InputDecoration(
+                labelText: "Postal Code",
+                labelStyle: GoogleFonts.poppins(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w400,
+                  color: Colors.grey,
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.symmetric(vertical: 16),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildRole() {
+
+    Map<String, String> roleMap = {
+      for (var item in apiRoleData ?? [])
+        item['dropdown_key'] as String: item['dropdown_value'] as String,
+    };
+
+    // List<String> roleNames = roleMap.values.toList();
+    List<String> roleNames = roleMap.values.take(5).toList();
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Role",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: DropdownSearch<String>(
+              selectedItem: roleMap[selectedRole] ,
+              enabled: false, //enabled: !widget.isViewMode,
+              popupProps: PopupProps.menu(
+                showSearchBox: true,
+                fit: FlexFit.loose,
+                constraints: BoxConstraints(maxHeight: 250),
+                menuProps: const MenuProps(backgroundColor: Colors.white),
+                itemBuilder:
+                    (context, item, isSelected) => Container(
+                  color: Colors.white,
+                  padding: EdgeInsets.symmetric(
+                    horizontal: 10,
+                    vertical: 6,
+                  ),
+                  child: Text(
+                    item,
+                    style: GoogleFonts.poppins(fontSize: 11.5),
+                  ),
+                ),
+                searchFieldProps: TextFieldProps(
+                  decoration: InputDecoration(
+                    hintText: "Search Role...",
+                    contentPadding: EdgeInsets.symmetric(horizontal: 10),
+                  ),
+                ),
+              ),
+              items: roleNames,
+              dropdownDecoratorProps: DropDownDecoratorProps(
+                dropdownSearchDecoration: InputDecoration(
+                  border: InputBorder.none,
+                  contentPadding: EdgeInsets.symmetric(horizontal: 1),
+                ),
+              ),
+              dropdownBuilder:
+                  (context, selectedItem) => Align(
+                alignment: Alignment.centerLeft,
+                child: Text(
+                  selectedItem ?? "Select Role",
+                  style: GoogleFonts.poppins(
+                    fontSize: 12,
+                    color: Colors.black,
+                  ),
+                ),
+              ),
+              onChanged:
+              widget.isViewMode
+                  ? null
+                  : (String? newValue) {
+                widget.errorMessages.remove("role_id");
+                if (newValue == null) return;
+                final selectedKey =
+                    roleMap.entries
+                        .firstWhere((entry) => entry.value == newValue)
+                        .key;
+
+                setState(() {
+                  selectedRole = selectedKey;
+                  isTravelAgent = selectedKey == "5";
+                });
+                widget.onUserTypeChanged?.call(isTravelAgent);
+                widget.onRoleChanged?.call(selectedKey);
+              },
+            ),
+          ),
+        ),
+        if (widget.errorMessages["role_id"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            widget.errorMessages["role_id"]!,
+            style: GoogleFonts.poppins(color: Colors.red, fontSize: 12),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget buildAddress() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Address",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 80,
+            child: TextField(
+              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              controller: widget.controllers["address"],
+              enabled: !widget.isViewMode,
+              maxLines: 2,
+              keyboardType: TextInputType.multiline,
+              decoration: InputDecoration(
+                labelText: "Address",
+                labelStyle: GoogleFonts.poppins(
+                  fontSize: 12,
+                  color: Colors.grey,
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                // contentPadding: EdgeInsets.symmetric(vertical: 16),
+                contentPadding: EdgeInsets.symmetric(vertical: 4),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildPassword() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Password *",
+          style: GoogleFonts.poppins(
+            fontSize: 12,
+            fontWeight: FontWeight.w600,
+            color: Color(0xFF575A74),
+          ),
+        ),
+        SizedBox(height: 5),
+        CustomTextFieldUserWrapper(
+          isFocused: false,
+          isDesktop: widget.isDesktop,
+          child: SizedBox(
+            height: 40,
+            child: TextField(
+              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
+              controller: widget.controllers["password"],
+              enabled: !widget.isViewMode,
+              onChanged: (value) {
+                _clearError("password");
+              },
+              decoration: InputDecoration(
+                labelText: "Password",
+                labelStyle: GoogleFonts.poppins(
+                  fontSize: 12,
+                  color: Colors.grey,
+                ),
+                floatingLabelBehavior: FloatingLabelBehavior.never,
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.symmetric(vertical: 16),
+              ),
+            ),
+          ),
+        ),
+        if (widget.errorMessages["password"] != null) ...[
+          SizedBox(height: 5), // Space before error message
+          Text(
+            widget.errorMessages["password"]!,
+            style: GoogleFonts.poppins(color: Colors.red, fontSize: 12),
+          ),
+        ],
+      ],
+    );
+  }
+
+  // apiselectedUser != null
+  // ? SizedBox()
+}
diff --git a/lib/Screens/userManagement/create_user/traveller_details.dart b/lib/Screens/userManagement/create_user/traveller_details.dart
index 9968e83..01f697a 100644
--- a/lib/Screens/userManagement/create_user/traveller_details.dart
+++ b/lib/Screens/userManagement/create_user/traveller_details.dart
@@ -1261,7 +1261,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
   }
 
   Widget buildNationality() {
-    List<String> nationalityOptions = ["Indian", "International"];
+    List<String> nationalityOptions = ["Indian", "International","other nationality"];
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
diff --git a/lib/Screens/userManagement/user_List.dart b/lib/Screens/userManagement/user_List.dart
index ede48cd..dcd27b9 100644
--- a/lib/Screens/userManagement/user_List.dart
+++ b/lib/Screens/userManagement/user_List.dart
@@ -27,7 +27,7 @@ class UserListScreen extends StatefulWidget {
 class _UserListScreenState extends State<UserListScreen> {
   final ApiService apiService = ApiService();
   late Future<List<dynamic>> futureUsers;
-
+  late bool _dialogShown = false;
   late Map<String, dynamic> userSingleData;
   List<dynamic>? apiCountryData;
   String? selectedUserId;
@@ -219,6 +219,54 @@ class _UserListScreenState extends State<UserListScreen> {
     print("handDel - $userId");
   }
 
+  void _showConfirmationDialog(String subtitle, List<String> successList, List<Map<String, String>> failedList) {
+    _dialogShown = true;
+
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        // title: Text("User Details"),
+        title: Text("User Details - $subtitle", style: TextStyle(fontWeight: FontWeight.bold)),
+        content: SingleChildScrollView(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // Text(subtitle, style: TextStyle(fontWeight: FontWeight.bold)),
+              //
+              // SizedBox(height: 12),
+              Text("Users Created Successfully :", style: TextStyle(fontWeight: FontWeight.bold)),
+              if (successList.isNotEmpty)
+                ...successList.asMap().entries.map((entry) => Text("${entry.key + 1}) ${entry.value} created."))
+              else
+                Text("-- There is no data to create. --"),
+
+              SizedBox(height: 12),
+              Text("Failed to Create Users :", style: TextStyle(fontWeight: FontWeight.bold)),
+              if (failedList.isNotEmpty)
+                ...failedList.asMap().entries.map((entry) {
+                  final data = entry.value["data"] ?? "-";
+                  final reason = entry.value["reason"] ?? "Unknown error";
+                  return Text("${entry.key + 1}) $data - unable to create due to \"$reason\".");
+                })
+              else
+                Text("-- There is no failed data. --"),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () {
+              Navigator.pop(context);
+              _dialogShown = false;
+            },
+            child: Text("Close"),
+          ),
+        ],
+      ),
+    );
+  }
+
+
   Future<void> handleUpload() async {
     final String apiUrldata = '$apiUrl/api/user/userUpload'; // api
     final String? token = await getToken(); // 2kn
@@ -303,32 +351,51 @@ class _UserListScreenState extends State<UserListScreen> {
 
             // Check the status code of the response
             if (response.statusCode == 200) {
-              Map<String, dynamic> data = json.decode(responseString);
-              if (data['status'] == 'success') {
-                print(data['message']);
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(data['message']),
-                    backgroundColor: Colors.green.shade500,
-                    behavior: SnackBarBehavior.floating,
-                  ),
-                );
-                refreshUserList();
-              } else {
-                print(data['message']);
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(data['message']),
-                    backgroundColor: Colors.redAccent,
-                    behavior: SnackBarBehavior.floating,
-                  ),
-                );
-                refreshUserList();
-              }
+              Map<String, dynamic> responseData = json.decode(responseString);
+
+              final message = responseData['message'] ?? '';
+              final status = responseData['status'] ?? '';
+              final data = responseData['data'] ?? {};
+
+              final List<String> successList = List<String>.from(data['successfulUsers'] ?? []);
+              final List<Map<String, String>> failedList = List<Map<String, String>>.from(
+                (data['failedUsers'] ?? []).map((item) => Map<String, String>.from(item)),
+              );
+
+              _showConfirmationDialog(message, successList, failedList);
+
+              // final successfulUsers = List.from(data['successfulUsers'] ?? []);
+              // final failedUsers = List.from(data['failedUsers'] ?? []);
+
+              // Unified SnackBar logic
+              // ScaffoldMessenger.of(context).showSnackBar(
+              //   SnackBar(
+              //     content: Text(
+              //       combinedMessage,
+              //       style: TextStyle(color: Colors.white),
+              //     ),
+              //     backgroundColor: Colors.green,
+              //     behavior: SnackBarBehavior.floating,
+              //     // duration: Duration(seconds: 6),
+              //   ),
+              // );
+
+              // Refresh list if needed
+              refreshUserList();
+
             } else {
-              print('Something went wrong');
-              print('Failed to upload file: ${response.reasonPhrase}');
+              // For non-200 responses
+              final errorMsg = 'Failed to upload file: ${response.reasonPhrase}';
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(errorMsg),
+                  backgroundColor: Colors.redAccent,
+                  behavior: SnackBarBehavior.floating,
+                ),
+              );
+              print(errorMsg);
             }
+
           }
         }
       }
diff --git a/lib/config/apiUrl.dart b/lib/config/apiUrl.dart
index eb751b8..5b21759 100644
--- a/lib/config/apiUrl.dart
+++ b/lib/config/apiUrl.dart
@@ -1,3 +1,4 @@
 //api url
 const String apiUrl = 'http://apitest.tripapprovaltool.com/tstat_be';
 // const String apiUrl = 'https://uat.tripapprovaltool.com/tstat_be';
+ 
\ No newline at end of file
diff --git a/lib/routes/custom_router.dart b/lib/routes/custom_router.dart
index fcd7843..4d797b0 100644
--- a/lib/routes/custom_router.dart
+++ b/lib/routes/custom_router.dart
@@ -11,6 +11,7 @@ import 'package:frontend/Screens/plans/create_plans.dart';
 import 'package:frontend/Screens/plans/list_plans.dart';
 import 'package:frontend/Screens/policy/policy.dart';
 import 'package:frontend/Screens/policy/policy_list.dart';
+import 'package:frontend/Screens/userManagement/create_traveller_agent/createTravelAgent.dart';
 import 'package:frontend/Screens/userManagement/create_user/create_user1.dart';
 import 'package:frontend/Screens/userManagement/user_List.dart';
 import 'package:frontend/routes/organizationSetting.dart';
@@ -39,6 +40,7 @@ import '../Screens/reports/misAir.dart';
 import '../Screens/reports/misHotel.dart';
 import '../Screens/reports/misForex.dart';
 import '../Screens/reports/guestHouse.dart';
+import '../Screens/userManagement/create_traveller_agent/listTravelAgent.dart';
 
 import 'mainLayout.dart';
 
@@ -176,6 +178,14 @@ final GoRouter router = GoRouter(
           path: '/guestHouseReport',
           builder: (context, state) => GuestHouse(),
         ),
+        GoRoute(
+          path: '/listTravelAgent',
+          builder: (context, state) => TravelAgentListScreen(),
+        ),
+        GoRoute(
+          path: '/CreateTravelAgent',
+          builder: (context, state) => CreateTravelAgentFormDetials(),
+        ),
       ],
     ),
   ],
diff --git a/lib/routes/organizationSetting.dart b/lib/routes/organizationSetting.dart
index ec624fa..0b6865a 100644
--- a/lib/routes/organizationSetting.dart
+++ b/lib/routes/organizationSetting.dart
@@ -146,6 +146,12 @@ class OrganizationSettingState extends State<OrganizationSetting> {
         'label': 'Traveller (Non Employee)',
         'description': 'Create and Edit Traveller',
       },
+      {
+        'value': '/listTravelAgent',
+        'icon': Icons.person_pin_outlined,
+        'label': 'Travel Agents',
+        'description': 'Create and Edit Travel Agent',
+      },
     ];
 
     // List<Widget> rows = [];
diff --git a/lib/services/apiService.dart b/lib/services/apiService.dart
index 64fa3e8..8e459aa 100644
--- a/lib/services/apiService.dart
+++ b/lib/services/apiService.dart
@@ -643,25 +643,6 @@ class ApiService {
     }
   }
 
-  static Future<void> viewPlanTravelAgent(
-    BuildContext context,
-    String planId, {
-    bool isViewMode = false,
-    bool isMyTrips = false,
-  }) async {
-    try {
-      Map<String, dynamic> planData = await getViewPlanEdit(planId);
-      print("ViewAAA - $planData");
-
-      context.go(
-        '/travelagent/trips',
-        extra: {'planData': planData, 'isViewMode': isViewMode},
-      );
-    } catch (e) {
-      print("Error fetching plan: $e");
-    }
-  }
-
   Future<Map<String, dynamic>> fetchUserApprovalList() async {
     String? orgId = await getOrgId();
     String? userId = await getUserId();
@@ -1301,6 +1282,25 @@ class ApiService {
         false; // Default to false if dismissed
   }
 
+  static Future<void> viewPlanTravelAgent(
+    BuildContext context,
+    String planId, {
+    bool isViewMode = false,
+    bool isMyTrips = false,
+  }) async {
+    try {
+      Map<String, dynamic> planData = await getViewPlanEdit(planId);
+      print("ViewAAA - $planData");
+
+      context.go(
+        '/travelagent/trips',
+        extra: {'planData': planData, 'isViewMode': isViewMode},
+      );
+    } catch (e) {
+      print("Error fetching plan: $e");
+    }
+  }
+
   Future<Map<String, dynamic>> getCostCenterDetailsFind(int id) async {
     final String apiUrldata = '$apiUrl/api/findCostCenter?cost_center_id=$id';
 
diff --git a/lib/widgets/custom_text_forex.dart b/lib/widgets/custom_text_forex.dart
index 4121aba..6b150cb 100644
--- a/lib/widgets/custom_text_forex.dart
+++ b/lib/widgets/custom_text_forex.dart
@@ -63,25 +63,25 @@ class _CustomTextFieldForexWrapperState
       decoration: BoxDecoration(
         // color: widget.color,
         color: Colors.white,
-        borderRadius: BorderRadius.circular(10),
+        borderRadius: BorderRadius.circular(8),
         border: Border.all(
           color: widget.isFocused ? layoutColor! : Color(0xFFD6D5E6),
           // color: widget.isFocused ? Color(0xFF78B4FC) : Color(0xFFD6D5E6),
           width: widget.isFocused ? 1.0 : 0.5,
         ),
-        boxShadow:
-            widget.isFocused
-                ? [
-                  BoxShadow(
-                    color: Colors.white,
-                    // color: Color.fromRGBO(120, 180, 252, 0.3),
-                    // color: Color.fromRGBO(120, 180, 252, 0.3),
-                    blurRadius: 5,
-                    spreadRadius: 2,
-                    offset: Offset(0, 1),
-                  ),
-                ]
-                : [],
+        // boxShadow:
+        //     widget.isFocused
+        //         ? [
+        //           BoxShadow(
+        //             color: Colors.white,
+        //             // color: Color.fromRGBO(120, 180, 252, 0.3),
+        //             // color: Color.fromRGBO(120, 180, 252, 0.3),
+        //             blurRadius: 5,
+        //             spreadRadius: 2,
+        //             offset: Offset(0, 1),
+        //           ),
+        //         ]
+        //         : [],
       ),
       // decoration: BoxDecoration(
       //   color: widget.color,
diff --git a/lib/widgets/popup_travelAgentList_action.dart b/lib/widgets/popup_travelAgentList_action.dart
new file mode 100644
index 0000000..671384f
--- /dev/null
+++ b/lib/widgets/popup_travelAgentList_action.dart
@@ -0,0 +1,88 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+import '../services/apiService.dart';
+import 'custom_popup.dart';
+
+class UserActionsMenu extends StatelessWidget {
+  final ApiService apiService = ApiService();
+  final Map<String, dynamic> user;
+  final Future<Map<String, dynamic>> Function(int userId) getUserDetails;
+
+  UserActionsMenu({
+    super.key,
+    required this.user,
+    required this.getUserDetails,
+  });
+
+  int getUserId(dynamic value) {
+    if (value is String) return int.parse(value);
+    return value;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return PopupMenuButton<int>(
+      color: Colors.white,
+      padding: EdgeInsets.zero,
+      offset: Offset(0, 30),
+      icon: Icon(
+        Icons.more_vert,
+        color: Color(0xFF475569),
+        size: 14,
+      ),
+      itemBuilder: (context) => [
+        CustomPopupMenuEntry(
+          child: Container(
+            padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                GestureDetector(
+                  child: Tooltip(
+                      message: 'View Details',
+                      child: Icon(Icons.remove_red_eye,
+                          color: Color(0xFF475569), size: 18)
+                  ),
+                  // child: Icon(Icons.remove_red_eye,
+                  //     color: Color(0xFF475569), size: 18,),
+                  onTap: () async {
+                    Navigator.pop(context); // Close the menu
+                    final userId = getUserId(user['user_id']);
+                    final usersData = await getUserDetails(userId);
+                    context.go("/CreateTravelAgent", extra: {
+                      "selectedUser": usersData,
+                      "isViewMode": true,
+                    });
+                  },
+                ),
+                SizedBox(width: 8),
+                GestureDetector(
+                  child: Tooltip(
+                    message: 'Edit Details',
+                    child: Image.asset(
+                      'assets/images/IconsImg/edit.png',
+                      width: 20,
+                      height: 15,
+                    ),
+                  ),
+                  onTap: () async {
+                    Navigator.pop(context); // Close the menu
+                    final userId = getUserId(user['user_id']);
+                    final usersData = await getUserDetails(userId);
+                    context.go("/CreateTravelAgent", extra: {
+                      "selectedUser": usersData,
+                      "isViewMode": false,
+                    });
+                  },
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}