Elham Rababah
|
4a3175830d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
Conflicts:
lib/config/localized_values.dart
lib/screens/dashboard_screen.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
9674eb89d9
|
add modification on so
|
5 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
|
5 years ago |
Mohammad Aljammal
|
9147cde86e
|
Merge branch 'tasks-translation' into 'development'
medical dile & Order Procedure translation
See merge request Cloud_Solution/doctor_app_flutter!256
|
5 years ago |
hussam al-habibeh
|
1fa52e0394
|
medical dile & Order Procedure translation
|
5 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
|
5 years ago |
hussam al-habibeh
|
e67233bb21
|
medical dile & Order Procedure translation
|
5 years ago |
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
5 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
|
5 years ago |
Elham Rababah
|
23fb2e7297
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
5 years ago |
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
5 years ago |
Sultan Khan
|
909940a6d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
40e9ab864a
|
login changes
|
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
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
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 |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
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 |
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
|
e75e7801aa
|
working on UCAF get data
|
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 |
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
5 years ago |
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
5 years ago |
mosazaid
|
ee9ca72057
|
change empty referral message
|
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 |
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
|
71b50c8404
|
First step translations
|
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 |
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 |
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
5 years ago |
Elham Rababah
|
f8b195e368
|
parseHtmlString now working :)
|
5 years ago |
Sultan Khan
|
3c968f0de1
|
doctor leave
|
5 years ago |
mosazaid
|
cb4ee05b40
|
working on ucaf
|
5 years ago |
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
mosazaid
|
5142b5b6c7
|
finish admission request design
|
5 years ago |
Sultan Khan
|
669655307a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
49e9ecfa4a
|
doctor leave
|
5 years ago |
Elham Rababah
|
05e7762533
|
fix obj page
|
5 years ago |
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
5 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
|
5 years ago |
mosazaid
|
b5c937bd86
|
Working on vitalSigns,
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/routes.dart
|
5 years ago |
Elham Rababah
|
edef444534
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/config/config.dart
lib/core/service/base/lookup-service.dart
|
5 years ago |
Elham Rababah
|
dc4250a4de
|
Post progress Note
|
5 years ago |
mosazaid
|
a71da8e4ef
|
working on vital signs
|
5 years ago |
hussam al-habibeh
|
47a350a811
|
prscription and procedure
|
5 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
|
5 years ago |
hussam al-habibeh
|
697f17f2cd
|
prescription and procedure
|
5 years ago |
Sultan Khan
|
e45220829f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 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
|
5 years ago |
Sultan Khan
|
5585274b18
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 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
|
5 years ago |
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
5 years ago |
Sultan Khan
|
5dcc03cfa8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
mosazaid
|
f6ddf7a9eb
|
make logout button close all screen stack and push to login
|
5 years ago |
Elham Rababah
|
bb651478a0
|
Finish subjective
|
5 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
|
5 years ago |
mosazaid
|
7cefbb4dbd
|
add referral pages
|
5 years ago |
Sultan Khan
|
989c06ae33
|
prescription changes
|
5 years ago |
Sultan Khan
|
8d58348267
|
dashboard changes
|
5 years ago |
Sultan Khan
|
e61f3f0281
|
add sick leave
|
5 years ago |
Elham Rababah
|
dcba85c7b9
|
Finish first step subjective_page.dart
|
5 years ago |
Elham Rababah
|
518c30bdeb
|
Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Sultan Khan
|
4f96cff585
|
sick leave
|
5 years ago |
Sultan Khan
|
e5d542f1d0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
5 years ago |
Sultan Khan
|
ba2697c917
|
sick leave
|
5 years ago |
mosazaid
|
bb1f101e94
|
finish re-design refer-patient screen
|
5 years ago |
Sultan Khan
|
97d915ef99
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
cc1a63786f
|
sick leave
|
5 years ago |
hussam al-habibeh
|
dfca3aa0e5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
16821c17fc
|
re-design in-patient detail page
|
5 years ago |
hussam al-habibeh
|
7de6a8e99f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/landing_page.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
5 years ago |
hussam al-habibeh
|
c581638e00
|
refer_patient_screen 'not finshed'
|
5 years ago |
mosazaid
|
e5341e3031
|
Merge branch 'development' into replay-design
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
f9ae2559f0
|
working on referral reply screen
|
5 years ago |
hussam al-habibeh
|
6bbc629060
|
patients out and patients in screens design updates
|
5 years ago |
Elham Rababah
|
91cc76a9cf
|
medicine search fix bugs =
|
5 years ago |
Elham Rababah
|
ec3b69f0cb
|
The Patient services Names the words should be in separate line.
|
5 years ago |
Elham Rababah
|
53862ec1b3
|
fix bugs in patient search
|
5 years ago |
Elham Rababah
|
8980fc03aa
|
Finish Patient search design
|
6 years ago |
Elham Rababah
|
871bd6ab20
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
Conflicts:
lib/config/localized_values.dart
lib/screens/medicine/medicine_search_screen.dart
lib/util/translations_delegate_base.dart
lib/widgets/shared/app_text_form_field.dart
|
6 years ago |
Elham Rababah
|
fbc99d681f
|
First step from medicine search and change the logo
|
6 years ago |
Sultan Khan
|
3f7ef48fd5
|
live care chages
|
6 years ago |
Mohammad ALjammal
|
d4b3e42070
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
Elham Rababah
|
287bb20d12
|
fix issues ios
|
6 years ago |
Elham Rababah
|
6ea72f5ffa
|
make things daynamic
|
6 years ago |
Mohammad ALjammal
|
d22ce32cdb
|
add call back android
|
6 years ago |
hussam al-habibeh
|
aa57f4c4d7
|
get clinic list after changing the language
|
6 years ago |
Mohammad ALjammal
|
eb2995ea25
|
Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/providers/auth_provider.dart
lib/util/helpers.dart
|
6 years ago |
Mohammad ALjammal
|
c671059a03
|
fix issues in video call
|
6 years ago |
Mohammad ALjammal
|
270d7ffa6d
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/main.dart
|
6 years ago |
Sultan Khan
|
dd3154a498
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Sultan Khan
|
bde86ef829
|
live care features added.
|
6 years ago |
hussam al-habibeh
|
0e471aaa63
|
language setup on logout
|
6 years ago |
hussam al-habibeh
|
5172703a32
|
setup language on logout
|
6 years ago |
Mohammad ALjammal
|
990d36d804
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Mohammad ALjammal
|
868b118243
|
integration with OpenTok android
|
6 years ago |
hussam al-habibeh
|
000315ac0e
|
translation 'updates'
|
6 years ago |
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
6 years ago |
hussam al-habibeh
|
fb6d54faaf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
hussam al-habibeh
|
054933b280
|
Translation stage four
|
6 years ago |
Elham Rababah
|
bd3ce0a4d4
|
refactor models
|
6 years ago |
hussam al-habibeh
|
c486d7f357
|
translation stage three
|
6 years ago |
hussam alhababieh
|
a02fe9c83d
|
translation stage two
|
6 years ago |
hussam alhababieh
|
b0005e72f9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b4570d7bd1
|
translation for pages stage one
|
6 years ago |
Mohammad Aljammal
|
7be7d715fe
|
Merge branch 'mohammad' into 'development'
Mohammad
See merge request Cloud_Solution/doctor_app_flutter!117
|
6 years ago |
Mohammad ALjammal
|
0dad77bfa2
|
fix issues in login
|
6 years ago |
hussam alhababieh
|
dcbf1312b7
|
translate dashboard/patient search
|
6 years ago |
hussam alhababieh
|
097d8df8c0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b178f08278
|
translate dashboard and patient search
|
6 years ago |
Mohammad ALjammal
|
a3730e4efb
|
fix issues with sultan branch
|
6 years ago |
Salman Afzal
|
11f10f1eea
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
6 years ago |
Amjad Amireh
|
0ed3481b42
|
Localization comment
|
6 years ago |
Amjad Amireh
|
1935b781d6
|
Localization comment
|
6 years ago |
Mohammad ALjammal
|
9b5658c00e
|
change design My Referral and My Referral Patient
|
6 years ago |
Mohammad ALjammal
|
9ce7d3267b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
6 years ago |
Mohammad ALjammal
|
9572e16627
|
done My Referral Patient and create Base App Client
|
6 years ago |
Amjad Amireh
|
64f13bf8a7
|
checkDate (today tommorow ,next week)
|
6 years ago |
Mohammad ALjammal
|
7d3bfddd68
|
update design my schedule and doctor replay
|
6 years ago |
Elham Rababah
|
f4b62a6158
|
add focus to input and fix cupertino picker
|
6 years ago |
her_username
|
111d90d56f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/models/patient/patiant_info_model.dart
pubspec.lock
|
6 years ago |
Elham Rababah
|
1e656af143
|
handelCatcherrorCase
|
6 years ago |
Elham Rababah
|
bc395c3fcc
|
add doctor profile to shaerd pref
|
6 years ago |
her_username
|
b07ff8154c
|
update local for doctor replay , my schedule and message screen
|
6 years ago |
her_username
|
3fbc2dabef
|
remove i18n package, change the location localized values,
change provider name and create new provider
|
6 years ago |
her_username
|
cc929ba4a5
|
update Localizations
|
6 years ago |
Elham Rababah
|
5e7526f2c7
|
vital sign screen
|
6 years ago |
her_username
|
e387820fe1
|
add some comment
|
6 years ago |
her_username
|
a886731109
|
done Dr Schedule
|
6 years ago |
ibrahim albitar
|
70f238e498
|
Merge branch 'develop' into 'master'
Develop
See merge request Cloud_Solution/doctor_app_flutter!14
|
6 years ago |
unknown
|
4b55176b9d
|
text validation and AppTextField
|
6 years ago |
Elham Rababah
|
93e7499a52
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
unknown
|
8c83166c40
|
profile screen and extentions class
|
6 years ago |
Elham Rababah
|
4dece11a43
|
add services related to auth
|
6 years ago |
Elham Rababah
|
0c23520318
|
move dropdwon list to cupertino picker
|
6 years ago |
Elham Rababah
|
6737e457b5
|
first step from handeling token in interceptor
|
6 years ago |
Elham Rababah
|
5bdae16684
|
fingerprint Working now on android
|
6 years ago |
Elham Rababah
|
1050b02140
|
create shaerd pref service
|
6 years ago |
Elham Rababah
|
ed14157e76
|
first step from user login
|
6 years ago |
Elham Rababah
|
c0168cb8fb
|
add DrAppToastMsg and handle error in the login page
|
6 years ago |
Elham Rababah
|
bd30843bfb
|
set project structure
|
6 years ago |