Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into haroon_dev

Browse Source 
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
pull/83/head
haroon amjad 3 weeks ago
parent d693850ef4 080b2327ef
commit 0441d072fa
9 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
lib/core/common_models/data_points.dart
Unescape Escape View File

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

7
lib/features/lab/lab_view_model.dart
Unescape Escape View File

@ -264,6 +264,7 @@ class LabViewModel extends ChangeNotifier {
value: transformedValue, value: transformedValue,
actualValue:element.resultValue!, actualValue:element.resultValue!,
label: formatDateAsMMYY(dateTime), label: formatDateAsMMYY(dateTime),
unitOfMeasurement: element.uOM,
displayTime: resultDate(dateTime), displayTime: resultDate(dateTime),
time: DateUtil.convertStringToDate(element.verifiedOnDateTime), time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
referenceValue: element.calculatedResultFlag ?? "", referenceValue: element.calculatedResultFlag ?? "",
@ -393,6 +394,8 @@ class LabViewModel extends ChangeNotifier {
value: transformedValue, value: transformedValue,
actualValue: element.resultValue!, actualValue: element.resultValue!,
label: formatDateAsMMYY(time), label: formatDateAsMMYY(time),
unitOfMeasurement: element.uOM,
displayTime: resultDate(time), displayTime: resultDate(time),
time: DateUtil.convertStringToDate(element.verifiedOnDateTime), time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
referenceValue: element.calculatedResultFlag ?? "", referenceValue: element.calculatedResultFlag ?? "",
@ -420,6 +423,8 @@ class LabViewModel extends ChangeNotifier {
filteredGraphValues.add(DataPoint( filteredGraphValues.add(DataPoint(
value: transformedValue, value: transformedValue,
actualValue: element.resultValue!, actualValue: element.resultValue!,
unitOfMeasurement: element.uOM,
label: formatDateAsMMYY(dateTime), label: formatDateAsMMYY(dateTime),
displayTime: resultDate(dateTime), displayTime: resultDate(dateTime),
time: time:
@ -433,6 +438,8 @@ class LabViewModel extends ChangeNotifier {
value: transformedValue, value: transformedValue,
actualValue: element.resultValue!, actualValue: element.resultValue!,
label: formatDateAsMMYY(dateTime), label: formatDateAsMMYY(dateTime),
unitOfMeasurement: element.uOM,
displayTime: resultDate(dateTime), displayTime: resultDate(dateTime),
time: time:
DateUtil.convertStringToDate(element.verifiedOnDateTime), DateUtil.convertStringToDate(element.verifiedOnDateTime),

2
lib/presentation/lab/lab_orders_page.dart
View File

File diff suppressed because one or more lines are too long

9
lib/presentation/lab/lab_result_via_hospital/LabResultByHospital.dart → lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
Unescape Escape View File

@ -11,8 +11,8 @@ import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart';
import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart'; import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.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_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/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart'; import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart'; import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
@ -21,12 +21,11 @@ import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
import 'package:open_filex/open_filex.dart'; import 'package:open_filex/open_filex.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class LabResultByHospitals extends StatelessWidget { class LabResultByClinic extends StatelessWidget {
LabResultByHospitals({required this.labOrder, Key? key}); LabResultByClinic({required this.labOrder, Key? key});
late LabViewModel labViewModel; late LabViewModel labViewModel;
PatientLabOrdersResponseModel labOrder; PatientLabOrdersResponseModel labOrder;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
labViewModel = Provider.of<LabViewModel>(context, listen: false); labViewModel = Provider.of<LabViewModel>(context, listen: false);

2
lib/presentation/lab/lab_result_via_hospital/LabResultList.dart → lib/presentation/lab/lab_result_via_clinic/LabResultList.dart
Unescape Escape View File

@ -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/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/features/lab/lab_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/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; import 'package:provider/provider.dart' show Selector, Provider, ReadContext;
class LabResultList extends StatelessWidget { class LabResultList extends StatelessWidget {

2
lib/presentation/lab/lab_result_via_hospital/lab_order_result_item.dart → lib/presentation/lab/lab_result_via_clinic/lab_order_result_item.dart
Unescape Escape View File

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

0
lib/presentation/lab/lab_result_via_hospital/lab_order_specialResult.dart → lib/presentation/lab/lab_result_via_clinic/lab_order_specialResult.dart
Unescape Escape View File

48
lib/presentation/lab/lab_results/lab_result_details.dart
Unescape Escape View File

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

3
lib/widgets/graph/custom_graph.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save