Commit Graph

157 Commits (ebc5ba7743c2d59cd40c67190e158ddab5b8a3e0)

Author SHA1 Message Date
mosazaid ebc5ba7743 some fixes 4 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!271
4 years ago
Mohammad Aljammal fbd509d6ec Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!272
4 years ago
hussam al-habibeh fb8381ea61 bugs fix 4 years ago
Elham Rababah a5bccddf55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 4 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 63e8ee8dd0 sick leave 4 years ago
hussam alhababieh 3c55af7adc Merge branch 'development' into 'tasks-translation'
# Conflicts:
#   lib/screens/prescription/add_prescription_form.dart
4 years ago
Elham Rababah 00543a759a fix remarks in allergies 4 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 735698ce90 bug fixes 4 years ago
hussam al-habibeh bada160cf5 Search Medacation 4 years ago
hussam al-habibeh d9fcf89c19 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/core/viewModel/medicine_view_model.dart
4 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 4 years ago
Elham Rababah 537f53c3de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah ba263ada44 fix DA-201 4 years ago
Sultan Khan d55ce4c1ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Mohammad Aljammal 574e1525d9 Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix

See merge request Cloud_Solution/doctor_app_flutter!262
4 years ago
Sultan Khan 896078507f gub fixes 4 years ago
hussam al-habibeh e133a014e8 Prescription & medical file fix 4 years ago
mosazaid 88f1dc637f some fixes 4 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 9674eb89d9 add modification on so 4 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a99b3847ac login completed 4 years ago
mosazaid dcb71e5c22 Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf

# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan ad99cebf02 login and drug to drug 4 years ago
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!249
4 years ago
Mohammad Aljammal 3306d6f400 Merge branch 'medical-file' into 'development'
post Procedure

See merge request Cloud_Solution/doctor_app_flutter!248
4 years ago
hussam al-habibeh dd53a9bd4d post Procedure 4 years ago
mosazaid 8726653ffb working on Referral feature 4 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 40e9ab864a login changes 4 years ago
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 70cfc4668b Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!243
4 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
4 years ago
Elham Rababah 175ba545e7 finish create episode 4 years ago
Elham Rababah 4f1a892be4 first step form create episode 4 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 4 years ago
hussam al-habibeh f767467a67 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file 4 years ago
hussam al-habibeh bcbd091dae ss 4 years ago
mosazaid ff906338bf Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 4 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 4 years ago
Sultan Khan c4cae6fb38 doctor leave bug fix 4 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 4 years ago
mosazaid e75e7801aa working on UCAF get data 4 years ago