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

code merge

Browse Source
This commit is contained in:
venba-Inspriron-3558 2025-07-18 15:07:51 +05:30
commit 9fac4152ab
1 changed files with 97 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
lib/Screens/allTrips/list_all_plans.dart
View File

@ -690,9 +690,10 @@ class _ListAllPlansState extends State<ListAllPlans> {
if (!isDesktop) if (!isDesktop)
Row( Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.85, width: MediaQuery.of(context).size.width * 0.88,
height: 35, height: 35,
child: TextField( child: TextField(
controller: searchController, controller: searchController,
@ -1184,50 +1185,78 @@ class _ListAllPlansState extends State<ListAllPlans> {
child: Row( child: Row(
children: [ children: [
Container( // Container(
// color: Colors.red.shade50, // // color: Colors.red.shade50,
child: Column( // child: Column(
mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: // crossAxisAlignment:
CrossAxisAlignment.center, // CrossAxisAlignment.center,
children: [ // children: [
Image.asset( // Image.asset(
plan.tripType == 'Domestic' // plan.tripType == 'Domestic'
? 'assets/images/IconsImg/Domestic_new.png' // ? 'assets/images/IconsImg/Domestic_new.png'
: 'assets/images/IconsImg/International_new.png', // : 'assets/images/IconsImg/International_new.png',
// width: 65, // // width: 65,
height: // height:
plan.tripType == 'Domestic' // plan.tripType == 'Domestic'
? 37 // ? 37
: 40, // : 40,
), // ),
], // ],
), // ),
), // ),
SizedBox(width: 10), // SizedBox(width: 10),
Expanded( Expanded(
child: Container( child: Container(
// color: Colors.yellow.shade50, // color: Colors.yellow.shade50,
child: Column( child: Column(
children: [ children: [
Row( Row(
mainAxisAlignment: // mainAxisAlignment:
MainAxisAlignment.spaceBetween, // MainAxisAlignment.spaceBetween,
children: [ children: [
Column( Container(
crossAxisAlignment: // color: Colors.red.shade50,
CrossAxisAlignment.start, child: Column(
children: [ mainAxisAlignment:
Text( MainAxisAlignment.center,
'${plan.tripTitle}', crossAxisAlignment:
style: TextStyle( CrossAxisAlignment.center,
fontSize: 12, children: [
fontFamily: "Inter", Image.asset(
fontWeight: FontWeight.bold, plan.tripType == 'Domestic'
? 'assets/images/IconsImg/Domestic_new.png'
: 'assets/images/IconsImg/International_new.png',
// width: 65,
height:
plan.tripType ==
'Domestic'
? 28
: 30,
), ),
), ],
], ),
), ),
SizedBox(width: 10),
Expanded(
flex: 1,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
'${plan.tripTitle}',
style: GoogleFonts.poppins(
fontSize: 12,
fontWeight:
FontWeight.w500,
),
),
],
),
),
SizedBox(width: 10),
Column( Column(
children: [ children: [
// PlanPopupMenu( // PlanPopupMenu(
@ -1394,6 +1423,8 @@ class _ListAllPlansState extends State<ListAllPlans> {
Row( Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.end,
children: [ children: [
Column( Column(
@ -1401,53 +1432,41 @@ class _ListAllPlansState extends State<ListAllPlans> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text( Text(
plan.userName.isNotEmpty // plan.userName.isNotEmpty
? '${plan.userName}' // ? plan.userName
: '${plan.travellerName}', // : '${plan.travellerName}',
style: TextStyle( '${plan.userName.isNotEmpty ? plan.userName : plan.travellerName} (${plan.employeeCode ?? 'No Data'})',
fontSize: 12, style: GoogleFonts.poppins(
fontFamily: "Inter",
color: Colors.black87,
),
),
Text(
plan.employeeCode ??
'No Data',
style: TextStyle(
fontSize: 9,
fontFamily: "Inter",
color: Colors.black87,
),
),
Text(
'${_formatDate(plan.createdOn)}',
style: TextStyle(
fontSize: 10, fontSize: 10,
color: Colors.black87, color: Colors.black87,
fontFamily: "Inter",
), ),
), ),
// Text(
// Column( // // plan.userName.isNotEmpty
// crossAxisAlignment: // // ? plan.userName
// CrossAxisAlignment.start, // // : '${plan.travellerName}',
// children: [ // // '(${plan.employeeCode ?? 'No Data'})',
// // plan.employeeCode ??
// ], // 'No Data',
// ), // style: GoogleFonts.poppins(
// Spacer(), // fontSize: 9,
// Column( // color: Colors.black87,
// crossAxisAlignment: // ),
// CrossAxisAlignment.start, // ),
// children: [ Text(
// '${_formatDate(plan.createdOn)}',
// ], style: GoogleFonts.poppins(
// ), fontSize: 9,
// ], color: Colors.grey,
// ), ),
),
], ],
), ),
Column( Column(
mainAxisAlignment:
MainAxisAlignment.end,
crossAxisAlignment:
CrossAxisAlignment.end,
children: [ children: [
GestureDetector( GestureDetector(
onTap: onTap:
@ -1471,12 +1490,12 @@ class _ListAllPlansState extends State<ListAllPlans> {
), ),
child: Text( child: Text(
plan.statusValue, plan.statusValue,
style: TextStyle( style: GoogleFonts.poppins(
color: color:
getStatusTextColor( getStatusTextColor(
plan.statusValue, plan.statusValue,
), ),
fontSize: 10, fontSize: 9,
fontWeight: fontWeight:
FontWeight.w600, FontWeight.w600,
), ),