418 Commits (70480cc09ea28f0f2166558dbecdfdfd8aa8da70)

Author SHA1 Message Date
Mohammad Aljammal 8541ddc0f8 fix LabOrderResult 6 years ago
Mohammad Aljammal 8653d54a0d Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration

See merge request Cloud_Solution/doctor_app_flutter!658
6 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
6 years ago
mosazaid 0bfa74f1c9 ucaf-change 6 years ago
Mohammad Aljammal b871009033 Merge branch 'feature-modeical_profile' into 'development'
Feature modeical profile

See merge request Cloud_Solution/doctor_app_flutter!654
6 years ago
Mohammad Aljammal 74ded739c8 fix imports 6 years ago
hussam al-habibeh bc340693ba project refactoring 6 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
6 years ago
mosazaid 444afa464e working on feature medical profile 6 years ago
Mohammad Aljammal 086ca517d2 Add Medical Report Page 6 years ago
Mohammad Aljammal bf86fcc168 fix in note and AddReplayOnReferralPatient 6 years ago
Sultan Khan f84bc6da9d voice command uodated 6 years ago
Sultan Khan b66d9d1ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 5a42184716 voice commad updated 6 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 6 years ago
Elham Rababah 1a1757f841 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter 6 years ago
mosazaid 802bd83ddd design-changes 6 years ago
Elham Rababah 607da6af66 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
6 years ago
Elham Rababah 7559ab31c0 fix out patient + fix steper in arabic 6 years ago
mosazaid 6fba03ed69 design fixes 6 years ago
Mohammad Aljammal c6ac829813 hot fixes in PatientReferralScreen 6 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
6 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
6 years ago
mosazaid b43b7cafcc working on in-patient screen design 6 years ago
Mohammad Aljammal 0d71378400 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 6 years ago
Elham Rababah 7bc897bf39 fix profile issue 6 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 6 years ago
Elham Rababah 0b473f630f translate progress_note_screen 6 years ago
Elham Rababah d5d57e7997 fix new design issue 6 years ago
Mohammad Aljammal 2978aeecb2 fix the tab bar 6 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 6 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
6 years ago
Mohammad Aljammal ed3449bcf4 fix the doctor card in lab result and radiology 6 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
6 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
6 years ago
hussam al-habibeh c86a3dabda page translation 6 years ago
Elham Rababah f0457f4e99 finish filter page 6 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
6 years ago
Elham Rababah 0f8820fa44 fix profile screen and start the first step from filter page 6 years ago
mosazaid 68f405cb21 design fixes 6 years ago
mosazaid 55895496e1 Merge branch 'design-changes' into development 6 years ago
mosazaid 3d6b55681a fix arabic and font style 6 years ago
Elham Rababah 7c2889c5d2 fix height issue 6 years ago
Elham Rababah 8e9687c2ed fix issue on add examination 6 years ago
Elham Rababah 30bc9b4bea fix issue 6 years ago
Mohammad Aljammal f08a91b0b8 Merge branch 'in-patient_re-design' into 'development'
In patient re design

See merge request Cloud_Solution/doctor_app_flutter!608
6 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 6 years ago
Elham Rababah bfd36b1c77 fix scrolling step 3 6 years ago
Elham Rababah cfe3056f17 fix scrolling step 2 6 years ago
Elham Rababah 72bf5d2337 fix scrolling in patient screen 6 years ago