mosazaid
|
0625de2b15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/patient_card/PatientCard.dart
|
3 years ago |
|
mosazaid
|
ac4a68600c
|
working on lab result new service
|
3 years ago |
Elham Rababh
|
1c2ccd9149
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_before_live
Conflicts:
lib/widgets/patients/profile/patient-profile-app-bar.dart
|
3 years ago |
|
Elham Rababh
|
c17f9fb91d
|
add copy to patient cart
|
3 years ago |
|
Elham Rababh
|
a5f3731b9a
|
first step from fixing header
|
3 years ago |
hussam al-habibeh
|
de6936efb8
|
Profile app bar copying & lab result
|
3 years ago |
|
mosazaid
|
0fb4b4a890
|
add copy to selected texts
|
3 years ago |
|
Elham Rababh
|
e8c0281913
|
fix show count in home page
|
3 years ago |
|
Elham Rababh
|
e2caebde8b
|
some fixes before live
|
3 years ago |
Mohammad Aljammal
|
8b7d61ba03
|
Merge branch 'episode_fixes_dev_merge' into 'development'
Episode fixes dev merge
See merge request Cloud_Solution/doctor_app_flutter!788
|
3 years ago |
|
Elham Rababh
|
53d7d68012
|
add badge on bottom bar in order to show number of un replied msg
|
3 years ago |
|
Elham Rababh
|
1c45fcea22
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes
Conflicts:
lib/core/viewModel/authentication_view_model.dart
|
3 years ago |
|
Elham Rababh
|
e58ce34aa4
|
move bottom sheet to index page
|
3 years ago |
|
Elham Rababh
|
b341bd5f47
|
fixes issues in small devices
|
3 years ago |
|
Elham Rababh
|
0780cafcca
|
fixes issues in small devices
|
3 years ago |
|
Elham Rababh
|
6b65de77e9
|
fix design issues on diff pages inside soap
|
3 years ago |
|
Elham Rababh
|
14a0911aec
|
fix first step from Soap
|
3 years ago |
|
hussam al-habibeh
|
cac949f402
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical_report_changes
Conflicts:
lib/screens/medical-file/health_summary_page.dart
lib/screens/patients/insurance_approval_screen_patient.dart
lib/screens/patients/profile/medical_report/MedicalReportPage.dart
lib/screens/patients/profile/note/progress_note_screen.dart
|
3 years ago |
|
hussam al-habibeh
|
64a7aca228
|
adding google anlyatic to doctor app
|
3 years ago |
|
Elham Rababh
|
7e57882349
|
fix design issues on first step form create episode
|
3 years ago |
Mohammad Aljammal
|
46683df8a9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into analytics_service
|
3 years ago |
|
Mohammad Aljammal
|
3b6fcb4240
|
fix app text field custom
|
3 years ago |
|
Mohammad Aljammal
|
5a61a3eaba
|
Add missing page tob google analytics
|
3 years ago |
|
Elham Rababh
|
9b40638f86
|
fix get allergies issues
|
3 years ago |
|
mosazaid
|
405a363e28
|
referral change
|
3 years ago |
|
Elham Rababah
|
1af52dc5b7
|
fix referral patient
|
3 years ago |
|
Mohammad Aljammal
|
78338ebc64
|
Merge branch 'video-streaming-android' into 'development'
Merge video call into 'development'
See merge request Cloud_Solution/doctor_app_flutter!745
|
3 years ago |
|
Mohammad Aljammal
|
654a86a9b6
|
Add App Permissions Utils
|
3 years ago |
|
Elham Rababah
|
4e6237f2ce
|
fix header from lab
|
3 years ago |
|
Elham Rababah
|
b9711fce65
|
fix header from lab result details
|
3 years ago |
|
Elham Rababah
|
78903043d9
|
fix header
|
3 years ago |
|
Mohammad Aljammal
|
746f44157e
|
Add video call service
|
3 years ago |
|
mosazaid
|
550b4a848d
|
Merge branch 'development' into video-streaming-android
|
3 years ago |
|
Elham Rababah
|
fee36336d8
|
fix out patient header
|
3 years ago |
|
mosazaid
|
883778d278
|
video call
|
3 years ago |
|
mosazaid
|
13ee7f6491
|
Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android
Conflicts:
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
lib/util/VideoChannel.dart
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
|
3 years ago |
Zohaib Iqbal Kambrani
|
f60ff85e31
|
no message
|
3 years ago |
|
Elham Rababah
|
712a742aa2
|
fix small issue
|
3 years ago |
|
Elham Rababah
|
161cb1e872
|
fix profile height size
|
3 years ago |
|
Elham Rababah
|
411746da98
|
remove patient type and arrival type form patient profile header
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
1b4988e5f0
|
no message
|
3 years ago |
|
Elham Rababah
|
bc53ca7b8a
|
fix appointment date in header
|
3 years ago |
|
Elham Rababah
|
3fefcf60d7
|
match the app header design
|
3 years ago |
|
Elham Rababah
|
132565c298
|
Merge branches 'development' and 'headers_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor
|
3 years ago |
|
mosazaid
|
c44b3d74bb
|
reply changes
|
3 years ago |
|
Elham Rababah
|
717468b637
|
fix design issue
|
3 years ago |
|
Elham Rababah
|
57399c3dcb
|
fix issues in header
|
3 years ago |
|
Elham Rababah
|
95425d9568
|
fix issues in header
|
3 years ago |
|
Elham Rababah
|
6aef8b5878
|
first step refactor headers
|
3 years ago |
|
Elham Rababah
|
354a1f2dec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes
|
3 years ago |
|
Elham Rababah
|
ca0cc745d5
|
remove headers
|
3 years ago |
|
Elham Rababah
|
23feb2c354
|
remove unused code
|
3 years ago |
|
mosazaid
|
1b47b60155
|
Merge branch 'development' into reply-doctor_changes
# Conflicts:
# lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
|
3 years ago |
|
mosazaid
|
10441e4af0
|
referral changes
|
3 years ago |
|
Elham Rababah
|
4cdc654348
|
fix font size in header
|
3 years ago |
|
Elham Rababah
|
36caca0e46
|
test live care and general result header in lab result
|
3 years ago |
|
mosazaid
|
663c8d1104
|
Merge branch 'development' into referral-outpatient
|
3 years ago |
|
Elham Rababah
|
8a8b55d2de
|
move show timer to its own file
|
3 years ago |
|
Elham Rababah
|
792c85e28a
|
fix live care icon size
|
3 years ago |
|
mosazaid
|
ec9f628b67
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
3 years ago |
|
Elham Rababah
|
f80215b6bb
|
fix doctor id spelling in live care service, fix colors in
|
3 years ago |
|
Elham Rababah
|
d57b331df2
|
add timer
|
3 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
|
3 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
|
3 years ago |
|
Mohammad Aljammal
|
151b69ed17
|
Merge branch 'favourite_prescription' into 'development'
Favourite prescription
See merge request Cloud_Solution/doctor_app_flutter!714
|
3 years ago |
|
mosazaid
|
c82a4a05d5
|
medical report design changes
|
3 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
|
3 years ago |
|
mosazaid
|
b16dc2092b
|
liveCare cahnges
|
3 years ago |
|
Mohammad Aljammal
|
280f87e514
|
fix live care issues
|
3 years ago |
|
hussam al-habibeh
|
da45f8c4b6
|
prescription refactoring
|
3 years ago |
|
mosazaid
|
73cf681e9d
|
lab-result-special
|
3 years ago |
|
mosazaid
|
0cd7fa0cb2
|
working on livecare
|
3 years ago |
|
Elham Rababah
|
6d989e3fc3
|
finish new service for live care
|
3 years ago |
|
Elham Rababah
|
d49d52458b
|
fix birthOfDate
|
3 years ago |
|
Elham Rababah
|
3557e87b75
|
fix loading issue
|
3 years ago |
|
Elham Rababah
|
33ceb01d67
|
first step from Live care patient list
|
3 years ago |
|
Elham Rababah
|
342477beda
|
add rich editor for MedicalReportPage
|
3 years ago |
|
Elham Rababah
|
8cac9b6fe9
|
add rich editor
|
3 years ago |
|
Mohammad Aljammal
|
1cc55d809c
|
fix authentication service
|
3 years ago |
|
Mohammad Aljammal
|
a97a331d87
|
fix bugs in change the clinic, login page when get the projects and add the special Result
|
3 years ago |
|
Mohammad Aljammal
|
57fcd2cdeb
|
fix home page design
|
3 years ago |
|
Mohammad Aljammal
|
a525787c19
|
Merge branch 'live_care' into 'development'
Live care
See merge request Cloud_Solution/doctor_app_flutter!668
|
3 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
|
3 years ago |
|
Elham Rababah
|
14a3ca8695
|
fix login screen design
|
3 years ago |
|
Elham Rababah
|
515955663a
|
add verification
|
3 years ago |
|
Mohammad Aljammal
|
1187c3b605
|
fix authentication provider
|
3 years ago |
|
Elham Rababah
|
9b34c2c833
|
first step from live care
|
3 years ago |
|
Elham Rababah
|
0d8684481d
|
fix sms error and some design issue
|
3 years ago |
|
Elham Rababah
|
e0be4ec1be
|
move logout function from helper to authentication view model
|
3 years ago |
|
Elham Rababah
|
c9e7fb9883
|
small fix
|
3 years ago |
|
Elham Rababah
|
1eeaaa48ca
|
remove comment
|
3 years ago |
|
Elham Rababah
|
0adcfeccce
|
fix auth bug
|
3 years ago |
|
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
4 years ago |
|
Elham Rababah
|
2e71706cab
|
add UNVERIFIED status
|
4 years ago |
|
Elham Rababah
|
fd9f93a936
|
do some refactor and change the code to view model
|
4 years ago |
|
mosazaid
|
50b4b8eb50
|
dashboard change
|
4 years ago |
|
mosazaid
|
27f940b473
|
home design
|
4 years ago |
|
mosazaid
|
12bb283a68
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
4 years ago |
|
mosazaid
|
72ee88d567
|
working on dashboard
|
4 years ago |
|
Mohammad Aljammal
|
8e4321b3da
|
Migration dev to Zohaib branch
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
081bfe3f61
|
add TODO to Elham
|
4 years ago |
|
mosazaid
|
2023ce9b55
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/core/viewModel/dashboard_view_model.dart
# lib/screens/home/home_screen.dart
|
4 years ago |
|
mosazaid
|
95a6893b59
|
home design
|
4 years ago |
|
Mohammad Aljammal
|
74ded739c8
|
fix imports
|
4 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
|
4 years ago |
|
mosazaid
|
b10fe8112a
|
Merge branch 'development' into home-refactoring
|
4 years ago |
|
Elham Rababah
|
7af300d455
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
4 years ago |
|
Elham Rababah
|
32d26c3c4b
|
remove Verification Methods page and move some code to model
|
4 years ago |
|
Elham Rababah
|
3ca4ac3632
|
create method card and remove future builder from verification method widget
|
4 years ago |
|
mosazaid
|
2cf77bac85
|
fit dashboard design
|
4 years ago |
|
hussam al-habibeh
|
d2814f610e
|
hot fix
|
4 years ago |
|
hussam al-habibeh
|
68e9470273
|
hot fix
|
4 years ago |
|
Elham Rababah
|
a3caf023e2
|
Add enum to verification_methods
|
4 years ago |
|
mosazaid
|
34a7c0b148
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
4 years ago |
|
Elham Rababah
|
53791f1028
|
change imei to authentication
|
4 years ago |
|
Elham Rababah
|
a5120b473f
|
rename Auth view model to Doctor Profile View Model
|
4 years ago |
|
mosazaid
|
4ce9a3c5bf
|
finish home-refactoring
|
4 years ago |
|
Mohammad Aljammal
|
16519d0ccf
|
hot fix
|
4 years ago |
|
mosazaid
|
0d86759245
|
working on dashboard re-factoring
|
4 years ago |
|
Elham Rababah
|
9f1f06f2fc
|
refactor verification methods services
|
4 years ago |
|
hussam al-habibeh
|
4eba6d9f5a
|
Project refactoring
|
4 years ago |
|
Elham Rababah
|
34c58149a0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
4 years ago |
|
Elham Rababah
|
663d2a942f
|
first step from refactoring auth part
|
4 years ago |
|
Mohammad Aljammal
|
d6e621e4ce
|
Merge branch 'design-changes' into 'development'
Design changes
See merge request Cloud_Solution/doctor_app_flutter!635
|
4 years ago |
|
Mohammad Aljammal
|
a82775fc61
|
Merge branch 'app_translation' into 'development'
SMS Popup design fix
See merge request Cloud_Solution/doctor_app_flutter!634
|
4 years ago |
|
mosazaid
|
802bd83ddd
|
design-changes
|
4 years ago |
|
hussam al-habibeh
|
1bcc643fb9
|
SMS Popup design fix
|
4 years ago |
|
mosazaid
|
a61cae4922
|
Merge branch 'development' into design-changes
|
4 years ago |
|
mosazaid
|
6fba03ed69
|
design fixes
|
4 years ago |
|
Mohammad Aljammal
|
866f6cc8ea
|
Merge branch 'add_out_patient_filter' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!630
|
4 years ago |
|
Elham Rababah
|
8e4d9d9692
|
hot fix
|
4 years ago |
|
Mohammad Aljammal
|
88b8454afe
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/screens/patients/DischargedPatientPage.dart
|
4 years ago |
|
mosazaid
|
7eea1bf4a5
|
Merge branch 'development' into design-changes
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
4 years ago |
|
Mohammad Aljammal
|
0d71378400
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
4 years ago |
|
Elham Rababah
|
fba71b69ce
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
Conflicts:
lib/client/base_app_client.dart
|
4 years ago |
|
Elham Rababah
|
7bc897bf39
|
fix profile issue
|
4 years ago |
|
Mohammad Aljammal
|
82544cb2e7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/client/base_app_client.dart
|
4 years ago |
|
Mohammad Aljammal
|
989774a0b3
|
Fix patient card and add the discharged in Patient referral page
|
4 years ago |
|
hussam al-habibeh
|
c24bb604d4
|
DashBoard design fix
|
4 years ago |
|
Elham Rababah
|
d5d57e7997
|
fix new design issue
|
4 years ago |
|
Mohammad Aljammal
|
27a3dd1eb4
|
fix the filter page
|
4 years ago |
|
Mohammad Aljammal
|
b1f1b7e34d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/screens/patients/profile/lab_result/labs_home_page.dart
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
ed3449bcf4
|
fix the doctor card in lab result and radiology
|
4 years ago |
|
Mohammad Aljammal
|
04be0a7fc6
|
Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter
See merge request Cloud_Solution/doctor_app_flutter!620
|
4 years ago |
|
Elham Rababah
|
fe581ae7ce
|
remove button height
|
4 years ago |
|
hussam al-habibeh
|
b5bebea932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
4 years ago |
|
hussam al-habibeh
|
c86a3dabda
|
page translation
|
4 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
|
4 years ago |