hussam al-habibeh
|
c652f40a89
|
add medical report new service
|
5 years ago |
mosazaid
|
1fd9c4f2f2
|
Merge branch 'development' into video-stream-background
# Conflicts:
# lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
5 years ago |
hussam al-habibeh
|
07835aaa1b
|
medical report changes
|
5 years ago |
mosazaid
|
c722c9b05a
|
Merge branch 'development' into video-stream-background
# Conflicts:
# android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
# lib/core/service/VideoCallService.dart
# lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
5 years ago |
Mohammad Aljammal
|
e70eabe68d
|
Fix live care issues and qr code
|
5 years ago |
Mohammad Aljammal
|
e4a7f4e105
|
Merge branch 'sort_out_patient' into 'development'
first step form sort
See merge request Cloud_Solution/doctor_app_flutter!751
|
5 years ago |
mosazaid
|
8d5f86e4f2
|
Merge branch 'development' into video_stream_fix_bugs
|
5 years ago |
mosazaid
|
321bf7825e
|
solve video stream publisher popup window bug
|
5 years ago |
Elham Rababah
|
9da1bff723
|
first step form sort
|
5 years ago |
Mohammad Aljammal
|
0e2bcd7916
|
Fix Qr issues
|
5 years ago |
mosazaid
|
7fed1c58f3
|
working to open video stream from service
|
5 years ago |
Mohammad Aljammal
|
61c94f85b2
|
fix the end call
|
5 years ago |
Mohammad Aljammal
|
bed7dee27c
|
fix drop video call issue
|
5 years ago |
Mohammad Aljammal
|
7614b4aa5c
|
fix the video call issues
|
5 years ago |
mosazaid
|
550b4a848d
|
Merge branch 'development' into video-streaming-android
|
5 years ago |
Elham Rababah
|
f76bac898b
|
make clinic id dynamic
|
5 years ago |
Elham Rababah
|
09634716e5
|
Merge branches 'development' and 'special_clinic' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
Conflicts:
lib/locator.dart
|
5 years ago |
Elham Rababah
|
3cf4ef4348
|
check if special in home page
|
5 years ago |
mosazaid
|
883778d278
|
video call
|
5 years ago |
hussam al-habibeh
|
1c3391baed
|
Scan qr code refactoring
|
5 years ago |
Elham Rababah
|
363b55069f
|
first step form Special Clinic
|
5 years ago |
hussam al-habibeh
|
3913f8936c
|
Scan QR Code fix
|
5 years ago |
Elham Rababah
|
c46c339933
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
Conflicts:
lib/config/config.dart
|
5 years ago |
Elham Rababah
|
1edd375fd7
|
first step from special clinic
|
5 years ago |
hussam al-habibeh
|
142fbb93fd
|
Referrel Doctor reply
|
5 years ago |
Elham Rababah
|
b0938562fa
|
Merge branches 'development' and 'fix_medical_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_medical_report
Conflicts:
pubspec.lock
|
5 years ago |
Elham Rababah
|
30bf59458c
|
finish medical report
|
5 years ago |
Elham Rababah
|
176c0ab97c
|
first step from live care fixes
|
5 years ago |
Elham Rababah
|
72966c3269
|
fix referral patient services
|
5 years ago |
mosazaid
|
ec9f628b67
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
5 years ago |
mosazaid
|
400420bd4d
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
5 years ago |
Mohammad Aljammal
|
6dfcbcca12
|
Merge branch 'procedure_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedure_refactoring
Conflicts:
lib/core/service/patient/LiveCarePatientServices.dart
lib/core/viewModel/LiveCarePatientViewModel.dart
|
5 years ago |
mosazaid
|
0fe6d880fd
|
add livecare send instructions
|
5 years ago |
mosazaid
|
0afe3b3afd
|
livecare changes
|
5 years ago |
mosazaid
|
5d0a7a4045
|
livecare changes
|
5 years ago |
hussam al-habibeh
|
c800219428
|
Live Care Is Login Service
|
5 years ago |
mosazaid
|
ea0658c05c
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/viewModel/procedure_View_model.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 |
mosazaid
|
bc48d915c6
|
procedure refactoring
|
5 years ago |
hussam al-habibeh
|
519e6f2fec
|
Prescription favourite templates
|
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
|
e89d5b13ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services
|
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 |
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 |
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 |
Elham Rababah
|
6d989e3fc3
|
finish new service for live care
|
5 years ago |
Elham Rababah
|
8e140abee9
|
make pending service dynamic
|
5 years ago |
Elham Rababah
|
5778a4a887
|
view list of Live care patient
|
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 |
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
|
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 |
Mohammad Aljammal
|
f0039b491e
|
fix home page
|
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 |
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
|
c3ac50a859
|
hot fixes
|
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 |