Commit Graph

285 Commits (0e836c67c8997d6b4fd070b18ec0da15eec98b83)

Author SHA1 Message Date
Mohammad Aljammal 3127a09ecf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 704a4bd0be hot fixes 5 years ago
mosazaid 596f518525 Merge branch 'development' into release-hot-fix
# Conflicts:
#	lib/screens/patients/profile/patient_profile_screen.dart
#	lib/widgets/patients/profile/PatientProfileButton.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
mosazaid bf9ce4694f fix logic 5 years ago
Elham Rababah b2a2884586 Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
hussam al-habibeh 1d09bcf251 hot fixes 5 years ago
Elham Rababah d4ddfa21e5 add the new logic 5 years ago
Mohammad Aljammal 0ded3a5a03 hot fixes 5 years ago
Mohammad Aljammal 9e8aef0835 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 8350d68397 Merge branch 'progress_note' into 'development'
add condition

See merge request Cloud_Solution/doctor_app_flutter!545
5 years ago
Mohammad Aljammal b37c607813 done the referral service 5 years ago
Elham Rababah 79037d8fc7 add condition 5 years ago
Mohammad Aljammal 650a949c6a Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!542
5 years ago
Elham Rababah 9d780f72b4 remove commented code 5 years ago
Mohammad Aljammal 36189adf94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card.dart
5 years ago
Elham Rababah 8d7fef3db9 fix some issue on progress_note_screen 5 years ago
mosazaid 2bf003c100 Merge branch 'development' into in-patient-changes 5 years ago
mosazaid 33545d1180 work on in paitent referral 5 years ago
Mohammad Aljammal fd790978c4 add new referral service 5 years ago
Elham Rababah acc3ecdbbe cancel progress_note part 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
Elham Rababah f2011301c6 update progress_note 5 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 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 b6a6f16b31 add vital sign inPatient 5 years ago
mosazaid 37edd8cef9 add in-patient cards and header 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 0260b92f24 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!528
5 years ago
Elham Rababah bd01624f5a create New order widget 5 years ago
mosazaid 4b3c5b9f37 Merge branch 'development' into app-changes 5 years ago
mosazaid dde8d9aa48 design hot fixes 5 years ago
mosazaid 54482bfb1d hot fix 5 years ago
Sultan Khan 6f52c9a7fd fixe 5 years ago
hussam al-habibeh 89451a3c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/medical-file/medical_file_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid 8ae0a91c05 working on text widget 5 years ago
hussam al-habibeh 17c878fa4c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/patients/profile/lab_result/lab_orders_screen.dart
	lib/screens/patients/profile/refer_patient_screen.dart
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
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
hussam al-habibeh ebe05226e9 Delteing unused file & refactoring routes page 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 b8f6c35e75 working on buttons widgets 5 years ago
mosazaid 9f61c7eaa0 Merge branch 'design-fixes' into development 5 years ago
mosazaid 65585ab586 add charts to procedures 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Elham Rababah 59ec9d8e56 first step from change text fields 5 years ago