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 |