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

131
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,
@ -1183,11 +1184,42 @@ class _ListAllPlansState extends State<ListAllPlans> {
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
child: Row( child: Row(
children: [
// Container(
// // color: Colors.red.shade50,
// child: Column(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment:
// CrossAxisAlignment.center,
// children: [
// Image.asset(
// plan.tripType == 'Domestic'
// ? 'assets/images/IconsImg/Domestic_new.png'
// : 'assets/images/IconsImg/International_new.png',
// // width: 65,
// height:
// plan.tripType == 'Domestic'
// ? 37
// : 40,
// ),
// ],
// ),
// ),
// SizedBox(width: 10),
Expanded(
child: Container(
// color: Colors.yellow.shade50,
child: Column(
children: [
Row(
// mainAxisAlignment:
// MainAxisAlignment.spaceBetween,
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: [
@ -1197,37 +1229,34 @@ class _ListAllPlansState extends State<ListAllPlans> {
: 'assets/images/IconsImg/International_new.png', : 'assets/images/IconsImg/International_new.png',
// width: 65, // width: 65,
height: height:
plan.tripType == 'Domestic' plan.tripType ==
? 37 'Domestic'
: 40, ? 28
: 30,
), ),
], ],
), ),
), ),
SizedBox(width: 10), SizedBox(width: 10),
Expanded( Expanded(
child: Container( flex: 1,
// color: Colors.yellow.shade50,
child: Column( child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'${plan.tripTitle}', '${plan.tripTitle}',
style: TextStyle( style: GoogleFonts.poppins(
fontSize: 12, fontSize: 12,
fontFamily: "Inter", fontWeight:
fontWeight: FontWeight.bold, 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(
// fontSize: 9,
// color: Colors.black87,
// ), // ),
// Spacer(),
// Column(
// 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,
), ),