From ab74a6196938c299cc0b112abea70dd912bbae68 Mon Sep 17 00:00:00 2001 From: tahaalam Date: Thu, 9 Oct 2025 09:46:49 +0300 Subject: [PATCH] lab severity values handled and size of lab description fixed --- .../lab_order_result_item.dart | 41 +++++++++++-------- .../lab/lab_results/lab_result_details.dart | 2 - 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/lib/presentation/lab/lab_result_via_hospital/lab_order_result_item.dart b/lib/presentation/lab/lab_result_via_hospital/lab_order_result_item.dart index 87fd790..edfc65b 100644 --- a/lib/presentation/lab/lab_result_via_hospital/lab_order_result_item.dart +++ b/lib/presentation/lab/lab_result_via_hospital/lab_order_result_item.dart @@ -63,14 +63,13 @@ class LabOrderResultItem extends StatelessWidget { ), letterSpacing: -2, ), - overflow: TextOverflow.ellipsis, // prevent overflow - maxLines: 1, - softWrap: false, ), ), SizedBox(width: 4.h,), - Expanded( - flex: 2, + Visibility( + visible: tests?.checkIfGraphShouldBeDisplayed() == true, + child: Expanded( + flex: 2, child: Visibility( visible: tests?.referanceRange != null, child: Text( @@ -86,25 +85,31 @@ class LabOrderResultItem extends StatelessWidget { softWrap: true, ), ), - ), + ), + ) ], ), + SizedBox(height: 12.h), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( - spacing: 6.h, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - severityText.tr().toText10(weight: FontWeight.w500, color: AppColors.greyTextColor), - Utils.buildSvgWithAssets( - icon: AppAssets.lab_result_indicator, - width: 21, - height: 23, - iconColor: iconColor - ), - ], + Visibility( + visible: tests?.checkIfGraphShouldBeDisplayed() == true, + child: Column( + spacing: 6.h, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + severityText.tr().toText10( + weight: FontWeight.w500, + color: AppColors.greyTextColor), + Utils.buildSvgWithAssets( + icon: AppAssets.lab_result_indicator, + width: 21, + height: 23, + iconColor: iconColor), + ], + ), ), CustomButton( icon: AppAssets.view_report_icon, diff --git a/lib/presentation/lab/lab_results/lab_result_details.dart b/lib/presentation/lab/lab_results/lab_result_details.dart index 30c1910..ad108cc 100644 --- a/lib/presentation/lab/lab_results/lab_result_details.dart +++ b/lib/presentation/lab/lab_results/lab_result_details.dart @@ -6,7 +6,6 @@ import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; -import 'package:hmg_patient_app_new/widgets/date_range_selector/viewmodel/date_range_view_model.dart'; import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart'; import 'package:hmg_patient_app_new/features/lab/models/resp_models/lab_result.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; @@ -339,7 +338,6 @@ class LabResultDetails extends StatelessWidget { borderRadius: 24.h, hasShadow: true, ), - height: 98.h, padding: EdgeInsets.all(16.h), child: Column( crossAxisAlignment: CrossAxisAlignment.start,