Commit Graph

180 Commits (3dd5538dca615d3345bd244caab91c8674533cf3)

Author SHA1 Message Date
Sultan Khan 3dd5538dca Merge remote-tracking branch 'origin/update_flutter_3.16.0' into update_flutter_3.16.0 5 months ago
Sultan Khan 558691a0d1 login flow changed 5 months ago
Syed Taha Alam a54ebb91ab request and response are being reported to firestore 5 months ago
haroon amjad f365181888 Pharmacy intervention null error fix, Update to stores VersionID 9.7 7 months ago
taha.alam 63675befe2 WIP: api integration 11 months ago
taha.alam fd4dacee83 WD: error handling and request changes 12 months ago
taha.alam 8f05d526f6 WD: Changes of apis and flows performed.
1. diagnosis restricted for operation  after the resolution or deletion of diagnosis.
2. pomrid in episode api.
12 months ago
Sultan khan 53aa39cab9 Updated 1 year ago
taha.alam 0b89ea91b7 WD: firebase firestore added and url and response mapping added 1 year ago
haroon amjad 4af8a0a28f update to stores version ID 9.1 1 year ago
Sultan khan c13d7a08a0 logout issue fixed. 1 year ago
Sultan khan e4b891bf68 Merge branch 'development-3.3' of http://34.17.52.79/Haroon6138/doctor_app_flutter into update_flutter_3.16.0
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/model/SOAP/assessment/patch_assessment_req_model.dart
#	lib/core/service/patient_medical_file/soap/SOAP_service.dart
#	lib/core/viewModel/SOAP_view_model.dart
#	lib/core/viewModel/dashboard_view_model.dart
#	lib/core/viewModel/prescription/prescription_view_model.dart
#	lib/core/viewModel/procedure_View_model.dart
#	lib/screens/doctor_schedule/doctor_schedule.dart
#	lib/screens/home/home_screen.dart
#	lib/screens/patients/insurance_approvals_details.dart
#	lib/screens/patients/profile/lab_result/labs_home_page.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart
#	lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart
#	lib/screens/prescription/add_prescription/prescription_form_widget.dart
#	lib/screens/prescription/new_prescriptions_page.dart
#	lib/screens/procedures/add_procedure_page.dart
#	lib/screens/procedures/procedure_screen.dart
#	lib/utils/translations_delegate_base_utils.dart
#	lib/widgets/shared/speech-text-popup.dart
#	pubspec.lock
#	pubspec.yaml
2 years ago
Aamir Muhammad 83737dc5a7 Null Safety Fixes & Overrides 2 years ago
Sultan khan 0f2593f56d Merge branch 'update_flutter_3.16.0' of http://34.17.52.79/Haroon6138/doctor_app_flutter into update_flutter_3.16.0
# Conflicts:
#	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
2 years ago
Aamir Muhammad ea497ff8b1 Null Safety Fixes & Overrides 2 years ago
Aamir Muhammad 0db3617737 Null Safety 2 years ago
Aamir Muhammad e524151da9 Null Safety 2 years ago
Aamir Muhammad 7e92348cb5 Null Safety 2 years ago
Aamir Muhammad d4cb4d7ad3 Null Safety 2 years ago
Sultan khan b5851f384d DOCTOR ROTA AND LAB RAD CHANGES 2 years ago
haroon amjad 0d65197b2f updates & fixes 2 years ago
haroon amjad d2a16f5357 updates & fixes 2 years ago
haroon amjad fc21961807 updates & fixes 2 years ago
haroon amjad c50100613a updates 2 years ago
haroon amjad 0861a0c79f updates 3 years ago
haroon amjad ac74e1e62d updates 3 years ago
haroon amjad 92c665197d SetupID made dynamic 3 years ago
Elham Rababh 092cfbc891 fix some issue in prescription 4 years ago
Elham Rababh d4f01c19f7 session management update 4 years ago
Elham Rababh 8069e89a61 session management update 4 years ago
Elham Rababh c30d6bebd8 session management update 4 years ago
RoaaGhali98 e61d1e78f6 Refactoring 4 years ago
RoaaGhali98 c93ea2f285 Refactoring 4 years ago
RoaaGhali98 240c9aa411 Refactoring 4 years ago
Elham Rababh cb19a5fcfe move models to the core file 4 years ago
RoaaGhali98 406165c348 we fix some issues -in-patient 4 years ago
Elham Rababh da63af6db3 vte assessment 4 years ago
Elham Rababh fb610d21b0 reformat code 4 years ago
Elham Rababh 26e80356e1 first change 4 years ago
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
4 years ago
Elham Rababh a6153db2f9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/localized_values.dart
	lib/config/size_config.dart
	lib/core/model/Prescriptions/prescription_report.dart
	lib/core/model/Prescriptions/prescription_report_enh.dart
	lib/core/model/auth/activation_Code_req_model.dart
	lib/core/model/auth/activation_code_for_verification_screen_model.dart
	lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
	lib/core/model/auth/check_activation_code_request_model.dart
	lib/core/model/labs/lab_result.dart
	lib/core/model/patient_muse/PatientSearchRequestModel.dart
	lib/core/model/procedure/get_ordered_procedure_request_model.dart
	lib/core/model/referral/MyReferralPatientModel.dart
	lib/core/model/sick_leave/sick_leave_patient_model.dart
	lib/core/model/sick_leave/sick_leave_patient_request_model.dart
	lib/core/service/VideoCallService.dart
	lib/core/service/base/base_service.dart
	lib/core/service/home/scan_qr_service.dart
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/service/patient/MyReferralPatientService.dart
	lib/core/service/patient/patient-doctor-referral-service.dart
	lib/core/service/patient_medical_file/lab_order/labs_service.dart
	lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
	lib/core/service/patient_medical_file/prescription/prescriptions_service.dart
	lib/core/service/patient_medical_file/procedure/procedure_service.dart
	lib/core/service/patient_medical_file/radiology/radiology_service.dart
	lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart
	lib/core/service/patient_medical_file/soap/SOAP_service.dart
	lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/core/viewModel/SOAP_view_model.dart
	lib/core/viewModel/authentication_view_model.dart
	lib/core/viewModel/base_view_model.dart
	lib/core/viewModel/dashboard_view_model.dart
	lib/core/viewModel/doctor_replay_view_model.dart
	lib/core/viewModel/labs_view_model.dart
	lib/core/viewModel/patient-referral-viewmodel.dart
	lib/core/viewModel/patient-ucaf-viewmodel.dart
	lib/core/viewModel/prescription_view_model.dart
	lib/core/viewModel/prescriptions_view_model.dart
	lib/core/viewModel/procedure_View_model.dart
	lib/core/viewModel/sick_leave_view_model.dart
	lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
	lib/models/SOAP/GetPhysicalExamReqModel.dart
	lib/models/SOAP/my_selected_allergy.dart
	lib/models/SOAP/my_selected_assement.dart
	lib/models/SOAP/my_selected_examination.dart
	lib/models/SOAP/my_selected_history.dart
	lib/models/SOAP/post_chief_complaint_request_model.dart
	lib/models/SOAP/post_physical_exam_request_model.dart
	lib/models/doctor/list_gt_my_patients_question_model.dart
	lib/models/doctor/profile_req_Model.dart
	lib/models/doctor/replay/request_doctor_reply.dart
	lib/models/livecare/start_call_res.dart
	lib/models/patient/patiant_info_model.dart
	lib/models/patient/progress_note_request.dart
	lib/models/patient/vital_sign/vital_sign_req_model.dart
	lib/models/pharmacies/pharmacies_items_request_model.dart
	lib/screens/auth/verification_methods_screen.dart
	lib/screens/doctor/doctor_repaly_chat.dart
	lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
	lib/screens/doctor/doctor_reply_screen.dart
	lib/screens/doctor/my_referral_patient_screen.dart
	lib/screens/home/dashboard_swipe_widget.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_patient_screen.dart
	lib/screens/live_care/video_call.dart
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/InPatientPage.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_header.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
	lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
	lib/screens/patients/profile/UCAF/page-stepper-widget.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/lab_result/FlowChartPage.dart
	lib/screens/patients/profile/lab_result/LabResultWidget.dart
	lib/screens/patients/profile/lab_result/laboratory_result_page.dart
	lib/screens/patients/profile/lab_result/laboratory_result_widget.dart
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/notes/note/progress_note_screen.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
	lib/screens/patients/profile/radiology/radiology_details_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
	lib/screens/patients/profile/referral/my-referral-detail-screen.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/assessment/add_assessment_details.dart
	lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
	lib/screens/patients/profile/soap_update/objective/examination_item_card.dart
	lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/steps_widget.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart
	lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
	lib/screens/patients/profile/soap_update/subjective/history/priority_bar.dart
	lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart
	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
	lib/screens/patients/profile/soap_update/update_soap_index.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_item_in_patient_page.dart
	lib/screens/prescription/prescription_text_filed.dart
	lib/screens/prescription/prescriptions_page.dart
	lib/screens/procedures/ProcedureCard.dart
	lib/screens/procedures/add-favourite-procedure.dart
	lib/screens/procedures/procedure_checkout_screen.dart
	lib/screens/procedures/procedure_screen.dart
	lib/screens/reschedule-leaves/add-rescheduleleave.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/screens/sick-leave/show-sickleave.dart
	lib/screens/sick-leave/sick_leave.dart
	lib/util/VideoChannel.dart
	lib/util/date-utils.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/patient-referral-item-widget.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/PatientProfileButton.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/profile-welcome-widget.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/patients/profile/profile_medical_info_widget_search.dart
	lib/widgets/patients/profile/profile_status_info_widget.dart
	lib/widgets/shared/app_texts_widget.dart
	lib/widgets/shared/bottom_nav_bar.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/buttons/app_buttons_widget.dart
	lib/widgets/shared/card_with_bg_widget.dart
	lib/widgets/shared/dialogs/dailog-list-select.dart
	lib/widgets/shared/dialogs/master_key_dailog.dart
	lib/widgets/shared/doctor_card.dart
	lib/widgets/shared/doctor_card_insurance.dart
	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
	lib/widgets/shared/master_key_checkbox_search_widget.dart
	lib/widgets/shared/rounded_container_widget.dart
	lib/widgets/shared/text_fields/app-textfield-custom.dart
	lib/widgets/shared/text_fields/text_fields_utils.dart
	lib/widgets/shared/user-guid/custom_validation_error.dart
	lib/widgets/transitions/fade_page.dart
	lib/widgets/transitions/slide_up_page.dart
	pubspec.lock
	pubspec.yaml
4 years ago
Elham Rababh cf498de70f finish confirmation page 4 years ago
Mohammad Aljammal d5cff77743 fix login issue and add new localizedValues 4 years ago
Mohammad Aljammal 243108e81a Apply the new authentication logic 4 years ago
hussam al-habibeh 07835aaa1b medical report changes 5 years ago
Mohammad Aljammal e70eabe68d Fix live care issues and qr code 5 years ago
hussam al-habibeh 550d54c034 flutter 2 migration fix 5 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
5 years ago
hussam al-habibeh bb20b4d582 flutter 2 migration 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