From ed6af7f26ead1eadb5d54a6dce4d1dab3bf3425f Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 1 Mar 2022 16:25:57 +0300 Subject: [PATCH] change the file structure --- lib/routes.dart | 6 +- lib/screens/home/home_screen.dart | 2 +- .../ReplySummeryOnReferralPatient.dart | 115 ------------------ .../refer-patient-screen-in-patient.dart | 0 .../refer-patient-screen.dart | 0 .../referred-patient-screen.dart | 4 +- .../referred_patient_detail_in-paint.dart | 2 +- .../add_replay_on_referral_patient.dart | 0 .../my-referral-detail-screen.dart | 0 .../my-referral-inpatient-screen.dart | 8 +- .../patient_referral_screen.dart | 4 +- .../referral_patient_detail_in-paint.dart | 4 +- 12 files changed, 15 insertions(+), 130 deletions(-) delete mode 100644 lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart rename lib/screens/patients/profile/referral/{ => refer_details}/refer-patient-screen-in-patient.dart (100%) rename lib/screens/patients/profile/referral/{ => refer_details}/refer-patient-screen.dart (100%) rename lib/screens/patients/profile/referral/{ => refer_details}/referred-patient-screen.dart (98%) rename lib/screens/patients/profile/referral/{ => refer_details}/referred_patient_detail_in-paint.dart (99%) rename lib/screens/patients/profile/referral/{ => referral_details}/add_replay_on_referral_patient.dart (100%) rename lib/screens/patients/profile/referral/{ => referral_details}/my-referral-detail-screen.dart (100%) rename lib/screens/patients/profile/referral/{ => referral_details}/my-referral-inpatient-screen.dart (97%) rename lib/screens/patients/profile/referral/{ => referral_details}/patient_referral_screen.dart (97%) rename lib/screens/patients/profile/referral/{ => referral_details}/referral_patient_detail_in-paint.dart (99%) diff --git a/lib/routes.dart b/lib/routes.dart index 917b1c6c..b4d2c171 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -21,7 +21,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/pending_orders/pendi import 'package:doctor_app_flutter/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_home_page.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/refer-patient-screen-in-patient.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/update_soap_index.dart'; import 'package:doctor_app_flutter/screens/patients/profile/vte_assessment/vte_assessment_screen.dart'; import 'package:doctor_app_flutter/screens/prescription/new_prescriptions_page.dart'; @@ -36,8 +36,8 @@ import 'screens/patients/profile/admission-request/admission-request-first-scree import 'screens/patients/profile/admission-request/admission-request-third-screen.dart'; import 'screens/patients/profile/admission-request/admission-request_second-screen.dart'; import 'screens/patients/profile/profile_screen/patient_profile_screen.dart'; -import 'screens/patients/profile/referral/my-referral-detail-screen.dart'; -import 'screens/patients/profile/referral/refer-patient-screen.dart'; +import 'screens/patients/profile/referral/referral_details/my-referral-detail-screen.dart'; +import 'screens/patients/profile/referral/refer_details/refer-patient-screen.dart'; const String INIT_ROUTE = ROOT; const String ROOT = 'root'; diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 4f5b9762..826bb230 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -16,7 +16,7 @@ import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart' import 'package:doctor_app_flutter/screens/patients/In_patient/in_patient_screen.dart'; import 'package:doctor_app_flutter/screens/patients/out_patient/out_patient_screen.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_screen.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/referral_details/patient_referral_screen.dart'; import 'package:doctor_app_flutter/screens/patients/register_patient/RegisterPatientPage.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; diff --git a/lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart b/lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart deleted file mode 100644 index e63656e9..00000000 --- a/lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart +++ /dev/null @@ -1,115 +0,0 @@ -import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; -import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; -import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.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:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; -import 'package:flutter/material.dart'; - -class ReplySummeryOnReferralPatient extends StatefulWidget { - final MyReferralPatientModel referredPatient; - final String doctorReply; - - ReplySummeryOnReferralPatient(this.referredPatient, this.doctorReply); - - @override - _ReplySummeryOnReferralPatientState createState() => - _ReplySummeryOnReferralPatientState(this.referredPatient); -} - -class _ReplySummeryOnReferralPatientState - extends State { - final MyReferralPatientModel referredPatient; - - _ReplySummeryOnReferralPatientState(this.referredPatient); - - @override - Widget build(BuildContext context) { - return BaseView( - builder: (_, model, w) => AppScaffold( - baseViewModel: model, - isShowAppBar: true, - appBarTitle: TranslationBase.of(context).summeryReply, - body: Container( - child: Column( - children: [ - Expanded( - child: SingleChildScrollView( - child: Container( - width: double.infinity, - margin: EdgeInsets.symmetric( - horizontal: 16, vertical: 16), - padding: EdgeInsets.symmetric( - horizontal: 16, vertical: 16), - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.all(Radius.circular(8)), - border: Border.fromBorderSide(BorderSide( - color: Colors.white, - width: 1.0, - )), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).reply, - fontFamily: 'Poppins', - fontWeight: FontWeight.w700, - fontSize: 2.4 * SizeConfig.textMultiplier, - color: Color(0XFF2E303A), - ), - AppText( - widget.doctorReply ?? '', - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - fontSize: 1.8 * SizeConfig.textMultiplier, - color: Color(0XFF2E303A), - ), - SizedBox( - height: 8, - ), - ], - ), - ), - ), - ), - Container( - margin: - EdgeInsets.symmetric(horizontal: 16, vertical: 16), - child: Row( - children: [ - Expanded( - child: AppButton( - onPressed: () { - Navigator.of(context).pop(); - }, - title: TranslationBase.of(context).cancel, - fontColor: Colors.white, - color: Colors.red[600], - ), - ), - SizedBox( - width: 4, - ), - Expanded( - child: AppButton( - onPressed: () {}, - title: TranslationBase.of(context).noteConfirm, - fontColor: Colors.white, - color: AppGlobal.appGreenColor, - ), - ), - ], - ), - ), - ], - ), - ), - )); - } -} diff --git a/lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart similarity index 100% rename from lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart rename to lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart diff --git a/lib/screens/patients/profile/referral/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart similarity index 100% rename from lib/screens/patients/profile/referral/refer-patient-screen.dart rename to lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart diff --git a/lib/screens/patients/profile/referral/referred-patient-screen.dart b/lib/screens/patients/profile/referral/refer_details/referred-patient-screen.dart similarity index 98% rename from lib/screens/patients/profile/referral/referred-patient-screen.dart rename to lib/screens/patients/profile/referral/refer_details/referred-patient-screen.dart index 6edfad8a..c0bf43d6 100644 --- a/lib/screens/patients/profile/referral/referred-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer_details/referred-patient-screen.dart @@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/enum/PatientType.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/referred_patient_detail_in-paint.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; @@ -12,7 +12,7 @@ import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import '../../../../widgets/shared/errors/error_message.dart'; +import '../../../../../widgets/shared/errors/error_message.dart'; class ReferredPatientScreen extends StatefulWidget { @override diff --git a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart similarity index 99% rename from lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart rename to lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart index bf4b1c24..1d4f7223 100644 --- a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart @@ -15,7 +15,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:flutter/material.dart'; -import '../../../../routes.dart'; +import '../../../../../routes.dart'; class ReferredPatientDetailScreen extends StatelessWidget { final MyReferredPatientModel referredPatient; diff --git a/lib/screens/patients/profile/referral/add_replay_on_referral_patient.dart b/lib/screens/patients/profile/referral/referral_details/add_replay_on_referral_patient.dart similarity index 100% rename from lib/screens/patients/profile/referral/add_replay_on_referral_patient.dart rename to lib/screens/patients/profile/referral/referral_details/add_replay_on_referral_patient.dart diff --git a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/referral_details/my-referral-detail-screen.dart similarity index 100% rename from lib/screens/patients/profile/referral/my-referral-detail-screen.dart rename to lib/screens/patients/profile/referral/referral_details/my-referral-detail-screen.dart diff --git a/lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart b/lib/screens/patients/profile/referral/referral_details/my-referral-inpatient-screen.dart similarity index 97% rename from lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart rename to lib/screens/patients/profile/referral/referral_details/my-referral-inpatient-screen.dart index ea418ebe..0e22ab25 100644 --- a/lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart +++ b/lib/screens/patients/profile/referral/referral_details/my-referral-inpatient-screen.dart @@ -1,9 +1,9 @@ import 'package:doctor_app_flutter/core/enum/PatientType.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/my-referral-detail-screen.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/referral_patient_detail_in-paint.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/referred-patient-screen.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/referral_details/my-referral-detail-screen.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/referral_details/referral_patient_detail_in-paint.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/refer_details/referred-patient-screen.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; @@ -12,7 +12,7 @@ import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import '../../../../widgets/shared/errors/error_message.dart'; +import '../../../../../widgets/shared/errors/error_message.dart'; class MyReferralInPatientScreen extends StatefulWidget { @override diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/referral_details/patient_referral_screen.dart similarity index 97% rename from lib/screens/patients/profile/referral/patient_referral_screen.dart rename to lib/screens/patients/profile/referral/referral_details/patient_referral_screen.dart index c36c8251..2417cef8 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/referral_details/patient_referral_screen.dart @@ -1,14 +1,14 @@ import 'dart:ui'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/referred-patient-screen.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/refer_details/referred-patient-screen.dart'; import 'package:doctor_app_flutter/utils/tab_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../ReferralDischargedPatientPage.dart'; +import '../../../ReferralDischargedPatientPage.dart'; import 'my-referral-inpatient-screen.dart'; class PatientReferralScreen extends StatefulWidget { diff --git a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referral_details/referral_patient_detail_in-paint.dart similarity index 99% rename from lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart rename to lib/screens/patients/profile/referral/referral_details/referral_patient_detail_in-paint.dart index 814df03e..b901056e 100644 --- a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referral_details/referral_patient_detail_in-paint.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/referral/add_replay_on_referral_patient.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/referral_details/add_replay_on_referral_patient.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; @@ -17,7 +17,7 @@ import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dar import 'package:doctor_app_flutter/widgets/transitions/slide_up_page.dart'; import 'package:flutter/material.dart'; -import '../../../../routes.dart'; +import '../../../../../routes.dart'; class ReferralPatientDetailScreen extends StatelessWidget { final MyReferralPatientModel referredPatient;