From 76d411b79a13cf64bf3e5746678f322c2746bedf Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Sun, 18 Apr 2021 13:11:33 +0300 Subject: [PATCH] move soap folder to the correct place --- lib/core/service/SOAP_service.dart | 1 - lib/core/viewModel/SOAP_view_model.dart | 1 - lib/routes.dart | 5 +---- .../profile/soap_update/SOAP_open_items.dart | 0 .../profile/soap_update/SOAP_step_header.dart | 2 +- .../assessment/add_assessment_details.dart | 2 +- .../assessment/update_assessment_page.dart | 0 .../profile/soap_update/custom_validation_error.dart | 0 .../profile/soap_update/expandable_SOAP_widget.dart | 0 .../soap_update/objective/examination-item-card.dart | 0 .../objective/objective-add-examination-page.dart | 0 .../soap_update/objective/update_objective_page.dart | 0 .../patients/profile/soap_update/steps_widget.dart | 0 .../subjective/allergies/add_allergies.dart | 0 .../allergies/update_allergies_widget.dart | 0 .../soap_update/subjective/bottom_sheet_title.dart | 0 .../soap_update/subjective/history/PriorityBar.dart | 0 .../subjective/history/add_history_dialog.dart | 0 .../subjective/history/update_history_widget.dart | 0 .../subjective/medication/add_medication.dart | 0 .../medication/update_medication_widget.dart | 0 .../subjective/update_Chief_complaints.dart | 2 +- .../subjective/update_subjective_page.dart | 8 +++----- .../profile/soap_update/update_plan_page.dart | 0 .../profile/soap_update/update_soap_index.dart | 12 +++++------- lib/widgets/patients/dynamic_elements.dart | 2 +- .../master_key_checkbox_search_allergies_widget.dart | 2 +- 27 files changed, 14 insertions(+), 23 deletions(-) rename lib/{widgets => screens}/patients/profile/soap_update/SOAP_open_items.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/SOAP_step_header.dart (95%) rename lib/{widgets => screens}/patients/profile/soap_update/assessment/add_assessment_details.dart (99%) rename lib/{widgets => screens}/patients/profile/soap_update/assessment/update_assessment_page.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/custom_validation_error.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/expandable_SOAP_widget.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/objective/examination-item-card.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/objective/objective-add-examination-page.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/objective/update_objective_page.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/steps_widget.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/allergies/add_allergies.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/bottom_sheet_title.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/history/PriorityBar.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/history/add_history_dialog.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/history/update_history_widget.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/medication/add_medication.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/medication/update_medication_widget.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/update_Chief_complaints.dart (95%) rename lib/{widgets => screens}/patients/profile/soap_update/subjective/update_subjective_page.dart (97%) rename lib/{widgets => screens}/patients/profile/soap_update/update_plan_page.dart (100%) rename lib/{widgets => screens}/patients/profile/soap_update/update_soap_index.dart (91%) diff --git a/lib/core/service/SOAP_service.dart b/lib/core/service/SOAP_service.dart index d35736f5..901445bf 100644 --- a/lib/core/service/SOAP_service.dart +++ b/lib/core/service/SOAP_service.dart @@ -21,7 +21,6 @@ import 'package:doctor_app_flutter/models/SOAP/post_chief_complaint_request_mode import 'package:doctor_app_flutter/models/SOAP/post_histories_request_model.dart'; import 'package:doctor_app_flutter/models/SOAP/post_physical_exam_request_model.dart'; import 'package:doctor_app_flutter/models/SOAP/post_progress_note_request_model.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/assessment/update_assessment_page.dart'; import 'base/lookup-service.dart'; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index c576e566..274c983f 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -25,7 +25,6 @@ import 'package:doctor_app_flutter/models/SOAP/post_chief_complaint_request_mode import 'package:doctor_app_flutter/models/SOAP/post_histories_request_model.dart'; import 'package:doctor_app_flutter/models/SOAP/post_physical_exam_request_model.dart'; import 'package:doctor_app_flutter/models/SOAP/post_progress_note_request_model.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/assessment/update_assessment_page.dart'; import 'package:flutter/material.dart'; import '../../locator.dart'; diff --git a/lib/routes.dart b/lib/routes.dart index dbe4f0cb..502b3be6 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -1,4 +1,3 @@ -import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/root_page.dart'; import 'package:doctor_app_flutter/screens/medical-file/medical_file_page.dart'; import 'package:doctor_app_flutter/screens/patients/ECGPage.dart'; @@ -13,14 +12,13 @@ import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_ import 'package:doctor_app_flutter/screens/patients/profile/refer_patient_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart'; -import 'package:doctor_app_flutter/screens/live_care/video_call.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/update_soap_index.dart'; import 'package:doctor_app_flutter/screens/prescription/prescription_screen_history.dart'; import 'package:doctor_app_flutter/screens/prescription/prescriptions_page.dart'; import 'package:doctor_app_flutter/screens/sick-leave/add-sickleave.dart'; import 'package:doctor_app_flutter/screens/sick-leave/show-sickleave.dart'; import 'package:doctor_app_flutter/screens/sick-leave/sick_leave.dart'; import 'package:doctor_app_flutter/screens/procedures/procedure_screen.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/update_soap_index.dart'; import './screens/QR_reader_screen.dart'; import './screens/auth/change_password_screen.dart'; @@ -28,7 +26,6 @@ import './screens/auth/login_screen.dart'; import './screens/auth/verification_methods_screen.dart'; import './screens/auth/verify_account_screen.dart'; import './screens/blood_bank_screen.dart'; -import 'screens/home/home_screen.dart'; import './screens/doctor/message_screen.dart'; import './screens/doctor/my_schedule_screen.dart'; import './screens/doctor/services_screen.dart'; diff --git a/lib/widgets/patients/profile/soap_update/SOAP_open_items.dart b/lib/screens/patients/profile/soap_update/SOAP_open_items.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/SOAP_open_items.dart rename to lib/screens/patients/profile/soap_update/SOAP_open_items.dart diff --git a/lib/widgets/patients/profile/soap_update/SOAP_step_header.dart b/lib/screens/patients/profile/soap_update/SOAP_step_header.dart similarity index 95% rename from lib/widgets/patients/profile/soap_update/SOAP_step_header.dart rename to lib/screens/patients/profile/soap_update/SOAP_step_header.dart index e4d8d67e..0efcc4fa 100644 --- a/lib/widgets/patients/profile/soap_update/SOAP_step_header.dart +++ b/lib/screens/patients/profile/soap_update/SOAP_step_header.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/steps_widget.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/steps_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart similarity index 99% rename from lib/widgets/patients/profile/soap_update/assessment/add_assessment_details.dart rename to lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index bb331ba1..008172a6 100644 --- a/lib/widgets/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -12,8 +12,8 @@ import 'package:doctor_app_flutter/models/SOAP/post_assessment_request_model.dar import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/subjective/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/app-textfield-custom.dart'; diff --git a/lib/widgets/patients/profile/soap_update/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/assessment/update_assessment_page.dart rename to lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart diff --git a/lib/widgets/patients/profile/soap_update/custom_validation_error.dart b/lib/screens/patients/profile/soap_update/custom_validation_error.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/custom_validation_error.dart rename to lib/screens/patients/profile/soap_update/custom_validation_error.dart diff --git a/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart b/lib/screens/patients/profile/soap_update/expandable_SOAP_widget.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart rename to lib/screens/patients/profile/soap_update/expandable_SOAP_widget.dart diff --git a/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart b/lib/screens/patients/profile/soap_update/objective/examination-item-card.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart rename to lib/screens/patients/profile/soap_update/objective/examination-item-card.dart diff --git a/lib/widgets/patients/profile/soap_update/objective/objective-add-examination-page.dart b/lib/screens/patients/profile/soap_update/objective/objective-add-examination-page.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/objective/objective-add-examination-page.dart rename to lib/screens/patients/profile/soap_update/objective/objective-add-examination-page.dart diff --git a/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart rename to lib/screens/patients/profile/soap_update/objective/update_objective_page.dart diff --git a/lib/widgets/patients/profile/soap_update/steps_widget.dart b/lib/screens/patients/profile/soap_update/steps_widget.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/steps_widget.dart rename to lib/screens/patients/profile/soap_update/steps_widget.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/allergies/add_allergies.dart rename to lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart rename to lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/bottom_sheet_title.dart b/lib/screens/patients/profile/soap_update/subjective/bottom_sheet_title.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/bottom_sheet_title.dart rename to lib/screens/patients/profile/soap_update/subjective/bottom_sheet_title.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/history/PriorityBar.dart b/lib/screens/patients/profile/soap_update/subjective/history/PriorityBar.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/history/PriorityBar.dart rename to lib/screens/patients/profile/soap_update/subjective/history/PriorityBar.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/history/add_history_dialog.dart rename to lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/history/update_history_widget.dart b/lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/history/update_history_widget.dart rename to lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/medication/add_medication.dart rename to lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/medication/update_medication_widget.dart b/lib/screens/patients/profile/soap_update/subjective/medication/update_medication_widget.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/subjective/medication/update_medication_widget.dart rename to lib/screens/patients/profile/soap_update/subjective/medication/update_medication_widget.dart diff --git a/lib/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart b/lib/screens/patients/profile/soap_update/subjective/update_Chief_complaints.dart similarity index 95% rename from lib/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart rename to lib/screens/patients/profile/soap_update/subjective/update_Chief_complaints.dart index bb66fd90..6169c3db 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update/subjective/update_Chief_complaints.dart @@ -1,10 +1,10 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/subjective/medication/update_medication_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/new_text_Field.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../custom_validation_error.dart'; +import 'medication/update_medication_widget.dart'; class UpdateChiefComplaints extends StatelessWidget { const UpdateChiefComplaints({ diff --git a/lib/widgets/patients/profile/soap_update/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart similarity index 97% rename from lib/widgets/patients/profile/soap_update/subjective/update_subjective_page.dart rename to lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart index 37291faa..819acfb2 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/update_subjective_page.dart +++ b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart @@ -17,18 +17,16 @@ import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/subjective/history/update_history_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import '../SOAP_step_header.dart'; import '../expandable_SOAP_widget.dart'; -import '../steps_widget.dart'; +import 'allergies/update_allergies_widget.dart'; +import 'history/update_history_widget.dart'; +import 'update_Chief_complaints.dart'; class UpdateSubjectivePage extends StatefulWidget { final Function changePageViewIndex; diff --git a/lib/widgets/patients/profile/soap_update/update_plan_page.dart b/lib/screens/patients/profile/soap_update/update_plan_page.dart similarity index 100% rename from lib/widgets/patients/profile/soap_update/update_plan_page.dart rename to lib/screens/patients/profile/soap_update/update_plan_page.dart diff --git a/lib/widgets/patients/profile/soap_update/update_soap_index.dart b/lib/screens/patients/profile/soap_update/update_soap_index.dart similarity index 91% rename from lib/widgets/patients/profile/soap_update/update_soap_index.dart rename to lib/screens/patients/profile/soap_update/update_soap_index.dart index 5166f998..de62f754 100644 --- a/lib/widgets/patients/profile/soap_update/update_soap_index.dart +++ b/lib/screens/patients/profile/soap_update/update_soap_index.dart @@ -7,18 +7,17 @@ import 'package:doctor_app_flutter/models/SOAP/my_selected_examination.dart'; import 'package:doctor_app_flutter/models/SOAP/my_selected_history.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/steps_widget.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/subjective/update_subjective_page.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/assessment/update_assessment_page.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/update_plan_page.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/update_subjective_page.dart'; +import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; + import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../patient-profile-header-new-design.dart'; +import 'assessment/update_assessment_page.dart'; import 'objective/update_objective_page.dart'; +import 'update_plan_page.dart'; class UpdateSoapIndex extends StatefulWidget { final bool isUpdate; @@ -88,7 +87,6 @@ class _UpdateSoapIndexState extends State mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - // PatientPageHeaderWidget(patient), PatientProfileHeaderNewDesign(patient, '7', '7',), Container( width: double.infinity, diff --git a/lib/widgets/patients/dynamic_elements.dart b/lib/widgets/patients/dynamic_elements.dart index a6a492ca..4a13630b 100644 --- a/lib/widgets/patients/dynamic_elements.dart +++ b/lib/widgets/patients/dynamic_elements.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/custom_validation_error.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/custom_validation_error.dart'; import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart b/lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart index 07d5d7e4..56db325b 100644 --- a/lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart +++ b/lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart @@ -3,8 +3,8 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/custom_validation_error.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/soap_update/custom_validation_error.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/new_text_Field.dart';