diff --git a/lib/routes.dart b/lib/routes.dart index 712db98c..47fccec3 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -1,6 +1,7 @@ import 'package:doctor_app_flutter/root_page.dart'; import 'package:doctor_app_flutter/screens/live_care/end_call_screen.dart'; import 'package:doctor_app_flutter/screens/medical-file/health_summary_page.dart'; +import 'package:doctor_app_flutter/screens/patient-sick-leave/patient_sick_leave_screen.dart'; import 'package:doctor_app_flutter/screens/patients/ECGPage.dart'; import 'package:doctor_app_flutter/screens/patients/insurance_approval_screen_patient.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/all_lab_special_result_page.dart'; @@ -15,8 +16,6 @@ import 'package:doctor_app_flutter/screens/patients/profile/referral/refer-patie import 'package:doctor_app_flutter/screens/patients/profile/soap_update/update_soap_index.dart'; import 'package:doctor_app_flutter/screens/prescription/prescriptions_page.dart'; import 'package:doctor_app_flutter/screens/procedures/procedure_screen.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/auth/verification_methods_screen.dart'; import './screens/auth/login_screen.dart'; @@ -65,7 +64,6 @@ const String IN_PATIENT_PRESCRIPTIONS_DETAILS = 'patients/prescription-details'; const String ORDER_PRESCRIPTION_NEW = 'prescription/prescription_new'; const String ORDER_PROCEDURE = 'procedure/procedure'; const String ADD_SICKLEAVE = 'add-sickleave'; -const String SHOW_SICKLEAVE = 'show-sickleave'; const String RADIOLOGY_PATIENT = 'radiology-patient'; const String ALL_SPECIAL_LAB_RESULT = 'all-special_lab'; @@ -103,8 +101,7 @@ var routes = { isUpdate: true, ), IN_PATIENT_PRESCRIPTIONS_DETAILS: (_) => InpatientPrescriptionDetailsScreen(), - ADD_SICKLEAVE: (_) => AddSickLeavScreen(), - SHOW_SICKLEAVE: (_) => ShowSickLeaveScreen(), + ADD_SICKLEAVE: (_) => PatientSickLeaveScreen(), ORDER_PRESCRIPTION_NEW: (_) => PrescriptionsPage(), ORDER_PROCEDURE: (_) => ProcedureScreen(), MY_REFERRAL_DETAIL: (_) => MyReferralDetailScreen(), diff --git a/lib/screens/sick-leave/sick_leave.dart b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart similarity index 98% rename from lib/screens/sick-leave/sick_leave.dart rename to lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart index b7c3ba55..c32eed2c 100644 --- a/lib/screens/sick-leave/sick_leave.dart +++ b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart @@ -27,14 +27,14 @@ import 'package:intl/intl.dart'; Helpers helpers = Helpers(); -class SickLeaveScreen extends StatefulWidget { +class AddPatientSickLeaveScreen extends StatefulWidget { final bool isExtended; final GetAllSickLeaveResponse extendedData; final appointmentNo; final patientMRN; final patient; - SickLeaveScreen( + AddPatientSickLeaveScreen( {this.appointmentNo, this.patientMRN, this.isExtended = false, @@ -42,10 +42,10 @@ class SickLeaveScreen extends StatefulWidget { this.patient}); @override - _SickLeaveScreenState createState() => _SickLeaveScreenState(); + _AddPatientSickLeaveScreenState createState() => _AddPatientSickLeaveScreenState(); } -class _SickLeaveScreenState extends State { +class _AddPatientSickLeaveScreenState extends State { DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); TextEditingController _toDateController = new TextEditingController(); TextEditingController _numberOfDayController = new TextEditingController(); diff --git a/lib/screens/sick-leave/add-sickleave.dart b/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart similarity index 96% rename from lib/screens/sick-leave/add-sickleave.dart rename to lib/screens/patient-sick-leave/patient_sick_leave_screen.dart index c90ed6d7..55114803 100644 --- a/lib/screens/sick-leave/add-sickleave.dart +++ b/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart @@ -3,14 +3,12 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/sick_leave/sick_leave_patient_model.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; - import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; -import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/sick-leave/sick_leave.dart'; +import 'package:doctor_app_flutter/screens/patient-sick-leave/add_patient_sick_leave_screen.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; @@ -20,15 +18,12 @@ 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/errors/error_message.dart'; -import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart'; -import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/slide_up_page.dart'; import 'package:flutter/material.dart'; -import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; -class AddSickLeavScreen extends StatelessWidget { +class PatientSickLeaveScreen extends StatelessWidget { PatiantInformtion patient; @override @@ -299,13 +294,13 @@ class AddSickLeavScreen extends StatelessWidget { context, SlideUpPageRoute( fullscreenDialog: true, - widget: SickLeaveScreen( - appointmentNo: isExtend == true + widget: AddPatientSickLeaveScreen( + appointmentNo: isExtend ? extendedData.appointmentNo : patient.appointmentNo, //extendedData.appointmentNo, patientMRN: - isExtend == true ? extendedData.patientMRN : patient.patientMRN, + isExtend ? extendedData.patientMRN : patient.patientMRN, isExtended: isExtend, extendedData: extendedData, patient: patient), diff --git a/lib/screens/sick-leave/show-sickleave.dart b/lib/screens/sick-leave/show-sickleave.dart deleted file mode 100644 index 726524d8..00000000 --- a/lib/screens/sick-leave/show-sickleave.dart +++ /dev/null @@ -1,198 +0,0 @@ -import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; -import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; -import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; -import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/util/date-utils.dart'; -import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; -import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/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/rounded_container_widget.dart'; -import 'package:flutter/material.dart'; - -class ShowSickLeaveScreen extends StatelessWidget { - PatiantInformtion patient; - - @override - Widget build(BuildContext context) { - final routeArgs = ModalRoute.of(context).settings.arguments as Map; - patient = routeArgs['patient']; - return BaseView( - onModelReady: (model) => - model.getSickLeave(patient.patientMRN ?? patient.patientId), - builder: (_, model, w) => AppScaffold( - baseViewModel: model, - isShowAppBar: true, - backgroundColor: Colors.grey[100], - appBar: PatientProfileAppBar( - patient, - ), - body: SingleChildScrollView( - child: Column( - children: [ - // PatientProfileHeaderNewDesign( - // patient, routeArgs['patientType'], routeArgs['arrivalType']), - model.getAllSIckLeave.length > 0 - ? Column( - children: model.getAllSIckLeave - .map((GetAllSickLeaveResponse item) { - return RoundedContainer( - margin: EdgeInsets.all(10), - child: Column( - children: [ - Container( - decoration: BoxDecoration( - border: Border( - left: BorderSide( - color: item.status == 1 - ? Colors.yellow[800] - : item.status == 2 - ? Colors.green - : Colors.black, - width: 5.0, - ))), - padding: EdgeInsets.all(10), - child: Row( - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - Expanded( - flex: 4, - child: Wrap( - // mainAxisAlignment: - // MainAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Container( - padding: EdgeInsets.all(3), - child: AppText( - item.status == 1 - ? TranslationBase.of( - context) - .hold - : item.status == 2 - ? TranslationBase - .of( - context) - .active - : TranslationBase - .of(context) - .all, - fontWeight: - FontWeight.bold, - color: item.status == 1 - ? Colors.yellow[800] - : item.status == 2 - ? Colors.green - : Colors.black, - ), - ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .daysSickleave), - AppText( - item.noOfDays - .toString(), - fontWeight: - FontWeight.bold, - ), - ], - ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .startDate + - ' ', - ), - Flexible( - child: AppText( - AppDateUtils - .convertStringToDateFormat( - item.startDate, - 'dd-MMM-yyyy'), - fontWeight: - FontWeight.bold, - )) - ], - ), - Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - AppText( - item.remarks ?? "", - ), - (item.status == 1) - ? IconButton( - icon: Image.asset( - 'assets/images/edit.png'), - - // color: Colors.green, //Colors.black, - onPressed: () => - { - if (item.status == - 1) - { - DrAppToastMsg.showErrorToast( - TranslationBase.of(context) - .sickleaveonhold) - } - // else - // { - // openSickLeave( - // context, - // true, - // extendedData: - // item) - // } - }, - ) - : SizedBox() - ]), - ], - ), - SizedBox( - width: 20, - ), - ], - ), - ), - ], - )), - ], - )); - }).toList(), - ) - : Center( - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - height: 100, - ), - Image.asset('assets/images/no-data.png'), - Padding( - padding: const EdgeInsets.all(8.0), - child: AppText( - TranslationBase.of(context).noSickLeave), - ) - ], - ), - ) - ], - ), - ), - ), - ); - } -}