changes

lib/branch/branch_selection_page.dart

@@ -5,6 +5,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../customAppBar/customAppBar.dart';
 import '../customAppBar/customFooter.dart';
 import '../customAppBar/toastHelper.dart';
+import '../service/session/web_session.dart';
 import '../service/token_storage_service.dart';
 import 'branch_card_widget.dart';
 
@@ -51,6 +52,7 @@ class _BranchSelectionPageState extends State<BranchSelectionPage> {
 
     final selectedBranch = branches[selectedIndex!];
 
+
     // Save selected branch and decode token
     await tokenStorage.saveSelectedBranch(selectedBranch);
 
@@ -59,6 +61,8 @@ class _BranchSelectionPageState extends State<BranchSelectionPage> {
     print('Selected Branch: $selectedBranch');
     print('Decoded Token: $decodedToken');
 
+
+
     // Navigate to home
     if (mounted) {
       final SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -119,8 +123,37 @@ class _BranchSelectionPageState extends State<BranchSelectionPage> {
       ToastHelper.showSuccessToast(context, 'Successfully Login');
       Navigator.pushReplacementNamed(context, 'hrDashboard');
     }
+
+    // final branch = branches[selectedIndex!];
+    // // =====================
+    // // POST (HR)
+    // // =====================
+    // WebSession.postClientId = branch['client_id']?.toString();
+    // WebSession.postBranchId =
+    //     branch['post_branch_id']?.toString() ??
+    //         branch['client_branch_id']?.toString();
+    // WebSession.postHrId = branch['id']?.toString();
+    // WebSession.postModules =
+    //     branch['allowed_modules']?['post'] ?? [];
+    //
+    // // =====================
+    // // PRE (Enrollment)
+    // // =====================
+    // WebSession.preClientId = branch['client_id']?.toString();
+    // WebSession.preBranchId =
+    //     branch['pre_branch_id']?.toString() ??
+    //         branch['client_branch_id']?.toString();
+    // WebSession.preHrId = branch['id']?.toString();
+    // WebSession.preModules =
+    //     branch['allowed_modules']?['pre'] ?? [];
+    //
+    // ToastHelper.showSuccessToast(context, 'Successfully Login');
+    //
+    // if (!mounted) return;
+    // Navigator.pushReplacementNamed(context, 'hrDashboard');
   }
 
+
   @override
   Widget build(BuildContext context) {
     final screenHeight = MediaQuery.of(context).size.height;

lib/customAppBar/customAppBar.dart

@@ -5,6 +5,8 @@ import 'package:nhancepolicy/responsive.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:nhancepolicy/responsive.dart';
 
+import '../service/api_service.dart';
+
 class CustomAppBar extends StatefulWidget implements PreferredSizeWidget {
   @override
   _CustomAppBarState createState() => _CustomAppBarState();
@@ -15,22 +17,25 @@ class CustomAppBar extends StatefulWidget implements PreferredSizeWidget {
 
 class _CustomAppBarState extends State<CustomAppBar> {
   bool showBackToHR = false;
+  late ApiService apiService;
   // bool isLoading = true; // Add a loading state
   // bool hideInactiveStatus = true;
 
   @override
   void initState() {
     super.initState();
+    apiService = ApiService(context);
     // _checkTokens();
   }
 
   Future<void> logout(BuildContext context) async {
-    final prefs = await SharedPreferences.getInstance();
+    // final prefs = await SharedPreferences.getInstance();
     // final String? hrtoken = prefs.getString('_postToken');
     // final String? token = prefs.getString('enrollToken');
-    prefs.clear();
+    // prefs.clear();
     print('LocalStorage Cleared');
-    Navigator.pushNamed(context, 'hrLogin');
+    apiService.logout();
+    // Navigator.pushNamed(context, 'hrLogin');
   }
 
   @override

lib/email_verify.dart

@@ -118,6 +118,22 @@ class _MyEmailVerifyState extends State<MyEmailVerify> {
         Map<String, dynamic> data = json.decode(response.body);
         print('Response data: $data');
 
+        final String mainStatus = data['status'] ?? 'failed';
+        final Map<String, dynamic> postEnrollment1 =
+            data['post_enrollment'] ?? {};
+
+        final String postStatus =
+            postEnrollment1['status'] ?? 'failed';
+
+        /// ❌ BLOCK if BOTH failed
+        if (mainStatus != 'success' && postStatus != 'success') {
+          ToastHelper.showErrorToast(
+            context,
+            postEnrollment1['message'] ?? 'User not found',
+          );
+          return;
+        }
+
         // ✅ Safely extract preEnrollmentData
         List<dynamic> preEnrollmentData = [];
         if (data['data'] is List) {

lib/hrDashboard.dart

@@ -515,7 +515,7 @@ class _hrDashboardState extends State<hrDashboard>
             child: Text("Cancel"),
           ),
           TextButton(
-            onPressed: () => Navigator.of(context).pop(true),
+            onPressed: () => apiService.logout(),
             child: Text("Logout"),
           ),
         ],