Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page

Conflicts: lib/pages/BookAppointment/components/DocAvailableAppointments.dart lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
4 years ago · 124d388ee1
parent 64f970c40c 625e40d7bf
commit 124d388ee1
2 changed files with 2 additions and 2 deletions
--- a/lib/core/service/AuthenticatedUserObject.dart
+++ b/lib/core/service/AuthenticatedUserObject.dart
@ -23,6 +23,5 @@ class AuthenticatedUserObject {

  logout() async {
    isLogin = false;
-    var asd ="";
  }
 }
--- a/lib/pages/login/login.dart
+++ b/lib/pages/login/login.dart
@ -221,7 +221,8 @@ class _Login extends State<Login> {
          this.sharedPref.setObject(USER_PROFILE, result.list),
          this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
          this.sharedPref.setString(TOKEN, result.authenticationTokenID),
-
+          authenticatedUserObject.isLogin = true,
+      appointmentRateViewModel.isLogin =true,
          appointmentRateViewModel
              .getIsLastAppointmentRatedList()
              .then((value) => {