Merge pull request 'files and packages renamed' (#81) from feature/lab_result into master

Reviewed-on: #81

lib/core/common_models/data_points.dart

@@ -8,6 +8,7 @@ class DataPoint {
   String label;
   String referenceValue;
   String actualValue;
+  String? unitOfMeasurement ;
   DateTime time;
   String displayTime;
 
@@ -18,6 +19,7 @@ class DataPoint {
         required this.actualValue,
         required this.time,
         required this.displayTime,
+        this.unitOfMeasurement
       });
 
   @override

lib/features/lab/lab_view_model.dart

@@ -238,6 +238,7 @@ class LabViewModel extends ChangeNotifier {
                   value: transformedValue,
                   actualValue:element.resultValue!,
                   label: formatDateAsMMYY(dateTime),
+                  unitOfMeasurement: element.uOM,
                displayTime: resultDate(dateTime),
                time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
                   referenceValue: element.calculatedResultFlag ?? "",
@@ -367,6 +368,8 @@ class LabViewModel extends ChangeNotifier {
             value: transformedValue,
             actualValue: element.resultValue!,
             label: formatDateAsMMYY(time),
+            unitOfMeasurement: element.uOM,
+
             displayTime: resultDate(time),
             time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
             referenceValue: element.calculatedResultFlag ?? "",
@@ -394,6 +397,8 @@ class LabViewModel extends ChangeNotifier {
               filteredGraphValues.add(DataPoint(
                   value: transformedValue,
                   actualValue: element.resultValue!,
+                  unitOfMeasurement: element.uOM,
+
                   label: formatDateAsMMYY(dateTime),
                   displayTime: resultDate(dateTime),
                   time:
@@ -407,6 +412,8 @@ class LabViewModel extends ChangeNotifier {
                   value: transformedValue,
                   actualValue: element.resultValue!,
                   label: formatDateAsMMYY(dateTime),
+                  unitOfMeasurement: element.uOM,
+
                   displayTime: resultDate(dateTime),
                   time:
                       DateUtil.convertStringToDate(element.verifiedOnDateTime),

lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart

@@ -8,13 +8,13 @@ import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart';
-import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_hospital/LabResultList.dart';
+import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultList.dart';
-import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_hospital/lab_order_specialResult.dart';
+import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/lab_order_specialResult.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
 import 'package:provider/provider.dart';
 
-class LabResultByHospitals extends StatelessWidget {
+class LabResultByClinic extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return CollapsingListView(

lib/presentation/lab/lab_result_via_clinic/LabResultList.dart

@@ -3,7 +3,7 @@ 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/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/presentation/lab/lab_result_via_hospital/lab_order_result_item.dart';
+import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/lab_order_result_item.dart';
 import 'package:provider/provider.dart' show Selector, Provider, ReadContext;
 
 class LabResultList extends StatelessWidget {

lib/presentation/lab/lab_result_via_clinic/lab_order_result_item.dart

@@ -53,7 +53,7 @@ class LabOrderResultItem extends StatelessWidget {
                 children: [
                   Flexible(
                     child: Text(
-                      tests?.resultValue ?? "",
+                      "${tests?.resultValue} ${tests?.uOM}",
                       style: TextStyle(
                         fontSize: 24.fSize,
                         fontWeight: FontWeight.w600,

lib/presentation/lab/lab_results/lab_result_details.dart

@@ -91,7 +91,8 @@ class LabResultDetails extends StatelessWidget {
                   children: [
                     Flexible(
                       child: Text(
-                        recentLabResult.resultValue ?? "",
+                        "${recentLabResult.resultValue} ${recentLabResult.uOM}" ??
+                            "",
                         style: TextStyle(
                           fontSize: 24.fSize,
                           fontWeight: FontWeight.w600,
@@ -128,17 +129,42 @@ class LabResultDetails extends StatelessWidget {
                   ],
                 ),
               ),
-              SizedBox(
+              Visibility(
-                width: 21,
+                visible:
-                child: Utils.buildSvgWithAssets(
+                    recentLabResult.checkIfGraphShouldBeDisplayed() == true,
+                child: Column(
+                  spacing: 6.h,
+                  children: [
+                    context
+                        .read<LabViewModel>()
+                        .getSeverityText(
+                          recentLabResult.calculatedResultFlag ?? "",
+                        )
+                        .tr()
+                        .toText10(
+                            weight: FontWeight.w500,
+                            color: AppColors.greyTextColor),
+                    Utils.buildSvgWithAssets(
                         icon: AppAssets.lab_result_indicator,
                         width: 21,
                         height: 23,
                         iconColor: context.read<LabViewModel>().getColor(
                               recentLabResult.calculatedResultFlag ?? "",
+                            )),
+                  ],
                 ),
               ),
-              ),
+              // SizedBox(
+              //   width: 21,
+              //   child: Utils.buildSvgWithAssets(
+              //     icon: AppAssets.lab_result_indicator,
+              //     width: 21,
+              //     height: 23,
+              //     iconColor: context.read<LabViewModel>().getColor(
+              //           recentLabResult.calculatedResultFlag ?? "",
+              //     ),
+              //   ),
+              // ),
             ],
           )
 
@@ -257,7 +283,7 @@ class LabResultDetails extends StatelessWidget {
           maxY: (labmodel.maxY)+(getInterval(labmodel)??0)/2,
           maxX: labmodel.filteredGraphValues.length.toDouble()-.75,
           leftLabelFormatter: (value) {
-            return leftLabels(value.toStringAsFixed(2).tr());
+            return leftLabels(value.toStringAsFixed(2));
             // switch (value.toInt()) {
             //   case 10:
             //     return leftLabels("Critical Low".needTranslation);

lib/widgets/graph/custom_graph.dart

@@ -142,8 +142,7 @@ class CustomGraph extends StatelessWidget {
                         final dataPoint = dataPoints[spot.x.toInt()];
 
                         return LineTooltipItem(
-                          // '${dataPoint.label} ${spot.y.toStringAsFixed(2)}',
+                          '${dataPoint.actualValue} ${dataPoint.unitOfMeasurement??""} - ${dataPoint.displayTime}',
-                          '${dataPoint.value} - ${dataPoint.actualValue} - ${dataPoint.displayTime}',
                           TextStyle(
                               color: Colors.black,
                               fontSize: 12.fSize,