diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index a43a4582..b59824b0 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -84,6 +84,7 @@ class _OutPatientsScreenState extends State { @override Widget build(BuildContext context) { authenticationViewModel = Provider.of(context); + projectsProvider = Provider.of(context); _times = [ TranslationBase.of(context).previous, TranslationBase.of(context).today, diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index 0e077895..d4e18fc3 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -108,15 +108,13 @@ class PatientReferralItemWidget extends StatelessWidget { Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded( - child: AppText( - patientName, - fontSize: 16.0, - fontWeight: FontWeight.w600, - color: Color(0xff2E303A), - fontFamily: 'Poppins', - letterSpacing: -0.64, - ), + AppText( + patientName, + fontSize: 16.0, + fontWeight: FontWeight.w600, + color: Color(0xff2E303A), + fontFamily: 'Poppins', + letterSpacing: -0.64, ), SizedBox( width: 0, @@ -148,34 +146,23 @@ class PatientReferralItemWidget extends StatelessWidget { Expanded( child: Column( children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - CustomRow( - label: - TranslationBase.of(context).fileNumber, - value: patientID, - ), - ], + CustomRow( + label: + TranslationBase.of(context).fileNumber, + value: patientID, ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CustomRow( - label: isSameBranch + CustomRow( + label: isSameBranch + ? TranslationBase.of(context) + .referredFrom + : TranslationBase.of(context).refClinic, + value: !isReferralClinic + ? isSameBranch ? TranslationBase.of(context) - .referredFrom - : TranslationBase.of(context).refClinic, - value: !isReferralClinic - ? isSameBranch - ? TranslationBase.of(context) - .sameBranch - : TranslationBase.of(context) - .otherBranch - : " " + referralClinic, - ), - ], + .sameBranch + : TranslationBase.of(context) + .otherBranch + : " " + referralClinic, ), ], ), @@ -207,15 +194,9 @@ class PatientReferralItemWidget extends StatelessWidget { ) ], ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CustomRow( - label: TranslationBase.of(context).remarks + " : ", - value: remark ?? "", - ), - ], + CustomRow( + label: TranslationBase.of(context).remarks + " : ", + value: remark ?? "", ), Row( crossAxisAlignment: CrossAxisAlignment.start,