Sultan Khan
|
909940a6d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
40e9ab864a
|
login changes
|
6 years ago |
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
6 years ago |
|
mosazaid
|
ca9f1a022b
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
6 years ago |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
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
|
1be8ea7dcb
|
Fix conflict
|
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 |
|
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 |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
6 years ago |
|
Sultan Khan
|
3c968f0de1
|
doctor leave
|
6 years ago |
|
mosazaid
|
cb4ee05b40
|
working on ucaf
|
6 years ago |
|
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
|
mosazaid
|
5142b5b6c7
|
finish admission request design
|
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 Rababah
|
05e7762533
|
fix obj page
|
6 years ago |
|
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
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 |
hussam al-habibeh
|
47a350a811
|
prscription and procedure
|
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 |
|
Sultan Khan
|
e45220829f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
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 |
|
Elham Rababah
|
d4a1dcfc81
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/client/base_app_client.dart
lib/core/service/base/lookup-service.dart
|
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 |
|
Elham Rababah
|
bb651478a0
|
Finish subjective
|
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 |