Commit Graph

23 Commits (8dade058a4582ae8c13aae58656ec0de2fb4d26e)

Author SHA1 Message Date
Elham Rababh 94a699a58f fix all the screenshots 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 Rababh 26f5e57417 8 step from fix screen 4 years ago
Elham Rababh 28d8449345 Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
 Conflicts:
	lib/models/SOAP/selected_items/my_selected_allergy.dart
4 years ago
Elham Ali 81ae0b04d3 Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
4 years ago
Elham Rababh a54ec0ef78 5 step from fix screen 4 years ago
hussam al-habibeh 24618e5232 flutter 2 models 4 years ago
Elham Rababh 71463dc459 remove margin top form DischargedPatient 4 years ago
Elham Rababh dac8f90a8a rename file related to custom search 4 years ago
Elham Rababh b27cc6ae9a serach-text_fields 4 years ago
mosazaid 6ca3baf7cb solve lab results design issue 5 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 5 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
5 years ago
Mohammad Aljammal c6ac829813 hot fixes in PatientReferralScreen 5 years ago
Mohammad Aljammal 88b8454afe Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
5 years ago
mosazaid b43b7cafcc working on in-patient screen design 5 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
Mohammad Aljammal 55c63c9531 fix Discharged Patient 5 years ago
Mohammad Aljammal b2bcb3dd6d Done Referral Discharged Patient 5 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 5 years ago