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

Labels Milestones

New Pull Request

lab prescription details are added andgraph visibility added to the graph page for result that are IRR #73

Merged
Haroon6138 merged 1 commits from feature/lab_result into master 4 weeks ago
Conversation 0 Commits 1 Files Changed 6
6 changed files with 216 additions and 108 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,6 +22,8 @@ class LabViewModel extends ChangeNotifier {
bool isLabResultsLoading = false;
bool isLabResultByHospitalLoading = false;
bool isSpecialResultsLoading = false;
bool isGraphVisible = true;
bool shouldShowGraph = true;
LabRepo labRepo;
ErrorHandlerService errorHandlerService;
@ -225,6 +227,7 @@ class LabViewModel extends ChangeNotifier {
} catch (e) {}
});
LabResult recentResult = recentThree.first;
checkIfGraphShouldBeDisplayed(recentResult);
recentResult.verifiedOn = resultDate(DateUtil.convertStringToDate(recentResult.verifiedOnDateTime!));
// filteredGraphValues = [filteredGraphValues.first];
navigationService.push(MaterialPageRoute(
@ -237,6 +240,12 @@ class LabViewModel extends ChangeNotifier {
);
}
void checkIfGraphShouldBeDisplayed(LabResult recentResult){
shouldShowGraph = recentResult.checkIfGraphShouldBeDisplayed();
isGraphVisible = shouldShowGraph;
notifyListeners();
}
Future<void> getPatientSpecialResult(
PatientLabOrdersResponseModel laborder) async {
isSpecialResultsLoading = true;
@ -551,4 +560,9 @@ class LabViewModel extends ChangeNotifier {
return "normal";
}
}
alterGraphVisibility(){
isGraphVisible = !isGraphVisible;
notifyListeners();
}
}

17
lib/features/lab/models/resp_models/lab_result.dart
Unescape Escape View File

@ -24,6 +24,7 @@ class LabResult {
String? referenceHigh;
String? criticalLow;
String? referenceLow;
num? resultTypeID;
String? packageShortDescription;
LabResult(
@ -80,6 +81,7 @@ class LabResult {
criticalLow = json['CriticalLow'];
referenceLow = json['ReferenceLow'];
packageShortDescription = json['PackageShortDescription'];
resultTypeID = json['ResultTypeID'];
}
Map<String, dynamic> toJson() {
@ -111,6 +113,21 @@ class LabResult {
return data;
}
bool checkIfGraphShouldBeDisplayed(){
if (resultTypeID == null) return false;
if (resultTypeID == 6) return false;
if (referanceRange == null || referanceRange == "" || referanceRange == "\n") return false;
bool isDigit = RegExp(r"\\d+").hasMatch("$resultValue");
if(isDigit) return true;
try {
num.parse(resultValue ?? "");
} catch (e) {
return false;
}
return true;
}
@override
String toString() {
return 'LabOrderResult(flag: $calculatedResultFlag, value: $resultValue, verifiedOn: $verifiedOnDateTime)';

4
lib/presentation/lab/lab_result_via_hospital/LabResultList.dart
Unescape Escape View File

@ -4,7 +4,7 @@ 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:provider/provider.dart' show Selector, Provider;
import 'package:provider/provider.dart' show Selector, Provider, ReadContext;
class LabResultList extends StatelessWidget {
late LabViewModel model;
@ -15,7 +15,7 @@ class LabResultList extends StatelessWidget {
return Selector<LabViewModel, List<LabResult>>(
selector: (_, model) => model.mainLabResultsByHospitals,
builder: (__, list, ___) {
if (list.isEmpty) {
if (list.isEmpty && context.read<LabViewModel>().labSpecialResult.isEmpty) {
return Utils.getNoDataWidget(context,
noDataText: "You don't have any lab results yet."
.needTranslation);

47
lib/presentation/lab/lab_result_via_hospital/lab_order_result_item.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:hmg_patient_app_new/core/utils/date_util.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/features/lab/lab_view_model.dart' show LabViewModel;
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/patient_lab_orders_response_model.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
@ -14,6 +15,7 @@ import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart';
import 'package:provider/provider.dart';
class LabOrderResultItem extends StatelessWidget {
final VoidCallback onTap;
@ -45,8 +47,49 @@ class LabOrderResultItem extends StatelessWidget {
child: '${tests!.description}'.toText14(weight: FontWeight.w500),
),
'${tests!.packageShortDescription}'.toText12(fontWeight: FontWeight.w500, color: AppColors.textColorLight),
//
SizedBox(height: 24.h),
SizedBox(height: 12.h),
Row(
mainAxisSize: MainAxisSize.max,
children: [
Flexible(
child: Text(
tests?.resultValue ?? "",
style: TextStyle(
fontSize: 24.fSize,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
color: context.read<LabViewModel>().getColor(
tests?.calculatedResultFlag ?? "",
),
letterSpacing: -2,
),
overflow: TextOverflow.ellipsis, // prevent overflow
maxLines: 1,
softWrap: false,
),
),
SizedBox(width: 4.h,),
Expanded(
flex: 2,
child: Visibility(
visible: tests?.referanceRange != null,
child: Text(
"(Reference range ${tests?.referanceRange})".needTranslation,
style: TextStyle(
fontSize: 12.fSize,
fontWeight: FontWeight.w500,
fontFamily: 'Poppins',
color: AppColors.greyTextColor,
),
// overflow: TextOverflow.ellipsis,
// maxLines: 2,
softWrap: true,
),
),
),
],
),
SizedBox(height: 12.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [

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

@ -15,35 +15,38 @@ import 'package:hmg_patient_app_new/presentation/lab/lab_results/lab_result_list
import 'package:hmg_patient_app_new/theme/colors.dart' show AppColors;
import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/widgets/graph/custom_graph.dart';
import 'package:provider/provider.dart' show Consumer, Provider;
import 'package:provider/provider.dart' show Consumer, Provider, ReadContext;
import '../../../widgets/common_bottom_sheet.dart'
show showCommonBottomSheetWithoutHeight;
class LabResultDetails extends StatelessWidget {
final LabResult recentLabResult;
final String? testDescription;
// final List<DataPoint> graphPoint;
late LabViewModel model;
String? testDescription;
LabResultDetails({super.key, required this.recentLabResult, required this.testDescription});
const LabResultDetails(
{super.key,
required this.recentLabResult,
required this.testDescription});
@override
Widget build(BuildContext context) {
model = Provider.of<LabViewModel>(context, listen: false);
return CollapsingListView(
title: 'Lab Result Details'.needTranslation,
child: SingleChildScrollView(
child: Column(
spacing: 16.h,
children: [LabNameAndStatus, LabGraph(context)],
children: [
LabNameAndStatus(context),
getLabDescription(context),
LabGraph(context)
],
).paddingAll(24.h),
),
);
}
Widget get LabNameAndStatus => Container(
Widget LabNameAndStatus(BuildContext context) => Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24.h,
@ -80,11 +83,12 @@ class LabResultDetails extends StatelessWidget {
//todo change the text color according to the provided test values
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Row(
spacing: 4.h,
mainAxisSize: MainAxisSize.max,
children: [
Flexible(
child: Text(
@ -93,8 +97,8 @@ class LabResultDetails extends StatelessWidget {
fontSize: 24.fSize,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
color: model.getColor(
recentLabResult.calculatedResultFlag ?? "",
color: context.read<LabViewModel>().getColor(
recentLabResult.calculatedResultFlag ?? "",
),
letterSpacing: -2,
),
@ -103,30 +107,37 @@ class LabResultDetails extends StatelessWidget {
softWrap: false,
),
),
Visibility(
visible: recentLabResult.referanceRange != null,
child: Text(
"(Reference range ${recentLabResult.referanceRange})".needTranslation,
style: TextStyle(
fontSize: 12.fSize,
fontWeight: FontWeight.w500,
fontFamily: 'Poppins',
color: AppColors.greyTextColor,
SizedBox(width: 4.h,),
Expanded(
flex: 2,
child: Visibility(
visible: recentLabResult.referanceRange != null,
child: Text(
"(Reference range ${recentLabResult.referanceRange})".needTranslation,
style: TextStyle(
fontSize: 12.fSize,
fontWeight: FontWeight.w500,
fontFamily: 'Poppins',
color: AppColors.greyTextColor,
),
// overflow: TextOverflow.ellipsis,
// maxLines: 2,
softWrap: true,
),
overflow: TextOverflow.ellipsis,
maxLines: 1,
softWrap: false,
),
),
],
),
),
Utils.buildSvgWithAssets(
icon: AppAssets.lab_result_indicator,
SizedBox(
width: 21,
height: 23,
iconColor: model.getColor(
recentLabResult.calculatedResultFlag ?? "",
child: Utils.buildSvgWithAssets(
icon: AppAssets.lab_result_indicator,
width: 21,
height: 23,
iconColor: context.read<LabViewModel>().getColor(
recentLabResult.calculatedResultFlag ?? "",
),
),
),
],
@ -135,73 +146,80 @@ class LabResultDetails extends StatelessWidget {
],
));
Widget LabGraph(BuildContext context) => Consumer<DateRangeSelectorRangeViewModel>(
builder: (_, model, ___) => Consumer<LabViewModel>(
builder: (_, labmodel, ___) => Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24.h,
hasShadow: true,
),
height: model.isGraphVisible?260.h:(labmodel.filteredGraphValues.length<3)?(labmodel.filteredGraphValues.length*64)+80.h:260.h,
padding: EdgeInsets.all(16.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
Widget LabGraph(BuildContext context) => Consumer<LabViewModel>(
builder: (_, labmodel, ___) => Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24.h,
hasShadow: true,
),
height: labmodel.isGraphVisible
? 260.h
: (labmodel.filteredGraphValues.length < 3)
? (labmodel.filteredGraphValues.length * 64) + 80.h
: 260.h,
padding: EdgeInsets.all(16.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
//title and filter icon
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
//title and filter icon
Text(
labmodel.isGraphVisible
? LocaleKeys.historyFlowchart.tr()
: LocaleKeys.history.tr(),
style: TextStyle(
fontSize: 16,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
color: AppColors.textColor,
),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
spacing: 16.h,
children: [
Text(
model.isGraphVisible?LocaleKeys.historyFlowchart.tr(): LocaleKeys.history.tr(),
style: TextStyle(
fontSize: 16,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
color: AppColors.textColor,
),
),
Row(
spacing: 16.h,
children: [
//todo handle when the graph icon is being displayed
Utils.buildSvgWithAssets(
icon: model.isGraphVisible?AppAssets.ic_list:AppAssets.ic_graph,
width: 24.h,
height: 24.h)
.onPress(() {
model.alterGraphVisibility();
}),
Utils.buildSvgWithAssets(
icon: AppAssets.ic_date_filter,
width: 24,
height: 24)
.onPress(() {
showCommonBottomSheetWithoutHeight(
title: LocaleKeys.setTheDateRange.tr(),
context,
child: DateRangeSelector(
onRangeSelected: (start, end) {
// if (start != null) {
labmodel.getSelectedDateRange(start, end);
// }
},
),
isFullScreen: false,
isCloseButtonVisible: true,
callBackFunc: () {},
);
}),
],
)
//todo handle when the graph icon is being displayed
Utils.buildSvgWithAssets(
icon: labmodel.isGraphVisible
? AppAssets.ic_list
: AppAssets.ic_graph,
width: 24.h,
height: 24.h)
.onPress(() {
if (labmodel.shouldShowGraph) {
labmodel.alterGraphVisibility();
}
}),
Utils.buildSvgWithAssets(
icon: AppAssets.ic_date_filter,
width: 24,
height: 24)
.onPress(() {
showCommonBottomSheetWithoutHeight(
title: LocaleKeys.setTheDateRange.tr(),
context,
child: DateRangeSelector(
onRangeSelected: (start, end) {
// if (start != null) {
labmodel.getSelectedDateRange(start, end);
// }
},
),
isFullScreen: false,
isCloseButtonVisible: true,
callBackFunc: () {},
);
}),
],
).paddingOnly(bottom: model.isGraphVisible? 16.h :24.h),
historyBody(model, labmodel)
)
],
)),
));
).paddingOnly(bottom: labmodel.isGraphVisible ? 16.h : 24.h),
historyBody(labmodel)
],
)),
);
Widget leftLabels(String value) {
return Text(
@ -229,17 +247,15 @@ class LabResultDetails extends StatelessWidget {
);
}
Widget historyBody(DateRangeSelectorRangeViewModel model, LabViewModel labmodel) {
if(model.isGraphVisible){
Widget historyBody(LabViewModel labmodel) {
if (labmodel.isGraphVisible && labmodel.shouldShowGraph) {
var graphColor = labmodel.getColor(recentLabResult.calculatedResultFlag??"N");
return CustomGraph(
dataPoints: labmodel.filteredGraphValues,
// maxY: 100,
makeGraphBasedOnActualValue: true,
leftLabelReservedSize: 40,
leftLabelInterval: getInterval(labmodel),
maxY: (labmodel.maxY)+(getInterval(labmodel)??0)/5,
maxY: (labmodel.maxY)+(getInterval(labmodel)??0)/2,
maxX: labmodel.filteredGraphValues.length.toDouble()-.75,
leftLabelFormatter: (value) {
return leftLabels(value.toStringAsFixed(2).tr());
@ -279,11 +295,11 @@ class LabResultDetails extends StatelessWidget {
scrollDirection: Axis.horizontal,
height: 180.h);
}else {
return labHistoryList(model, labmodel);
return labHistoryList(labmodel);
}
}
Widget labHistoryList(DateRangeSelectorRangeViewModel model, LabViewModel labmodel) {
Widget labHistoryList(LabViewModel labmodel) {
return SizedBox(
height: labmodel.filteredGraphValues.length<3?labmodel.filteredGraphValues.length*64:180.h,
child: ListView.separated(
@ -315,4 +331,27 @@ class LabResultDetails extends StatelessWidget {
if(maxX >100 && maxX < 200) return 30;
return 50;
}
Widget getLabDescription(BuildContext context) {
return Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24.h,
hasShadow: true,
),
height: 98.h,
padding: EdgeInsets.all(16.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 8.h,
children: [
"What is this result?"
.needTranslation
.toText16(weight: FontWeight.w600, color: AppColors.textColor),
testDescription?.toText12(
fontWeight: FontWeight.w500, color: AppColors.textColorLight) ??
SizedBox.shrink()
],
));
}
}

7
lib/widgets/date_range_selector/viewmodel/date_range_view_model.dart
Unescape Escape View File

@ -17,7 +17,7 @@ class DateRangeSelectorRangeViewModel extends ChangeNotifier {
'Nov',
'Dec'
];
bool isGraphVisible = true;
Range? _currentlySelectedRange;
Range? get currentlySelectedRange => _currentlySelectedRange;
@ -77,7 +77,6 @@ class DateRangeSelectorRangeViewModel extends ChangeNotifier {
toDate = null;
fromDate = null;
currentlySelectedRange = null;
isGraphVisible = true;
notifyListeners();
}
@ -86,8 +85,4 @@ class DateRangeSelectorRangeViewModel extends ChangeNotifier {
notifyListeners();
}
alterGraphVisibility(){
isGraphVisible = !isGraphVisible;
notifyListeners();
}
}

Write Preview
Loading…
Cancel
Save