diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 878a1850..2f4607e0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -322,4 +322,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 -COCOAPODS: 1.10.1 +COCOAPODS: 1.10.0.rc.1 diff --git a/lib/core/viewModel/dashboard_view_model.dart b/lib/core/viewModel/dashboard_view_model.dart index 7d458fc7..f37a8feb 100644 --- a/lib/core/viewModel/dashboard_view_model.dart +++ b/lib/core/viewModel/dashboard_view_model.dart @@ -1,12 +1,14 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/home/dasboard_service.dart';import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; +import 'package:doctor_app_flutter/core/service/home/dasboard_service.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart'; +import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import '../../locator.dart'; +import 'authentication_view_model.dart'; import 'base_view_model.dart'; class DashboardViewModel extends BaseViewModel { @@ -17,7 +19,7 @@ class DashboardViewModel extends BaseViewModel { List get dashboardItemsList => _dashboardService.dashboardItemsList; - Future setFirebaseNotification(ProjectViewModel projectsProvider, AuthViewModel authProvider) async{ + Future setFirebaseNotification(ProjectViewModel projectsProvider, AuthenticationViewModel authProvider) async{ setState(ViewState.Busy); await projectsProvider.getDoctorClinicsList(); @@ -33,9 +35,7 @@ class DashboardViewModel extends BaseViewModel { _firebaseMessaging.getToken().then((String token) async { if (token != '') { DEVICE_TOKEN = token; - var request = await sharedPref.getObj(DOCTOR_PROFILE); - authProvider.insertDeviceImei(request).then((value) { - }); + authProvider.insertDeviceImei(); } }); } @@ -50,7 +50,7 @@ class DashboardViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future changeClinic(int clinicId, AuthViewModel authProvider) async { + Future changeClinic(int clinicId, AuthenticationViewModel authProvider) async { setState(ViewState.BusyLocal); await getDoctorProfile(); ProfileReqModel docInfo = new ProfileReqModel( @@ -60,14 +60,11 @@ class DashboardViewModel extends BaseViewModel { projectID: doctorProfile.projectID, tokenID: '', languageID: 2); - - await authProvider.getDocProfiles(docInfo.toJson()).then((res) async { - sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]); - setState(ViewState.Idle); - }).catchError((err) { - error = err; - setState(ViewState.ErrorLocal); - }); + ClinicModel clinicModel = ClinicModel(doctorID:doctorProfile.doctorID,clinicID: doctorProfile.clinicID, projectID: doctorProfile.projectID,); + await authProvider.getDoctorProfileBasedOnClinic(clinicModel); + if(authProvider.state == ViewState.ErrorLocal) { + error = authProvider.error; + } } getPatientCount(DashboardModel inPatientCount) { diff --git a/lib/locator.dart b/lib/locator.dart index a2c77373..4cb18514 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -1,13 +1,6 @@ import 'package:doctor_app_flutter/core/service/authentication_service.dart'; -import 'package:doctor_app_flutter/core/service/dasboard_service.dart'; -import 'package:doctor_app_flutter/core/service/medical_file_service.dart'; -import 'package:doctor_app_flutter/core/service/patient_service.dart'; -import 'package:doctor_app_flutter/core/service/prescription_service.dart'; -import 'package:doctor_app_flutter/core/service/procedure_service.dart'; -import 'package:doctor_app_flutter/core/service/sickleave_service.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/hospitals_view_model.dart'; -import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; @@ -15,7 +8,6 @@ import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:get_it/get_it.dart'; -import 'core/service/home/auth_service.dart'; import 'core/service/home/dasboard_service.dart'; import 'core/service/patient/DischargedPatientService.dart'; import 'core/service/patient/patient_service.dart'; diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index 4edb0f44..0ec7f5ee 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -174,14 +174,14 @@ class _VerificationMethodsScreenState extends State { AppText( authenticationViewModel.user.editedOn != null - ? DateUtils.getDayMonthYearDateFormatted( - DateUtils.convertStringToDate( + ? AppDateUtils.getDayMonthYearDateFormatted( + AppDateUtils.convertStringToDate( authenticationViewModel.user .editedOn)) : authenticationViewModel.user.createdOn != null - ? DateUtils.getDayMonthYearDateFormatted( - DateUtils.convertStringToDate(authenticationViewModel.user + ? AppDateUtils.getDayMonthYearDateFormatted( + AppDateUtils.convertStringToDate(authenticationViewModel.user .createdOn)) : '--', textAlign: @@ -193,14 +193,14 @@ class _VerificationMethodsScreenState extends State { AppText( authenticationViewModel.user.editedOn != null - ? DateUtils.getHour( - DateUtils.convertStringToDate( + ? AppDateUtils.getHour( + AppDateUtils.convertStringToDate( authenticationViewModel.user .editedOn)) : authenticationViewModel.user.createdOn != null - ? DateUtils.getHour( - DateUtils.convertStringToDate(authenticationViewModel.user + ? AppDateUtils.getHour( + AppDateUtils.convertStringToDate(authenticationViewModel.user .createdOn)) : '--', textAlign: diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index b7125e21..2827a421 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -44,7 +44,6 @@ class HomeScreen extends StatefulWidget { } class _HomeScreenState extends State { - final FirebaseMessaging _firebaseMessaging = FirebaseMessaging(); bool isLoading = false; ProjectViewModel projectsProvider; var _isInit = true; @@ -53,11 +52,11 @@ class _HomeScreenState extends State { bool isInpatient = false; int sliderActiveIndex = 0; var clinicId; + AuthenticationViewModel authenticationViewModel; @override Widget build(BuildContext context) { ProjectViewModel projectsProvider = Provider.of(context); - AuthViewModel authProvider = Provider.of(context); authenticationViewModel = Provider.of(context); FocusScopeNode currentFocus = FocusScope.of(context); @@ -67,7 +66,7 @@ class _HomeScreenState extends State { return BaseView( onModelReady: (model) async { - await model.setFirebaseNotification(projectsProvider, authProvider); + await model.setFirebaseNotification(projectsProvider, authenticationViewModel); await model.getDashboard(); }, builder: (_, model, w) => AppScaffold( @@ -178,7 +177,7 @@ class _HomeScreenState extends State { GifLoaderDialogUtils.showMyDialog( context); await model.changeClinic( - newValue, authProvider); + newValue, authenticationViewModel); GifLoaderDialogUtils.hideDialog( context); if (model.state ==