Commit Graph

422 Commits (25e09fa105ed152d6a7da26b52077bfb9b8d8db6)

Author SHA1 Message Date
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
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 3557e87b75 fix loading issue 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
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 e0be4ec1be move logout function from helper to authentication view model 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
mosazaid 50b4b8eb50 dashboard change 5 years ago
mosazaid 12bb283a68 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
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
mosazaid 95a6893b59 home design 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
hussam al-habibeh d2814f610e hot fix 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
Elham Rababah a5120b473f rename Auth view model to Doctor Profile View Model 5 years ago
mosazaid 0d86759245 working on dashboard re-factoring 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
Mohammad Aljammal 0d71378400 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 5 years ago
Elham Rababah d5d57e7997 fix new design issue 5 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 5 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
5 years ago
Elham Rababah fe581ae7ce remove button height 5 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
5 years ago
hussam al-habibeh c86a3dabda page translation 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 68f405cb21 design fixes 5 years ago
mosazaid 55895496e1 Merge branch 'design-changes' into development 5 years ago
mosazaid 3d6b55681a fix arabic and font style 5 years ago
Elham Rababah 30bc9b4bea fix issue 5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
mosazaid 40c0f9f4a0 Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 3e24278d89 in-patient re-design 5 years ago
Mohammad Aljammal 357e01c846 hot fixes 5 years ago
Mohammad Aljammal 55c63c9531 fix Discharged Patient 5 years ago
Mohammad Aljammal c9c18efd72 add in lab result get in and out patient 5 years ago
Sultan Khan bbdbc3cc25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 045584bb28 voice feature added 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
mosazaid 5003b3a001 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 5 years ago
mosazaid 1b8e3eb895 some fixes 5 years ago
Mohammad Aljammal 127bc16415 Merge branch 'in_patient_services' into 'development'
medical file hot fix

See merge request Cloud_Solution/doctor_app_flutter!572
5 years ago
hussam al-habibeh 0e836c67c8 medical file hot fix 5 years ago
Sultan Khan 648f6fd7cb bug fix 5 years ago
Sultan Khan 19f0d7ede9 voice feature added 5 years ago
Mohammad Aljammal 704a4bd0be hot fixes 5 years ago
Mohammad Aljammal 36189adf94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card.dart
5 years ago
Mohammad Aljammal ae8882fbae Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!539
5 years ago
mosazaid 78f2ab5ae3 design fixes 5 years ago
hussam al-habibeh e3102b3f5e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
5 years ago
hussam al-habibeh 94e598c5f2 Insurance Approval In Patient 5 years ago
Mohammad Aljammal fd790978c4 add new referral service 5 years ago
Elham Rababah 4a263dda8a Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 82285ccf39 show progress_note part 5 years ago
hussam al-habibeh 017074ba56 Prescriptions for in patient 5 years ago
Elham Rababah 0c74bc4c60 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor 5 years ago
Elham Rababah dcd1605649 add error Msg 5 years ago
mosazaid 51234b8059 hot fix 5 years ago
mosazaid 21ef5ee56a hot fix 5 years ago
mosazaid 6c3cb8cc94 hot fix 5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid 8ae0a91c05 working on text widget 5 years ago
mosazaid bbe94d2b9b Merge branch 'development' into design-fixes
# Conflicts:
#	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
#	lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
#	lib/screens/patients/profile/refer_patient_screen.dart
#	lib/screens/patients/profile/referral/refer-patient-screen.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
#	lib/screens/prescription/add_prescription_form.dart
#	lib/screens/prescription/prescription_warnings.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
5 years ago
mosazaid 10baff8d59 button fixes 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Elham Rababah 8220ef7700 add auto complete search 5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Mohammad Aljammal 43c254de05 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!513
5 years ago
Sultan Khan 4ed8f716db dashboard changes 5 years ago
Elham Rababah 042d4b4bfd remove commented code 5 years ago
Elham Rababah 76d411b79a move soap folder to the correct place 5 years ago
Mohammad Aljammal cb568d74c0 add fun back press on relay page 5 years ago
Mohammad Aljammal 94b7744dd0 Merge branch 'fix-issues' into 'development'
Hot Fixes

See merge request Cloud_Solution/doctor_app_flutter!500
5 years ago
hussam al-habibeh 2e07e34c11 Hot Fixes 5 years ago
Mohammad Aljammal b6941d9f63 Merge branch 'Stepper_header' into 'development'
small fixes in soap and in all app.

See merge request Cloud_Solution/doctor_app_flutter!495
5 years ago
Elham Rababah 2aba9e79f1 small fixes in soap and in all app. 5 years ago
Mohammad Aljammal da084d889c hot ECG,add a new button and hot fixes 5 years ago
Elham Rababah 14cf5a5a1c finish fix the assessment 5 years ago
Elham Rababah b178bc418e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Stepper_header 5 years ago
Elham Rababah 5caa2da6f3 fix issue on soap design 5 years ago
Elham Rababah 6a6087e5ba fix small bug in allergies 5 years ago
Mohammad Aljammal b812ac4b06 add no data image in all pages 5 years ago
Mohammad Aljammal 26f90214b2 Merge branch 'Stepper_header' into 'development'
Stepper header

See merge request Cloud_Solution/doctor_app_flutter!477
5 years ago
Elham Rababah e668fd3334 fix overflow in allergies 5 years ago
hussam al-habibeh 6f914b3e93 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/procedures/ProcedureCard.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
5 years ago
hussam al-habibeh 3586d226e0 insurance approval & medical file design fix 5 years ago
Elham Rababah 344ca9c55a refactor code in subjective step2 5 years ago