diff --git a/lib/screens/patients/profile/vital_sign/body_measurements_screen.dart b/lib/screens/patients/profile/vital_sign/body_measurements_screen.dart index 9e0dc749..c3b88614 100644 --- a/lib/screens/patients/profile/vital_sign/body_measurements_screen.dart +++ b/lib/screens/patients/profile/vital_sign/body_measurements_screen.dart @@ -13,7 +13,7 @@ class BodyMeasurementsScreen extends StatelessWidget { BodyMeasurementsScreen(); // ; PatientsProvider patientsProv; - + List vitalList = []; @override Widget build(BuildContext context) { patientsProv = Provider.of(context); @@ -26,18 +26,18 @@ class BodyMeasurementsScreen extends StatelessWidget { children: [ Column( children: [ + // RoundedContainer( + // height: SizeConfig.realScreenHeight * 0.4, + // child: Padding( + // padding: EdgeInsets.all(8.0), + // child: Container( + // child: Center( + // child: Text('sss'), + // ), + // ), + // ), + // ), RoundedContainer( - height: SizeConfig.realScreenHeight * 0.4, - child: Padding( - padding: EdgeInsets.all(8.0), - child: Container( - child: Center( - child: Text('sss'), - ), - ), - ), - ), - Container( height: SizeConfig.realScreenHeight * 0.4, child: Center( child: Expanded( @@ -46,8 +46,8 @@ class BodyMeasurementsScreen extends StatelessWidget { behaviors: [ new charts.RangeAnnotation([ new charts.RangeAnnotationSegment( - new DateTime(2017, 10, 4), - new DateTime(2017, 10, 15), + vitalList[vitalList.length - 1].vitalSignDate, + vitalList[0].vitalSignDate, charts.RangeAnnotationAxisType.domain), ]), ]), @@ -82,87 +82,38 @@ class BodyMeasurementsScreen extends StatelessWidget { new ChartAxis(10, 38), new ChartAxis(1, 38), ]; - final data = [ - new TimeSeriesSales(new DateTime(2017, 9, 19), 5), - new TimeSeriesSales(new DateTime(2017, 9, 26), 25), - new TimeSeriesSales(new DateTime(2017, 10, 3), 100), - new TimeSeriesSales(new DateTime(2017, 10, 10), 75), - ]; + // final data = [ + // new TimeSeriesSales(new DateTime(2018, 11, 30), 45), + // new TimeSeriesSales(new DateTime(2017, 9, 26), 25), + // new TimeSeriesSales(new DateTime(2017, 10, 3), 100), + // new TimeSeriesSales(new DateTime(2015, 10, 10), 75), + // ]; - final List data1 = []; + final List data = []; - final List myFakeDesktopData1 = []; - List vitalList = patientsProv.patientVitalSignList; + vitalList = patientsProv.patientVitalSignList; if (vitalList.length > 0) { - // vitalList.sort((VitalSignResModel a, VitalSignResModel b) { - // return a.bodyMassIndex.toInt() - b.bodyMassIndex.toInt(); - // }); + vitalList.sort((VitalSignResModel a, VitalSignResModel b) { + return a.vitalSignDate.microsecondsSinceEpoch - + b.vitalSignDate.microsecondsSinceEpoch; + }); + for (int x = vitalList.length - 1; x >= 0; x--) { - myFakeDesktopData1.add( - new ChartAxis( - // x, - vitalList[x].vitalSignDate.day, - // 20, - // vitalSign.bodyMassIndex.toInt(), - // vitalSign.vitalSignDate.toString(), - // vitalSign.pulseBeatPerMinute!=null?vitalSign.pulseBeatPerMinute.toInt():50, - vitalList[x].bodyMassIndex.toInt(), - ), - ); - data1.add(TimeSeriesSales(new DateTime(vitalList[x].vitalSignDate.year,vitalList[x].vitalSignDate.month,vitalList[x].vitalSignDate.day), + data.add(TimeSeriesSales( + new DateTime( + vitalList[x].vitalSignDate.year, + vitalList[x].vitalSignDate.month, + vitalList[x].vitalSignDate.day), vitalList[x].bodyMassIndex.toInt())); - // data1.add(TimeSeriesSales(vitalList[x].vitalSignDate,vitalList[x].bodyMassIndex.toInt() + x * 15)); } - // vitalList.forEach((VitalSignResModel vitalSign) { - - // // print(e);' - // // int x = int.parse(vitalSign.bodyMassIndex); - // myFakeDesktopData1.add( - // new ChartAxis( - // vitalSign.vitalSignDate.day, - // // 20, - // // vitalSign.bodyMassIndex.toInt(), - // // vitalSign.vitalSignDate.toString(), - // // vitalSign.pulseBeatPerMinute!=null?vitalSign.pulseBeatPerMinute.toInt():50, - // vitalSign.bodyMassIndex.toInt(), - // ), - // ); - // }); - - // // map( - // // (VitalSignResModel vitalSign) { - // // print(vitalSign); - // // myFakeDesktopData1.add( - // // ChartAxis(vitalSign.transNo, vitalSign.bodyMassIndex), - // // ); - // // }, - // // ); - // } } return [ new charts.Series( id: 'Sales', domainFn: (TimeSeriesSales sales, _) => sales.time, measureFn: (TimeSeriesSales sales, _) => sales.sales, - data: data1, + data: data, ) - // charts.Series( - // id: 'ww', - // // Light shade for even xAxiss, dark shade for odd. - // colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault, - // // dashPatternFn: (ChartAxis yAxis, _) => [2, 4], - // strokeWidthPxFn: (ChartAxis yAxis, _) => 2.5, - // domainFn: (ChartAxis xAxis, _) => xAxis.xAxis, - // measureFn: (ChartAxis yAxis, _) => yAxis.yAxis, - // data: myFakeDesktopData1, - // ), - // new charts.Series( - // id: 'Desktop', - // colorFn: (_, __) => charts.MaterialPalette.blue.shadeDefault, - // domainFn: (LinearSales sales, _) => sales.year, - // measureFn: (LinearSales sales, _) => sales.sales, - // data: myFakeDesktopData1, - // ) ]; } }