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
|
fb035cd4c9
|
fix patient_search_screen.dart
|
4 years ago |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
4 years ago |
Elham Rababah
|
175ba545e7
|
finish create episode
|
4 years ago |
hussam al-habibeh
|
5253c28469
|
prescription form fix
|
4 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
4 years ago |
mosazaid
|
289cf9b479
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
Mohammad Aljammal
|
e60cc5ec4a
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!240
|
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 |
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 |
Elham
|
8494f6e0f4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!241
|
4 years ago |
Elham Rababah
|
caddbdb53c
|
small fixes in progress note
|
4 years ago |
Elham Rababah
|
34b7b4564c
|
assessment work fine now
|
4 years ago |
hussam al-habibeh
|
a3fa8ef839
|
medical file fix
|
4 years ago |
Mohammad Aljammal
|
bdd879c00e
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!239
|
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 |
hussam al-habibeh
|
ebc09db053
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file
Conflicts:
lib/screens/prescription/add_prescription_form.dart
|
4 years ago |
hussam al-habibeh
|
7f250baf32
|
date picker fix
|
4 years ago |
Mohammad Aljammal
|
ac90620b2f
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!238
|
4 years ago |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
4 years ago |
mosazaid
|
e14df2855a
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
50d7f733b6
|
working on UCAF datails and add patient procedure list and diagnosis
|
4 years ago |
Sultan Khan
|
71c4d48cca
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
c4cae6fb38
|
doctor leave bug fix
|
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 |
Mohammad Aljammal
|
ba3817e0f8
|
Merge branch 'hot_fixing' into 'development'
hot fixing
See merge request Cloud_Solution/doctor_app_flutter!237
|
4 years ago |
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
4 years ago |
Mohammad Aljammal
|
deb5b81cb3
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!236
|
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 |
Mohammad Aljammal
|
60fecde83a
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!235
|
4 years ago |
mosazaid
|
b67fd55aac
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
4 years ago |
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
4 years ago |
Elham Rababah
|
9aa5ab4228
|
small changes
|
4 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
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 |
Mohammad Aljammal
|
699c565427
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!232
|
4 years ago |
Mohammad Aljammal
|
d20604aaaf
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!231
|
4 years ago |
Sultan Khan
|
d67b531865
|
bug fix
|
4 years ago |
Sultan Khan
|
31d6ca5593
|
Doctor ID updated
|
4 years ago |
mosazaid
|
4f1c70a3f4
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
4 years ago |