diff --git a/lib/Screens/allTrips/list_all_plans.dart b/lib/Screens/allTrips/list_all_plans.dart index f9e427e..3c8378b 100644 --- a/lib/Screens/allTrips/list_all_plans.dart +++ b/lib/Screens/allTrips/list_all_plans.dart @@ -690,9 +690,10 @@ class _ListAllPlansState extends State { if (!isDesktop) Row( + mainAxisAlignment: MainAxisAlignment.center, children: [ Container( - width: MediaQuery.of(context).size.width * 0.85, + width: MediaQuery.of(context).size.width * 0.88, height: 35, child: TextField( controller: searchController, @@ -1184,50 +1185,78 @@ class _ListAllPlansState extends State { 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), + // 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, + // mainAxisAlignment: + // MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - '${plan.tripTitle}', - style: TextStyle( - fontSize: 12, - fontFamily: "Inter", - fontWeight: FontWeight.bold, + 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' + ? 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( children: [ // PlanPopupMenu( @@ -1394,6 +1423,8 @@ class _ListAllPlansState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.end, children: [ Column( @@ -1401,53 +1432,41 @@ class _ListAllPlansState extends State { CrossAxisAlignment.start, children: [ Text( - plan.userName.isNotEmpty - ? '${plan.userName}' - : '${plan.travellerName}', - style: TextStyle( - fontSize: 12, - 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( + // plan.userName.isNotEmpty + // ? plan.userName + // : '${plan.travellerName}', + '${plan.userName.isNotEmpty ? plan.userName : plan.travellerName} (${plan.employeeCode ?? 'No Data'})', + style: GoogleFonts.poppins( fontSize: 10, color: Colors.black87, - fontFamily: "Inter", ), ), - - // Column( - // crossAxisAlignment: - // CrossAxisAlignment.start, - // children: [ - // - // ], - // ), - // Spacer(), - // Column( - // crossAxisAlignment: - // CrossAxisAlignment.start, - // children: [ - // - // ], - // ), - // ], - // ), + // Text( + // // plan.userName.isNotEmpty + // // ? plan.userName + // // : '${plan.travellerName}', + // // '(${plan.employeeCode ?? 'No Data'})', + // plan.employeeCode ?? + // 'No Data', + // style: GoogleFonts.poppins( + // fontSize: 9, + // color: Colors.black87, + // ), + // ), + Text( + '${_formatDate(plan.createdOn)}', + style: GoogleFonts.poppins( + fontSize: 9, + color: Colors.grey, + ), + ), ], ), Column( + mainAxisAlignment: + MainAxisAlignment.end, + crossAxisAlignment: + CrossAxisAlignment.end, children: [ GestureDetector( onTap: @@ -1471,12 +1490,12 @@ class _ListAllPlansState extends State { ), child: Text( plan.statusValue, - style: TextStyle( + style: GoogleFonts.poppins( color: getStatusTextColor( plan.statusValue, ), - fontSize: 10, + fontSize: 9, fontWeight: FontWeight.w600, ),