diff --git a/lib/config/config.dart b/lib/config/config.dart index 06768cbc..f402bea2 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -121,7 +121,7 @@ const GET_DASHBOARD = const GET_SICKLEAVE_STATISTIC = 'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics'; const ARRIVED_PATIENT_URL = - 'Services/DoctorApplication.svc/REST/PatientArrivalList​'; + 'Services/DoctorApplication.svc/REST/PatientArrivalList'; const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave'; const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; @@ -143,9 +143,6 @@ const GET_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/GetOrderedProcedure'; const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure'; -const GET_PATIENT_ARRIVAL_LIST = - 'Services/DoctorApplication.svc/REST/PatientArrivalList'; - ///Lab Order const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders'; const GET_Patient_LAB_SPECIAL_RESULT = diff --git a/lib/core/service/base/base_service.dart b/lib/core/service/base/base_service.dart index 6f4c5d1e..c97fdea9 100644 --- a/lib/core/service/base/base_service.dart +++ b/lib/core/service/base/base_service.dart @@ -38,15 +38,15 @@ class BaseService { body['To'] = date; body['PageIndex'] = 0; body['PageSize'] = 0; - if(patientMrn == -1){ + if(patientMrn != -1){ body['PatientMRN'] = patientMrn; } - if(appointmentNo == -1){ + if(appointmentNo != -1){ body['AppointmentNo'] = appointmentNo; } await baseAppClient.post( - GET_PATIENT_ARRIVAL_LIST, + ARRIVED_PATIENT_URL, onSuccess: (dynamic response, int statusCode) { patientArrivalList.clear(); diff --git a/lib/core/viewModel/patient-referral-viewmodel.dart b/lib/core/viewModel/patient-referral-viewmodel.dart index 00ef09f6..7458456c 100644 --- a/lib/core/viewModel/patient-referral-viewmodel.dart +++ b/lib/core/viewModel/patient-referral-viewmodel.dart @@ -158,8 +158,7 @@ class PatientReferralViewModel extends BaseViewModel { await _referralPatientService.getPatientArrivalList(toDate, fromDate: fromDate, - patientMrn: patientMrn, - appointmentNo: appointmentNo); + patientMrn: patientMrn); if (_referralPatientService.hasError) { error = _referralPatientService.error; setState(ViewState.Error); diff --git a/lib/screens/medical-file/medical_file_details.dart b/lib/screens/medical-file/medical_file_details.dart index 77fddfe5..b52fabed 100644 --- a/lib/screens/medical-file/medical_file_details.dart +++ b/lib/screens/medical-file/medical_file_details.dart @@ -61,10 +61,10 @@ class _MedicalFileDetailsState extends State { this.encounterNumber, this.pp, this.patient}); - bool isPhysicalExam = false; - bool isProcedureExpand = false; - bool isHistoryExpand = false; - bool isAssessmentExpand = false; + bool isPhysicalExam = true; + bool isProcedureExpand = true; + bool isHistoryExpand = true; + bool isAssessmentExpand = true; @override Widget build(BuildContext context) { diff --git a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart index d6d9e8b6..3c2197f3 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -70,12 +70,14 @@ class MyReferralDetailScreen extends StatelessWidget { color: Colors.black, //Colors.black, onPressed: () => Navigator.pop(context), ), - AppText( - (Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)), - fontSize: SizeConfig.textMultiplier * 3, - fontWeight: FontWeight.bold, - backGroundcolor: Colors.white, - fontFamily: 'Poppins', + Expanded( + child: AppText( + (Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)), + fontSize: SizeConfig.textMultiplier * 3, + fontWeight: FontWeight.bold, + backGroundcolor: Colors.white, + fontFamily: 'Poppins', + ), ), model.patientArrivalList[0].patientDetails.gender == 1 ? Icon( diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart index 3dd45782..ffe08225 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sig import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; +import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_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/transitions/fade_page.dart'; @@ -38,6 +39,11 @@ class VitalSignDetailsScreen extends StatelessWidget { builder: (_, mode, widget) => AppScaffold( isShowAppBar: false, baseViewModel: mode, + /* appBar: PatientProfileHeaderWhitAppointmentAppBar( + patient: patient, + patientType: patientType, + arrivalType: arrivalType, + ),*/ appBarTitle: TranslationBase.of(context).vitalSign, body: mode.patientVitalSignsHistory.length > 0 ? Column( diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 5dc04221..1330dae4 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -218,8 +218,8 @@ class _PrescriptionFormWidgetState extends State { FocusScope.of(context).requestFocus(new FocusNode()); }, child: DraggableScrollableSheet( - initialChildSize: 0.90, - maxChildSize: 0.90, + initialChildSize: 0.98, + maxChildSize: 0.98, minChildSize: 0.9, builder: (BuildContext context, ScrollController scrollController) { @@ -234,25 +234,30 @@ class _PrescriptionFormWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, //mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - Row( + Column( children: [ - AppText( - 'New Prescription Order', - fontWeight: FontWeight.w700, - fontSize: 20, + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], ), - SizedBox( - width: MediaQuery.of(context).size.width * 0.32, + Row( + children: [ + AppText( + 'New Prescription Order', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], ), - InkWell( - child: Icon( - Icons.close, - size: 23.0, - ), - onTap: () { - Navigator.pop(context); - }, - ) ], ), SizedBox( @@ -511,15 +516,15 @@ class _PrescriptionFormWidgetState extends State { } : null, child: TextField( - decoration: - textFieldSelectorDecoration( - 'UNIT', - units != null - ? units['description'] - : null, - true), - enabled: false, - ), + decoration: + textFieldSelectorDecoration( + 'UNIT', + units != null + ? units[ + 'description'] + : null, + true), + enabled: false), ), ), ], diff --git a/lib/screens/procedures/add-procedure-form.dart b/lib/screens/procedures/add-procedure-form.dart index 605bb61c..39aed026 100644 --- a/lib/screens/procedures/add-procedure-form.dart +++ b/lib/screens/procedures/add-procedure-form.dart @@ -156,10 +156,31 @@ class _AddSelectedProcedureState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - 'Please Select Category', - fontWeight: FontWeight.w900, - fontSize: 15.0, + Column( + children: [ + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + Row( + children: [ + AppText( + 'Please Select Category', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], + ), + ], ), SizedBox( height: 10.0, diff --git a/lib/screens/procedures/add_lab_orders.dart b/lib/screens/procedures/add_lab_orders.dart index d72ffa65..5c0cde24 100644 --- a/lib/screens/procedures/add_lab_orders.dart +++ b/lib/screens/procedures/add_lab_orders.dart @@ -157,10 +157,31 @@ class _AddSelectedLabOrderState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - 'New Lab Order', - fontWeight: FontWeight.w900, - fontSize: 18.0, + Column( + children: [ + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + Row( + children: [ + AppText( + 'New Radiology Order', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], + ), + ], ), SizedBox( height: 10.0, diff --git a/lib/screens/procedures/add_radiology_order.dart b/lib/screens/procedures/add_radiology_order.dart index d3ae723d..9fc76dc4 100644 --- a/lib/screens/procedures/add_radiology_order.dart +++ b/lib/screens/procedures/add_radiology_order.dart @@ -157,10 +157,31 @@ class _AddSelectedRadiologyOrderState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - 'New Radiology Order', - fontWeight: FontWeight.w900, - fontSize: 18.0, + Column( + children: [ + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + Row( + children: [ + AppText( + 'New Radiology Order', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], + ), + ], ), SizedBox( height: 10.0, diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index 0cfe9d53..d9c6a20a 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -279,19 +279,22 @@ class _UpdateProcedureWidgetState extends State { child: TextFields( fontSize: 15.0, controller: widget.remarksController, + hintText: widget.remarksController.text.isEmpty + ? 'No Remarks Added' + : '', maxLines: 3, minLines: 2, onChanged: (value) {}, ), ), SizedBox( - height: 50.0, + height: 70.0, ), Container( margin: EdgeInsets.all(SizeConfig.widthMultiplier * 2), - child: Wrap( - alignment: WrapAlignment.center, + child: Column( + //alignment: WrapAlignment.center, children: [ AppButton( color: Color(0xff359846), @@ -320,6 +323,16 @@ class _UpdateProcedureWidgetState extends State { // authorizationForm(context); }, ), + SizedBox( + height: 20.0, + ), + AppButton( + title: TranslationBase.of(context).cancel, + color: Color(0xFFB9382C), + onPressed: () { + Navigator.pop(context); + }, + ) ], ), ), diff --git a/lib/widgets/doctor/doctor_reply_widget.dart b/lib/widgets/doctor/doctor_reply_widget.dart index d0d8c3ca..d056f816 100644 --- a/lib/widgets/doctor/doctor_reply_widget.dart +++ b/lib/widgets/doctor/doctor_reply_widget.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; @@ -8,6 +9,8 @@ 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:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; class DoctorReplyWidget extends StatefulWidget { final ListGtMyPatientsQuestions reply; @@ -22,6 +25,8 @@ class DoctorReplyWidget extends StatefulWidget { class _DoctorReplyWidgetState extends State { @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return Container( child: CardWithBgWidget( bgColor: @@ -57,26 +62,44 @@ class _DoctorReplyWidgetState extends State { ], ), ), - AppText( - DateUtils.getDateTimeFromServerFormat( - widget.reply.createdOn) - .day - .toString() + - " " + - DateUtils.getMonth( - DateUtils.getDateTimeFromServerFormat( - widget.reply.createdOn) - .month) - .toString() - .substring(0, 3) + - ' ' + + Column( + children: [ + AppText( + DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .day + .toString() + + " " + + DateUtils.getMonth( + DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .month) + .toString() + .substring(0, 3) + + ' ' + + DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .year + .toString(), + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + ), + AppText( DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .hour + .toString() + + ":"+ + DateUtils.getDateTimeFromServerFormat( widget.reply.createdOn) - .year - .toString(), - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - ) + .minute + .toString(), + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + ) + + ], + ), ], ), Row( @@ -197,6 +220,8 @@ class _DoctorReplyWidgetState extends State { Container( width: MediaQuery.of(context).size.width * 0.5, child: RichText( + maxLines: 2, + overflow: TextOverflow.ellipsis, text: new TextSpan( style: new TextStyle( fontSize: 2.0 * SizeConfig.textMultiplier, @@ -207,11 +232,11 @@ class _DoctorReplyWidgetState extends State { style: TextStyle(fontSize: 14, fontFamily: 'Poppins', color: Color(0xFF575757),fontWeight: FontWeight.bold)), new TextSpan( - text: widget.reply.remarks, + text: widget.reply.remarks.trim(), style: TextStyle( fontFamily: 'Poppins', color: Color(0xFF575757), - fontSize: 15)), + fontSize: 12)), ], ), ), @@ -219,234 +244,15 @@ class _DoctorReplyWidgetState extends State { ],) ], ), - - SizedBox( - height: 20, - ), + Container( + alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight, + child: Icon(FontAwesomeIcons.arrowRight, + size: 20, color: Colors.black),) ], ), // onTap: onTap, )), ), ); - // Stack( - // children: [ - // Container( - // margin: EdgeInsets.symmetric(vertical: 10.0), - // width: double.infinity, - // decoration: BoxDecoration( - // color: HexColor('#FFFFFF'), - // borderRadius: BorderRadius.all( - // Radius.circular(20.0), - // ), - // ), - // child: Container( - // margin: EdgeInsets.all(5), - // child: Column( - // children: [ - // SizedBox(height: 18,), - // Container( - // margin: EdgeInsets.only(right: 15), - // child: Row( - // children: [ - // SizedBox(width: 5,), - // //LargeAvatar(icon: widget.reply.gender == 0 ? DoctorApp.male : DoctorApp.femaleicon ,), - // Container( - // decoration: BoxDecoration( - // gradient: LinearGradient( - // begin: Alignment(-1, -1), - // end: Alignment(1, 1), - // colors: [ - // Colors.grey[100], - // Colors.grey[200], - // ]), - // boxShadow: [ - // BoxShadow( - // color: Color.fromRGBO(0, 0, 0, 0.08), - // offset: Offset(0.0, 5.0), - // blurRadius: 16.0) - // ], - // borderRadius: BorderRadius.all(Radius.circular(50.0)), - // ), - // width: 80, - // height: 80, - // child: Icon(widget.reply.gender == 1 ? DoctorApp.male : DoctorApp.female_icon,size: 80,)), - // - // SizedBox(width: 15,), - // Expanded( - // child: Container( - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // widget.reply.patientName, - // fontSize: 1.5 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // SizedBox( - // height: 5, - // ), - // - // Row( - // children: [ - // AppText( - // TranslationBase.of(context).fileNo, - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // Container( - // margin: EdgeInsets.only(left: 5), - // child: AppText( - // '${widget.reply.patientID}', - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ), - // SizedBox( - // height: 5, - // ), - // Row( - // children: [ - // AppText( - // TranslationBase.of(context).mobileNo, - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // Container( - // margin: EdgeInsets.only(left: 5), - // child: AppText( - // widget.reply.mobileNumber, - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ), - // SizedBox( - // height: 5, - // ), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Container( - // width: 70, - // height: 20, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.all(Radius.circular(60.0)), - // color: Colors.green[600] - // ), - // child: Center( - // child: AppText( - // widget.reply.requestTime, - // fontSize: 1.5 * SizeConfig.textMultiplier, - // color: Colors.white, - // ), - // ), - // ), - // Container( - // - // child: AppText( - // '${Helpers.getDate(widget.reply.requestDate)}', - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // color: Colors.black, - // ), - // ), - // ], - // ), - // - // ], - // ), - // ), - // ) - // - // ], - // ), - // ), - // - // !widget.isShowMore ? SizedBox(height: 18,) : - // AnimatedContainer( - // duration: Duration(milliseconds: 200), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Divider(color: Colors.grey), - // SizedBox(height: 5,), - // Row( - // mainAxisAlignment: MainAxisAlignment.start, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // TranslationBase.of(context).remarks + " : ", - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ),Expanded( - // child: AppText( - // widget.reply.remarks, - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ), - // SizedBox(height: 10,), - // Row( - // mainAxisAlignment: MainAxisAlignment.start, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // TranslationBase.of(context).doctorResponse + " : ", - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ),Expanded( - // child: AppText( - // widget.reply.doctorResponse, - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ),SizedBox(height: 10,), - // Row( - // mainAxisAlignment: MainAxisAlignment.start, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // TranslationBase.of(context).infoStatus + " : ", - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ),Expanded( - // child: AppText( - // widget.reply.infoStatus, - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ) - // ], - // ), - // ), - // - // ], - // ), - // ), - // ), - // Positioned( - // right: 5, - // top: 20, - // child: InkWell( - // onTap: (){ - // setState(() { - // widget.isShowMore = !widget.isShowMore; - // }); - // }, - // child: Icon(widget.isShowMore? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down)), - // ) - // ], - // - // ); } } diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design.dart b/lib/widgets/patients/profile/patient-profile-header-new-design.dart index 848bda41..93069432 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design.dart @@ -42,10 +42,11 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { onPressed: () => Navigator.pop(context), ), AppText( + patient.firstName != null ? (Helpers.capitalize(patient.firstName) + " " + Helpers.capitalize( - patient.lastName)), + patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), fontSize: SizeConfig.textMultiplier * 3, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, diff --git a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart index f21b7c71..84ad978e 100644 --- a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart +++ b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart @@ -64,10 +64,11 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre onPressed: () => Navigator.pop(context), ), AppText( + patient.firstName != null ? (Helpers.capitalize(patient.firstName) + " " + Helpers.capitalize( - patient.lastName)), + patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), fontSize: SizeConfig.textMultiplier * 3, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart index c49c4576..b4c445ca 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -134,6 +134,16 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { nameLine1: TranslationBase.of(context).progress, nameLine2: TranslationBase.of(context).note, icon: 'patient/Progress_notes.png'), + if (int.parse(patientType) == 7 || int.parse(patientType) == 6) + PatientProfileButton( + key: key, + patient: patient, + patientType: patientType, + arrivalType: arrivalType, + route: ORDER_PROCEDURE, + nameLine1: TranslationBase.of(context).orders, + nameLine2: TranslationBase.of(context).procedures, + icon: 'patient/Order_Procedures.png'), ], ), ); diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 100e8c1d..43106db1 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -76,7 +76,7 @@ class _AppDrawerState extends State { fontWeight: FontWeight.bold, color: Color(0xFF2E303A), fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier * 2.5, + fontSize: 17, ), ), Padding( @@ -85,7 +85,7 @@ class _AppDrawerState extends State { authProvider.doctorProfile?.clinicDescription, fontWeight: FontWeight.w600, color: Color(0xFF2E303A), - fontSize: SizeConfig.textMultiplier * 2, + fontSize: 15, fontFamily: 'Poppins', )) ], diff --git a/lib/widgets/shared/drawer_item_widget.dart b/lib/widgets/shared/drawer_item_widget.dart index 84691f7f..fefea780 100644 --- a/lib/widgets/shared/drawer_item_widget.dart +++ b/lib/widgets/shared/drawer_item_widget.dart @@ -47,7 +47,7 @@ class _DrawerItemState extends State { marginLeft: 5, marginRight: 5, color:widget.color ??Color(0xFF2E303A), - fontSize: SizeConfig.textMultiplier * 2.0, + fontSize: 14, fontFamily: 'Poppins', fontWeight: FontWeight.bold, ),