Mohammad Aljammal
|
9303091f20
|
Merge branch 'medical_report_changes' into 'development'
Medical report changes
See merge request Cloud_Solution/doctor_app_flutter!757
|
5 years ago |
mosazaid
|
eb62fdfe21
|
Merge branch 'development' into video-stream-background
# Conflicts:
# android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt
# 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 |
|
mosazaid
|
a7c5e1afde
|
finish solve keybaord issue
|
5 years ago |
hussam al-habibeh
|
9890d6a063
|
using dynimc setup id in medical report service
|
5 years ago |
Elham Rababah
|
e80523749b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_episode_no
Conflicts:
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
5 years ago |
|
Elham Rababah
|
1918c2219e
|
improve the code.
|
5 years ago |
|
Elham Rababah
|
29eeb21e76
|
finalize create episode on Live care.
|
5 years ago |
|
hussam al-habibeh
|
19548ccb1e
|
Medical Report change status
|
5 years ago |
|
Elham Rababah
|
80ef1a241d
|
first step from fix episode in patient live care list
|
5 years ago |
|
hussam al-habibeh
|
bec5eb82bc
|
update medical file service
|
5 years ago |
|
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 |
|
mosazaid
|
e1c4721ac1
|
Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
# lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
5 years ago |
|
mosazaid
|
385820fdce
|
video stream add record icon and change button disable
|
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 |
|
mosazaid
|
321bf7825e
|
solve video stream publisher popup window bug
|
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
|
654a86a9b6
|
Add App Permissions Utils
|
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 |
|
Mohammad Aljammal
|
746f44157e
|
Add video call service
|
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 |
|
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 |
|
mosazaid
|
1b47b60155
|
Merge branch 'development' into reply-doctor_changes
# Conflicts:
# lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
|
5 years ago |
|
mosazaid
|
10441e4af0
|
referral changes
|
5 years ago |
|
Elham Rababah
|
36caca0e46
|
test live care and general result header in lab result
|
5 years ago |
|
Elham Rababah
|
176c0ab97c
|
first step from live care fixes
|
5 years ago |
|
Elham Rababah
|
2e0f6aad5c
|
Merge branches 'development' and 'navigation_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into navigation_service
Conflicts:
lib/locator.dart
|
5 years ago |
|
Elham Rababah
|
9d6a23c1a3
|
add NavigationService
|
5 years ago |
|
Elham Rababah
|
72966c3269
|
fix referral patient services
|
5 years ago |
|
mosazaid
|
663c8d1104
|
Merge branch 'development' into referral-outpatient
|
5 years ago |
|
Mohammad Aljammal
|
95b00dd67d
|
Merge branch 'fix_live_care' into 'development'
fix live care issues
See merge request Cloud_Solution/doctor_app_flutter!725
|
5 years ago |
|
Mohammad Aljammal
|
f6922ee41a
|
Merge branch 'live_care_fixes' into 'development'
Live care fixes
See merge request Cloud_Solution/doctor_app_flutter!724
|
5 years ago |
|
Mohammad Aljammal
|
a1abcaa7c0
|
fix live care issues
|
5 years ago |
|
mosazaid
|
ec9f628b67
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
5 years ago |
|
Elham Rababah
|
f80215b6bb
|
fix doctor id spelling in live care service, fix colors in
|
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 |
|
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
|
fb6ef8fca1
|
fix appointment in live care
|
5 years ago |
|
mosazaid
|
9454e9d8af
|
working on procedure refactoring
|
5 years ago |
|
Mohammad Aljammal
|
3c325ef199
|
fix load procedure
|
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
|
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
|
ac701c9806
|
fix live care issues
|
5 years ago |
|
mosazaid
|
73cf681e9d
|
lab-result-special
|
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 |
|
Elham Rababah
|
401516403f
|
first step from show Video call
|
5 years ago |
|
mosazaid
|
0cd7fa0cb2
|
working on livecare
|
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
|
1bc01e0ad1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
|
5 years ago |
|
mosazaid
|
186461f3a8
|
hot fix
|
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
|
67e0cac742
|
add livecare to home
|
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 |
|
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
|
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 |
|
mosazaid
|
6192d9a84f
|
working on medical-profile
|
5 years ago |
|
hussam al-habibeh
|
6b6243232c
|
Procedure template service
|
5 years ago |
|
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
5 years ago |
|
Elham Rababah
|
2e71706cab
|
add UNVERIFIED status
|
5 years ago |
|
Elham Rababah
|
fd9f93a936
|
do some refactor and change the code to view model
|
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 |