mosazaid
|
91cd7f2b88
|
refactoring
|
5 years ago |
Mohammad Aljammal
|
6439bb9a90
|
Merge branch 'favourite_prescription' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!719
|
5 years ago |
hussam al-habibeh
|
4af94e6b71
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
d9358bce75
|
hot fix in medical report
|
5 years ago |
Mohammad Aljammal
|
a9a7c8a73c
|
fix patient MRN
|
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
|
3107950f5c
|
fix bug
|
5 years ago |
Mohammad Aljammal
|
151b69ed17
|
Merge branch 'favourite_prescription' into 'development'
Favourite prescription
See merge request Cloud_Solution/doctor_app_flutter!714
|
5 years ago |
hussam al-habibeh
|
a6a8f616e1
|
hot fix
|
5 years ago |
hussam al-habibeh
|
df6a9a7822
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
61ea94faeb
|
Merge branch 'live_care_new_services' into 'development'
Live care new services
See merge request Cloud_Solution/doctor_app_flutter!713
|
5 years ago |
Mohammad Aljammal
|
ad74ff00dc
|
fix issues in android and add ChangeCallStatus services in IOS
|
5 years ago |
mosazaid
|
bc48d915c6
|
procedure refactoring
|
5 years ago |
hussam al-habibeh
|
519e6f2fec
|
Prescription favourite templates
|
5 years ago |
mosazaid
|
9454e9d8af
|
working on procedure refactoring
|
5 years ago |
mosazaid
|
c82a4a05d5
|
medical report design changes
|
5 years ago |
hussam al-habibeh
|
13fb50f9be
|
prescription refactoring
|
5 years ago |
hussam al-habibeh
|
7595629c8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_refactor
Conflicts:
lib/screens/prescription/add_prescription_form.dart
|
5 years ago |
mosazaid
|
c7ce4676f6
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
59e06f53af
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
6e660883f6
|
Fix medical report
|
5 years ago |
mosazaid
|
1b2e158a24
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
54fbe76c7b
|
medical report fixes and vital sign
|
5 years ago |
Mohammad Aljammal
|
e336821f65
|
fix lab result
|
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
|
cf10eba134
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_live_care_issues
|
5 years ago |
Mohammad Aljammal
|
280f87e514
|
fix live care issues
|
5 years ago |
hussam al-habibeh
|
e068009527
|
prescription form
|
5 years ago |
hussam al-habibeh
|
da45f8c4b6
|
prescription refactoring
|
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
|
69eca869b4
|
fix error after merge
|
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
|
2a44840666
|
hot fix
|
5 years ago |
hussam al-habibeh
|
17cca30b17
|
procedure changes
|
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 |
hussam al-habibeh
|
269c8e21f6
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
e313722743
|
fix bug when logout
|
5 years ago |
mosazaid
|
957cf96c16
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
Mohammad Aljammal
|
899c22419f
|
Merge branch 'live_care_patient' into 'development'
add translation
See merge request Cloud_Solution/doctor_app_flutter!686
|
5 years ago |
mosazaid
|
8b2c7f1a05
|
livecare
|
5 years ago |
Elham Rababah
|
1367f2bebb
|
add translation
|
5 years ago |
Mohammad Aljammal
|
dd23640a46
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
|
5 years ago |
Mohammad Aljammal
|
5d5f9f6928
|
Fix issues on the add procedure
|
5 years ago |
Mohammad Aljammal
|
15d826c8d1
|
Merge branch 'live_care_patient' into 'development'
add VC_ID
See merge request Cloud_Solution/doctor_app_flutter!685
|
5 years ago |
mosazaid
|
ac460f1d19
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
0ed0dbb5aa
|
livecare changes
|
5 years ago |
Mohammad Aljammal
|
2de29f0b83
|
Merge branch 'prescription_changes' into 'development'
adding validation and voice speach to prescription form
See merge request Cloud_Solution/doctor_app_flutter!684
|
5 years ago |
hussam al-habibeh
|
b6cb6362f6
|
adding validation and voice speach to prescription form
|
5 years ago |
Elham Rababah
|
04c9a1168b
|
add VC_ID
|
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
|
d49d52458b
|
fix birthOfDate
|
5 years ago |
Elham Rababah
|
8e140abee9
|
make pending service dynamic
|
5 years ago |
Elham Rababah
|
3557e87b75
|
fix loading issue
|
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
|
97a855ab70
|
return condition in home page
|
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
|
172b457092
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
5 years ago |
Mohammad Aljammal
|
40b4a83c6b
|
Fix Expansion Procedure
|
5 years ago |
Mohammad Aljammal
|
fa479ce258
|
Merge branch 'prescription_changes' into 'development'
favourite template Procedure service
See merge request Cloud_Solution/doctor_app_flutter!677
|
5 years ago |
hussam al-habibeh
|
c182928a5d
|
favourite template Procedure service
|
5 years ago |
Mohammad Aljammal
|
0603ea1e40
|
Merge branch 'html_editor' into 'development'
add rich editor for MedicalReportPage
See merge request Cloud_Solution/doctor_app_flutter!676
|
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 |
Elham Rababah
|
342477beda
|
add rich editor for MedicalReportPage
|
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 |
Mohammad Aljammal
|
5b94a19b60
|
Merge branch 'html_editor' into 'development'
add rich editor
See merge request Cloud_Solution/doctor_app_flutter!673
|
5 years ago |
Elham Rababah
|
8cac9b6fe9
|
add rich editor
|
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
|
623f2730e8
|
Procedure card design update
|
5 years ago |
hussam al-habibeh
|
066acc404a
|
Procedure template service
|
5 years ago |
Mohammad Aljammal
|
57fcd2cdeb
|
fix home page design
|
5 years ago |
Mohammad Aljammal
|
a525787c19
|
Merge branch 'live_care' into 'development'
Live care
See merge request Cloud_Solution/doctor_app_flutter!668
|
5 years ago |
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
5 years ago |
mosazaid
|
fa830cf4da
|
changes
|
5 years ago |
Elham Rababah
|
d574dd0b16
|
return base app client
|
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 |
hussam al-habibeh
|
84a7f44b68
|
favourite procedure templates
|
5 years ago |
Elham Rababah
|
14a3ca8695
|
fix login screen design
|
5 years ago |
Elham Rababah
|
515955663a
|
add verification
|
5 years ago |
hussam al-habibeh
|
3b800bcd19
|
favourite procedure templates
|
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 |
Elham Rababah
|
9b34c2c833
|
first step from live care
|
5 years ago |
Elham Rababah
|
a9bd02a908
|
first step from user another account
|
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
|
8ac040a809
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
42275b41fd
|
Merge branch 'load_medical_report' into 'development'
Load medical report
See merge request Cloud_Solution/doctor_app_flutter!665
|
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
|
c9e7fb9883
|
small fix
|
5 years ago |
Elham Rababah
|
1eeaaa48ca
|
remove comment
|
5 years ago |
Elham Rababah
|
0adcfeccce
|
fix auth bug
|
5 years ago |
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
5 years ago |
Mohammad Aljammal
|
8399677a0a
|
Fix Dubai user issues
|
5 years ago |
Elham Rababah
|
2e71706cab
|
add UNVERIFIED status
|
5 years ago |
mosazaid
|
0e2b700136
|
vital sign hot fix
|
5 years ago |
mosazaid
|
25fb8ea5ae
|
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 |
mosazaid
|
50b4b8eb50
|
dashboard change
|
5 years ago |
Mohammad Aljammal
|
8541ddc0f8
|
fix LabOrderResult
|
5 years ago |
mosazaid
|
6280904669
|
Merge branch 'development' into home-refactoring
|
5 years ago |
mosazaid
|
27f940b473
|
home design
|
5 years ago |
Mohammad Aljammal
|
5c73f3b3b6
|
Merge branch 'prescription_changes' into 'development'
prescreption hot fix
See merge request Cloud_Solution/doctor_app_flutter!659
|
5 years ago |
mosazaid
|
12bb283a68
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
5 years ago |
mosazaid
|
72ee88d567
|
working on dashboard
|
5 years ago |
hussam al-habibeh
|
bf589e703e
|
prescreption hot fix
|
5 years ago |
Mohammad Aljammal
|
8653d54a0d
|
Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration
See merge request Cloud_Solution/doctor_app_flutter!658
|
5 years ago |
Mohammad Aljammal
|
8e4321b3da
|
Migration dev to Zohaib branch
|
5 years ago |