improvements

merge-requests/317/head
Sikander Saleem 3 years ago
parent d6566d4abf
commit b7fbee3252

@ -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<H2OService>();
@ -91,13 +92,21 @@ class H2OViewModel extends BaseViewModel {
_h2OService.userProgressForWeekDataList.forEach((UserProgressForWeekDataModel data) {
globalData.add(new ChartSeries(data.dayName, data.percentageConsumed));
});
Iterable<int> 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<ChartSeries, String>(
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,
),
];

@ -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) {

Loading…
Cancel
Save