Commit Graph

301 Commits (17eeaf2cc6f7441e68832e657d9c89c116f5ef09)

Author SHA1 Message Date
Elham Rababh 9b40638f86 fix get allergies issues 3 years ago
Elham Rababh c69f122713 prevent passing data and first step from refactor examinations 3 years ago
Elham Rababh 638ae40035 first step for fix first step from fixes soap 3 years ago
Mohammad Aljammal eb40cc819d fix video call 3 years ago
Mohammad Aljammal a5988c2885 Merge branch 'fixes' into 'development'
Fixes

See merge request Cloud_Solution/doctor_app_flutter!756
3 years ago
Elham Rababah 74b17c5fc9 Merge branches 'development' and 'fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes
 Conflicts:
	lib/models/patient/patiant_info_model.dart
3 years ago
Elham Rababah f5b7829e7d fix create create episode on live care 3 years ago
mosazaid e1c4721ac1 Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
3 years ago
mosazaid 385820fdce video stream add record icon and change button disable 3 years ago
hussam al-habibeh 07835aaa1b medical report changes 3 years ago
Elham Rababah 02307e8fac fix header and verification method 3 years ago
Elham Rababah 9da1bff723 first step form sort 3 years ago
Elham Rababah 329711a002 fix error to make the code work with flutter 2 3 years ago
Elham Rababah ca6306950d Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham
 Conflicts:
	ios/Podfile
	lib/client/base_app_client.dart
	lib/core/model/patient_muse/PatientSearchRequestModel.dart
	lib/core/model/referral/MyReferralPatientModel.dart
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/service/patient/MyReferralPatientService.dart
	lib/core/service/patient/patient_service.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/core/viewModel/PatientMedicalReportViewModel.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/core/viewModel/authentication_view_model.dart
	lib/core/viewModel/dashboard_view_model.dart
	lib/core/viewModel/patient-referral-viewmodel.dart
	lib/core/viewModel/procedure_View_model.dart
	lib/core/viewModel/referred_view_model.dart
	lib/models/livecare/start_call_req.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/auth/login_screen.dart
	lib/screens/auth/verification_methods_screen.dart
	lib/screens/home/dashboard_slider-item-widget.dart
	lib/screens/home/dashboard_swipe_widget.dart
	lib/screens/home/home_page_card.dart
	lib/screens/home/home_patient_card.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/live_care/live-care_transfer_to_admin.dart
	lib/screens/live_care/live_care_patient_screen.dart
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/medical-file/medical_file_details.dart
	lib/screens/patients/ECGPage.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	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/medical_report/AddVerifyMedicalReport.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/profile_screen/PatientProfileCardModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/radiology/radiology_details_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/patients/profile/referral/referred-patient-screen.dart
	lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
	lib/screens/patients/profile/soap_update/update_soap_index.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
	lib/screens/prescription/add_favourite_prescription.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_home_screen.dart
	lib/screens/prescription/prescription_item_in_patient_page.dart
	lib/screens/prescription/prescription_items_page.dart
	lib/screens/prescription/prescription_screen.dart
	lib/screens/prescription/prescription_screen_history.dart
	lib/screens/prescription/prescriptions_page.dart
	lib/screens/procedures/ProcedureCard.dart
	lib/screens/procedures/add-favourite-procedure.dart
	lib/screens/procedures/add-procedure-form.dart
	lib/screens/procedures/add_lab_home_screen.dart
	lib/screens/procedures/add_lab_orders.dart
	lib/screens/procedures/add_radiology_order.dart
	lib/screens/procedures/add_radiology_screen.dart
	lib/screens/procedures/base_add_procedure_tab_page.dart
	lib/screens/procedures/entity_list_procedure_widget.dart
	lib/screens/qr_reader/QR_reader_screen.dart
	lib/util/VideoChannel.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/auth/sms-popup.dart
	lib/widgets/auth/verification_methods_list.dart
	lib/widgets/dashboard/out_patient_stack.dart
	lib/widgets/patients/patient-referral-item-widget.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart
	lib/widgets/patients/profile/PatientProfileButton.dart
	lib/widgets/patients/profile/patient-page-header-widget.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/patient-profile-header-new-design.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
	lib/widgets/patients/profile/profile-welcome-widget.dart
	lib/widgets/shared/app_drawer_widget.dart
	lib/widgets/shared/app_scaffold_widget.dart
	lib/widgets/shared/app_texts_widget.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/buttons/app_buttons_widget.dart
	lib/widgets/shared/drawer_item_widget.dart
	pubspec.lock
3 years ago
Mohammad Aljammal 4d3371e882 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/live_care/end_call_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/util/helpers.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/shared/app_scaffold_widget.dart
3 years ago
Mohammad Aljammal 737d0e9bec Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor
 Conflicts:
	lib/screens/patients/profile/lab_result/laboratory_result_page.dart
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
3 years ago
Mohammad Aljammal 61c94f85b2 fix the end call 3 years ago
Elham Rababah e4fb83826a fix referral screen in out patient 3 years ago
Elham Rababah 363b55069f first step form Special Clinic 3 years ago
Elham Rababah c46c339933 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/config/config.dart
3 years ago
Elham Rababah 1edd375fd7 first step from special clinic 3 years ago
Elham Rababah 07857b28cd change the code of header profile to new implementation 3 years ago
hussam al-habibeh 110a1983c7 flutter vervion 2 migration 3 years ago
mosazaid 017669c406 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
3 years ago
Elham Rababah 176c0ab97c first step from live care fixes 3 years ago
Elham Rababah 3df6a55dad remove comment 3 years ago
Elham Rababah 72966c3269 fix referral patient services 3 years ago
hussam al-habibeh 6e6a7deba5 migration Services to flutter 2 3 years ago
Mohammad Aljammal d784310c82 Migrate models to flutter 2 3 years ago
Mohammad Aljammal d9358bce75 hot fix in medical report 3 years ago
Mohammad Aljammal a9a7c8a73c fix patient MRN 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 fb6ef8fca1 fix appointment in live care 3 years ago
mosazaid c82a4a05d5 medical report design changes 3 years ago
mosazaid 54fbe76c7b medical report fixes and vital sign 3 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 3 years ago
mosazaid b16dc2092b liveCare cahnges 3 years ago
Mohammad Aljammal 280f87e514 fix live care issues 3 years ago
Mohammad Aljammal 281a807ec8 fix live care 3 years ago
hussam al-habibeh 2a44840666 hot fix 3 years ago
Elham Rababah 04c9a1168b add VC_ID 3 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 3 years ago
mosazaid deb126fdd5 meical report changes 3 years ago
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
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
mosazaid 6192d9a84f working on medical-profile 3 years ago
mosazaid 0e2b700136 vital sign hot fix 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
Elham Rababah 333d1e3f50 first step from models 4 years ago
Elham Rababah 9f1f06f2fc refactor verification methods services 4 years ago
Haroon Amjad 0244334bb5 Update on store 4 years ago
Haroon Amjad 53a610213c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/home/home_screen.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 4 years ago
Mohammad Aljammal c3ac50a859 hot fixes 4 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
4 years ago
Mohammad Aljammal 357e01c846 hot fixes 4 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 4 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 4 years ago
mosazaid 9d00440789 referral -re design 4 years ago
Mohammad Aljammal 704a4bd0be hot fixes 4 years ago
Mohammad Aljammal 0ded3a5a03 hot fixes 4 years ago
mosazaid b6a6f16b31 add vital sign inPatient 4 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 4 years ago
Haroon Amjad 6fc72328b7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
Haroon Amjad 27b4450dac versionID changed to 5.5 4 years ago
Elham Rababah 2fd30ae1be improve exam step 4 years ago
Mohammad Aljammal f4d1aac5e6 hot fixes on doctor replay and schedule 4 years ago
Mohammad Aljammal d450affa37 Merge branch 'Stepper_header' into 'development'
add doctor replay

See merge request Cloud_Solution/doctor_app_flutter!502
4 years ago
Elham Rababah 4ecf9fe4b9 add doctor replay 4 years ago
mosazaid 4b32487540 referral design and service changes 4 years ago
mosazaid a701b6e989 make referral changes 4 years ago
Sultan Khan 9268b13312 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 5c4aee849e bug fixes 4 years ago
Elham Rababah 14cf5a5a1c finish fix the assessment 4 years ago
Sultan Khan 212d1dc05f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 0498545e5c no data 4 years ago
mosazaid 9a0555b715 design fixes 4 years ago
Elham Rababah ed02bbc1f0 fix allergy 4 years ago
Elham Rababah 19d8b9170d update allergies fixes 4 years ago
mosazaid ffd77528a2 patient profile new design 4 years ago
Sultan Khan a491eee7f7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan e640bcf975 search updated 4 years ago
Mohammad Aljammal 55d4ff1436 Merge branch 'patient_type_fix' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!370
4 years ago
Sultan Khan 091234ad77 bug fix 4 years ago
Elham Rababah 56d3f6a9bb fix issue 4 years ago
Sultan Khan 12dc637163 bug fixes 4 years ago
Sultan Khan c16b7ffca0 arrival page updated 4 years ago
Sultan Khan bbb1a8ff74 arrival list updated 4 years ago
Elham Rababah 083b49aa0a fix DA-341 4 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 4 years ago
Elham Rababah ff33afd124 fix DA-149 4 years ago
Elham Rababah a5a7425a09 fix DA-149 4 years ago
mosazaid b63c7aff25 Fix DA-331 vital signs uncorrect temperature value 4 years ago
Elham Rababah 00543a759a fix remarks in allergies 4 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 4 years ago
mosazaid 3be693337a some fixes 4 years ago
Elham Rababah 02167afa6b fix 143,144 4 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 9674eb89d9 add modification on so 4 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago