From 64dbcce06fa595c5259b488fd6a11bda2c9b53fc Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Sun, 13 Dec 2020 11:52:16 +0200 Subject: [PATCH 1/2] finish and remove patient provider --- lib/main.dart | 3 - lib/providers/patients_provider.dart | 282 ------------------ lib/screens/QR_reader_screen.dart | 4 +- ...t_patient_prescription_details_screen.dart | 5 +- lib/screens/patients/patients_screen.dart | 159 +++++----- .../profile/insurance_approvals_screen.dart | 3 - .../profile/lab_result/lab_orders_screen.dart | 1 - .../profile/patient_orders_screen.dart | 2 - .../prescriptions/prescriptions_screen.dart | 5 - .../profile/radiology/radiology_screen.dart | 8 +- .../profile/refer_patient_screen.dart | 1 - .../vital_sign/vital_sign_details_screen.dart | 3 - .../vital_sign_item_details_screen.dart | 2 +- lib/widgets/auth/show_timer_text.dart | 3 +- .../profile/Profile_general_info_Widget.dart | 3 - 15 files changed, 85 insertions(+), 399 deletions(-) delete mode 100644 lib/providers/patients_provider.dart diff --git a/lib/main.dart b/lib/main.dart index 1202c319..4a431d64 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -9,7 +9,6 @@ import 'package:provider/provider.dart'; import './config/size_config.dart'; import './providers/auth_provider.dart'; import './providers/hospital_provider.dart'; -import './providers/patients_provider.dart'; import './routes.dart'; import 'config/config.dart'; import 'locator.dart'; @@ -30,8 +29,6 @@ class MyApp extends StatelessWidget { SizeConfig().init(constraints, orientation); return MultiProvider( providers: [ - ChangeNotifierProvider( - create: (context) => PatientsProvider()), ChangeNotifierProvider( create: (context) => AuthProvider()), ChangeNotifierProvider( diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart deleted file mode 100644 index a562790c..00000000 --- a/lib/providers/patients_provider.dart +++ /dev/null @@ -1,282 +0,0 @@ - -import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; -import 'package:doctor_app_flutter/models/patient/get_clinic_by_project_id_request.dart'; -import 'package:doctor_app_flutter/models/patient/get_doctor_by_clinic_id_request.dart'; -import 'package:doctor_app_flutter/models/patient/get_list_stp_referral_frequency_request.dart'; -import 'package:doctor_app_flutter/models/patient/lab_orders/lab_orders_res_model.dart'; -import 'package:doctor_app_flutter/models/patient/lab_result/lab_result.dart'; -import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; -import 'package:doctor_app_flutter/models/patient/prescription/prescription_report.dart'; -import 'package:doctor_app_flutter/models/patient/prescription/prescription_report_for_in_patient.dart'; -import 'package:doctor_app_flutter/models/patient/prescription/prescription_res_model.dart'; -import 'package:doctor_app_flutter/models/patient/radiology/radiology_res_model.dart'; -import 'package:doctor_app_flutter/models/patient/refer_to_doctor_request.dart'; -import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; -import 'package:flutter/cupertino.dart'; - -import '../config/config.dart'; -import '../models/patient/lab_orders/lab_orders_res_model.dart'; -import '../models/patient/patiant_info_model.dart'; -import '../models/patient/patient_model.dart'; -import '../models/patient/prescription/prescription_res_model.dart'; -import '../models/patient/radiology/radiology_res_model.dart'; -import '../models/patient/vital_sign/vital_sign_res_model.dart'; -import '../util/helpers.dart'; - -Helpers helpers = Helpers(); -DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); - -class PatientsProvider with ChangeNotifier { - bool isLoading = false; - bool isError = false; - String error = ''; - List patientVitalSignList = []; - List patientVitalSignOrderdSubList = []; - List patientLabResultOrdersList = []; - List patientPrescriptionsList = []; - List patientRadiologyList = []; - List prescriptionReportForInPatientList = []; - List prescriptionReport = []; - BaseAppClient baseAppClient = BaseAppClient(); - - /*@author: ibrahe albitar - *@Date:2/6/2020 - *@desc: getPatientPrescriptions - */ - - List labResultList = []; - - var patientProgressNoteList = []; - var insuranceApporvalsList = []; - - var doctorsList = []; - var clinicsList = []; - var referalFrequancyList = []; - - DoctorsByClinicIdRequest _doctorsByClinicIdRequest = - DoctorsByClinicIdRequest(); - STPReferralFrequencyRequest _referralFrequencyRequest = - STPReferralFrequencyRequest(); - ClinicByProjectIdRequest _clinicByProjectIdRequest = - ClinicByProjectIdRequest(); - ReferToDoctorRequest _referToDoctorRequest; - - PatiantInformtion _selectedPatient; - - Future getPatientList(PatientModel patient, patientType) async { - int val = int.parse(patientType); - - try { - dynamic localRes; - await baseAppClient.post(GET_PATIENT + SERVICES_PATIANT[val], - onSuccess: (dynamic response, int statusCode) { - localRes = response; - }, onFailure: (String error, int statusCode) { - throw error; - }, body: { - "ProjectID": patient.ProjectID, - "ClinicID": patient.ClinicID, - "DoctorID": patient.DoctorID, - "FirstName": patient.FirstName, - "MiddleName": patient.MiddleName, - "LastName": patient.LastName, - "PatientMobileNumber": patient.PatientMobileNumber, - "PatientIdentificationID": patient.PatientIdentificationID, - "PatientID": patient.PatientID, - "From": patient.From, - "To": patient.To, - "LanguageID": patient.LanguageID, - "stamp": patient.stamp, - "IPAdress": patient.IPAdress, - "VersionID": patient.VersionID, - "Channel": patient.Channel, - "TokenID": patient.TokenID, - "SessionID": patient.SessionID, - "IsLoginForDoctorApp": patient.IsLoginForDoctorApp, - "PatientOutSA": patient.PatientOutSA - }); - - return Future.value(localRes); - } catch (error) { - print(error); - throw error; - } - } - - setBasicData() { - isLoading = true; - isError = false; - error = ''; - notifyListeners(); - } - - - - /*@author: Elham Rababah - *@Date:12/5/2020 - *@param: patient - *@return: - *@desc: getPatientRadiology - */ - handelCatchErrorCase(err) { - isLoading = false; - isError = true; - error = helpers.generateContactAdminMsg(err); - notifyListeners(); - throw err; - } - - // /*@author: ibrahem albitar - // *@Date:3/6/2020 - // *@desc: getDoctorsList - // */ - // getDoctorsList(String clinicId) async { - // setBasicData(); - // try { - // _doctorsByClinicIdRequest.clinicID = clinicId; - // await baseAppClient.post(PATIENT_GET_DOCTOR_BY_CLINIC_URL, - // onSuccess: (dynamic response, int statusCode) { - // doctorsList = response['List_Doctors_All']; - // isLoading = false; - // isError = false; - // this.error = ''; - // }, onFailure: (String error, int statusCode) { - // isLoading = false; - // isError = true; - // this.error = error; - // }, body: _doctorsByClinicIdRequest.toJson()); - // notifyListeners(); - // } catch (err) { - // handelCatchErrorCase(err); - // } - // } - // - // List getDoctorNameList() { - // var doctorNamelist = - // doctorsList.map((value) => value['DoctorName'].toString()).toList(); - // return doctorNamelist; - // } - // - // /*@author: ibrahem albitar - // *@Date:3/6/2020 - // *@desc: getClinicsList - // */ - // getClinicsList() async { - // setBasicData(); - // try { - // await baseAppClient.post(PATIENT_GET_CLINIC_BY_PROJECT_URL, - // onSuccess: (dynamic response, int statusCode) { - // clinicsList = response['List_Clinic_All']; - // isLoading = false; - // isError = false; - // this.error = ''; - // }, onFailure: (String error, int statusCode) { - // isLoading = false; - // isError = true; - // this.error = error; - // }, body: _clinicByProjectIdRequest.toJson()); - // notifyListeners(); - // } catch (err) { - // handelCatchErrorCase(err); - // } - // } - // - // List getClinicNameList() { - // var clinicsNameslist = clinicsList - // .map((value) => value['ClinicDescription'].toString()) - // .toList(); - // return clinicsNameslist; - // } - // - // /*@author: ibrahem albitar - // *@Date:3/6/2020 - // *@desc: getReferralFrequancyList - // */ - // getReferralFrequancyList() async { - // setBasicData(); - // try { - // await baseAppClient.post(PATIENT_GET_LIST_REFERAL_URL, - // onSuccess: (dynamic response, int statusCode) { - // referalFrequancyList = response['list_STPReferralFrequency']; - // isLoading = false; - // isError = false; - // this.error = ''; - // }, onFailure: (String error, int statusCode) { - // isLoading = false; - // isError = true; - // this.error = error; - // }, body: _referralFrequencyRequest.toJson()); - // notifyListeners(); - // } catch (err) { - // handelCatchErrorCase(err); - // } - // } - // - // List getReferralNamesList() { - // var referralNamesList = referalFrequancyList - // .map((value) => value['Description'].toString()) - // .toList(); - // return referralNamesList; - // } - - /*@author: ibrahem albitar - *@Date:3/6/2020 - *@desc: referToDoctor - */ - // referToDoctor(context, - // {String selectedDoctorID, - // String selectedClinicID, - // int admissionNo, - // String extension, - // String priority, - // String frequency, - // String referringDoctorRemarks, - // int patientID, - // int patientTypeID, - // String roomID, - // int projectID}) async { - // setBasicData(); - // try { - // String token = await sharedPref.getString(TOKEN); - // Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - // DoctorProfileModel doctorProfile = - // new DoctorProfileModel.fromJson(profile); - // int doctorID = doctorProfile.doctorID; - // int clinicId = doctorProfile.clinicID; - // _referToDoctorRequest = ReferToDoctorRequest( - // projectID: projectID, - // admissionNo: admissionNo, - // roomID: roomID, - // referralClinic: selectedClinicID.toString(), - // referralDoctor: selectedDoctorID.toString(), - // createdBy: doctorID, - // editedBy: doctorID, - // patientID: patientID, - // patientTypeID: patientTypeID, - // referringClinic: clinicId, - // referringDoctor: doctorID, - // referringDoctorRemarks: referringDoctorRemarks, - // priority: priority, - // frequency: frequency, - // extension: extension, - // tokenID: token); - // await baseAppClient.post(PATIENT_REFER_TO_DOCTOR_URL, - // onSuccess: (dynamic response, int statusCode) { - // // print('Done : \n $res'); - // Navigator.pop(context); - // }, - // onFailure: (String error, int statusCode) { - // isLoading = false; - // isError = true; - // this.error = error; - // }, - // body: _referToDoctorRequest.toJson()); - // notifyListeners(); - // - // } catch (err) { - // handelCatchErrorCase(err); - // } - // } -} diff --git a/lib/screens/QR_reader_screen.dart b/lib/screens/QR_reader_screen.dart index 627f5f31..825abb83 100644 --- a/lib/screens/QR_reader_screen.dart +++ b/lib/screens/QR_reader_screen.dart @@ -5,19 +5,19 @@ import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; -import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; +import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_button.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; import '../routes.dart'; import 'base/base_view.dart'; +Helpers helpers = Helpers(); class QrReaderScreen extends StatefulWidget { @override diff --git a/lib/screens/patients/out_patient_prescription_details_screen.dart b/lib/screens/patients/out_patient_prescription_details_screen.dart index 5966b3a8..c7056ce3 100644 --- a/lib/screens/patients/out_patient_prescription_details_screen.dart +++ b/lib/screens/patients/out_patient_prescription_details_screen.dart @@ -1,7 +1,6 @@ import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/models/patient/prescription/prescription_res_model.dart'; import 'package:doctor_app_flutter/models/patient/prescription/request_prescription_report.dart'; -import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/out_patient_prescription_details_item.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; @@ -22,8 +21,6 @@ class OutPatientPrescriptionDetailsScreen extends StatefulWidget { class _OutPatientPrescriptionDetailsScreenState extends State { - bool _isInit = true; - PatientsProvider patientsProvider; getPrescriptionReport(BuildContext context,PatientViewModel model ){ @@ -43,7 +40,7 @@ class _OutPatientPrescriptionDetailsScreenState appBarTitle: TranslationBase.of(context).prescriptionDetails, body: CardWithBgWidgetNew( widget: ListView.builder( - itemCount: patientsProvider.prescriptionReport.length, + itemCount: model.prescriptionReport.length, itemBuilder: (BuildContext context, int index) { return OutPatientPrescriptionDetailsItem( prescriptionReport: diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 3b960c6a..8f092701 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -8,13 +8,14 @@ */ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; -import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/providers/project_provider.dart'; import 'package:doctor_app_flutter/routes.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; @@ -55,70 +56,15 @@ class _PatientsScreenState extends State { bool _isInit = true; String patientType; String patientTypeTitle; - var _isLoading = false; + var _isLoading = true; - bool _isError = true; + bool _isError = false; String error = ""; ProjectProvider projectsProvider; final _controller = TextEditingController(); PatientModel patient; - PatientsProvider patientsProv; - - @override - void didChangeDependencies() { - projectsProvider = Provider.of(context); - - final routeArgs = ModalRoute.of(context).settings.arguments as Map; - - patient = routeArgs['patientSearchForm']; - - patientType = routeArgs['selectedType']; - - if (!projectsProvider.isArabic) - patientTypeTitle = SERVICES_PATIANT_HEADER[int.parse(patientType)]; - else - patientTypeTitle = SERVICES_PATIANT_HEADER_AR[int.parse(patientType)]; - - print(patientType); - - if (_isInit) { - PatientsProvider patientsProv = Provider.of(context); - setState(() { - _isLoading = true; - _isError = false; - error = ""; - }); - patientsProv.getPatientList(patient, patientType).then((res) { - setState(() { - _isLoading = false; - if (res['MessageStatus'] == 1) { - int val2 = int.parse(patientType); - lItems = res[SERVICES_PATIANT2[val2]]; - parsed = lItems; - responseModelList = new ModelResponse.fromJson(parsed).list; - responseModelList2 = responseModelList; - _isError = false; - } else { - _isError = true; - error = res['ErrorEndUserMessage'] ?? res['ErrorMessage']; - } - }); - }).catchError((error) { - print(error); - setState(() { - _isError = true; - _isLoading = false; - this.error = error; - }); - }); - } - - _isInit = false; - - super.didChangeDependencies(); - } /* *@author: Amjad Amireh @@ -300,24 +246,74 @@ class _PatientsScreenState extends State { @override Widget build(BuildContext context) { _locations = [ - TranslationBase.of(context).all, - TranslationBase.of(context).today, - TranslationBase.of(context).tomorrow, - TranslationBase.of(context).nextWeek, + TranslationBase + .of(context) + .all, + TranslationBase + .of(context) + .today, + TranslationBase + .of(context) + .tomorrow, + TranslationBase + .of(context) + .nextWeek, ]; - PatientsProvider patientsProv = Provider.of(context); - - return AppScaffold( - appBarTitle: patientTypeTitle, - body: _isLoading - ? DrAppCircularProgressIndeicator() - : _isError - ? DrAppEmbeddedError(error: error) - : lItems == null || lItems.length == 0 - ? DrAppEmbeddedError( - error: TranslationBase.of(context).youDontHaveAnyPatient) - : Container( - child: ListView( + projectsProvider = Provider.of(context); + final routeArgs = ModalRoute + .of(context) + .settings + .arguments as Map; + + patient = routeArgs['patientSearchForm']; + + patientType = routeArgs['selectedType']; + + if (!projectsProvider.isArabic) + patientTypeTitle = SERVICES_PATIANT_HEADER[int.parse(patientType)]; + else + patientTypeTitle = SERVICES_PATIANT_HEADER_AR[int.parse(patientType)]; + + return BaseView( + onModelReady: (model) { + // TODO : change all the logic here to make it work with the model and remove future + model.getPatientList(patient, patientType).then((res) { + setState(() { + _isLoading = false; + if (res['MessageStatus'] == 1) { + int val2 = int.parse(patientType); + lItems = res[SERVICES_PATIANT2[val2]]; + parsed = lItems; + responseModelList = new ModelResponse.fromJson(parsed).list; + responseModelList2 = responseModelList; + _isError = false; + } else { + _isError = true; + error = res['ErrorEndUserMessage'] ?? res['ErrorMessage']; + } + }); + }).catchError((error) { + setState(() { + _isError = true; + _isLoading = false; + this.error = error; + }); + }); + }, + builder: (_, model, w) => + AppScaffold( + appBarTitle: patientTypeTitle, + body: _isLoading + ? DrAppCircularProgressIndeicator() + : _isError + ? DrAppEmbeddedError(error: error) + : lItems == null || lItems.length == 0 + ? DrAppEmbeddedError( + error: TranslationBase + .of(context) + .youDontHaveAnyPatient) + : Container( + child: ListView( scrollDirection: Axis.vertical, children: [ Container( @@ -684,17 +680,17 @@ class _PatientsScreenState extends State { : Center( child: DrAppEmbeddedError( error: TranslationBase.of( - context) + context) .youDontHaveAnyPatient), - ), + ), ), ], - ), + ), ) ], - ), - ), - ); + ), + ), + ),); } InputDecoration buildInputDecoration(BuildContext context, hint) { @@ -764,7 +760,6 @@ class _PatientsScreenState extends State { ), ), onTap: () { - print(_locations.indexOf(item)); filterBooking(item.toString()); diff --git a/lib/screens/patients/profile/insurance_approvals_screen.dart b/lib/screens/patients/profile/insurance_approvals_screen.dart index e6b4dd70..9105338b 100644 --- a/lib/screens/patients/profile/insurance_approvals_screen.dart +++ b/lib/screens/patients/profile/insurance_approvals_screen.dart @@ -12,7 +12,6 @@ import 'package:hexcolor/hexcolor.dart'; import '../../../config/shared_pref_kay.dart'; import '../../../config/size_config.dart'; import '../../../models/patient/patiant_info_model.dart'; -import '../../../providers/patients_provider.dart'; import '../../../util/dr_app_shared_pref.dart'; import '../../../widgets/shared/app_scaffold_widget.dart'; import '../../../widgets/shared/app_texts_widget.dart'; @@ -33,11 +32,9 @@ class InsuranceApprovalsScreen extends StatefulWidget { } class _InsuranceApprovalsState extends State { - PatientsProvider patientsProv; var approvalsList; var filteredApprovalsList; final _controller = TextEditingController(); - var _isInit = true; /* *@author: ibrahim al bitar diff --git a/lib/screens/patients/profile/lab_result/lab_orders_screen.dart b/lib/screens/patients/profile/lab_result/lab_orders_screen.dart index 20e30850..41f58564 100644 --- a/lib/screens/patients/profile/lab_result/lab_orders_screen.dart +++ b/lib/screens/patients/profile/lab_result/lab_orders_screen.dart @@ -11,7 +11,6 @@ import '../../../../config/shared_pref_kay.dart'; import '../../../../config/size_config.dart'; import '../../../../models/patient/lab_orders/lab_orders_req_model.dart'; import '../../../../models/patient/patiant_info_model.dart'; -import '../../../../providers/patients_provider.dart'; import '../../../../util/dr_app_shared_pref.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; import '../../../../widgets/shared/app_texts_widget.dart'; diff --git a/lib/screens/patients/profile/patient_orders_screen.dart b/lib/screens/patients/profile/patient_orders_screen.dart index 00f6b59a..09834d50 100644 --- a/lib/screens/patients/profile/patient_orders_screen.dart +++ b/lib/screens/patients/profile/patient_orders_screen.dart @@ -10,7 +10,6 @@ import 'package:hexcolor/hexcolor.dart'; import '../../../config/shared_pref_kay.dart'; import '../../../config/size_config.dart'; import '../../../models/patient/patiant_info_model.dart'; -import '../../../providers/patients_provider.dart'; import '../../../util/dr_app_shared_pref.dart'; import '../../../widgets/shared/app_scaffold_widget.dart'; import '../../../widgets/shared/app_texts_widget.dart'; @@ -31,7 +30,6 @@ class PatientsOrdersScreen extends StatefulWidget { } class _PatientsOrdersState extends State { - PatientsProvider patientsProv; var notesList; var filteredNotesList; final _controller = TextEditingController(); diff --git a/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart b/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart index 2a1b60f3..496e5478 100644 --- a/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart +++ b/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart @@ -10,11 +10,8 @@ import 'package:flutter/material.dart'; import '../../../../config/shared_pref_kay.dart'; import '../../../../models/patient/patiant_info_model.dart'; import '../../../../models/patient/prescription/prescription_req_model.dart'; -import '../../../../providers/patients_provider.dart'; import '../../../../util/dr_app_shared_pref.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; -import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; -import '../../../../widgets/shared/errors/dr_app_embedded_error.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); @@ -32,8 +29,6 @@ class PrescriptionScreen extends StatefulWidget { } class _PrescriptionScreenState extends State { - PatientsProvider patientsProv; - bool _isInit = true; String type = '2'; /* diff --git a/lib/screens/patients/profile/radiology/radiology_screen.dart b/lib/screens/patients/profile/radiology/radiology_screen.dart index 5eb08d31..cdab5bca 100644 --- a/lib/screens/patients/profile/radiology/radiology_screen.dart +++ b/lib/screens/patients/profile/radiology/radiology_screen.dart @@ -10,11 +10,9 @@ import 'package:flutter/material.dart'; import '../../../../config/shared_pref_kay.dart'; import '../../../../config/size_config.dart'; import '../../../../models/patient/patiant_info_model.dart'; -import '../../../../providers/patients_provider.dart'; import '../../../../util/dr_app_shared_pref.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; import '../../../../widgets/shared/app_texts_widget.dart'; -import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); @@ -32,8 +30,6 @@ class RadiologyScreen extends StatefulWidget { } class _RadiologyScreenState extends State { - PatientsProvider patientsProv; - var _isInit = true; /* *@author: Elham Rababah @@ -103,7 +99,7 @@ class _RadiologyScreenState extends State { MaterialPageRoute( builder: (context) => RadiologyReportScreen( - reportData: patientsProv + reportData: model .patientRadiologyList[index] .reportData, )), @@ -133,7 +129,7 @@ class _RadiologyScreenState extends State { Row( children: [ LargeAvatar( - url: patientsProv + url: model .patientRadiologyList[index] .doctorImageURL, ), diff --git a/lib/screens/patients/profile/refer_patient_screen.dart b/lib/screens/patients/profile/refer_patient_screen.dart index f7a969e8..ffef05e6 100644 --- a/lib/screens/patients/profile/refer_patient_screen.dart +++ b/lib/screens/patients/profile/refer_patient_screen.dart @@ -13,7 +13,6 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:intl/intl.dart'; import '../../../config/size_config.dart'; -import '../../../providers/patients_provider.dart'; import '../../../util/dr_app_shared_pref.dart'; import '../../../util/extenstions.dart'; import '../../../widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart index 75b8be03..cf8ee839 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -10,7 +10,6 @@ import '../../../../config/size_config.dart'; import '../../../../lookups/patient_lookup.dart'; import '../../../../models/patient/patiant_info_model.dart'; import '../../../../models/patient/vital_sign/vital_sign_res_model.dart'; -import '../../../../providers/patients_provider.dart'; import '../../../../routes.dart'; import '../../../../screens/patients/profile/vital_sign/vital_sign_item.dart'; import '../../../../util/dr_app_shared_pref.dart'; @@ -28,8 +27,6 @@ class _VitalSignDetailsScreenState extends State { VitalSignResModel vitalSing; String url = "assets/images/"; - PatientsProvider patientsProv; - var _isInit = true; /* *@author: Elham Rababah diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart index ef7c35fa..853bec15 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart @@ -1 +1 @@ -import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../../lookups/patient_lookup.dart'; import '../../../../models/patient/vital_sign/vital_sign_res_model.dart'; import '../../../../providers/patients_provider.dart'; import '../../../../screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; /* *@author: Elham Rababah *@Date:03/6/2020 *@param: *@return: *@desc: VitalSignItemDetailsScreen */ class VitalSignItemDetailsScreen extends StatelessWidget { VitalSignItemDetailsScreen(); // ; PatientsProvider patientsProv; List vitalList = []; String pageTitle; @override Widget build(BuildContext context) { patientsProv = Provider.of(context); final routeArgs = ModalRoute.of(context).settings.arguments as Map; pageTitle = routeArgs['title']; var pageKey = routeArgs['key']; List VSchart; vitalList = patientsProv.patientVitalSignOrderdSubList; switch (pageKey) { case vitalSignDetails.bodyMeasurements: VSchart = [ { 'name': 'Highet', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'HeightCm', }, { 'name': 'Weight Kg', 'title1': 'Date', 'title2': 'Kg', 'viewKey': 'WeightKg', }, { 'name': 'BodyMassIndex', 'title1': 'Date', 'title2': 'BodyMass', 'viewKey': 'BodyMassIndex', }, { 'name': 'HeadCircumCm', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'HeadCircumCm', }, { 'name': 'Ideal Body Weight (Lbs)', 'title1': 'Date', 'title2': 'Ideal Weight', 'viewKey': 'IdealBodyWeightLbs', }, { 'name': 'LeanBodyWeightLbs (Lbs)', 'title1': 'Date', 'title2': 'Lean Weight', 'viewKey': 'LeanBodyWeightLbs', } ]; break; case vitalSignDetails.temperature: VSchart = [ { 'name': 'Temperature In Celcius', 'title1': 'Date', 'title2': 'C', 'viewKey': 'TemperatureCelcius', }, ]; break; case vitalSignDetails.pulse: VSchart = [ { 'name': 'Pulse Beat Per Minute', 'title1': 'Date', 'title2': 'Minute', 'viewKey': 'PulseBeatPerMinute', }, ]; break; case vitalSignDetails.pespiration: VSchart = [ { 'name': 'Respiration Beat Per Minute', 'title1': 'Date', 'title2': 'Beat Per Minute', 'viewKey': 'RespirationBeatPerMinute', }, ]; break; case vitalSignDetails.bloodPressure: VSchart = [ { 'name': 'Blood Pressure Higher', 'title1': 'Date', 'title2': 'Minute', 'viewKey': 'BloodPressureHigher', }, { 'name': 'Blood Pressure Lower', 'title1': 'Date', 'title2': 'Minute', 'viewKey': 'BloodPressureLower', } ]; break; case vitalSignDetails.oxygenation: VSchart = [ { 'name': 'FIO2', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'FIO2', }, { 'name': 'SAO2', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'SAO2', }, ]; break; case vitalSignDetails.painScale: VSchart = [ { 'name': 'PainScore', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'PainScore', }, ]; break; default: } return AppScaffold( appBarTitle: pageTitle, body: ListView( children: VSchart.map((chartInfo) { var vitalListTemp = vitalList.where( (element) => element.toJson()[chartInfo['viewKey']] != null, ); return vitalListTemp.length != 0 ? VitalSingChartAndDetials( vitalList: vitalList, name: chartInfo['name'], title1: chartInfo['title1'], title2: chartInfo['title2'], viewKey: chartInfo['viewKey']) : Center( child: Container( margin: EdgeInsets.only( top: MediaQuery.of(context).size.height * 0.45), child: Center( child: DrAppEmbeddedError( error: TranslationBase.of(context).youDoNotHaveAnyItem), ), )); }).toList(), ), ); } } \ No newline at end of file +import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:flutter/material.dart'; import '../../../../lookups/patient_lookup.dart'; import '../../../../models/patient/vital_sign/vital_sign_res_model.dart'; import '../../../../screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; /* *@author: Elham Rababah *@Date:03/6/2020 *@param: *@return: *@desc: VitalSignItemDetailsScreen */ class VitalSignItemDetailsScreen extends StatelessWidget { VitalSignItemDetailsScreen(); List vitalList = []; String pageTitle; @override Widget build(BuildContext context) { final routeArgs = ModalRoute.of(context).settings.arguments as Map; pageTitle = routeArgs['title']; var pageKey = routeArgs['key']; List VSchart; switch (pageKey) { case vitalSignDetails.bodyMeasurements: VSchart = [ { 'name': 'Highet', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'HeightCm', }, { 'name': 'Weight Kg', 'title1': 'Date', 'title2': 'Kg', 'viewKey': 'WeightKg', }, { 'name': 'BodyMassIndex', 'title1': 'Date', 'title2': 'BodyMass', 'viewKey': 'BodyMassIndex', }, { 'name': 'HeadCircumCm', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'HeadCircumCm', }, { 'name': 'Ideal Body Weight (Lbs)', 'title1': 'Date', 'title2': 'Ideal Weight', 'viewKey': 'IdealBodyWeightLbs', }, { 'name': 'LeanBodyWeightLbs (Lbs)', 'title1': 'Date', 'title2': 'Lean Weight', 'viewKey': 'LeanBodyWeightLbs', } ]; break; case vitalSignDetails.temperature: VSchart = [ { 'name': 'Temperature In Celcius', 'title1': 'Date', 'title2': 'C', 'viewKey': 'TemperatureCelcius', }, ]; break; case vitalSignDetails.pulse: VSchart = [ { 'name': 'Pulse Beat Per Minute', 'title1': 'Date', 'title2': 'Minute', 'viewKey': 'PulseBeatPerMinute', }, ]; break; case vitalSignDetails.pespiration: VSchart = [ { 'name': 'Respiration Beat Per Minute', 'title1': 'Date', 'title2': 'Beat Per Minute', 'viewKey': 'RespirationBeatPerMinute', }, ]; break; case vitalSignDetails.bloodPressure: VSchart = [ { 'name': 'Blood Pressure Higher', 'title1': 'Date', 'title2': 'Minute', 'viewKey': 'BloodPressureHigher', }, { 'name': 'Blood Pressure Lower', 'title1': 'Date', 'title2': 'Minute', 'viewKey': 'BloodPressureLower', } ]; break; case vitalSignDetails.oxygenation: VSchart = [ { 'name': 'FIO2', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'FIO2', }, { 'name': 'SAO2', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'SAO2', }, ]; break; case vitalSignDetails.painScale: VSchart = [ { 'name': 'PainScore', 'title1': 'Date', 'title2': 'Cm', 'viewKey': 'PainScore', }, ]; break; default: } return BaseView( onModelReady: (model) { vitalList = model.patientVitalSignOrderdSubList; }, builder: (_, model, w) => AppScaffold( baseViewModel: model, appBarTitle: pageTitle, body: ListView( children: VSchart.map((chartInfo) { var vitalListTemp = vitalList.where( (element) => element.toJson()[chartInfo['viewKey']] != null, ); return vitalListTemp.length != 0 ? VitalSingChartAndDetials( vitalList: vitalList, name: chartInfo['name'], title1: chartInfo['title1'], title2: chartInfo['title2'], viewKey: chartInfo['viewKey']) : Center( child: Container( margin: EdgeInsets.only( top: MediaQuery.of(context).size.height * 0.45), child: Center( child: DrAppEmbeddedError( error: TranslationBase.of(context).youDoNotHaveAnyItem), ), )); }).toList(), ), ), ); } } \ No newline at end of file diff --git a/lib/widgets/auth/show_timer_text.dart b/lib/widgets/auth/show_timer_text.dart index c3f7a142..73590e1e 100644 --- a/lib/widgets/auth/show_timer_text.dart +++ b/lib/widgets/auth/show_timer_text.dart @@ -3,11 +3,12 @@ import 'dart:async'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/providers/auth_provider.dart'; -import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/routes.dart'; +import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; +Helpers helpers = Helpers(); class ShowTimerText extends StatefulWidget { ShowTimerText({Key key, this.model}); diff --git a/lib/widgets/patients/profile/Profile_general_info_Widget.dart b/lib/widgets/patients/profile/Profile_general_info_Widget.dart index 53b46884..e0eb5b12 100644 --- a/lib/widgets/patients/profile/Profile_general_info_Widget.dart +++ b/lib/widgets/patients/profile/Profile_general_info_Widget.dart @@ -1,8 +1,5 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; -import 'package:doctor_app_flutter/providers/patients_provider.dart'; - import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; import './profile_general_info_content_widget.dart'; import '../../../config/size_config.dart'; From 9f19b2566f0e95d0fc058149156b4f80fbb0d016 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Sun, 13 Dec 2020 12:19:41 +0200 Subject: [PATCH 2/2] finish refactor provider --- lib/client/base_app_client.dart | 2 +- .../service/hospital/hospitals_service.dart | 23 ---------- .../viewModel/auth_view_model.dart} | 6 +-- .../viewModel/doctor_replay_view_model.dart | 2 - lib/core/viewModel/hospital_view_model.dart | 44 +++++++++++-------- .../viewModel/livecare_view_model.dart} | 7 ++- lib/core/viewModel/medicine_view_model.dart | 6 --- .../viewModel/project_view_model.dart} | 4 +- lib/core/viewModel/referral_view_model.dart | 6 --- lib/core/viewModel/referred_view_model.dart | 8 ---- lib/core/viewModel/schedule_view_model.dart | 4 -- lib/locator.dart | 4 -- lib/main.dart | 20 ++++----- lib/providers/hospital_provider.dart | 29 ------------ lib/root_page.dart | 4 +- lib/screens/dashboard_screen.dart | 10 ++--- lib/screens/live_care/panding_list.dart | 6 +-- lib/screens/live_care/video_call.dart | 6 +-- .../medicine/pharmacies_list_screen.dart | 2 +- .../patients/patient_search_screen.dart | 2 +- lib/screens/patients/patients_screen.dart | 2 +- lib/screens/settings/settings_screen.dart | 4 +- lib/widgets/auth/known_user_login.dart | 4 +- lib/widgets/auth/login_form.dart | 14 +++--- lib/widgets/auth/show_timer_text.dart | 6 +-- lib/widgets/auth/verfiy_account.dart | 10 ++--- lib/widgets/auth/verification_methods.dart | 14 +++--- .../dashboard_item_texts_widget.dart | 2 +- lib/widgets/shared/app_drawer_widget.dart | 4 +- lib/widgets/shared/app_scaffold_widget.dart | 2 +- .../shared/card_with_bgNew_widget.dart | 2 +- lib/widgets/shared/card_with_bg_widget.dart | 2 +- 32 files changed, 93 insertions(+), 168 deletions(-) delete mode 100644 lib/core/service/hospital/hospitals_service.dart rename lib/{providers/auth_provider.dart => core/viewModel/auth_view_model.dart} (97%) rename lib/{providers/livecare_provider.dart => core/viewModel/livecare_view_model.dart} (97%) rename lib/{providers/project_provider.dart => core/viewModel/project_view_model.dart} (96%) delete mode 100644 lib/providers/hospital_provider.dart diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 2521cf07..454f4d04 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:http/http.dart' as http; diff --git a/lib/core/service/hospital/hospitals_service.dart b/lib/core/service/hospital/hospitals_service.dart deleted file mode 100644 index 1fb24c6b..00000000 --- a/lib/core/service/hospital/hospitals_service.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/base/base_service.dart'; - -///This service just an example -class HospitalService extends BaseService { - List _hospitals = List(); - - List get hospitals => _hospitals; - - Future getHospitals() async { - await baseAppClient.post(GET_PROJECTS, - onSuccess: (dynamic response, int statusCode) { - _hospitals.clear(); - response['ListProject'].forEach((hospital) { - _hospitals.add(HospitalsModel.fromJson(hospital)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: Map()); - } -} diff --git a/lib/providers/auth_provider.dart b/lib/core/viewModel/auth_view_model.dart similarity index 97% rename from lib/providers/auth_provider.dart rename to lib/core/viewModel/auth_view_model.dart index eaca545d..9b656d31 100644 --- a/lib/providers/auth_provider.dart +++ b/lib/core/viewModel/auth_view_model.dart @@ -5,12 +5,12 @@ import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:flutter/cupertino.dart'; import 'package:doctor_app_flutter/config/config.dart'; -import '../models/doctor/user_model.dart'; +import '../../models/doctor/user_model.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); enum APP_STATUS { LOADING, UNAUTHENTICATED, AUTHENTICATED } -class AuthProvider with ChangeNotifier { +class AuthViewModel with ChangeNotifier { List doctorsClinicList = []; String selectedClinicName; bool isLogin = false; @@ -23,7 +23,7 @@ class AuthProvider with ChangeNotifier { } - AuthProvider() { + AuthViewModel() { getUserAuthentication(); } diff --git a/lib/core/viewModel/doctor_replay_view_model.dart b/lib/core/viewModel/doctor_replay_view_model.dart index ac212578..29d3b125 100644 --- a/lib/core/viewModel/doctor_replay_view_model.dart +++ b/lib/core/viewModel/doctor_replay_view_model.dart @@ -1,7 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/hospital_view_model.dart b/lib/core/viewModel/hospital_view_model.dart index cac49dac..56f03686 100644 --- a/lib/core/viewModel/hospital_view_model.dart +++ b/lib/core/viewModel/hospital_view_model.dart @@ -1,23 +1,31 @@ -import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; +import 'package:doctor_app_flutter/client/base_app_client.dart'; +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:flutter/cupertino.dart'; -import '../../locator.dart'; -import 'base_view_model.dart'; +// TODO change it when change login +class HospitalViewModel with ChangeNotifier { + BaseAppClient baseAppClient = BaseAppClient(); -///This View Model just an example -class HospitalViewModel extends BaseViewModel { - HospitalService _hospitalService = locator(); + Future getProjectsList() async { + const url = GET_PROJECTS; + // TODO create model or remove it if no info need + var info = { + "LanguageID": 1, + "stamp": "2020-02-26T13:51:44.111Z", + "IPAdress": "11.11.11.11", + "VersionID": 1.2, + "Channel": 9, + "TokenID": "", + "SessionID": "i1UJwCTSqt", + "IsLoginForDoctorApp": true + }; + dynamic localRes; - List get hospitals => _hospitalService.hospitals; - - Future getHospitals() async { - setState(ViewState.Busy); - await _hospitalService.getHospitals(); - if (_hospitalService.hasError) { - error = _hospitalService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); + await baseAppClient.post(url, onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: info); + return Future.value(localRes); } } diff --git a/lib/providers/livecare_provider.dart b/lib/core/viewModel/livecare_view_model.dart similarity index 97% rename from lib/providers/livecare_provider.dart rename to lib/core/viewModel/livecare_view_model.dart index 7af6585f..f6ef42e7 100644 --- a/lib/providers/livecare_provider.dart +++ b/lib/core/viewModel/livecare_view_model.dart @@ -1,7 +1,7 @@ -import 'dart:convert'; import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/models/livecare/end_call_req.dart'; import 'package:doctor_app_flutter/models/livecare/get_panding_req_list.dart'; import 'package:doctor_app_flutter/models/livecare/get_pending_res_list.dart'; @@ -9,11 +9,10 @@ import 'package:doctor_app_flutter/models/livecare/start_call_req.dart'; import 'package:doctor_app_flutter/models/livecare/start_call_res.dart'; import 'package:doctor_app_flutter/models/livecare/transfer_to_admin.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; -import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; -import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -class LiveCareProvider with ChangeNotifier { +//TODO: change it when Live care return back. +class LiveCareViewModel with ChangeNotifier { DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); List liveCarePendingList = []; diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index 72f4d0ab..a86f6dfb 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -1,11 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/core/service/medicine_service.dart'; -import 'package:doctor_app_flutter/core/service/schedule_service.dart'; -import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; import 'base_view_model.dart'; diff --git a/lib/providers/project_provider.dart b/lib/core/viewModel/project_view_model.dart similarity index 96% rename from lib/providers/project_provider.dart rename to lib/core/viewModel/project_view_model.dart index db912c3c..a12846c7 100644 --- a/lib/providers/project_provider.dart +++ b/lib/core/viewModel/project_view_model.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; @@ -121,7 +121,7 @@ class ProjectProvider with ChangeNotifier { tokenID: '', languageID: 2); - Provider.of(AppGlobal.CONTEX, listen: false) + Provider.of(AppGlobal.CONTEX, listen: false) .getDocProfiles(docInfo.toJson()) .then((res) async { sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]); diff --git a/lib/core/viewModel/referral_view_model.dart b/lib/core/viewModel/referral_view_model.dart index 54c3fd8a..2e99cc3a 100644 --- a/lib/core/viewModel/referral_view_model.dart +++ b/lib/core/viewModel/referral_view_model.dart @@ -1,11 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/core/service/referral_patient_service.dart'; -import 'package:doctor_app_flutter/core/service/schedule_service.dart'; -import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/referred_view_model.dart b/lib/core/viewModel/referred_view_model.dart index b12241e3..b5e3ecdc 100644 --- a/lib/core/viewModel/referred_view_model.dart +++ b/lib/core/viewModel/referred_view_model.dart @@ -1,13 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; -import 'package:doctor_app_flutter/core/service/referral_patient_service.dart'; import 'package:doctor_app_flutter/core/service/referred_patient_service.dart'; -import 'package:doctor_app_flutter/core/service/schedule_service.dart'; -import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; -import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/schedule_view_model.dart b/lib/core/viewModel/schedule_view_model.dart index cfaa1be4..8aebc4cb 100644 --- a/lib/core/viewModel/schedule_view_model.dart +++ b/lib/core/viewModel/schedule_view_model.dart @@ -1,10 +1,6 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/core/service/schedule_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; import 'base_view_model.dart'; diff --git a/lib/locator.dart b/lib/locator.dart index d4695f84..550b4666 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -3,13 +3,11 @@ import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:get_it/get_it.dart'; import 'core/service/doctor_reply_service.dart'; -import 'core/service/hospital/hospitals_service.dart'; import 'core/service/medicine_service.dart'; import 'core/service/referral_patient_service.dart'; import 'core/service/referred_patient_service.dart'; import 'core/service/schedule_service.dart'; import 'core/viewModel/doctor_replay_view_model.dart'; -import 'core/viewModel/hospital_view_model.dart'; import 'core/viewModel/medicine_view_model.dart'; import 'core/viewModel/referral_view_model.dart'; import 'core/viewModel/referred_view_model.dart'; @@ -20,7 +18,6 @@ GetIt locator = GetIt.instance; ///di void setupLocator() { /// Services - locator.registerLazySingleton(() => HospitalService()); locator.registerLazySingleton(() => DoctorReplyService()); locator.registerLazySingleton(() => ScheduleService()); locator.registerLazySingleton(() => ReferralPatientService()); @@ -29,7 +26,6 @@ void setupLocator() { locator.registerLazySingleton(() => PatientService()); /// View Model - locator.registerFactory(() => HospitalViewModel()); locator.registerFactory(() => DoctorReplayViewModel()); locator.registerFactory(() => ScheduleViewModel()); locator.registerFactory(() => ReferralPatientViewModel()); diff --git a/lib/main.dart b/lib/main.dart index 4a431d64..06d0ecfa 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,5 @@ -import 'package:doctor_app_flutter/providers/livecare_provider.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; @@ -7,8 +7,8 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import './config/size_config.dart'; -import './providers/auth_provider.dart'; -import './providers/hospital_provider.dart'; +import 'core/viewModel/auth_view_model.dart'; +import 'core/viewModel/hospital_view_model.dart'; import './routes.dart'; import 'config/config.dart'; import 'locator.dart'; @@ -29,15 +29,15 @@ class MyApp extends StatelessWidget { SizeConfig().init(constraints, orientation); return MultiProvider( providers: [ - ChangeNotifierProvider( - create: (context) => AuthProvider()), - ChangeNotifierProvider( - create: (context) => HospitalProvider()), + ChangeNotifierProvider( + create: (context) => AuthViewModel()), + ChangeNotifierProvider( + create: (context) => HospitalViewModel()), ChangeNotifierProvider( create: (context) => ProjectProvider(), ), - ChangeNotifierProvider( - create: (context) => LiveCareProvider(), + ChangeNotifierProvider( + create: (context) => LiveCareViewModel(), ), ], child: Consumer( diff --git a/lib/providers/hospital_provider.dart b/lib/providers/hospital_provider.dart deleted file mode 100644 index 3b1c7d03..00000000 --- a/lib/providers/hospital_provider.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/config/config.dart'; -import 'package:flutter/cupertino.dart'; - -class HospitalProvider with ChangeNotifier { - BaseAppClient baseAppClient = BaseAppClient(); - - Future getProjectsList() async { - const url = GET_PROJECTS; - var info = { - "LanguageID": 1, - "stamp": "2020-02-26T13:51:44.111Z", - "IPAdress": "11.11.11.11", - "VersionID": 1.2, - "Channel": 9, - "TokenID": "", - "SessionID": "i1UJwCTSqt", - "IsLoginForDoctorApp": true - }; - dynamic localRes; - - await baseAppClient.post(url, onSuccess: (response, statusCode) async { - localRes = response; - }, onFailure: (String error, int statusCode) { - throw error; - }, body: info); - return Future.value(localRes); - } -} diff --git a/lib/root_page.dart b/lib/root_page.dart index e361e42c..fe35a246 100644 --- a/lib/root_page.dart +++ b/lib/root_page.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/screens/auth/login_screen.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/cupertino.dart'; @@ -11,7 +11,7 @@ import 'landing_page.dart'; class RootPage extends StatelessWidget { @override Widget build(BuildContext context) { - AuthProvider authProvider = Provider.of(context); + AuthViewModel authProvider = Provider.of(context); Widget buildRoot() { switch (authProvider.stutas) { case APP_STATUS.LOADING: diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 33e39e9c..80697352 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -4,9 +4,9 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; -import 'package:doctor_app_flutter/providers/hospital_provider.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; @@ -38,8 +38,8 @@ class DashboardScreen extends StatefulWidget { } class _DashboardScreenState extends State { - HospitalProvider hospitalProvider; - AuthProvider authProvider; + HospitalViewModel hospitalProvider; + AuthViewModel authProvider; bool isLoading = false; ProjectProvider projectsProvider; var _isInit = true; diff --git a/lib/screens/live_care/panding_list.dart b/lib/screens/live_care/panding_list.dart index a59d7f05..251f9594 100644 --- a/lib/screens/live_care/panding_list.dart +++ b/lib/screens/live_care/panding_list.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/providers/livecare_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; import 'package:doctor_app_flutter/screens/live_care/video_call.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; @@ -33,12 +33,12 @@ class _LiveCarePandingListState extends State { List _data = []; Helpers helpers = new Helpers(); bool _isInit = true; - LiveCareProvider _liveCareProvider; + LiveCareViewModel _liveCareProvider; @override void didChangeDependencies() { super.didChangeDependencies(); if (_isInit) { - _liveCareProvider = Provider.of(context); + _liveCareProvider = Provider.of(context); pendingList(); } _isInit = false; diff --git a/lib/screens/live_care/video_call.dart b/lib/screens/live_care/video_call.dart index c4c59af1..f6d011a7 100644 --- a/lib/screens/live_care/video_call.dart +++ b/lib/screens/live_care/video_call.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:doctor_app_flutter/models/livecare/get_pending_res_list.dart'; import 'package:doctor_app_flutter/models/livecare/session_status_model.dart'; import 'package:doctor_app_flutter/models/livecare/start_call_res.dart'; -import 'package:doctor_app_flutter/providers/livecare_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; import 'package:doctor_app_flutter/screens/live_care/panding_list.dart'; import 'package:doctor_app_flutter/util/VideoChannel.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; @@ -30,7 +30,7 @@ class _VideoCallPageState extends State { Timer _timmerInstance; int _start = 0; String _timmer = ''; - LiveCareProvider _liveCareProvider; + LiveCareViewModel _liveCareProvider; bool _isInit = true; var _tokenData; bool isTransfer = false; @@ -43,7 +43,7 @@ class _VideoCallPageState extends State { void didChangeDependencies() { super.didChangeDependencies(); if (_isInit) { - _liveCareProvider = Provider.of(context); + _liveCareProvider = Provider.of(context); startCall(false); } _isInit = false; diff --git a/lib/screens/medicine/pharmacies_list_screen.dart b/lib/screens/medicine/pharmacies_list_screen.dart index d55916b2..6057bf23 100644 --- a/lib/screens/medicine/pharmacies_list_screen.dart +++ b/lib/screens/medicine/pharmacies_list_screen.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index 44420140..204d2336 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 8f092701..4ca3e587 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; diff --git a/lib/screens/settings/settings_screen.dart b/lib/screens/settings/settings_screen.dart index 631d639e..79cd827e 100644 --- a/lib/screens/settings/settings_screen.dart +++ b/lib/screens/settings/settings_screen.dart @@ -1,5 +1,5 @@ -import 'package:doctor_app_flutter/providers/project_provider.dart'; -import 'package:doctor_app_flutter/providers/hospital_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; diff --git a/lib/widgets/auth/known_user_login.dart b/lib/widgets/auth/known_user_login.dart index a3330285..4df37d66 100644 --- a/lib/widgets/auth/known_user_login.dart +++ b/lib/widgets/auth/known_user_login.dart @@ -8,7 +8,7 @@ import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../../config/size_config.dart'; -import '../../providers/auth_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_toast_msg.dart'; @@ -69,7 +69,7 @@ class _KnownUserLoginState extends State { @override Widget build(BuildContext context) { - AuthProvider authProv = Provider.of(context); + AuthViewModel authProv = Provider.of(context); var imeiModel = {'IMEI': _platformImei}; _loginTypeFuture = authProv.selectDeviceImei(imeiModel); return FutureBuilder( diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart index dbdb853d..8cf5f3d4 100644 --- a/lib/widgets/auth/login_form.dart +++ b/lib/widgets/auth/login_form.dart @@ -10,8 +10,8 @@ import 'package:provider/provider.dart'; import '../../config/shared_pref_kay.dart'; import '../../config/size_config.dart'; import '../../models/doctor/user_model.dart'; -import '../../providers/auth_provider.dart'; -import '../../providers/hospital_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; +import '../../core/viewModel/hospital_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_toast_msg.dart'; @@ -51,7 +51,7 @@ class _LoginFormState extends State { channel: 9, sessionID: "i1UJwCTSqt"); - AuthProvider authProv; + AuthViewModel authProv; @override void initState() { super.initState(); @@ -61,7 +61,7 @@ class _LoginFormState extends State { @override void didChangeDependencies() { super.didChangeDependencies(); - authProv = Provider.of(context); + authProv = Provider.of(context); if (_isInit) { if (projectsList.length == 0) { @@ -222,7 +222,7 @@ class _LoginFormState extends State { ); } - login(context, AuthProvider authProv, Function changeLoadingStata) { + login(context, AuthViewModel authProv, Function changeLoadingStata) { FocusScopeNode currentFocus = FocusScope.of(context); // if (!currentFocus.hasPrimaryFocus) { @@ -258,7 +258,7 @@ class _LoginFormState extends State { } } - insertDeviceImei(preRes, AuthProvider authProv) { + insertDeviceImei(preRes, AuthViewModel authProv) { if (_platformImei != 'Unknown') { var imeiInfo = { "IMEI": _platformImei, @@ -323,7 +323,7 @@ class _LoginFormState extends State { } getProjectsList() { - HospitalProvider projectsProv = Provider.of(context); + HospitalViewModel projectsProv = Provider.of(context); projectsProv.getProjectsList().then((res) { if (res['MessageStatus'] == 1) { setState(() { diff --git a/lib/widgets/auth/show_timer_text.dart b/lib/widgets/auth/show_timer_text.dart index 73590e1e..fd09ec25 100644 --- a/lib/widgets/auth/show_timer_text.dart +++ b/lib/widgets/auth/show_timer_text.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/material.dart'; @@ -24,7 +24,7 @@ class _ShowTimerTextState extends State { int sec = 59; Timer _timer; - AuthProvider authProv; + AuthViewModel authProv; resendCode() { min = TIMER_MIN - 1; @@ -64,7 +64,7 @@ class _ShowTimerTextState extends State { @override Widget build(BuildContext context) { - authProv = Provider.of(context); + authProv = Provider.of(context); return Center( child: Row( mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/widgets/auth/verfiy_account.dart b/lib/widgets/auth/verfiy_account.dart index b4b5e31b..43e9e988 100644 --- a/lib/widgets/auth/verfiy_account.dart +++ b/lib/widgets/auth/verfiy_account.dart @@ -10,7 +10,7 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import '../../config/size_config.dart'; -import '../../providers/auth_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_toast_msg.dart'; @@ -40,7 +40,7 @@ class _VerifyAccountState extends State { }; Future _loggedUserFuture; var _loggedUser; - AuthProvider authProv; + AuthViewModel authProv; bool _isInit = true; var model; TextEditingController digit1 = TextEditingController(text: ""); @@ -64,7 +64,7 @@ class _VerifyAccountState extends State { void didChangeDependencies() { super.didChangeDependencies(); if (_isInit) { - authProv = Provider.of(context); + authProv = Provider.of(context); final routeArgs = ModalRoute.of(context).settings.arguments as Map; model = routeArgs['model']; } @@ -73,7 +73,7 @@ class _VerifyAccountState extends State { @override Widget build(BuildContext context) { - authProv = Provider.of(context); + authProv = Provider.of(context); final focusD1 = FocusNode(); final focusD2 = FocusNode(); final focusD3 = FocusNode(); @@ -335,7 +335,7 @@ class _VerifyAccountState extends State { *@return: *@desc: verify Account func call sendActivationCodeByOtpNotificationType service */ - verifyAccount(AuthProvider authProv, Function changeLoadingStata) async { + verifyAccount(AuthViewModel authProv, Function changeLoadingStata) async { if (verifyAccountForm.currentState.validate()) { changeLoadingStata(true); diff --git a/lib/widgets/auth/verification_methods.dart b/lib/widgets/auth/verification_methods.dart index 22fc5779..2102a125 100644 --- a/lib/widgets/auth/verification_methods.dart +++ b/lib/widgets/auth/verification_methods.dart @@ -6,7 +6,7 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import '../../config/size_config.dart'; -import '../../providers/auth_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/helpers.dart'; @@ -57,7 +57,7 @@ class _VerificationMethodsState extends State { @override Widget build(BuildContext context) { - AuthProvider authProv = Provider.of(context); + AuthViewModel authProv = Provider.of(context); return FutureBuilder( future: Future.wait([_loggedUserFuture]), builder: (BuildContext context, AsyncSnapshot snapshot) { @@ -145,7 +145,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: buildSMSMethod Methods widget */ - Center buildSMSMethod(BuildContext context, AuthProvider authProv) { + Center buildSMSMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_sms_icon.png', @@ -161,7 +161,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: build WhatsApp Methods widget */ - Center buildWhatsAppMethod(BuildContext context, AuthProvider authProv) { + Center buildWhatsAppMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_whatsapp_icon.png', @@ -177,7 +177,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: build FaceID Methods widget */ - Center buildFaceIDMethod(BuildContext context, AuthProvider authProv) { + Center buildFaceIDMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_faceid_icon.png', @@ -193,7 +193,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: build Fingerprint Methods widget */ - Center buildFingerprintMethod(BuildContext context, AuthProvider authProv) { + Center buildFingerprintMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_fingerprint_icon.png', @@ -262,7 +262,7 @@ class _VerificationMethodsState extends State { *@return: *@desc: send Activation Code By Otp Notification Type */ - sendActivationCodeByOtpNotificationType(oTPSendType, AuthProvider authProv) { + sendActivationCodeByOtpNotificationType(oTPSendType, AuthViewModel authProv) { // TODO : build enum for verfication method if (oTPSendType == 1 || oTPSendType == 2) { widget.changeLoadingStata(true); diff --git a/lib/widgets/dashboard/dashboard_item_texts_widget.dart b/lib/widgets/dashboard/dashboard_item_texts_widget.dart index cd52e064..c3e4986d 100644 --- a/lib/widgets/dashboard/dashboard_item_texts_widget.dart +++ b/lib/widgets/dashboard/dashboard_item_texts_widget.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:provider/provider.dart'; import '../shared/rounded_container_widget.dart'; diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index e899d6e8..4ff72904 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:flutter/material.dart'; @@ -40,7 +40,7 @@ class _AppDrawerState extends State { @override Widget build(BuildContext context) { - AuthProvider authProvider = Provider.of(context); + AuthViewModel authProvider = Provider.of(context); return RoundedContainer( child: Container( color: Colors.white, diff --git a/lib/widgets/shared/app_scaffold_widget.dart b/lib/widgets/shared/app_scaffold_widget.dart index 290d18cd..eb61ce30 100644 --- a/lib/widgets/shared/app_scaffold_widget.dart +++ b/lib/widgets/shared/app_scaffold_widget.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/widgets/shared/card_with_bgNew_widget.dart b/lib/widgets/shared/card_with_bgNew_widget.dart index 3c4f3fa4..628a1eb4 100644 --- a/lib/widgets/shared/card_with_bgNew_widget.dart +++ b/lib/widgets/shared/card_with_bgNew_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index a6bbec60..e3110cde 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart';