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.
doctor_app_flutter/lib/models/SOAP
Elham Rababh 351d5a79e7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev_v2.8
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/core/viewModel/project_view_model.dart
	lib/models/SOAP/selected_items/my_selected_history.dart
	lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart
	lib/screens/home/home_screen.dart
	lib/screens/live_care/end_call_screen.dart
	lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart
	lib/screens/patients/In_patient/InPatientHeader.dart
	lib/screens/patients/In_patient/in_patient_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/diabetic_chart/line_chart_for_diabetic.dart
	lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart
	lib/screens/patients/profile/lab_result/LineChartCurved.dart
	lib/screens/patients/profile/lab_result/LineChartCurvedLabHistory.dart
	lib/screens/patients/profile/operation_report/operation_report.dart
	lib/screens/patients/profile/operation_report/update_operation_report.dart
	lib/screens/patients/profile/pending_orders/pending_orders_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/referral/my-referral-detail-screen.dart
	lib/screens/patients/profile/referral/refer-patient-screen.dart
	lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
	lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
	lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/allergies_item.dart
	lib/screens/patients/profile/soap_update/subjective/allergies/master_key_checkbox_search_allergies_widget.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/vital_sign/LineChartCurved.dart
	lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
	lib/screens/patients/register_patient/CustomEditableText.dart
	lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
	lib/screens/prescription/add_prescription_form.dart
	lib/screens/prescription/prescription_text_filed.dart
	lib/screens/reschedule-leaves/reschedule_leave.dart
	lib/util/dr_app_toast_msg.dart
	lib/widgets/patients/patient_card/PatientCard.dart
	lib/widgets/patients/profile/patient-profile-app-bar.dart
	lib/widgets/patients/profile/profile_medical_info_widget_search.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/bottom_navigation_item.dart
	lib/widgets/shared/text_fields/app-textfield-custom.dart
	lib/widgets/shared/text_fields/app_text_field_custom_serach.dart
	lib/widgets/shared/text_fields/new_text_Field.dart
	pubspec.yaml
4 years ago
..
ChiefComplaint Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
in_patient Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
selected_items Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev_v2.8 4 years ago
Allergy_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GeneralGetReqForSOAP.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetAllergiesResModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetAssessmentReqModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetAssessmentResModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetGetProgressNoteReqModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetGetProgressNoteResModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetHistoryReqModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetHistoryResModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetPhysicalExamListResModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
GetPhysicalExamReqModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
PatchAssessmentReqModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
PostEpisodeReqModel.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
get_Allergies_request_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
master_key_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
order-procedure.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
post_allergy_request_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
post_assessment_request_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
post_chief_complaint_request_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
post_histories_request_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
post_physical_exam_request_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago
post_progress_note_request_model.dart Revert "Merge branch 'hussam_flutter_2' into 'development'" 4 years ago