Travel-Spends/ts-tat
Travel-Spends/ts-tat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with old

Browse Source
This commit is contained in:
venba-Inspriron-3558 2025-06-10 17:18:36 +05:30
commit f1c153162b
9 changed files with 419 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/IconsImg/alternate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

BIN
assets/images/IconsImg/path.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

527
lib/Screens/group/group.dart
View File

@ -93,13 +93,15 @@ class _groupState extends State<Group> {
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;
});
}
@ -154,10 +156,7 @@ class _groupState extends State<Group> {
errorMessages.clear(); // Reset errors
// Required fields that must not be empty
List<String> requiredFields = [
"name",
"description",
];
List<String> requiredFields = ["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,23 +230,24 @@ class _groupState extends State<Group> {
}
try {
final response = await (isEdit
? http.put(
Uri.parse(apiUrlData),
headers: {
'Authorization': 'Bearer $token',
'Content-Type': 'application/json',
},
body: jsonEncode(groupData),
)
: http.post(
Uri.parse(apiUrlData),
headers: {
'Authorization': 'Bearer $token',
'Content-Type': 'application/json',
},
body: jsonEncode(groupData),
));
final response =
await (isEdit
? http.put(
Uri.parse(apiUrlData),
headers: {
'Authorization': 'Bearer $token',
'Content-Type': 'application/json',
},
body: jsonEncode(groupData),
)
: http.post(
Uri.parse(apiUrlData),
headers: {
'Authorization': 'Bearer $token',
'Content-Type': 'application/json',
},
body: jsonEncode(groupData),
));
if (response.statusCode == 200 || response.statusCode == 201) {
print("Group submitted successfully!");
@ -320,32 +328,38 @@ class _groupState extends State<Group> {
@override
Widget build(BuildContext context) {
return ResponsiveBuilder(builder: (context, sizingInfo) {
bool isDesktop = sizingInfo.deviceScreenType == DeviceScreenType.desktop;
return ResponsiveBuilder(
builder: (context, sizingInfo) {
bool isDesktop =
sizingInfo.deviceScreenType == DeviceScreenType.desktop;
return Scaffold(
// backgroundColor: Colors.white,
backgroundColor: Color(0xFFf5f5f5),
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(8),
child: Row(
children: [
// if (isDesktop) CustomDrawer(isDesktop: true),
Expanded(child: buildData(isDesktop, context))
],
return Scaffold(
// backgroundColor: Colors.white,
backgroundColor: Color(0xFFf5f5f5),
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(8),
child: Row(
children: [
// if (isDesktop) CustomDrawer(isDesktop: true),
Expanded(child: buildData(isDesktop, context)),
],
),
),
),
);
});
);
},
);
}
Widget buildData(bool isDesktop, context) {
@ -367,15 +381,16 @@ class _groupState extends State<Group> {
Container(
color: Colors.white,
padding: const EdgeInsets.all(8.0),
child: isDesktop
? Row(
mainAxisAlignment: MainAxisAlignment.end,
children: _buildSubmit(isDesktop),
)
: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: _buildSubmit(isDesktop),
),
child:
isDesktop
? Row(
mainAxisAlignment: MainAxisAlignment.end,
children: _buildSubmit(isDesktop),
)
: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: _buildSubmit(isDesktop),
),
),
],
),
@ -387,9 +402,10 @@ 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
? MediaQuery.of(context).size.height * 0.98
: MediaQuery.of(context).size.height,
height:
isDesktop
? MediaQuery.of(context).size.height * 0.98
: MediaQuery.of(context).size.height,
// decoration: BoxDecoration(
// border: isDesktop
// ? Border.all(
@ -414,10 +430,7 @@ class _groupState extends State<Group> {
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"Create Group",
style: GoogleFonts.poppins(fontSize: 18),
),
Text("Create Group", style: GoogleFonts.poppins(fontSize: 18)),
// Container(
// color: Color(0xFFE9EBF6),
// child: IconButton(
@ -436,53 +449,52 @@ class _groupState extends State<Group> {
// height: 5,
// ),
Container(
margin: const EdgeInsets.all(10),
padding: const EdgeInsets.all(20),
color: Colors.white,
height: MediaQuery.of(context).size.height * 0.6,
child: Column(
children: [
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Text(
// "Mail Settings",
// style: TextStyle(color: Colors.blueAccent),
// ),
// Icon(
// Icons.keyboard_arrow_down_outlined,
// color: Colors.blueAccent,
// size: 30,
// ),
// ],
// ),
isDesktop
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: _buildFirstRow(isDesktop),
)
: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: _buildFirstRow(isDesktop),
),
margin: const EdgeInsets.all(10),
padding: const EdgeInsets.all(20),
color: Colors.white,
height: MediaQuery.of(context).size.height * 0.6,
child: Column(
children: [
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Text(
// "Mail Settings",
// style: TextStyle(color: Colors.blueAccent),
// ),
// Icon(
// Icons.keyboard_arrow_down_outlined,
// color: Colors.blueAccent,
// size: 30,
// ),
// ],
// ),
isDesktop
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: _buildFirstRow(isDesktop),
)
: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: _buildFirstRow(isDesktop),
),
SizedBox(
height: 10,
),
SizedBox(height: 10),
isDesktop
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: _buildSecondRow(isDesktop),
)
: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: _buildSecondRow(isDesktop),
),
isDesktop
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: _buildSecondRow(isDesktop),
)
: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: _buildSecondRow(isDesktop),
),
// SizedBox(height: 15),
],
)),
// SizedBox(height: 15),
],
),
),
],
),
);
@ -496,17 +508,19 @@ class _groupState extends State<Group> {
Text(
"Group Name",
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74)),
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74),
),
),
SizedBox(height: 5),
CustomTextFieldWrapper(
isFocused: false,
isDesktop: isDesktop,
width: isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
width:
isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
child: SizedBox(
height: 40,
child: TextField(
@ -540,17 +554,19 @@ class _groupState extends State<Group> {
Text(
"Description",
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74)),
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74),
),
),
SizedBox(height: 5),
CustomTextFieldWrapper(
isFocused: false,
isDesktop: isDesktop,
width: isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
width:
isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
child: SizedBox(
height: 40,
child: TextField(
@ -589,72 +605,82 @@ class _groupState extends State<Group> {
Text(
"Select Policy For Domestic",
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74)),
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74),
),
),
SizedBox(height: 5),
CustomTextFieldWrapper(
isFocused: false,
isDesktop: isDesktop,
width: isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
width:
isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
child: SizedBox(
height: 40,
child: apiForDomestic == null
? Center(
child: Transform.scale(
scale: 0.5,
child: CircularProgressIndicator(),
),
)
: DropdownSearch<String>(
selectedItem: selectedDomestic == null
? null
: apiForDomestic!
.firstWhere((policy) =>
policy['policy_id'] ==
selectedDomestic)['name']
.toString(),
popupProps: PopupProps.menu(
showSearchBox: true,
fit: FlexFit.loose,
constraints: BoxConstraints(maxHeight: 250),
searchFieldProps: TextFieldProps(
decoration: InputDecoration(
hintText: "Search Policy...",
contentPadding:
EdgeInsets.symmetric(horizontal: 10),
child:
apiForDomestic == null
? Center(
child: Transform.scale(
scale: 0.5,
child: CircularProgressIndicator(),
),
)
: DropdownSearch<String>(
selectedItem:
selectedDomestic == null
? null
: apiForDomestic!
.firstWhere(
(policy) =>
policy['policy_id'] ==
selectedDomestic,
)['name']
.toString(),
popupProps: PopupProps.menu(
showSearchBox: true,
fit: FlexFit.loose,
constraints: BoxConstraints(maxHeight: 250),
searchFieldProps: TextFieldProps(
decoration: InputDecoration(
hintText: "Search Policy...",
contentPadding: EdgeInsets.symmetric(
horizontal: 10,
),
),
),
),
),
items: apiForDomestic!
.map((policy) => policy['name'].toString())
.toList(),
dropdownDecoratorProps: DropDownDecoratorProps(
dropdownSearchDecoration: InputDecoration(
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 1),
items:
apiForDomestic!
.map((policy) => policy['name'].toString())
.toList(),
dropdownDecoratorProps: DropDownDecoratorProps(
dropdownSearchDecoration: InputDecoration(
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 1),
),
),
dropdownBuilder:
(context, selectedItem) => Align(
alignment: Alignment.centerLeft,
child: Text(
selectedItem ?? "Select",
style: TextStyle(fontSize: 12),
),
),
onChanged: (String? newValue) {
setState(() {
selectedDomestic =
apiForDomestic!.firstWhere(
(policy) => policy['name'] == newValue,
)['policy_id'];
});
},
),
dropdownBuilder: (context, selectedItem) => Align(
alignment: Alignment.centerLeft,
child: Text(
selectedItem ?? "Select",
style: TextStyle(fontSize: 12),
),
),
onChanged: (String? newValue) {
setState(() {
selectedDomestic = apiForDomestic!.firstWhere(
(policy) =>
policy['name'] == newValue)['policy_id'];
});
},
),
),
)
),
],
),
Column(
@ -663,72 +689,82 @@ class _groupState extends State<Group> {
Text(
"Select Policy For International",
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74)),
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74),
),
),
SizedBox(height: 5),
CustomTextFieldWrapper(
isFocused: false,
isDesktop: isDesktop,
width: isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
width:
isDesktop
? MediaQuery.of(context).size.width * 0.34
: MediaQuery.of(context).size.width * 0.85,
child: SizedBox(
height: 40,
child: apiForInternational == null
? Center(
child: Transform.scale(
scale: 0.5,
child: CircularProgressIndicator(),
),
)
: DropdownSearch<String>(
selectedItem: selectedInternational == null
? null
: apiForInternational!
.firstWhere((policy) =>
policy['policy_id'] ==
selectedInternational)['name']
.toString(),
popupProps: PopupProps.menu(
showSearchBox: true,
fit: FlexFit.loose,
constraints: BoxConstraints(maxHeight: 250),
searchFieldProps: TextFieldProps(
decoration: InputDecoration(
hintText: "Search Policy...",
contentPadding:
EdgeInsets.symmetric(horizontal: 10),
child:
apiForInternational == null
? Center(
child: Transform.scale(
scale: 0.5,
child: CircularProgressIndicator(),
),
)
: DropdownSearch<String>(
selectedItem:
selectedInternational == null
? null
: apiForInternational!
.firstWhere(
(policy) =>
policy['policy_id'] ==
selectedInternational,
)['name']
.toString(),
popupProps: PopupProps.menu(
showSearchBox: true,
fit: FlexFit.loose,
constraints: BoxConstraints(maxHeight: 250),
searchFieldProps: TextFieldProps(
decoration: InputDecoration(
hintText: "Search Policy...",
contentPadding: EdgeInsets.symmetric(
horizontal: 10,
),
),
),
),
),
items: apiForInternational!
.map((policy) => policy['name'].toString())
.toList(),
dropdownDecoratorProps: DropDownDecoratorProps(
dropdownSearchDecoration: InputDecoration(
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 1),
items:
apiForInternational!
.map((policy) => policy['name'].toString())
.toList(),
dropdownDecoratorProps: DropDownDecoratorProps(
dropdownSearchDecoration: InputDecoration(
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(horizontal: 1),
),
),
dropdownBuilder:
(context, selectedItem) => Align(
alignment: Alignment.centerLeft,
child: Text(
selectedItem ?? "Select",
style: TextStyle(fontSize: 12),
),
),
onChanged: (String? newValue) {
setState(() {
selectedInternational =
apiForInternational!.firstWhere(
(policy) => policy['name'] == newValue,
)['policy_id'];
});
},
),
dropdownBuilder: (context, selectedItem) => Align(
alignment: Alignment.centerLeft,
child: Text(
selectedItem ?? "Select",
style: TextStyle(fontSize: 12),
),
),
onChanged: (String? newValue) {
setState(() {
selectedInternational = apiForInternational!
.firstWhere((policy) =>
policy['name'] == newValue)['policy_id'];
});
},
),
),
)
),
],
),
];
@ -737,22 +773,21 @@ class _groupState extends State<Group> {
List<Widget> _buildSubmit(isDesktop) {
return [
ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Colors.white,
foregroundColor: layoutColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
side: BorderSide(color: layoutColor ?? Colors.green, width: 2),
),
padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.white,
foregroundColor: layoutColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
side: BorderSide(color: layoutColor ?? Colors.green, width: 2),
),
onPressed: () {
context.go('/group');
},
child: Text("Cancel")),
SizedBox(
width: 20,
padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
),
onPressed: () {
context.go('/group');
},
child: Text("Cancel"),
),
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"),
),
)
),
];
}
}

58
lib/Screens/itnerary/forex.dart
View File

@ -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");
@ -1228,16 +1243,16 @@ class _ForexScreenState extends State<ForexScreen> {
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),
),
),
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 ...",
@ -1254,15 +1269,15 @@ class _ForexScreenState extends State<ForexScreen> {
),
dropdownBuilder:
(context, selectedItem) => Align(
alignment: Alignment.centerLeft,
child: Text(
selectedItem ?? "Select ",
style: GoogleFonts.poppins(
fontSize: 12,
color: Colors.black,
alignment: Alignment.centerLeft,
child: Text(
selectedItem ?? "Select ",
style: GoogleFonts.poppins(
fontSize: 12,
color: Colors.black,
),
),
),
),
),
onChanged: (String? newValue) {
setState(() {
// Find the country_code based on selected country_name
@ -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

35
lib/Screens/itnerary_list/flight_list.dart
View File

@ -398,13 +398,34 @@ class _FlightListWidgetState extends State<FlightListWidget> {
),
Expanded(
flex: 4,
child: Text(
"$fromPlaceCountry (From) - (To) $toPlaceCountry",
// "${trip["from_place"]?.toString()} - ${trip["to_place"]?.toString()}",
style: GoogleFonts.poppins(
fontSize: 12,
fontWeight: FontWeight.w700,
),
child: Column(
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(

34
lib/Screens/userManagement/create_user/create_user.dart
View File

@ -654,7 +654,6 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
void handleSubmit() async {
print("USR Detail Submit");
// printFormData();
bool isValid = travellerDetailsKey.currentState?.boolValidation() ?? false;
@ -709,30 +708,29 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
// }
// errorMessagesTravel = travellerDetailsKey.currentState!.errorMessages;
print("TRAVEL DETAILS FROM CHILD");
// print("TRAVEL DETAILS FROM CHILD: $travelDetailsData");
print("TRAVEL DETAILS FROM CHILD");
// print("TRAVEL DETAILS FROM CHILD: $travelDetailsData");
passportFile = travellerDetailsKey.currentState?.passportFile;
passportFile = travellerDetailsKey.currentState?.passportFile;
print("passportFile : $passportFile");
print("passportFile : $passportFile");
Map<String, dynamic> data = userDetials;
Map<String, dynamic> data = userDetials;
print("USERDETAILS : $data");
print("USERDETAILS : $data");
// Map<String, dynamic> data = userDetials;
// 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();
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();
createUserData(userDetials);
createUserData(userDetials);
}
}

1
lib/Screens/userManagement/create_user/personal_details.dart
View File

@ -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

64
lib/Screens/userManagement/create_user/traveller_details.dart
View File

@ -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:
(context, item, isSelected) => Padding(
padding: const EdgeInsets.symmetric(
horizontal: 8.0,
vertical: 6.0,
),
child: Text(
item,
style: GoogleFonts.poppins(fontSize: 11.5),
),
itemBuilder: (context, item, isSelected) {
// 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(
name,
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...",

2
pubspec.yaml
View File

@ -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