Commit Graph

306 Commits (81ae0b04d3b535b745778bdac658212e217e221b)

Author SHA1 Message Date
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
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
Elham Rababh 97a15bfb35 first step form confirmation page 4 years ago
mosazaid 7b8312fe26 make register patient feature 4 years ago
Elham Rababh a44a207116 finish the operation Reports from our side 4 years ago
Elham Rababh 8a0e94c854 match the design as xd 4 years ago
Elham Rababh 29336a9ef3 fix the design of all sick leave 4 years ago
mosazaid 136313ac72 design fixes for lab result 4 years ago
Elham Rababh b119590e39 Doctor replay add info status 99 4 years ago
mosazaid 702bb5b8da fix design 4 years ago
Elham Rababh 5e90f14a89 add translation 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 a0bc5b73de patient profile aligment fix 4 years ago
Elham Rababh 5a91f6a25b fix issues 4 years ago
Elham Rababh 50e8e7b0d6 add translation to text status 4 years ago
Mohammad Aljammal d5cff77743 fix login issue and add new localizedValues 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 943463b1d9 add pagination to doctor replay 4 years ago
Mohammad Aljammal 794c935d05 Merge branch 'fixes_before_live' into 'development'
fix show count in home page

See merge request Cloud_Solution/doctor_app_flutter!794
4 years ago
mosazaid 0fb4b4a890 add copy to selected texts 4 years ago
Elham Rababh 1712874c87 fix show count in home page 4 years ago
Elham Rababh 14a0911aec fix first step from Soap 5 years ago
Elham Rababh 88b04a8f5d fix stepper labels and translate it. 5 years ago
Elham Rababh d0d6874159 create mapper for the selected items 5 years ago
Elham Rababh c7c6314a8d finish create episode fixes 5 years ago
hussam al-habibeh 07835aaa1b medical report changes 5 years ago
Mohammad Aljammal e70eabe68d Fix live care issues and qr code 5 years ago
hussam al-habibeh e5056c5d93 fix flutter 2 migration 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
mosazaid 10441e4af0 referral changes 5 years ago
Elham Rababah f81e0b58cb Merge branches 'development' and 'login_home_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_home_design
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah d57b331df2 add timer 5 years ago
mosazaid b36ddf9317 add prescription to procedure type 5 years ago
mosazaid 9454e9d8af working on procedure refactoring 5 years ago
Elham Rababah 8e656dbc0d some design fixes 5 years ago
Mohammad Aljammal e336821f65 fix lab result 5 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 5 years ago
Mohammad Aljammal ad036f7133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into text-form-field
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 281a807ec8 fix live care 5 years ago
mosazaid 41515b311c lab-result-fixes 5 years ago
Mohammad Aljammal ac701c9806 fix live care issues 5 years ago
mosazaid 957cf96c16 Merge branch 'development' into medical-profile-services 5 years ago
Elham Rababah 1367f2bebb add translation 5 years ago
mosazaid 0ed0dbb5aa livecare changes 5 years ago
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal a525787c19 Merge branch 'live_care' into 'development'
Live care

See merge request Cloud_Solution/doctor_app_flutter!668
5 years ago
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
5 years ago
Elham Rababah 56698a82fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
 Conflicts:
	lib/core/service/home/auth_service.dart
	lib/core/viewModel/auth_view_model.dart
	lib/core/viewModel/imei_view_model.dart
	lib/locator.dart
	lib/screens/auth/login_screen.dart
	lib/screens/home/home_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/widgets/auth/verification_methods.dart
5 years ago