mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
88f1dc637f
|
some fixes
|
4 years ago |
Elham Rababah
|
c11f195e72
|
fix DA-192
|
4 years ago |
|
Elham Rababah
|
855ed0ac12
|
fix 145
|
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 |
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
|
4 years ago |
hussam al-habibeh
|
1fa52e0394
|
medical dile & Order Procedure translation
|
4 years ago |
|
hussam al-habibeh
|
015c3b53c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
|
hussam al-habibeh
|
e67233bb21
|
medical dile & Order Procedure translation
|
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 |
|
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
|
4 years ago |
|
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
4 years ago |
|
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
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 |
|
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
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 |
|
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
4 years ago |
|
mosazaid
|
ca9f1a022b
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
4 years ago |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
4 years ago |
|
Elham Rababah
|
7ce1d2dd55
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
4 years ago |
|
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
044ad7b51a
|
offtime leave
|
4 years ago |
|
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
4 years ago |
|
Elham Rababah
|
1be8ea7dcb
|
Fix conflict
|
4 years ago |
|
Elham Rababah
|
ffe7e7c57f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
4 years ago |
|
Elham Rababah
|
c3bb408787
|
add some translations
|
4 years ago |
|
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
4 years ago |
|
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
4 years ago |
|
mosazaid
|
ee9ca72057
|
change empty referral message
|
4 years ago |
|
mosazaid
|
ce164c3cb6
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
0c39dc6693
|
change on vital signs for uncoment the service
|
4 years ago |
|
mosazaid
|
4b5bec8c50
|
working on UCAF design
|
4 years ago |
|
Sultan Khan
|
9adc5ddd8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
6a8c37e0d7
|
doctor leave
|
4 years ago |
|
Elham Rababah
|
71b50c8404
|
First step translations
|
4 years ago |
|
Sultan Khan
|
43a1e56a8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
9bf07d7117
|
reschedule leave
|
4 years ago |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
4 years ago |
|
Sultan Khan
|
3c968f0de1
|
doctor leave
|
4 years ago |
|
mosazaid
|
cb4ee05b40
|
working on ucaf
|
4 years ago |
|
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
4 years ago |
|
mosazaid
|
5142b5b6c7
|
finish admission request design
|
4 years ago |
|
Sultan Khan
|
669655307a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
49e9ecfa4a
|
doctor leave
|
4 years ago |
|
Elham Rababah
|
05e7762533
|
fix obj page
|
4 years ago |