From a5f64798e0a7b3578e52f00ba58d8e6760dce32f Mon Sep 17 00:00:00 2001 From: Sultan khan Date: Wed, 10 Sep 2025 16:34:28 +0300 Subject: [PATCH] login fixes --- .../authentication/authentication_view_model.dart | 9 ++++++--- lib/presentation/lab/lab_orders_page.dart | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart index c82037f..505391d 100644 --- a/lib/features/authentication/authentication_view_model.dart +++ b/lib/features/authentication/authentication_view_model.dart @@ -191,7 +191,7 @@ class AuthenticationViewModel extends ChangeNotifier { (failure) async { // LoadingUtils.hideFullScreenLoader(); // await _errorHandlerService.handleError(failure: failure); - LoadingUtils.hideFullScreenLoader(); + LoaderBottomSheet.hideLoader(); _navigationService.pushPage(page: LoginScreen()); }, (apiResponse) { @@ -238,6 +238,7 @@ class AuthenticationViewModel extends ChangeNotifier { _navigationService.pushPage(page: SavedLogin()); // _navigationService.pushPage(page: LoginScreen()); } else { + print("print login........"); LoaderBottomSheet.hideLoader(); _navigationService.pushPage(page: LoginScreen()); } @@ -451,8 +452,9 @@ class AuthenticationViewModel extends ChangeNotifier { bool isUserAgreedBefore = await checkIfUserAgreedBefore(request: request); //updating the last login type in app state to show the fingerprint/face id option on home screen - _appState.getSelectDeviceByImeiRespModelElement!.logInType = loginTypeEnum.toInt; - + if( _appState.getSelectDeviceByImeiRespModelElement !=null) { + _appState.getSelectDeviceByImeiRespModelElement!.logInType = loginTypeEnum.toInt; + } LoaderBottomSheet.hideLoader(); insertPatientIMEIData(loginTypeEnum.toInt); clearDefaultInputValues(); @@ -738,6 +740,7 @@ class AuthenticationViewModel extends ChangeNotifier { deviceTypeId: _appState.getDeviceTypeID(), patientId: _appState.getAuthenticatedUser()!.patientId!, patientIdentificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!, + identificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!, firstName: _appState.getAuthenticatedUser()!.firstName!, lastName: _appState.getAuthenticatedUser()!.lastName!, patientTypeId: _appState.getAuthenticatedUser()!.patientType, diff --git a/lib/presentation/lab/lab_orders_page.dart b/lib/presentation/lab/lab_orders_page.dart index cf90fd8..0391f6a 100644 --- a/lib/presentation/lab/lab_orders_page.dart +++ b/lib/presentation/lab/lab_orders_page.dart @@ -14,7 +14,6 @@ import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart'; -import 'package:hmg_patient_app_new/presentation/lab/collapse_example.dart'; import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart'; import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart'; import 'package:hmg_patient_app_new/theme/colors.dart';