From 8e98976a654b1cef786d4235eff6b76826f22093 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Tue, 19 Aug 2025 12:12:49 +0300 Subject: [PATCH] lab result value updated --- .../viewModels/medical/labs_view_model.dart | 28 ++++++++++--------- .../medical/LabResult/newUI/LabItem.dart | 2 +- .../medical/LabResult/newUI/labWidgets.dart | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/core/viewModels/medical/labs_view_model.dart b/lib/core/viewModels/medical/labs_view_model.dart index 2fee0a41..993bca9d 100644 --- a/lib/core/viewModels/medical/labs_view_model.dart +++ b/lib/core/viewModels/medical/labs_view_model.dart @@ -123,27 +123,29 @@ class LabsViewModel extends BaseViewModel { double getPercentage(ResultFlag flag) { double percentage = 0.0; - final division = 0.2; + var division = (1/15); + switch (flag) { - case ResultFlag.N: //4 - percentage = division * 1.75; + case ResultFlag.N: + percentage = division * (7.5); break; - case ResultFlag.H: //5 - percentage = division * 2.8; + case ResultFlag.H: + percentage = division * (11); break; - case ResultFlag.L: //3 - percentage = division * .7; + case ResultFlag.L: + + percentage = division * (4); break; - case ResultFlag.CL: //2 - case ResultFlag.LCL: // - percentage = division * .07; + case ResultFlag.CL: + case ResultFlag.LCL: + percentage = division * 1.5; break; - case ResultFlag.HCH: //7 - case ResultFlag.CH: //6 - percentage = division * 3.4; + case ResultFlag.HCH: + case ResultFlag.CH: + percentage = division * 13.5; break; case ResultFlag.IRR: percentage = 0; diff --git a/lib/widgets/data_display/medical/LabResult/newUI/LabItem.dart b/lib/widgets/data_display/medical/LabResult/newUI/LabItem.dart index 3146b10e..55cd84e8 100644 --- a/lib/widgets/data_display/medical/LabResult/newUI/LabItem.dart +++ b/lib/widgets/data_display/medical/LabResult/newUI/LabItem.dart @@ -19,7 +19,7 @@ class LabItem extends StatefulWidget { } class _LabItemState extends State { - bool _isShowMoreGeneral = false; + bool _isShowMoreGeneral = true; bool showBottomSheet = false; @override diff --git a/lib/widgets/data_display/medical/LabResult/newUI/labWidgets.dart b/lib/widgets/data_display/medical/LabResult/newUI/labWidgets.dart index 2d3f67ed..911134c1 100644 --- a/lib/widgets/data_display/medical/LabResult/newUI/labWidgets.dart +++ b/lib/widgets/data_display/medical/LabResult/newUI/labWidgets.dart @@ -59,7 +59,7 @@ class CustomResultProgressBar extends StatelessWidget { return LayoutBuilder(builder: (context, constraints) { final double totalWidth = constraints.maxWidth; final double spacing = 2; - final double tooltipPosition = (totalWidth * (percentage / 100)).clamp(0, totalWidth - 50); + final double tooltipPosition = (totalWidth * (percentage )).clamp(0, totalWidth - 50); return Stack( children: [ Row(