Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
6 years ago |
|
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
6 years ago |
|
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
6 years ago |
|
Elham
|
8494f6e0f4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!241
|
6 years ago |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
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 |
|
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
|
6 years ago |
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
044ad7b51a
|
offtime leave
|
6 years ago |
|
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
6 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
|
6 years ago |
|
Elham Rababah
|
c3bb408787
|
add some translations
|
6 years ago |
|
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
6 years ago |
|
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
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 |
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
|
6 years ago |
|
Sultan Khan
|
9adc5ddd8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
6a8c37e0d7
|
doctor leave
|
6 years ago |
|
Elham Rababah
|
71b50c8404
|
First step translations
|
6 years ago |
|
Sultan Khan
|
43a1e56a8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
9bf07d7117
|
reschedule leave
|
6 years ago |
hussam al-habibeh
|
4ffeb31181
|
update procedure fixes
|
6 years ago |
|
Sultan Khan
|
4587fdda59
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
e23bb7ce94
|
reschedule leave
|
6 years ago |
|
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
6 years ago |
|
hussam al-habibeh
|
d1a261c847
|
procedure update
|
6 years ago |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
6 years ago |
|
Sultan Khan
|
b2aef274bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
3c968f0de1
|
doctor leave
|
6 years ago |
|
hussam al-habibeh
|
b3567df020
|
medical file model
|
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 |
|
hussam al-habibeh
|
ce0303fbce
|
Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
|
6 years ago |
|
hussam al-habibeh
|
adb8033138
|
update prescription
|
6 years ago |
|
Mohammad Aljammal
|
5669021add
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/widgets/patients/profile/SOAP/assessment_page.dart
lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
|
6 years ago |
|
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
6 years ago |
|
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
mosazaid
|
5142b5b6c7
|
finish admission request design
|
6 years ago |
|
Elham Rababah
|
ea4bf159c6
|
commit issue
|
6 years ago |
|
Sultan Khan
|
669655307a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
49e9ecfa4a
|
doctor leave
|
6 years ago |
|
Elham
|
88c2c04d68
|
Merge branch 'design-updates' into 'development'
post prescription
See merge request Cloud_Solution/doctor_app_flutter!203
|
6 years ago |
|
Elham Rababah
|
05e7762533
|
fix obj page
|
6 years ago |
|
Elham Rababah
|
dccf474e70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
lib/core/service/patient_service.dart
lib/core/viewModel/patient_view_model.dart
lib/lookups/patient_lookup.dart
lib/models/patient/patiant_info_model.dart
lib/screens/patients/patients_screen.dart
|
6 years ago |