Commit Graph

901 Commits (8d7fef3db93c1309361eb118c3ceb4f5d732ea2e)

Author SHA1 Message Date
Elham Rababah 8d7fef3db9 fix some issue on progress_note_screen 5 years ago
Elham Rababah 4a263dda8a Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 82285ccf39 show progress_note part 5 years ago
Mohammad Aljammal e4aae762cc Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!536
5 years ago
mosazaid 34e9a3797c Merge branch 'development' into in-patient-changes 5 years ago
Sultan Khan 822dc7da77 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan feef001323 bug fixes 5 years ago
Mohammad Aljammal bb8ad61b95 Merge branch 'in_patient_services' into 'development'
Prescriptions for in patient

See merge request Cloud_Solution/doctor_app_flutter!534
5 years ago
hussam al-habibeh 017074ba56 Prescriptions for in patient 5 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 5 years ago
Sultan Khan e445b5bb60 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan b52ba524a3 updated 5 years ago
Elham Rababah 0909879ccf Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 5 years ago
Elham Rababah 5199104d7a show progress_note 5 years ago
mosazaid 351c9b5e5c Merge branch 'development' into in-patient-changes
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/home/home_screen.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid b6a6f16b31 add vital sign inPatient 5 years ago
mosazaid 37edd8cef9 add in-patient cards and header 5 years ago
Sultan Khan bf812a77de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 360b4d22cf in patient change 5 years ago
Elham Rababah e1eaab6a8e fix medical profile_medical_info 5 years ago
Elham Rababah f4ce9eb004 Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology 5 years ago
Elham Rababah 67abe2a5e7 first step from radiology 5 years ago
Mohammad Aljammal a95bb8be04 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!529
5 years ago
Sultan Khan 5afb44adfd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 3aabb1537c in patient 5 years ago
Elham Rababah bd01624f5a create New order widget 5 years ago
Elham Rababah 0c74bc4c60 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor 5 years ago
Elham Rababah dcd1605649 add error Msg 5 years ago
Mohammad Aljammal 762fe14c37 Merge branch 'app-changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!525
5 years ago
mosazaid 51234b8059 hot fix 5 years ago
mosazaid 21ef5ee56a hot fix 5 years ago
Mohammad Aljammal 175168d56a Merge branch 'app-changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!524
5 years ago
mosazaid 6c3cb8cc94 hot fix 5 years ago
Sultan Khan 6f52c9a7fd fixe 5 years ago
Sultan Khan cacb619f02 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 4a8ae97518 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 0ea66c4483 bug fixes 5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid 8ae0a91c05 working on text widget 5 years ago
mosazaid bbe94d2b9b Merge branch 'development' into design-fixes
# Conflicts:
#	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/refer_patient_screen.dart
#	lib/screens/patients/profile/referral/refer-patient-screen.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
#	lib/screens/prescription/add_prescription_form.dart
#	lib/screens/prescription/prescription_warnings.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
5 years ago
mosazaid 10baff8d59 button fixes 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Elham Rababah 2a7daadead fix after merge 5 years ago
Elham Rababah 7579a21b83 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
 Conflicts:
	lib/widgets/auth/login_form.dart
5 years ago
Elham Rababah 8220ef7700 add auto complete search 5 years ago
mosazaid af9bd53feb Merge branch 'development' into design-fixes
# Conflicts:
#	lib/widgets/auth/login_form.dart
5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Sultan Khan f6e0e1b0cd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan fda75c721d bug fixes 5 years ago