Bug PAP-877 fixed, blood tracker exception.

merge-update-with-lab-changes
Sikander Saleem 5 years ago
parent 3128810fb0
commit b2e9060c3f

@ -39,6 +39,9 @@ class BloodSugarViewMode extends BaseViewModel {
element.dailyAverageResult.toDouble(), element.dailyAverageResult.toDouble(),
)); ));
}); });
if (bloodWeekTimeSeriesData.isEmpty) {
bloodWeekTimeSeriesData.add(TimeSeriesSales2(DateTime.now(), 0));
}
for (int index = 0; for (int index = 0;
index < bloodSugarService.monthDiabtectResultAverageList.length; index < bloodSugarService.monthDiabtectResultAverageList.length;

@ -31,42 +31,47 @@ class BloodSugarWeeklyPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return AppScaffold( return AppScaffold(
body:timeSeriesData.isEmpty?Container(child: Center(child: Texts(TranslationBase.of(context).noDataAvailable),),): ListView( body: timeSeriesData.isEmpty
children: [ ? Container(
Container( child: Center(
margin: EdgeInsets.only(top: 12, left: 8, right: 8), child: Texts(TranslationBase.of(context).noDataAvailable),
color: Colors.white, ),
child: LineChartCurved( )
title: 'Sugar', : ListView(
timeSeries: timeSeriesData, children: [
indexes: timeSeriesData.length ~/ 5.5, Container(
), margin: EdgeInsets.only(top: 12, left: 8, right: 8),
), color: Colors.white,
SizedBox( child: LineChartCurved(
height: 12, title: 'Sugar',
), timeSeries: timeSeriesData,
Padding( indexes: timeSeriesData.length ~/ 5.5,
padding: const EdgeInsets.all(8.0),
child: Texts(TranslationBase.of(context).details),
),
Container(
padding: EdgeInsets.all(10),
color: Colors.transparent,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Table(
border: TableBorder.symmetric(
inside: BorderSide(width: 2.0, color: Colors.grey[300]),
), ),
children:
fullData(context, projectViewModel, bloodSugarViewMode),
), ),
SizedBox(
height: 12,
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts(TranslationBase.of(context).details),
),
Container(
padding: EdgeInsets.all(10),
color: Colors.transparent,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Table(
border: TableBorder.symmetric(
inside: BorderSide(width: 2.0, color: Colors.grey[300]),
),
children: fullData(context, projectViewModel, bloodSugarViewMode),
),
],
),
)
], ],
), ),
)
],
),
); );
} }

@ -184,7 +184,7 @@ class LineChartCurved extends StatelessWidget {
} }
double getMinY() { double getMinY() {
double min = timeSeries[0].sales; double min = timeSeries.isEmpty ? 0 : timeSeries.first.sales;
timeSeries.forEach((element) { timeSeries.forEach((element) {
double resultValueDouble = element.sales; double resultValueDouble = element.sales;
if (resultValueDouble < min) min = resultValueDouble; if (resultValueDouble < min) min = resultValueDouble;

Loading…
Cancel
Save