diff --git a/lib/core/viewModels/base_view_model.dart b/lib/core/viewModels/base_view_model.dart index 46a36c27..98fb0b17 100644 --- a/lib/core/viewModels/base_view_model.dart +++ b/lib/core/viewModels/base_view_model.dart @@ -29,9 +29,9 @@ class BaseViewModel extends ChangeNotifier { if (hasListeners) notifyListeners(); } - setUser(AuthenticatedUser user, {bool notify = true}) { + setUser(AuthenticatedUser user) { this.user = user; - if (notify) notifyListeners(); + notifyListeners(); } BaseViewModel() { diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index daf7a650..f83945f8 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -484,16 +484,15 @@ class _MyFamily extends State with TickerProviderStateMixin { this.sharedPref.setString(BLOOD_TYPE, bloodType); this.sharedPref.setString(APP_LANGUAGE, currentLang); this.sharedPref.setInt(LAST_LOGIN, loginType); - this.sharedPref.setObject(MAIN_USER, mainUser); - this.sharedPref.setObject(USER_PROFILE, result.list); - this.sharedPref.setObject(FAMILY_FILE, familyFile); - this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID); - this.sharedPref.setString(TOKEN, result.authenticationTokenID); + await this.sharedPref.setObject(MAIN_USER, mainUser); + await this.sharedPref.setObject(USER_PROFILE, result.list); + await this.sharedPref.setObject(FAMILY_FILE, familyFile); + await this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID); + await this.sharedPref.setString(TOKEN, result.authenticationTokenID); _vitalSignService.heightCm = ""; _vitalSignService.weightKg = ""; - await authenticatedUserObject.getUser(getUser: true); - Provider.of(AppGlobal.context, listen: false).user = authenticatedUserObject.user; - Provider.of(AppGlobal.context, listen: false).setUser(authenticatedUserObject.user); + Provider.of(AppGlobal.context, listen: false).user = result.list; + Provider.of(AppGlobal.context, listen: false).setUser(result.list); try { // await appointmentRateViewModel.getIsLastAppointmentRatedList(); diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index 95e88ed5..c3b7f0ca 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -90,8 +90,8 @@ class _HomePageFragment2State extends State { }, child: LoggedSliderView( projectViewModel, - new SliderData(TranslationBase.of(context).fileno + ": " + projectViewModel.user.patientID.toString(), projectViewModel.user.firstName + ' ' + projectViewModel.user.lastName, - "", bannerColor[0].darkColor, bannerColor[0].lightColor), + new SliderData(TranslationBase.of(context).fileno + ": " + (projectViewModel.user?.patientID?.toString() ?? ""), + projectViewModel.user.firstName + ' ' + (projectViewModel.user?.lastName ?? ""), "", bannerColor[0].darkColor, bannerColor[0].lightColor), widget.model, ), ), diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 5375e97d..1cf83827 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -589,15 +589,14 @@ class _AppDrawerState extends State { this.sharedPref.setString(APP_LANGUAGE, currentLang); this.sharedPref.setString(BLOOD_TYPE, bloodType); this.sharedPref.setInt(LAST_LOGIN, loginType); - this.sharedPref.setObject(MAIN_USER, mainUser); - this.sharedPref.setObject(USER_PROFILE, result.list); - this.sharedPref.setObject(FAMILY_FILE, familyFile); - this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID); - this.sharedPref.setString(TOKEN, result.authenticationTokenID); + await this.sharedPref.setObject(MAIN_USER, mainUser); + await this.sharedPref.setObject(USER_PROFILE, result.list); + await this.sharedPref.setObject(FAMILY_FILE, familyFile); + await this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID); + await this.sharedPref.setString(TOKEN, result.authenticationTokenID); // Navigator.of(context).pop(); - await authenticatedUserObject.getUser(getUser: true); - Provider.of(context, listen: false).user = authenticatedUserObject.user; - Provider.of(context, listen: false).setUser(authenticatedUserObject.user); + Provider.of(context, listen: false).user = result.list; + Provider.of(context, listen: false).setUser(result.list); // await pharmacyModuleViewModel.generatePharmacyToken(); _vitalSignService.heightCm = ""; _vitalSignService.weightKg = "";