Commit Graph

59 Commits (eb2b614f7430b373f058286d4cdacaf785fdb5ed)

Author SHA1 Message Date
Elham Rababah ca6306950d Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham
 Conflicts:
	ios/Podfile
	lib/client/base_app_client.dart
	lib/core/model/patient_muse/PatientSearchRequestModel.dart
	lib/core/model/referral/MyReferralPatientModel.dart
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/service/patient/MyReferralPatientService.dart
	lib/core/service/patient/patient_service.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/core/viewModel/PatientMedicalReportViewModel.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/core/viewModel/authentication_view_model.dart
	lib/core/viewModel/dashboard_view_model.dart
	lib/core/viewModel/patient-referral-viewmodel.dart
	lib/core/viewModel/procedure_View_model.dart
	lib/core/viewModel/referred_view_model.dart
	lib/models/livecare/start_call_req.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/auth/login_screen.dart
	lib/screens/auth/verification_methods_screen.dart
	lib/screens/home/dashboard_slider-item-widget.dart
	lib/screens/home/dashboard_swipe_widget.dart
	lib/screens/home/home_page_card.dart
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/live_care/live-care_transfer_to_admin.dart
	lib/screens/live_care/live_care_patient_screen.dart
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/medical-file/medical_file_details.dart
	lib/screens/patients/ECGPage.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
	lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/profile_screen/PatientProfileCardModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/radiology/radiology_details_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/patients/profile/referral/referred-patient-screen.dart
	lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
	lib/screens/patients/profile/soap_update/update_soap_index.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
	lib/screens/prescription/add_favourite_prescription.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_home_screen.dart
	lib/screens/prescription/prescription_item_in_patient_page.dart
	lib/screens/prescription/prescription_items_page.dart
	lib/screens/prescription/prescription_screen.dart
	lib/screens/prescription/prescription_screen_history.dart
	lib/screens/prescription/prescriptions_page.dart
	lib/screens/procedures/ProcedureCard.dart
	lib/screens/procedures/add-favourite-procedure.dart
	lib/screens/procedures/add-procedure-form.dart
	lib/screens/procedures/add_lab_home_screen.dart
	lib/screens/procedures/add_lab_orders.dart
	lib/screens/procedures/add_radiology_order.dart
	lib/screens/procedures/add_radiology_screen.dart
	lib/screens/procedures/base_add_procedure_tab_page.dart
	lib/screens/procedures/entity_list_procedure_widget.dart
	lib/screens/qr_reader/QR_reader_screen.dart
	lib/util/VideoChannel.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/auth/sms-popup.dart
	lib/widgets/auth/verification_methods_list.dart
	lib/widgets/dashboard/out_patient_stack.dart
	lib/widgets/patients/patient-referral-item-widget.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart
	lib/widgets/patients/profile/PatientProfileButton.dart
	lib/widgets/patients/profile/patient-page-header-widget.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/patient-profile-header-new-design.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
	lib/widgets/patients/profile/profile-welcome-widget.dart
	lib/widgets/shared/app_drawer_widget.dart
	lib/widgets/shared/app_scaffold_widget.dart
	lib/widgets/shared/app_texts_widget.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/buttons/app_buttons_widget.dart
	lib/widgets/shared/drawer_item_widget.dart
	pubspec.lock
5 years ago
hussam al-habibeh 110a1983c7 flutter vervion 2 migration 5 years ago
Elham Rababah 60b5d474c1 home design fixes for small and large screen 5 years ago
Elham Rababah cc7fedc8f5 add middle screen height size 5 years ago
Elham Rababah 4dc72d6f35 Merge branches 'development' and 'login_design_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_design_fixes
 Conflicts:
	lib/core/viewModel/authentication_view_model.dart
	lib/widgets/shared/app_drawer_widget.dart
5 years ago
Elham Rababah 9692e54b97 fix login issue
# Conflicts:
#	lib/core/viewModel/authentication_view_model.dart
#	lib/root_page.dart
#	lib/widgets/shared/app_drawer_widget.dart
5 years ago
Elham Rababah 00aa2c3752 fix homepage screen 5 years ago
Elham Rababah 19bac417c4 fix login issue 5 years ago
Elham Rababah 49afc338d6 fix drawer in big screen 5 years ago
Elham Rababah 8d2252ecdf fixes 5 years ago
Elham Rababah 97f7426aee fix drawer design 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 5 years ago
Elham Rababah 515955663a add verification 5 years ago
Mohammad Aljammal 1187c3b605 fix authentication provider 5 years ago
Elham Rababah e0be4ec1be move logout function from helper to authentication view model 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
Elham Rababah a5120b473f rename Auth view model to Doctor Profile View Model 5 years ago
Elham Rababah d5d57e7997 fix new design issue 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Sultan Khan 4ed8f716db dashboard changes 5 years ago
Elham Rababah 2aba9e79f1 small fixes in soap and in all app. 5 years ago
Elham Rababah 9d4584097d fix flag on slider 5 years ago
Elham Rababah eb5e5862ec fix bugs 5 years ago
Elham Rababah b8b3ae5c7f add my code to sideMnue 5 years ago
Elham Rababah d987859865 make allergies as expandable widget 5 years ago
Elham Rababah 2ab012d503 fix drawer issue 5 years ago
Elham Rababah 8beab7d84f finish drawer 5 years ago
Sultan Khan 12dc637163 bug fixes 5 years ago
Sultan Khan bbb1a8ff74 arrival list updated 5 years ago
Sultan Khan 5861d159ac bug fixes 5 years ago
Elham Rababah cfb9ea30cb fix : DA-335 5 years ago
Elham Rababah e652752729 fix : DA-334 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Sultan Khan 735698ce90 bug fixes 5 years ago
Sultan Khan 3c968f0de1 doctor leave 5 years ago
Elham Rababah 9f19b2566f finish refactor provider 5 years ago
Elham Rababah 6e461f7212 refactor Schedule service 5 years ago
Elham Rababah ec3b69f0cb The Patient services Names the words should be in separate line. 5 years ago
Elham Rababah 51206c1164 fix auth with mohammad help 5 years ago
hussam al-habibeh 0e471aaa63 language setup on logout 6 years ago
hussam al-habibeh 5172703a32 setup language on logout 6 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 6 years ago
Elham Rababah bd3ce0a4d4 refactor models 6 years ago
erababah cad096d8c7 fix issue on ios and improve structure by Elham & mohammad 6 years ago
Sultan Khan b26e750abb drawer design updated 6 years ago
Mohammad ALjammal 0dad77bfa2 fix issues in login 6 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 6 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 6 years ago