Commit Graph

1036 Commits (fa830cf4da8302b76f3c5276e0b948d2f8d3d9c9)

Author SHA1 Message Date
mosazaid 50b4b8eb50 dashboard change 5 years ago
mosazaid 27f940b473 home design 5 years ago
mosazaid 12bb283a68 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 72ee88d567 working on dashboard 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 2023ce9b55 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/core/viewModel/dashboard_view_model.dart
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 95a6893b59 home design 5 years ago
Mohammad Aljammal 74ded739c8 fix imports 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 b10fe8112a Merge branch 'development' into home-refactoring 5 years ago
mosazaid 2cf77bac85 fit dashboard design 5 years ago
hussam al-habibeh d2814f610e hot fix 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
mosazaid 34a7c0b148 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 4ce9a3c5bf finish home-refactoring 5 years ago
Mohammad Aljammal 16519d0ccf hot fix 5 years ago
mosazaid 0d86759245 working on dashboard re-factoring 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
Mohammad Aljammal d6e621e4ce Merge branch 'design-changes' into 'development'
Design changes

See merge request Cloud_Solution/doctor_app_flutter!635
5 years ago
Mohammad Aljammal a82775fc61 Merge branch 'app_translation' into 'development'
SMS Popup design fix

See merge request Cloud_Solution/doctor_app_flutter!634
5 years ago
mosazaid 802bd83ddd design-changes 5 years ago
hussam al-habibeh 1bcc643fb9 SMS Popup design fix 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
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 fba71b69ce Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah 7bc897bf39 fix profile issue 5 years ago
Mohammad Aljammal 82544cb2e7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 5 years ago
hussam al-habibeh c24bb604d4 DashBoard design fix 5 years ago
Elham Rababah d5d57e7997 fix new design issue 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
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
Elham Rababah fe581ae7ce remove button height 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 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
Elham Rababah 30bc9b4bea fix issue 5 years ago