backup changes and email and mobile number same

lib/email_verify.dart

@@ -117,10 +117,23 @@ class _MyEmailVerifyState extends State<MyEmailVerify> {
         Map<String, dynamic> data = json.decode(response.body);
         print('Response data: $data');
 
+        // ✅ Safely extract preEnrollmentData
+        List<dynamic> preEnrollmentData = [];
+        if (data['data'] is List) {
+          preEnrollmentData = data['data'];
+        }
+
+        // ✅ Safely extract postEnrollmentData
+        final postEnrollment = data['post_enrollment'] ?? {};
+        List<dynamic> postEnrollmentData = [];
+        if (postEnrollment['data'] is List) {
+          postEnrollmentData = postEnrollment['data'];
+        }
+
         // Extract enrollment data
-        List<dynamic> preEnrollmentData = data['data'] ?? [];
+        // List<dynamic> preEnrollmentData = data['data'] ?? [];
-        Map<String, dynamic> postEnrollment = data['post_enrollment'] ?? {};
+        // Map<String, dynamic> postEnrollment = data['post_enrollment'] ?? {};
-        List<dynamic> postEnrollmentData = postEnrollment['data'] ?? [];
+        // List<dynamic> postEnrollmentData = postEnrollment['data'] ?? [];
 
         // Save to global storage
         final tokenStorage = TokenStorageService();

lib/excel_verification.dart

@@ -20,6 +20,7 @@ import 'package:intl/intl.dart';
 import 'package:csv/csv.dart';
 
 import 'package:spreadsheet_decoder/spreadsheet_decoder.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'customAppBar/customFooter.dart';
 
@@ -581,6 +582,29 @@ class _excelVerifyState extends State<excelVerify> {
     anchor.click(); // Trigger a click on the anchor element
   }
 
+  // Future<void> downloadSampleFile() async {
+  //
+  //   final response = await apiService.getSampleFileDownload(widget.Token);
+  //   print('check 1');
+  //   if (response['status'] == 'success') {
+  //    final url = response['data'];
+  //     _launchURL(url);
+  //   } else {
+  //     ToastHelper.showErrorToast(context, '⚠️ Unknown response format');
+  //     print('⚠️ Unknown response format');
+  //   }
+  // }
+  //
+  // Future<void> _launchURL(String url) async {
+  //   print('url $url');
+  //   try {
+  //     final Uri uri = Uri.parse(url);
+  //     await launchUrl(uri, mode: LaunchMode.externalApplication);
+  //   } catch (e) {
+  //     print('Could not launch URL: $e');
+  //   }
+  // }
+
   resetErrorCount() {
     setState(() {
       fileBytes = null;

lib/hrDashboard.dart

@@ -48,6 +48,7 @@ class _hrDashboardState extends State<hrDashboard>
   String? _postToken = '';
   late String _token;
   dynamic getPolicyNo;
+  dynamic branchName;
   // bool _isLoading = false;
   dynamic getPolicyNameDetails;
   dynamic enrollmentClient_id;
@@ -131,7 +132,7 @@ class _hrDashboardState extends State<hrDashboard>
     _postToken = await tokenService.getCurrentToken();
     print(enrollToken);
     print(_postToken);
-
+    branchName = prefs.getString('branchName') ?? '';
 
     if (enrollToken != null && enrollToken!.isNotEmpty) {
       // Map<String, dynamic>? decodedToken = Jwt.parseJwt(enrollToken!);
@@ -499,10 +500,48 @@ class _hrDashboardState extends State<hrDashboard>
     };
   });
 
+  Future<bool> _showLogoutDialog() async {
+    return await showDialog<bool>(
+      context: context,
+      barrierDismissible: false,
+      builder: (context) => AlertDialog(
+        title: Text("Confirm Logout"),
+        content: Text("Do you want to logout?"),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(false),
+            child: Text("Cancel"),
+          ),
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(true),
+            child: Text("Logout"),
+          ),
+        ],
+      ),
+    ) ??
+        false;
+  }
+
   @override
   Widget build(BuildContext context) {
     if (getCardArrays == []) {
-      return Scaffold(
+      return PopScope(
+          canPop: false, // ✅ Prevents automatic back navigation
+          onPopInvoked: (didPop) async {
+            // This is triggered when browser back button is pressed
+            bool logout = await _showLogoutDialog();
+
+            if (logout) {
+              // ✅ Clear storage & logout
+              // Example:
+              // await storage.clear();
+              final prefs = await SharedPreferences.getInstance();
+              prefs.clear();
+              print('LocalStorage Cleared');
+              Navigator.pushNamed(context, 'hrLogin');
+            }
+          },
+          child: Scaffold(
           appBar: CustomAppBar(),
           body: SingleChildScrollView(
             child: Container(
@@ -515,7 +554,7 @@ class _hrDashboardState extends State<hrDashboard>
                 ],
               ),
             ),
-          ));
+          )));
     } else {
       int numCards = getCardArrays.length;
       int numExpanded = numCards < 4 ? numCards : 4;
@@ -525,8 +564,23 @@ class _hrDashboardState extends State<hrDashboard>
 
       print("visibleTabAll - $visibleTabs");
       print("tabViewsAll - $tabViews");
+      return PopScope(
+          canPop: false, // ✅ Prevents automatic back navigation
+          onPopInvoked: (didPop) async {
+            // This is triggered when browser back button is pressed
+            bool logout = await _showLogoutDialog();
 
-      return Scaffold(
+            if (logout) {
+              // ✅ Clear storage & logout
+              // Example:
+              // await storage.clear();
+              final prefs = await SharedPreferences.getInstance();
+              prefs.clear();
+              print('LocalStorage Cleared');
+              Navigator.pushNamed(context, 'hrLogin');
+            }
+          },
+          child: Scaffold(
               appBar: CustomAppBar(),
               body: Stack(children: [
                 Container(
@@ -609,7 +663,12 @@ class _hrDashboardState extends State<hrDashboard>
                             ),
                             Expanded(
                               flex: 9,
-                          child: Text(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.end,   // right aligned
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  // ⭐ Client Name
+                                  Text(
                                     clientName ?? '',
                                     textAlign: TextAlign.right,
                                     style: GoogleFonts.poppins(
@@ -617,7 +676,23 @@ class _hrDashboardState extends State<hrDashboard>
                                       fontWeight: FontWeight.w600,
                                     ),
                                   ),
+
+                                  const SizedBox(height: 20),
+
+                                  // ⭐ Branch Name (new line)
+                                  Text(
+                                    'Branch: ${branchName}' ?? '',
+                                    textAlign: TextAlign.right,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: Responsive.isDesktop(context) ? 16 : 14,
+                                      fontWeight: FontWeight.w400,
+                                      color: Colors.grey[700],
+                                    ),
+                                  ),
+                                ],
+                              ),
                             )
+
                           ],
                         ),
                       ),
@@ -717,7 +792,10 @@ class _hrDashboardState extends State<hrDashboard>
                     child: CustomFooter(),
                   ),
                 ),
-          ]));
+              ]))
+      );
+
+
     }
   }
 

lib/hrLogin.dart

@@ -24,9 +24,10 @@ class MyHrLogin extends StatefulWidget {
 }
 
 class _MyPhoneState extends State<MyHrLogin> {
-  final TextEditingController emailController = TextEditingController();
+  final TextEditingController emailMobileController = TextEditingController();
-  TextEditingController countryController = TextEditingController();
+  // final TextEditingController emailController = TextEditingController();
-  TextEditingController mobileController = TextEditingController();
+  // TextEditingController countryController = TextEditingController();
+  // TextEditingController mobileController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
   bool _isCheckingToken = false;
   dynamic empMobileNo;
@@ -42,7 +43,7 @@ class _MyPhoneState extends State<MyHrLogin> {
   @override
   void initState() {
     print('vndbbcbdskbvkjs1');
-    countryController.text = "+91";
+    // countryController.text = "+91";
     super.initState();
     clearLocalStorageWhenStarts('initState');
   }
@@ -74,14 +75,30 @@ class _MyPhoneState extends State<MyHrLogin> {
           _isLoading = true;
         });
 
+        String input = emailMobileController.text.trim();
+
+        bool isEmail = RegExp(r'^[^@]+@[^@]+\.[^@]+$').hasMatch(input);
+        bool isMobile = RegExp(r'^[0-9]{10}$').hasMatch(input);
+
+        if (isEmail) {
+          setState(() {
+            isEmailFieldVisible = true;
+          });
+          print("User entered Email: $input");
+        } else if (isMobile) {
+          isEmailFieldVisible = false;
+          print("User entered Mobile: $input");
+        }
+
+
         // Determine the API and the payload based on the visible field
         String apiEndpoint = isEmailFieldVisible
             ? Environment.apiUrl + 'verifyHrWithEmail'
             : Environment.apiUrl + 'verifyHrWithMobileNumber';
 
         Map<String, dynamic> payload = isEmailFieldVisible
-            ? {'email': emailController.text}
+            ? {'email': emailMobileController.text}
-            : {'mobile_number': mobileController.text};
+            : {'mobile_number': emailMobileController.text};
 
         // var enteredMobileNumber = mobileController.text;
         final response = await http.post(
@@ -101,28 +118,28 @@ class _MyPhoneState extends State<MyHrLogin> {
                 await SharedPreferences.getInstance();
             if (isEmailFieldVisible) {
               print('isEmailFieldVisible $isEmailFieldVisible');
-              prefs.setString('empEmail', emailController.text);
+              prefs.setString('empEmail', emailMobileController.text);
-              print('${emailController.text}');
+              print('${emailMobileController.text}');
               ToastHelper.showSuccessToast(
-                  context, 'Verification code sent to ${emailController.text}');
+                  context, 'Verification code sent to ${emailMobileController.text}');
               Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => MyEmailVerify(
                     type: 'email',
-                    value: emailController.text.trim(), // Pass the phone number
+                    value: emailMobileController.text.trim(), // Pass the phone number
                   ),
                 ),
               );
             } else {
               ToastHelper.showSuccessToast(
-                  context, 'Verification code sent to ${emailController.text}');
+                  context, 'Verification code sent to ${emailMobileController.text}');
               Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => MyEmailVerify(
                     type: 'mobile',
-                    value: mobileController.text.trim(), // Pass the phone number
+                    value: emailMobileController.text.trim(), // Pass the phone number
                   ),
                 ),
               );
@@ -556,126 +573,95 @@ class _MyPhoneState extends State<MyHrLogin> {
                                     ),
                                     Column(
                                       children: [
-                                        isEmailFieldVisible
+                                        Container(
-                                            ? Container(
                                           height: 55,
-                                                margin: Responsive.isDesktop(
+                                          margin: Responsive.isDesktop(context)
-                                                        context)
+                                              ? const EdgeInsets.symmetric(horizontal: 150)
-                                                    ? EdgeInsets.symmetric(
+                                              : const EdgeInsets.symmetric(horizontal: 0),
-                                                        horizontal: 150)
-                                                    : EdgeInsets.symmetric(
-                                                        horizontal: 0),
                                           decoration: BoxDecoration(
-                                                  border: Border.all(
+                                            border: Border.all(width: 1, color: Colors.grey),
-                                                      width: 1,
+                                            borderRadius: BorderRadius.circular(10),
-                                                      color: Colors.grey),
-                                                  borderRadius:
-                                                      BorderRadius.circular(10),
                                           ),
                                           child: TextFormField(
-                                                  controller: emailController,
+                                              controller: emailMobileController,
-                                                  keyboardType: TextInputType
+                                              keyboardType: TextInputType.text,
-                                                      .emailAddress,
+                                              decoration: const InputDecoration(
-                                                  decoration: InputDecoration(
                                                 border: InputBorder.none,
-                                                    hintText:
+                                                hintText: "Email / Mobile Number ",
-                                                        "Enter your email",
+                                                contentPadding: EdgeInsets.symmetric(horizontal: 10),
-                                                    contentPadding:
-                                                        EdgeInsets.symmetric(
-                                                            horizontal: 10),
                                               ),
                                               validator: (value) {
-                                                    if (value == null ||
+                                                if (value == null || value.trim().isEmpty) {
-                                                        value.isEmpty) {
+                                                  return "Please enter email or mobile number";
-                                                      return 'Please enter your email';
                                                 }
-                                                    if (!RegExp(
+
-                                                            r'^[^@]+@[^@]+\.[^@]+')
+                                                String input = value.trim();
-                                                        .hasMatch(value)) {
+
-                                                      return 'Please enter a valid email';
+                                                // ❌ Reject all spaces
+                                                if (input.contains(' ')) {
+                                                  return "No spaces allowed";
                                                 }
+
+                                                final emailRegex = RegExp(r'^[^@]+@[^@]+\.[^@]+$');
+                                                final mobileRegex = RegExp(r'^[0-9]{10}$');
+
+                                                bool isEmailFormat = emailRegex.hasMatch(input);
+                                                bool isMobileFormat = mobileRegex.hasMatch(input);
+
+                                                // ---------------------------
+                                                // 🛑 MOBILE VALIDATION
+                                                // ---------------------------
+                                                if (RegExp(r'^[0-9]+$').hasMatch(input)) {
+                                                  if (input.length != 10) {
+                                                    return "Mobile number must be exactly 10 digits";
+                                                  }
+                                                }
+
+                                                // ---------------------------
+                                                // 🛑 EMAIL VALIDATION
+                                                // ---------------------------
+
+                                                // Reject anything that has '@' but is NOT a valid email format
+                                                if (input.contains('@') && !isEmailFormat) {
+                                                  return "Enter a valid email address";
+                                                }
+
+                                                // Reject email with extra digits at the end
+                                                if (input.contains('@') && RegExp(r'\d+$').hasMatch(input)) {
+                                                  return "Email cannot contain extra numbers";
+                                                }
+
+                                                // Reject email+mobile combination
+                                                if (input.contains('@') && RegExp(r'\d{10}$').hasMatch(input)) {
+                                                  return "Enter only email OR mobile number";
+                                                }
+
+                                                // ---------------------------
+                                                // 🛑 MIXED CONTENT (letters + digits but NOT email)
+                                                // ---------------------------
+                                                bool hasLetters = RegExp(r'[A-Za-z]').hasMatch(input);
+                                                bool hasDigits = RegExp(r'[0-9]').hasMatch(input);
+
+                                                if ((hasLetters && hasDigits) && !input.contains('@')) {
+                                                  return "Enter only email OR 10-digit mobile number";
+                                                }
+
+                                                // ---------------------------
+                                                // 🟢 FINAL CHECK
+                                                // ---------------------------
+                                                if (!isEmailFormat && !isMobileFormat) {
+                                                  return "Enter a valid email or 10-digit mobile number";
+                                                }
+
                                                 return null;
-                                                  },
-                                                ),
-                                              )
-                                            : Container(
-                                                height: 55,
-                                                margin: Responsive.isDesktop(
-                                                        context)
-                                                    ? EdgeInsets.symmetric(
-                                                        horizontal: 150)
-                                                    : EdgeInsets.symmetric(
-                                                        horizontal: 0),
-                                                decoration: BoxDecoration(
-                                                  border: Border.all(
-                                                      width: 1,
-                                                      color: Colors.grey),
-                                                  borderRadius:
-                                                      BorderRadius.circular(10),
-                                                ),
-                                                child: Row(
-                                                  children: [
-                                                    SizedBox(width: 10),
-                                                    SizedBox(
-                                                      width: 40,
-                                                      child: TextField(
-                                                        controller:
-                                                            countryController,
-                                                        keyboardType:
-                                                            TextInputType
-                                                                .number,
-                                                        decoration:
-                                                            InputDecoration(
-                                                          border:
-                                                              InputBorder.none,
-                                                        ),
-                                                      ),
-                                                    ),
-                                                    Text(
-                                                      "|",
-                                                      style: TextStyle(
-                                                          fontSize: 33,
-                                                          color: Colors.grey),
-                                                    ),
-                                                    SizedBox(width: 10),
-                                                    Expanded(
-                                                      child: TextFormField(
-                                                        controller:
-                                                            mobileController,
-                                                        keyboardType:
-                                                            TextInputType.phone,
-                                                        decoration:
-                                                            InputDecoration(
-                                                          border:
-                                                              InputBorder.none,
-                                                          hintText:
-                                                              "Enter your mobile number",
-                                                        ),
-                                                        validator: (value) {
-                                                          if (value == null ||
-                                                              value.isEmpty) {
-                                                            return 'Please enter your mobile number';
                                               }
-                                                          if (value.length !=
+
-                                                              10) {
-                                                            return 'Mobile number must be 10 digits';
-                                                          }
-                                                          return null;
-                                                        },
-                                                        inputFormatters: [
-                                                          FilteringTextInputFormatter
-                                                              .digitsOnly,
-                                                          LengthLimitingTextInputFormatter(
-                                                              10),
-                                                        ],
-                                                      ),
-                                                    ),
-                                                  ],
                                           ),
                                         ),
                                         SizedBox(height: 15),
                                         Container(
-                                          margin: Responsive.isDesktop(context)
+                                          margin: Responsive.isDesktop(
+                                              context)
                                               ? EdgeInsets.symmetric(
                                               horizontal: 150)
                                               : EdgeInsets.symmetric(
@@ -684,12 +670,15 @@ class _MyPhoneState extends State<MyHrLogin> {
                                             width: double.infinity,
                                             height: 45,
                                             child: ElevatedButton(
-                                              style: ElevatedButton.styleFrom(
+                                              style: ElevatedButton
+                                                  .styleFrom(
                                                 backgroundColor:
                                                 Color(0xFF00989E),
-                                                shape: RoundedRectangleBorder(
+                                                shape:
+                                                RoundedRectangleBorder(
                                                   borderRadius:
-                                                      BorderRadius.circular(10),
+                                                  BorderRadius
+                                                      .circular(10),
                                                 ),
                                               ),
                                               onPressed: _isLoading
@@ -703,34 +692,31 @@ class _MyPhoneState extends State<MyHrLogin> {
                                                   Color(0xFF00989E),
                                                 ),
                                               )
-                                                  : Text(
+                                                  : Text( "Login with Email / Mobile OTP",
-                                                      isEmailFieldVisible
+                                                style: GoogleFonts
-                                                          ? "Login with Email OTP"
+                                                    .poppins(
-                                                          : "Login with Mobile OTP",
+                                                  color: Color(
-                                                      style:
+                                                      0xFFFFFFFF),
-                                                          GoogleFonts.poppins(
-                                                        color:
-                                                            Color(0xFFFFFFFF),
                                                 ),
                                               ),
                                             ),
                                           ),
                                         ),
                                         SizedBox(height: 15),
-                                        MouseRegion(
+                                        // MouseRegion(
-                                          cursor: SystemMouseCursors.click,
+                                        //   cursor: SystemMouseCursors.click,
-                                          child: GestureDetector(
+                                        //   child: GestureDetector(
-                                            onTap: toggleField,
+                                        //     onTap: toggleField,
-                                            child: Text(
+                                        //     child: Text(
-                                              isEmailFieldVisible
+                                        //       isEmailFieldVisible
-                                                  ? "Login with Mobile No"
+                                        //           ? "Login with Mobile No"
-                                                  : "Login with Email",
+                                        //           : "Login with Email",
-                                              style: TextStyle(
+                                        //       style: TextStyle(
-                                                color: Color(0xFF00989E),
+                                        //         color: Color(0xFF00989E),
-                                              ),
+                                        //       ),
-                                            ),
+                                        //     ),
-                                          ),
+                                        //   ),
-                                        ),
+                                        // ),
                                       ],
                                     ),
                                     SizedBox(

lib/hrPolicyDetails.dart

@@ -174,6 +174,27 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
     }
   }
 
+  Future<void> getEcardDownload(String? empCode,String? empId,String? clientPolicyId,String? policyNo) async {
+    final eCarDParams = {
+      'id': empId,
+      'emp_code': empCode,
+      'client_policy_id': clientPolicyId,
+      'policy_no': policyNo
+    };
+    final response = await apiService.getEcardRequest(eCarDParams,widget.Token);
+    print('check 1');
+    final ecardDownloadUrl = response['data']['eCardDownload'];
+    final message = response['data']['message'];
+    if (ecardDownloadUrl != null) {
+      print('✅ Link: $ecardDownloadUrl');
+      await _launchURL(ecardDownloadUrl); // Only launch if status is success
+      // ToastHelper.showSuccessToast(context, message);
+    } else {
+      print('❌ Error: $message');
+      ToastHelper.showErrorToast(context, message);
+    }
+  }
+
   Future<void> _launchURL(String url) async {
     final Uri uri = Uri.parse(url); // Parse the URL properly
     print('_launchURL $uri');
@@ -933,7 +954,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                                     padding: const EdgeInsets.symmetric(horizontal: 4.0),
                                     child: GestureDetector(
                                       onTap: () {
-                                        _launchURL(item['ecard_download_link']);
+                                        getEcardDownload(item['emp_code'],item['employee_id'],item['client_policy_id'],item['policy_no']);
                                       },
                                       child: Container(
                                         height: 40,

lib/service/api_service.dart

@@ -612,6 +612,18 @@ class ApiService {
     }
   }
 
+  Future<Map<String, dynamic>> getEcardRequest(eCardParam,String token) async {
+    final url = Uri.parse('${Environment.apiUrlPost}ecardRequest');
+    final headers = {
+      'Authorization': 'Bearer $token' ?? '',
+      'Content-Type': 'application/json', // Ensure content type is JSON
+    };
+    final jsonBody = jsonEncode(eCardParam);
+    // Send formDataJson as the body
+    final response = await _makePostRequestWithoutFormData(url,jsonBody, headers);
+    return response;
+  }
+
   Future<Map<String, dynamic>> getCdTransactionData(
       String clintID, String insurerId, String cd_ac_pk, String token) async {
     print("getCashDepositDetailsToApi1");
@@ -638,6 +650,17 @@ class ApiService {
     return response;
   }
 
+  Future<Map<String, dynamic>> getSampleFileDownload(String token) async {
+    final url = Uri.parse(
+        '${Environment.apiUrl}downloadSampleExcel/enrollment');
+
+    final headers = {
+      'Authorization': 'Bearer $token' ?? '',
+    };
+    final response = await _makeGetRequest(url, headers);
+    return response;
+  }
+
   Future<Map<String, dynamic>> getEmployeeAndDependenceToApi(
       String clintID, String getPolicyNo, String empRefId, String token) async {
     print(_hrtoken);
@@ -754,6 +777,13 @@ class ApiService {
   //   return response;
   // }
 
+  Future<Map<String, dynamic>> _makePostRequestWithoutFormData(
+      Uri url, String body, Map<String, String> headers) async {
+
+    final response = await http.post(url, headers: headers, body: body);
+    return _handleResponse(response);
+  }
+
   Future<Map<String, dynamic>> _makeGetRequest(
       Uri url, Map<String, String> headers) async {
     final response = await http.get(url, headers: headers);

lib/service/hrDashboardTabs/activePolicies.dart

@@ -228,7 +228,7 @@ class _ActivePolicieState extends State<ActivePolicies> {
                       child: getCardArrays.isEmpty
                           ? Center(
                               child: Text(
-                                'No data found',
+                                'No Policy Mapping Found',
                                 style: TextStyle(
                                   fontSize: 16,
                                   color: Colors.grey.shade600,

lib/service/hrDashboardTabs/cd.dart

@@ -323,7 +323,7 @@ class _CdPolicieState extends State<CdPolicies> {
     if (filteredData.isEmpty) {
       return const SizedBox(
         height: 50,
-        child: Center(child: Text('No available data')),
+        child: Center(child: Text('No CD Accout Mapped')),
       );
     }