diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 434921a6..46af5dea 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -551,7 +551,7 @@ const Map> localizedValues = { "sendSuc": {"en": "A copy has been sent to the email", "ar": "تم إرسال نسخة إلى البريد الإلكتروني"}, "SpecialResult": {"en": "Special Result", "ar": "نتيجة خاصة"}, "noDataAvailable": {"en": "No data available", "ar": " لا يوجد بيانات متاحة "}, - "show-more-btn": {"en": "Flow Chart", "ar": "النتائج التراكمية"}, + "show-more-btn": {"en": "Flowchart", "ar": "النتائج التراكمية"}, "open-rad": {"en": "Open Radiology Image", "ar": "فتح صور الاشعة"}, "fileNumber": {"en": "File Number: ", "ar": "رقم الملف : "}, "searchPatient-name": {"en": "Search Name, Medical File, Phone Number", "ar": "اسم البحث ، الملف الطبي ، رقم الهاتف"}, diff --git a/lib/screens/patients/profile/lab_result/LabResultWidget.dart b/lib/screens/patients/profile/lab_result/LabResultWidget.dart index 153dfc6e..5b8a3ea9 100644 --- a/lib/screens/patients/profile/lab_result/LabResultWidget.dart +++ b/lib/screens/patients/profile/lab_result/LabResultWidget.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; @@ -44,7 +45,11 @@ class LabResultWidget extends StatelessWidget { children: [ Row( children: [ - AppText(filterName), + AppText( + filterName, + fontSize: SizeConfig.textMultiplier * 2.0, + fontWeight: FontWeight.w700, + ), ], ), // InkWell( @@ -69,6 +74,9 @@ class LabResultWidget extends StatelessWidget { // ), ], ), + SizedBox( + height: 8, + ), Row( children: [ Expanded( @@ -77,7 +85,8 @@ class LabResultWidget extends StatelessWidget { child: AppText( TranslationBase.of(context).description, color: Colors.black, - bold: true, + fontSize: SizeConfig.textMultiplier * 2.0, + fontWeight: FontWeight.w700, ), ), ), @@ -88,7 +97,8 @@ class LabResultWidget extends StatelessWidget { child: AppText( TranslationBase.of(context).value, color: Colors.black, - bold: true, + fontSize: SizeConfig.textMultiplier * 2.0, + fontWeight: FontWeight.w700, ), ), ), @@ -98,16 +108,19 @@ class LabResultWidget extends StatelessWidget { child: Center( child: AppText( TranslationBase.of(context).range, - color: Colors.black, - bold: true, + fontSize: SizeConfig.textMultiplier * 2.0, + fontWeight: FontWeight.w700, ), ), ), + ), + Expanded( + child: Container(), ) ], ), SizedBox( - height: 7, + height: 4, ), Divider( color: Colors.black, @@ -117,107 +130,132 @@ class LabResultWidget extends StatelessWidget { height: 12, ), ...List.generate( - patientLabResultList.length, - (index) => Column( - crossAxisAlignment: CrossAxisAlignment.start, + patientLabResultList.length, + (index) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + color: Color(0XFFF2F2F2), + borderRadius: BorderRadius.all( + Radius.circular(8.0), + ), + ), + child: Row( children: [ - Row( - children: [ - Expanded( - child: Container( - padding: EdgeInsets.all(10), - color: Colors.white, - child: Center( - child: AppText( - '${patientLabResultList[index].testCode}\n' + - patientLabResultList[index].description, - textAlign: TextAlign.center, - isCopyable: true, - ), - ), + Expanded( + child: Container( + padding: EdgeInsets.all(10), + child: Center( + child: AppText( + /*'${patientLabResultList[index].testCode}\n' +*/ + patientLabResultList[index].description, + textAlign: TextAlign.center, + fontSize: SizeConfig.textMultiplier * 1.8, + isCopyable: true, ), ), - Expanded( - child: Container( - padding: EdgeInsets.all(10), - color: Colors.white, - child: Center( - child: AppText( - patientLabResultList[index].resultValue ?? - "" + - " " + - "${patientLabResultList[index].uOM ?? ""}", - textAlign: TextAlign.center, - isCopyable: true, + ), + ), + Expanded( + child: Row( + children: [ + Container( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.red.shade700, + // borderRadius: BorderRadius.all( + // Radius.circular(25.0), + // ), + ), + child: Icon( + Icons.arrow_circle_up_sharp, + ), + ), + Expanded( + child: Container( + padding: EdgeInsets.all(10), + child: Center( + child: AppText( + patientLabResultList[index].resultValue ?? + "" + + " " + + "${patientLabResultList[index].uOM ?? ""}", + textAlign: TextAlign.center, + isCopyable: true, + fontSize: SizeConfig.textMultiplier * 1.8, + ), ), ), ), + ], + ), + ), + Expanded( + child: Container( + padding: EdgeInsets.all(10), + // color: Colors.white, + child: Center( + child: AppText( + patientLabResultList[index].referanceRange, + textAlign: TextAlign.center, + fontSize: SizeConfig.textMultiplier * 1.8, + isCopyable: true, + ), ), - Expanded( - child: Column( - children: [ - Container( - padding: EdgeInsets.all(10), - color: Colors.white, - child: Center( - child: AppText( - patientLabResultList[index].referanceRange, - textAlign: TextAlign.center, - isCopyable: true, - ), + ), + ), + Expanded( + child: Container( + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: FlowChartPage( + filterName: + patientLabResultList[index].description, + patientLabOrder: patientLabOrder, + patient: patient, + isInpatient: isInpatient, ), + // page: LabResultHistoryPage( + // filterName: patientLabResultList[index].description, + // patientLabOrder: patientLabOrder, + // patient: patient, + // ), ), - SizedBox( - height: 12, + ); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + AppText( + TranslationBase.of(context).showMoreBtn, + textDecoration: TextDecoration.underline, + color: Colors.red.shade700, + fontSize: SizeConfig.textMultiplier * 1.8, + fontWeight: FontWeight.w700, ), - InkWell( - onTap: () { - Navigator.push( - context, - FadePage( - page: FlowChartPage( - filterName: - patientLabResultList[index].description, - patientLabOrder: patientLabOrder, - patient: patient, - isInpatient: isInpatient, - ), - // page: LabResultHistoryPage( - // filterName: patientLabResultList[index].description, - // patientLabOrder: patientLabOrder, - // patient: patient, - // ), - ), - ); - }, - // child: AppText( - // " (show details)", - // color: Colors.blue, - // fontSize: 12, - // ), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - AppText( - TranslationBase.of(context).showMoreBtn, - textDecoration: TextDecoration.underline, - color: Colors.blue, - fontSize: 12, - ), - ], - ), - ) ], ), ), - ], + ), ), - // SizedBox( - // height: 12, - // ), - Divider(), ], - )) + ), + ), + SizedBox( + height: 4, + ), + ], + ), + ), + SizedBox( + height: 6, + ), + Divider(), // Table( // border: TableBorder.symmetric( // inside: BorderSide(width: 2.0, color: Colors.grey[300],style: BorderStyle.solid), diff --git a/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart b/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart index ff6752ff..97ab6cc5 100644 --- a/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; import 'package:doctor_app_flutter/core/viewModel/labs_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; @@ -84,17 +85,18 @@ class _LaboratoryResultWidgetState extends State { color: Colors.white, borderRadius: BorderRadius.all( Radius.circular(5.0), - )), + ),), child: Row( children: [ Expanded( child: Container( margin: EdgeInsets.only( - left: 10, right: 10), + left: 0, right: 0), child: AppText( TranslationBase.of(context) .generalResult, - bold: true, + fontSize: SizeConfig.textMultiplier * 2.3, + bold: false, ))), Container( width: 25, @@ -141,7 +143,7 @@ class _LaboratoryResultWidgetState extends State { patient: widget.patient, isInpatient: widget.isInpatient, ), - ) + ), ], ), ), @@ -149,7 +151,7 @@ class _LaboratoryResultWidgetState extends State { ], ), ) - else + else if (widget.details == null) Container( child: ErrorMessage( error: TranslationBase.of(context).noDataAvailable,