Commit Graph

281 Commits (6253e2c9a3dddda1f69db2a2ac5e96d88aea1521)

Author SHA1 Message Date
mosazaid 2273808333 translation 5 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid ebc5ba7743 some fixes 5 years ago
Elham Rababah 7db8a42adc Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 5 years ago
Elham Rababah fd17fc4608 enforce user to add date in case referral 5 years ago
Elham Rababah 905818b532 add admission no to orders 5 years ago
Elham Rababah b9eaee1887 fix design 5 years ago
Elham Rababah 13c879654b DA-250: fix age 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 5 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
5 years ago
mosazaid cd95a581f0 simple changes 5 years ago
Elham Rababah e32c360f85 fix DA-154,DA-150 5 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 88f1dc637f some fixes 5 years ago
Elham Rababah 8360179050 fix DA-195 5 years ago
Elham Rababah d53493aa52 fix DA-237 5 years ago
Elham Rababah c6156921e8 fix DA-197 5 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
5 years ago
Elham Rababah 763d6bb49f finish add loader 5 years ago
Mohammad Aljammal f75ab83981 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
mosazaid eae0bb443f solve problem with vital signs charts depend on date 5 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
5 years ago
Elham Rababah 23fb2e7297 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 5 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
mosazaid 8726653ffb working on Referral feature 5 years ago
mosazaid 2f17167e2f some design enhancments 5 years ago
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
5 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
5 years ago
Elham Rababah fb035cd4c9 fix patient_search_screen.dart 5 years ago
Elham Rababah 4f1a892be4 first step form create episode 5 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 5 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 5 years ago
mosazaid e14df2855a Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 5 years ago
Mohammad Aljammal eb5a3a59ff hot fixing 5 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 5 years ago
mosazaid e75e7801aa working on UCAF get data 5 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
5 years ago
hussam al-habibeh f997561bb8 drug list 5 years ago
mosazaid c9aac6e2e9 vital signs solve overflow of the width 5 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 5 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 5 years ago
mosazaid ee9ca72057 change empty referral message 5 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 5 years ago