Commit Graph

889 Commits (b015cb06f7262bbcc4a6876e07995673db77d9fa)

Author SHA1 Message Date
mosazaid ec9f628b67 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Elham Rababah f80215b6bb fix doctor id spelling in live care service, fix colors in 5 years ago
mosazaid ea0658c05c Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/viewModel/procedure_View_model.dart
5 years ago
Mohammad Aljammal 6439bb9a90 Merge branch 'favourite_prescription' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!719
5 years ago
hussam al-habibeh 4af94e6b71 hot fix 5 years ago
Elham Rababah 8dbfb92f88 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_appointment
 Conflicts:
	ios/Podfile.lock
5 years ago
Elham Rababah fb6ef8fca1 fix appointment in live care 5 years ago
mosazaid 9454e9d8af working on procedure refactoring 5 years ago
mosazaid c82a4a05d5 medical report design changes 5 years ago
mosazaid c7ce4676f6 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 59e06f53af hot fix 5 years ago
Mohammad Aljammal 6e660883f6 Fix medical report 5 years ago
mosazaid 1b2e158a24 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 54fbe76c7b medical report fixes and vital sign 5 years ago
Mohammad Aljammal e336821f65 fix lab result 5 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 5 years ago
Mohammad Aljammal 725c87fe8b Add favorite procedure templates for lab and radiology 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 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
mosazaid 41515b311c lab-result-fixes 5 years ago
Mohammad Aljammal e89d5b13ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services 5 years ago
Mohammad Aljammal 169e5301a0 Merge branch 'lab-result-special' into 'development'
lab-result-special

See merge request Cloud_Solution/doctor_app_flutter!692
5 years ago
Mohammad Aljammal ac701c9806 fix live care issues 5 years ago
mosazaid 73cf681e9d lab-result-special 5 years ago
Elham Rababah 69eca869b4 fix error after merge 5 years ago
Elham Rababah fdc23ce932 Merge branches 'development' and 'live_care_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_patient
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Elham Rababah 401516403f first step from show Video call 5 years ago
mosazaid 957cf96c16 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 8b2c7f1a05 livecare 5 years ago
Elham Rababah 1367f2bebb add translation 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
Elham Rababah d49d52458b fix birthOfDate 5 years ago
mosazaid 67e0cac742 add livecare to home 5 years ago
Elham Rababah 342477beda add rich editor for MedicalReportPage 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
mosazaid deb126fdd5 meical report changes 5 years ago
Mohammad Aljammal a97a331d87 fix bugs in change the clinic, login page when get the projects and add the special Result 5 years ago
Mohammad Aljammal 57fcd2cdeb fix home page design 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
mosazaid 6192d9a84f working on medical-profile 5 years ago
Elham Rababah 9b34c2c833 first step from live care 5 years ago
Mohammad Aljammal 8ac040a809 hot fix 5 years ago
Mohammad Aljammal 42275b41fd Merge branch 'load_medical_report' into 'development'
Load medical report

See merge request Cloud_Solution/doctor_app_flutter!665
5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
mosazaid 0e2b700136 vital sign hot fix 5 years ago
mosazaid 25fb8ea5ae hot fix 5 years ago
Mohammad Aljammal 8541ddc0f8 fix LabOrderResult 5 years ago
Mohammad Aljammal 8653d54a0d Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration

See merge request Cloud_Solution/doctor_app_flutter!658
5 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 5 years ago
Mohammad Aljammal b3ae86db31 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/ReferralDischargedPatientDetails.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/patients_screen.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/prescription/update_prescription_form.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/widgets/patients/PatientCard.dart
	pubspec.lock
5 years ago
mosazaid 0bfa74f1c9 ucaf-change 5 years ago
Mohammad Aljammal b871009033 Merge branch 'feature-modeical_profile' into 'development'
Feature modeical profile

See merge request Cloud_Solution/doctor_app_flutter!654
5 years ago
Mohammad Aljammal 74ded739c8 fix imports 5 years ago
hussam al-habibeh bc340693ba project refactoring 5 years ago
hussam al-habibeh 9457e04825 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/sick-leave/add-sickleave.dart
5 years ago
mosazaid 444afa464e working on feature medical profile 5 years ago
Elham Rababah 7af300d455 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Mohammad Aljammal aab7808468 add medical report page design 5 years ago
Elham Rababah a5120b473f rename Auth view model to Doctor Profile View Model 5 years ago
Mohammad Aljammal 086ca517d2 Add Medical Report Page 5 years ago
Mohammad Aljammal 16519d0ccf hot fix 5 years ago
Mohammad Aljammal bf86fcc168 fix in note and AddReplayOnReferralPatient 5 years ago
Mohammad Aljammal 5705c02bfd Merge branch 'fix_out_number' into 'development'
fix out patient number

See merge request Cloud_Solution/doctor_app_flutter!639
5 years ago
Elham Rababah 583edfed89 fix out patient number 5 years ago
Mohammad Aljammal 09d9f1ce25 Merge branch 'inpatient-hot-fix' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!638
5 years ago
mosazaid 81d518e725 hot fix 5 years ago
Sultan Khan f84bc6da9d voice command uodated 5 years ago
Sultan Khan b66d9d1ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5a42184716 voice commad updated 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
Elham Rababah 1a1757f841 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter 5 years ago
mosazaid 802bd83ddd design-changes 5 years ago
Elham Rababah 607da6af66 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
5 years ago
Elham Rababah c3c4b66271 refactor search file name 5 years ago
Elham Rababah 7559ab31c0 fix out patient + fix steper in arabic 5 years ago
mosazaid a61cae4922 Merge branch 'development' into design-changes 5 years ago
mosazaid 6fba03ed69 design fixes 5 years ago
Mohammad Aljammal 866f6cc8ea Merge branch 'add_out_patient_filter' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!630
5 years ago
Elham Rababah 8e4d9d9692 hot fix 5 years ago
mosazaid 3295143840 Merge branch 'development' into design-changes 5 years ago
mosazaid eb74002cf0 hot fix 5 years ago
Mohammad Aljammal c6ac829813 hot fixes in PatientReferralScreen 5 years ago
Mohammad Aljammal 88b8454afe Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
5 years ago
mosazaid 7eea1bf4a5 Merge branch 'development' into design-changes
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid b43b7cafcc working on in-patient screen design 5 years ago
Mohammad Aljammal 0d71378400 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Elham Rababah 7bc897bf39 fix profile issue 5 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 5 years ago
Elham Rababah 0b473f630f translate progress_note_screen 5 years ago
Elham Rababah d5d57e7997 fix new design issue 5 years ago
Mohammad Aljammal 2978aeecb2 fix the tab bar 5 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 5 years ago
Mohammad Aljammal 2c81941428 Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter

See merge request Cloud_Solution/doctor_app_flutter!622
5 years ago
Elham Rababah eebaf01570 fix diff msg 5 years ago
Elham Rababah 01bd55366a date difference 5 years ago
Elham Rababah f4020af4f8 date fix 5 years ago
Elham Rababah 4d87c6fb75 date fix 5 years ago
Elham Rababah 7337dc4f87 date picker 5 years ago
Mohammad Aljammal b1f1b7e34d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
Mohammad Aljammal ed3449bcf4 fix the doctor card in lab result and radiology 5 years ago
Mohammad Aljammal 04be0a7fc6 Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter

See merge request Cloud_Solution/doctor_app_flutter!620
5 years ago
hussam al-habibeh b5bebea932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh c86a3dabda page translation 5 years ago
Elham Rababah f0457f4e99 finish filter page 5 years ago
Elham Rababah dcdbe76e54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issus_soap
 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
5 years ago
Elham Rababah 0f8820fa44 fix profile screen and start the first step from filter page 5 years ago
mosazaid 68f405cb21 design fixes 5 years ago
mosazaid 55895496e1 Merge branch 'design-changes' into development 5 years ago
mosazaid 3d6b55681a fix arabic and font style 5 years ago
Mohammad Aljammal 4613de5fe1 Merge branch 'fix_issus_soap' into 'development'
Fix issus soap

See merge request Cloud_Solution/doctor_app_flutter!617
5 years ago
Mohammad Aljammal 16717ede58 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/doctor_app_flutter!616
5 years ago
Elham Rababah 7c2889c5d2 fix height issue 5 years ago
Haroon Amjad 0244334bb5 Update on store 5 years ago
Elham Rababah 8e9687c2ed fix issue on add examination 5 years ago
Elham Rababah 30bc9b4bea fix issue 5 years ago
Mohammad Aljammal f08a91b0b8 Merge branch 'in-patient_re-design' into 'development'
In patient re design

See merge request Cloud_Solution/doctor_app_flutter!608
5 years ago
Haroon Amjad 53a610213c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/home/home_screen.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/auth/verfiy_account.dart
5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Elham Rababah bfd36b1c77 fix scrolling step 3 5 years ago
Elham Rababah cfe3056f17 fix scrolling step 2 5 years ago
Elham Rababah 72bf5d2337 fix scrolling in patient screen 5 years ago
Elham Rababah acb1bdbb37 fix 5 years ago
Elham Rababah b6d1c698e2 fix 5 years ago
Elham Rababah d37051ebe0 fix button 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
mosazaid b91d41428f Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 4f6fec07da vital sign fix bug 5 years ago
Mohammad Aljammal ef70a8f15d Merge branch 'referral_in_patient' into 'development'
Referral in patient

See merge request Cloud_Solution/doctor_app_flutter!607
5 years ago
Mohammad Aljammal a1a500813b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 21fd90ea8c hot fixes 5 years ago
Elham Rababah 4c493d8ea6 fix issue in patients_screen 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
Elham Rababah 05a3ca7300 add doctor profile 5 years ago
Mohammad Aljammal 3e2323fbc0 Merge branch 'referral_in_patient' into 'development'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!605
5 years ago
Mohammad Aljammal debfc02af0 Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!604
5 years ago
Mohammad Aljammal c3ac50a859 hot fixes 5 years ago
Elham Rababah 29831e8207 return code back 5 years ago
Elham Rababah 48471bbc07 fix small 5 years ago
Elham Rababah a91d64f103 samll fix 5 years ago
Mohammad Aljammal 7346c9b0c3 Merge branch 'in_patient_services' into 'development'
add procedure form update

See merge request Cloud_Solution/doctor_app_flutter!603
5 years ago
hussam al-habibeh 8a564b34ac add procedure form update 5 years ago
Mohammad Aljammal 85288cc014 Add filter in outpatient 5 years ago
Mohammad Aljammal 3c4f7654a1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal f4fd4b26d6 Add filter in outpatient 5 years ago
Mohammad Aljammal 17512e372f Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!600
5 years ago
Elham Rababah b6e698d4e4 fix header 5 years ago
Mohammad Aljammal ac4df7b9d8 Merge branch 'referral_in_patient' into 'development'
Referral in patient

See merge request Cloud_Solution/doctor_app_flutter!599
5 years ago
Mohammad Aljammal 3af47304b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago