From b7fbee32521c614a294a58a08c3cf47ea1174dcc Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 23 Jun 2021 10:06:43 +0300 Subject: [PATCH] improvements --- .../AlHabibMedicalService/H2O_view_model.dart | 13 +++++++++++-- lib/pages/AlHabibMedicalService/h2o/today_page.dart | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart index 972891a9..9d163a27 100644 --- a/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart +++ b/lib/core/viewModels/AlHabibMedicalService/H2O_view_model.dart @@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:charts_flutter/flutter.dart' as charts; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import '../../../locator.dart'; +import 'dart:math' as math; class H2OViewModel extends BaseViewModel { H2OService _h2OService = locator(); @@ -91,13 +92,21 @@ class H2OViewModel extends BaseViewModel { _h2OService.userProgressForWeekDataList.forEach((UserProgressForWeekDataModel data) { globalData.add(new ChartSeries(data.dayName, data.percentageConsumed)); }); + Iterable minMaxList = globalData.map((e) => e.x).toList(); + int maxValue = minMaxList.isEmpty ? 0 : minMaxList.reduce(math.max); + int minValue = minMaxList.isEmpty ? 0 : minMaxList.reduce(math.min); + + if (maxValue == 0 && minValue == 0) { + maxValue = 1; + minValue = -1; + } return [ new charts.Series( id: 'Global Revenue', domainFn: (ChartSeries sales, _) => sales.y, measureFn: (ChartSeries sales, _) => sales.x, - measureLowerBoundFn: (ChartSeries sales, _) => sales.x - 1, - measureUpperBoundFn: (ChartSeries sales, _) => sales.x + 1, + measureLowerBoundFn: (ChartSeries sales, _) => minValue, + measureUpperBoundFn: (ChartSeries sales, _) => maxValue, data: globalData, ), ]; diff --git a/lib/pages/AlHabibMedicalService/h2o/today_page.dart b/lib/pages/AlHabibMedicalService/h2o/today_page.dart index e52d2732..03d11f50 100644 --- a/lib/pages/AlHabibMedicalService/h2o/today_page.dart +++ b/lib/pages/AlHabibMedicalService/h2o/today_page.dart @@ -46,7 +46,7 @@ class TodayPage extends StatelessWidget { future: readPrefs(), builder: (context, data) { var isUnitML = true; - var unit; + String unit; if (data.connectionState == ConnectionState.done) { isUnitML = data.data; } @@ -55,6 +55,7 @@ class TodayPage extends StatelessWidget { } else { unit = TranslationBase.of(context).l; } + unit = unit.toLowerCase(); var totalH2O = model?.userProgressData?.quantityLimit ?? 0.0; var consumedH2O = model?.userProgressData?.quantityConsumed ?? 0.0; if (!isUnitML) {