Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
6 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
|
6 years ago |
mosazaid
|
cd95a581f0
|
simple changes
|
6 years ago |
|
Elham Rababah
|
e32c360f85
|
fix DA-154,DA-150
|
6 years ago |
|
mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
88f1dc637f
|
some fixes
|
6 years ago |
|
Elham Rababah
|
8360179050
|
fix DA-195
|
6 years ago |
|
Elham Rababah
|
d53493aa52
|
fix DA-237
|
6 years ago |
|
Elham Rababah
|
c6156921e8
|
fix DA-197
|
6 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
|
6 years ago |
|
Elham Rababah
|
763d6bb49f
|
finish add loader
|
6 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
|
6 years ago |
|
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
6 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
|
6 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
|
6 years ago |
|
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
6 years ago |
|
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
6 years ago |
|
mosazaid
|
8726653ffb
|
working on Referral feature
|
6 years ago |
|
mosazaid
|
2f17167e2f
|
some design enhancments
|
6 years ago |
|
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Mohammad Aljammal
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
6 years ago |
|
Elham Rababah
|
fb035cd4c9
|
fix patient_search_screen.dart
|
6 years ago |
|
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
6 years ago |
|
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
6 years ago |
|
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
6 years ago |
|
mosazaid
|
e14df2855a
|
Merge branch 'development' into feature-ucaf
|
6 years ago |
|
mosazaid
|
50d7f733b6
|
working on UCAF datails and add patient procedure list and diagnosis
|
6 years ago |
|
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
6 years ago |
|
mosazaid
|
b67fd55aac
|
Merge branch 'development' into feature-ucaf
|
6 years ago |
|
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
6 years ago |
|
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
6 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
6 years ago |
|
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
6 years ago |
|
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
6 years ago |
|
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
6 years ago |
|
mosazaid
|
ee9ca72057
|
change empty referral message
|
6 years ago |
|
mosazaid
|
ce164c3cb6
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
0c39dc6693
|
change on vital signs for uncoment the service
|
6 years ago |
|
mosazaid
|
4b5bec8c50
|
working on UCAF design
|
6 years ago |
Elham Rababah
|
ba14d23c05
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
|
Elham Rababah
|
e65740761a
|
add improvement on create episode
|
6 years ago |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
6 years ago |
|
mosazaid
|
e9ffbf06a6
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
mosazaid
|
3578c82f62
|
solve hacking patient screen
|
6 years ago |
|
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
mosazaid
|
cb4ee05b40
|
working on ucaf
|
6 years ago |
|
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
6 years ago |
|
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
mosazaid
|
5142b5b6c7
|
finish admission request design
|
6 years ago |