Commit Graph

1277 Commits (d22ea2e2faee486f96e9f7371c34f2e6f58ca1f0)

Author SHA1 Message Date
Mohammad Aljammal f095da8943 fix inpatient issue 4 years ago
Mohammad Aljammal 771d94ff4c Merge branch 'search_text_fields' into 'development'
Search text fields

See merge request Cloud_Solution/doctor_app_flutter!842
4 years ago
Elham Rababh 0ab0570bc6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_text_fields 4 years ago
Elham Rababh dac8f90a8a rename file related to custom search 4 years ago
Elham Rababh b27cc6ae9a serach-text_fields 4 years ago
Mohammad Aljammal 6002e22d6d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!841
4 years ago
mosazaid 4663a65fd6 design fixes 4 years ago
hussam al-habibeh 7be6ef6ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
 Conflicts:
	pubspec.lock
4 years ago
hussam al-habibeh 288bef5a5f fix all special result 4 years ago
Elham Rababh 4923b66065 fix cashing issue 4 years ago
Elham Rababh b119590e39 Doctor replay add info status 99 4 years ago
mosazaid 702bb5b8da fix design 4 years ago
mosazaid 6ca3baf7cb solve lab results design issue 4 years ago
Mohammad Aljammal c1103f26fa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
hussam al-habibeh 6eecb4a614 adding cashed network image 4 years ago
Elham Rababh cdc3b36174 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/screens/patients/In_patient/in_patient_list_page.dart
4 years ago
hussam al-habibeh 696b8b89ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in-patient-medication
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
hussam al-habibeh ba275eaed4 adding cashed network image 4 years ago
Elham Rababh a1f9729091 in patient list improve performace 4 years ago
Mohammad Aljammal 09c8d9c09e Merge branch 'procedure_changes' into 'development'
dilog list & procedure changes

See merge request Cloud_Solution/doctor_app_flutter!826
4 years ago
hussam al-habibeh c5eac79522 dilog list & procedure changes 4 years ago
mosazaid c608b5601d add arrow to patient card 4 years ago
Elham Rababh 7ef7c8225c fix replay status 4 years ago
Mohammad Aljammal 835c8cd77d Merge branch 'fix_bugs_new' into 'development'
UI fix design

See merge request Cloud_Solution/doctor_app_flutter!814
4 years ago
mosazaid 4ce6ff8d7d ui lab result history chart page 4 years ago
mosazaid cdbd905a62 ui fix design 4 years ago
Elham Rababh 8eb9401941 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_status
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababh b1294a863c fix issues 4 years ago
Elham Rababh 1f3d1f68fb change the status of replay 4 years ago
hussam al-habibeh 0deca4f624 patient profile aligment fix 4 years ago
hussam al-habibeh a0bc5b73de patient profile aligment fix 4 years ago
hussam al-habibeh 19487ba435 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result 4 years ago
hussam al-habibeh 5241273303 all lab special result 4 years ago
Elham Rababh 50e8e7b0d6 add translation to text status 4 years ago
Elham Rababh 7e552cccd4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pagination_doctor_repay 4 years ago
Elham Rababh ae70fe1bdf first step from doctor replay 4 years ago
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
4 years ago
mosazaid ac4a68600c working on lab result new service 4 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
4 years ago
Elham Rababh c17f9fb91d add copy to patient cart 4 years ago
Elham Rababh a5f3731b9a first step from fixing header 4 years ago
hussam al-habibeh de6936efb8 Profile app bar copying & lab result 4 years ago
mosazaid 0fb4b4a890 add copy to selected texts 4 years ago
Elham Rababh e8c0281913 fix show count in home page 4 years ago
Elham Rababh e2caebde8b some fixes before live 4 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
5 years ago
Elham Rababh 53d7d68012 add badge on bottom bar in order to show number of un replied msg 5 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
5 years ago
Elham Rababh e58ce34aa4 move bottom sheet to index page 5 years ago
Elham Rababh b341bd5f47 fixes issues in small devices 5 years ago
Elham Rababh 0780cafcca fixes issues in small devices 5 years ago
Elham Rababh 6b65de77e9 fix design issues on diff pages inside soap 5 years ago
Elham Rababh 14a0911aec fix first step from Soap 5 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
5 years ago
hussam al-habibeh 64a7aca228 adding google anlyatic to doctor app 5 years ago
Elham Rababh 7e57882349 fix design issues on first step form create episode 5 years ago
Mohammad Aljammal 46683df8a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into analytics_service 5 years ago
Mohammad Aljammal 3b6fcb4240 fix app text field custom 5 years ago
Mohammad Aljammal 5a61a3eaba Add missing page tob google analytics 5 years ago
Elham Rababh 9b40638f86 fix get allergies issues 5 years ago
mosazaid 405a363e28 referral change 5 years ago
Elham Rababah 1af52dc5b7 fix referral patient 5 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
5 years ago
Mohammad Aljammal 654a86a9b6 Add App Permissions Utils 5 years ago
Elham Rababah 4e6237f2ce fix header from lab 5 years ago
Elham Rababah b9711fce65 fix header from lab result details 5 years ago
Elham Rababah 78903043d9 fix header 5 years ago
Mohammad Aljammal 746f44157e Add video call service 5 years ago
mosazaid 550b4a848d Merge branch 'development' into video-streaming-android 5 years ago
Elham Rababah fee36336d8 fix out patient header 5 years ago
mosazaid 883778d278 video call 5 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
5 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 5 years ago
Elham Rababah 712a742aa2 fix small issue 5 years ago
Elham Rababah 161cb1e872 fix profile height size 5 years ago
Elham Rababah 411746da98 remove patient type and arrival type form patient profile header 5 years ago
Zohaib Iqbal Kambrani 1b4988e5f0 no message 5 years ago
Elham Rababah bc53ca7b8a fix appointment date in header 5 years ago
Elham Rababah 3fefcf60d7 match the app header design 5 years ago
Elham Rababah 132565c298 Merge branches 'development' and 'headers_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor 5 years ago
mosazaid c44b3d74bb reply changes 5 years ago
Elham Rababah 717468b637 fix design issue 5 years ago
Elham Rababah 57399c3dcb fix issues in header 5 years ago
Elham Rababah 95425d9568 fix issues in header 5 years ago
Elham Rababah 6aef8b5878 first step refactor headers 5 years ago
Elham Rababah 354a1f2dec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah ca0cc745d5 remove headers 5 years ago
Elham Rababah 23feb2c354 remove unused code 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 4cdc654348 fix font size in header 5 years ago
Elham Rababah 36caca0e46 test live care and general result header in lab result 5 years ago
mosazaid 663c8d1104 Merge branch 'development' into referral-outpatient 5 years ago
Elham Rababah 8a8b55d2de move show timer to its own file 5 years ago
Elham Rababah 792c85e28a fix live care icon size 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
Elham Rababah d57b331df2 add timer 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
Mohammad Aljammal 151b69ed17 Merge branch 'favourite_prescription' into 'development'
Favourite prescription

See merge request Cloud_Solution/doctor_app_flutter!714
5 years ago
mosazaid c82a4a05d5 medical report design changes 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 b16dc2092b liveCare cahnges 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 5 years ago
hussam al-habibeh da45f8c4b6 prescription refactoring 5 years ago
mosazaid 73cf681e9d lab-result-special 5 years ago
mosazaid 0cd7fa0cb2 working on livecare 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
Elham Rababah d49d52458b fix birthOfDate 5 years ago
Elham Rababah 3557e87b75 fix loading issue 5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago
Elham Rababah 342477beda add rich editor for MedicalReportPage 5 years ago
Elham Rababah 8cac9b6fe9 add rich editor 5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 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
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
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 14a3ca8695 fix login screen design 5 years ago
Elham Rababah 515955663a add verification 5 years ago
Mohammad Aljammal 1187c3b605 fix authentication provider 5 years ago
Elham Rababah 9b34c2c833 first step from live care 5 years ago
Elham Rababah 0d8684481d fix sms error and some design issue 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
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
mosazaid 50b4b8eb50 dashboard change 5 years ago
mosazaid 27f940b473 home design 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
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
mosazaid 95a6893b59 home design 5 years ago
Mohammad Aljammal 74ded739c8 fix imports 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
mosazaid b10fe8112a Merge branch 'development' into home-refactoring 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
mosazaid 2cf77bac85 fit dashboard design 5 years ago
hussam al-habibeh d2814f610e hot fix 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
Elham Rababah a3caf023e2 Add enum to verification_methods 5 years ago