Mohammad Aljammal
|
05ed1202fe
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!293
|
4 years ago |
|
Mohammad Aljammal
|
127b5eb4bd
|
Merge branch 'fix-issues' into 'development'
fix bugs
See merge request Cloud_Solution/doctor_app_flutter!292
|
4 years ago |
Sultan Khan
|
efc4cf9443
|
reschedule issue fixed
|
4 years ago |
Elham Rababah
|
1e84b73cf0
|
fix DA-279
|
4 years ago |
|
Elham Rababah
|
34d5ac7d43
|
add label on assessment and fix DA-333
|
4 years ago |
hussam al-habibeh
|
6dd1d9ef90
|
fix bugs
|
4 years ago |
|
Sultan Khan
|
8b7acf7202
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
6a23c2a137
|
bug fix
|
4 years ago |
|
Mohammad Aljammal
|
9f04ef8066
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!290
|
4 years ago |
|
hussam al-habibeh
|
546b520d7b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/core/enum/master_lookup_key.dart
lib/core/service/base/lookup-service.dart
|
4 years ago |
|
hussam al-habibeh
|
15dd0f7c1a
|
bug fix
|
4 years ago |
|
hussam al-habibeh
|
d66811546f
|
refactoring my code
|
4 years ago |
mosazaid
|
a71bf160e7
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
5b5954c6f3
|
working on Admission request feature adding lookup
|
4 years ago |
|
hussam al-habibeh
|
23c826b37f
|
bug fix
|
4 years ago |
|
Elham Rababah
|
f84902b73b
|
fix : DA-333
|
4 years ago |
|
Mohammad Aljammal
|
8916b4a1f3
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!286
|
4 years ago |
|
hussam al-habibeh
|
29de472c66
|
bug fix
|
4 years ago |
|
hussam al-habibeh
|
9b5899d4e6
|
bug fix
|
4 years ago |
|
hussam al-habibeh
|
deca96f62e
|
bug fix
|
4 years ago |
|
mosazaid
|
de1d0283d2
|
some lables and translation changes and add search functionality for ListSelectDialog
|
4 years ago |
|
hussam al-habibeh
|
b267342c03
|
fixing issues
|
4 years ago |
|
mosazaid
|
a64088320f
|
DA-259 translation bug
|
4 years ago |
|
mosazaid
|
c2df291029
|
DA - 286 Fix
|
4 years ago |
|
Mohammad Aljammal
|
cb767e4d4c
|
Merge branch 'fix-issues' into 'development'
bugs fix
See merge request Cloud_Solution/doctor_app_flutter!282
|
4 years ago |
|
hussam al-habibeh
|
6b0e87ce55
|
bugs fix
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
75efcde0bc
|
fix ios
|
4 years ago |
|
mosazaid
|
2273808333
|
translation
|
4 years ago |
|
mosazaid
|
cca4e33fce
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
ebc5ba7743
|
some fixes
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
6d473be371
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!273
|
4 years ago |
|
hussam al-habibeh
|
35bc8c03a4
|
bug fixing
|
4 years ago |
|
mosazaid
|
e75318799f
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
ac9fd8c936
|
samll fixes for labels and msges
|
4 years ago |
|
Elham Rababah
|
fd17fc4608
|
enforce user to add date in case referral
|
4 years ago |
|
Elham Rababah
|
905818b532
|
add admission no to orders
|
4 years ago |
|
Elham Rababah
|
b9eaee1887
|
fix design
|
4 years ago |
|
Elham Rababah
|
13c879654b
|
DA-250: fix age
|
4 years ago |
|
Mohammad Aljammal
|
81fdcb2d8d
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!271
|
4 years ago |
|
Mohammad Aljammal
|
fbd509d6ec
|
Merge branch 'fix-issues' into 'development'
bugs fix
See merge request Cloud_Solution/doctor_app_flutter!272
|
4 years ago |
|
hussam al-habibeh
|
fb8381ea61
|
bugs fix
|
4 years ago |
|
Elham Rababah
|
68d27a451d
|
fix general issue
|
4 years ago |
|
Elham Rababah
|
a5bccddf55
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
4 years ago |
|
Elham Rababah
|
9ddfbd3e66
|
fix issue on app drawer
|
4 years ago |
|
Sultan Khan
|
d5d7ea6c49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
63e8ee8dd0
|
sick leave
|
4 years ago |
|
hussam alhababieh
|
3c55af7adc
|
Merge branch 'development' into 'tasks-translation'
# Conflicts:
# lib/screens/prescription/add_prescription_form.dart
|
4 years ago |
|
hussam al-habibeh
|
7c800bdab4
|
medical file fix
|
4 years ago |
|
Elham Rababah
|
00543a759a
|
fix remarks in allergies
|
4 years ago |
|
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
4 years ago |
|
Elham Rababah
|
cbf850da2f
|
fix DA-201
|
4 years ago |
|
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
|
Sultan Khan
|
135c852e8c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
735698ce90
|
bug fixes
|
4 years ago |
|
hussam al-habibeh
|
bada160cf5
|
Search Medacation
|
4 years ago |
|
hussam al-habibeh
|
d9fcf89c19
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
Conflicts:
lib/core/viewModel/medicine_view_model.dart
|
4 years ago |
|
hussam al-habibeh
|
4a4cd03f63
|
Prescription date
|
4 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
|
4 years ago |
|
Elham Rababah
|
ba263ada44
|
fix DA-201
|
4 years ago |
|
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
4 years ago |
|
Elham Rababah
|
53e88620ec
|
fix DA-230
|
4 years ago |
|
Sultan Khan
|
d55ce4c1ec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
5af6210785
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!263
|
4 years ago |
|
Mohammad Aljammal
|
574e1525d9
|
Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix
See merge request Cloud_Solution/doctor_app_flutter!262
|
4 years ago |
|
mosazaid
|
cd95a581f0
|
simple changes
|
4 years ago |
|
Sultan Khan
|
896078507f
|
gub fixes
|
4 years ago |
|
hussam al-habibeh
|
e133a014e8
|
Prescription & medical file fix
|
4 years ago |
|
Elham Rababah
|
e32c360f85
|
fix DA-154,DA-150
|
4 years ago |
|
mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
88f1dc637f
|
some fixes
|
4 years ago |
|
Elham Rababah
|
8360179050
|
fix DA-195
|
4 years ago |
|
Elham Rababah
|
c11f195e72
|
fix DA-192
|
4 years ago |
|
Elham Rababah
|
d53493aa52
|
fix DA-237
|
4 years ago |
|
Elham Rababah
|
c6156921e8
|
fix DA-197
|
4 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
|
4 years ago |
|
Sultan Khan
|
417ca9401b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
a99b3847ac
|
login completed
|
4 years ago |
|
Elham Rababah
|
763d6bb49f
|
finish add loader
|
4 years ago |
|
hussam al-habibeh
|
5150f9b93d
|
Prescription & procedure body update
|
4 years ago |
|
Elham Rababah
|
bc8a90ef2c
|
first step from fix loader
|
4 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
|
4 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
|
4 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
|
4 years ago |
|
hussam al-habibeh
|
e67233bb21
|
medical dile & Order Procedure translation
|
4 years ago |
|
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
4 years ago |
|
mosazaid
|
d9d4e22531
|
Merge branch 'development' into feature-ucaf
|
4 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
|
4 years ago |
|
hussam alhababieh
|
d87aeb290f
|
Merge branch 'development' into 'procedure-fix'
# Conflicts:
# lib/landing_page.dart
|
4 years ago |
|
hussam al-habibeh
|
b0410dc744
|
Procedure updates
|
4 years ago |
|
hussam al-habibeh
|
debcad3a3d
|
prescription
|
4 years ago |
|
hussam al-habibeh
|
4b54ca7d47
|
prescription
|
4 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
|
4 years ago |
|
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
4 years ago |
|
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
4 years ago |
|
Sultan Khan
|
722e1a5c41
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
ad99cebf02
|
login and drug to drug
|
4 years ago |
|
Mohammad Aljammal
|
307463865b
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!249
|
4 years ago |
|
Mohammad Aljammal
|
3306d6f400
|
Merge branch 'medical-file' into 'development'
post Procedure
See merge request Cloud_Solution/doctor_app_flutter!248
|
4 years ago |
|
hussam al-habibeh
|
dd53a9bd4d
|
post Procedure
|
4 years ago |
|
mosazaid
|
8726653ffb
|
working on Referral feature
|
4 years ago |
|
Sultan Khan
|
909940a6d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
40e9ab864a
|
login changes
|
4 years ago |
|
mosazaid
|
2f17167e2f
|
some design enhancments
|
4 years ago |
|
Mohammad Aljammal
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
70cfc4668b
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!243
|
4 years ago |
|
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
4 years ago |
|
Elham Rababah
|
fb035cd4c9
|
fix patient_search_screen.dart
|
4 years ago |
|
hussam al-habibeh
|
5253c28469
|
prescription form fix
|
4 years ago |
|
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
4 years ago |
|
mosazaid
|
289cf9b479
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
Mohammad Aljammal
|
e60cc5ec4a
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!240
|
4 years ago |
|
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
4 years ago |
|
hussam al-habibeh
|
f767467a67
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file
|
4 years ago |
|
hussam al-habibeh
|
bcbd091dae
|
ss
|
4 years ago |
|
hussam al-habibeh
|
a3fa8ef839
|
medical file fix
|
4 years ago |
|
mosazaid
|
ff906338bf
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
4 years ago |
|
mosazaid
|
e14df2855a
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
50d7f733b6
|
working on UCAF datails and add patient procedure list and diagnosis
|
4 years ago |
|
Sultan Khan
|
71c4d48cca
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
c4cae6fb38
|
doctor leave bug fix
|
4 years ago |
|
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
4 years ago |
|
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
044ad7b51a
|
offtime leave
|
4 years ago |
|
mosazaid
|
b67fd55aac
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
4 years ago |
|
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
4 years ago |
|
hussam al-habibeh
|
f997561bb8
|
drug list
|
4 years ago |
|
Mohammad Aljammal
|
699c565427
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!232
|
4 years ago |
|
Mohammad Aljammal
|
d20604aaaf
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!231
|
4 years ago |
|
Sultan Khan
|
d67b531865
|
bug fix
|
4 years ago |
|
Sultan Khan
|
31d6ca5593
|
Doctor ID updated
|
4 years ago |
|
mosazaid
|
4f1c70a3f4
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
4 years ago |
|
Mohammad Aljammal
|
ff9eaeb09f
|
Merge branch 'sultan' into 'development'
reschdule leave
See merge request Cloud_Solution/doctor_app_flutter!230
|
4 years ago |
|
Sultan Khan
|
ad48415038
|
reschdule leave
|
4 years ago |
|
mosazaid
|
a51239447b
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
Mohammad Aljammal
|
dc9a9ad4f6
|
Merge branch 'medical-file' into 'development'
medical file
See merge request Cloud_Solution/doctor_app_flutter!229
|
4 years ago |
|
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
hussam al-habibeh
|
76cc4d11f8
|
medical file
|
4 years ago |
|
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
4 years ago |
|
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
4 years ago |
|
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
4 years ago |
|
mosazaid
|
b5a102add3
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
ee9ca72057
|
change empty referral message
|
4 years ago |
|
hussam al-habibeh
|
eef5d57d2f
|
Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post
|
4 years ago |
|
hussam al-habibeh
|
16b949461d
|
prescription post
|
4 years ago |