From f8123b688edd8cd9ac005995ca0c707d3e678439 Mon Sep 17 00:00:00 2001 From: SurendarSuri30 Date: Thu, 23 Oct 2025 10:45:18 +0530 Subject: [PATCH] client logo issue fix --- lib/pages/email_verify.dart | 8 +++--- lib/pages/enrollment/addons.dart | 15 +++++----- lib/pages/enrollment/empDetails.dart | 28 ++++++++++++------- lib/pages/enrollment/empReview.dart | 15 +++++----- lib/pages/enrollment/service/api_service.dart | 9 ++++-- lib/pages/postEnrollment/home.dart | 5 ++++ lib/pages/service/data_manager.dart | 2 +- 7 files changed, 50 insertions(+), 32 deletions(-) diff --git a/lib/pages/email_verify.dart b/lib/pages/email_verify.dart index f8194cf..195fa83 100755 --- a/lib/pages/email_verify.dart +++ b/lib/pages/email_verify.dart @@ -371,7 +371,7 @@ class _MyEmailVerifyState extends State { // // print('Successfully Login'); // } - + // getClientLogoAndDetails(); // Redirect to another page } @@ -664,9 +664,9 @@ class _MyEmailVerifyState extends State { if (data.containsKey('data')) { dynamic clientDetails = data['data']; final SharedPreferences prefs = await SharedPreferences.getInstance(); - prefs.setString('clientLogo', clientDetails['client']['client_logo']); - prefs.setString('clientName', clientDetails['client']['client_name']); - prefs.setString( + await prefs.setString('clientLogo', clientDetails['client']['client_logo']); + await prefs.setString('clientName', clientDetails['client']['client_name']); + await prefs.setString( 'addon_subheading', clientDetails['client']['addon_subheading']); setState(() { // dynamic clientDetails = data['data']; diff --git a/lib/pages/enrollment/addons.dart b/lib/pages/enrollment/addons.dart index 8c2a189..dc99640 100755 --- a/lib/pages/enrollment/addons.dart +++ b/lib/pages/enrollment/addons.dart @@ -285,14 +285,15 @@ class _addOnsDetailsState extends State { Future getClientLogoAndDetails() async { try { - if (enrollmentClient_id == null || - enrollmentEmpCodeString == null || - enrollmentEmpClientBranchId == null) { - return; - } - final response = await apiService.getClientLogoAndDetailsToApi( + // if (enrollmentClient_id == null || + // enrollmentEmpCodeString == null || + // enrollmentEmpClientBranchId == null) { + // return; + // } + final empClientId = await session.client_id; + final empClientBranchId = await session.empClientBranchId; + final response = await apiService.getClientLogoAndDetailsToApi(empClientId,empClientBranchId, enrollmentClient_id!, - enrollmentEmpCodeString!, enrollmentEmpClientBranchId!); if (response['status'] == 'success') { if (response.containsKey('data')) { diff --git a/lib/pages/enrollment/empDetails.dart b/lib/pages/enrollment/empDetails.dart index 606328c..fd24c4d 100755 --- a/lib/pages/enrollment/empDetails.dart +++ b/lib/pages/enrollment/empDetails.dart @@ -156,10 +156,16 @@ class _empDetailsState extends State { selfEmpStatus = prefs.getString('selfEmpStatus'); print('client_id : $enrollmentClient_id'); - if (prefs.containsKey('clientLogo') && prefs.containsKey('clientName')) { - clientLogo = prefs.getString('clientLogo'); - clientName = prefs.getString('clientName'); + final logo = await prefs.getString('clientLogo'); + final name = await prefs.getString('clientName'); + + if (logo != null && logo.isNotEmpty && name != null && name.isNotEmpty) { + setState(() { + clientLogo = prefs.getString('clientLogo'); + clientName = prefs.getString('clientName'); + }); } else { + print('getClientLogoAndDetails()'); getClientLogoAndDetails(); } @@ -216,14 +222,16 @@ class _empDetailsState extends State { Future getClientLogoAndDetails() async { try { - if (enrollmentClient_id == null || - enrollmentEmpCodeString == null || - enrollmentEmpClientBranchId == null) { - return; - } - final response = await apiService.getClientLogoAndDetailsToApi( + final SharedPreferences prefs = await SharedPreferences.getInstance(); + final empClientId = await session.client_id; + final empClientBranchId = await session.empClientBranchId; + // if (enrollmentClient_id == null || + // enrollmentEmpCodeString == null || + // enrollmentEmpClientBranchId == null) { + // return; + // } + final response = await apiService.getClientLogoAndDetailsToApi(empClientId,empClientBranchId, enrollmentClient_id!, - enrollmentEmpCodeString!, enrollmentEmpClientBranchId!); print('check 1'); diff --git a/lib/pages/enrollment/empReview.dart b/lib/pages/enrollment/empReview.dart index 78c3588..f0e4aea 100755 --- a/lib/pages/enrollment/empReview.dart +++ b/lib/pages/enrollment/empReview.dart @@ -373,14 +373,15 @@ class _empReviewDetailsState extends State { Future getClientLogoAndDetails() async { try { - if (enrollmentClient_id == null || - enrollmentEmpCodeString == null || - enrollmentEmpClientBranchId == null) { - return; - } - final response = await apiService.getClientLogoAndDetailsToApi( + // if (enrollmentClient_id == null || + // enrollmentEmpCodeString == null || + // enrollmentEmpClientBranchId == null) { + // return; + // } + final empClientId = await session.client_id; + final empClientBranchId = await session.empClientBranchId; + final response = await apiService.getClientLogoAndDetailsToApi(empClientId,empClientBranchId, enrollmentClient_id!, - enrollmentEmpCodeString!, enrollmentEmpClientBranchId!); if (response['status'] == 'success') { if (response.containsKey('data')) { diff --git a/lib/pages/enrollment/service/api_service.dart b/lib/pages/enrollment/service/api_service.dart index 4e3d35c..f40715f 100755 --- a/lib/pages/enrollment/service/api_service.dart +++ b/lib/pages/enrollment/service/api_service.dart @@ -20,14 +20,17 @@ class ApiService { _token = await TokenService.getPreToken(); } - Future> getClientLogoAndDetailsToApi( - String clientId, String empCode, String branchID) async { + Future> getClientLogoAndDetailsToApi(empClientId,empClientBranchId, + String clientId, String branchID) async { print(_token); if (_token == null) { await _initializeToken(); } + // final SharedPreferences prefs = await SharedPreferences.getInstance(); + // final empClientId = await prefs.getString('empClientId'); + // final empClientBranchId = await prefs.getString('empClientBranchId'); final url = Uri.parse( - '${Environment.apiUrlEnrollment}getClientDetails?client_id=$clientId&emp_code=$empCode&client_branch_id=$branchID'); + '${Environment.apiUrlEnrollment}getClientDetails?post_client_id=$empClientId&post_branch_id=$empClientBranchId&pre_client_id=$clientId&pre_branch_id=$branchID'); final headers = { 'Authorization': 'Bearer $_token' ?? '', }; diff --git a/lib/pages/postEnrollment/home.dart b/lib/pages/postEnrollment/home.dart index 825cbd7..75db39e 100755 --- a/lib/pages/postEnrollment/home.dart +++ b/lib/pages/postEnrollment/home.dart @@ -88,7 +88,12 @@ class _HomeState extends State { // 🔹 Load ads // dataManager.loadAdvertisementImages(); + if(kIsWeb){ + getAdvertisementSliderImage(); + } else { advertisementImages = DataManager().advertisementImages; + } + print('starts'); print(advertisementImages); print('Ends'); diff --git a/lib/pages/service/data_manager.dart b/lib/pages/service/data_manager.dart index 3ae069f..8a96432 100644 --- a/lib/pages/service/data_manager.dart +++ b/lib/pages/service/data_manager.dart @@ -49,7 +49,7 @@ class DataManager extends ChangeNotifier { final response = await _apiService.getAdvertisementImageToApi(); if (response['status'] == 'success') { - _advertisementImages = List.from(response['data']); + _advertisementImages = await List.from(response['data']); _adsLoaded = true; notifyListeners(); debugPrint("✅ Advertisement images loaded: $_advertisementImages");