Mohammad Aljammal
|
0747dfb1e0
|
Migrate to flutter 2
|
5 years ago |
hussam al-habibeh
|
25583d7bee
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favourite_prescription
Conflicts:
lib/core/service/patient/LiveCarePatientServices.dart
|
5 years ago |
hussam al-habibeh
|
6989235334
|
Live care Is Login service
|
5 years ago |
mosazaid
|
66d12f8fdd
|
procedure fixes, liveCare working
|
5 years ago |
mosazaid
|
ea0658c05c
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/viewModel/procedure_View_model.dart
|
5 years ago |
Elham Rababah
|
4dc72d6f35
|
Merge branches 'development' and 'login_design_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_design_fixes
Conflicts:
lib/core/viewModel/authentication_view_model.dart
lib/widgets/shared/app_drawer_widget.dart
|
5 years ago |
Elham Rababah
|
8dbfb92f88
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_appointment
Conflicts:
ios/Podfile.lock
|
5 years ago |
Elham Rababah
|
9692e54b97
|
fix login issue
# Conflicts:
# lib/core/viewModel/authentication_view_model.dart
# lib/root_page.dart
# lib/widgets/shared/app_drawer_widget.dart
|
5 years ago |
Elham Rababah
|
fb6ef8fca1
|
fix appointment in live care
|
5 years ago |
mosazaid
|
bc48d915c6
|
procedure refactoring
|
5 years ago |
Elham Rababah
|
00aa2c3752
|
fix homepage screen
|
5 years ago |
hussam al-habibeh
|
519e6f2fec
|
Prescription favourite templates
|
5 years ago |
Elham Rababah
|
19bac417c4
|
fix login issue
|
5 years ago |
mosazaid
|
9454e9d8af
|
working on procedure refactoring
|
5 years ago |
Elham Rababah
|
8d2252ecdf
|
fixes
|
5 years ago |
Mohammad Aljammal
|
3c325ef199
|
fix load procedure
|
5 years ago |
Mohammad Aljammal
|
80a751ae4d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates
|
5 years ago |
mosazaid
|
b16dc2092b
|
liveCare cahnges
|
5 years ago |
Mohammad Aljammal
|
2b6736ed6a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates
Conflicts:
lib/screens/procedures/add-favourite-procedure.dart
|
5 years ago |
Mohammad Aljammal
|
725c87fe8b
|
Add favorite procedure templates for lab and radiology
|
5 years ago |
mosazaid
|
390a34dd81
|
procedure hot fix
|
5 years ago |
mosazaid
|
f75ac64cad
|
procedure get template
|
5 years ago |
Mohammad Aljammal
|
6620c79478
|
fix ui issues
|
5 years ago |
Mohammad Aljammal
|
280f87e514
|
fix live care issues
|
5 years ago |
Mohammad Aljammal
|
ad036f7133
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into text-form-field
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
|
5 years ago |
Mohammad Aljammal
|
281a807ec8
|
fix live care
|
5 years ago |
mosazaid
|
41515b311c
|
lab-result-fixes
|
5 years ago |
Mohammad Aljammal
|
1391799101
|
fix live care user
|
5 years ago |
Mohammad Aljammal
|
e89d5b13ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services
|
5 years ago |
Mohammad Aljammal
|
169e5301a0
|
Merge branch 'lab-result-special' into 'development'
lab-result-special
See merge request Cloud_Solution/doctor_app_flutter!692
|
5 years ago |
Mohammad Aljammal
|
7d423d9457
|
Merge branch 'prescription_changes' into 'development'
procedure changes
See merge request Cloud_Solution/doctor_app_flutter!691
|
5 years ago |
Mohammad Aljammal
|
ac701c9806
|
fix live care issues
|
5 years ago |
mosazaid
|
73cf681e9d
|
lab-result-special
|
5 years ago |
hussam al-habibeh
|
764578f28e
|
procedure changes
|
5 years ago |
Elham Rababah
|
fdc23ce932
|
Merge branches 'development' and 'live_care_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_patient
Conflicts:
lib/core/service/patient/LiveCarePatientServices.dart
lib/core/viewModel/LiveCarePatientViewModel.dart
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
5 years ago |
Mohammad Aljammal
|
b9831adeb2
|
Merge branch 'medical-profile-services' into 'development'
Medical profile services
See merge request Cloud_Solution/doctor_app_flutter!689
|
5 years ago |
Mohammad Aljammal
|
d7cd818a31
|
Merge branch 'expansion_procedure' into 'development'
Expansion procedure
See merge request Cloud_Solution/doctor_app_flutter!687
|
5 years ago |
hussam al-habibeh
|
36ce997529
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/config/config.dart
|
5 years ago |
hussam al-habibeh
|
f26d870d5b
|
procedure changes
|
5 years ago |
Elham Rababah
|
401516403f
|
first step from show Video call
|
5 years ago |
mosazaid
|
0cd7fa0cb2
|
working on livecare
|
5 years ago |
Mohammad Aljammal
|
e313722743
|
fix bug when logout
|
5 years ago |
mosazaid
|
8b2c7f1a05
|
livecare
|
5 years ago |
mosazaid
|
ac460f1d19
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
Elham Rababah
|
6d989e3fc3
|
finish new service for live care
|
5 years ago |
mosazaid
|
ced177e1c0
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
0798057f31
|
change
|
5 years ago |
Elham Rababah
|
8e140abee9
|
make pending service dynamic
|
5 years ago |
Elham Rababah
|
1bc01e0ad1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
|
5 years ago |
Elham Rababah
|
5778a4a887
|
view list of Live care patient
|
5 years ago |
mosazaid
|
fef70604be
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/config.dart
|
5 years ago |
mosazaid
|
186461f3a8
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
08d72ed121
|
Merge branch 'prescription_changes' into 'development'
Procedure template service
See merge request Cloud_Solution/doctor_app_flutter!680
|
5 years ago |
Elham Rababah
|
c4b434497a
|
Merge branches 'development' and 'html_editor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
Conflicts:
lib/screens/home/home_screen.dart
|
5 years ago |
Elham Rababah
|
33ceb01d67
|
first step from Live care patient list
|
5 years ago |
hussam al-habibeh
|
d50740b9b9
|
Procedure template service
|
5 years ago |
mosazaid
|
70d171a599
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
67e0cac742
|
add livecare to home
|
5 years ago |
Mohammad Aljammal
|
40b4a83c6b
|
Fix Expansion Procedure
|
5 years ago |
Mohammad Aljammal
|
16dac03b24
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
Conflicts:
lib/locator.dart
lib/screens/home/home_screen.dart
|
5 years ago |
Mohammad Aljammal
|
f6539c82a6
|
add live care card in home page
|
5 years ago |
hussam al-habibeh
|
3801d7b59a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
5 years ago |
hussam al-habibeh
|
e1d00b87ad
|
favourite template Procedure service
|
5 years ago |
mosazaid
|
9e552668c7
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
2fabe85b30
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
1cc55d809c
|
fix authentication service
|
5 years ago |
mosazaid
|
deb126fdd5
|
meical report changes
|
5 years ago |
Mohammad Aljammal
|
a97a331d87
|
fix bugs in change the clinic, login page when get the projects and add the special Result
|
5 years ago |
hussam al-habibeh
|
066acc404a
|
Procedure template service
|
5 years ago |
Mohammad Aljammal
|
57fcd2cdeb
|
fix home page design
|
5 years ago |
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
5 years ago |
Elham Rababah
|
164a7fd2fc
|
fix merge issues
|
5 years ago |
Elham Rababah
|
56698a82fd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
Conflicts:
lib/core/service/home/auth_service.dart
lib/core/viewModel/auth_view_model.dart
lib/core/viewModel/imei_view_model.dart
lib/locator.dart
lib/screens/auth/login_screen.dart
lib/screens/home/home_screen.dart
lib/screens/patients/patient_search/patient_search_screen.dart
lib/widgets/auth/verification_methods.dart
|
5 years ago |
Elham Rababah
|
515955663a
|
add verification
|
5 years ago |
mosazaid
|
6192d9a84f
|
working on medical-profile
|
5 years ago |
Mohammad Aljammal
|
1187c3b605
|
fix authentication provider
|
5 years ago |
Elham Rababah
|
6933b6577f
|
add session time out.
|
5 years ago |
hussam al-habibeh
|
6b6243232c
|
Procedure template service
|
5 years ago |
Elham Rababah
|
0d8684481d
|
fix sms error and some design issue
|
5 years ago |
Mohammad Aljammal
|
2c43cfcdde
|
Merge branch 'home-refactoring' into 'development'
Home refactoring
See merge request Cloud_Solution/doctor_app_flutter!648
|
5 years ago |
Elham Rababah
|
e0be4ec1be
|
move logout function from helper to authentication view model
|
5 years ago |
Elham Rababah
|
0adcfeccce
|
fix auth bug
|
5 years ago |
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
5 years ago |
Elham Rababah
|
2e71706cab
|
add UNVERIFIED status
|
5 years ago |
mosazaid
|
0e2b700136
|
vital sign hot fix
|
5 years ago |
Elham Rababah
|
fd9f93a936
|
do some refactor and change the code to view model
|
5 years ago |
mosazaid
|
70480cc09e
|
Merge branch 'development' into home-refactoring
|
5 years ago |
Mohammad Aljammal
|
8541ddc0f8
|
fix LabOrderResult
|
5 years ago |
mosazaid
|
12bb283a68
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
5 years ago |
Mohammad Aljammal
|
8e4321b3da
|
Migration dev to Zohaib branch
|
5 years ago |
Mohammad Aljammal
|
b3ae86db31
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
Conflicts:
lib/screens/patients/DischargedPatientPage.dart
lib/screens/patients/ReferralDischargedPatientDetails.dart
lib/screens/patients/insurance_approvals_details.dart
lib/screens/patients/patients_screen.dart
lib/screens/patients/profile/note/progress_note_screen.dart
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
lib/screens/prescription/update_prescription_form.dart
lib/screens/sick-leave/add-sickleave.dart
lib/widgets/patients/PatientCard.dart
pubspec.lock
|
5 years ago |
Mohammad Aljammal
|
081bfe3f61
|
add TODO to Elham
|
5 years ago |
mosazaid
|
2023ce9b55
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/core/viewModel/dashboard_view_model.dart
# lib/screens/home/home_screen.dart
|
5 years ago |
hussam al-habibeh
|
292bc2a97f
|
prescription changes
|
5 years ago |
hussam al-habibeh
|
c50a483663
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/core/service/patient_medical_file/prescription/prescription_service.dart
lib/core/viewModel/prescription_view_model.dart
lib/screens/prescription/add_prescription_form.dart
|
5 years ago |
hussam al-habibeh
|
cecc1a725d
|
pescription changes
|
5 years ago |
Mohammad Aljammal
|
74ded739c8
|
fix imports
|
5 years ago |
Elham Rababah
|
745545ffc3
|
add models
|
5 years ago |
hussam al-habibeh
|
bc340693ba
|
project refactoring
|
5 years ago |
hussam al-habibeh
|
9457e04825
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/core/viewModel/PatientSearchViewModel.dart
lib/screens/patients/PatientsInPatientScreen.dart
lib/screens/patients/out_patient/out_patient_screen.dart
lib/screens/patients/patient_search/patient_search_result_screen.dart
lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
lib/screens/sick-leave/add-sickleave.dart
|
5 years ago |
Elham Rababah
|
333d1e3f50
|
first step from models
|
5 years ago |
Elham Rababah
|
7af300d455
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
5 years ago |
Elham Rababah
|
32d26c3c4b
|
remove Verification Methods page and move some code to model
|
5 years ago |
Elham Rababah
|
3ca4ac3632
|
create method card and remove future builder from verification method widget
|
5 years ago |
Elham Rababah
|
a3caf023e2
|
Add enum to verification_methods
|
5 years ago |
Mohammad Aljammal
|
f0039b491e
|
fix home page
|
5 years ago |
mosazaid
|
34a7c0b148
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
5 years ago |
Elham Rababah
|
53791f1028
|
change imei to authentication
|
5 years ago |
Elham Rababah
|
a5120b473f
|
rename Auth view model to Doctor Profile View Model
|
5 years ago |
Mohammad Aljammal
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
5 years ago |
Elham Rababah
|
15bead5164
|
add insert IMEI service
|
5 years ago |
mosazaid
|
0d86759245
|
working on dashboard re-factoring
|
5 years ago |
Elham Rababah
|
9f1f06f2fc
|
refactor verification methods services
|
5 years ago |
Elham Rababah
|
b20d936933
|
fix hospitals_service
|
5 years ago |
mosazaid
|
916c1266ca
|
refactoring home screen
|
5 years ago |
hussam al-habibeh
|
4eba6d9f5a
|
Project refactoring
|
5 years ago |
Elham Rababah
|
663d2a942f
|
first step from refactoring auth part
|
5 years ago |
Elham Rababah
|
607da6af66
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
Conflicts:
lib/core/viewModel/PatientSearchViewModel.dart
|
5 years ago |
Elham Rababah
|
7559ab31c0
|
fix out patient + fix steper in arabic
|
5 years ago |
mosazaid
|
a61cae4922
|
Merge branch 'development' into design-changes
|
5 years ago |
mosazaid
|
6fba03ed69
|
design fixes
|
5 years ago |
Mohammad Aljammal
|
866f6cc8ea
|
Merge branch 'add_out_patient_filter' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!630
|
5 years ago |
Elham Rababah
|
8e4d9d9692
|
hot fix
|
5 years ago |
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
5 years ago |
Mohammad Aljammal
|
27a3dd1eb4
|
fix the filter page
|
5 years ago |
Elham Rababah
|
7337dc4f87
|
date picker
|
5 years ago |
Elham Rababah
|
f0457f4e99
|
finish filter page
|
5 years ago |
Elham Rababah
|
dcdbe76e54
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issus_soap
Conflicts:
lib/screens/patients/profile/patient_profile_screen.dart
|
5 years ago |
Elham Rababah
|
0f8820fa44
|
fix profile screen and start the first step from filter page
|
5 years ago |
mosazaid
|
55895496e1
|
Merge branch 'design-changes' into development
|
5 years ago |
mosazaid
|
3d6b55681a
|
fix arabic and font style
|
5 years ago |
Haroon Amjad
|
0244334bb5
|
Update on store
|
5 years ago |
Haroon Amjad
|
53a610213c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/home/home_screen.dart
# lib/widgets/auth/login_form.dart
# lib/widgets/auth/verfiy_account.dart
|
5 years ago |
Mohammad Aljammal
|
1dd668ed70
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
dc9f75f0ca
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
a1a500813b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
21fd90ea8c
|
hot fixes
|
5 years ago |
Elham Rababah
|
4c493d8ea6
|
fix issue in patients_screen
|
5 years ago |
Mohammad Aljammal
|
60eb7adab1
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
3e2323fbc0
|
Merge branch 'referral_in_patient' into 'development'
hot fixes
See merge request Cloud_Solution/doctor_app_flutter!605
|
5 years ago |
Mohammad Aljammal
|
c3ac50a859
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
35b3aaf90a
|
Merge branch 'search_out_patient' into 'development'
fix small bug
See merge request Cloud_Solution/doctor_app_flutter!602
|
5 years ago |
Mohammad Aljammal
|
7346c9b0c3
|
Merge branch 'in_patient_services' into 'development'
add procedure form update
See merge request Cloud_Solution/doctor_app_flutter!603
|
5 years ago |
hussam al-habibeh
|
8a564b34ac
|
add procedure form update
|
5 years ago |
Elham Rababah
|
1e68f8fe33
|
fix small bug
|
5 years ago |
Mohammad Aljammal
|
f4fd4b26d6
|
Add filter in outpatient
|
5 years ago |
mosazaid
|
7c8583075a
|
Merge branch 'development' into in-patient_re-design
# Conflicts:
# lib/core/viewModel/PatientSearchViewModel.dart
|
5 years ago |
Zohaib Iqbal Kambrani
|
4b7688d620
|
showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
|
5 years ago |
mosazaid
|
9870356e6e
|
Merge branch 'development' into in-patient_re-design
|
5 years ago |
mosazaid
|
286d883c9b
|
in-patient re-design
|
5 years ago |
Elham Rababah
|
cc7d64e9d1
|
fix merge issue
|
5 years ago |
Elham Rababah
|
56a5209d92
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
Conflicts:
lib/core/model/PatientSearchRequestModel.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/locator.dart
|
5 years ago |
Elham Rababah
|
20f7664b4c
|
fix issue
|
5 years ago |
Mohammad Aljammal
|
54166c0568
|
Merge branch 'in_patient_services' into 'development'
sick leave service
See merge request Cloud_Solution/doctor_app_flutter!593
|
5 years ago |
hussam al-habibeh
|
058a6d9e8c
|
sick leave service
|
5 years ago |
mosazaid
|
40c0f9f4a0
|
Merge branch 'development' into in-patient_re-design
|
5 years ago |
mosazaid
|
3e24278d89
|
in-patient re-design
|
5 years ago |
Mohammad Aljammal
|
357e01c846
|
hot fixes
|
5 years ago |
Elham Rababah
|
c062a14cc2
|
Merge branches 'development' and 'search_out_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
|
5 years ago |
Elham Rababah
|
cb67dcc9e1
|
first step from search
|
5 years ago |
Mohammad Aljammal
|
55c63c9531
|
fix Discharged Patient
|
5 years ago |
Mohammad Aljammal
|
57d22aca13
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
c9c18efd72
|
add in lab result get in and out patient
|
5 years ago |
Mohammad Aljammal
|
98eec8fcdb
|
Merge branch 'referral_in_patient' into 'development'
add PatientSearchViewModel
See merge request Cloud_Solution/doctor_app_flutter!589
|
5 years ago |
Mohammad Aljammal
|
2f01fa1b53
|
add PatientSearchViewModel
|
5 years ago |
Mohammad Aljammal
|
0647dc4bc3
|
Merge branch 'design-changes' into 'development'
some functionality and design changes
See merge request Cloud_Solution/doctor_app_flutter!586
|
5 years ago |
Mohammad Aljammal
|
4e37a16211
|
add PatientSearchRequestModel
|
5 years ago |
mosazaid
|
ddc266416d
|
some functionality and design changes
|
5 years ago |
Mohammad Aljammal
|
f708689d00
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
29e2d962bc
|
Optimize imports
|
5 years ago |
mosazaid
|
58f1b21ea3
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
mosazaid
|
a3eb9dbb55
|
vital sign design
|
5 years ago |
Mohammad Aljammal
|
86b5640fe6
|
Merge branch 'progress_note' into 'development'
fix radiology date
See merge request Cloud_Solution/doctor_app_flutter!578
|
5 years ago |
Mohammad Aljammal
|
8b1c400f2b
|
Merge branch 'referral_in_patient' into 'development'
Done Referral Discharged Patient
See merge request Cloud_Solution/doctor_app_flutter!576
|
5 years ago |
Mohammad Aljammal
|
97c29945d0
|
Merge branch 'in_patient_services' into 'development'
procedure screen hot fix
See merge request Cloud_Solution/doctor_app_flutter!577
|
5 years ago |
Elham Rababah
|
5075a52a02
|
fix radiology date
|
5 years ago |
hussam al-habibeh
|
9a2cd1719b
|
procedure screen hot fix
|
5 years ago |
mosazaid
|
3335147313
|
vital sign add oxygenation
|
5 years ago |
Mohammad Aljammal
|
b2bcb3dd6d
|
Done Referral Discharged Patient
|
5 years ago |
mosazaid
|
5003b3a001
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
mosazaid
|
1b8e3eb895
|
some fixes
|
5 years ago |
Mohammad Aljammal
|
460a5293b9
|
add Discharged Patient
|
5 years ago |
Mohammad Aljammal
|
a3cdacad08
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
15aaeef157
|
Merge branch 'in_patient_services' into 'development'
add doctor image to in patient insurance approvals
See merge request Cloud_Solution/doctor_app_flutter!568
|
5 years ago |
Mohammad Aljammal
|
cd3002b0e4
|
done the referral
|
5 years ago |
hussam al-habibeh
|
45e9ee60a9
|
add doctor image to in patient insurance approvals
|
5 years ago |
Mohammad Aljammal
|
89e0107b86
|
Merge branch 'referral_in_patient' into 'development'
Referral in patient
See merge request Cloud_Solution/doctor_app_flutter!566
|
5 years ago |
Mohammad Aljammal
|
9b7bb687c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
cf4d2c6cb7
|
Merge branch 'progress_note' into 'development'
fix radiology_service
See merge request Cloud_Solution/doctor_app_flutter!565
|
5 years ago |
mosazaid
|
3074dfd42e
|
hot fix
|
5 years ago |
Elham Rababah
|
84ec110c82
|
fix radiology_service
|
5 years ago |
mosazaid
|
a34db1b00c
|
Merge branch 'development' into fridayf-fix-bug
# Conflicts:
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
42d8fc0207
|
finish in-patient referral
|
5 years ago |
Mohammad Aljammal
|
1cfc970051
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
3c224ece41
|
Add replay on referral patient and add the time on the vital signs
|
5 years ago |
Sultan Khan
|
94806c3601
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
19f0d7ede9
|
voice feature added
|
5 years ago |
Mohammad Aljammal
|
7ed64c9007
|
Merge branch 'referral_in_patient' into 'development'
done first page in ReferralInPatient
See merge request Cloud_Solution/doctor_app_flutter!559
|
5 years ago |
Mohammad Aljammal
|
018f216658
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
5333c0730b
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!557
|
5 years ago |
Mohammad Aljammal
|
6d530301b6
|
done first page in ReferralInPatient
|
5 years ago |
Elham Rababah
|
fceb351b6c
|
fix the progress_note_screen
|
5 years ago |
mosazaid
|
9d00440789
|
referral -re design
|
5 years ago |
Mohammad Aljammal
|
8a63d8bb83
|
hot fixes
|
5 years ago |
mosazaid
|
596f518525
|
Merge branch 'development' into release-hot-fix
# Conflicts:
# lib/screens/patients/profile/patient_profile_screen.dart
# lib/widgets/patients/profile/PatientProfileButton.dart
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
mosazaid
|
bf9ce4694f
|
fix logic
|
5 years ago |
Elham Rababah
|
d4ddfa21e5
|
add the new logic
|
5 years ago |
Mohammad Aljammal
|
414ccdde49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
b37c607813
|
done the referral service
|
5 years ago |
Sultan Khan
|
426aa03aa5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
b5503a8411
|
fixes
|
5 years ago |
Mohammad Aljammal
|
650a949c6a
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!542
|
5 years ago |
Mohammad Aljammal
|
36189adf94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/shared/doctor_card.dart
|
5 years ago |
Mohammad Aljammal
|
ae8882fbae
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!539
|
5 years ago |
Elham Rababah
|
8d7fef3db9
|
fix some issue on progress_note_screen
|
5 years ago |
hussam al-habibeh
|
e3102b3f5e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
|
5 years ago |
hussam al-habibeh
|
94e598c5f2
|
Insurance Approval In Patient
|
5 years ago |
mosazaid
|
2bf003c100
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
mosazaid
|
33545d1180
|
work on in paitent referral
|
5 years ago |
Mohammad Aljammal
|
fd790978c4
|
add new referral service
|
5 years ago |
Elham Rababah
|
4a263dda8a
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/config/config.dart
|
5 years ago |
Elham Rababah
|
82285ccf39
|
show progress_note part
|
5 years ago |
mosazaid
|
34e9a3797c
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
Mohammad Aljammal
|
bb8ad61b95
|
Merge branch 'in_patient_services' into 'development'
Prescriptions for in patient
See merge request Cloud_Solution/doctor_app_flutter!534
|
5 years ago |
hussam al-habibeh
|
3e0f87527f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
|
5 years ago |
hussam al-habibeh
|
017074ba56
|
Prescriptions for in patient
|
5 years ago |
Elham Rababah
|
f2011301c6
|
update progress_note
|
5 years ago |
mosazaid
|
9aecc6fbdb
|
add lap results to inpatient and some changes on patient profile
|
5 years ago |
mosazaid
|
b6a6f16b31
|
add vital sign inPatient
|
5 years ago |
Elham Rababah
|
67abe2a5e7
|
first step from radiology
|
5 years ago |
Elham Rababah
|
7b7ce4e037
|
refactor utils folder
|
5 years ago |
Elham Rababah
|
7579a21b83
|
Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
Conflicts:
lib/widgets/auth/login_form.dart
|
5 years ago |
Mohammad Aljammal
|
ad0f159c98
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!516
|
5 years ago |
mosazaid
|
9f61c7eaa0
|
Merge branch 'design-fixes' into development
|
5 years ago |
mosazaid
|
65585ab586
|
add charts to procedures
|
5 years ago |
Elham Rababah
|
59ec9d8e56
|
first step from change text fields
|
5 years ago |
Sultan Khan
|
f6e0e1b0cd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
fda75c721d
|
bug fixes
|
5 years ago |
Haroon Amjad
|
6fc72328b7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
Haroon Amjad
|
27b4450dac
|
versionID changed to 5.5
|
5 years ago |
Elham Rababah
|
76d411b79a
|
move soap folder to the correct place
|
5 years ago |
Mohammad Aljammal
|
cb568d74c0
|
add fun back press on relay page
|
5 years ago |
Mohammad Aljammal
|
7ab149a1cb
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
d450affa37
|
Merge branch 'Stepper_header' into 'development'
add doctor replay
See merge request Cloud_Solution/doctor_app_flutter!502
|
5 years ago |
Elham Rababah
|
4ecf9fe4b9
|
add doctor replay
|
5 years ago |
mosazaid
|
8950dabf7a
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
4b32487540
|
referral design and service changes
|
5 years ago |
Mohammad Aljammal
|
ffabb8883c
|
fix in the verification methods and radiology page
|
5 years ago |
mosazaid
|
82cbf392af
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
a701b6e989
|
make referral changes
|
5 years ago |
Sultan Khan
|
91a499090b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
649379d88f
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
b6941d9f63
|
Merge branch 'Stepper_header' into 'development'
small fixes in soap and in all app.
See merge request Cloud_Solution/doctor_app_flutter!495
|
5 years ago |
Elham Rababah
|
2aba9e79f1
|
small fixes in soap and in all app.
|
5 years ago |
Mohammad Aljammal
|
da084d889c
|
hot ECG,add a new button and hot fixes
|
5 years ago |
Sultan Khan
|
9268b13312
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5c4aee849e
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
8ed9b3c023
|
Merge branch 'Stepper_header' into 'development'
Stepper header
See merge request Cloud_Solution/doctor_app_flutter!484
|
5 years ago |
Sultan Khan
|
148ea967fb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Elham Rababah
|
14cf5a5a1c
|
finish fix the assessment
|
5 years ago |
hussam al-habibeh
|
9645791164
|
changeing add prescription behovior
|
5 years ago |
Sultan Khan
|
0498545e5c
|
no data
|
5 years ago |
Mohammad Aljammal
|
b812ac4b06
|
add no data image in all pages
|
5 years ago |
hussam al-habibeh
|
6f914b3e93
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/screens/procedures/ProcedureCard.dart
lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
|
5 years ago |
hussam al-habibeh
|
3586d226e0
|
insurance approval & medical file design fix
|
5 years ago |
Mohammad Aljammal
|
8055fa17eb
|
add the branch in all doctors card and add no data image
|
5 years ago |
mosazaid
|
f0f4613960
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
f8f088fe8c
|
design changes
|
5 years ago |
hussam al-habibeh
|
136c839c93
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
0e4ec6ed31
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!443
|
5 years ago |
Sultan Khan
|
2aaeaa1a36
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
1fb594617a
|
bug fixes
|
5 years ago |
hussam al-habibeh
|
1fba6c839c
|
insurance approvals deatils fix
|
5 years ago |
Mohammad Aljammal
|
ecccb2d068
|
fix font size
|
5 years ago |
Mohammad Aljammal
|
4fe6652997
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!430
|
5 years ago |
Mohammad Aljammal
|
be55597771
|
Merge branch 'fix-issues' into 'development'
adding Doctor image in medical file & adding DoctorApp new Icons
See merge request Cloud_Solution/doctor_app_flutter!426
|
5 years ago |
Mohammad Aljammal
|
6ca4797c91
|
hot fixes
|
5 years ago |
hussam al-habibeh
|
92d33abac0
|
adding Doctor image in medical file & adding DoctorApp new Icons
|
5 years ago |
Mohammad Aljammal
|
c66357a4ce
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
mosazaid
|
9dc708fd3d
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
494f716f05
|
working on new design on vital sign and referral screens
|
5 years ago |
Mohammad Aljammal
|
ca28fa77bd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
5e85af35c2
|
fix radiology image
|
5 years ago |
Mohammad Aljammal
|
7f7f7611f3
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!419
|
5 years ago |
Elham Rababah
|
fc98e75ec3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor_replay
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
04f39315b5
|
finish doctor replay design
|
5 years ago |
hussam al-habibeh
|
03f39b8bab
|
insurance approval new design
|
5 years ago |
mosazaid
|
c642d88804
|
some fixes
|
5 years ago |
mosazaid
|
cc7c5af1d0
|
referral details fix bugs
|
5 years ago |
Mohammad Aljammal
|
e038ec4333
|
Merge branch 'patient_app_services' into 'development'
Create procedure card
See merge request Cloud_Solution/doctor_app_flutter!400
|
5 years ago |
Mohammad Aljammal
|
328bb25496
|
Create procedure card
|
5 years ago |
hussam al-habibeh
|
d1a6c2a703
|
adding add prescription form
|
5 years ago |
Mohammad Aljammal
|
7facc70a4c
|
Merge branch 'patient_app_services' into 'development'
Change the font type in the app and Prescription
See merge request Cloud_Solution/doctor_app_flutter!395
|
5 years ago |
Mohammad Aljammal
|
d45b8a9cc5
|
change the font type in the app and Prescription
|
5 years ago |
Sultan Khan
|
c3f19d5ccf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5256c9633f
|
leave reschedule change
|
5 years ago |
hussam al-habibeh
|
2a1426ecd9
|
adding lab form and radiology
|
5 years ago |
Mohammad Aljammal
|
ba13ea7140
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!389
|
5 years ago |
Mohammad Aljammal
|
920ec14bc2
|
add new design for Lab Result and Radiology Results
|
5 years ago |
mosazaid
|
6eaf448d5a
|
working on new design for vital sign and admission request
|
5 years ago |
Mohammad Aljammal
|
6267d805f0
|
hot fixes
|
5 years ago |
Sultan Khan
|
a491eee7f7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
e640bcf975
|
search updated
|
5 years ago |
Mohammad Aljammal
|
de48ae2bff
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/config.dart
|
5 years ago |
Mohammad Aljammal
|
17f8b05748
|
Add prescriptions and radiology from the patient app
|
5 years ago |
Sultan Khan
|
091234ad77
|
bug fix
|
5 years ago |
Sultan Khan
|
10ef8f7954
|
bug fixes
|
5 years ago |
Sultan Khan
|
1ac94d9ec8
|
bug fixes
|
5 years ago |
Sultan Khan
|
12dc637163
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
7dae41513f
|
Add insurance approval services
|
5 years ago |
Mohammad Aljammal
|
e515265f11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
0742d64428
|
add lab result services
|
5 years ago |
Elham Rababah
|
103a1bc6fc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
Conflicts:
lib/config/localized_values.dart
lib/screens/medicine/medicine_search_screen.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
hussam al-habibeh
|
06fdee2d2d
|
hussam
|
5 years ago |
Elham Rababah
|
234cc57a2a
|
return search medicine
|
5 years ago |
Mohammad Aljammal
|
1af6115365
|
add ECG and Show sick leave
|
5 years ago |
Mohammad Aljammal
|
ee25102c2d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ecg_services
Conflicts:
lib/screens/patients/profile/patient_profile_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Mohammad Aljammal
|
e7e4aad962
|
add ECG service
|
5 years ago |
Elham Rababah
|
64c7dae97c
|
Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
Conflicts:
lib/screens/patients/patients_screen.dart
|
5 years ago |
Elham Rababah
|
340bfd0a1c
|
add clinic to arrival search patient
|
5 years ago |
mosazaid
|
fdc893c3d6
|
make search patient profile have preview services
|
5 years ago |
hussam al-habibeh
|
cf44e6f77a
|
hussam
|
5 years ago |
hussam al-habibeh
|
0597cc4b00
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/core/model/get_medication_response_model.dart
lib/core/service/prescription_service.dart
|
5 years ago |
hussam al-habibeh
|
c239dbc620
|
Claculate Box Quantity while adding prescrption
|
5 years ago |
Sultan Khan
|
12f936d045
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
531e7f497b
|
drug to drug intraction
|
5 years ago |
Mohammad Aljammal
|
5a4b084446
|
Merge branch 'fix-issues' into 'development'
procedure updates
See merge request Cloud_Solution/doctor_app_flutter!333
|
5 years ago |
hussam al-habibeh
|
6ae8cf8048
|
procedure updates
|
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
|
e03d2c6ab6
|
Merge branch 'fix-issues' into 'development'
jira bug
See merge request Cloud_Solution/doctor_app_flutter!329
|
5 years ago |
hussam al-habibeh
|
dc941b709f
|
DA-396
|
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
|
3250f33b43
|
jira bugs fix
|
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
|
f819e6353e
|
fix DA-350
|
5 years ago |
Mohammad Aljammal
|
68462b04d8
|
Merge branch 'fix-issues' into 'development'
updating prescription after backend fix
See merge request Cloud_Solution/doctor_app_flutter!321
|
5 years ago |
hussam al-habibeh
|
f32d25b007
|
updating prescription after backend fix
|
5 years ago |
Mohammad Aljammal
|
3c090ecdaf
|
Merge branch 'fix-issues' into 'development'
design inhancment
See merge request Cloud_Solution/doctor_app_flutter!319
|
6 years ago |
hussam al-habibeh
|
0f15732728
|
design inhancment
|
6 years ago |
hussam al-habibeh
|
57aea2ba4f
|
pharmacy remarks
|
6 years ago |
hussam al-habibeh
|
963fe42cd8
|
new changes
|
6 years ago |
Mohammad Aljammal
|
98bc5f7812
|
Merge branch 'fix-issues' into 'development'
DA-355
See merge request Cloud_Solution/doctor_app_flutter!316
|
6 years ago |
Sultan Khan
|
958a341c3b
|
sick leave
|
6 years ago |
hussam al-habibeh
|
d115564cc1
|
DA-355
|
6 years ago |
hussam al-habibeh
|
2563b10216
|
DA-367
|
6 years ago |
mosazaid
|
a047255f2c
|
add referral get facilties
|
6 years ago |
hussam al-habibeh
|
28370e7492
|
fix bugs
|
6 years ago |
mosazaid
|
4f302694b3
|
Merge branch 'development' into fix-bugs10_2
|
6 years ago |
mosazaid
|
498c6c00af
|
fix minor issue bugs (DA-273, DA-361, DA-362, DA-363)
|
6 years ago |