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 99% 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 index 53ecff07..90dc98e5 100644 --- 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 @@ -147,7 +147,7 @@ class _PatientMakeInPatientReferralScreenState extends State