Sultan Khan
|
05ef7a4b25
|
dashboard page updated
|
5 years ago |
Mohammad Aljammal
|
6f46e89346
|
Merge branch 'fix-issues' into 'development'
DA-185
See merge request Cloud_Solution/doctor_app_flutter!330
|
5 years ago |
hussam al-habibeh
|
bfe73ebe1d
|
DA-185
|
5 years ago |
Mohammad Aljammal
|
88a5750d22
|
Merge branch 'fix-issues' into 'development'
jira bugs fix
See merge request Cloud_Solution/doctor_app_flutter!327
|
5 years ago |
hussam al-habibeh
|
066ac94d4a
|
jira bugs
|
5 years ago |
Sultan Khan
|
332caaae2f
|
dashboard issue
|
5 years ago |
Elham Rababah
|
8615671095
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
Conflicts:
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
f3220be735
|
fix DA-350
|
5 years ago |
Sultan Khan
|
214dfecb3c
|
DA-422
|
5 years ago |
Sultan Khan
|
388c095d7f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
a309acbf46
|
dashboard changes
|
5 years ago |
Elham Rababah
|
083b49aa0a
|
fix DA-341
|
5 years ago |
Sultan Khan
|
fa80d62e7d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
0dc25a4a03
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
60e416e632
|
add done button in all pages user keyboard and hide the keyboard when the user click on background
|
5 years ago |
mosazaid
|
1207339b01
|
Merge branch 'development' into admission-request
|
5 years ago |
mosazaid
|
8d154239bb
|
finish admission request feature
|
5 years ago |
Elham Rababah
|
a1c60e692f
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
248367fbe9
|
fix DA-220
|
5 years ago |
Elham Rababah
|
753ef3bfb0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
5 years ago |
Elham Rababah
|
a5a7425a09
|
fix DA-149
|
5 years ago |
mosazaid
|
a618292d20
|
bug fixes for DA-284-DA-285
|
5 years ago |
mosazaid
|
f87f851100
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/core/service/base/lookup-service.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
2b3a7f33d1
|
working on some bug fixes and finish addmission request
|
5 years ago |
Sultan Khan
|
8b7acf7202
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
6a23c2a137
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
8b992b4189
|
Merge branch 'development' into 'fix_issues'
# Conflicts:
# lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
437ae3dfb5
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
34692b94c2
|
fix : DA-264
|
5 years ago |
mosazaid
|
de1d0283d2
|
some lables and translation changes and add search functionality for ListSelectDialog
|
5 years ago |
mosazaid
|
a64088320f
|
DA-259 translation bug
|
5 years ago |
mosazaid
|
c2df291029
|
DA - 286 Fix
|
5 years ago |
Mohammad Aljammal
|
6253e2c9a3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
Conflicts:
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
75efcde0bc
|
fix ios
|
5 years ago |
mosazaid
|
2273808333
|
translation
|
5 years ago |
mosazaid
|
cca4e33fce
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
ebc5ba7743
|
some fixes
|
5 years ago |
Elham Rababah
|
7db8a42adc
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
6d473be371
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!273
|
5 years ago |
hussam al-habibeh
|
35bc8c03a4
|
bug fixing
|
5 years ago |
mosazaid
|
e75318799f
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
ac9fd8c936
|
samll fixes for labels and msges
|
5 years ago |
Elham Rababah
|
c065dbbdb3
|
Fixed DA:266
|
5 years ago |
Elham Rababah
|
13c879654b
|
DA-250: fix age
|
5 years ago |
hussam al-habibeh
|
fb8381ea61
|
bugs fix
|
5 years ago |
Sultan Khan
|
135c852e8c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
735698ce90
|
bug fixes
|
5 years ago |
Elham Rababah
|
537f53c3de
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
cc92fe56c6
|
fix DA-154,DA-150
|
5 years ago |
mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
88f1dc637f
|
some fixes
|
5 years ago |
Elham Rababah
|
c11f195e72
|
fix DA-192
|
5 years ago |
Elham Rababah
|
855ed0ac12
|
fix 145
|
5 years ago |
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 |