From 46760ffc778073a5380c2cf8297c93c2389c81c2 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 26 Apr 2022 10:38:27 +0300 Subject: [PATCH] session management update --- lib/core/model/auth/insert_imei_model.dart | 8 ++++++-- lib/core/viewModel/authentication_view_model.dart | 13 ++++++++----- lib/core/viewModel/dashboard_view_model.dart | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/core/model/auth/insert_imei_model.dart b/lib/core/model/auth/insert_imei_model.dart index e779da77..dfc15bd9 100644 --- a/lib/core/model/auth/insert_imei_model.dart +++ b/lib/core/model/auth/insert_imei_model.dart @@ -32,6 +32,8 @@ class InsertIMEIDetailsModel { String vidaAuthTokenID; String vidaRefreshTokenID; dynamic password; + int loginDoctorID; + InsertIMEIDetailsModel( {this.iMEI, @@ -66,7 +68,7 @@ class InsertIMEIDetailsModel { this.patientOutSA, this.vidaAuthTokenID, this.vidaRefreshTokenID, - this.password}); + this.password, this.loginDoctorID}); InsertIMEIDetailsModel.fromJson(Map json) { iMEI = json['IMEI']; @@ -102,7 +104,7 @@ class InsertIMEIDetailsModel { vidaAuthTokenID = json['VidaAuthTokenID']; vidaRefreshTokenID = json['VidaRefreshTokenID']; password = json['Password']; - } + loginDoctorID = json['LoginDoctorID']; } Map toJson() { final Map data = new Map(); @@ -139,6 +141,8 @@ class InsertIMEIDetailsModel { data['VidaAuthTokenID'] = this.vidaAuthTokenID; data['VidaRefreshTokenID'] = this.vidaRefreshTokenID; data['Password'] = this.password; + data['LoginDoctorID'] = this.loginDoctorID; + return data; } } diff --git a/lib/core/viewModel/authentication_view_model.dart b/lib/core/viewModel/authentication_view_model.dart index af0c0cb3..da166bd6 100644 --- a/lib/core/viewModel/authentication_view_model.dart +++ b/lib/core/viewModel/authentication_view_model.dart @@ -102,9 +102,9 @@ class AuthenticationViewModel extends BaseViewModel { insertIMEIDetailsModel.titleDescriptionN = profileInfo['Title_DescriptionN']; insertIMEIDetailsModel.projectID = await sharedPref.getInt(PROJECT_ID); - // insertIMEIDetailsModel.doctorID = loggedIn != null - // ? loggedIn['List_MemberInformation'][0]['MemberID'] - // : user.doctorID; + insertIMEIDetailsModel.doctorID = loggedIn != null + ? loggedIn['List_MemberInformation'][0]['MemberID'] + : user.doctorID; insertIMEIDetailsModel.outSA = loggedIn != null ? loggedIn['PatientOutSA'] : user.outSA; insertIMEIDetailsModel.vidaAuthTokenID = @@ -112,6 +112,7 @@ class AuthenticationViewModel extends BaseViewModel { insertIMEIDetailsModel.vidaRefreshTokenID = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID); insertIMEIDetailsModel.password = userInfo.password; + insertIMEIDetailsModel.loginDoctorID = loggedUser.listMemberInformation[0].employeeID; await _authService.insertDeviceImei(insertIMEIDetailsModel); if (_authService.hasError) { @@ -147,7 +148,8 @@ class AuthenticationViewModel extends BaseViewModel { iMEI: user.iMEI, facilityId: user.projectID, memberID: user.doctorID, - loginDoctorID: int.parse(user.editedBy.toString()), + //TODO Elham* return it dynamic + loginDoctorID: 4709,//int.parse(user.editedBy.toString()), zipCode: user.outSA == true ? '971' : '966', mobileNumber: user.mobile, oTPSendType: authMethodType.getTypeIdService(), @@ -210,7 +212,8 @@ class AuthenticationViewModel extends BaseViewModel { : user.projectID.toString(), oTPSendType: await sharedPref.getInt(OTP_TYPE), iMEI: localToken, - loginDoctorID: loggedUser.listMemberInformation[0].employeeID, + loginDoctorID: loggedUser != null ? loggedUser.listMemberInformation[0].employeeID + : int.parse(user.editedBy),///loggedUser.listMemberInformation[0].employeeID, // loggedUser.listMemberInformation[0].employeeID, isForSilentLogin: isSilentLogin, generalid: "Cs2020@2016\$2958"); diff --git a/lib/core/viewModel/dashboard_view_model.dart b/lib/core/viewModel/dashboard_view_model.dart index 0343eaa4..82de3ca3 100644 --- a/lib/core/viewModel/dashboard_view_model.dart +++ b/lib/core/viewModel/dashboard_view_model.dart @@ -59,7 +59,8 @@ class DashboardViewModel extends BaseViewModel { _firebaseMessaging.getToken().then((String token) async { if (token != '') { // DEVICE_TOKEN = token; - authProvider.insertDeviceImei(token); + ///TODO Elham* return back + // authProvider.insertDeviceImei(token); } }); }