merge with old

lib/Screens/group/group.dart

@@ -93,11 +93,13 @@ class _groupState extends State<Group> {
     String? bodyStringColor = await getBodyColor();
 
     setState(() {
-      layoutColor = layoutString != null
+      layoutColor =
+          layoutString != null
               ? Color(int.parse(layoutString))
               : Colors.redAccent;
 
-      bodyColor = bodyStringColor != null
+      bodyColor =
+          bodyStringColor != null
               ? Color(int.parse(bodyStringColor))
               : Colors.white;
     });
@@ -154,10 +156,7 @@ class _groupState extends State<Group> {
     errorMessages.clear(); // Reset errors
 
     // Required fields that must not be empty
-    List<String> requiredFields = [
+    List<String> requiredFields = ["name", "description"];
-      "name",
-      "description",
-    ];
 
     // Check validation for each field
     for (String field in requiredFields) {
@@ -165,6 +164,14 @@ class _groupState extends State<Group> {
         errorMessages[field] = "Required";
       }
     }
+    // ✅ At least one of the two policies must be selected
+    if ((selectedDomestic == null || selectedDomestic!.isEmpty) &&
+        (selectedInternational == null || selectedInternational!.isEmpty)) {
+      errorMessages["domestic_policy_id"] = "Select at least one policy";
+      errorMessages["international_policy_id"] = "Select at least one policy";
+    }
+
+    return errorMessages.isEmpty;
 
     return errorMessages.isEmpty; // Valid if there are no errors
   }
@@ -223,7 +230,8 @@ class _groupState extends State<Group> {
     }
 
     try {
-      final response = await (isEdit
+      final response =
+          await (isEdit
               ? http.put(
                 Uri.parse(apiUrlData),
                 headers: {
@@ -320,8 +328,10 @@ class _groupState extends State<Group> {
 
   @override
   Widget build(BuildContext context) {
-    return ResponsiveBuilder(builder: (context, sizingInfo) {
+    return ResponsiveBuilder(
-      bool isDesktop = sizingInfo.deviceScreenType == DeviceScreenType.desktop;
+      builder: (context, sizingInfo) {
+        bool isDesktop =
+            sizingInfo.deviceScreenType == DeviceScreenType.desktop;
 
         return Scaffold(
           // backgroundColor: Colors.white,
@@ -329,23 +339,27 @@ class _groupState extends State<Group> {
           appBar: CustomAppBar(isDesktop: isDesktop),
           drawer: CustomDrawer(isDesktop: false),
           body: Padding(
-          padding: isDesktop
+            padding:
+                isDesktop
                     ? EdgeInsets.symmetric(
-                  horizontal: MediaQuery.of(context).size.width *
+                      horizontal:
+                          MediaQuery.of(context).size.width *
                           0.1, // 30% of screen width as horizontal padding
-                  vertical: MediaQuery.of(context).size.height *
+                      vertical:
+                          MediaQuery.of(context).size.height *
                           0, // 5% of screen height as vertical padding
                     )
                     : EdgeInsets.all(8),
             child: Row(
               children: [
                 // if (isDesktop) CustomDrawer(isDesktop: true),
-              Expanded(child: buildData(isDesktop, context))
+                Expanded(child: buildData(isDesktop, context)),
               ],
             ),
           ),
         );
-    });
+      },
+    );
   }
 
   Widget buildData(bool isDesktop, context) {
@@ -367,7 +381,8 @@ class _groupState extends State<Group> {
           Container(
             color: Colors.white,
             padding: const EdgeInsets.all(8.0),
-            child: isDesktop
+            child:
+                isDesktop
                     ? Row(
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: _buildSubmit(isDesktop),
@@ -387,7 +402,8 @@ class _groupState extends State<Group> {
       // margin: isDesktop
       //     ? EdgeInsets.all(10.0)
       //     : EdgeInsets.only(left: 20.0, bottom: 20.0, top: 10.0, right: 20.0),
-      height: isDesktop
+      height:
+          isDesktop
               ? MediaQuery.of(context).size.height * 0.98
               : MediaQuery.of(context).size.height,
       // decoration: BoxDecoration(
@@ -414,10 +430,7 @@ class _groupState extends State<Group> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                Text(
+                Text("Create Group", style: GoogleFonts.poppins(fontSize: 18)),
-                  "Create Group",
-                  style: GoogleFonts.poppins(fontSize: 18),
-                ),
                 // Container(
                 //   color: Color(0xFFE9EBF6),
                 //   child: IconButton(
@@ -466,9 +479,7 @@ class _groupState extends State<Group> {
                       children: _buildFirstRow(isDesktop),
                     ),
 
-                  SizedBox(
+                SizedBox(height: 10),
-                    height: 10,
-                  ),
 
                 isDesktop
                     ? Row(
@@ -482,7 +493,8 @@ class _groupState extends State<Group> {
 
                 // SizedBox(height: 15),
               ],
-              )),
+            ),
+          ),
         ],
       ),
     );
@@ -498,13 +510,15 @@ class _groupState extends State<Group> {
             style: TextStyle(
               fontSize: 12,
               fontWeight: FontWeight.w600,
-                color: Color(0xFF575A74)),
+              color: Color(0xFF575A74),
+            ),
           ),
           SizedBox(height: 5),
           CustomTextFieldWrapper(
             isFocused: false,
             isDesktop: isDesktop,
-            width: isDesktop
+            width:
+                isDesktop
                     ? MediaQuery.of(context).size.width * 0.34
                     : MediaQuery.of(context).size.width * 0.85,
             child: SizedBox(
@@ -542,13 +556,15 @@ class _groupState extends State<Group> {
             style: TextStyle(
               fontSize: 12,
               fontWeight: FontWeight.w600,
-                color: Color(0xFF575A74)),
+              color: Color(0xFF575A74),
+            ),
           ),
           SizedBox(height: 5),
           CustomTextFieldWrapper(
             isFocused: false,
             isDesktop: isDesktop,
-            width: isDesktop
+            width:
+                isDesktop
                     ? MediaQuery.of(context).size.width * 0.34
                     : MediaQuery.of(context).size.width * 0.85,
             child: SizedBox(
@@ -591,18 +607,21 @@ class _groupState extends State<Group> {
             style: TextStyle(
               fontSize: 12,
               fontWeight: FontWeight.w600,
-                color: Color(0xFF575A74)),
+              color: Color(0xFF575A74),
+            ),
           ),
           SizedBox(height: 5),
           CustomTextFieldWrapper(
             isFocused: false,
             isDesktop: isDesktop,
-            width: isDesktop
+            width:
+                isDesktop
                     ? MediaQuery.of(context).size.width * 0.34
                     : MediaQuery.of(context).size.width * 0.85,
             child: SizedBox(
               height: 40,
-              child: apiForDomestic == null
+              child:
+                  apiForDomestic == null
                       ? Center(
                         child: Transform.scale(
                           scale: 0.5,
@@ -610,12 +629,15 @@ class _groupState extends State<Group> {
                         ),
                       )
                       : DropdownSearch<String>(
-                      selectedItem: selectedDomestic == null
+                        selectedItem:
+                            selectedDomestic == null
                                 ? null
                                 : apiForDomestic!
-                              .firstWhere((policy) =>
+                                    .firstWhere(
+                                      (policy) =>
                                           policy['policy_id'] ==
-                                  selectedDomestic)['name']
+                                          selectedDomestic,
+                                    )['name']
                                     .toString(),
                         popupProps: PopupProps.menu(
                           showSearchBox: true,
@@ -624,12 +646,14 @@ class _groupState extends State<Group> {
                           searchFieldProps: TextFieldProps(
                             decoration: InputDecoration(
                               hintText: "Search Policy...",
-                            contentPadding:
+                              contentPadding: EdgeInsets.symmetric(
-                                EdgeInsets.symmetric(horizontal: 10),
+                                horizontal: 10,
                               ),
                             ),
                           ),
-                      items: apiForDomestic!
+                        ),
+                        items:
+                            apiForDomestic!
                                 .map((policy) => policy['name'].toString())
                                 .toList(),
                         dropdownDecoratorProps: DropDownDecoratorProps(
@@ -638,7 +662,8 @@ class _groupState extends State<Group> {
                             contentPadding: EdgeInsets.symmetric(horizontal: 1),
                           ),
                         ),
-                      dropdownBuilder: (context, selectedItem) => Align(
+                        dropdownBuilder:
+                            (context, selectedItem) => Align(
                               alignment: Alignment.centerLeft,
                               child: Text(
                                 selectedItem ?? "Select",
@@ -647,14 +672,15 @@ class _groupState extends State<Group> {
                             ),
                         onChanged: (String? newValue) {
                           setState(() {
-                          selectedDomestic = apiForDomestic!.firstWhere(
+                            selectedDomestic =
-                              (policy) =>
+                                apiForDomestic!.firstWhere(
-                                  policy['name'] == newValue)['policy_id'];
+                                  (policy) => policy['name'] == newValue,
+                                )['policy_id'];
                           });
                         },
                       ),
             ),
-          )
+          ),
         ],
       ),
       Column(
@@ -665,18 +691,21 @@ class _groupState extends State<Group> {
             style: TextStyle(
               fontSize: 12,
               fontWeight: FontWeight.w600,
-                color: Color(0xFF575A74)),
+              color: Color(0xFF575A74),
+            ),
           ),
           SizedBox(height: 5),
           CustomTextFieldWrapper(
             isFocused: false,
             isDesktop: isDesktop,
-            width: isDesktop
+            width:
+                isDesktop
                     ? MediaQuery.of(context).size.width * 0.34
                     : MediaQuery.of(context).size.width * 0.85,
             child: SizedBox(
               height: 40,
-              child: apiForInternational == null
+              child:
+                  apiForInternational == null
                       ? Center(
                         child: Transform.scale(
                           scale: 0.5,
@@ -684,12 +713,15 @@ class _groupState extends State<Group> {
                         ),
                       )
                       : DropdownSearch<String>(
-                      selectedItem: selectedInternational == null
+                        selectedItem:
+                            selectedInternational == null
                                 ? null
                                 : apiForInternational!
-                              .firstWhere((policy) =>
+                                    .firstWhere(
+                                      (policy) =>
                                           policy['policy_id'] ==
-                                  selectedInternational)['name']
+                                          selectedInternational,
+                                    )['name']
                                     .toString(),
                         popupProps: PopupProps.menu(
                           showSearchBox: true,
@@ -698,12 +730,14 @@ class _groupState extends State<Group> {
                           searchFieldProps: TextFieldProps(
                             decoration: InputDecoration(
                               hintText: "Search Policy...",
-                            contentPadding:
+                              contentPadding: EdgeInsets.symmetric(
-                                EdgeInsets.symmetric(horizontal: 10),
+                                horizontal: 10,
                               ),
                             ),
                           ),
-                      items: apiForInternational!
+                        ),
+                        items:
+                            apiForInternational!
                                 .map((policy) => policy['name'].toString())
                                 .toList(),
                         dropdownDecoratorProps: DropDownDecoratorProps(
@@ -712,7 +746,8 @@ class _groupState extends State<Group> {
                             contentPadding: EdgeInsets.symmetric(horizontal: 1),
                           ),
                         ),
-                      dropdownBuilder: (context, selectedItem) => Align(
+                        dropdownBuilder:
+                            (context, selectedItem) => Align(
                               alignment: Alignment.centerLeft,
                               child: Text(
                                 selectedItem ?? "Select",
@@ -721,14 +756,15 @@ class _groupState extends State<Group> {
                             ),
                         onChanged: (String? newValue) {
                           setState(() {
-                          selectedInternational = apiForInternational!
+                            selectedInternational =
-                              .firstWhere((policy) =>
+                                apiForInternational!.firstWhere(
-                                  policy['name'] == newValue)['policy_id'];
+                                  (policy) => policy['name'] == newValue,
+                                )['policy_id'];
                           });
                         },
                       ),
             ),
-          )
+          ),
         ],
       ),
     ];
@@ -749,10 +785,9 @@ class _groupState extends State<Group> {
         onPressed: () {
           context.go('/group');
         },
-          child: Text("Cancel")),
+        child: Text("Cancel"),
-      SizedBox(
-        width: 20,
       ),
+      SizedBox(width: 20),
       MouseRegion(
         // cursor: widget.isViewMode
         //     ? SystemMouseCursors.forbidden
@@ -773,7 +808,7 @@ class _groupState extends State<Group> {
           onPressed: handleSubmit, // Disable when in view mode
           child: Text("Submit"),
         ),
-      )
+      ),
     ];
   }
 }

lib/Screens/itnerary/forex.dart

@@ -53,6 +53,7 @@ class _ForexScreenState extends State<ForexScreen> {
 
   int fifteenPercent = 0;
   int remainingAmount = 0;
+  bool isWidget = false;
 
   Map<String, FocusNode> focusNodes = {};
   Map<String, bool> focusStates = {};
@@ -443,12 +444,16 @@ class _ForexScreenState extends State<ForexScreen> {
       selectedCashPercent = int.tryParse(
         widget.selectedItem!["cash_percentage"]?.toString() ?? "",
       );
+
+      print("selectedCashPercentUPdae - $selectedCashPercent");
       selectedPerdiemAmount = widget.selectedItem!["perdiem_amount"] as String?;
       isChecked =
           widget.selectedItem!["have_card"] == "1"; // Convert string to bool
       textControllers["_cardNumber"]?.text =
           widget.selectedItem!["card_number"]?.toString() ?? "";
 
+      isWidget = true;
+
       // if (textControllers["_cardNumber"] != null) {
       //   print("userCardNumber11 - $userCardNumber");
       //   textControllers["_cardNumber"]!.text = userCardNumber ?? '';
@@ -572,6 +577,13 @@ class _ForexScreenState extends State<ForexScreen> {
 
       selectedQuotedAmount =
           ((perdiemAmount + calclateVal).toString() ?? 0) as String?;
+
+      if (isWidget) {
+        print("IsWidget Update");
+
+        int? quotedAmount = int.tryParse(selectedQuotedAmount!);
+        fifteenPercent = (quotedAmount! * selectedCashPercent!) ~/ 100;
+      }
     });
 
     if (userEdited) {
@@ -636,7 +648,8 @@ class _ForexScreenState extends State<ForexScreen> {
     );
 
     if (enteredAmount == null || calculateAmnt > qouteAmount!) {
-      errorMessages["deposit_on_card"] = "Amount cannot exceed $qouteAmount";
+      errorMessages["deposit_on_card"] =
+          "Sum of cash card cannot exceed $qouteAmount";
     } else if (checkValidAmount < qouteAmount) {
       errorMessages["deposit_on_card"] =
           "Enter Valid Amount"; // Clear error if valid
@@ -651,6 +664,7 @@ class _ForexScreenState extends State<ForexScreen> {
   void _validateCashAmount(String value) {
     // errorMessages["deposit_on_card"] = " ";
     errorMessages.remove("deposit_on_cash");
+
     print("_validateCashAmount - $value - $fifteenPercent");
 
     int? enteredAmount = int.tryParse(value);
@@ -676,6 +690,7 @@ class _ForexScreenState extends State<ForexScreen> {
         errorMessages["deposit_on_card"] =
             "Enter Valid Amount"; // Clear error if valid
       }
+      print("CASHfifteenPercent - $fifteenPercent");
       errorMessages["deposit_on_cash"] = "Amount cannot exceed $fifteenPercent";
     } else if (checkValidAmount == quotedAmount) {
       errorMessages.remove("deposit_on_cash");
@@ -1712,7 +1727,9 @@ class _ForexScreenState extends State<ForexScreen> {
                   errorMessages.remove("deposit_on_cash");
                   errorMessages.remove("deposit_on_card");
                   // errorMessages["deposit_on_card"] = "";
-
+                  setState(() {
+                    userEdited = true;
+                  });
                   _validateCashAmount(
                     value,
                   ); // Call validation when text changes
@@ -1768,6 +1785,7 @@ class _ForexScreenState extends State<ForexScreen> {
                 onChanged: (value) {
                   errorMessages.remove("deposit_on_cash");
                   errorMessages.remove("deposit_on_card");
+                  userEdited = true;
                   _validateCardAmount(
                     value,
                   ); // Call validation when text changes

lib/Screens/itnerary_list/flight_list.dart

@@ -398,14 +398,35 @@ class _FlightListWidgetState extends State<FlightListWidget> {
                             ),
                             Expanded(
                               flex: 4,
-                              child: Text(
+                              child: Column(
-                                "$fromPlaceCountry (From) - (To) $toPlaceCountry",
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    "$fromPlaceCountry",
                                     // "${trip["from_place"]?.toString()} - ${trip["to_place"]?.toString()}",
                                     style: GoogleFonts.poppins(
                                       fontSize: 12,
                                       fontWeight: FontWeight.w700,
                                     ),
                                   ),
+                                  Padding(
+                                    padding: const EdgeInsets.only(left: 10),
+                                    child: Image.asset(
+                                      'assets/images/IconsImg/alternate.png',
+                                      width: 20,
+                                      height: 20,
+                                    ),
+                                  ),
+                                  Text(
+                                    "$toPlaceCountry",
+                                    // "${trip["from_place"]?.toString()} - ${trip["to_place"]?.toString()}",
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w700,
+                                    ),
+                                  ),
+                                ],
+                              ),
                             ),
                             Expanded(
                               flex: 2,

lib/Screens/userManagement/create_user/create_user.dart

@@ -654,7 +654,6 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
 
   void handleSubmit() async {
     print("USR Detail Submit");
-
     // printFormData();
 
     bool isValid = travellerDetailsKey.currentState?.boolValidation() ?? false;
@@ -722,8 +721,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
 
       // Map<String, dynamic> data = userDetials;
 
-    if (!isValidData(data) &&
+      if (!isValidData(data) && isValidDataTwo(data)) {
-        isValidDataTwo(data) ) {
         print("USERDETAILS : $userDetials");
         print("Validation Failed: Required fields are missing.");
         setState(() {});

lib/Screens/userManagement/create_user/personal_details.dart

@@ -1589,6 +1589,7 @@ class PersonalDetailsState extends State<PersonalDetails> {
                   widget.isViewMode
                       ? null
                       : (String? newValue) {
+                        widget.errorMessages.remove("role_id");
                         if (newValue == null) return;
                         final selectedKey =
                             roleMap.entries

lib/Screens/userManagement/create_user/traveller_details.dart

@@ -3008,8 +3008,11 @@ class TravellerDetailsState extends State<TravellerDetails> {
 
     countryMap = {
       for (var country in countryList)
-        country['airline'] as String: '${country['airline_name']}',
+        country['airline'] as String:
+            '${country['airline_name']} (${country['airline']})',
+      // country['airline'] as String: '${country['airline_name']}',
     };
+    // airline
 
     countryCodes = countryMap.keys.toList();
 
@@ -3089,17 +3092,56 @@ class TravellerDetailsState extends State<TravellerDetails> {
                           backgroundColor: Colors.white,
                         ),
                         constraints: BoxConstraints(maxHeight: 250),
-                        itemBuilder:
+                        itemBuilder: (context, item, isSelected) {
-                            (context, item, isSelected) => Padding(
+                          // Extract airline name and code from "AirlineName (CODE)"
+                          final match = RegExp(
+                            r'^(.*)\s+\(([^)]+)\)$',
+                          ).firstMatch(item);
+                          final name = match?.group(1) ?? '';
+                          final code = match?.group(2) ?? '';
+
+                          return Padding(
                             padding: const EdgeInsets.symmetric(
                               horizontal: 8.0,
                               vertical: 6.0,
                             ),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Expanded(
                                   child: Text(
-                                item,
+                                    name,
-                                style: GoogleFonts.poppins(fontSize: 11.5),
+                                    style: const TextStyle(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w500,
+                                    ),
+                                    overflow: TextOverflow.ellipsis,
                                   ),
                                 ),
+                                Text(
+                                  code,
+                                  style: const TextStyle(
+                                    fontSize: 12,
+                                    fontWeight: FontWeight.w500,
+                                    color: Colors.grey,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          );
+                        },
+
+                        // itemBuilder:
+                        //     (context, item, isSelected) => Padding(
+                        //       padding: const EdgeInsets.symmetric(
+                        //         horizontal: 8.0,
+                        //         vertical: 6.0,
+                        //       ),
+                        //       child: Text(
+                        //         item,
+                        //         style: GoogleFonts.poppins(fontSize: 11.5),
+                        //       ),
+                        //     ),
                         searchFieldProps: TextFieldProps(
                           decoration: InputDecoration(
                             hintText: "Search Airline...",

pubspec.yaml

@@ -99,6 +99,8 @@ flutter:
     - assets/images/login/VectorG.png
     - assets/images/login/logoNew.jpg
     - assets/images/login/microsoft.png
+    - assets/images/IconsImg/path.png
+    - assets/images/IconsImg/alternate.png
     - assets/images/IconsImg/delete.png
     - assets/images/IconsImg/edit.png
     - assets/images/IconsImg/planPdf_icon.png