Commit Graph

740 Commits (ipd-changes-for-vida-plus)

Author SHA1 Message Date
Elham Rababh efe25b898d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes 4 years ago
hussam al-habibeh 658a28e558 referal patient card design fix 4 years ago
Elham Rababh 753a72b85e add missing code 4 years ago
Elham Rababh fc126caddf first step from patient profile 4 years ago
Elham Rababh 9e1aeb857f Patient card 4 years ago
Elham Rababh 98f6d63fcd add simibold 4 years ago
Elham Rababh 52bd1511e8 fix patient card 4 years ago
Elham Ali 4760d4ae50 Merge branch 'Dec_fixes' into 'development'
change the green color

See merge request Cloud_Solution/doctor_app_flutter!914
4 years ago
Elham Rababh 3d379b3b84 change the green color 4 years ago
hussam al-habibeh 3bfee08b9d textfiled and app button design change 4 years ago
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
4 years ago
Elham Rababh 1f28a09043 first step from fix screen 4 years ago
Elham Rababh dc0f3e7235 fix utils && widget 4 years ago
Elham Rababh 7f9969b6cf some fixes to go flutter 2 4 years ago
Elham Rababh 47437c8637 some fixes to go flutter 2 4 years ago
Elham Rababh a6153db2f9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/localized_values.dart
	lib/config/size_config.dart
	lib/core/model/Prescriptions/prescription_report.dart
	lib/core/model/Prescriptions/prescription_report_enh.dart
	lib/core/model/auth/activation_Code_req_model.dart
	lib/core/model/auth/activation_code_for_verification_screen_model.dart
	lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
	lib/core/model/auth/check_activation_code_request_model.dart
	lib/core/model/labs/lab_result.dart
	lib/core/model/patient_muse/PatientSearchRequestModel.dart
	lib/core/model/procedure/get_ordered_procedure_request_model.dart
	lib/core/model/referral/MyReferralPatientModel.dart
	lib/core/model/sick_leave/sick_leave_patient_model.dart
	lib/core/model/sick_leave/sick_leave_patient_request_model.dart
	lib/core/service/VideoCallService.dart
	lib/core/service/base/base_service.dart
	lib/core/service/home/scan_qr_service.dart
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/service/patient/MyReferralPatientService.dart
	lib/core/service/patient/patient-doctor-referral-service.dart
	lib/core/service/patient_medical_file/lab_order/labs_service.dart
	lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
	lib/core/service/patient_medical_file/prescription/prescriptions_service.dart
	lib/core/service/patient_medical_file/procedure/procedure_service.dart
	lib/core/service/patient_medical_file/radiology/radiology_service.dart
	lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart
	lib/core/service/patient_medical_file/soap/SOAP_service.dart
	lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/core/viewModel/SOAP_view_model.dart
	lib/core/viewModel/authentication_view_model.dart
	lib/core/viewModel/base_view_model.dart
	lib/core/viewModel/dashboard_view_model.dart
	lib/core/viewModel/doctor_replay_view_model.dart
	lib/core/viewModel/labs_view_model.dart
	lib/core/viewModel/patient-referral-viewmodel.dart
	lib/core/viewModel/patient-ucaf-viewmodel.dart
	lib/core/viewModel/prescription_view_model.dart
	lib/core/viewModel/prescriptions_view_model.dart
	lib/core/viewModel/procedure_View_model.dart
	lib/core/viewModel/sick_leave_view_model.dart
	lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
	lib/models/SOAP/GetPhysicalExamReqModel.dart
	lib/models/SOAP/my_selected_allergy.dart
	lib/models/SOAP/my_selected_assement.dart
	lib/models/SOAP/my_selected_examination.dart
	lib/models/SOAP/my_selected_history.dart
	lib/models/SOAP/post_chief_complaint_request_model.dart
	lib/models/SOAP/post_physical_exam_request_model.dart
	lib/models/doctor/list_gt_my_patients_question_model.dart
	lib/models/doctor/profile_req_Model.dart
	lib/models/doctor/replay/request_doctor_reply.dart
	lib/models/livecare/start_call_res.dart
	lib/models/patient/patiant_info_model.dart
	lib/models/patient/progress_note_request.dart
	lib/models/patient/vital_sign/vital_sign_req_model.dart
	lib/models/pharmacies/pharmacies_items_request_model.dart
	lib/screens/auth/verification_methods_screen.dart
	lib/screens/doctor/doctor_repaly_chat.dart
	lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
	lib/screens/doctor/doctor_reply_screen.dart
	lib/screens/doctor/my_referral_patient_screen.dart
	lib/screens/home/dashboard_swipe_widget.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_patient_screen.dart
	lib/screens/live_care/video_call.dart
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/InPatientPage.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_header.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.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/lab_result/FlowChartPage.dart
	lib/screens/patients/profile/lab_result/LabResultWidget.dart
	lib/screens/patients/profile/lab_result/laboratory_result_page.dart
	lib/screens/patients/profile/lab_result/laboratory_result_widget.dart
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/notes/note/progress_note_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/radiology/radiology_details_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.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/assessment/add_assessment_details.dart
	lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
	lib/screens/patients/profile/soap_update/objective/examination_item_card.dart
	lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/steps_widget.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart
	lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
	lib/screens/patients/profile/soap_update/subjective/history/priority_bar.dart
	lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart
	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
	lib/screens/patients/profile/soap_update/update_soap_index.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_item_in_patient_page.dart
	lib/screens/prescription/prescription_text_filed.dart
	lib/screens/prescription/prescriptions_page.dart
	lib/screens/procedures/ProcedureCard.dart
	lib/screens/procedures/add-favourite-procedure.dart
	lib/screens/procedures/procedure_checkout_screen.dart
	lib/screens/procedures/procedure_screen.dart
	lib/screens/reschedule-leaves/add-rescheduleleave.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/screens/sick-leave/show-sickleave.dart
	lib/screens/sick-leave/sick_leave.dart
	lib/util/VideoChannel.dart
	lib/util/date-utils.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/patient-referral-item-widget.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/PatientProfileButton.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/profile-welcome-widget.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/patients/profile/profile_medical_info_widget_search.dart
	lib/widgets/patients/profile/profile_status_info_widget.dart
	lib/widgets/shared/app_texts_widget.dart
	lib/widgets/shared/bottom_nav_bar.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/buttons/app_buttons_widget.dart
	lib/widgets/shared/card_with_bg_widget.dart
	lib/widgets/shared/dialogs/dailog-list-select.dart
	lib/widgets/shared/dialogs/master_key_dailog.dart
	lib/widgets/shared/doctor_card.dart
	lib/widgets/shared/doctor_card_insurance.dart
	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
	lib/widgets/shared/master_key_checkbox_search_widget.dart
	lib/widgets/shared/rounded_container_widget.dart
	lib/widgets/shared/text_fields/app-textfield-custom.dart
	lib/widgets/shared/text_fields/text_fields_utils.dart
	lib/widgets/shared/user-guid/custom_validation_error.dart
	lib/widgets/transitions/fade_page.dart
	lib/widgets/transitions/slide_up_page.dart
	pubspec.lock
	pubspec.yaml
4 years ago
Mohammad Aljammal dd4eb2f76d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!846
4 years ago
mosazaid 2274affd9a design fixes 4 years ago
Mohammad Aljammal 3cd4973eab Merge branch 'design-fixes' into 'development'
design fixes for lab result

See merge request Cloud_Solution/doctor_app_flutter!843
4 years ago
mosazaid 62ee6dff3a design fixes for lab result 4 years ago
Mohammad Aljammal 6002e22d6d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!841
4 years ago
mosazaid 4663a65fd6 design fixes 4 years ago
hussam al-habibeh 7be6ef6ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
 Conflicts:
	pubspec.lock
4 years ago
hussam al-habibeh 288bef5a5f fix all special result 4 years ago
mosazaid 702bb5b8da fix design 4 years ago
Mohammad Aljammal c1103f26fa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
hussam al-habibeh 6eecb4a614 adding cashed network image 4 years ago
hussam al-habibeh 696b8b89ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in-patient-medication
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
hussam al-habibeh ba275eaed4 adding cashed network image 4 years ago
Elham Rababh a1f9729091 in patient list improve performace 4 years ago
mosazaid c608b5601d add arrow to patient card 4 years ago
Mohammad Aljammal 835c8cd77d Merge branch 'fix_bugs_new' into 'development'
UI fix design

See merge request Cloud_Solution/doctor_app_flutter!814
4 years ago
mosazaid 4ce6ff8d7d ui lab result history chart page 4 years ago
mosazaid cdbd905a62 ui fix design 4 years ago
Elham Rababh 8eb9401941 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_status
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababh 1f3d1f68fb change the status of replay 4 years ago
hussam al-habibeh 0deca4f624 patient profile aligment fix 4 years ago
hussam al-habibeh a0bc5b73de patient profile aligment fix 4 years ago
hussam al-habibeh 5241273303 all lab special result 4 years ago
mosazaid 0625de2b15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
mosazaid ac4a68600c working on lab result new service 4 years ago
Elham Rababh 1c2ccd9149 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_before_live
 Conflicts:
	lib/widgets/patients/profile/patient-profile-app-bar.dart
4 years ago
Elham Rababh c17f9fb91d add copy to patient cart 4 years ago
Elham Rababh a5f3731b9a first step from fixing header 4 years ago
hussam al-habibeh de6936efb8 Profile app bar copying & lab result 4 years ago
mosazaid 0fb4b4a890 add copy to selected texts 4 years ago
Elham Rababh 1c45fcea22 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes
 Conflicts:
	lib/core/viewModel/authentication_view_model.dart
4 years ago
Elham Rababh e58ce34aa4 move bottom sheet to index page 4 years ago
Elham Rababh 0780cafcca fixes issues in small devices 4 years ago
Elham Rababh 6b65de77e9 fix design issues on diff pages inside soap 4 years ago
hussam al-habibeh cac949f402 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical_report_changes
 Conflicts:
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
4 years ago
hussam al-habibeh 64a7aca228 adding google anlyatic to doctor app 4 years ago
Mohammad Aljammal 5a61a3eaba Add missing page tob google analytics 4 years ago
mosazaid 405a363e28 referral change 4 years ago
Elham Rababah 1af52dc5b7 fix referral patient 4 years ago
hussam al-habibeh c9a95188ce Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_2_developemt 5 years ago
hussam al-habibeh 6c6b043571 flutter 2 migration fix 5 years ago
Elham Rababah b8c7ce2920 fix header 5 years ago
Elham Rababah 02307e8fac fix header and verification method 5 years ago
hussam al-habibeh 550d54c034 flutter 2 migration fix 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 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 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 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
Elham Rababah e4fb83826a fix referral screen in out patient 5 years ago
hussam al-habibeh daf125b995 flutter 2 migration 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 746f44157e Add video call service 5 years ago
hussam al-habibeh bb20b4d582 flutter 2 migration 5 years ago
mosazaid 550b4a848d Merge branch 'development' into video-streaming-android 5 years ago
Elham Rababah fee36336d8 fix out patient header 5 years ago
mosazaid 883778d278 video call 5 years ago
mosazaid 13ee7f6491 Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android
 Conflicts:
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/util/VideoChannel.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
5 years ago
Elham Rababah 148657e06b small fix 5 years ago
Elham Rababah 9328724167 fix height patient app header 5 years ago
Elham Rababah 6fd9af9b26 change the name of the file 5 years ago
Elham Rababah 07857b28cd change the code of header profile to new implementation 5 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 5 years ago
Elham Rababah 712a742aa2 fix small issue 5 years ago
Elham Rababah 161cb1e872 fix profile height size 5 years ago
Elham Rababah 411746da98 remove patient type and arrival type form patient profile header 5 years ago
Zohaib Iqbal Kambrani 1b4988e5f0 no message 5 years ago
Elham Rababah bc53ca7b8a fix appointment date in header 5 years ago
Elham Rababah 3fefcf60d7 match the app header design 5 years ago
hussam al-habibeh 110a1983c7 flutter vervion 2 migration 5 years ago
Elham Rababah 132565c298 Merge branches 'development' and 'headers_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor 5 years ago
mosazaid c44b3d74bb reply changes 5 years ago
Elham Rababah 717468b637 fix design issue 5 years ago
Elham Rababah 57399c3dcb fix issues in header 5 years ago
Elham Rababah 95425d9568 fix issues in header 5 years ago
Elham Rababah 6aef8b5878 first step refactor headers 5 years ago
Elham Rababah 354a1f2dec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah ca0cc745d5 remove headers 5 years ago
Elham Rababah 23feb2c354 remove unused code 5 years ago
mosazaid 1b47b60155 Merge branch 'development' into reply-doctor_changes
# Conflicts:
#	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
5 years ago