mosazaid
|
db502b7f0d
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
421cee49c7
|
Merge branch 'feature-ucaf' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
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
|
748802af1d
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!245
|
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 |
Mohammad Aljammal
|
70cfc4668b
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!243
|
5 years ago |
Elham Rababah
|
3c1b51eb94
|
fix issue related to landing page
|
5 years ago |
Elham Rababah
|
90a16676db
|
fix issue related to SOAP
|
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
|
0147e7e49b
|
do translation, fix some bugs
|
5 years ago |
Elham Rababah
|
175ba545e7
|
finish create episode
|
5 years ago |
hussam al-habibeh
|
5253c28469
|
prescription form fix
|
5 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
5 years ago |
mosazaid
|
289cf9b479
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
Mohammad Aljammal
|
e60cc5ec4a
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!240
|
5 years ago |
mosazaid
|
ca9f1a022b
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
5 years ago |
hussam al-habibeh
|
f767467a67
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file
|
5 years ago |
hussam al-habibeh
|
bcbd091dae
|
ss
|
5 years ago |
Elham
|
8494f6e0f4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!241
|
5 years ago |
Elham Rababah
|
caddbdb53c
|
small fixes in progress note
|
5 years ago |
Elham Rababah
|
34b7b4564c
|
assessment work fine now
|
5 years ago |
hussam al-habibeh
|
a3fa8ef839
|
medical file fix
|
5 years ago |
mosazaid
|
ff906338bf
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
5 years ago |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
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 |
Sultan Khan
|
71c4d48cca
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
c4cae6fb38
|
doctor leave bug fix
|
5 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
|
5 years ago |
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
5 years ago |
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
044ad7b51a
|
offtime leave
|
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 |
Elham Rababah
|
9aa5ab4228
|
small changes
|
5 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
5 years ago |
Elham Rababah
|
1be8ea7dcb
|
Fix conflict
|
5 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
|
5 years ago |
Elham Rababah
|
c3bb408787
|
add some translations
|
5 years ago |
Mohammad Aljammal
|
699c565427
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!232
|
5 years ago |
Mohammad Aljammal
|
d20604aaaf
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!231
|
5 years ago |
Sultan Khan
|
d67b531865
|
bug fix
|
5 years ago |
Sultan Khan
|
31d6ca5593
|
Doctor ID updated
|
5 years ago |
mosazaid
|
4f1c70a3f4
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
5 years ago |
Mohammad Aljammal
|
ff9eaeb09f
|
Merge branch 'sultan' into 'development'
reschdule leave
See merge request Cloud_Solution/doctor_app_flutter!230
|
5 years ago |
Sultan Khan
|
ad48415038
|
reschdule leave
|
5 years ago |
mosazaid
|
a51239447b
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
Mohammad Aljammal
|
dc9a9ad4f6
|
Merge branch 'medical-file' into 'development'
medical file
See merge request Cloud_Solution/doctor_app_flutter!229
|
5 years ago |
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
hussam al-habibeh
|
76cc4d11f8
|
medical file
|
5 years ago |
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
bbcd218a94
|
history delete is fixed
|
5 years ago |
mosazaid
|
2f9d4a1034
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
5 years ago |
Elham Rababah
|
3dffd33728
|
hot fix
|
5 years ago |
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
5 years ago |
Elham Rababah
|
1cda486268
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
|
5 years ago |
Elham Rababah
|
9194d8a44b
|
delete Allergy
|
5 years ago |
mosazaid
|
3b471aebdc
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
5 years ago |
Elham
|
b291572767
|
Merge branch 'soap_update' into 'development'
Fix profile widget
See merge request Cloud_Solution/doctor_app_flutter!223
|
5 years ago |
Elham Rababah
|
8284f1d475
|
Fix profile widget
|
5 years ago |
mosazaid
|
b5a102add3
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
ee9ca72057
|
change empty referral message
|
5 years ago |
hussam al-habibeh
|
eef5d57d2f
|
Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post
|
5 years ago |
hussam al-habibeh
|
16b949461d
|
prescription post
|
5 years ago |
Mohammad Aljammal
|
812fe10db8
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!219
|
5 years ago |
Elham Rababah
|
e054c28234
|
hide text
|
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 |
mosazaid
|
4b5bec8c50
|
working on UCAF design
|
5 years ago |
Mohammad Aljammal
|
f0f98280b4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
|
5 years ago |
Sultan Khan
|
9adc5ddd8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
6a8c37e0d7
|
doctor leave
|
5 years ago |
Elham Rababah
|
7d550ca15f
|
prevent null
|
5 years ago |
Elham Rababah
|
cece85cda7
|
small fix remove todo
|
5 years ago |
Elham Rababah
|
2f80af6b74
|
small fix
|
5 years ago |
Elham Rababah
|
71b50c8404
|
First step translations
|
5 years ago |
Sultan Khan
|
6c894c3d3b
|
sick leave
|
5 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
|
5 years ago |
Elham Rababah
|
e65740761a
|
add improvement on create episode
|
5 years ago |
Sultan Khan
|
43a1e56a8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
9bf07d7117
|
reschedule leave
|
5 years ago |
hussam al-habibeh
|
e72ef46efb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
5 years ago |
hussam al-habibeh
|
4ffeb31181
|
update procedure fixes
|
5 years ago |
Mohammad Aljammal
|
d975fb021c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/routes.dart
lib/util/helpers.dart
|
5 years ago |
Sultan Khan
|
4587fdda59
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
e23bb7ce94
|
reschedule leave
|
5 years ago |
Elham Rababah
|
423bd49aee
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/routes.dart
|
5 years ago |
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
5 years ago |
Mohammad Aljammal
|
3cb96f35ca
|
Merge branch 'design-updates' into 'development'
Design updates
See merge request Cloud_Solution/doctor_app_flutter!211
|
5 years ago |
hussam al-habibeh
|
75eda8832d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
5 years ago |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
5 years ago |
Elham Rababah
|
856777c648
|
finish updating functions
|
5 years ago |
mosazaid
|
0e645c2b1f
|
Merge branch 'development' into feature_admission_request
|
5 years ago |