Elham Rababah
|
e652752729
|
fix : DA-334
|
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 |
mosazaid
|
e74de0b475
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
b63c7aff25
|
Fix DA-331 vital signs uncorrect temperature value
|
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 |
|
Mohammad Aljammal
|
8b992b4189
|
Merge branch 'development' into 'fix_issues'
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
|
Elham Rababah
|
494479f1d9
|
fix : DA-264 fix merge error
|
4 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
|
4 years ago |
|
Elham Rababah
|
febdadc924
|
fix : DA-264
|
4 years ago |
|
Elham Rababah
|
34692b94c2
|
fix : DA-264
|
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 |
|
Elham Rababah
|
b9b5ec09e4
|
fix : DA-248
|
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
|
abcd7e9833
|
Merge branch 'fix_issues' into 'development'
remark fix in allergies
See merge request Cloud_Solution/doctor_app_flutter!280
|
4 years ago |
|
Elham Rababah
|
6820e2d097
|
remark fix in allergies
|
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 |
|
Mohammad Aljammal
|
fa94b60711
|
Merge branch 'feature-ucaf' into 'development'
translation
See merge request Cloud_Solution/doctor_app_flutter!278
|
4 years ago |
|
Mohammad Aljammal
|
3cfb88b313
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!277
|
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 |
Sultan Khan
|
ed3b42d721
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
d34744e168
|
bug fix
|
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
|
c065dbbdb3
|
Fixed DA:266
|
4 years ago |
|
Elham Rababah
|
913ffc3052
|
Fix DA-260,DA-267
|
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 |
|
Sultan Khan
|
b92bc85e8f
|
bug fixes
|
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 |
|
Elham Rababah
|
484c737836
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
4 years ago |
|
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
|
Mohammad Aljammal
|
b89af8a5ab
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!266
|
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 |
|
Elham Rababah
|
f0cd33ae43
|
fix issue on assessment design
|
4 years ago |
|
Elham Rababah
|
1de25aae2f
|
fix issue on assessment design
|
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 |
|
hussam al-habibeh
|
38d9881ed2
|
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 |
|
mosazaid
|
5440fd1ef9
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
3be693337a
|
some fixes
|
4 years ago |
|
Elham Rababah
|
4e4e6a3600
|
fix DA-151
|
4 years ago |
|
Elham Rababah
|
a7ca7fb271
|
fix DA-151
|
4 years ago |
|
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
4 years ago |
|
Elham Rababah
|
03fa9de901
|
fix DA-198
|
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 |
|
Elham Rababah
|
cc92fe56c6
|
fix DA-154,DA-150
|
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
|
e95638bd99
|
fix DA-157
|
4 years ago |
|
Elham Rababah
|
e9de8a72e9
|
fix DA-152
|
4 years ago |
|
Elham Rababah
|
855ed0ac12
|
fix 145
|
4 years ago |
|
Elham Rababah
|
02167afa6b
|
fix 143,144
|
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 |
|
Elham Rababah
|
eb90fc0161
|
fix bug in assessment
|
4 years ago |
|
Sultan Khan
|
40cfad7f7b
|
login
|
4 years ago |
|
Elham Rababah
|
9674eb89d9
|
add modification on so
|
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
|
1fa52e0394
|
medical dile & Order Procedure translation
|
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
|
306d484837
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
8726653ffb
|
working on Referral feature
|
4 years ago |
|
Mohammad Aljammal
|
cc14448d48
|
Merge branch 'soap_update' into 'development'
fix loader in login
See merge request Cloud_Solution/doctor_app_flutter!247
|
4 years ago |
|
Elham Rababah
|
1f2aebde33
|
fix loader in login
|
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 |
|
mosazaid
|
db502b7f0d
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
|
mosazaid
|
421cee49c7
|
Merge branch 'feature-ucaf' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
748802af1d
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!245
|
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 Rababah
|
3c1b51eb94
|
fix issue related to landing page
|
4 years ago |
|
Elham Rababah
|
90a16676db
|
fix issue related to SOAP
|
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 |
|
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
4 years ago |
|
Elham Rababah
|
175ba545e7
|
finish create episode
|
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
|
ca9f1a022b
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
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 |
|
Elham
|
8494f6e0f4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!241
|
4 years ago |