Elham Rababah
|
4d6795fcc0
|
show all services for all type of patient.
|
5 years ago |
mosazaid
|
7c5d88f169
|
Merge branch 'development' into app_changes
|
5 years ago |
mosazaid
|
9b02bdc541
|
inhancements
|
5 years ago |
Sultan Khan
|
3f7961b50c
|
dashboard sreen updated
|
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 |
Elham Rababah
|
f819e6353e
|
fix DA-350
|
5 years ago |
Sultan Khan
|
63d73b60e1
|
ios faceid issue
|
5 years ago |
Sultan Khan
|
9ed5a294ab
|
dashboard changes
|
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 |
Mohammad Aljammal
|
d8d2e7f1d6
|
fix ios issues
|
5 years ago |
Mohammad Aljammal
|
62d45d4e1c
|
hide the keyboard when the user click on background
|
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 |
Mohammad Aljammal
|
8deba06957
|
Merge branch 'fix_patient_card' into 'development'
fix PatientCard
See merge request Cloud_Solution/doctor_app_flutter!304
|
5 years ago |
Elham Rababah
|
c8e5a7eeef
|
fix PatientCard
|
5 years ago |
mosazaid
|
4f302694b3
|
Merge branch 'development' into fix-bugs10_2
|
5 years ago |
mosazaid
|
498c6c00af
|
fix minor issue bugs (DA-273, DA-361, DA-362, DA-363)
|
5 years ago |
Mohammad Aljammal
|
d41fd496b6
|
Merge branch 'fix-issues' into 'development'
fixing bugs
See merge request Cloud_Solution/doctor_app_flutter!300
|
5 years ago |
Sultan Khan
|
f0539860c2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
400f8e25f6
|
bug xis
|
5 years ago |
hussam al-habibeh
|
5bde14813a
|
fixing bugs
|
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 |
Mohammad Aljammal
|
05ed1202fe
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!293
|
5 years ago |
Mohammad Aljammal
|
127b5eb4bd
|
Merge branch 'fix-issues' into 'development'
fix bugs
See merge request Cloud_Solution/doctor_app_flutter!292
|
5 years ago |
Elham Rababah
|
34d5ac7d43
|
add label on assessment and fix DA-333
|
5 years ago |
hussam al-habibeh
|
6dd1d9ef90
|
fix bugs
|
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 |
Elham Rababah
|
7505a6b6b0
|
fix allergy
|
5 years ago |
Elham Rababah
|
6a5e134527
|
fix remark and step widget
|
5 years ago |
Elham Rababah
|
cfb9ea30cb
|
fix : DA-335
|
5 years ago |
Elham Rababah
|
e652752729
|
fix : DA-334
|
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
|
febdadc924
|
fix : DA-264
|
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 |
Elham Rababah
|
b9b5ec09e4
|
fix : DA-248
|
5 years ago |
mosazaid
|
c2df291029
|
DA - 286 Fix
|
5 years ago |
Mohammad Aljammal
|
abcd7e9833
|
Merge branch 'fix_issues' into 'development'
remark fix in allergies
See merge request Cloud_Solution/doctor_app_flutter!280
|
5 years ago |
Elham Rababah
|
6820e2d097
|
remark fix in allergies
|
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 |
Mohammad Aljammal
|
fa94b60711
|
Merge branch 'feature-ucaf' into 'development'
translation
See merge request Cloud_Solution/doctor_app_flutter!278
|
5 years ago |
Mohammad Aljammal
|
3cfb88b313
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!277
|
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 |
Sultan Khan
|
ed3b42d721
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
d34744e168
|
bug fix
|
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 |
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
|
913ffc3052
|
Fix DA-260,DA-267
|
5 years ago |
Elham Rababah
|
13c879654b
|
DA-250: fix age
|
5 years ago |
Mohammad Aljammal
|
81fdcb2d8d
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!271
|
5 years ago |
Elham Rababah
|
68d27a451d
|
fix general issue
|
5 years ago |
Sultan Khan
|
b92bc85e8f
|
bug fixes
|
5 years ago |
Elham Rababah
|
9ddfbd3e66
|
fix issue on app drawer
|
5 years ago |
Sultan Khan
|
d5d7ea6c49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
63e8ee8dd0
|
sick leave
|
5 years ago |
Elham Rababah
|
00543a759a
|
fix remarks in allergies
|
5 years ago |
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
5 years ago |
Elham Rababah
|
484c737836
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
5 years ago |
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Mohammad Aljammal
|
b89af8a5ab
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!266
|
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
|
f0cd33ae43
|
fix issue on assessment design
|
5 years ago |
Elham Rababah
|
1de25aae2f
|
fix issue on assessment design
|
5 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
|
5 years ago |
hussam al-habibeh
|
4a4cd03f63
|
Prescription date
|
5 years ago |
hussam al-habibeh
|
38d9881ed2
|
Prescription date
|
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 |
mosazaid
|
3be693337a
|
some fixes
|
5 years ago |
Elham Rababah
|
4e4e6a3600
|
fix DA-151
|
5 years ago |
Elham Rababah
|
a7ca7fb271
|
fix DA-151
|
5 years ago |
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
5 years ago |
Sultan Khan
|
d55ce4c1ec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
mosazaid
|
cd95a581f0
|
simple changes
|
5 years ago |
Elham Rababah
|
cc92fe56c6
|
fix DA-154,DA-150
|
5 years ago |
Sultan Khan
|
896078507f
|
gub fixes
|
5 years ago |
Elham Rababah
|
e32c360f85
|
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
|
e95638bd99
|
fix DA-157
|
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
|
eb90fc0161
|
fix bug in assessment
|
5 years ago |
Sultan Khan
|
40cfad7f7b
|
login
|
5 years ago |
Elham Rababah
|
9674eb89d9
|
add modification on so
|
5 years ago |
Sultan Khan
|
417ca9401b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
a99b3847ac
|
login completed
|
5 years ago |
Elham Rababah
|
bc8a90ef2c
|
first step from fix loader
|
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 |
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
|
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
|
722e1a5c41
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
ad99cebf02
|
login and drug to drug
|
5 years ago |
mosazaid
|
306d484837
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
8726653ffb
|
working on Referral feature
|
5 years ago |
Elham Rababah
|
1f2aebde33
|
fix loader in login
|
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 |
Mohammad Aljammal
|
748802af1d
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!245
|
5 years ago |
Elham Rababah
|
90a16676db
|
fix issue related to SOAP
|
5 years ago |
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
5 years ago |
Elham Rababah
|
fb035cd4c9
|
fix patient_search_screen.dart
|
5 years ago |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
5 years ago |
Elham Rababah
|
175ba545e7
|
finish create episode
|
5 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
5 years ago |
Elham
|
8494f6e0f4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!241
|
5 years ago |
Elham Rababah
|
caddbdb53c
|
small fixes in progress note
|
5 years ago |
Elham Rababah
|
34b7b4564c
|
assessment work fine now
|
5 years ago |
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
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 |
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
5 years ago |
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
5 years ago |
Elham Rababah
|
9aa5ab4228
|
small changes
|
5 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
5 years ago |
Elham Rababah
|
c3bb408787
|
add some translations
|
5 years ago |
Elham Rababah
|
bbcd218a94
|
history delete is fixed
|
5 years ago |
Elham Rababah
|
3dffd33728
|
hot fix
|
5 years ago |
Elham Rababah
|
1cda486268
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
|
5 years ago |
Elham Rababah
|
9194d8a44b
|
delete Allergy
|
5 years ago |
mosazaid
|
3b471aebdc
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
5 years ago |
Elham
|
b291572767
|
Merge branch 'soap_update' into 'development'
Fix profile widget
See merge request Cloud_Solution/doctor_app_flutter!223
|
5 years ago |
Elham Rababah
|
8284f1d475
|
Fix profile widget
|
5 years ago |
Mohammad Aljammal
|
812fe10db8
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!219
|
5 years ago |
Elham Rababah
|
e054c28234
|
hide text
|
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
|
4b5bec8c50
|
working on UCAF design
|
5 years ago |
Mohammad Aljammal
|
f0f98280b4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
|
5 years ago |
Sultan Khan
|
9adc5ddd8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
7d550ca15f
|
prevent null
|
5 years ago |
Elham Rababah
|
2f80af6b74
|
small fix
|
5 years ago |
Elham Rababah
|
71b50c8404
|
First step translations
|
5 years ago |
Elham Rababah
|
ba14d23c05
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Elham Rababah
|
e65740761a
|
add improvement on create episode
|
5 years ago |
Sultan Khan
|
43a1e56a8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
hussam al-habibeh
|
4ffeb31181
|
update procedure fixes
|
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 |
Sultan Khan
|
4587fdda59
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
423bd49aee
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/routes.dart
|
5 years ago |
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
5 years ago |
Mohammad Aljammal
|
3cb96f35ca
|
Merge branch 'design-updates' into 'development'
Design updates
See merge request Cloud_Solution/doctor_app_flutter!211
|
5 years ago |
hussam al-habibeh
|
75eda8832d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
5 years ago |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
5 years ago |
Elham Rababah
|
856777c648
|
finish updating functions
|
5 years ago |
mosazaid
|
0e645c2b1f
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
5 years ago |
Elham Rababah
|
f8b195e368
|
parseHtmlString now working :)
|
5 years ago |
Elham Rababah
|
3cadd532d8
|
finish Updating
|
5 years ago |
Sultan Khan
|
70d11bfe9e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Mohammad Aljammal
|
93c0bdf32a
|
return login
|
5 years ago |
Sultan Khan
|
b2aef274bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
3c968f0de1
|
doctor leave
|
5 years ago |
Elham Rababah
|
6a7f0e605f
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
5 years ago |
Elham Rababah
|
4caf40a2ab
|
finish plan page
|
5 years ago |
Mohammad Aljammal
|
1af5f1040f
|
add search in soap update
|
5 years ago |
Mohammad Aljammal
|
d5bde6228a
|
add search in update assessment page
|
5 years ago |
Elham Rababah
|
d8ac550357
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
5 years ago |
Elham Rababah
|
311bee5136
|
try to fix get
|
5 years ago |
Elham Rababah
|
46043efb42
|
Finish Update objective code Page
|
5 years ago |
Elham Rababah
|
c92a848851
|
Finish Update Subjective Page
|
5 years ago |
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
5 years ago |
mosazaid
|
cb4ee05b40
|
working on ucaf
|
5 years ago |
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
5 years ago |
Mohammad Aljammal
|
5669021add
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/widgets/patients/profile/SOAP/assessment_page.dart
lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
|
5 years ago |
Mohammad Aljammal
|
9bf08e81da
|
Add search button name and hint search text in MasterKeyCheckboxSearchWidget
|
5 years ago |
Elham Rababah
|
39970fe1a8
|
get update_subjective_page.dart
|
5 years ago |
Mohammad Aljammal
|
b60b45ab53
|
Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/screens/patients/patient_search_screen.dart
|
5 years ago |
Mohammad Aljammal
|
93bece09d7
|
add search in SOAP
|
5 years ago |
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
5 years ago |
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
hussam al-habibeh
|
b3345a86ef
|
post prescription
|
5 years ago |
Elham Rababah
|
ea4bf159c6
|
commit issue
|
5 years ago |
Elham Rababah
|
05e7762533
|
fix obj page
|
5 years ago |
Elham Rababah
|
49f7dab008
|
Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
5 years ago |
mosazaid
|
873ee67eb7
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
5 years ago |
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
5 years ago |
Mohammad Aljammal
|
6f2e764deb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
Conflicts:
lib/client/base_app_client.dart
lib/routes.dart
|
5 years ago |
Mohammad Aljammal
|
04ed76069c
|
hack login
|
5 years ago |
Elham Rababah
|
fc82665f1b
|
add ICD10
|
5 years ago |
Elham Rababah
|
2f273dcde8
|
add ICD10
|
5 years ago |
Elham Rababah
|
4e8de52efe
|
add commented code
|
5 years ago |
Elham Rababah
|
14955201a9
|
fix things
|
5 years ago |
Elham Rababah
|
efee00c79e
|
finish add assessment
|
5 years ago |
Elham Rababah
|
a47e9b69f5
|
add CDI service
|
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 |
Elham Rababah
|
8a6ea1c0c5
|
Fix SOAP
|
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
|
1672d9a3a0
|
add assessment_page code
|
5 years ago |
Elham Rababah
|
dc4250a4de
|
Post progress Note
|
5 years ago |
Elham Rababah
|
b22fd3f7ba
|
fix listHisProgNotePhysicalExaminationVM
|
5 years ago |
Elham Rababah
|
f97d11183d
|
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 |
Elham Rababah
|
1491a04b39
|
PostPhysicalExam works
|
5 years ago |
hussam al-habibeh
|
697f17f2cd
|
prescription and procedure
|
5 years ago |
Elham Rababah
|
a362901da8
|
improve code inside my eam
|
5 years ago |
Elham Rababah
|
4df3b1fb40
|
First step from examination
|
5 years ago |
Elham Rababah
|
cde56a82f2
|
Finish subjective
|
5 years ago |
mosazaid
|
d11a8e6209
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/core/service/base/base_service.dart
# lib/locator.dart
|
5 years ago |
mosazaid
|
aafcd89222
|
working on vitalSigns feature
|
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 |
Elham Rababah
|
74d315b887
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/client/base_app_client.dart
|
5 years ago |
Elham Rababah
|
4560706d55
|
improve code inside my eam
|
5 years ago |
mosazaid
|
47e9d2a558
|
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
|
5 years ago |
Elham Rababah
|
abbe891673
|
improve code quality
|
5 years ago |
Elham Rababah
|
2658694b70
|
remove static value
|
5 years ago |
Elham Rababah
|
9a614b25b5
|
Finish the login
|
5 years ago |
Elham Rababah
|
e96d38454c
|
First step from examination
|
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 |
Elham Rababah
|
9b0731d5c8
|
check activation code
|
5 years ago |
Elham Rababah
|
7001940d0d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new
|
5 years ago |
Elham Rababah
|
9bb396c309
|
fix error in base app
|
5 years ago |
mosazaid
|
7cefbb4dbd
|
add referral pages
|
5 years ago |
Elham Rababah
|
a3dff8c9f8
|
Post Allergies service
|
5 years ago |
Elham Rababah
|
52554d1aef
|
add and remove allergy
|
5 years ago |
Sultan Khan
|
989c06ae33
|
prescription changes
|
5 years ago |
Elham Rababah
|
405ad731c7
|
history list ready
|
5 years ago |
Elham Rababah
|
df68e912b5
|
first step from calling history
|
5 years ago |
Sultan Khan
|
8d58348267
|
dashboard changes
|
5 years ago |
Elham Rababah
|
ef6b1bc50e
|
add master lookups
|
5 years ago |
Elham Rababah
|
16e6221b9e
|
Finish plan page design
|
5 years ago |
Elham Rababah
|
7910e6a9e9
|
Finish step objective_page.dart + assessment_page.dart page
|
5 years ago |
Elham Rababah
|
c15300125e
|
First step objective_page.dart
|
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
|
e5d542f1d0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
81352c2b0e
|
small fix.
|
5 years ago |
Elham Rababah
|
af77d35ce3
|
ass some changes to SOAP
|
5 years ago |
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
5 years ago |
Sultan Khan
|
ba2697c917
|
sick leave
|
5 years ago |
Elham Rababah
|
4eee5cd9d8
|
new login type
|
5 years ago |
mosazaid
|
bb1f101e94
|
finish re-design refer-patient screen
|
5 years ago |
Sultan Khan
|
76e10459e0
|
sick leave
|
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 |
Elham Rababah
|
89729e4537
|
fix my referred widget
|
5 years ago |
Elham Rababah
|
5905311d12
|
small fixes in patient profile
|
5 years ago |
Elham
|
97a1a56f1f
|
Merge branch 'replay-design' into 'development'
re-design in-patient detail page
See merge request Cloud_Solution/doctor_app_flutter!182
|
5 years ago |
Sultan Khan
|
06f71a22fb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
mosazaid
|
16821c17fc
|
re-design in-patient detail page
|
5 years ago |
Sultan Khan
|
ac747e7519
|
dashboard
|
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 |
Elham Rababah
|
9f19b2566f
|
finish refactor provider
|
5 years ago |
Elham Rababah
|
64dbcce06f
|
finish and remove patient provider
|
5 years ago |
mosazaid
|
f9ae2559f0
|
working on referral reply screen
|
5 years ago |
mosazaid
|
a55b605a6c
|
Merge branch 'development' into replay-design
|
5 years ago |
mosazaid
|
5ed9aea5a7
|
fix HexColor library error
|
5 years ago |
Elham Rababah
|
45cde2cb72
|
refactor Referred Patient Service
|
5 years ago |
Elham Rababah
|
df9d151f46
|
refactor Referral Patient Service
|
5 years ago |
Elham Rababah
|
6e461f7212
|
refactor Schedule service
|
5 years ago |
Mohammad Aljammal
|
3cedf3c927
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_mvvm
Conflicts:
lib/providers/medicine_provider.dart
|
5 years ago |
Mohammad Aljammal
|
e6edd5449f
|
Add MVVM
|
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
|
9a18c405c7
|
comment code not working in good way until we fixed
|
5 years ago |
Elham Rababah
|
51206c1164
|
fix auth with mohammad help
|
5 years ago |
Elham Rababah
|
b308dc5826
|
change doctor app icons and optimization
|
6 years ago |
Elham Rababah
|
8980fc03aa
|
Finish Patient search design
|
6 years ago |
Elham Rababah
|
0d8455faa7
|
Finish medicine 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 |
Mohammad Aljammal
|
2e4f9fa335
|
Merge remote-tracking branch 'origin/development' into development
|
6 years ago |
Mohammad Aljammal
|
5eae2f9519
|
fix merge issues
|
6 years ago |
Mohammad Aljammal
|
146a53a6e5
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/config/config.dart
lib/models/pharmacies/pharmacies_List_request_model.dart
lib/screens/medicine/medicine_search_screen.dart
|
6 years ago |
Elham Rababah
|
e37a3e8ce1
|
Finish dashboard screen design
|
6 years ago |
Sultan Khan
|
6eb2da3770
|
voice search
|
6 years ago |
hussam al-habibeh
|
b6d2cdb1db
|
fixing clinic name in app reopening
|
6 years ago |
hussam al-habibeh
|
0444d6803c
|
verification Screen Fixed
|
6 years ago |
hussam al-habibeh
|
d3bb85129c
|
LogIn function refactoring
|
6 years ago |
hussam al-habibeh
|
629ccbeda8
|
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
|
d866d8b9de
|
get clinic list
|
6 years ago |
ibrahim albitar
|
98950890a0
|
Add User Guid Module
|
6 years ago |
hussam al-habibeh
|
0e471aaa63
|
language setup on logout
|
6 years ago |
hussam al-habibeh
|
420cc0622c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam al-habibeh
|
5172703a32
|
setup language on logout
|
6 years ago |
ibrahim albitar
|
c07f84ff78
|
fixing and enhancments
|
6 years ago |
Elham
|
c35c6f7444
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!134
|
6 years ago |
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
6 years ago |
Elham Rababah
|
c62340e834
|
modify IMEI
|
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 |
erababah
|
cad096d8c7
|
fix issue on ios and improve structure by Elham & mohammad
|
6 years ago |
hussam al-habibeh
|
8f04edb450
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/landing_page.dart
|
6 years ago |
Mohammad Aljammal
|
5062d942c3
|
Merge branch 'mohammad' into 'development'
Mohammad
See merge request Cloud_Solution/doctor_app_flutter!126
|
6 years ago |
hussam al-habibeh
|
c486d7f357
|
translation stage three
|
6 years ago |
Mohammad ALjammal
|
63dd8262da
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
Mohammad ALjammal
|
f22eec909b
|
create internet connection page Mohammad & Elham
|
6 years ago |
Sultan Khan
|
b26e750abb
|
drawer design updated
|
6 years ago |
Mohammad Aljammal
|
934236ac82
|
Merge branch 'mohammad' into 'development'
fix issues in login
See merge request Cloud_Solution/doctor_app_flutter!123
|
6 years ago |
Mohammad ALjammal
|
6747495ea8
|
fix issues in login
|
6 years ago |
hussam al-habibeh
|
b63d8906bc
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/profile_screen.dart
|
6 years ago |
Sultan Khan
|
79c2de3f96
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# fonts/DoctorApp.ttf
# lib/presentation/doctor_app_icons.dart
|
6 years ago |
hussam alhababieh
|
a02fe9c83d
|
translation stage two
|
6 years ago |
Elham Rababah
|
574a951fcf
|
finish clinic exept design
|
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 |
Elham Rababah
|
165d697e33
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
6 years ago |
Elham Rababah
|
ef8dfc5b5f
|
first step form change clinic
|
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
|
94dbecca4a
|
fix issues in login
|
6 years ago |
ibrahim albitar
|
09ca836ea7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
ibrahim albitar
|
6fd43a281d
|
fixing
|
6 years ago |
Mohammad ALjammal
|
0dad77bfa2
|
fix issues in login
|
6 years ago |
Mohammad ALjammal
|
69173e8c46
|
fix issues in login focus
|
6 years ago |
amjad nabil amireh
|
67c0531fe1
|
Merge branch 'Amjad_search' into 'development'
Modify date in time in search patient
See merge request Cloud_Solution/doctor_app_flutter!116
|
6 years ago |
Amjad Amireh
|
66627534a9
|
Modify date in time in search patiant
|
6 years ago |
Mohammad ALjammal
|
d52429564d
|
fix issues in Patient
|
6 years ago |
Mohammad ALjammal
|
b758ae8196
|
fix issues
|
6 years ago |
Mohammad ALjammal
|
fa9e1a344a
|
fix issues
|
6 years ago |
Mohammad ALjammal
|
c7f1c6d174
|
Merge branch 'ibrahim-merge' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
lib/screens/auth/login_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/auth/verfiy_account.dart
|
6 years ago |
Mohammad ALjammal
|
a3730e4efb
|
fix issues with sultan branch
|
6 years ago |
Mohammad ALjammal
|
79eb6b19d0
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/config/config.dart
lib/presentation/doctor_app_icons.dart
lib/screens/dashboard_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
6 years ago |
Mohammad ALjammal
|
edd25ff437
|
Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/config/config.dart
|
6 years ago |
Mohammad ALjammal
|
2877aa171e
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/widgets/auth/verfiy_account.dart
|
6 years ago |
Mohammad ALjammal
|
692674fac0
|
merge ibrahim
|
6 years ago |
Mohammad ALjammal
|
80664439d9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
|
6 years ago |
Mohammad ALjammal
|
2b1391a6bb
|
Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
Mohammad ALjammal
|
ed857d8d54
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/client/base_app_client.dart
lib/screens/dashboard_screen.dart
|
6 years ago |
Mohammad ALjammal
|
e545d4992c
|
fix issues in dev
|
6 years ago |