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 code

Browse Source
This commit is contained in:
venba-Inspriron-3558 2025-06-11 17:52:15 +05:30
commit 128b0ea9e6
12 changed files with 1214 additions and 1018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Screens/approvals/approval_list.dart
View File

@ -898,6 +898,7 @@ class _ApprovalListState extends State<ApprovalList> {
plan.planId, plan.planId,
plan.approverId, plan.approverId,
plan.delegaterId, plan.delegaterId,
plan.approver_status,
isViewMode: isViewMode:
false, false,
isApprover: isApprover:
@ -1144,6 +1145,7 @@ class _ApprovalListState extends State<ApprovalList> {
plan.planId, plan.planId,
plan.approverId, plan.approverId,
plan.delegaterId, plan.delegaterId,
plan.approver_status,
isViewMode: false, isViewMode: false,
isApprover: true, isApprover: true,
); );

1
lib/Screens/authentication/login/login_widget.dart
View File

@ -125,6 +125,7 @@ class _LoginWidgetState extends State<LoginWidget> {
final token = data['token']; // Assuming the token is in response final token = data['token']; // Assuming the token is in response
// final userId = data['user_id'].toString(); // final userId = data['user_id'].toString();
print("Token - $token");
await storeUserDetails(token); await storeUserDetails(token);
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(

845
lib/Screens/itnerary/flights.dart
View File

File diff suppressed because it is too large Load Diff

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

@ -297,6 +297,11 @@ class _ForexScreenState extends State<ForexScreen> {
errorMessages["end_date"] = errorMessages["end_date"] =
"End date cannot be earlier than start date"; "End date cannot be earlier than start date";
; ;
} else if (checkEndDate.isAtSameMomentAs(checkStartDate)) {
setState(() {
errorMessages["end_date"] =
"Start and end dates cannot be the same";
});
} }
} catch (e) { } catch (e) {
errorMessages["end_date"] = "Invalid date format"; errorMessages["end_date"] = "Invalid date format";
@ -350,16 +355,6 @@ class _ForexScreenState extends State<ForexScreen> {
final cash = data["deposit_on_cash"]; final cash = data["deposit_on_cash"];
print("card - $card"); print("card - $card");
print("cash - $cash"); print("cash - $cash");
// Call validations first (they populate errorMessages)
_validateCardAmount(card);
_validateCashAmount(cash);
// Now check if any errors exist
if (errorMessages.isNotEmpty) {
print("Validation Failed: ${errorMessages}");
setState(() {}); // Refresh UI with error messages
return;
}
if (!isValidForexData(data)) { if (!isValidForexData(data)) {
// && errorMessages.isNotEmpty) { // && errorMessages.isNotEmpty) {
@ -416,6 +411,7 @@ class _ForexScreenState extends State<ForexScreen> {
textControllers["_forexStartDate"]?.addListener(_onFieldChanged); textControllers["_forexStartDate"]?.addListener(_onFieldChanged);
textControllers["_forexEndDate"]?.addListener(_onFieldChanged); textControllers["_forexEndDate"]?.addListener(_onFieldChanged);
flightFirstTripDateNotifier = ValueNotifier<String?>(null); flightFirstTripDateNotifier = ValueNotifier<String?>(null);
flightLastTripDateNotifier = ValueNotifier<String?>(null); flightLastTripDateNotifier = ValueNotifier<String?>(null);
@ -509,6 +505,7 @@ class _ForexScreenState extends State<ForexScreen> {
// textControllers["_cardNumber"]!.text = userCardNumber ?? ''; // textControllers["_cardNumber"]!.text = userCardNumber ?? '';
// //
// } // }
_onFieldChangedForOthers(); _onFieldChangedForOthers();
setState(() {}); // Update the UI setState(() {}); // Update the UI
@ -544,7 +541,6 @@ class _ForexScreenState extends State<ForexScreen> {
// Handle field changes // Handle field changes
void _onFieldChanged() { void _onFieldChanged() {
print("_on Field Changed Called");
if (_isForexDataDurationComplete()) { if (_isForexDataDurationComplete()) {
print("Calculate 1"); print("Calculate 1");
CalculateDuration(); CalculateDuration();
@ -581,7 +577,8 @@ class _ForexScreenState extends State<ForexScreen> {
print("Calculate 4"); print("Calculate 4");
// Calculate difference // Calculate difference
final durationInDays = endDate.difference(startDate).inDays ; // +1 to include both days final durationInDays =
endDate.difference(startDate).inDays; // +1 to include both days
// You can now use durationInDays however you want: // You can now use durationInDays however you want:
print("Duration: $durationInDays days"); print("Duration: $durationInDays days");
@ -763,9 +760,6 @@ class _ForexScreenState extends State<ForexScreen> {
for (var controller in textControllers.values) { for (var controller in textControllers.values) {
controller.dispose(); controller.dispose();
} }
// textControllers["_forexStartDate"]?.removeListener(_onFieldChanged);
// textControllers["_forexEndDate"]?.removeListener(_onFieldChanged);
// textControllers.forEach((_, controller) => controller.dispose());
super.dispose(); super.dispose();
} }
@ -1021,18 +1015,36 @@ class _ForexScreenState extends State<ForexScreen> {
textControllers["_forexEndDate"]!.text, textControllers["_forexEndDate"]!.text,
); );
if (startDate != null && if (startDate != null && endDate != null) {
endDate != null && if (endDate.isBefore(startDate)) {
endDate.isBefore(startDate)) { setState(() {
setState(() { errorMessages["end_date"] =
errorMessages["end_date"] = "End date cannot be earlier than start date";
"End date cannot be earlier than start date"; });
}); } else if (endDate.isAtSameMomentAs(startDate)) {
} else { setState(() {
setState(() { errorMessages["end_date"] =
errorMessages.remove("end_date"); "Start and end dates cannot be the same";
}); });
} else {
setState(() {
errorMessages.remove("end_date");
});
}
} }
// if (startDate != null &&
// endDate != null &&
// endDate.isBefore(startDate)) {
// setState(() {
// errorMessages["end_date"] =
// "End date cannot be earlier than start date";
// });
// } else {
// setState(() {
// errorMessages.remove("end_date");
// });
// }
} }
}, },
child: AbsorbPointer( child: AbsorbPointer(
@ -1108,6 +1120,11 @@ class _ForexScreenState extends State<ForexScreen> {
errorMessages["end_date"] = errorMessages["end_date"] =
"End date cannot be earlier than start date"; "End date cannot be earlier than start date";
}); });
} else if (endDate!.isAtSameMomentAs(startDate!)) {
setState(() {
errorMessages["end_date"] =
"Start and end dates cannot be the same";
});
} else { } else {
setState(() { setState(() {
errorMessages.remove("end_date"); errorMessages.remove("end_date");

702
lib/Screens/plans/create_plans.dart
View File

@ -124,6 +124,7 @@ class _CreatePlansState extends State<CreatePlan> {
final bool isApprover = args?['isApprover'] ?? false; final bool isApprover = args?['isApprover'] ?? false;
final String approverId = args['approverId'] ?? ""; final String approverId = args['approverId'] ?? "";
final String delegaterId = args['delegaterId'] ?? ""; final String delegaterId = args['delegaterId'] ?? "";
final String approverStatus = args['approver_status'] ?? "";
final Map<String, dynamic> planData = final Map<String, dynamic> planData =
args['planData'] as Map<String, dynamic>? ?? {}; args['planData'] as Map<String, dynamic>? ?? {};
@ -216,6 +217,7 @@ class _CreatePlansState extends State<CreatePlan> {
isApprover: isApprover, isApprover: isApprover,
approverId: approverId, approverId: approverId,
delegaterId: delegaterId, delegaterId: delegaterId,
approverStatus: approverStatus,
), ),
), ),
), ),
@ -325,6 +327,7 @@ class CreateNewPlan extends StatefulWidget {
final bool isDesktop; final bool isDesktop;
final bool isViewMode; final bool isViewMode;
final bool isApprover; final bool isApprover;
final String? approverStatus;
final Color? bodyColor; final Color? bodyColor;
final Color? layoutColor; final Color? layoutColor;
@ -341,6 +344,7 @@ class CreateNewPlan extends StatefulWidget {
required this.selectedPlanData, required this.selectedPlanData,
required this.isViewMode, required this.isViewMode,
required this.isApprover, required this.isApprover,
required this.approverStatus,
required this.approverId, required this.approverId,
required this.delegaterId, required this.delegaterId,
}); });
@ -375,6 +379,7 @@ class CreateNewPlansState extends State<CreateNewPlan> {
bool isStatusExpanded = false; bool isStatusExpanded = false;
bool isShowApprovalAction = false; bool isShowApprovalAction = false;
String? selectedPlanId; String? selectedPlanId;
String? approverStatus;
String? userDetails; String? userDetails;
String? userName; String? userName;
@ -502,7 +507,11 @@ class CreateNewPlansState extends State<CreateNewPlan> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
print("approverStatus - ${widget.approverStatus}");
if (widget.approverStatus == "Approval pending") {
print("Status approver - Approval Pending");
}
flightTripTypeNotifier = ValueNotifier(null); flightTripTypeNotifier = ValueNotifier(null);
fetchUserDetails(); fetchUserDetails();
@ -1169,6 +1178,8 @@ class CreateNewPlansState extends State<CreateNewPlan> {
data['plan_id'], data['plan_id'],
data['approverId'], data['approverId'],
data['delegaterId'], data['delegaterId'],
data['approver_status'],
isViewMode: false, isViewMode: false,
isApprover: true, isApprover: true,
); );
@ -1295,366 +1306,373 @@ class CreateNewPlansState extends State<CreateNewPlan> {
), ),
); );
return ResponsiveBuilder( return FocusTraversalGroup(
builder: (context, sizingInfo) { policy: OrderedTraversalPolicy(), // 👈 more predictable tab order
bool isMobile = sizingInfo.isMobile; descendantsAreFocusable: true,
bool isDesktop = child: ResponsiveBuilder(
sizingInfo.deviceScreenType == DeviceScreenType.desktop; builder: (context, sizingInfo) {
bool isMobile = sizingInfo.isMobile;
bool isDesktop =
sizingInfo.deviceScreenType == DeviceScreenType.desktop;
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
ResponsiveBuilder( ResponsiveBuilder(
builder: (context, sizingInfo) { builder: (context, sizingInfo) {
bool isDesktop = bool isDesktop =
sizingInfo.deviceScreenType == sizingInfo.deviceScreenType ==
DeviceScreenType.desktop; DeviceScreenType.desktop;
return Container( return Container(
padding: const EdgeInsets.all(5), padding: const EdgeInsets.all(5),
child: child:
isDesktop isDesktop
? Row( ? Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.end, // mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
_buildTripName(isDesktop), _buildTripName(isDesktop),
if (isDesktop) Spacer(), if (isDesktop) Spacer(),
..._buildApproverControls(isDesktop), ..._buildApproverControls(isDesktop),
// Text( // Text(
// widget.isViewMode // widget.isViewMode
// ? "View Plan" // ? "View Plan"
// : (selectedPlanId != null && // : (selectedPlanId != null &&
// selectedPlanId!.isNotEmpty // selectedPlanId!.isNotEmpty
// ? "Update Plan" // ? "Update Plan"
// : "New Plan"), // : "New Plan"),
// style: TextStyle(fontSize: 18), // style: TextStyle(fontSize: 18),
// ), // ),
// Spacer(), // Spacer(),
if (statusValue != "") if (statusValue != "")
..._buildPlanPdf(isDesktop), ..._buildPlanPdf(isDesktop),
], ],
) )
: Column( : Column(
children: [ children: [
Row( Row(
// crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.end, MainAxisAlignment.end,
children: [ children: [
..._buildApproverControls( ..._buildApproverControls(
isDesktop, isDesktop,
), ),
if (statusValue != "") if (statusValue != "")
..._buildPlanPdf(isDesktop), ..._buildPlanPdf(isDesktop),
], ],
), ),
Row( Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [_buildTripName(isDesktop)], children: [
), _buildTripName(isDesktop),
], ],
), ),
); ],
}, ),
), );
// if (isStatusExpanded) },
// Container( ),
// margin: isDesktop // if (isStatusExpanded)
// ? const EdgeInsets.only(left: 0, top: 0) // Container(
// : const EdgeInsets.only(left: 5, top: 2), // margin: isDesktop
// padding: const EdgeInsets.all(12), // ? const EdgeInsets.only(left: 0, top: 0)
// width: isDesktop // : const EdgeInsets.only(left: 5, top: 2),
// ? MediaQuery.of(context).size.width * 0.2 // padding: const EdgeInsets.all(12),
// : MediaQuery.of(context).size.width, // width: isDesktop
// decoration: BoxDecoration( // ? MediaQuery.of(context).size.width * 0.2
// color: Color(0xFFF5F5F5), // : MediaQuery.of(context).size.width,
// border: Border.all( // decoration: BoxDecoration(
// // color: Colors.grey.shade300, // color: Color(0xFFF5F5F5),
// color: Colors.white, // border: Border.all(
// width: 0.2), // // color: Colors.grey.shade300,
// borderRadius: BorderRadius.circular(8), // color: Colors.white,
// // boxShadow: [ // width: 0.2),
// // BoxShadow( // borderRadius: BorderRadius.circular(8),
// // // color: Colors.grey.withAlpha(20), // // boxShadow: [
// // color: Colors.grey.withAlpha(20), // // BoxShadow(
// // spreadRadius: 1.5, // // // color: Colors.grey.withAlpha(20),
// // blurRadius: 7, // // color: Colors.grey.withAlpha(20),
// // offset: Offset(0, 4), // shadow direction: bottom // // spreadRadius: 1.5,
// // ), // // blurRadius: 7,
// // ], // // offset: Offset(0, 4), // shadow direction: bottom
// ), // // ),
// child: Column( // // ],
// crossAxisAlignment: CrossAxisAlignment.start, // ),
// children: [ // child: Column(
// if (!hasApprovals) // crossAxisAlignment: CrossAxisAlignment.start,
// Center( // children: [
// child: Text( // if (!hasApprovals)
// "--- No Approvals ---", // Center(
// style: TextStyle( // child: Text(
// fontFamily: "Archivo", // "--- No Approvals ---",
// fontSize: 11, // style: TextStyle(
// fontWeight: FontWeight.w500, // fontFamily: "Archivo",
// color: Colors.black87, // fontSize: 11,
// ), // fontWeight: FontWeight.w500,
// )), // color: Colors.black87,
// for (int i = 0; i < planStatusList.length; i++) ...[ // ),
// if (planStatusList[i].entries.any((entry) => // )),
// entry.key.contains('status') && // for (int i = 0; i < planStatusList.length; i++) ...[
// entry.value != null && // if (planStatusList[i].entries.any((entry) =>
// entry.value.toString().isNotEmpty)) ...[ // entry.key.contains('status') &&
// _buildApprovalItem( // entry.value != null &&
// "Approver ${i + 1}", // entry.value.toString().isNotEmpty)) ...[
// planStatusList[i] // _buildApprovalItem(
// .entries // "Approver ${i + 1}",
// .firstWhere( // planStatusList[i]
// (entry) => entry.key.contains('status'), // .entries
// orElse: () => MapEntry('', ''), // .firstWhere(
// ) // (entry) => entry.key.contains('status'),
// .value // orElse: () => MapEntry('', ''),
// .toString(), // )
// ), // .value
// SizedBox(height: 6), // .toString(),
// ], // ),
// ], // SizedBox(height: 6),
// ], // ],
// ), // ],
// ), // ],
if (isApproverRejected) // ),
Row( // ),
crossAxisAlignment: CrossAxisAlignment.start, if (isApproverRejected)
children: [ Row(
const Padding( crossAxisAlignment: CrossAxisAlignment.start,
padding: EdgeInsets.only(top: 4, left: 8), children: [
child: Text( const Padding(
"Remarks : ", padding: EdgeInsets.only(top: 4, left: 8),
style: TextStyle( child: Text(
fontFamily: "Archivo", "Remarks : ",
fontWeight: FontWeight.w600,
fontSize: 11,
),
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(
top: 0,
), // tweak if needed
child: TextFormField(
controller: _remarksController,
style: TextStyle( style: TextStyle(
fontFamily: "Archivo", fontFamily: "Archivo",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 11, fontSize: 11,
), ),
decoration: InputDecoration(
hintText: "Please enter remarks...",
hintStyle: GoogleFonts.poppins(
fontSize: 13,
color: Colors.grey,
),
border: InputBorder.none,
isDense: true,
),
maxLines: null,
), ),
), ),
), Expanded(
], child: Padding(
), padding: const EdgeInsets.only(
top: 0,
// if (widget.isApprover || isStatusExpanded) ), // tweak if needed
Divider(thickness: 0.1, color: Colors.blueGrey), child: TextFormField(
if (widget.isApprover) SizedBox(height: 5), controller: _remarksController,
style: TextStyle(
Text( fontFamily: "Archivo",
"Planning This Trip For*", // Your label fontWeight: FontWeight.w600,
style: GoogleFonts.poppins( fontSize: 11,
fontSize: 12, ),
fontWeight: FontWeight.w600, decoration: InputDecoration(
color: Color(0xFF575A74), hintText: "Please enter remarks...",
), hintStyle: GoogleFonts.poppins(
), fontSize: 13,
SizedBox(height: 6), color: Colors.grey,
isDesktop ),
? SingleChildScrollView( border: InputBorder.none,
scrollDirection: Axis.horizontal, isDense: true,
child: Row(children: _buildPlanTrip(isDesktop)), ),
) maxLines: null,
: Row(children: _buildPlanTrip(isDesktop)), ),
SizedBox(height: 7), ),
// Text(
// otherUserName ?? userName ?? " ", // Your label
//
// style: GoogleFonts.poppins(
// fontSize: 11,
// fontWeight: FontWeight.w400,
// color: widget.layoutColor,
// ),
// ),
Text.rich(
TextSpan(
text: "Trip Planned User : ", // Static text
style: GoogleFonts.poppins(
fontSize: 11,
fontWeight: FontWeight.w400,
color: Color(0xFF212121),
// color: Color(0xFF575A74), // Default color
),
children: [
TextSpan(
text:
otherUserName ??
userName ??
" ", // Dynamic username
style: GoogleFonts.poppins(
fontSize: 11,
fontWeight: FontWeight.w400,
color:
widget
.layoutColor, // Change this to any color
// color: Colors.blueAccent, // Change this to any color
), ),
), ],
], ),
// if (widget.isApprover || isStatusExpanded)
Divider(thickness: 0.1, color: Colors.blueGrey),
if (widget.isApprover) SizedBox(height: 5),
Text(
"Planning This Trip For*", // Your label
style: GoogleFonts.poppins(
fontSize: 12,
fontWeight: FontWeight.w600,
color: Color(0xFF575A74),
),
), ),
), SizedBox(height: 6),
SizedBox(height: 5), isDesktop
], ? SingleChildScrollView(
), scrollDirection: Axis.horizontal,
), child: Row(children: _buildPlanTrip(isDesktop)),
], )
), : Row(children: _buildPlanTrip(isDesktop)),
SizedBox(height: 7),
// Padding( // Text(
// padding: const EdgeInsets.all(8.0), // otherUserName ?? userName ?? " ", // Your label
// child: Divider( //
// color: Color(0xFFE6E7F5), // Change color // style: GoogleFonts.poppins(
// thickness: 0.5, // fontSize: 11,
// ), // fontWeight: FontWeight.w400,
// ), // color: widget.layoutColor,
SizedBox(height: 10), // ),
// ),
// Row( Text.rich(
// children: [ TextSpan(
// Expanded( text: "Trip Planned User : ", // Static text
// child: style: GoogleFonts.poppins(
// ), fontSize: 11,
// ], fontWeight: FontWeight.w400,
// ), color: Color(0xFF212121),
isDesktop // color: Color(0xFF575A74), // Default color
? Row( ),
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: _buildTripRow(isMobile), TextSpan(
) text:
: Column( otherUserName ??
crossAxisAlignment: CrossAxisAlignment.start, userName ??
children: _buildTripRow(isMobile), " ", // Dynamic username
), style: GoogleFonts.poppins(
SizedBox(height: 15), fontSize: 11,
fontWeight: FontWeight.w400,
isDesktop color:
? Row( widget
crossAxisAlignment: CrossAxisAlignment.start, .layoutColor, // Change this to any color
children: _buildCostCenter(isDesktop), // color: Colors.blueAccent, // Change this to any color
) ),
: Column( ),
crossAxisAlignment: CrossAxisAlignment.start, ],
children: _buildCostCenter(isDesktop), ),
), ),
SizedBox(height: 8), SizedBox(height: 5),
isDesktop ],
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// _buildNonDescriptionColumn(),
// SizedBox(width: 25),
_buildDescriptionColumn(isDesktop),
],
)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// _buildNonDescriptionColumn(),
// SizedBox(height: 15),
_buildDescriptionColumn(isDesktop),
],
),
// Padding(
// padding: const EdgeInsets.all(8.0),
// child: Divider(
// color: Color(0xFFE6E7F5), // Change color
// thickness: 0.5,
// ),
// ),
SizedBox(height: 20),
if (temporaryMessage != null)
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
// validationErrors["services"]!,
temporaryMessage!,
style: GoogleFonts.poppins(
color: Colors.red,
fontSize: 12,
fontWeight: FontWeight.w400,
), ),
), ),
], ],
), ),
if (temporaryMessage != null) SizedBox(height: 10), // Padding(
Row( // padding: const EdgeInsets.all(8.0),
children: [ // child: Divider(
Expanded( // color: Color(0xFFE6E7F5), // Change color
child: DynamicItinerary( // thickness: 0.5,
key: dynamicItineraryKey, // ),
flightScreenKey: flightScreenKey, // ),
tripTypeNotifier: flightTripTypeNotifier, SizedBox(height: 10),
hasAction: hasAction,
tripType: _selectedTripType,
apiData: apiData,
apiDataForClass: apiDataForClass,
apiCountryData: apiCountryData,
onItineraryUpdate: handleItineraryUpdate,
loginUser: selfId,
selectedPlanData: planData,
isViewMode: widget.isViewMode,
),
), // Wrap with Expanded if needed
],
),
SizedBox(height: 15),
],
);
// Row( // Row(
// children: [ // children: [
// isDesktop // Expanded(
// ? Row( // child:
// mainAxisAlignment: MainAxisAlignment.end, // ),
// children: _buildSubmit(isDesktop), // ],
// ) // ),
// : Row( isDesktop
// mainAxisAlignment: MainAxisAlignment.center, ? Row(
// children: _buildSubmit(isDesktop), crossAxisAlignment: CrossAxisAlignment.start,
// ) children: _buildTripRow(isMobile),
// ], )
// ) : Column(
}, crossAxisAlignment: CrossAxisAlignment.start,
children: _buildTripRow(isMobile),
),
SizedBox(height: 15),
isDesktop
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: _buildCostCenter(isDesktop),
)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _buildCostCenter(isDesktop),
),
SizedBox(height: 8),
isDesktop
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// _buildNonDescriptionColumn(),
// SizedBox(width: 25),
_buildDescriptionColumn(isDesktop),
],
)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// _buildNonDescriptionColumn(),
// SizedBox(height: 15),
_buildDescriptionColumn(isDesktop),
],
),
// Padding(
// padding: const EdgeInsets.all(8.0),
// child: Divider(
// color: Color(0xFFE6E7F5), // Change color
// thickness: 0.5,
// ),
// ),
SizedBox(height: 20),
if (temporaryMessage != null)
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
// validationErrors["services"]!,
temporaryMessage!,
style: GoogleFonts.poppins(
color: Colors.red,
fontSize: 12,
fontWeight: FontWeight.w400,
),
),
],
),
if (temporaryMessage != null) SizedBox(height: 10),
Row(
children: [
Expanded(
child: DynamicItinerary(
key: dynamicItineraryKey,
flightScreenKey: flightScreenKey,
tripTypeNotifier: flightTripTypeNotifier,
hasAction: hasAction,
tripType: _selectedTripType,
apiData: apiData,
apiDataForClass: apiDataForClass,
apiCountryData: apiCountryData,
onItineraryUpdate: handleItineraryUpdate,
loginUser: selfId,
selectedPlanData: planData,
isViewMode: widget.isViewMode,
),
), // Wrap with Expanded if needed
],
),
SizedBox(height: 15),
],
);
// Row(
// children: [
// isDesktop
// ? Row(
// mainAxisAlignment: MainAxisAlignment.end,
// children: _buildSubmit(isDesktop),
// )
// : Row(
// mainAxisAlignment: MainAxisAlignment.center,
// children: _buildSubmit(isDesktop),
// )
// ],
// )
},
),
// replace with your full form column
); );
} }
@ -3132,7 +3150,7 @@ class CreateNewPlansState extends State<CreateNewPlan> {
// ], // ],
// ), // ),
const SizedBox(height: 10, width: 10), const SizedBox(height: 10, width: 10),
if (widget.isApprover) if (widget.isApprover && (widget.approverStatus == "Approval pending"))
GestureDetector( GestureDetector(
// onTap: () { // onTap: () {
// setState(() { // setState(() {

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

@ -42,9 +42,9 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
final ApiService apiService = ApiService(); final ApiService apiService = ApiService();
final GlobalKey<PersonalDetailsState> personalDetailsKey = final GlobalKey<PersonalDetailsState> personalDetailsKey =
GlobalKey<PersonalDetailsState>(); GlobalKey<PersonalDetailsState>();
final GlobalKey<TravellerDetailsState> travellerDetailsKey = final GlobalKey<TravellerDetailsState> travellerDetailsKey =
GlobalKey<TravellerDetailsState>(); GlobalKey<TravellerDetailsState>();
// late List<Map<String, dynamic>?> travelDetailsData; // late List<Map<String, dynamic>?> travelDetailsData;
Map<String, dynamic>? travelDetailsData; Map<String, dynamic>? travelDetailsData;
@ -64,6 +64,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
final Map<String, TextEditingController> controllers = {}; final Map<String, TextEditingController> controllers = {};
bool isViewMode = false; bool isViewMode = false;
bool isEditProfile = false; bool isEditProfile = false;
// late final List<dynamic>? apiCountryData ; // late final List<dynamic>? apiCountryData ;
late List<dynamic>? apiCountryData; late List<dynamic>? apiCountryData;
@ -86,6 +87,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
String? selectedCountry; String? selectedCountry;
String? selectedGender; String? selectedGender;
// String? selectedGender = personalDetailsKey.currentState?.selectedGender; // String? selectedGender = personalDetailsKey.currentState?.selectedGender;
String? selectedUserType; String? selectedUserType;
@ -299,7 +301,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
// Fix the invalid JSON (dangerous if the format changes) // Fix the invalid JSON (dangerous if the format changes)
final fixedJson = raw.replaceAllMapped( final fixedJson = raw.replaceAllMapped(
RegExp(r'(\w+):'), // matches `service_id:` RegExp(r'(\w+):'), // matches `service_id:`
(match) => '"${match.group(1)}":', (match) => '"${match.group(1)}":',
); );
List<dynamic> decodedList = jsonDecode(fixedJson); List<dynamic> decodedList = jsonDecode(fixedJson);
@ -363,7 +365,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
// } // }
final extraData = final extraData =
GoRouterState.of(context).extra as Map<String, dynamic>?; GoRouterState.of(context).extra as Map<String, dynamic>?;
if (extraData != null) { if (extraData != null) {
print("extraData: ${extraData['selectedUser']}"); print("extraData: ${extraData['selectedUser']}");
@ -381,8 +383,8 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
// Handle selectedUser as a Map (not a List) // Handle selectedUser as a Map (not a List)
apiselectedUser = apiselectedUser =
extraData['selectedUser'] extraData['selectedUser']
as Map<String, dynamic>?; // Cast it as a Map as Map<String, dynamic>?; // Cast it as a Map
isViewMode = extraData['isViewMode'] ?? false; isViewMode = extraData['isViewMode'] ?? false;
isEditProfile = extraData['isEditProfile'] ?? false; isEditProfile = extraData['isEditProfile'] ?? false;
}); });
@ -444,7 +446,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
userMap = { userMap = {
for (var user in userList) for (var user in userList)
user['user_id'].toString(): user['user_id'].toString():
"${user['first_name']} ${user['last_name']}", "${user['first_name']} ${user['last_name']}",
}; };
userIdsApi = userMap.keys.toList(); userIdsApi = userMap.keys.toList();
}); });
@ -483,14 +485,14 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
setState(() { setState(() {
layoutColor = layoutColor =
layoutString != null layoutString != null
? Color(int.parse(layoutString)) ? Color(int.parse(layoutString))
: Colors.redAccent; : Colors.redAccent;
bodyColor = bodyColor =
bodyStringColor != null bodyStringColor != null
? Color(int.parse(bodyStringColor)) ? Color(int.parse(bodyStringColor))
: Colors.white; : Colors.white;
}); });
} }
@ -654,11 +656,9 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
void handleSubmit() async { void handleSubmit() async {
print("USR Detail Submit"); print("USR Detail Submit");
// printFormData(); // printFormData();
print("travel validation");
bool isValid = travellerDetailsKey.currentState?.boolValidation() ?? false; bool isValid = travellerDetailsKey.currentState?.boolValidation() ?? false;
if (selectedTab == "travel" || if (selectedRole == "5" || setSelectesUserType == true) {
selectedRole == "5" ||
setSelectesUserType == true) {
print("NO validation"); print("NO validation");
Map<String, dynamic> data = userDetials; Map<String, dynamic> data = userDetials;
@ -702,30 +702,64 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
// block-submit-here // block-submit-here
// Additional validation starts - travelDetailsData passport final format = DateFormat("dd-MM-yyyy");
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) { DateTime? start_Date;
try { DateTime? end_Date;
final format = DateFormat("dd-MM-yyyy");
final checkStartDate = format.parse("$start_Date");
final checkEndDate = format.parse("$end_Date");
if (checkEndDate.isBefore(checkStartDate)) { try {
// return "End date cannot be earlier than start date";; if (travelDetailsData?['date_of_issue'] != null &&
return ; travelDetailsData!['date_of_issue'].toString().isNotEmpty) {
} start_Date = format.parse(travelDetailsData!['date_of_issue']);
} catch (e) { // return "End date cannot be earlier than start date";
return ;
// errorMessages["end_date"] = "Invalid date format";
} }
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("End date cannot be earlier than start date");
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 // valid_from: 20-06-2025, valid_upto: 19-06-2025
DateTime? valid_from = data?['valid_from']; DateTime? valid_from = data?['valid_from'];
DateTime? valid_upto = data?['valid_upto']; DateTime? valid_upto = data?['valid_upto'];
if (valid_from != null && valid_upto != null && valid_from.toString().isNotEmpty && valid_upto.toString().isNotEmpty) { if (valid_from != null &&
valid_upto != null &&
valid_from.toString().isNotEmpty &&
valid_upto.toString().isNotEmpty) {
try { try {
final format = DateFormat("dd-MM-yyyy"); final format = DateFormat("dd-MM-yyyy");
final checkValidFrom = format.parse("$valid_from"); final checkValidFrom = format.parse("$valid_from");
@ -733,10 +767,11 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
if (checkValidUpto.isBefore(checkValidFrom)) { if (checkValidUpto.isBefore(checkValidFrom)) {
// return "valid upto cannot be earlier than valid from"; // return "valid upto cannot be earlier than valid from";
return ; return;
} }
} catch (e) { // return "valid upto cannot be earlier than valid from"; } catch (e) {
return ; // return "valid upto cannot be earlier than valid from";
return;
// errorMessages["end_date"] = "Invalid date format"; // errorMessages["end_date"] = "Invalid date format";
} }
} }
@ -785,7 +820,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
if (data["mobile_no"] != null && data["mobile_no"].toString().isNotEmpty) { if (data["mobile_no"] != null && data["mobile_no"].toString().isNotEmpty) {
if (!RegExp(r"^\d{10}$").hasMatch(data["mobile_no"].toString())) { if (!RegExp(r"^\d{10}$").hasMatch(data["mobile_no"].toString())) {
errorMessages["mobile_no"] = errorMessages["mobile_no"] =
"Enter 10 digits"; // Invalid mobile number format "Enter 10 digits"; // Invalid mobile number format
} }
} }
@ -795,7 +830,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
r"^\d{10}$", r"^\d{10}$",
).hasMatch(data["alternate_mobile_no"].toString())) { ).hasMatch(data["alternate_mobile_no"].toString())) {
errorMessages["alternate_mobile_no"] = errorMessages["alternate_mobile_no"] =
"Enter 10 digits"; // Invalid mobile number format "Enter 10 digits"; // Invalid mobile number format
} }
} }
@ -985,7 +1020,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
// ✅ Ensure UI updates // ✅ Ensure UI updates
if (isMatch) { if (isMatch) {
errorMessages["password"] = errorMessages["password"] =
"New password is not similar to old password"; "New password is not similar to old password";
print(" Password match!"); print(" Password match!");
} else { } else {
print(" Password NOT match!"); print(" Password NOT match!");
@ -1014,16 +1049,16 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
drawer: CustomDrawer(isDesktop: false), drawer: CustomDrawer(isDesktop: false),
body: Padding( body: Padding(
padding: padding:
isDesktop isDesktop
? EdgeInsets.symmetric( ? EdgeInsets.symmetric(
horizontal: horizontal:
MediaQuery.of(context).size.width * MediaQuery.of(context).size.width *
0.1, // 30% of screen width as horizontal padding 0.1, // 30% of screen width as horizontal padding
vertical: vertical:
MediaQuery.of(context).size.height * MediaQuery.of(context).size.height *
0, // 5% of screen height as vertical padding 0, // 5% of screen height as vertical padding
) )
: EdgeInsets.all(0), : EdgeInsets.all(0),
child: Row( child: Row(
children: [Expanded(child: buildData(isDesktop, context))], children: [Expanded(child: buildData(isDesktop, context))],
), ),
@ -1045,9 +1080,9 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
Expanded( Expanded(
child: Container( child: Container(
height: height:
isDesktop isDesktop
? MediaQuery.of(context).size.height * 0.98 ? MediaQuery.of(context).size.height * 0.98
: MediaQuery.of(context).size.height, : MediaQuery.of(context).size.height,
child: Padding( child: Padding(
padding: EdgeInsets.all(0.0), padding: EdgeInsets.all(0.0),
child: _buildUserDetails(isDesktop), child: _buildUserDetails(isDesktop),
@ -1059,39 +1094,39 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: child:
isDesktop isDesktop
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
if (selectedTab != "personal") if (selectedTab != "personal")
..._buildBack(isDesktop, layoutColor!), ..._buildBack(isDesktop, layoutColor!),
Spacer(), // spacing between buttons Spacer(), // spacing between buttons
// Next or Submit based on role or user type // Next or Submit based on role or user type
if (selectedTab == "travel" || if (selectedTab == "travel" ||
selectedRole == "5" || selectedRole == "5" ||
setSelectesUserType == true) setSelectesUserType == true)
..._buildSubmit(isDesktop, layoutColor!) ..._buildSubmit(isDesktop, layoutColor!)
else else
..._buildNext(isDesktop, layoutColor!), ..._buildNext(isDesktop, layoutColor!),
// (selectedTab == "travel" || // (selectedTab == "travel" ||
// selectedRole == "5" || // selectedRole == "5" ||
// setSelectesUserType == true) // setSelectesUserType == true)
// ? _buildSubmit(isDesktop, layoutColor!) // ? _buildSubmit(isDesktop, layoutColor!)
// : _buildNext( // : _buildNext(
// isDesktop, // isDesktop,
// layoutColor!, // layoutColor!,
// ), // _buildGoBack(isDesktop, layoutColor!), // ), // _buildGoBack(isDesktop, layoutColor!),
], ],
) )
: Row( : Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: children:
(selectedTab == "travel" || (selectedTab == "travel" ||
selectedRole == "5" || selectedRole == "5" ||
setSelectesUserType == true) setSelectesUserType == true)
? _buildSubmit(isDesktop, layoutColor!) ? _buildSubmit(isDesktop, layoutColor!)
: _buildNext(isDesktop, layoutColor!), : _buildNext(isDesktop, layoutColor!),
), ),
), ),
), ),
], ],
@ -1136,9 +1171,9 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
isDesktop isDesktop
? buildTabsForUser() ? buildTabsForUser()
: SingleChildScrollView( : SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: buildTabsForUser(), child: buildTabsForUser(),
), ),
Container( Container(
// color: Colors.yellow.shade50, // color: Colors.yellow.shade50,
height: MediaQuery.of(context).size.height * 0.64, height: MediaQuery.of(context).size.height * 0.64,
@ -1241,8 +1276,8 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
); );
case "travel": case "travel":
final fullName = final fullName =
"${controllers["Fname"]?.text ?? ""} ${controllers["Lname"]?.text ?? ""}" "${controllers["Fname"]?.text ?? ""} ${controllers["Lname"]?.text ?? ""}"
.trim(); .trim();
return TravellerDetails( return TravellerDetails(
key: travellerDetailsKey, key: travellerDetailsKey,
isDesktop: isDesktop, isDesktop: isDesktop,
@ -1301,69 +1336,69 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.end, // important crossAxisAlignment: CrossAxisAlignment.end, // important
children: children:
tabs.entries.map((entry) { tabs.entries.map((entry) {
final targetTab = entry.key; final targetTab = entry.key;
print("TargetsTAb: $targetTab"); print("TargetsTAb: $targetTab");
final isSelected = selectedTab == entry.key; final isSelected = selectedTab == entry.key;
print("isSelected: $isSelected"); print("isSelected: $isSelected");
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
bool isValid = false; bool isValid = false;
final currentTab = selectedTab; final currentTab = selectedTab;
if (currentTab == "personal") { if (currentTab == "personal") {
isValid = isValidData(userDetials); isValid = isValidData(userDetials);
if (isValid) { if (isValid) {
selectedTab = entry.key; selectedTab = entry.key;
} }
} else if (currentTab == "office" && } else if (currentTab == "office" &&
targetTab == "personal") { targetTab == "personal") {
selectedTab = entry.key; selectedTab = entry.key;
} else if (currentTab == "office") { } else if (currentTab == "office") {
isValid = isValidDataTwo(userDetials); isValid = isValidDataTwo(userDetials);
if (isValid) { if (isValid) {
selectedTab = entry.key; selectedTab = entry.key;
} }
} else { } else {
isValid = isValid =
true; // Travel tab might not need validation at this point true; // Travel tab might not need validation at this point
selectedTab = entry.key; selectedTab = entry.key;
} }
}); });
}, },
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
right: 24.0, right: 24.0,
), // space between tabs ), // space between tabs
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Text(
entry.value, entry.value,
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: color:
isSelected ? Color(0xFF114D8B) : Color(0xFF475569), 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),
),
],
), ),
const SizedBox(height: 8), ),
AnimatedContainer( );
duration: Duration(milliseconds: 300), }).toList(),
height: 2,
width: isSelected ? 50 : 0, // small line
color: Color(0xFF114D8B),
),
],
),
),
);
}).toList(),
); );
} }
@ -1373,17 +1408,17 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
return [ return [
MouseRegion( MouseRegion(
cursor: cursor:
isViewMode isViewMode
? SystemMouseCursors.forbidden ? SystemMouseCursors.forbidden
: SystemMouseCursors.click, : SystemMouseCursors.click,
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: backgroundColor:
isViewMode ? layoutColor : layoutColor, // Keep original color isViewMode ? layoutColor : layoutColor, // Keep original color
foregroundColor: foregroundColor:
isViewMode ? Colors.white : Colors.white, // Keep original color isViewMode ? Colors.white : Colors.white, // Keep original color
disabledBackgroundColor: disabledBackgroundColor:
layoutColor, // Ensure color remains when disabled layoutColor, // Ensure color remains when disabled
disabledForegroundColor: Colors.white, disabledForegroundColor: Colors.white,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -1402,17 +1437,17 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
return [ return [
MouseRegion( MouseRegion(
cursor: cursor:
isViewMode isViewMode
? SystemMouseCursors.forbidden ? SystemMouseCursors.forbidden
: SystemMouseCursors.click, : SystemMouseCursors.click,
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: backgroundColor:
isViewMode ? layoutColor : layoutColor, // Keep original color isViewMode ? layoutColor : layoutColor, // Keep original color
foregroundColor: foregroundColor:
isViewMode ? Colors.white : Colors.white, // Keep original color isViewMode ? Colors.white : Colors.white, // Keep original color
disabledBackgroundColor: disabledBackgroundColor:
layoutColor, // Ensure color remains when disabled layoutColor, // Ensure color remains when disabled
disabledForegroundColor: Colors.white, disabledForegroundColor: Colors.white,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -1433,17 +1468,17 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
return [ return [
MouseRegion( MouseRegion(
cursor: cursor:
isViewMode isViewMode
? SystemMouseCursors.forbidden ? SystemMouseCursors.forbidden
: SystemMouseCursors.click, : SystemMouseCursors.click,
child: TextButton( child: TextButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: backgroundColor:
isViewMode ? Colors.white : Colors.white, // Keep original color isViewMode ? Colors.white : Colors.white, // Keep original color
foregroundColor: foregroundColor:
isViewMode ? layoutColor : layoutColor, // Keep original color isViewMode ? layoutColor : layoutColor, // Keep original color
disabledBackgroundColor: disabledBackgroundColor:
layoutColor, // Ensure color remains when disabled layoutColor, // Ensure color remains when disabled
disabledForegroundColor: Colors.white, disabledForegroundColor: Colors.white,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -1481,19 +1516,19 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
if (!isViewMode) if (!isViewMode)
MouseRegion( MouseRegion(
cursor: cursor:
isViewMode isViewMode
? SystemMouseCursors.forbidden ? SystemMouseCursors.forbidden
: SystemMouseCursors.click, : SystemMouseCursors.click,
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: backgroundColor:
isViewMode ? layoutColor : layoutColor, // Keep original color isViewMode ? layoutColor : layoutColor, // Keep original color
foregroundColor: foregroundColor:
isViewMode isViewMode
? Colors.white ? Colors.white
: Colors.white, // Keep original color : Colors.white, // Keep original color
disabledBackgroundColor: disabledBackgroundColor:
layoutColor, // Ensure color remains when disabled layoutColor, // Ensure color remains when disabled
disabledForegroundColor: Colors.white, disabledForegroundColor: Colors.white,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -1502,7 +1537,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12), padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12),
), ),
onPressed: onPressed:
isViewMode ? null : handleSubmit, // Disable when in view mode isViewMode ? null : handleSubmit, // Disable when in view mode
child: Text("Submit"), child: Text("Submit"),
), ),
), ),

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

@ -155,6 +155,9 @@ class TravellerDetailsState extends State<TravellerDetails> {
} }
bool boolValidation() { bool boolValidation() {
print("travel validation start");
print("visaEntries - $visaEntries");
final passportText = controllers["passportNumber"]?.text ?? ""; final passportText = controllers["passportNumber"]?.text ?? "";
if (_selectedTripType == "Indian") { if (_selectedTripType == "Indian") {
@ -173,6 +176,80 @@ class TravellerDetailsState extends State<TravellerDetails> {
} }
} }
final format = DateFormat("dd-MM-yyyy");
DateTime? start_Date;
DateTime? end_Date;
try {
if (controllers["dateOfIssue"]?.text != null &&
controllers["dateOfIssue"]!.text.isNotEmpty) {
start_Date = format.parse(controllers["dateOfIssue"]!.text);
}
if (controllers["dateOfExpiry"]?.text != null &&
controllers["dateOfExpiry"]!.text.isNotEmpty) {
end_Date = format.parse(controllers["dateOfExpiry"]!.text);
}
if (start_Date != null &&
end_Date != null &&
end_Date.isBefore(start_Date)) {
setState(() {
errorMessages["date_of_expiry"] = "End date cannot be earlier";
});
print("End date cannot be earlier than start date");
}
} catch (e) {
print("Invalid passport date format");
}
// 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";
// }
// } catch (e) {
// // return "valid upto cannot be earlier than valid from";
//
// // errorMessages["end_date"] = "Invalid date format";
// }
// }
print("travel validation end");
return true; return true;
} }
@ -1355,30 +1432,34 @@ class TravellerDetailsState extends State<TravellerDetails> {
DateTime? _selectedDateOfExpiry; DateTime? _selectedDateOfExpiry;
Widget buildDateOfIssue() { Widget buildDateOfIssue() {
Future<void> _selectCheckDateOfIssue(BuildContext context) async { Future<void> _selectCheckDateOfIssue(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? pickedDate = await showDatePicker( DateTime? pickedDate = await showDatePicker(
context: context, context: context,
initialDate: _selectedDateOfIssue != null && _selectedDateOfIssue!.isAfter(today) initialDate:
? _selectedDateOfIssue! _selectedDateOfIssue != null && _selectedDateOfIssue!.isAfter(today)
: today, ? _selectedDateOfIssue!
: today,
firstDate: DateTime(1900), firstDate: DateTime(1900),
lastDate: DateTime(2100), // lastDate: DateTime(2100),
lastDate: today,
initialEntryMode: DatePickerEntryMode.calendarOnly, initialEntryMode: DatePickerEntryMode.calendarOnly,
); );
if (pickedDate != null && pickedDate != _selectedDateOfIssue) { if (pickedDate != null && pickedDate != _selectedDateOfIssue) {
setState(() { setState(() {
_selectedDateOfIssue = pickedDate; _selectedDateOfIssue = pickedDate;
controllers["dateOfIssue"]?.text = DateFormat('dd-MM-yyyy').format(pickedDate); controllers["dateOfIssue"]?.text = DateFormat(
'dd-MM-yyyy',
).format(pickedDate);
// Revalidate expiry // Revalidate expiry
if (_selectedDateOfExpiry != null && if (_selectedDateOfExpiry != null &&
_selectedDateOfExpiry!.isBefore(_selectedDateOfIssue!)) { _selectedDateOfExpiry!.isBefore(_selectedDateOfIssue!)) {
errorMessages["date_of_expiry"] = "Expiry date cannot be earlier than Issue date"; errorMessages["date_of_expiry"] =
"Expiry date cannot be earlier than Issue date";
} else { } else {
errorMessages.remove("date_of_expiry"); errorMessages.remove("date_of_expiry");
} }
@ -1400,25 +1481,25 @@ class TravellerDetailsState extends State<TravellerDetails> {
SizedBox(height: 5), SizedBox(height: 5),
CustomTextFieldUserTravellerWrapper( CustomTextFieldUserTravellerWrapper(
width: width:
widget.isDesktop widget.isDesktop
? MediaQuery.of(context).size.width * 0.13 ? MediaQuery.of(context).size.width * 0.13
: null, : null,
isFocused: false, isFocused: false,
isDesktop: widget.isDesktop, isDesktop: widget.isDesktop,
child: SizedBox( child: SizedBox(
height: 40, height: 40,
child: GestureDetector( child: GestureDetector(
onTap: onTap:
widget.isViewMode widget.isViewMode
? null ? null
: () async { : () async {
await _selectCheckDateOfIssue(context); await _selectCheckDateOfIssue(context);
if (controllers["dateOfIssue"]!.text.isNotEmpty) { if (controllers["dateOfIssue"]!.text.isNotEmpty) {
setState(() { setState(() {
// errorMessages.remove("start_date"); // errorMessages.remove("start_date");
}); });
} }
}, },
child: AbsorbPointer( child: AbsorbPointer(
child: TextField( child: TextField(
controller: controllers["dateOfIssue"], controller: controllers["dateOfIssue"],
@ -1449,9 +1530,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
} }
Widget buildDateOfExpiry() { Widget buildDateOfExpiry() {
Future<void> _selectCheckDateOfExpiry(BuildContext context) async { Future<void> _selectCheckDateOfExpiry(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 firstDate = today; // DateTime firstDate = today;
@ -1500,11 +1579,14 @@ class TravellerDetailsState extends State<TravellerDetails> {
if (pickedDate != null) { if (pickedDate != null) {
setState(() { setState(() {
_selectedDateOfExpiry = pickedDate; _selectedDateOfExpiry = pickedDate;
controllers["dateOfExpiry"]?.text = DateFormat("dd-MM-yyyy").format(pickedDate); controllers["dateOfExpiry"]?.text = DateFormat(
"dd-MM-yyyy",
).format(pickedDate);
if (_selectedDateOfIssue != null && if (_selectedDateOfIssue != null &&
_selectedDateOfExpiry!.isBefore(_selectedDateOfIssue!)) { _selectedDateOfExpiry!.isBefore(_selectedDateOfIssue!)) {
errorMessages["date_of_expiry"] = "Expiry date cannot be earlier than Issue date"; errorMessages["date_of_expiry"] =
"Expiry date cannot be earlier than Issue date";
} else { } else {
errorMessages.remove("date_of_expiry"); errorMessages.remove("date_of_expiry");
} }
@ -1540,23 +1622,23 @@ class TravellerDetailsState extends State<TravellerDetails> {
isFocused: false, isFocused: false,
isDesktop: widget.isDesktop, isDesktop: widget.isDesktop,
width: width:
widget.isDesktop widget.isDesktop
? MediaQuery.of(context).size.width * 0.13 ? MediaQuery.of(context).size.width * 0.13
: null, : null,
child: SizedBox( child: SizedBox(
height: 40, height: 40,
child: GestureDetector( child: GestureDetector(
onTap: onTap:
widget.isViewMode widget.isViewMode
? null ? null
: () async { : () async {
await _selectCheckDateOfExpiry(context); await _selectCheckDateOfExpiry(context);
if (controllers["dateOfExpiry"]!.text.isNotEmpty) { if (controllers["dateOfExpiry"]!.text.isNotEmpty) {
setState(() { setState(() {
// errorMessages.remove("start_date"); // errorMessages.remove("start_date");
}); });
} }
}, },
child: AbsorbPointer( child: AbsorbPointer(
child: TextField( child: TextField(
controller: controllers["dateOfExpiry"], controller: controllers["dateOfExpiry"],
@ -1588,7 +1670,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
errorMessages["date_of_expiry"]!, errorMessages["date_of_expiry"]!,
style: const TextStyle(color: Colors.red, fontSize: 10), style: const TextStyle(color: Colors.red, fontSize: 10),
maxLines: 2, // Allow it to wrap onto two lines maxLines: 2, // Allow it to wrap onto two lines
overflow: TextOverflow.ellipsis, // Add ellipsis if it still overflows overflow:
TextOverflow.ellipsis, // Add ellipsis if it still overflows
), ),
], ],
], ],
@ -4057,7 +4140,6 @@ class TravellerDetailsState extends State<TravellerDetails> {
DateTime? _selectedCheckInDate; DateTime? _selectedCheckInDate;
Widget buildVisaValidFrom(Map<String, dynamic> entry) { Widget buildVisaValidFrom(Map<String, dynamic> entry) {
TimeOfDay? _selectedCheckOutTime; TimeOfDay? _selectedCheckOutTime;
Future<void> _selectValidFromDate(BuildContext context) async { Future<void> _selectValidFromDate(BuildContext context) async {
@ -4078,19 +4160,23 @@ class TravellerDetailsState extends State<TravellerDetails> {
// initialDate: initialDate, // initialDate: initialDate,
// firstDate: initialDate, // firstDate: initialDate,
firstDate: DateTime(1900), firstDate: DateTime(1900),
lastDate: DateTime(2100), // lastDate: DateTime(2100),
lastDate: today,
initialEntryMode: DatePickerEntryMode.calendarOnly, initialEntryMode: DatePickerEntryMode.calendarOnly,
); );
if (pickedDate != null && pickedDate != _selectedCheckOutDate) { if (pickedDate != null && pickedDate != _selectedCheckOutDate) {
setState(() { setState(() {
_selectedCheckInDate = pickedDate; _selectedCheckInDate = pickedDate;
entry["controller_valid_from"]?.text = DateFormat('dd-MM-yyyy').format(pickedDate); entry["controller_valid_from"]?.text = DateFormat(
'dd-MM-yyyy',
).format(pickedDate);
// Revalidate expiry // Revalidate expiry
if (_selectedCheckOutDate != null && if (_selectedCheckOutDate != null &&
_selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) { _selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) {
errorMessages["valid_upto"] = "valid upto cannot be earlier than valid from"; errorMessages["valid_upto"] =
"valid upto cannot be earlier than valid from";
} else { } else {
errorMessages.remove("valid_upto"); errorMessages.remove("valid_upto");
} }
@ -4112,9 +4198,9 @@ class TravellerDetailsState extends State<TravellerDetails> {
SizedBox(height: 5), SizedBox(height: 5),
CustomTextFieldUserTravellerWrapper( CustomTextFieldUserTravellerWrapper(
width: width:
widget.isDesktop widget.isDesktop
? MediaQuery.of(context).size.width * 0.15 ? MediaQuery.of(context).size.width * 0.15
: null, : null,
isFocused: false, isFocused: false,
isDesktop: widget.isDesktop, isDesktop: widget.isDesktop,
child: SizedBox( child: SizedBox(
@ -4151,7 +4237,6 @@ class TravellerDetailsState extends State<TravellerDetails> {
} }
Widget buildVisaValidUpTo(Map<String, dynamic> entry) { Widget buildVisaValidUpTo(Map<String, dynamic> entry) {
TimeOfDay? _selectedCheckOutTime; TimeOfDay? _selectedCheckOutTime;
Future<void> _selectValidUpToDate(BuildContext context) async { Future<void> _selectValidUpToDate(BuildContext context) async {
@ -4202,11 +4287,14 @@ class TravellerDetailsState extends State<TravellerDetails> {
if (pickedDate != null && pickedDate != _selectedCheckOutDate) { if (pickedDate != null && pickedDate != _selectedCheckOutDate) {
setState(() { setState(() {
_selectedCheckOutDate = pickedDate; _selectedCheckOutDate = pickedDate;
entry["controller_valid_upto"].text = DateFormat("dd-MM-yyyy").format(pickedDate); entry["controller_valid_upto"].text = DateFormat(
"dd-MM-yyyy",
).format(pickedDate);
if (_selectedCheckInDate != null && if (_selectedCheckInDate != null &&
_selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) { _selectedCheckOutDate!.isBefore(_selectedCheckInDate!)) {
errorMessages["valid_upto"] = "valid upto cannot be earlier than valid from"; errorMessages["valid_upto"] =
"valid upto cannot be earlier than valid from";
} else { } else {
errorMessages.remove("valid_upto"); errorMessages.remove("valid_upto");
} }
@ -4228,9 +4316,9 @@ class TravellerDetailsState extends State<TravellerDetails> {
SizedBox(height: 5), SizedBox(height: 5),
CustomTextFieldUserTravellerWrapper( CustomTextFieldUserTravellerWrapper(
width: width:
widget.isDesktop widget.isDesktop
? MediaQuery.of(context).size.width * 0.15 ? MediaQuery.of(context).size.width * 0.15
: null, : null,
isFocused: false, isFocused: false,
isDesktop: widget.isDesktop, isDesktop: widget.isDesktop,
child: SizedBox( child: SizedBox(
@ -4269,7 +4357,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
errorMessages["valid_upto"]!, errorMessages["valid_upto"]!,
style: const TextStyle(color: Colors.red, fontSize: 10), style: const TextStyle(color: Colors.red, fontSize: 10),
maxLines: 2, // Allow it to wrap onto two lines maxLines: 2, // Allow it to wrap onto two lines
overflow: TextOverflow.ellipsis, // Add ellipsis if it still overflows overflow:
TextOverflow.ellipsis, // Add ellipsis if it still overflows
), ),
], ],
], ],

3
lib/data/models/plan.dart
View File

@ -5,6 +5,7 @@ class Plan {
final String tripTitle; final String tripTitle;
final String tripType; final String tripType;
final String status; final String status;
final String approver_status;
final String costCenter; final String costCenter;
final String functionalDepartment; final String functionalDepartment;
final String purposeOfTravel; final String purposeOfTravel;
@ -23,6 +24,7 @@ class Plan {
required this.planId, required this.planId,
this.employeeCode, this.employeeCode,
required this.tripTitle, required this.tripTitle,
required this.approver_status,
required this.tripType, required this.tripType,
required this.status, required this.status,
required this.costCenter, required this.costCenter,
@ -46,6 +48,7 @@ class Plan {
employeeCode: json['employee_code'], employeeCode: json['employee_code'],
tripTitle: json['trip_title'], tripTitle: json['trip_title'],
tripType: json['trip_type_value'], tripType: json['trip_type_value'],
approver_status: json['approver_status'],
status: json['status'] == "0" ? "Inactive" : "Active", status: json['status'] == "0" ? "Inactive" : "Active",
costCenter: json['cost_center_value'] ?? '', costCenter: json['cost_center_value'] ?? '',
functionalDepartment: json['functional_department_value'] ?? '', functionalDepartment: json['functional_department_value'] ?? '',

2
lib/main.dart
View File

@ -4,6 +4,6 @@ import 'app.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart';
void main() { void main() {
setUrlStrategy(PathUrlStrategy()); // setUrlStrategy(PathUrlStrategy());
runApp(const MyApp()); runApp(const MyApp());
} }

27
lib/routes/custom_appBar.dart
View File

@ -117,6 +117,7 @@ class _CustomAppBarState extends State<CustomAppBar> {
"name": "${userDetails["first_name"]} ${userDetails["last_name"]}", "name": "${userDetails["first_name"]} ${userDetails["last_name"]}",
"email": userDetails["email"] ?? "", "email": userDetails["email"] ?? "",
"role": userDetails["role"] ?? "", "role": userDetails["role"] ?? "",
"last_login_at": userDetails["last_login_at"] ?? "",
}; };
} catch (e) { } catch (e) {
print("Error decoding user data: $e"); print("Error decoding user data: $e");
@ -282,6 +283,18 @@ class _CustomAppBarState extends State<CustomAppBar> {
}); });
} }
Future<void> logout(BuildContext context) async {
// Clear localStorage
final prefs = await SharedPreferences.getInstance();
await prefs.clear(); // Clears all keys
// Optional: clear sessionStorage if used
// html.window.sessionStorage.clear();
// Navigate to login or home page
context.go('/');
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppBar( return AppBar(
@ -431,7 +444,7 @@ class _CustomAppBarState extends State<CustomAppBar> {
actions: [ actions: [
Padding( Padding(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: MediaQuery.of(context).size.width * 0.05, horizontal: MediaQuery.of(context).size.width * 0.055,
), ),
child: Row( child: Row(
children: [ children: [
@ -478,7 +491,8 @@ class _CustomAppBarState extends State<CustomAppBar> {
}, },
); );
case '/logout': case '/logout':
context.go('/'); logout(context);
// context.go('/');
break; break;
} }
}, },
@ -523,6 +537,15 @@ class _CustomAppBarState extends State<CustomAppBar> {
color: Colors.black, color: Colors.black,
), ),
), ),
Text(
"Last Login: ${userData?["last_login_at"]}" ??
'',
style: GoogleFonts.poppins(
fontSize: 8.5,
fontWeight: FontWeight.w400,
color: Colors.black,
),
),
const Divider(), // 👈 Divider after role const Divider(), // 👈 Divider after role
], ],
), ),

3
lib/services/apiService.dart
View File

@ -102,6 +102,7 @@ class ApiService {
throw Exception('Failed to load country list'); throw Exception('Failed to load country list');
} }
} }
Future<List<dynamic>> fetchAirlineList() async { Future<List<dynamic>> fetchAirlineList() async {
final String apiUrldata = '$apiUrl/api/getAirlineMaster'; final String apiUrldata = '$apiUrl/api/getAirlineMaster';
final token = await getToken(); final token = await getToken();
@ -617,6 +618,7 @@ class ApiService {
BuildContext context, BuildContext context,
String planId, String planId,
String? approverId, String? approverId,
String? approver_status,
String? delegaterId, { String? delegaterId, {
bool isViewMode = false, bool isViewMode = false,
bool isApprover = true, bool isApprover = true,
@ -629,6 +631,7 @@ class ApiService {
'/approver/plans', '/approver/plans',
extra: { extra: {
'planData': planData, 'planData': planData,
'approver_status': approver_status,
'approverId': approverId, 'approverId': approverId,
'delegaterId': delegaterId, 'delegaterId': delegaterId,
'isViewMode': isViewMode, 'isViewMode': isViewMode,

2
web/index.html
View File

@ -14,7 +14,7 @@
This is a placeholder for base href that will be replaced by the value of This is a placeholder for base href that will be replaced by the value of
the `--base-href` argument provided to `flutter build`. the `--base-href` argument provided to `flutter build`.
--> -->
<base href="$FLUTTER_BASE_HREF"> <base href="/tstat/">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta content="IE=Edge" http-equiv="X-UA-Compatible"> <meta content="IE=Edge" http-equiv="X-UA-Compatible">