Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
Sultan Khan
|
735698ce90
|
bug fixes
|
6 years ago |
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
6 years ago |
mosazaid
|
88f1dc637f
|
some fixes
|
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 |
|
hussam al-habibeh
|
1fa52e0394
|
medical dile & Order Procedure translation
|
6 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
|
6 years ago |
|
hussam al-habibeh
|
e67233bb21
|
medical dile & Order Procedure translation
|
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
|
6bab2e0b2d
|
fix referral patient issue
|
6 years ago |
|
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
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
|
0147e7e49b
|
do translation, fix some bugs
|
6 years ago |
|
Elham Rababah
|
175ba545e7
|
finish create episode
|
6 years ago |
|
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
6 years ago |
|
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
6 years ago |
Elham Rababah
|
8284f1d475
|
Fix profile widget
|
6 years ago |
|
Elham Rababah
|
71b50c8404
|
First step translations
|
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
|
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 |
|
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
mosazaid
|
cb4ee05b40
|
working on ucaf
|
6 years ago |
|
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
6 years ago |
|
mosazaid
|
873ee67eb7
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
6 years ago |
|
Mohammad Aljammal
|
6f2e764deb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
Conflicts:
lib/client/base_app_client.dart
lib/routes.dart
|
6 years ago |
|
Elham Rababah
|
2f273dcde8
|
add ICD10
|
6 years ago |
|
mosazaid
|
25d884c774
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/routes.dart
# lib/util/helpers.dart
# lib/util/translations_delegate_base.dart
# lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
# pubspec.lock
|
6 years ago |
|
mosazaid
|
b5c937bd86
|
Working on vitalSigns,
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/routes.dart
|
6 years ago |
|
mosazaid
|
a71da8e4ef
|
working on vital signs
|
6 years ago |
|
hussam al-habibeh
|
d3bf97fdd8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/util/translations_delegate_base.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_buttons_widget.dart
lib/widgets/shared/app_text_form_field.dart
lib/widgets/shared/app_texts_widget.dart
|
6 years ago |
|
hussam al-habibeh
|
697f17f2cd
|
prescription and procedure
|
6 years ago |
|
hussam al-habibeh
|
1ce6571668
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/screens/patients/profile/refer_patient_screen.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_text_form_field.dart
|
6 years ago |
|
Sultan Khan
|
5585274b18
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
6 years ago |
|
Sultan Khan
|
5dcc03cfa8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
mosazaid
|
4ac8fe4681
|
finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/locator.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
7cefbb4dbd
|
add referral pages
|
6 years ago |
|
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
6 years ago |
|
Sultan Khan
|
ba2697c917
|
sick leave
|
6 years ago |
|
Sultan Khan
|
76e10459e0
|
sick leave
|
6 years ago |
|
Sultan Khan
|
97d915ef99
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
cc1a63786f
|
sick leave
|
6 years ago |
|
mosazaid
|
16821c17fc
|
re-design in-patient detail page
|
6 years ago |
|
mosazaid
|
5ed9aea5a7
|
fix HexColor library error
|
6 years ago |
|
Elham Rababah
|
53862ec1b3
|
fix bugs in patient search
|
6 years ago |
|
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
6 years ago |