diff --git a/lib/core/viewModel/patient-referral-viewmodel.dart b/lib/core/viewModel/patient-referral-viewmodel.dart index 85ecfbae..d4cc986f 100644 --- a/lib/core/viewModel/patient-referral-viewmodel.dart +++ b/lib/core/viewModel/patient-referral-viewmodel.dart @@ -250,8 +250,12 @@ class PatientReferralViewModel extends BaseViewModel { int priority, String referralDate, String remarks, - String ext}) async { - setState(ViewState.Busy); + String ext, + bool isLocalBusy = false}) async { + if(isLocalBusy) + setState(ViewState.BusyLocal); + else + setState(ViewState.Busy); await _referralService.referralPatient( patientID: patient.patientId, roomID: patient.roomId, 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/lab_result/all_lab_special_result_page.dart b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart index 24b4a9b8..ab05548b 100644 --- a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart +++ b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart @@ -4,8 +4,9 @@ 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/lab_result/special_lab_result_details_page.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'; + +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index ff64a406..05e86a7f 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -5,14 +5,12 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart'; import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart'; import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_page.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.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/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart b/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart index 721a0c2d..fca8fb35 100644 --- a/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart +++ b/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/core/viewModel/PatientMedicalReportViewModel.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/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index 2aa1b1fc..244fd37f 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart @@ -5,13 +5,12 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_details_page.dart'; import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart'; import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_page.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.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/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/slide_up_page.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 80% 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 42bfab5f..dfdb6f3d 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 @@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.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/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; @@ -31,8 +32,7 @@ class PatientMakeInPatientReferralScreen extends StatefulWidget { _PatientMakeInPatientReferralScreenState(); } -class _PatientMakeInPatientReferralScreenState - extends State { +class _PatientMakeInPatientReferralScreenState extends State{ PatiantInformtion patient; List referToList; dynamic _referTo; @@ -40,20 +40,23 @@ class _PatientMakeInPatientReferralScreenState dynamic _selectedClinic; dynamic _selectedDoctor; dynamic _selectedFrequency; + dynamic _selectedPriority; final _remarksController = TextEditingController(); final _extController = TextEditingController(); int _activePriority = 1; String appointmentDate; - String branchError; String hospitalError; String clinicError; String doctorError; String frequencyError; + String remarkError; stt.SpeechToText speech = stt.SpeechToText(); var recognizedWord; var event = RobotProvider(); + + @override void initState() { requestPermissions(); @@ -123,6 +126,26 @@ class _PatientMakeInPatientReferralScreenState @override Widget build(BuildContext context) { + + dynamic priority1 = { + "ParameterCode": 1, + "Description": TranslationBase.of(context).veryUrgent.toUpperCase(), + }; + dynamic priority2 = { + "ParameterCode": 2, + 'Description': TranslationBase.of(context).urgent.toUpperCase(), + }; + dynamic priority3 = { + "ParameterCode": 0, + 'Description': TranslationBase.of(context).routine.toUpperCase(), + }; + + List _priorityList = List(); + _priorityList.add(priority1); + _priorityList.add(priority2); + _priorityList.add(priority3); + + final routeArgs = ModalRoute.of(context).settings.arguments as Map; patient = routeArgs['patient']; bool isInpatient = routeArgs['isInpatient']; @@ -388,22 +411,40 @@ class _PatientMakeInPatientReferralScreenState SizedBox( height: 10, ), - Padding( - padding: const EdgeInsets.all(4.0), - child: AppText( - "${TranslationBase.of(context).priority}", - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier * 2.0, - fontWeight: FontWeight.w600, - ), - ), - SizedBox( - height: 4, - ), - Padding( - padding: const EdgeInsets.all(3.0), - child: priorityBar(context, screenSize), + AppTextFieldCustom( + height: screenSize.height * 0.075, + hintText: + TranslationBase.of(context).priority, + dropDownText: _selectedPriority != null + ? _selectedPriority['Description'] + : null, + enabled: false, + isTextFieldHasSuffix: true, + validationError: frequencyError, + onClick: () { + ListSelectDialog dialog = ListSelectDialog( + list: _priorityList, + attributeName: 'Description', + attributeValueId: 'Description', + usingSearch: false, + okText: TranslationBase.of(context).ok, + okFunction: (selectedValue) { + setState(() { + _selectedPriority = selectedValue; + _activePriority = selectedValue["ParameterCode"]; + }); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + }, ), + SizedBox( height: 10, ), @@ -466,6 +507,7 @@ class _PatientMakeInPatientReferralScreenState Stack( children: [ AppTextFieldCustom( + validationError: remarkError, hintText: "Remarks", controller: _remarksController, inputType: TextInputType.multiline, @@ -489,6 +531,9 @@ class _PatientMakeInPatientReferralScreenState ), ], ), + SizedBox( + height: 100, + ) ], ), ) @@ -511,126 +556,91 @@ class _PatientMakeInPatientReferralScreenState SizedBox( height: 10, ), - ], - ) + ), ], ), ), ), - bottomSheet: BottomSheetDialogButton( - label: "${TranslationBase.of(context).refer}", - onTap: () async { - setState(() { - if (_referTo == null) { - branchError = - TranslationBase.of(context).fieldRequired; - } else { - branchError = null; - } - if (_selectedBranch == null) { - hospitalError = - TranslationBase.of(context).fieldRequired; - } else { - hospitalError = null; - } - if (_selectedClinic == null) { - clinicError = - TranslationBase.of(context).fieldRequired; - } else { - clinicError = null; - } - if (_selectedDoctor == null) { - doctorError = - TranslationBase.of(context).fieldRequired; - } else { - doctorError = null; - } - if (_selectedFrequency == null) { - frequencyError = - TranslationBase.of(context).fieldRequired; - } else { - frequencyError = null; - } - }); - if (_selectedFrequency == null || - _selectedBranch == null || - _selectedClinic == null || - _selectedDoctor == null || - _remarksController.text == null || - _extController.text == null) return; - { - await model.makeInPatientReferral( - patient: patient, - projectID: _selectedBranch['facilityId'], - clinicID: _selectedClinic['ClinicID'], - doctorID: _selectedDoctor['DoctorID'], - frequencyCode: - _selectedFrequency['ParameterCode'], - ext: _extController.text, - remarks: _remarksController.text, - priority: _activePriority, - referralDate: appointmentDate); - if (model.state == ViewState.ErrorLocal) - DrAppToastMsg.showErrorToast(model.error); - else { - DrAppToastMsg.showSuccesToast( - TranslationBase.of(context) - .referralSuccessMsg); - Navigator.pop(context); + bottomSheet: + model.state != ViewState.Idle + ? Container( + height: 0, + ) + :BottomSheetDialogButton( + label: "${TranslationBase.of(context).refer}", + onTap: () async { + setState(() { + if (_referTo == null) { + branchError = + TranslationBase.of(context).fieldRequired; + } else { + branchError = null; + } + if (_selectedBranch == null) { + hospitalError = + TranslationBase.of(context).fieldRequired; + } else { + hospitalError = null; + } + if (_selectedClinic == null) { + clinicError = + TranslationBase.of(context).fieldRequired; + } else { + clinicError = null; + } + if (_selectedDoctor == null) { + doctorError = + TranslationBase.of(context).fieldRequired; + } else { + doctorError = null; + } + if (_selectedFrequency == null) { + frequencyError = + TranslationBase.of(context).fieldRequired; + } else { + frequencyError = null; + } + if (_selectedPriority == null) { + remarkError = + TranslationBase.of(context).fieldRequired; + } else { + remarkError = null; + } + }); + if (_selectedFrequency == null || + _selectedPriority == null || + _selectedBranch == null || + _selectedClinic == null || + _selectedDoctor == null || + _remarksController.text == null || + _extController.text == null) return; + { + GifLoaderDialogUtils.showMyDialog(context); + await model.makeInPatientReferral( + patient: patient, + projectID: _selectedBranch['facilityId'], + clinicID: _selectedClinic['ClinicID'], + doctorID: _selectedDoctor['DoctorID'], + frequencyCode: + _selectedFrequency['ParameterCode'], + ext: _extController.text, + remarks: _remarksController.text, + priority: _activePriority, + referralDate: appointmentDate, + isLocalBusy: true); + GifLoaderDialogUtils.hideDialog(context); + if (model.state == ViewState.ErrorLocal) + DrAppToastMsg.showErrorToast(model.error); + else { + DrAppToastMsg.showSuccesToast( + TranslationBase.of(context) + .referralSuccessMsg); + Navigator.pop(context); + } } - } - }, - ), - ), - ); - } - - Widget priorityBar(BuildContext _context, Size screenSize) { - List _priorities = [ - TranslationBase.of(context).veryUrgent.toUpperCase(), - TranslationBase.of(context).urgent.toUpperCase(), - TranslationBase.of(context).routine.toUpperCase(), - ]; - return Container( - height: screenSize.height * 0.070, - width: screenSize.width * 0.95, - decoration: - containerBorderDecoration(Color(0Xffffffff), Color(0xFFCCCCCC)), - child: Row( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: _priorities.map((item) { - bool _isActive = _priorities[_activePriority] == item ? true : false; - return Expanded( - child: InkWell( - child: Center( - child: Container( - height: screenSize.height * 0.070, - decoration: containerBorderDecoration( - _isActive ? Color(0XFFB8382B) : Colors.white, - _isActive ? Color(0XFFB8382B) : Colors.white), - child: Center( - child: Text( - item, - style: TextStyle( - fontSize: 12, - color: _isActive ? Colors.white : Colors.black, - //Colors.black, - fontWeight: FontWeight.bold, - ), - ), - )), - ), - onTap: () { - print(_priorities.indexOf(item)); - setState(() { - _activePriority = _priorities.indexOf(item); - }); - }, - ), - ); - }).toList(), + }, + ) ), ); } @@ -648,11 +658,11 @@ class _PatientMakeInPatientReferralScreenState date = date.add(new Duration(days: 1)); break; } - var format = DateFormat('yyyy/mm/dd HH:mm a'); - var time = format.format(date); - print(time); + var format = DateFormat('yyyy/MM/dd HH:mm a'); + var localAppointmentDate = format.format(date); + appointmentDate = localAppointmentDate; + String time = AppDateUtils.getDayMonthYearDateFormatted(date) + ' ' + AppDateUtils.getHour(date); - appointmentDate = time; return time; } 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 050cea87..e606c1bc 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; diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index 3a9e40f1..a07869db 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -1,4 +1,3 @@ -//import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; @@ -6,8 +5,8 @@ import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.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/procedures/update-procedure.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/utils/tab_utils.dart b/lib/utils/tab_utils.dart index 3f177a00..8593425a 100644 --- a/lib/utils/tab_utils.dart +++ b/lib/utils/tab_utils.dart @@ -1,7 +1,5 @@ - import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; - import '../config/config.dart'; import '../config/size_config.dart'; import '../core/viewModel/project_view_model.dart';