You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Aamir Muhammad dc802e2bda Merge remote-tracking branch 'origin/development-3.3' into update_flutter_3.16.0 ... # Conflicts: # android/app/build.gradle # android/app/src/main/kotlin/com/hmg/hmgDr/Service/BaseMovingFloatingWidget.kt # android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt # android/build.gradle # android/gradle/wrapper/gradle-wrapper.properties # ios/Runner.xcodeproj/project.pbxproj # ios/Runner/Info.plist # lib/client/base_app_client.dart # lib/core/model/ER_sign_in/doctor_ER_sign_assessment_req_model.dart # lib/core/model/SOAP/assessment/post_assessment_request_model.dart # lib/core/model/admissionRequest/admission-request.dart # lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart # lib/core/model/doctor/clinic_model.dart # lib/core/model/hospitals/get_hospitals_request_model.dart # lib/core/model/labs/patient_lab_orders.dart # lib/core/model/patient/get_doctor_by_clinic_id_request.dart # lib/core/model/patient/vital_sign/patient-vital-sign-data.dart # lib/core/model/pharmacy-intervention-model/intervention_medication_history_res_model.dart # lib/core/model/radiology/final_radiology.dart # lib/core/service/AnalyticsService.dart # lib/core/service/VideoCallService.dart # lib/core/service/authentication_service.dart # lib/core/service/hospitals/hospitals_service.dart # lib/core/service/patient_medical_file/ER_signin/ER_signin_service.dart # lib/core/service/patient_medical_file/lab_order/labs_service.dart # lib/core/service/patient_medical_file/radiology/radiology_service.dart # lib/core/service/pending_order_service.dart # lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart # lib/core/viewModel/SOAP_view_model.dart # lib/core/viewModel/authentication_view_model.dart # lib/core/viewModel/dashboard_view_model.dart # lib/core/viewModel/doctor_replay_view_model.dart # lib/core/viewModel/patient-ucaf-viewmodel.dart # lib/core/viewModel/procedure_View_model.dart # lib/core/viewModel/radiology_view_model.dart # lib/screens/ER_singin/ER_singin_screen.dart # lib/screens/auth/login_screen.dart # lib/screens/auth/verification_methods_screen.dart # lib/screens/live_care/video_call.dart # lib/screens/medical-file/medical_file_details.dart # lib/screens/medicine/medicine_search_screen.dart # lib/screens/patients/DischargedPatientPage.dart # lib/screens/patients/ECGPage.dart # lib/screens/patients/out_patient/out_patient_screen.dart # lib/screens/patients/profile/admission_request/admission_request_first_screen.dart # lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart # lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart # lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_widget.dart # lib/screens/patients/profile/notes/note/progress_note_screen.dart # lib/screens/patients/profile/notes/note/update_note.dart # lib/screens/patients/profile/operation_report/update_operation_report.dart # lib/screens/patients/profile/profile_screen/patient_profile_screen.dart # lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart # lib/screens/patients/profile/radiology/radiology_details_page.dart # lib/screens/patients/profile/radiology/radiology_home_page.dart # lib/screens/patients/profile/referral/refer_details/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/update_objective_page.dart # lib/screens/patients/profile/soap_update/plan/update_plan_page.dart # lib/screens/patients/profile/soap_update/soap_utils.dart # lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart # lib/screens/patients/profile/soap_update/subjective/allergies/master_key_checkbox_search_allergies_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/vital_sign/line_chart_curved.dart # lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.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_prescription/add_drug/drug_to_drug.dart # lib/screens/prescription/add_prescription/prescription_form_widget.dart # lib/screens/prescription/old_prescriptions_page.dart # lib/screens/prescription/prescription_checkout_screen.dart # lib/screens/procedures/add_procedure_page.dart # lib/screens/procedures/entity_list_checkbox_search_widget.dart # lib/screens/reschedule_leaves/reschedule_leave.dart # lib/utils/translations_delegate_base_utils.dart # lib/utils/utils.dart # lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart # lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart # lib/widgets/shared/app_scaffold_widget.dart # lib/widgets/shared/app_texts_widget.dart # lib/widgets/shared/dialogs/dailog-list-select.dart # lib/widgets/shared/dialogs/master_key_dailog.dart # lib/widgets/shared/dialogs/search-drugs-dailog-list.dart # lib/widgets/shared/text_fields/TextFields.dart # lib/widgets/shared/text_fields/html_rich_editor.dart # pubspec.lock # pubspec.yaml		2 years ago
..
add_patient_sick_leave_screen.dart	Updates	2 years ago
patient_sick_leave_screen.dart	Merge remote-tracking branch 'origin/development-3.3' into update_flutter_3.16.0	2 years ago