Commit Graph

2724 Commits (eb2b614f7430b373f058286d4cdacaf785fdb5ed)
 

Author SHA1 Message Date
Mohammad Aljammal eb2b614f74 Merge branch 'flutter_vervion_2_elham' into 'flutter_2_developemt'
Flutter vervion 2 elham

See merge request Cloud_Solution/doctor_app_flutter!748
5 years ago
Mohammad Aljammal 95c7161987 fix flutter 2 issue 5 years ago
Elham Rababah a1ef722954 fix yaml 5 years ago
Elham Rababah 329711a002 fix error to make the code work with flutter 2 5 years ago
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
Mohammad Aljammal ac5ec049da Merge branch 'video_call_and_app_bar' into 'flutter_2_developemt'
Merge video call into flutter_2_development

See merge request Cloud_Solution/doctor_app_flutter!747
5 years ago
Mohammad Aljammal 7f6128b458 fix app bar issues 5 years ago
Mohammad Aljammal 4d3371e882 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/live_care/end_call_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/util/helpers.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/shared/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 78338ebc64 Merge branch 'video-streaming-android' into 'development'
Merge video call into 'development'

See merge request Cloud_Solution/doctor_app_flutter!745
5 years ago
Mohammad Aljammal 327d392f6b Merge branch 'headers_refactor' into 'flutter_2_developemt'
Headers refactor

See merge request Cloud_Solution/doctor_app_flutter!738
5 years ago
Mohammad Aljammal 47dfde6e78 fix patient app bar 5 years ago
Mohammad Aljammal 737d0e9bec Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor
 Conflicts:
	lib/screens/patients/profile/lab_result/laboratory_result_page.dart
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
5 years ago
Mohammad Aljammal 3990ba6ff7 Merge branch 'login_home_design' into 'flutter_2_developemt'
Login home design

See merge request Cloud_Solution/doctor_app_flutter!723
5 years ago
Mohammad Aljammal 387f75b36c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_home_design
 Conflicts:
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
5 years ago
Mohammad Aljammal 0cb82586bd Merge branch 'fix_inpatent_header' into 'development'
fix header

See merge request Cloud_Solution/doctor_app_flutter!744
5 years ago
Mohammad Aljammal 352d3263ac Merge branch 'special_clinic' into 'development'
add loader

See merge request Cloud_Solution/doctor_app_flutter!743
5 years ago
Mohammad Aljammal f9a989b6fd Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android 5 years ago
Mohammad Aljammal 61c94f85b2 fix the end call 5 years ago
mosazaid c585cbb5be fix timer issue 5 years ago
Elham Rababah bf54139647 first procedure 5 years ago
mosazaid 02f43d6e61 fix timer issue 5 years ago
Elham Rababah 8940de50d6 Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2 5 years ago
Elham Rababah 764e2e29f5 first fix from procedure 5 years ago
mosazaid d17316f7b2 fix disconected stream 5 years ago
hussam al-habibeh e4ef47213d Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2 5 years ago
hussam al-habibeh 73f2abbea2 flutter 2 migration 5 years ago
Elham Rababah e4fb83826a fix referral screen in out patient 5 years ago
mosazaid c67f3d10ad fix circle video stream 5 years ago
Elham Rababah 2140f0a229 fix add sick leave 5 years ago
Mohammad Aljammal a08e801918 Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android 5 years ago
Mohammad Aljammal 654a86a9b6 Add App Permissions Utils 5 years ago
mosazaid 3c2abb66c6 add video call permissions 5 years ago
Mohammad Aljammal b66b624f14 Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android
# Conflicts:
#	lib/core/service/VideoCallService.dart
5 years ago
Mohammad Aljammal bed7dee27c fix drop video call issue 5 years ago
mosazaid b8de9c9a14 circle screen fix bug, and mini screen design 5 years ago
Elham Rababah 46d09ee55d Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2 5 years ago
hussam al-habibeh daf125b995 flutter 2 migration 5 years ago
Elham Rababah 52eef31e2e change ios file to make it version 2 works on ios 5 years ago
mosazaid edca552f78 video fix bugs 5 years ago
Elham Rababah 4e6237f2ce fix header from lab 5 years ago
Elham Rababah b9711fce65 fix header from lab result details 5 years ago
Elham Rababah 78903043d9 fix header 5 years ago
Mohammad Aljammal 7614b4aa5c fix the video call issues 5 years ago
Mohammad Aljammal ee7f8e9e42 Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android 5 years ago
Mohammad Aljammal 746f44157e Add video call service 5 years ago
mosazaid 0868de7961 video fix bugs 5 years ago
hussam al-habibeh bb20b4d582 flutter 2 migration 5 years ago
Zohaib Iqbal Kambrani c1de908777 no message 5 years ago
mosazaid 5312c221d1 video fix bugs 5 years ago
Elham Rababah c1ed1dc737 add loader 5 years ago