Commit Graph

19 Commits (a11d9f60fd6dbac96cb74e5aa0a2e271f7681741)

Author SHA1 Message Date
Elham Rababh 9292b38d5a fix shaerd 4 years ago
Elham Rababh 6fe3cecc9b reverting manully 4 years ago
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
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
4 years ago
hussam al-habibeh 110a1983c7 flutter vervion 2 migration 5 years ago
Elham Rababah 8fd318548a finish chief complaint design 5 years ago
Elham Rababah d8cce04b8a fix replay design 5 years ago
Mohammad Aljammal 60e416e632 add done button in all pages user keyboard and hide the keyboard when the user click on background 5 years ago
hussam al-habibeh 5bde14813a fixing bugs 5 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 5 years ago
Elham Rababah 34692b94c2 fix : DA-264 5 years ago
hussam al-habibeh 47a350a811 prscription and procedure 5 years ago
hussam al-habibeh d3bf97fdd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_buttons_widget.dart
	lib/widgets/shared/app_text_form_field.dart
	lib/widgets/shared/app_texts_widget.dart
5 years ago
hussam al-habibeh 697f17f2cd prescription and procedure 5 years ago
hussam al-habibeh 1ce6571668 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/refer_patient_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_text_form_field.dart
5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Elham Rababah bb651478a0 Finish subjective 5 years ago
Elham Rababah dcba85c7b9 Finish first step subjective_page.dart 5 years ago
Mohammad ALjammal 9572e16627 done My Referral Patient and create Base App Client 6 years ago