From cdbd905a62e9633fa42f268407c0d47291ce84ba Mon Sep 17 00:00:00 2001 From: mosazaid Date: Wed, 1 Sep 2021 12:50:15 +0300 Subject: [PATCH] ui fix design --- .../lab_result/LabResultHistoryPage.dart | 11 ++++++- .../patients/patient_card/PatientCard.dart | 29 ++++--------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart b/lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart index 590c3e9a..118bc476 100644 --- a/lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart +++ b/lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart @@ -15,7 +15,7 @@ class LabResultHistoryPage extends StatelessWidget { final PatiantInformtion patient; LabResultHistoryPage({this.patientLabOrder, this.filterName, this.patient}); -// TODO mosa changes +// TODO mosa UI changes @override Widget build(BuildContext context) { return BaseView( @@ -34,6 +34,7 @@ class LabResultHistoryPage extends StatelessWidget { ...List.generate(model.labOrdersResultHistoryList.length, (index) { return Container( + margin: EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0), child: Column( children: [ Row( @@ -116,6 +117,14 @@ class LabResultHistoryPage extends StatelessWidget { ), ], ), + Divider( + color: Colors.grey, + height: 0.75, + thickness: 0.75, + ), + SizedBox( + height: 10, + ), ], ), ); diff --git a/lib/widgets/patients/patient_card/PatientCard.dart b/lib/widgets/patients/patient_card/PatientCard.dart index 745966f2..2bd0228a 100644 --- a/lib/widgets/patients/patient_card/PatientCard.dart +++ b/lib/widgets/patients/patient_card/PatientCard.dart @@ -382,32 +382,15 @@ class PatientCard extends StatelessWidget { "${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patientInfo.admissionDate)).inDays + 1}", ), if (patientInfo.admissionDate != null) - Container( - child: RichText( - text: new TextSpan( - style: new TextStyle( - fontSize: - 2.0 * SizeConfig.textMultiplier, - color: Colors.black, - fontFamily: 'Poppins', - ), - children: [ - new TextSpan( - text: TranslationBase.of(context) - .roomNo + - " : ", - style: TextStyle(fontSize: 12)), - new TextSpan( - text: - "${patientInfo.roomId}", - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 13)), - ]))), + CustomRow( + label: TranslationBase.of(context).roomNo + " : ", + value: + "${patientInfo.roomId}", + ), + if (isFromLiveCare) Column( children: [ - CustomRow(label: TranslationBase.of(context) .clinic + " : ",