diff --git a/lib/Screens/hotels/hotelsDetails.dart b/lib/Screens/hotels/hotelsDetails.dart index 4439c91..77d0e0d 100644 --- a/lib/Screens/hotels/hotelsDetails.dart +++ b/lib/Screens/hotels/hotelsDetails.dart @@ -289,9 +289,15 @@ class HotelsDataState extends State { countryList = apiCountryData ?? []; // Map country codes to country names + // countryMap = { + // for (var item in countryList) + // item['country_code'] as String: item['country_name'] as String, + // }; + countryMap = { - for (var item in countryList) - item['country_code'] as String: item['country_name'] as String, + for (var country in countryList) + (country['country_code'] ?? ''): + '${country['country_name'] ?? ''} (${country['country_code'] ?? ''})', }; // Extract only country codes for processing @@ -482,16 +488,34 @@ class HotelsDataState extends State { menuProps: const MenuProps(backgroundColor: Colors.white), constraints: BoxConstraints(maxHeight: 200), itemBuilder: - (context, item, isSelected) => Padding( + (context, item, isSelected) { + print("contryItem - $item"); + final match = RegExp(r'^(.*)\s\((.*)\)$',).firstMatch(item); + final countryName = match?.group(1) ?? ''; + final countryCode = match?.group(2) ?? ''; + return Padding( padding: const EdgeInsets.symmetric( - horizontal: 10.0, - vertical: 8.0, + horizontal: 8.0, + vertical: 6.0, ), - child: Text( - item, - style: GoogleFonts.poppins(fontSize: 11.5), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + countryName, + style: GoogleFonts.poppins(fontSize: 11.5), + ), + Text( + countryCode, + style: GoogleFonts.poppins(fontSize: 11.5,color:Colors.grey), + + ), + ], + ), ), - ), + );}, searchFieldProps: TextFieldProps( decoration: InputDecoration( hintText: "Search ...", diff --git a/lib/Screens/perdiem_amount/forexDetails.dart b/lib/Screens/perdiem_amount/forexDetails.dart index 3415f68..1a0d05c 100644 --- a/lib/Screens/perdiem_amount/forexDetails.dart +++ b/lib/Screens/perdiem_amount/forexDetails.dart @@ -346,9 +346,15 @@ class ForexDataState extends State { countryList = apiCountryData ?? []; // Map country codes to country names + // countryMap = { + // for (var item in countryList) + // item['country_code'] as String: item['country_name'] as String, + // }; + countryMap = { - for (var item in countryList) - item['country_code'] as String: item['country_name'] as String, + for (var country in countryList) + (country['country_code'] ?? ''): + '${country['country_name'] ?? ''} (${country['country_code'] ?? ''})', }; // Extract only country codes for processing @@ -426,18 +432,35 @@ class ForexDataState extends State { popupProps: PopupProps.menu( showSearchBox: true, // Enables search functionality menuProps: const MenuProps(backgroundColor: Colors.white), - constraints: BoxConstraints(maxHeight: 250), + constraints: BoxConstraints(maxHeight: 200), itemBuilder: - (context, item, isSelected) => Padding( - padding: const EdgeInsets.symmetric( - horizontal: 10.0, - vertical: 8.0, - ), - child: Text( - item, - style: GoogleFonts.poppins(fontSize: 11.5), - ), - ), + (context, item, isSelected) { + print("contryItem - $item"); + final match = RegExp(r'^(.*)\s\((.*)\)$',).firstMatch(item); + final countryName = match?.group(1) ?? ''; + final countryCode = match?.group(2) ?? ''; + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: 8.0, + vertical: 6.0, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + countryName, + style: GoogleFonts.poppins(fontSize: 11.5), + ), + Text( + countryCode, + style: GoogleFonts.poppins(fontSize: 11.5,color:Colors.grey), + ), + ], + ), + ), + );}, searchFieldProps: TextFieldProps( decoration: InputDecoration( hintText: "Search ...", @@ -495,10 +518,87 @@ class ForexDataState extends State { .firstWhere((entry) => entry.value == newValue) .key; selectedCountryName = newValue; - setCurrencyFromSelectedCountry(selectedCountry!); }); }, ), + // child: DropdownSearch( + // selectedItem: countryMap[selectedCountry], + // popupProps: PopupProps.menu( + // showSearchBox: true, // Enables search functionality + // menuProps: const MenuProps(backgroundColor: Colors.white), + // constraints: BoxConstraints(maxHeight: 250), + // itemBuilder: + // (context, item, isSelected) => Padding( + // padding: const EdgeInsets.symmetric( + // horizontal: 10.0, + // vertical: 8.0, + // ), + // child: Text( + // item, + // style: GoogleFonts.poppins(fontSize: 11.5), + // ), + // ), + // searchFieldProps: TextFieldProps( + // decoration: InputDecoration( + // hintText: "Search ...", + // hintStyle: GoogleFonts.poppins(fontSize: 11), + // contentPadding: EdgeInsets.symmetric(horizontal: 4), + // ), + // ), + // ), + // items: countryMap.values.toList(), + // dropdownDecoratorProps: DropDownDecoratorProps( + // dropdownSearchDecoration: InputDecoration( + // // border: InputBorder.none, + // border: OutlineInputBorder( + // borderRadius: BorderRadius.circular(8), + // borderSide: BorderSide( + // color: + // (focusStates["country_codeFocused"] ?? false) + // ? widget.layoutColor! + // : Colors.white, + // // width: 0.5, + // ), + // ), + // enabledBorder: OutlineInputBorder( + // borderSide: BorderSide( + // color: + // (focusStates["country_codeFocused"] ?? false) + // ? widget.layoutColor! + // : Colors.white, + // // : const Color(0xFFD6D5E6), + // // width: 0.5, + // // const Color(0xFFD6D5E6), + // ), + // ), + // focusedBorder: OutlineInputBorder( + // borderSide: BorderSide(color: widget.layoutColor!, width: 1), + // ), + // contentPadding: EdgeInsets.symmetric(horizontal: 10.0, + // vertical: 8.0,), + // ), + // ), + // dropdownBuilder: + // (context, selectedItem) => Align( + // // Center-align selected item + // alignment: Alignment.centerLeft, + // child: Text( + // selectedItem ?? "Select ", + // style: GoogleFonts.poppins(fontSize: 11), + // ), + // ), + // onChanged: (String? newValue) { + // setState(() { + // // Find the country_code based on selected country_name + // selectedCountry = + // countryMap.entries + // .firstWhere((entry) => entry.value == newValue) + // .key; + // selectedCountryName = newValue; + // setCurrencyFromSelectedCountry(selectedCountry!); + // }); + // }, + // ), ) ) ), diff --git a/lib/Screens/policy/policy.dart b/lib/Screens/policy/policy.dart index b9a65c5..53df327 100644 --- a/lib/Screens/policy/policy.dart +++ b/lib/Screens/policy/policy.dart @@ -644,16 +644,16 @@ class _PolicyState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Text( - "Choose Policy Type", - style: GoogleFonts.poppins( - fontSize: 12, - fontWeight: FontWeight.w600, - color: Color(0xFF575A74), - ), - ), - ], + // children: [ + // Text( + // "Choose Policy Type", + // style: GoogleFonts.poppins( + // fontSize: 12, + // fontWeight: FontWeight.w600, + // color: Color(0xFF575A74), + // ), + // ), + // ], ), ), ], diff --git a/lib/Screens/reports/advancePurchase.dart b/lib/Screens/reports/advancePurchase.dart index c44c7a8..f6eb16b 100644 --- a/lib/Screens/reports/advancePurchase.dart +++ b/lib/Screens/reports/advancePurchase.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:core'; import 'dart:typed_data'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; @@ -323,12 +324,16 @@ class _AdvancePurchaseState extends State if (textControllers["from_date"]!.text.isEmpty || textControllers["to_date"]!.text.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - backgroundColor: Colors.redAccent, - content: Text("Please choose a valid date range."), - behavior: SnackBarBehavior.floating, - ), + + Fluttertoast.showToast( + msg: "Please choose a valid date range.", + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, '#dc1c13','#dc1c13')", ); return; } @@ -356,13 +361,21 @@ class _AdvancePurchaseState extends State excelName, ); - // ScaffoldMessenger.of(context).showSnackBar( - // SnackBar( - // backgroundColor: result['status'] ? Colors.green : Colors.red, - // content: Text(result['message']), - // behavior: SnackBarBehavior.floating, - // ), - // ); + final String displayBackgroundColor = result['status'] ? '#28a745' : '#dc1c13'; + final Color displayColor = result['status'] ? Colors.green : Colors.redAccent; + final String displayMessage = result['message']; + // final bool status = result['status'] == true; + + Fluttertoast.showToast( + msg: displayMessage , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: displayColor, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, $displayBackgroundColor, $displayBackgroundColor)", + ); } void handleDomesticFilter(String query) { diff --git a/lib/Screens/reports/guestHouse.dart b/lib/Screens/reports/guestHouse.dart index 225a20d..d4af939 100644 --- a/lib/Screens/reports/guestHouse.dart +++ b/lib/Screens/reports/guestHouse.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:core'; import 'dart:typed_data'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; @@ -302,13 +303,18 @@ class _GuestHouseState extends State if (textControllers["from_date"]!.text.isEmpty || textControllers["to_date"]!.text.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - backgroundColor: Colors.redAccent, - content: Text("Please choose a valid date range."), - behavior: SnackBarBehavior.floating, - ), + + Fluttertoast.showToast( + msg: "Please choose a valid date range." , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, '#dc1c13', '#dc1c13')", ); + return; } @@ -335,13 +341,21 @@ class _GuestHouseState extends State excelName, ); - // ScaffoldMessenger.of(context).showSnackBar( - // SnackBar( - // backgroundColor: result['status'] ? Colors.green : Colors.red, - // content: Text(result['message']), - // behavior: SnackBarBehavior.floating, - // ), - // ); + final String displayBackgroundColor = result['status'] ? '#28a745' : '#dc1c13'; + final Color displayColor = result['status'] ? Colors.green : Colors.redAccent; + final String displayMessage = result['message']; + // final bool status = result['status'] == true; + + Fluttertoast.showToast( + msg: displayMessage , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: displayColor, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, $displayBackgroundColor, $displayBackgroundColor)", + ); } void handleDomesticFilter(String query) { diff --git a/lib/Screens/reports/misAir.dart b/lib/Screens/reports/misAir.dart index 79d0c42..88ec957 100644 --- a/lib/Screens/reports/misAir.dart +++ b/lib/Screens/reports/misAir.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:core'; import 'dart:typed_data'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; @@ -301,12 +302,16 @@ class _MISairState extends State with SingleTickerProviderStateMixin { if (textControllers["from_date"]!.text.isEmpty || textControllers["to_date"]!.text.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - backgroundColor: Colors.redAccent, - content: Text("Please choose a valid date range."), - behavior: SnackBarBehavior.floating, - ), + + Fluttertoast.showToast( + msg: "Please choose a valid date range.", + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, '#dc1c13', '#dc1c13')", ); return; } @@ -334,13 +339,21 @@ class _MISairState extends State with SingleTickerProviderStateMixin { excelName, ); - // ScaffoldMessenger.of(context).showSnackBar( - // SnackBar( - // backgroundColor: result['status'] ? Colors.green : Colors.red, - // content: Text(result['message']), - // behavior: SnackBarBehavior.floating, - // ), - // ); + final String displayBackgroundColor = result['status'] ? '#28a745' : '#dc1c13'; + final Color displayColor = result['status'] ? Colors.green : Colors.redAccent; + final String displayMessage = result['message']; + // final bool status = result['status'] == true; + + Fluttertoast.showToast( + msg: displayMessage , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: displayColor, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, $displayBackgroundColor, $displayBackgroundColor)", + ); } void handleDomesticFilter(String query) { diff --git a/lib/Screens/reports/misForex.dart b/lib/Screens/reports/misForex.dart index 8b4ce5d..7896f8e 100644 --- a/lib/Screens/reports/misForex.dart +++ b/lib/Screens/reports/misForex.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:core'; import 'dart:typed_data'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; @@ -262,12 +263,15 @@ class _MISforexState extends State if (textControllers["from_date"]!.text.isEmpty || textControllers["to_date"]!.text.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - backgroundColor: Colors.redAccent, - content: Text("Please choose a valid date range."), - behavior: SnackBarBehavior.floating, - ), + Fluttertoast.showToast( + msg: "Please choose a valid date range.", + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, '#dc1c13', '#dc1c13')", ); return; } @@ -295,13 +299,28 @@ class _MISforexState extends State excelName, ); - // ScaffoldMessenger.of(context).showSnackBar( - // SnackBar( - // backgroundColor: result['status'] ? Colors.green : Colors.red, - // content: Text(result['message']), - // behavior: SnackBarBehavior.floating, - // ), - // ); + final String displayBackgroundColor = result['status'] ? '#28a745' : '#dc1c13'; + final Color displayColor = result['status'] ? Colors.green : Colors.redAccent; + final String displayMessage = result['message']; + // final bool status = result['status'] == true; + + Fluttertoast.showToast( + msg: displayMessage , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: displayColor, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, $displayBackgroundColor, $displayBackgroundColor)", + ); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: result['status'] ? Colors.green : Colors.red, + content: Text(result['message']), + behavior: SnackBarBehavior.floating, + ), + ); } void handleInternationalFilter(String query) { diff --git a/lib/Screens/reports/misHotel.dart b/lib/Screens/reports/misHotel.dart index 989a77f..18da2f4 100644 --- a/lib/Screens/reports/misHotel.dart +++ b/lib/Screens/reports/misHotel.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:core'; import 'dart:typed_data'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; @@ -302,12 +303,16 @@ class _MIShotelState extends State if (textControllers["from_date"]!.text.isEmpty || textControllers["to_date"]!.text.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - backgroundColor: Colors.redAccent, - content: Text("Please choose a valid date range."), - behavior: SnackBarBehavior.floating, - ), + + Fluttertoast.showToast( + msg: "Please choose a valid date range.", + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, '#dc1c13', '#dc1c13')", ); return; } @@ -335,13 +340,21 @@ class _MIShotelState extends State excelName, ); - // ScaffoldMessenger.of(context).showSnackBar( - // SnackBar( - // backgroundColor: result['status'] ? Colors.green : Colors.red, - // content: Text(result['message']), - // behavior: SnackBarBehavior.floating, - // ), - // ); + final String displayBackgroundColor = result['status'] ? '#28a745' : '#dc1c13'; + final Color displayColor = result['status'] ? Colors.green : Colors.redAccent; + final String displayMessage = result['message']; + // final bool status = result['status'] == true; + + Fluttertoast.showToast( + msg: displayMessage , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: displayColor, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, $displayBackgroundColor, $displayBackgroundColor)", + ); } void handleDomesticFilter(String query) { diff --git a/lib/Screens/reports/reportSample.dart b/lib/Screens/reports/reportSample.dart deleted file mode 100644 index 8db8a93..0000000 --- a/lib/Screens/reports/reportSample.dart +++ /dev/null @@ -1,333 +0,0 @@ -import 'dart:convert'; -import 'dart:core'; -import 'package:go_router/go_router.dart'; -import 'package:google_fonts/google_fonts.dart'; -import 'package:http/http.dart' as http; -import 'package:flutter/material.dart'; -import 'package:frontend/config/apiUrl.dart'; -import 'package:intl/intl.dart'; -import 'package:responsive_builder/responsive_builder.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - -import '../../routes/custom_appBar.dart'; -import '../../routes/custom_drawer.dart'; -import '../../routes/mainLayout.dart'; -import '../../services/apiService.dart'; -import '../../utils/auth_utils.dart'; - -class ReportSample extends StatefulWidget { - const ReportSample({super.key}); - - @override - _ReportSampleState createState() => _ReportSampleState(); -} - -class _ReportSampleState extends State { - final ApiService apiService = ApiService(); - - String? userId; - String? orgId; - String? roleUser; - String? token; - - Color? layoutColor; - Color? bodyColor; - - - @override - void initState() { - super.initState(); - getToken(); - } - - - void loadInitialData() async { - String? layoutString = await getLayoutColor(); - String? bodyStringColor = await getBodyColor(); - - setState(() { - layoutColor = layoutString != null ? Color(int.parse(layoutString)) - : Colors.redAccent; - - bodyColor = bodyStringColor != null ? Color(int.parse(bodyStringColor)) - : Colors.white; - }); - - } - - Future initializeData() async { - token = await getToken(); - userId = await getUserId(); - orgId = await getOrgId(); - roleUser = await getRoleUser(); - - - if (token == null || userId == null) { - print("Token or USerId missing"); - return; - } - } - - - Future getUserId() async { - final prefs = await SharedPreferences.getInstance(); - final String? userDataString = prefs.getString('user_data'); - - if (userDataString != null) { - try { - final Map userData = jsonDecode(userDataString); - return userData["user_id"]?.toString(); - } catch (e) { - return null; - } - } - return null; - } - - Future getOrgId() async { - final prefs = await SharedPreferences.getInstance(); - final String? userDataString = prefs.getString('user_data'); - - if (userDataString != null) { - try { - final Map userData = jsonDecode(userDataString); - return userData["org_id"]?.toString(); - } catch (e) { - return null; - } - } - return null; - } - - Future getToken() async { - final prefs = await SharedPreferences.getInstance(); - return prefs.getString('auth_token'); - } - - @override - // Widget build(BuildContext context) { - // // TODO: implement build - // throw UnimplementedError(); - // } - - Widget build(BuildContext context) { - return ResponsiveBuilder(builder: (context, sizingInfo) { - bool isDesktop = sizingInfo.deviceScreenType == DeviceScreenType.desktop; - - return Scaffold( - backgroundColor: Colors.white, - appBar: CustomAppBar(isDesktop: isDesktop), - drawer: CustomDrawer(isDesktop: false), - body: Row( - children: [ - // if (isDesktop) CustomDrawer(isDesktop: true), - Expanded(child: buildReportSampleLayout(isDesktop)) - ], - ), - ); - }); - } - - Widget buildReportSampleLayout(bool isDesktop) { - return Container( child: buildFormLayout(isDesktop) ); - } - - Widget buildFormLayout(bool isDesktop) { - return Container( - margin: isDesktop ? EdgeInsets.all(10.0) : null, - padding: const EdgeInsets.only(top: 15, bottom: 15, left: 20, right: 20), - height: isDesktop - ? MediaQuery.of(context).size.height * 0.98 - : MediaQuery.of(context).size.height, - decoration: BoxDecoration( - border: isDesktop - ? Border.all(width: 2, color: Colors.white) - : null, - color: isDesktop ? Colors.white : Color(0xFFFCFCFC), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - // ------------------- First Row ------------------- - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - 'ReportSample', - style: GoogleFonts.poppins( - fontSize: isDesktop ? 16 : 14, - fontWeight: FontWeight.w600, - color: Colors.black, - ), - ), - Row( - children: [ - ElevatedButton( - style: ElevatedButton.styleFrom( - backgroundColor: Color(0xFF114D8B), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), - side: BorderSide(color: Color(0xFF114D8B), width: 2), - ), - padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12), - ), - onPressed: () { - // Your Excel export logic here - }, - child: Row( - children: [ - Text( - "Excel", - style: GoogleFonts.poppins( - fontSize: isDesktop ? 13 : 11, - color: Colors.white, - ), - ), - SizedBox(width: 8), - Icon(Icons.file_present_outlined, size: 15, color: Colors.white), - ], - ), - ), - SizedBox(width: 10), - ElevatedButton( - style: ElevatedButton.styleFrom( - backgroundColor: Color(0xFF114D8B), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), - side: BorderSide(color: Color(0xFF114D8B), width: 2), - ), - padding: EdgeInsets.symmetric(horizontal: 20, vertical: 12), - ), - onPressed: () { - // Your PDF export logic here - }, - child: Row( - children: [ - Text( - "PDF", - style: GoogleFonts.poppins( - fontSize: isDesktop ? 13 : 11, - color: Colors.white, - ), - ), - SizedBox(width: 8), - Icon(Icons.picture_as_pdf_outlined, size: 15, color: Colors.white), - ], - ), - ), - ], - ), - ], - ), - - SizedBox(height: 15), - - // ------------------- Second Row ------------------- - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("From Date", style: GoogleFonts.poppins(fontSize: 12)), - SizedBox(height: 5), - Container( - height: 40, - padding: EdgeInsets.symmetric(horizontal: 10), - decoration: BoxDecoration( - border: Border.all(color: Colors.grey.shade300), - borderRadius: BorderRadius.circular(8), - color: Colors.white, - ), - child: Center(child: Text("Select From Date")), // Replace with date picker - ), - ], - ), - ), - SizedBox(width: 20), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("To Date", style: GoogleFonts.poppins(fontSize: 12)), - SizedBox(height: 5), - Container( - height: 40, - padding: EdgeInsets.symmetric(horizontal: 10), - decoration: BoxDecoration( - border: Border.all(color: Colors.grey.shade300), - borderRadius: BorderRadius.circular(8), - color: Colors.white, - ), - child: Center(child: Text("Select To Date")), // Replace with date picker - ), - ], - ), - ), - ], - ), - - SizedBox(height: 15), - - // ------------------- Third Row ------------------- - DefaultTabController( - length: 2, - child: Column( - children: [ - TabBar( - labelColor: Colors.black, - unselectedLabelColor: Colors.grey, - indicatorColor: Color(0xFF114D8B), - tabs: [ - Tab(text: "Domestic"), - Tab(text: "International"), - ], - ), - SizedBox(height: 10), - Container( - height: 200, // Set desired height for tab content - child: TabBarView( - children: [ - Center(child: Text("Domestic Content")), - Center(child: Text("International Content")), - ], - ), - ), - ], - ), - ), - // ------------------- Fourth Row (Table) ------------------- - Expanded( - child: SingleChildScrollView( - scrollDirection: Axis.vertical, - child: DataTable( - headingRowColor: MaterialStateColor.resolveWith( - (states) => Color(0xFFE6F0FA)), // Light blue header - columnSpacing: 20, - columns: [ - DataColumn(label: Text('ID', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))), - DataColumn(label: Text('Name', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))), - DataColumn(label: Text('Status', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))), - DataColumn(label: Text('Date', style: GoogleFonts.poppins(fontSize: 12, fontWeight: FontWeight.w600))), - ], - rows: List.generate( - 10, - (index) => DataRow( - cells: [ - DataCell(Text('#$index', style: GoogleFonts.poppins(fontSize: 12))), - DataCell(Text('User $index', style: GoogleFonts.poppins(fontSize: 12))), - DataCell(Text(index % 2 == 0 ? 'Active' : 'Inactive', style: GoogleFonts.poppins(fontSize: 12))), - DataCell(Text('13 Jun 2025', style: GoogleFonts.poppins(fontSize: 12))), - ], - ), - ), - ), - ), - ), - - ], - ), - ); - } - -} \ No newline at end of file diff --git a/lib/Screens/reports/servicesAnalysis.dart b/lib/Screens/reports/servicesAnalysis.dart index a4b170e..5f6dfe8 100644 --- a/lib/Screens/reports/servicesAnalysis.dart +++ b/lib/Screens/reports/servicesAnalysis.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:core'; import 'dart:typed_data'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; @@ -301,13 +302,17 @@ class _ServicesAnalysisState extends State if (textControllers["from_date"]!.text.isEmpty || textControllers["to_date"]!.text.isEmpty) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - backgroundColor: Colors.redAccent, - content: Text("Please choose a valid date range."), - behavior: SnackBarBehavior.floating, - ), + Fluttertoast.showToast( + msg: "Please choose a valid date range.", + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, '#dc1c13', '#dc1c13')", ); + return; } @@ -334,13 +339,21 @@ class _ServicesAnalysisState extends State excelName, ); - // ScaffoldMessenger.of(context).showSnackBar( - // SnackBar( - // backgroundColor: result['status'] ? Colors.green : Colors.red, - // content: Text(result['message']), - // behavior: SnackBarBehavior.floating, - // ), - // ); + final String displayBackgroundColor = result['status'] ? '#28a745' : '#dc1c13'; + final Color displayColor = result['status'] ? Colors.green : Colors.redAccent; + final String displayMessage = result['message']; + // final bool status = result['status'] == true; + + Fluttertoast.showToast( + msg: displayMessage , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: displayColor, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, $displayBackgroundColor, $displayBackgroundColor)", + ); } void handleDomesticFilter(String query) { diff --git a/lib/Screens/userManagement/create_traveller_agent/personalDetailsTravelAgent.dart b/lib/Screens/userManagement/create_traveller_agent/personalDetailsTravelAgent.dart index 87abaf7..11f5234 100644 --- a/lib/Screens/userManagement/create_traveller_agent/personalDetailsTravelAgent.dart +++ b/lib/Screens/userManagement/create_traveller_agent/personalDetailsTravelAgent.dart @@ -1193,10 +1193,15 @@ class PersonalDetailsState extends State { countryList = apiCountryData ?? []; // Map country codes to country names + // countryMap = { + // for (var item in countryList) + // item['country_code'] as String: item['country_name'] as String, + // // item['currency'] as String + // }; countryMap = { - for (var item in countryList) - item['country_code'] as String: item['country_name'] as String, - // item['currency'] as String + for (var country in countryList) + (country['country_code'] ?? ''): + '${country['country_name'] ?? ''} (${country['country_code'] ?? ''})', }; // Extract only country codes for processing @@ -1229,16 +1234,44 @@ class PersonalDetailsState extends State { fit: FlexFit.loose, // Allows flexible height menuProps: const MenuProps(backgroundColor: Colors.white), itemBuilder: - (context, item, isSelected) => Container( - padding: EdgeInsets.symmetric( - horizontal: 10, - vertical: 6, - ), - child: Text( - item, - style: GoogleFonts.poppins(fontSize: 11.5), + // (context, item, isSelected) => Container( + // padding: EdgeInsets.symmetric( + // horizontal: 10, + // vertical: 6, + // ), + // child: Text( + // item, + // style: GoogleFonts.poppins(fontSize: 11.5), + // ), + // ), + (context, item, isSelected) { + print("contryItem - $item"); + final match = RegExp(r'^(.*)\s\((.*)\)$',).firstMatch(item); + final countryName = match?.group(1) ?? ''; + final countryCode = match?.group(2) ?? ''; + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: 8.0, + vertical: 6.0, + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + countryName, + style: GoogleFonts.poppins(fontSize: 11.5), + ), + Text( + countryCode, + style: GoogleFonts.poppins(fontSize: 11.5,color:Colors.grey), + + ), + ], ), ), + );}, constraints: BoxConstraints(maxHeight: 200), searchFieldProps: TextFieldProps( decoration: InputDecoration( diff --git a/lib/Screens/userManagement/create_user/personal_details.dart b/lib/Screens/userManagement/create_user/personal_details.dart index a79901f..5d6a4d5 100644 --- a/lib/Screens/userManagement/create_user/personal_details.dart +++ b/lib/Screens/userManagement/create_user/personal_details.dart @@ -1521,9 +1521,14 @@ class PersonalDetailsState extends State { Widget buildRole() { // Map dropdown_key (ID) -> dropdown_value (Name) + // Map roleMap = { + // for (var item in apiRoleData ?? []) + // item['dropdown_key'] as String: item['dropdown_value'] as String, + // }; Map roleMap = { for (var item in apiRoleData ?? []) - item['dropdown_key'] as String: item['dropdown_value'] as String, + if (item['dropdown_key'] != '5') + item['dropdown_key'].toString(): item['dropdown_value'].toString(), }; List roleNames = roleMap.values.toList(); diff --git a/lib/Screens/userManagement/user_List.dart b/lib/Screens/userManagement/user_List.dart index dcd27b9..25d4079 100644 --- a/lib/Screens/userManagement/user_List.dart +++ b/lib/Screens/userManagement/user_List.dart @@ -1,5 +1,7 @@ +import 'dart:async'; import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:frontend/utils/auth_utils.dart'; import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -43,6 +45,9 @@ class _UserListScreenState extends State { int currentPage = 0; int itemsPerPage = 10; + bool _isUploading = false; + bool _isDownloading = false; + @override void initState() { super.initState(); @@ -226,7 +231,7 @@ class _UserListScreenState extends State { context: context, builder: (context) => AlertDialog( // title: Text("User Details"), - title: Text("User Details - $subtitle", style: TextStyle(fontWeight: FontWeight.bold)), + title: Text("Upload Status - $subtitle", style: TextStyle(fontWeight: FontWeight.bold)), content: SingleChildScrollView( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -234,14 +239,14 @@ class _UserListScreenState extends State { // Text(subtitle, style: TextStyle(fontWeight: FontWeight.bold)), // // SizedBox(height: 12), - Text("Users Created Successfully :", style: TextStyle(fontWeight: FontWeight.bold)), + Text("Success Report :", style: TextStyle(fontWeight: FontWeight.bold)), if (successList.isNotEmpty) ...successList.asMap().entries.map((entry) => Text("${entry.key + 1}) ${entry.value} created.")) else - Text("-- There is no data to create. --"), + Text("-- no data. --"), SizedBox(height: 12), - Text("Failed to Create Users :", style: TextStyle(fontWeight: FontWeight.bold)), + Text("Failed Report :", style: TextStyle(fontWeight: FontWeight.bold)), if (failedList.isNotEmpty) ...failedList.asMap().entries.map((entry) { final data = entry.value["data"] ?? "-"; @@ -249,7 +254,7 @@ class _UserListScreenState extends State { return Text("${entry.key + 1}) $data - unable to create due to \"$reason\"."); }) else - Text("-- There is no failed data. --"), + Text("-- no data. --"), ], ), ), @@ -267,7 +272,28 @@ class _UserListScreenState extends State { } + Future handleDownload() async { + final result = await apiService.getDownloadUserTemplateForUpload(); + + final String displayBackgroundColor = result['status'] ? '#28a745' : '#dc1c13'; + final Color displayColor = result['status'] ? Colors.green : Colors.redAccent; + final String displayMessage = result['message']; + // final bool status = result['status'] == true; + + Fluttertoast.showToast( + msg: displayMessage , + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: displayColor, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, $displayBackgroundColor, $displayBackgroundColor)", + ); + } Future handleUpload() async { + final Completer completer = Completer(); + final String apiUrldata = '$apiUrl/api/user/userUpload'; // api final String? token = await getToken(); // 2kn @@ -287,16 +313,19 @@ class _UserListScreenState extends State { await reader.onLoadEnd.first; print(' file - extn : ${file.name.endsWith(".xlsx")}'); if (!file.name.endsWith('.xlsx')) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - // content: Text("Error: Not a valid Excel file "), - content: Text('Invalid file format. Please upload a .xlsx file.'), - backgroundColor: Colors.redAccent, - behavior: SnackBarBehavior.floating, - ), + Fluttertoast.showToast( + msg: 'Invalid file format. Please upload a .xlsx file.', + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, #dc1c13, #dc1c13)", ); print("Error: Not a valid .xlsx file"); - return; + completer.complete(); // Complete even on error + return; // Wait for upload to finish before proceeding } if (reader.readyState == html.FileReader.DONE) { @@ -309,13 +338,17 @@ class _UserListScreenState extends State { if (fileBytes == null) { print('File Bytes: null'); - // ScaffoldMessenger.of(context).showSnackBar( - // SnackBar( - // content: Text("Issues Occur In Files"), - // backgroundColor: Colors.redAccent, - // behavior: SnackBarBehavior.floating, - // ), - // ); + Fluttertoast.showToast( + msg: 'Issues occur in file format conversation', + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, #dc1c13, #dc1c13)", + ); + completer.complete(); return; // No file selected } else { print('File Bytes: CALLING API'); @@ -386,18 +419,22 @@ class _UserListScreenState extends State { } else { // For non-200 responses final errorMsg = 'Failed to upload file: ${response.reasonPhrase}'; - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text(errorMsg), - backgroundColor: Colors.redAccent, - behavior: SnackBarBehavior.floating, - ), + Fluttertoast.showToast( + msg: errorMsg, + toastLength: Toast.LENGTH_SHORT, + gravity: ToastGravity.CENTER, + timeInSecForIosWeb: 2, + backgroundColor: Colors.redAccent, + textColor: Colors.white, + fontSize: 18.0, + webBgColor: "linear-gradient(to right, #dc1c13, #dc1c13)", ); print(errorMsg); } } } + return completer.future; // Wait for upload to finish before proceeding } // if (!file.name.endsWith('.xlsx')) { @@ -747,7 +784,6 @@ class _UserListScreenState extends State { }, ), SizedBox(width: 5), - // Upload Button // OutlinedButton( // onPressed: handleUpload, @@ -762,16 +798,39 @@ class _UserListScreenState extends State { // ), // child: Text("User Bulk Upload"), // ), - IconButton( - icon: Image.asset( - 'assets/images/IconsImg/upload.png', - width: 25, - height: 25, + // IconButton( + // icon: Image.asset( + // 'assets/images/IconsImg/upload.png', + // width: 25, + // height: 25, + // ), + // tooltip: 'User Bulk Upload', + // onPressed: () { + // handleUpload(); + // }, + // ), + // UPLOAD BUTTON + Align( + alignment: Alignment.centerLeft, + child: _isUploading + ? const SizedBox( + width: 28, + height: 28, + child: CircularProgressIndicator(strokeWidth: 3), + ) + : IconButton( + icon: Image.asset( + 'assets/images/IconsImg/upload.png', + width: 25, + height: 25, + ), + tooltip: 'User Bulk Upload', + onPressed: () async { + setState(() => _isUploading = true); + await handleUpload(); + setState(() => _isUploading = false); + }, ), - tooltip: 'User Bulk Upload', - onPressed: () { - handleUpload(); - }, ), // Spacer(), SizedBox(width: 5), diff --git a/lib/routes/organizationSetting.dart b/lib/routes/organizationSetting.dart index 0b6865a..95663ad 100644 --- a/lib/routes/organizationSetting.dart +++ b/lib/routes/organizationSetting.dart @@ -20,6 +20,8 @@ class OrganizationSettingState extends State { final ApiService apiService = ApiService(); Color? layoutColor; + String? roleUser = ""; + void initState() { super.initState(); loadInitialData(); @@ -28,7 +30,7 @@ class OrganizationSettingState extends State { void loadInitialData() async { String? layoutString = await getLayoutColor(); // String? bodyStringColor = await getBodyColor(); - + roleUser = await getRoleUser(); setState(() { layoutColor = layoutString != null @@ -103,7 +105,6 @@ class OrganizationSettingState extends State { 'label': 'Travel Policies', 'description': 'Create and Edit Travel Policy', }, - { 'value': '/getPerdiem', 'icon': Icons.attach_money, @@ -154,6 +155,10 @@ class OrganizationSettingState extends State { }, ]; + if (roleUser == "Travel Admin") { + menuItems.removeWhere((item) => item['value'] == '/OrganizationSetup'); + } + // List rows = []; // for (int i = 0; i < menuItems.length; i += cardsPerRow) { // List cards = []; diff --git a/lib/services/apiService.dart b/lib/services/apiService.dart index 8e459aa..664c5c1 100644 --- a/lib/services/apiService.dart +++ b/lib/services/apiService.dart @@ -898,7 +898,7 @@ class ApiService { } // download the Template for bulk upload the user - Future getDownloadUserTemplateForUpload() async { + Future> getDownloadUserTemplateForUpload() async { final String apiUrldata = '$apiUrl/api/user/userUploadTemplate'; // download the Template for bulk upload user => api @@ -936,29 +936,14 @@ class ApiService { // Revoke the download URL to free up resources html.Url.revokeObjectUrl(url); + return {'status': true, 'message': 'Successfully Downloaded'}; } catch (e) { - throw Exception('Error parsing response: $e'); + return {'status': false, 'message': 'Download error: $e'}; } } else if (response.statusCode == 404) { - // showDialog( - // context: context, - // builder: (BuildContext context) { - // return AlertDialog( - // title: Text('File not found.'), - // // content: Text('File not found.'), - // actions: [ - // TextButton( - // child: Text('OK'), - // onPressed: () { - // Navigator.of(context).pop(); // Close the dialog - // }, - // ), - // ], - // ); - // }, - // ); + return {'status': false, 'message': 'File not found (404).'}; } else { - throw Exception('Failed to load plans'); + return {'status': false, 'message': 'Failed to download. Try again.'}; } } @@ -1056,7 +1041,7 @@ class ApiService { // --- Future> getDepartmentDetailsFind(int id) async { - final String apiUrldata = '$apiUrl/api/findDepartment?department_id=$id'; + final String apiUrldata = '$apiUrl/api/findDepartment?id=$id'; final token = await getToken(); @@ -1560,11 +1545,7 @@ class ApiService { } } - Future reportExcelDownload( - String apiRoute, - String body, - String name, - ) async { + Future> reportExcelDownload(String apiRoute,String body,String name,) async { final String apiUrldata = '$apiUrl/api/$apiRoute'; // Sanitize name for filename (optional) @@ -1607,14 +1588,18 @@ class ApiService { // Revoke the download URL to free up resources html.Url.revokeObjectUrl(url); - throw Exception('Sucessfully Downloaded'); + // throw Exception('Sucessfully Downloaded'); + return {'status': true, 'message': 'Successfully Downloaded'}; } catch (e) { - throw Exception('Error parsing response: $e'); + // throw Exception('Error parsing response: $e'); + return {'status': false, 'message': 'Download error: $e'}; } } else if (response.statusCode == 404) { - throw Exception('File not found.'); + // throw Exception('File not found.'); + return {'status': false, 'message': 'File not found (404).'}; } else { - throw Exception('Failed to Download'); + // throw Exception('Failed to Download'); + return {'status': false, 'message': 'Failed to download. Try again.'}; } } diff --git a/lib/widgets/popup_travelAgentList_action.dart b/lib/widgets/popup_travelAgentList_action.dart index 671384f..e928223 100644 --- a/lib/widgets/popup_travelAgentList_action.dart +++ b/lib/widgets/popup_travelAgentList_action.dart @@ -40,25 +40,25 @@ class UserActionsMenu extends StatelessWidget { mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, children: [ - GestureDetector( - child: Tooltip( - message: 'View Details', - child: Icon(Icons.remove_red_eye, - color: Color(0xFF475569), size: 18) - ), - // child: Icon(Icons.remove_red_eye, - // color: Color(0xFF475569), size: 18,), - onTap: () async { - Navigator.pop(context); // Close the menu - final userId = getUserId(user['user_id']); - final usersData = await getUserDetails(userId); - context.go("/CreateTravelAgent", extra: { - "selectedUser": usersData, - "isViewMode": true, - }); - }, - ), - SizedBox(width: 8), + // GestureDetector( + // child: Tooltip( + // message: 'View Details', + // child: Icon(Icons.remove_red_eye, + // color: Color(0xFF475569), size: 18) + // ), + // // child: Icon(Icons.remove_red_eye, + // // color: Color(0xFF475569), size: 18,), + // onTap: () async { + // Navigator.pop(context); // Close the menu + // final userId = getUserId(user['user_id']); + // final usersData = await getUserDetails(userId); + // context.go("/CreateTravelAgent", extra: { + // "selectedUser": usersData, + // "isViewMode": true, + // }); + // }, + // ), + // SizedBox(width: 8), GestureDetector( child: Tooltip( message: 'Edit Details', diff --git a/lib/widgets/popup_userList_action.dart b/lib/widgets/popup_userList_action.dart index 5ff7a85..45c5a2a 100644 --- a/lib/widgets/popup_userList_action.dart +++ b/lib/widgets/popup_userList_action.dart @@ -40,25 +40,25 @@ class UserActionsMenu extends StatelessWidget { mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, children: [ - GestureDetector( - child: Tooltip( - message: 'View Details', - child: Icon(Icons.remove_red_eye, - color: Color(0xFF475569), size: 18) - ), - // child: Icon(Icons.remove_red_eye, - // color: Color(0xFF475569), size: 18,), - onTap: () async { - Navigator.pop(context); // Close the menu - final userId = getUserId(user['user_id']); - final usersData = await getUserDetails(userId); - context.go("/CreateUserDetails", extra: { - "selectedUser": usersData, - "isViewMode": true, - }); - }, - ), - SizedBox(width: 8), + // GestureDetector( + // child: Tooltip( + // message: 'View Details', + // child: Icon(Icons.remove_red_eye, + // color: Color(0xFF475569), size: 18) + // ), + // // child: Icon(Icons.remove_red_eye, + // // color: Color(0xFF475569), size: 18,), + // onTap: () async { + // Navigator.pop(context); // Close the menu + // final userId = getUserId(user['user_id']); + // final usersData = await getUserDetails(userId); + // context.go("/CreateUserDetails", extra: { + // "selectedUser": usersData, + // "isViewMode": true, + // }); + // }, + // ), + // SizedBox(width: 8), GestureDetector( child: Tooltip( message: 'Edit Details',