diff --git a/lib/Screens/costCenter/costCenter_list.dart b/lib/Screens/costCenter/costCenter_list.dart index af92cdb..1970b8b 100644 --- a/lib/Screens/costCenter/costCenter_list.dart +++ b/lib/Screens/costCenter/costCenter_list.dart @@ -336,7 +336,7 @@ class CostCenterListState extends State { MainAxisSize.min, // Ensures content fits nicely children: [ Text( - "Add CostCenter", + "Add Cost Center", style: GoogleFonts.poppins( fontSize: isDesktop ? 13 : 11, ), diff --git a/lib/Screens/forex/forexDetails.dart b/lib/Screens/forex/forexDetails.dart index 44c60bc..78002e5 100644 --- a/lib/Screens/forex/forexDetails.dart +++ b/lib/Screens/forex/forexDetails.dart @@ -396,7 +396,7 @@ class ForexDataState extends State { ), searchFieldProps: TextFieldProps( decoration: InputDecoration( - hintText: "Search Country...", + hintText: "Search ...", hintStyle: GoogleFonts.poppins(fontSize: 11), contentPadding: EdgeInsets.symmetric(horizontal: 4), ), @@ -414,7 +414,7 @@ class ForexDataState extends State { // Center-align selected item alignment: Alignment.centerLeft, child: Text( - selectedItem ?? "Select Country", + selectedItem ?? "Select ", style: GoogleFonts.poppins(fontSize: 11), ), ), diff --git a/lib/Screens/forex/forex_list.dart b/lib/Screens/forex/forex_list.dart index 64daa91..2d99fc6 100644 --- a/lib/Screens/forex/forex_list.dart +++ b/lib/Screens/forex/forex_list.dart @@ -746,9 +746,9 @@ class ForexDataListState extends State { style: TextStyle( fontSize: 13, fontFamily: "Inter", - // color: forex['is_active'] == "1" - // ? Colors.green - // : Colors.grey, + color: forex['is_active'] == "1" + ? Colors.green + : Colors.grey, ), softWrap: true, overflow: TextOverflow.ellipsis, diff --git a/lib/Screens/group/groupDetails.dart b/lib/Screens/group/groupDetails.dart index fc3156b..9f0cb19 100644 --- a/lib/Screens/group/groupDetails.dart +++ b/lib/Screens/group/groupDetails.dart @@ -407,7 +407,7 @@ class GroupDataState extends State { ), searchFieldProps: TextFieldProps( decoration: InputDecoration( - hintText: "Select Policy For International", + hintText: "Search ...", hintStyle: GoogleFonts.poppins(fontSize: 11), contentPadding: EdgeInsets.symmetric(horizontal: 4), ), @@ -425,7 +425,7 @@ class GroupDataState extends State { // Center-align selected item alignment: Alignment.centerLeft, child: Text( - selectedItem ?? "Select Policy For International", + selectedItem ?? "Select", style: GoogleFonts.poppins(fontSize: 11), ), ), @@ -481,7 +481,7 @@ class GroupDataState extends State { ), searchFieldProps: TextFieldProps( decoration: InputDecoration( - hintText: "Select Policy For Domestic...", + hintText: "Search ...", hintStyle: GoogleFonts.poppins(fontSize: 11), contentPadding: EdgeInsets.symmetric(horizontal: 4), ), @@ -499,7 +499,7 @@ class GroupDataState extends State { // Center-align selected item alignment: Alignment.centerLeft, child: Text( - selectedItem ?? "Select Policy For Domestic", + selectedItem ?? "Select ", style: GoogleFonts.poppins(fontSize: 11), ), ), diff --git a/lib/Screens/group/groupList.dart b/lib/Screens/group/groupList.dart index d653297..92c43af 100644 --- a/lib/Screens/group/groupList.dart +++ b/lib/Screens/group/groupList.dart @@ -353,7 +353,7 @@ class _GroupListState extends State { MainAxisSize.min, // Ensures content fits nicely children: [ Text( - "Add New Group", + "Add Group", style: GoogleFonts.poppins( fontSize: isDesktop ? 13 : 11, ), @@ -927,7 +927,7 @@ class _GroupListState extends State { ? Center( child: Text( "No matches found", - style: GoogleFonts.poppins( + style: GoogwqleFonts.poppins( fontSize: 14, color: Colors.grey, ), diff --git a/lib/Screens/hotels/hotelsDetails.dart b/lib/Screens/hotels/hotelsDetails.dart index e759d09..76eb5f9 100644 --- a/lib/Screens/hotels/hotelsDetails.dart +++ b/lib/Screens/hotels/hotelsDetails.dart @@ -418,7 +418,7 @@ class HotelsDataState extends State { ), searchFieldProps: TextFieldProps( decoration: InputDecoration( - hintText: "Search Country...", + hintText: "Search ...", hintStyle: GoogleFonts.poppins(fontSize: 11), contentPadding: EdgeInsets.symmetric(horizontal: 4), ), @@ -436,7 +436,7 @@ class HotelsDataState extends State { // Center-align selected item alignment: Alignment.centerLeft, child: Text( - selectedItem ?? "Select Country", + selectedItem ?? "Select ", style: GoogleFonts.poppins(fontSize: 11), ), ), diff --git a/lib/Screens/itnerary/accomodations.dart b/lib/Screens/itnerary/accomodations.dart index 2d085f1..8493ff7 100644 --- a/lib/Screens/itnerary/accomodations.dart +++ b/lib/Screens/itnerary/accomodations.dart @@ -437,7 +437,7 @@ class _AccomodationScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Destination", + "Destination *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w600, @@ -485,7 +485,7 @@ class _AccomodationScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Hotel Name", + "Hotel Name *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w600, @@ -695,7 +695,7 @@ class _AccomodationScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Check-in*", + "Check-in *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w600, @@ -747,7 +747,7 @@ class _AccomodationScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Time (Check-in)", + "Time (Check-in) *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w600, @@ -851,7 +851,7 @@ class _AccomodationScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Time (Check-out)", + "Time (Check-out) *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w600, diff --git a/lib/Screens/itnerary/bus.dart b/lib/Screens/itnerary/bus.dart index 6738e33..a8990d8 100644 --- a/lib/Screens/itnerary/bus.dart +++ b/lib/Screens/itnerary/bus.dart @@ -401,7 +401,7 @@ class _BusScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "From", + "From *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -446,7 +446,7 @@ class _BusScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "To", + "To *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -491,7 +491,7 @@ class _BusScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Date", + "Date *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -543,7 +543,7 @@ class _BusScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Time", + "Time *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, diff --git a/lib/Screens/itnerary/forex.dart b/lib/Screens/itnerary/forex.dart index 0d93906..7acd3e7 100644 --- a/lib/Screens/itnerary/forex.dart +++ b/lib/Screens/itnerary/forex.dart @@ -1154,7 +1154,7 @@ class _ForexScreenState extends State { showSearchBox: true, // Enables search functionality searchFieldProps: TextFieldProps( decoration: InputDecoration( - hintText: "Search Country...", + hintText: "Search ...", contentPadding: EdgeInsets.symmetric(horizontal: 10), ), ), @@ -1171,7 +1171,7 @@ class _ForexScreenState extends State { // Center-align selected item alignment: Alignment.centerLeft, child: Text( - selectedItem ?? "Select Country", + selectedItem ?? "Select ", style: TextStyle(fontSize: 12), ), ), @@ -1620,6 +1620,10 @@ class _ForexScreenState extends State { // keyboardType: TextInputType.number, onChanged: (value) { // errorMessages["deposit_on_cash"] = ""; + errorMessages.remove("deposit_on_cash"); + errorMessages.remove("deposit_on_card"); + // errorMessages["deposit_on_card"] = ""; + _validateCashAmount( value, ); // Call validation when text changes @@ -1673,6 +1677,8 @@ class _ForexScreenState extends State { FilteringTextInputFormatter.digitsOnly, // ✅ Only allow digits ], onChanged: (value) { + errorMessages.remove("deposit_on_cash"); + errorMessages.remove("deposit_on_card"); _validateCardAmount( value, ); // Call validation when text changes diff --git a/lib/Screens/itnerary/insurance.dart b/lib/Screens/itnerary/insurance.dart index d1a903c..5998146 100644 --- a/lib/Screens/itnerary/insurance.dart +++ b/lib/Screens/itnerary/insurance.dart @@ -529,7 +529,7 @@ class _InsuranceScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Insurance Type", + "Insurance Type *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -580,7 +580,7 @@ class _InsuranceScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Start Date", + "Start Date *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -641,7 +641,7 @@ class _InsuranceScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "End Date", + "End Date *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, diff --git a/lib/Screens/itnerary/miscellaneous.dart b/lib/Screens/itnerary/miscellaneous.dart index 47ec8a8..93029f3 100644 --- a/lib/Screens/itnerary/miscellaneous.dart +++ b/lib/Screens/itnerary/miscellaneous.dart @@ -114,7 +114,7 @@ class _MiscellaneousScreenState extends State { // Check validation for each field for (String field in requiredFields) { if (data[field] == null || data[field].toString().trim().isEmpty) { - errorMessages[field] = "This field is required"; + errorMessages[field] = "Required"; } } @@ -191,7 +191,7 @@ class _MiscellaneousScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Special Type", + "Special Type *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -266,7 +266,7 @@ class _MiscellaneousScreenState extends State { if (errorMessages["special_request"] != null) ...[ SizedBox(height: 5), // Space before error message Text( - "Select Type", + "Required", style: TextStyle(color: Colors.red, fontSize: 12), ), ], @@ -279,7 +279,7 @@ class _MiscellaneousScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Comments", + "Comments *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, diff --git a/lib/Screens/itnerary/taxi.dart b/lib/Screens/itnerary/taxi.dart index 969ba4e..077563b 100644 --- a/lib/Screens/itnerary/taxi.dart +++ b/lib/Screens/itnerary/taxi.dart @@ -524,7 +524,7 @@ class _TaxiScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "City", + "City *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -562,7 +562,7 @@ class _TaxiScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Pickup Location", + "Pickup Location *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -600,7 +600,7 @@ class _TaxiScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Date", + "Date *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -648,7 +648,7 @@ class _TaxiScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Time", + "Time *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -700,7 +700,7 @@ class _TaxiScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Comments", + "Comments *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, diff --git a/lib/Screens/itnerary/train.dart b/lib/Screens/itnerary/train.dart index 3f2e5d8..3c7c755 100644 --- a/lib/Screens/itnerary/train.dart +++ b/lib/Screens/itnerary/train.dart @@ -369,7 +369,7 @@ class _TrainScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Train Number", + "Train Number *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -584,7 +584,7 @@ class _TrainScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "From", + "From *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -694,7 +694,7 @@ class _TrainScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "To", + "To *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -767,7 +767,7 @@ class _TrainScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Date", + "Date *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -816,7 +816,7 @@ class _TrainScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Time", + "Time *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, diff --git a/lib/Screens/itnerary/visa.dart b/lib/Screens/itnerary/visa.dart index b8de533..1a81a43 100644 --- a/lib/Screens/itnerary/visa.dart +++ b/lib/Screens/itnerary/visa.dart @@ -442,7 +442,7 @@ class _VisaScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Type of Visa", + "Type of Visa *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -499,7 +499,7 @@ class _VisaScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Country", + "Country *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, @@ -518,7 +518,7 @@ class _VisaScreenState extends State { showSearchBox: true, // Enables search functionality searchFieldProps: TextFieldProps( decoration: InputDecoration( - hintText: "Search Country...", + hintText: "Search ...", contentPadding: EdgeInsets.symmetric(horizontal: 10), ), ), @@ -536,7 +536,7 @@ class _VisaScreenState extends State { // Center-align selected item alignment: Alignment.centerLeft, child: Text( - selectedItem ?? "Select Country", + selectedItem ?? "Select ", style: TextStyle(fontSize: 12), ), ), @@ -574,7 +574,7 @@ class _VisaScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "Start Date", + "Start Date *", style: GoogleFonts.poppins( fontSize: 12, fontWeight: FontWeight.w500, diff --git a/lib/Screens/policy/policy_list.dart b/lib/Screens/policy/policy_list.dart index 6c69199..8b0a94c 100644 --- a/lib/Screens/policy/policy_list.dart +++ b/lib/Screens/policy/policy_list.dart @@ -322,7 +322,8 @@ class _PolicyListState extends State { controller: searchController, onChanged: filterPolicy, decoration: InputDecoration( - hintText: "Search for a Policy", + hintText: "Search ...", + hintStyle: TextStyle( fontSize: 12, color: Color(0xFF9E9DBD), @@ -383,7 +384,7 @@ class _PolicyListState extends State { MainAxisSize.min, // Ensures content fits nicely children: [ Text( - "Add New Policy", + "Add Policy", style: GoogleFonts.poppins( fontSize: isDesktop ? 13 : 11, ), @@ -413,7 +414,7 @@ class _PolicyListState extends State { controller: searchController, onChanged: filterPolicy, decoration: InputDecoration( - hintText: "Search for a Policy", + hintText: "Search ...", hintStyle: TextStyle( fontSize: 12, color: Color(0xFF9E9DBD),