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

Merge branch 'main' of bitbucket.org:venbainformationtechnology/ts-tat

Browse Source
This commit is contained in:
venbaittech 2025-06-10 19:22:54 +05:30
commit 2e85273b06
7 changed files with 732 additions and 733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1096,8 +1096,9 @@ class _ForexScreenState extends State<ForexScreen> {
SizedBox(height: 5), // Space before error message SizedBox(height: 5), // Space before error message
Text( Text(
errorMessages["end_date"]!, errorMessages["end_date"]!,
// "Select End Date", style: const TextStyle(color: Colors.red, fontSize: 12),
style: TextStyle(color: Colors.red, fontSize: 12), maxLines: 2, // Allow it to wrap onto two lines
overflow: TextOverflow.ellipsis, // Add ellipsis if it still overflows
), ),
], ],
], ],

221
lib/Screens/itnerary/insurance.dart
View File

@ -38,20 +38,21 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
final FocusNode _tripTypeFocusNode = FocusNode(); final FocusNode _tripTypeFocusNode = FocusNode();
final FocusNode _hotelNameFocusNode = FocusNode(); final FocusNode _hotelNameFocusNode = FocusNode();
final FocusNode _fromFocusNode = FocusNode(); final FocusNode _startDateFocusNode = FocusNode();
final FocusNode _dateFocusNode = FocusNode(); final FocusNode _endDateFocusNode = FocusNode();
final FocusNode _commentsFocusNode = FocusNode(); final FocusNode _commentsFocusNode = FocusNode();
final FocusNode _nomineeFocusNode = FocusNode(); final FocusNode _nomineeFocusNode = FocusNode();
late TextEditingController _tripTypeController = TextEditingController(); late TextEditingController _tripTypeController = TextEditingController();
late TextEditingController _startdateController = TextEditingController(); late TextEditingController _startDateController = TextEditingController();
late TextEditingController _endDateController = TextEditingController(); late TextEditingController _endDateController = TextEditingController();
late TextEditingController _insuranceCommentsController = late TextEditingController _insuranceCommentsController =
TextEditingController(); TextEditingController();
late TextEditingController _nomineeController = TextEditingController(); late TextEditingController _nomineeController = TextEditingController();
bool _isHotelNameFocused = false; bool _isHotelNameFocused = false;
bool _dateFocus = false; bool _startDateFocus = false;
bool _endDateFocus = false;
bool _commentsFocus = false; bool _commentsFocus = false;
bool _nomineeFocus = false; bool _nomineeFocus = false;
@ -63,7 +64,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
Map<String, dynamic> get InsuranceData { Map<String, dynamic> get InsuranceData {
Map<String, dynamic> data = { Map<String, dynamic> data = {
"type_of_insurance": selectedInsuranceType, "type_of_insurance": selectedInsuranceType,
"start_date": _startdateController.text, "start_date": _startDateController.text,
"end_date": _endDateController.text, "end_date": _endDateController.text,
"comments": _insuranceCommentsController.text, "comments": _insuranceCommentsController.text,
"nominee_name": _nomineeController.text, "nominee_name": _nomineeController.text,
@ -93,9 +94,14 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
_isHotelNameFocused = _hotelNameFocusNode.hasFocus; _isHotelNameFocused = _hotelNameFocusNode.hasFocus;
}); });
}); });
_dateFocusNode.addListener(() { _endDateFocusNode.addListener(() {
setState(() { setState(() {
_dateFocus = _fromFocusNode.hasFocus; _endDateFocus = _endDateFocusNode.hasFocus;
});
});
_startDateFocusNode.addListener(() {
setState(() {
_startDateFocus = _startDateFocusNode.hasFocus;
}); });
}); });
_commentsFocusNode.addListener(() { _commentsFocusNode.addListener(() {
@ -113,7 +119,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
_insuranceCommentsController = TextEditingController( _insuranceCommentsController = TextEditingController(
text: widget.selectedItem?["comments"] ?? "", text: widget.selectedItem?["comments"] ?? "",
); );
_startdateController = TextEditingController( _startDateController = TextEditingController(
text: widget.selectedItem?["start_date"] ?? "", text: widget.selectedItem?["start_date"] ?? "",
); );
_endDateController = TextEditingController( _endDateController = TextEditingController(
@ -141,26 +147,15 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
// ✅ Only set controller after value is updated // ✅ Only set controller after value is updated
// final parsedDate = // final parsedDate =
// DateTime.tryParse(flightFirstTripDateNotifier.value ?? ''); // DateTime.tryParse(flightFirstTripDateNotifier.value ?? '');
final parsedDate = DateFormat( final parsedDate = DateFormat("dd-MM-yyyy").parse(flightFirstTripDateNotifier.value ?? '');
"dd-MM-yyyy", if (parsedDate != null) { _startDateController.text = DateFormat('dd-MM-yyyy').format(parsedDate); }
).parse(flightFirstTripDateNotifier.value ?? '');
if (parsedDate != null) {
_startdateController.text = DateFormat('dd-MM-yyyy').format(parsedDate);
}
final parsedEndDate = DateFormat( final parsedEndDate = DateFormat("dd-MM-yyyy").parse(flightLastTripDateNotifier.value ?? '');
"dd-MM-yyyy", if (parsedEndDate != null) { _endDateController.text = DateFormat('dd-MM-yyyy').format(parsedEndDate); }
).parse(flightLastTripDateNotifier.value ?? '');
if (parsedEndDate != null) { print("parsedDate $parsedDate");
_endDateController.text = DateFormat( print("parsedEndDate $parsedEndDate");
'dd-MM-yyyy',
).format(parsedEndDate);
print("parsedDate");
print(parsedDate);
print("parsedEndDate");
print(parsedEndDate);
}
}); });
} }
@ -267,7 +262,8 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
void dispose() { void dispose() {
_tripTypeFocusNode.dispose(); _tripTypeFocusNode.dispose();
_tripTypeController.dispose(); _tripTypeController.dispose();
_startdateController.dispose(); _startDateController.dispose();
_endDateController.dispose();
_insuranceCommentsController.dispose(); _insuranceCommentsController.dispose();
_nomineeController.dispose(); _nomineeController.dispose();
super.dispose(); super.dispose();
@ -592,105 +588,23 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
if (pickedDate != null && pickedDate != _selectedCheckOutDate) { if (pickedDate != null && pickedDate != _selectedCheckOutDate) {
setState(() { setState(() {
_selectedCheckOutDate = pickedDate; _selectedCheckOutDate = pickedDate;
_startdateController.text = DateFormat( _startDateController.text = DateFormat(
'dd-MM-yyyy', 'dd-MM-yyyy',
).format(pickedDate); ).format(pickedDate);
}); });
} }
} }
// Future<void> _selectEndCheckOutDate(BuildContext context) async {
// DateTime now = DateTime.now();
// DateTime today = DateTime(now.year, now.month, now.day);
//
// // DateTime? checkInDate;
// // try {
// // checkInDate = DateTime.parse(_startdateController.text);
// // } catch (e) {
// // checkInDate = today;
// // }
//
// // // Ensure at least today is used
// // DateTime firstDate = checkInDate.isAfter(today) ? checkInDate : today;
// // DateTime initialDate = _selectedCheckOutDate != null &&
// // _selectedCheckOutDate!.isAfter(firstDate)
// // ? _selectedCheckOutDate!
// // : firstDate;
//
// // DateTime firstDate = checkInDate;
// // DateTime initialDate =
// // _selectedCheckOutDate != null &&
// // _selectedCheckOutDate!.isAfter(firstDate)
// // ? _selectedCheckOutDate!
// // : firstDate;
//
// DateTime? validFromDate;
//
// try {
// String fromDateText = _startdateController.text.trim();
// print("Valid From Text: $fromDateText");
// if (fromDateText.isNotEmpty) {
// validFromDate = DateFormat('dd-MM-yyyy').parseStrict(fromDateText);
// print("Parsed Valid From: $validFromDate");
// }
// } catch (e) {
// print("Error parsing valid from date: $e");
// }
//
// // Use max(today, validFromDate) as firstDate
// // DateTime firstDate = today;
// DateTime firstDate = validFromDate ?? today;
// if (validFromDate != null && validFromDate.isAfter(today)) {
// firstDate = validFromDate;
// }
// final pickedDate = await showDatePicker(
// context: context,
// // initialDate: initialDate,
// // firstDate: initialDate,
// // firstDate: DateTime(1900),
// initialDate: firstDate,
// firstDate: firstDate,
// lastDate: DateTime(2100),
// initialEntryMode: DatePickerEntryMode.calendarOnly,
// );
//
// // final pickedDate = await showDatePicker(
// // context: context,
// // // initialDate: initialDate,
// // initialDate: initialDate,
// // firstDate: initialDate,
// // lastDate: DateTime(2100),
// // initialEntryMode: DatePickerEntryMode.calendarOnly,
// // );
//
// // DateTime? pickedDate = await showDatePicker(
// // context: context,
// // initialDate: _selectedCheckOutDate != null &&
// // _selectedCheckOutDate!.isAfter(today)
// // ? _selectedCheckOutDate!
// // : today,
// // firstDate: today,
// // lastDate: DateTime(2100),
// // );
//
// if (pickedDate != null && pickedDate != _selectedCheckOutDate) {
// setState(() {
// _selectedCheckOutDate = pickedDate;
// _endDateController.text = DateFormat('dd-MM-yyyy').format(pickedDate);
// });
// }
// }
Future<void> _selectEndCheckOutDate(BuildContext context) async { Future<void> _selectEndCheckOutDate(BuildContext context) async {
DateTime now = DateTime.now(); DateTime now = DateTime.now();
DateTime today = DateTime(now.year, now.month, now.day); DateTime today = DateTime(now.year, now.month, now.day);
DateTime? checkInDate; // DateTime? checkInDate;
try { // try {
checkInDate = DateTime.parse(_startdateController.text); // checkInDate = DateTime.parse(_startDateController.text);
} catch (e) { // } catch (e) {
checkInDate = today; // checkInDate = today;
} // }
// // Ensure at least today is used // // Ensure at least today is used
// DateTime firstDate = checkInDate.isAfter(today) ? checkInDate : today; // DateTime firstDate = checkInDate.isAfter(today) ? checkInDate : today;
@ -699,20 +613,52 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
// ? _selectedCheckOutDate! // ? _selectedCheckOutDate!
// : firstDate; // : firstDate;
DateTime firstDate = checkInDate; // DateTime firstDate = checkInDate;
DateTime initialDate = // DateTime initialDate =
_selectedCheckOutDate != null && // _selectedCheckOutDate != null &&
_selectedCheckOutDate!.isAfter(firstDate) // _selectedCheckOutDate!.isAfter(firstDate)
? _selectedCheckOutDate! // ? _selectedCheckOutDate!
: firstDate; // : firstDate;
DateTime? validFromDate;
try {
String fromDateText = _startDateController.text.trim();
print("Valid From Text: $fromDateText");
if (fromDateText.isNotEmpty) {
validFromDate = DateFormat('dd-MM-yyyy').parseStrict(fromDateText);
print("Parsed Valid From: $validFromDate");
}
} catch (e) {
print("Error parsing valid from date: $e");
}
// Use max(today, validFromDate) as firstDate
// DateTime firstDate = today;
DateTime firstDate = validFromDate ?? today;
if (validFromDate != null && validFromDate.isAfter(today)) {
firstDate = validFromDate;
}
final pickedDate = await showDatePicker( final pickedDate = await showDatePicker(
context: context, context: context,
initialDate: initialDate, // initialDate: initialDate,
// firstDate: initialDate,
// firstDate: DateTime(1900),
initialDate: firstDate,
firstDate: firstDate, firstDate: firstDate,
lastDate: DateTime(2100), lastDate: DateTime(2100),
initialEntryMode: DatePickerEntryMode.calendarOnly,
); );
// final pickedDate = await showDatePicker(
// context: context,
// // initialDate: initialDate,
// initialDate: initialDate,
// firstDate: initialDate,
// lastDate: DateTime(2100),
// initialEntryMode: DatePickerEntryMode.calendarOnly,
// );
// DateTime? pickedDate = await showDatePicker( // DateTime? pickedDate = await showDatePicker(
// context: context, // context: context,
// initialDate: _selectedCheckOutDate != null && // initialDate: _selectedCheckOutDate != null &&
@ -833,10 +779,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
dropdownDecoratorProps: const DropDownDecoratorProps( dropdownDecoratorProps: const DropDownDecoratorProps(
dropdownSearchDecoration: InputDecoration( dropdownSearchDecoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
contentPadding: EdgeInsets.symmetric( contentPadding: EdgeInsets.symmetric(horizontal: 10,vertical: 10,),
horizontal: 10,
vertical: 10,
),
), ),
), ),
dropdownBuilder: (context, selectedItem) { dropdownBuilder: (context, selectedItem) {
@ -862,15 +805,14 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
? (Map<String, dynamic>? newValue) { ? (Map<String, dynamic>? newValue) {
setState(() { setState(() {
selectedInsuranceType= newValue?['dropdown_key']; selectedInsuranceType= newValue?['dropdown_key'];
print( print("selected Insurance Type: ${selectedInsuranceType}");
"selected Insurance Type: ${selectedInsuranceType}",
);
}); });
} }
: null, : null,
), ),
), ),
), ),
], ],
), ),
@ -925,7 +867,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
), ),
SizedBox(height: 5), SizedBox(height: 5),
CustomTextFieldWrapper( CustomTextFieldWrapper(
isFocused: _dateFocus, isFocused: _startDateFocus,
isDesktop: isDesktop, isDesktop: isDesktop,
width: isDesktop ? MediaQuery.of(context).size.width * 0.11 : null, width: isDesktop ? MediaQuery.of(context).size.width * 0.11 : null,
child: SizedBox( child: SizedBox(
@ -933,7 +875,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
child: GestureDetector( child: GestureDetector(
onTap: () async { onTap: () async {
await _selectCheckOutDate(context); await _selectCheckOutDate(context);
if (_startdateController.text.isNotEmpty) { if (_startDateController.text.isNotEmpty) {
setState(() { setState(() {
errorMessages.remove( errorMessages.remove(
"start_date", "start_date",
@ -943,8 +885,8 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
}, },
child: AbsorbPointer( child: AbsorbPointer(
child: TextField( child: TextField(
focusNode: _dateFocusNode, focusNode: _startDateFocusNode,
controller: _startdateController, controller: _startDateController,
style: const TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: const InputDecoration( decoration: const InputDecoration(
labelText: "Select ", labelText: "Select ",
@ -983,7 +925,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
), ),
SizedBox(height: 5), SizedBox(height: 5),
CustomTextFieldWrapper( CustomTextFieldWrapper(
isFocused: _dateFocus, isFocused: _endDateFocus,
isDesktop: isDesktop, isDesktop: isDesktop,
width: isDesktop ? MediaQuery.of(context).size.width * 0.11 : null, width: isDesktop ? MediaQuery.of(context).size.width * 0.11 : null,
child: SizedBox( child: SizedBox(
@ -993,7 +935,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
await _selectEndCheckOutDate(context); await _selectEndCheckOutDate(context);
if (_endDateController.text.isNotEmpty) { if (_endDateController.text.isNotEmpty) {
DateTime? startDate = _parseDate(_startdateController.text); DateTime? startDate = _parseDate(_startDateController.text);
DateTime? endDate = _parseDate(_endDateController.text); DateTime? endDate = _parseDate(_endDateController.text);
if (startDate != null && if (startDate != null &&
@ -1012,7 +954,7 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
}, },
child: AbsorbPointer( child: AbsorbPointer(
child: TextField( child: TextField(
focusNode: _dateFocusNode, focusNode: _endDateFocusNode,
controller: _endDateController, controller: _endDateController,
style: const TextStyle(fontSize: 12), style: const TextStyle(fontSize: 12),
decoration: const InputDecoration( decoration: const InputDecoration(
@ -1035,9 +977,10 @@ class _InsuranceScreenState extends State<InsuranceScreen> {
if (errorMessages["end_date"] != null) ...[ if (errorMessages["end_date"] != null) ...[
SizedBox(height: 5), // Space before error message SizedBox(height: 5), // Space before error message
Text( Text(
// "Required",
errorMessages["end_date"]!, errorMessages["end_date"]!,
style: TextStyle(color: Colors.red, fontSize: 12), 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
), ),
], ],
], ],

12
lib/Screens/itnerary_list/visa_list.dart
View File

@ -334,7 +334,7 @@ class VisaListWidget extends StatelessWidget {
Expanded( Expanded(
flex: 2, flex: 2,
child: Text( child: Text(
" Visa Type", " Country",
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 11, fontSize: 11,
), ),
@ -342,7 +342,7 @@ class VisaListWidget extends StatelessWidget {
Expanded( Expanded(
flex: 2, flex: 2,
child: Text( child: Text(
" Country", " Visa Type",
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 11, fontSize: 11,
), ),
@ -372,8 +372,8 @@ class VisaListWidget extends StatelessWidget {
Expanded( Expanded(
flex: 2, flex: 2,
child: Text( child: Text(
getRequestForVisa( getRequestForCountry(
item["type_of_visa"]!.toString()), item["country_code"]!.toString()),
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -384,8 +384,8 @@ class VisaListWidget extends StatelessWidget {
Expanded( Expanded(
flex: 2, flex: 2,
child: Text( child: Text(
getRequestForCountry( getRequestForVisa(
item["country_code"]!.toString()), item["type_of_visa"]!.toString()),
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

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

@ -700,6 +700,47 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
print("USERDETAILS : $data"); print("USERDETAILS : $data");
// block-submit-here
// Additional validation starts - travelDetailsData passport
DateTime? start_Date = travelDetailsData?['date_of_issue'];
DateTime? end_Date = travelDetailsData?['date_of_expiry'];
if (start_Date != null && end_Date != null && start_Date.toString().isNotEmpty && end_Date.toString().isNotEmpty) {
try {
final format = DateFormat("dd-MM-yyyy");
final checkStartDate = format.parse("$start_Date");
final checkEndDate = format.parse("$end_Date");
if (checkEndDate.isBefore(checkStartDate)) {
// return "End date cannot be earlier than start date";;
return ;
}
} catch (e) { // return "End date cannot be earlier than start date";
return ;
// errorMessages["end_date"] = "Invalid date format";
}
}
// valid_from: 20-06-2025, valid_upto: 19-06-2025
DateTime? valid_from = data?['valid_from'];
DateTime? valid_upto = data?['valid_upto'];
if (valid_from != null && valid_upto != null && valid_from.toString().isNotEmpty && valid_upto.toString().isNotEmpty) {
try {
final format = DateFormat("dd-MM-yyyy");
final checkValidFrom = format.parse("$valid_from");
final checkValidUpto = format.parse("$valid_upto");
if (checkValidUpto.isBefore(checkValidFrom)) {
// return "valid upto cannot be earlier than valid from";
return ;
}
} catch (e) { // return "valid upto cannot be earlier than valid from";
return ;
// errorMessages["end_date"] = "Invalid date format";
}
}
// Map<String, dynamic> data = userDetials; // Map<String, dynamic> data = userDetials;
if (!isValidData(data) && isValidDataTwo(data)) { if (!isValidData(data) && isValidDataTwo(data)) {

3
lib/Screens/userManagement/create_user/office_details.dart
View File

@ -692,6 +692,9 @@ class _OfficeDetailsState extends State<OfficeDetails> {
enabled: !widget.isViewMode, enabled: !widget.isViewMode,
popupProps: PopupProps.menu( popupProps: PopupProps.menu(
menuProps: const MenuProps(
backgroundColor: Colors.white,
),
showSearchBox: true, showSearchBox: true,
fit: FlexFit.loose, // Allows flexible height fit: FlexFit.loose, // Allows flexible height
itemBuilder: itemBuilder:

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

@ -1584,7 +1584,9 @@ class TravellerDetailsState extends State<TravellerDetails> {
SizedBox(height: 5), // Space before error message SizedBox(height: 5), // Space before error message
Text( Text(
errorMessages["date_of_expiry"]!, errorMessages["date_of_expiry"]!,
style: TextStyle(color: Colors.red, fontSize: 12), style: const TextStyle(color: Colors.red, fontSize: 10),
maxLines: 2, // Allow it to wrap onto two lines
overflow: TextOverflow.ellipsis, // Add ellipsis if it still overflows
), ),
], ],
], ],
@ -4085,7 +4087,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
// Revalidate expiry // Revalidate expiry
if (_selectedCheckOutDate != null && if (_selectedCheckOutDate != null &&
_selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) { _selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) {
errorMessages["valid_upto"] = "end date cannot be earlier than from date"; errorMessages["valid_upto"] = "valid upto cannot be earlier than valid from";
} else { } else {
errorMessages.remove("valid_upto"); errorMessages.remove("valid_upto");
} }
@ -4201,7 +4203,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
if (_selectedCheckInDate != null && if (_selectedCheckInDate != null &&
_selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) { _selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) {
errorMessages["valid_upto"] = "end date cannot be earlier than from date"; errorMessages["valid_upto"] = "valid upto cannot be earlier than valid from";
} else { } else {
errorMessages.remove("valid_upto"); errorMessages.remove("valid_upto");
} }
@ -4257,6 +4259,15 @@ class TravellerDetailsState extends State<TravellerDetails> {
), ),
), ),
), ),
if (errorMessages["valid_upto"] != null) ...[
SizedBox(height: 5), // Space before error message
Text(
errorMessages["valid_upto"]!,
style: const TextStyle(color: Colors.red, fontSize: 10),
maxLines: 2, // Allow it to wrap onto two lines
overflow: TextOverflow.ellipsis, // Add ellipsis if it still overflows
),
],
], ],
); );
} }