From 604ff24a93ef6626d9f58c349ce06e90e5390633 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Wed, 14 Apr 2021 15:14:21 +0300 Subject: [PATCH] referral design fixes --- .../referral/my-referral-detail-screen.dart | 122 +++--- .../referral/my-referral-patient-screen.dart | 31 +- .../referral/refer-patient-screen.dart | 102 +++-- .../referral/referred-patient-screen.dart | 6 +- .../patient-referral-item-widget.dart | 353 +++--------------- .../profile_medical_info_widget_search.dart | 19 +- 6 files changed, 220 insertions(+), 413 deletions(-) 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 d1800285..53135600 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -10,19 +10,14 @@ import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart'; -import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.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/borderedButton.dart'; import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; -import '../../../../routes.dart'; - class MyReferralDetailScreen extends StatelessWidget { PendingReferral pendingReferral; @@ -37,7 +32,7 @@ class MyReferralDetailScreen extends StatelessWidget { return BaseView( onModelReady: (model) => model.getPatientDetails( DateUtils.convertStringToDateFormat( - DateTime.now()/*.subtract(Duration(days: 350))*/.toString(), + DateTime.now() /*.subtract(Duration(days: 350))*/ .toString(), "yyyy-MM-dd"), DateUtils.convertStringToDateFormat( DateTime.now().toString(), "yyyy-MM-dd"), @@ -52,14 +47,13 @@ class MyReferralDetailScreen extends StatelessWidget { ? Column( children: [ Container( - padding: EdgeInsets.only( - left: 0, right: 5, bottom: 5, top: 5), + padding: + EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5), decoration: BoxDecoration( color: Colors.white, ), child: Container( - padding: EdgeInsets.only( - left: 10, right: 10, bottom: 10), + padding: EdgeInsets.only(left: 10, right: 10, bottom: 10), margin: EdgeInsets.only(top: 50), child: Column( children: [ @@ -73,22 +67,27 @@ class MyReferralDetailScreen extends StatelessWidget { ), Expanded( child: AppText( - (Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)), + (Helpers.capitalize(model + .patientArrivalList[0] + .patientDetails + .fullName)), fontSize: SizeConfig.textMultiplier * 2.5, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', ), ), - model.patientArrivalList[0].patientDetails.gender == 1 + model.patientArrivalList[0].patientDetails + .gender == + 1 ? Icon( - DoctorApp.male_2, - color: Colors.blue, - ) + DoctorApp.male_2, + color: Colors.blue, + ) : Icon( - DoctorApp.female_1, - color: Colors.pink, - ), + DoctorApp.female_1, + color: Colors.pink, + ), ]), ), ], @@ -101,18 +100,6 @@ class MyReferralDetailScreen extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - /*ProfileWelcomeWidget( - AppText( - authProvider.selectedClinicName != null - ? authProvider.selectedClinicName - : authProvider - .doctorProfile.clinicDescription, - fontSize: SizeConfig.textMultiplier * 1.7, - color: Colors.white, - textAlign: TextAlign.center, - ), - height: 100, - ),*/ SizedBox( height: 16, ), @@ -127,21 +114,31 @@ class MyReferralDetailScreen extends StatelessWidget { ), ), PatientReferralItemWidget( - "${pendingReferral.patientID}", - patientName: pendingReferral.patientName, referralStatus: pendingReferral.referralStatus, - isReferredTo: false, + patientName: pendingReferral.patientName, + patientGender: + pendingReferral.patientDetails.gender, + referredDate: + pendingReferral.referredOn.split(" ")[0], + referredTime: + pendingReferral.referredOn.split(" ")[1], + patientID: "${pendingReferral.patientID}", isSameBranch: pendingReferral.isReferralDoctorSameBranch, + isReferral: true, + remark: pendingReferral.remarksFromSource, + nationality: pendingReferral + .patientDetails.nationalityName, + nationalityFlag: + pendingReferral.nationalityFlagUrl, + doctorAvatar: pendingReferral.doctorImageUrl, referralDoctorName: pendingReferral.referredByDoctorInfo, clinicDescription: null, - remark: pendingReferral.remarksFromSource, - referredOn: pendingReferral.referredOn, - patientInfo: pendingReferral, ), Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), + padding: + const EdgeInsets.symmetric(horizontal: 16), child: SizedBox( child: ProfileMedicalInfoWidgetSearch( patient: model.patientArrivalList[0], @@ -174,7 +171,9 @@ class MyReferralDetailScreen extends StatelessWidget { if (model.state == ViewState.ErrorLocal) { DrAppToastMsg.showErrorToast(model.error); } else { - DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgAccept); + DrAppToastMsg.showSuccesToast( + TranslationBase.of(context) + .referralSuccessMsgAccept); Navigator.pop(context); Navigator.pop(context); } @@ -198,7 +197,9 @@ class MyReferralDetailScreen extends StatelessWidget { if (model.state == ViewState.ErrorLocal) { DrAppToastMsg.showErrorToast(model.error); } else { - DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgReject); + DrAppToastMsg.showSuccesToast( + TranslationBase.of(context) + .referralSuccessMsgReject); Navigator.pop(context); Navigator.pop(context); } @@ -211,26 +212,27 @@ class MyReferralDetailScreen extends StatelessWidget { ], ) : Column( - children: [ - Container( - padding: EdgeInsets.only(left: 12.0), - child: Row(children: [ - IconButton( - icon: Icon(Icons.arrow_back_ios), - color: Colors.black, //Colors.black, - onPressed: () => Navigator.pop(context), - ), - Expanded( - child: AppText("" , - fontSize: SizeConfig.textMultiplier * 2.5, - fontWeight: FontWeight.bold, - backGroundcolor: Colors.white, - fontFamily: 'Poppins', + children: [ + Container( + padding: EdgeInsets.only(left: 12.0), + child: Row(children: [ + IconButton( + icon: Icon(Icons.arrow_back_ios), + color: Colors.black, //Colors.black, + onPressed: () => Navigator.pop(context), ), - ), - ]), - ), - Container( + Expanded( + child: AppText( + "", + fontSize: SizeConfig.textMultiplier * 2.5, + fontWeight: FontWeight.bold, + backGroundcolor: Colors.white, + fontFamily: 'Poppins', + ), + ), + ]), + ), + Container( child: Center( child: AppText( TranslationBase.of(context).patientNoDetailErrMsg, @@ -240,8 +242,8 @@ class MyReferralDetailScreen extends StatelessWidget { ), ), ), - ], - ), + ], + ), ), ); } diff --git a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart index 986cf54f..bda285fe 100644 --- a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart @@ -51,23 +51,34 @@ class MyReferralPatientScreen extends StatelessWidget { }); }, child: PatientReferralItemWidget( - "${model.pendingReferral[index].patientID}", - patientInfo: model.pendingReferral[index], - patientName: - model.pendingReferral[index].patientName, referralStatus: model.pendingReferral[index].referralStatus, - isReferredTo: false, + patientName: + model.pendingReferral[index].patientName, + patientGender: model + .pendingReferral[index].patientDetails.gender, + referredDate: model + .pendingReferral[index].referredOn + .split(" ")[0], + referredTime: model + .pendingReferral[index].referredOn + .split(" ")[1], + patientID: + "${model.pendingReferral[index].patientID}", isSameBranch: model.pendingReferral[index] .isReferralDoctorSameBranch, + isReferral: true, + remark: + model.pendingReferral[index].remarksFromSource, + nationality: model.pendingReferral[index] + .patientDetails.nationalityName, + nationalityFlag: + model.pendingReferral[index].nationalityFlagUrl, + doctorAvatar: + model.pendingReferral[index].doctorImageUrl, referralDoctorName: model .pendingReferral[index].referredByDoctorInfo, clinicDescription: null, - remark: - model.pendingReferral[index].remarksFromSource, - referredOn: model.pendingReferral[index].referredOn, - answerFromTarget: - model.pendingReferral[index].answerFromTarget, infoIcon: InkWell( onTap: () { Navigator.of(context) diff --git a/lib/screens/patients/profile/referral/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer-patient-screen.dart index 815ec93d..52170c9b 100644 --- a/lib/screens/patients/profile/referral/refer-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer-patient-screen.dart @@ -113,35 +113,58 @@ class _PatientMakeReferralScreenState extends State { model.patientReferral.length == 0 ? referralForm(model, screenSize) : PatientReferralItemWidget( - "${model.patientReferral[model.patientReferral.length - 1].patientID}", + referralStatus: model + .patientReferral[ + model.patientReferral.length - 1] + .referralStatus, patientName: model .patientReferral[ model.patientReferral.length - 1] .patientName, - referralStatus: - "${model.patientReferral[model.patientReferral.length - 1].referralStatus}", - isReferredTo: true, - isSameBranch: model + patientGender: model .patientReferral[ model.patientReferral.length - 1] - .isReferralDoctorSameBranch, - referralDoctorName: model + .patientDetails + .gender, + referredDate: model .patientReferral[ model.patientReferral.length - 1] - .referredByDoctorInfo, - clinicDescription: null, + .referredOn + .split(" ")[0], + referredTime: model + .patientReferral[ + model.patientReferral.length - 1] + .referredOn + .split(" ")[1], + patientID: + "${model.patientReferral[model.patientReferral.length - 1].patientID}", + isSameBranch: model + .patientReferral[ + model.patientReferral.length - 1] + .isReferralDoctorSameBranch, + isReferral: true, remark: model .patientReferral[ model.patientReferral.length - 1] .remarksFromSource, - referredOn: model + nationality: model + .patientReferral[ + model.patientReferral.length - 1] + .patientDetails + .nationalityName, + nationalityFlag: model + .patientReferral[ + model.patientReferral.length - 1] + .nationalityFlagUrl, + doctorAvatar: model .patientReferral[ model.patientReferral.length - 1] - .referredOn, - answerFromTarget: model + .doctorImageUrl, + referralDoctorName: model .patientReferral[ model.patientReferral.length - 1] - .answerFromTarget, + .referredByDoctorInfo, + clinicDescription: null, ), ], ), @@ -154,24 +177,28 @@ class _PatientMakeReferralScreenState extends State { color: HexColor("#359846"), onPressed: () { setState(() { - if(_referTo == null){ - branchError = TranslationBase.of(context).fieldRequired; - }else { + if (_referTo == null) { + branchError = + TranslationBase.of(context).fieldRequired; + } else { branchError = null; } - if(_selectedBranch == null){ - hospitalError = TranslationBase.of(context).fieldRequired; - }else { + if (_selectedBranch == null) { + hospitalError = + TranslationBase.of(context).fieldRequired; + } else { hospitalError = null; } - if(_selectedClinic == null){ - clinicError = TranslationBase.of(context).fieldRequired; - }else { + if (_selectedClinic == null) { + clinicError = + TranslationBase.of(context).fieldRequired; + } else { clinicError = null; } - if(_selectedDoctor == null){ - doctorError = TranslationBase.of(context).fieldRequired; - }else { + if (_selectedDoctor == null) { + doctorError = + TranslationBase.of(context).fieldRequired; + } else { doctorError = null; } }); @@ -336,7 +363,8 @@ class _PatientMakeReferralScreenState extends State { GifLoaderDialogUtils.showMyDialog(context); await model .getClinicDoctors( - _selectedClinic['ClinicID'].toString(), _selectedBranch['facilityId']) + _selectedClinic['ClinicID'].toString(), + _selectedBranch['facilityId']) .then((_) => GifLoaderDialogUtils.hideDialog(context)); if (model.state == ViewState.ErrorLocal) { @@ -391,13 +419,16 @@ class _PatientMakeReferralScreenState extends State { }, ); } - : (){ - if(_selectedClinic == null){ - DrAppToastMsg.showErrorToast("You need to select a clinic first"); - } else if(model.doctorsList == null || model.doctorsList.length == 0){ - DrAppToastMsg.showErrorToast("There is no doctors for this clinic"); - } - }, + : () { + if (_selectedClinic == null) { + DrAppToastMsg.showErrorToast( + "You need to select a clinic first"); + } else if (model.doctorsList == null || + model.doctorsList.length == 0) { + DrAppToastMsg.showErrorToast( + "There is no doctors for this clinic"); + } + }, ), SizedBox( height: 10, @@ -414,7 +445,7 @@ class _PatientMakeReferralScreenState extends State { Icons.calendar_today, color: Colors.black, ), - onClick: (){ + onClick: () { _selectDate(context, model); }, ), @@ -422,8 +453,7 @@ class _PatientMakeReferralScreenState extends State { height: 10, ), AppTextFieldCustom( - hintText: - TranslationBase.of(context).dietTypeRemarks, + hintText: TranslationBase.of(context).dietTypeRemarks, controller: _remarksController, inputType: TextInputType.multiline, minLines: 4, diff --git a/lib/screens/patients/profile/referral/referred-patient-screen.dart b/lib/screens/patients/profile/referral/referred-patient-screen.dart index d6a81603..7f59b0f8 100644 --- a/lib/screens/patients/profile/referral/referred-patient-screen.dart +++ b/lib/screens/patients/profile/referral/referred-patient-screen.dart @@ -46,7 +46,8 @@ class ReferredPatientScreen extends StatelessWidget { ), ...List.generate( model.listMyReferredPatientModel.length, - (index) => PatientReferralItemWidget( + (index) => + Container() /*PatientReferralItemWidget( "${model.getReferredPatientItem(index).patientId}", patientName: "${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}", @@ -71,7 +72,8 @@ class ReferredPatientScreen extends StatelessWidget { null ? DateUtils.convertDateFromServerFormat(model.getReferredPatientItem(index).referralDate, "dd/MM/yyyy") : null, - ), + )*/ + , ), ], ), diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index ddc41c82..98d4f458 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -11,33 +11,38 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; class PatientReferralItemWidget extends StatelessWidget { + final String referralStatus; final String patientName; + final int patientGender; + final String referredDate; + final String referredTime; final String patientID; - final String referralStatus; - final isReferredTo; final isSameBranch; + final bool isReferral; + final String remark; + final String nationality; + final String nationalityFlag; + final String doctorAvatar; final String referralDoctorName; final String clinicDescription; - final String remark; - final String referredOn; - final String answerFromTarget; final Widget infoIcon; - final PendingReferral patientInfo; PatientReferralItemWidget( - this.patientID, { - this.patientName, - this.referralStatus, - this.isReferredTo = false, - this.isSameBranch, - this.referralDoctorName, - this.clinicDescription, - this.remark, - this.referredOn, - this.answerFromTarget, - this.infoIcon, - this.patientInfo, - }); + {this.referralStatus, + this.patientName, + this.patientGender, + this.referredDate, + this.referredTime, + this.patientID, + this.isSameBranch, + this.isReferral, + this.remark, + this.nationality, + this.nationalityFlag, + this.doctorAvatar, + this.referralDoctorName, + this.clinicDescription, + this.infoIcon}); @override Widget build(BuildContext context) { @@ -47,224 +52,6 @@ class PatientReferralItemWidget extends StatelessWidget { margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 8.0), child: Column( children: [ - // TODO should be removed by mousa - // Row( - // children: [ - // Expanded( - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // if (referralStatus != null) - // Row( - // children: [ - // AppText( - // TranslationBase.of(context).referralStatus, - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // Container( - // color: Color(0xFF4BA821), - // padding: EdgeInsets.all(4), - // child: AppText( - // referralStatus - // /*referralStatus == "46" - // ? TranslationBase.of(context).approved - // : TranslationBase.of(context).rejected*/ - // , - // color: Colors.white, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ), - // ], - // ), - // SizedBox( - // height: 8, - // ), - // Row( - // children: [ - // AppText( - // isReferredTo - // ? "${TranslationBase.of(context).referTo}: " - // : "${TranslationBase.of(context).referredFrom}: ", - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // AppText( - // isSameBranch - // ? TranslationBase.of(context).sameBranch - // : TranslationBase.of(context).otherBranch, - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ], - // ), - // SizedBox( - // height: 8, - // ), - // Row( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // "${TranslationBase.of(context).referralDoctor} : ", - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // Expanded( - // child: AppText( - // referralDoctorName != null - // ? "${TranslationBase.of(context).dr} $referralDoctorName" - // : "-", - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ), - // ], - // ), - // SizedBox( - // height: 8, - // ), - // if (clinicDescription != null) - // Row( - // children: [ - // AppText( - // "${TranslationBase.of(context).clinic}: ", - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // AppText( - // clinicDescription, - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ], - // ), - // SizedBox( - // height: 8, - // ), - // Row( - // children: [ - // AppText( - // "${TranslationBase.of(context).patientID}: ", - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // AppText( - // patientID ?? '-', - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ], - // ), - // SizedBox( - // height: 8, - // ), - // Row( - // children: [ - // AppText( - // "${TranslationBase.of(context).patientName}: ", - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // AppText( - // patientName ?? '-', - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ], - // ), - // SizedBox( - // height: 8, - // ), - // Row( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // TranslationBase.of(context).referralRemark, - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // Expanded( - // child: AppText( - // remark, - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ), - // ], - // ), - // SizedBox( - // height: 8, - // ), - // Row( - // children: [ - // AppText( - // TranslationBase.of(context).referredOn, - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // AppText( - // referredOn ?? '-', - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ], - // ), - // if (answerFromTarget != null) - // SizedBox( - // height: 8, - // ), - // if (answerFromTarget != null) - // Row( - // children: [ - // AppText( - // TranslationBase.of(context).referralResponse, - // color: Colors.grey, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // AppText( - // answerFromTarget != "" ? answerFromTarget : '-', - // color: Colors.black, - // fontWeight: FontWeight.bold, - // fontSize: 12, - // ), - // ], - // ), - // SizedBox( - // height: 16, - // ), - // ], - // ), - // ), - // if (infoIcon != null) infoIcon, - // ], - // ), - // const Divider( - // color: Color(0xffCCCCCC), - // height: 1, - // thickness: 1, - // indent: 0, - // endIndent: 0, - // ), - // SizedBox( - // height: 8, - // ), Container( child: CardWithBgWidget( bgColor: referralStatus != null @@ -296,7 +83,7 @@ class PatientReferralItemWidget extends StatelessWidget { : Colors.grey[500], ), AppText( - referredOn, + referredDate, fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 2.0 * SizeConfig.textMultiplier, @@ -309,7 +96,7 @@ class PatientReferralItemWidget extends StatelessWidget { children: [ Expanded( child: AppText( - patientInfo.patientName, + patientName, fontSize: SizeConfig.textMultiplier * 2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, @@ -320,7 +107,7 @@ class PatientReferralItemWidget extends StatelessWidget { SizedBox( width: 4, ), - /*patient.gender*/ 1 == 1 + patientGender == 1 ? Icon( DoctorApp.male_2, color: Colors.blue, @@ -333,7 +120,7 @@ class PatientReferralItemWidget extends StatelessWidget { width: 4, ), AppText( - referredOn, + referredTime, fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 1.8 * SizeConfig.textMultiplier, @@ -359,7 +146,7 @@ class PatientReferralItemWidget extends StatelessWidget { color: Color(0XFF575757), ), AppText( - patientInfo.patientID.toString(), + patientID, fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: 1.8 * SizeConfig.textMultiplier, @@ -395,36 +182,25 @@ class PatientReferralItemWidget extends StatelessWidget { Row( children: [ AppText( - /*patient.nationalityName ?? - patient.nationality*/ - "Saudi", + nationality != null ? nationality : "", fontWeight: FontWeight.bold, color: Color(0xFF2E303A), fontSize: 1.4 * SizeConfig.textMultiplier, ), - /* patient.nationality != null + nationalityFlag != null ? ClipRRect( - borderRadius: - BorderRadius - .circular( - 20.0), - child: Image.network( - patient - .nationalityFlagURL, - height: 25, - width: 30, - errorBuilder: - (BuildContext - context, - Object - exception, - StackTrace - stackTrace) { - return Text( - 'No Image'); - }, - ))*/ - /*:*/ SizedBox() + borderRadius: BorderRadius.circular(20.0), + child: Image.network( + nationalityFlag, + height: 25, + width: 30, + errorBuilder: (BuildContext context, + Object exception, + StackTrace stackTrace) { + return Text('No Image'); + }, + )) + : SizedBox() ], ) ], @@ -442,7 +218,7 @@ class PatientReferralItemWidget extends StatelessWidget { ), Expanded( child: AppText( - patientInfo.remarksFromSource, + remark, fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: 1.8 * SizeConfig.textMultiplier, @@ -457,7 +233,9 @@ class PatientReferralItemWidget extends StatelessWidget { Container( margin: EdgeInsets.only(left: 10, right: 0), child: Image.asset( - infoIcon != null ? 'assets/images/patient/ic_ref_arrow_up.png' : 'assets/images/patient/ic_ref_arrow_left.png', + isReferral + ? 'assets/images/patient/ic_ref_arrow_up.png' + : 'assets/images/patient/ic_ref_arrow_left.png', height: 50, width: 30, ), @@ -469,9 +247,10 @@ class PatientReferralItemWidget extends StatelessWidget { child: Container( width: 40, height: 40, - child: Image.asset( - 'assets/images/female_avatar.png', - fit: BoxFit.cover, + child: CircleAvatar( + radius: 25.0, + backgroundImage: NetworkImage(doctorAvatar), + backgroundColor: Colors.transparent, ), ), ), @@ -482,29 +261,13 @@ class PatientReferralItemWidget extends StatelessWidget { left: 10, top: 25, right: 10, bottom: 0), child: Column( children: [ - RichText( - text: TextSpan( - style: TextStyle( - fontSize: - 2.0 * SizeConfig.textMultiplier, - color: Colors.black), - children: [ - TextSpan( - text: TranslationBase.of(context) - .referralDoctor + - " : ", - style: TextStyle( - fontSize: 14, - fontFamily: 'Poppins')), - TextSpan( - text: referralDoctorName, - style: TextStyle( - fontWeight: FontWeight.w700, - fontFamily: 'Poppins', - fontSize: 15)), - ], - ), - ) + AppText( + referralDoctorName, + fontFamily: 'Poppins', + fontWeight: FontWeight.w700, + fontSize: 1.7 * SizeConfig.textMultiplier, + color: Color(0XFF2E303A), + ), ], ), ), 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 3b5896f8..95a8c567 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -100,6 +100,15 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { nameLine1: TranslationBase.of(context).orders, nameLine2: TranslationBase.of(context).prescription, icon: 'patient/order_prescription.png'), + 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'), PatientProfileButton( key: key, patient: patient, @@ -125,16 +134,6 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { // nameLine1: TranslationBase.of(context).admission, // nameLine2: TranslationBase.of(context).request, // icon: 'heartbeat.png'), - if (patientType == "1") - PatientProfileButton( - key: key, - patient: patient, - patientType: patientType, - arrivalType: arrivalType, - route: PROGRESS_NOTE, - nameLine1: TranslationBase.of(context).progress, - nameLine2: TranslationBase.of(context).note, - icon: 'patient/Progress_notes.png'), ], ), );