Commit Graph

583 Commits (2e0f6aad5caef9ae3ec0a9dd311b474121742b65)

Author SHA1 Message Date
mosazaid 663c8d1104 Merge branch 'development' into referral-outpatient 5 years ago
Elham Rababah 8a8b55d2de move show timer to its own file 5 years ago
Elham Rababah 792c85e28a fix live care icon size 5 years ago
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
Elham Rababah d57b331df2 add timer 5 years ago
mosazaid c82a4a05d5 medical report design changes 5 years ago
mosazaid b16dc2092b liveCare cahnges 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
Elham Rababah d49d52458b fix birthOfDate 5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 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 a525787c19 Merge branch 'live_care' into 'development'
Live care

See merge request Cloud_Solution/doctor_app_flutter!668
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
Elham Rababah 9b34c2c833 first step from live care 5 years ago
Elham Rababah 0adcfeccce fix auth bug 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 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
Elham Rababah 7af300d455 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Elham Rababah a5120b473f rename Auth view model to Doctor Profile View Model 5 years ago
Mohammad Aljammal 16519d0ccf hot fix 5 years ago
mosazaid 802bd83ddd design-changes 5 years ago
mosazaid 6fba03ed69 design fixes 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
Mohammad Aljammal 27a3dd1eb4 fix the filter page 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
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 3d6b55681a fix arabic and font style 5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Elham Rababah 72bf5d2337 fix scrolling in patient screen 5 years ago
Elham Rababah acb1bdbb37 fix 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
Mohammad Aljammal c3ac50a859 hot fixes 5 years ago
Mohammad Aljammal 85288cc014 Add filter in outpatient 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
Mohammad Aljammal 8d652372ff Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!598
5 years ago
Mohammad Aljammal 3927c40d7e Fix Patient Profile 5 years ago
Elham Rababah 403fece008 commit things 5 years ago
Mohammad Aljammal cab9cddef0 Merge branch 'in_patient_services' into 'development'
Search Profile Patient update

See merge request Cloud_Solution/doctor_app_flutter!596
5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago