Merge branch 'development' into hmg-services-fixing
# Conflicts: # lib/config/localized_values.dart # lib/uitl/translations_delegate_base.dartmerge-requests/262/head^2
mosazaid
4 years ago
commit
0444b21101
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
@ -0,0 +1,8 @@
|
||||
class healthData {
|
||||
int MedCategoryID;
|
||||
int MedSubCategoryID;
|
||||
String Value;
|
||||
String Notes;
|
||||
String MachineDate;
|
||||
int TransactionsListID;
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
class YearlyStepsResModel {
|
||||
double valueSum;
|
||||
int medCategoryID;
|
||||
int month;
|
||||
String monthName;
|
||||
int patientID;
|
||||
int year;
|
||||
|
||||
YearlyStepsResModel(
|
||||
{this.valueSum,
|
||||
this.medCategoryID,
|
||||
this.month,
|
||||
this.monthName,
|
||||
this.patientID,
|
||||
this.year});
|
||||
|
||||
YearlyStepsResModel.fromJson(Map<String, dynamic> json) {
|
||||
valueSum = json['ValueSum'];
|
||||
medCategoryID = json['MedCategoryID'];
|
||||
month = json['Month'];
|
||||
monthName = json['MonthName'];
|
||||
patientID = json['PatientID'];
|
||||
year = json['Year'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['ValueSum'] = this.valueSum;
|
||||
data['MedCategoryID'] = this.medCategoryID;
|
||||
data['Month'] = this.month;
|
||||
data['MonthName'] = this.monthName;
|
||||
data['PatientID'] = this.patientID;
|
||||
data['Year'] = this.year;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,273 @@
|
||||
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
|
||||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../Constants.dart';
|
||||
|
||||
class CurvedChartBloodPressure extends StatelessWidget {
|
||||
final String title;
|
||||
final List<TimeSeriesSales2> timeSeries1;
|
||||
final List<TimeSeriesSales2> timeSeries2;
|
||||
final int indexes;
|
||||
final double horizontalInterval;
|
||||
|
||||
CurvedChartBloodPressure(
|
||||
{this.title,
|
||||
this.timeSeries1,
|
||||
this.indexes,
|
||||
this.timeSeries2,
|
||||
this.horizontalInterval = 20.0});
|
||||
|
||||
List<int> xAxixs = List();
|
||||
List<double> yAxixs = List();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
getXaxix();
|
||||
return AspectRatio(
|
||||
aspectRatio: 1.1,
|
||||
child: Container(
|
||||
decoration: const BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(18)),
|
||||
// color: Colors.white,
|
||||
),
|
||||
child: Stack(
|
||||
children: <Widget>[
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: <Widget>[
|
||||
const SizedBox(
|
||||
height: 15,
|
||||
),
|
||||
Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
color: Colors.black, fontSize: 15, letterSpacing: 2),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding:
|
||||
const EdgeInsets.only(right: 18.0, left: 16.0, top: 15),
|
||||
child: LineChart(
|
||||
sampleData1(context),
|
||||
swapAnimationDuration: const Duration(milliseconds: 250),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 20,
|
||||
height: 20,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.rectangle,
|
||||
color: Theme.of(context).primaryColor),
|
||||
),
|
||||
SizedBox(
|
||||
width: 5,
|
||||
),
|
||||
Texts(TranslationBase.of(context).systolicLng)
|
||||
],
|
||||
),
|
||||
SizedBox(
|
||||
width: 15,
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 20,
|
||||
height: 20,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.rectangle, color: secondaryColor),
|
||||
),
|
||||
SizedBox(
|
||||
width: 5,
|
||||
),
|
||||
Texts(TranslationBase.of(context).diastolicLng)
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
getXaxix() {
|
||||
for (int index = 0; index < timeSeries1.length; index++) {
|
||||
int mIndex = indexes * index;
|
||||
if (mIndex < timeSeries1.length) {
|
||||
xAxixs.add(mIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
LineChartData sampleData1(context) {
|
||||
return LineChartData(
|
||||
lineTouchData: LineTouchData(
|
||||
touchTooltipData: LineTouchTooltipData(
|
||||
tooltipBgColor: Colors.white,
|
||||
),
|
||||
touchCallback: (LineTouchResponse touchResponse) {},
|
||||
handleBuiltInTouches: true,
|
||||
),
|
||||
gridData: FlGridData(
|
||||
show: true, drawVerticalLine: true, drawHorizontalLine: true),
|
||||
titlesData: FlTitlesData(
|
||||
bottomTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 10,
|
||||
),
|
||||
|
||||
margin: 22,
|
||||
getTitles: (value) {
|
||||
if (timeSeries1.length < 15) {
|
||||
if (timeSeries1.length > value.toInt()) {
|
||||
return '${timeSeries1[value.toInt()].time.month}/ ${timeSeries1[value.toInt()].time.year}';
|
||||
} else
|
||||
return '';
|
||||
} else {
|
||||
if (value.toInt() == 0)
|
||||
return '${timeSeries1[value.toInt()].time.month}/ ${timeSeries1[value.toInt()].time.year}';
|
||||
if (value.toInt() == timeSeries1.length - 1)
|
||||
return '${timeSeries1[value.toInt()].time.month}/ ${timeSeries1[value.toInt()].time.year}';
|
||||
if (xAxixs.contains(value.toInt())) {
|
||||
return '${timeSeries1[value.toInt()].time.month}/ ${timeSeries1[value.toInt()].time.year}';
|
||||
}
|
||||
}
|
||||
return '';
|
||||
},
|
||||
),
|
||||
leftTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 10,
|
||||
),
|
||||
getTitles: (value) {
|
||||
if (value.toInt() == 0)
|
||||
return '${value.toInt()}';
|
||||
else if (value.toInt() % horizontalInterval == 0)
|
||||
return '${value.toInt()}';
|
||||
else
|
||||
return '';
|
||||
},
|
||||
margin: 12,
|
||||
),
|
||||
),
|
||||
borderData: FlBorderData(
|
||||
show: true,
|
||||
border: const Border(
|
||||
bottom: BorderSide(
|
||||
color: Colors.black,
|
||||
width: 0.5,
|
||||
),
|
||||
left: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
right: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
top: BorderSide(
|
||||
color: Colors.transparent,
|
||||
),
|
||||
),
|
||||
),
|
||||
minX: 0,
|
||||
maxX: (timeSeries1.length - 1).toDouble(),
|
||||
maxY: getMaxY() + 0.3,
|
||||
minY: getMinY(),
|
||||
lineBarsData: getData(context),
|
||||
);
|
||||
}
|
||||
|
||||
double getMaxY() {
|
||||
double max = 0;
|
||||
timeSeries1.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble > max) max = resultValueDouble;
|
||||
});
|
||||
timeSeries2.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble > max) max = resultValueDouble;
|
||||
});
|
||||
|
||||
return max.roundToDouble();
|
||||
}
|
||||
|
||||
double getMinY() {
|
||||
double min = timeSeries1[0].sales;
|
||||
timeSeries1.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble < min) min = resultValueDouble;
|
||||
});
|
||||
timeSeries2.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble < min) min = resultValueDouble;
|
||||
});
|
||||
|
||||
int value = min.toInt();
|
||||
|
||||
return value.toDouble();
|
||||
}
|
||||
|
||||
List<LineChartBarData> getData(context) {
|
||||
List<FlSpot> spots = List();
|
||||
for (int index = 0; index < timeSeries1.length; index++) {
|
||||
spots.add(FlSpot(index.toDouble(), timeSeries1[index].sales));
|
||||
}
|
||||
|
||||
List<FlSpot> spots2 = List();
|
||||
for (int index = 0; index < timeSeries2.length; index++) {
|
||||
spots2.add(FlSpot(index.toDouble(), timeSeries2[index].sales));
|
||||
}
|
||||
|
||||
final LineChartBarData lineChartBarData1 = LineChartBarData(
|
||||
spots: spots,
|
||||
isCurved: true,
|
||||
colors: [Colors.red],
|
||||
barWidth: 5,
|
||||
isStrokeCapRound: true,
|
||||
dotData: FlDotData(
|
||||
show: false,
|
||||
),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
);
|
||||
final LineChartBarData lineChartBarData2 = LineChartBarData(
|
||||
spots: spots2,
|
||||
isCurved: true,
|
||||
colors: [Theme.of(context).primaryColor],
|
||||
barWidth: 5,
|
||||
isStrokeCapRound: true,
|
||||
dotData: FlDotData(
|
||||
show: false,
|
||||
),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
);
|
||||
|
||||
return [lineChartBarData1, lineChartBarData2];
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,222 @@
|
||||
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
|
||||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../Constants.dart';
|
||||
|
||||
class LineChartCurved extends StatelessWidget {
|
||||
final String title;
|
||||
final List<TimeSeriesSales2> timeSeries;
|
||||
final int indexes;
|
||||
final double horizontalInterval;
|
||||
|
||||
LineChartCurved(
|
||||
{this.title,
|
||||
this.timeSeries,
|
||||
this.indexes,
|
||||
this.horizontalInterval = 20.0});
|
||||
|
||||
List<int> xAxixs = List();
|
||||
List<double> yAxixs = List();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
getXaxix();
|
||||
getYaxix();
|
||||
return AspectRatio(
|
||||
aspectRatio: 1.1,
|
||||
child: Container(
|
||||
decoration: const BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(18)),
|
||||
// color: Colors.white,
|
||||
),
|
||||
child: Stack(
|
||||
children: <Widget>[
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: <Widget>[
|
||||
const SizedBox(
|
||||
height: 4,
|
||||
),
|
||||
Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
color: Colors.black, fontSize: 15, letterSpacing: 2),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
right: 18.0, left: 16.0, top: 15, bottom: 15),
|
||||
child: LineChart(
|
||||
sampleData1(context),
|
||||
swapAnimationDuration: const Duration(milliseconds: 250),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
getXaxix() {
|
||||
for (int index = 0; index < timeSeries.length; index++) {
|
||||
int mIndex = indexes * index;
|
||||
if (mIndex < timeSeries.length) {
|
||||
xAxixs.add(mIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getYaxix() {
|
||||
int indexess = (timeSeries.length * 0.30).toInt();
|
||||
for (int index = 0; index < timeSeries.length; index++) {
|
||||
int mIndex = indexess * index;
|
||||
if (mIndex < timeSeries.length) {
|
||||
yAxixs.add(timeSeries[mIndex].sales);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
LineChartData sampleData1(context) {
|
||||
return LineChartData(
|
||||
lineTouchData: LineTouchData(
|
||||
touchTooltipData: LineTouchTooltipData(
|
||||
tooltipBgColor: Colors.white,
|
||||
),
|
||||
touchCallback: (LineTouchResponse touchResponse) {},
|
||||
handleBuiltInTouches: true,
|
||||
),
|
||||
gridData: FlGridData(
|
||||
horizontalInterval: horizontalInterval,
|
||||
show: true,
|
||||
drawVerticalLine: true,
|
||||
drawHorizontalLine: true),
|
||||
titlesData: FlTitlesData(
|
||||
bottomTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 10,
|
||||
),
|
||||
// rotateAngle: 90,
|
||||
//rotateAngle:-65,
|
||||
margin: 22,
|
||||
getTitles: (value) {
|
||||
if (timeSeries.length < 15) {
|
||||
if (timeSeries.length > value.toInt()) {
|
||||
return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
|
||||
} else
|
||||
return '';
|
||||
} else {
|
||||
if (value.toInt() == 0)
|
||||
return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
|
||||
if (value.toInt() == timeSeries.length - 1)
|
||||
return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
|
||||
if (xAxixs.contains(value.toInt())) {
|
||||
return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
|
||||
}
|
||||
}
|
||||
return '';
|
||||
},
|
||||
),
|
||||
leftTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 10,
|
||||
),
|
||||
getTitles: (value) {
|
||||
if (value.toInt() == 0)
|
||||
return '${value.toInt()}';
|
||||
else if (value.toInt() % horizontalInterval == 0)
|
||||
return '${value.toInt()}';
|
||||
else
|
||||
return '';
|
||||
},
|
||||
margin: 12,
|
||||
),
|
||||
),
|
||||
borderData: FlBorderData(
|
||||
show: true,
|
||||
border: const Border(
|
||||
bottom: BorderSide(
|
||||
color: Colors.black,
|
||||
width: 0.5,
|
||||
),
|
||||
left: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
right: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
top: BorderSide(
|
||||
color: Colors.transparent,
|
||||
),
|
||||
),
|
||||
),
|
||||
minX: 0,
|
||||
maxX: (timeSeries.length - 1).toDouble(),
|
||||
maxY: getMaxY() + 0.3,
|
||||
minY: getMinY(),
|
||||
lineBarsData: getData(context),
|
||||
);
|
||||
}
|
||||
|
||||
double getMaxY() {
|
||||
double max = 0;
|
||||
timeSeries.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble > max) max = resultValueDouble;
|
||||
});
|
||||
|
||||
return max.roundToDouble();
|
||||
}
|
||||
|
||||
double getMinY() {
|
||||
double min = timeSeries[0].sales;
|
||||
timeSeries.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble < min) min = resultValueDouble;
|
||||
});
|
||||
int value = min.toInt();
|
||||
|
||||
return value.toDouble();
|
||||
}
|
||||
|
||||
List<LineChartBarData> getData(context) {
|
||||
List<FlSpot> spots = List();
|
||||
for (int index = 0; index < timeSeries.length; index++) {
|
||||
spots.add(FlSpot(index.toDouble(), timeSeries[index].sales));
|
||||
}
|
||||
|
||||
final LineChartBarData lineChartBarData1 = LineChartBarData(
|
||||
spots: spots,
|
||||
isCurved: true,
|
||||
colors: [secondaryColor],
|
||||
barWidth: 5,
|
||||
isStrokeCapRound: true,
|
||||
curveSmoothness: 0.12,
|
||||
dotData: FlDotData(
|
||||
show: false,
|
||||
),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
);
|
||||
|
||||
return [
|
||||
lineChartBarData1,
|
||||
];
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,252 @@
|
||||
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
|
||||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class MonthCurvedChartBloodPressure extends StatelessWidget {
|
||||
final String title;
|
||||
final List<TimeSeriesSales3> timeSeries1;
|
||||
final List<TimeSeriesSales3> timeSeries2;
|
||||
final int indexes;
|
||||
final double horizontalInterval;
|
||||
|
||||
MonthCurvedChartBloodPressure(
|
||||
{this.title, this.timeSeries1, this.indexes, this.timeSeries2, this.horizontalInterval = 20.0});
|
||||
|
||||
List<int> xAxixs = List();
|
||||
List<double> yAxixs = List();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
getXaxix();
|
||||
return AspectRatio(
|
||||
aspectRatio: 1.1,
|
||||
child: Container(
|
||||
decoration: const BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(18)),
|
||||
// color: Colors.white,
|
||||
),
|
||||
child: Stack(
|
||||
children: <Widget>[
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: <Widget>[
|
||||
const SizedBox(
|
||||
height: 15,
|
||||
),
|
||||
Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
color: Colors.black, fontSize: 15, letterSpacing: 2),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding:
|
||||
const EdgeInsets.only(right: 18.0, left: 16.0, top: 15),
|
||||
child: LineChart(
|
||||
sampleData1(context),
|
||||
swapAnimationDuration: const Duration(milliseconds: 250),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 20,
|
||||
height: 20,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.rectangle,
|
||||
color: Theme.of(context).primaryColor),
|
||||
),
|
||||
SizedBox(
|
||||
width: 5,
|
||||
),
|
||||
Texts(TranslationBase.of(context).systolicLng)
|
||||
],
|
||||
),
|
||||
SizedBox(
|
||||
width: 15,
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 20,
|
||||
height: 20,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.rectangle, color: Colors.grey),
|
||||
),
|
||||
SizedBox(
|
||||
width: 5,
|
||||
),
|
||||
Texts(TranslationBase.of(context).diastolicLng)
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
getXaxix() {
|
||||
for (int index = 0; index < timeSeries1.length; index++) {
|
||||
int mIndex = indexes * index;
|
||||
if (mIndex < timeSeries1.length) {
|
||||
xAxixs.add(mIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
LineChartData sampleData1(context) {
|
||||
return LineChartData(
|
||||
lineTouchData: LineTouchData(
|
||||
touchTooltipData: LineTouchTooltipData(
|
||||
tooltipBgColor: Colors.white,
|
||||
),
|
||||
touchCallback: (LineTouchResponse touchResponse) {},
|
||||
handleBuiltInTouches: true,
|
||||
),
|
||||
gridData: FlGridData(
|
||||
show: true, drawVerticalLine: true, drawHorizontalLine: true),
|
||||
titlesData: FlTitlesData(
|
||||
bottomTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 10,
|
||||
),
|
||||
margin: 22,
|
||||
getTitles: (value) {
|
||||
return '';
|
||||
},
|
||||
),
|
||||
leftTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 10,
|
||||
),
|
||||
getTitles: (value) {
|
||||
if (value.toInt() == 0)
|
||||
return '${value.toInt()}';
|
||||
else if (value.toInt() % horizontalInterval == 0)
|
||||
return '${value.toInt()}';
|
||||
else
|
||||
return '';
|
||||
},
|
||||
margin: 12,
|
||||
),
|
||||
),
|
||||
borderData: FlBorderData(
|
||||
show: true,
|
||||
border: const Border(
|
||||
bottom: BorderSide(
|
||||
color: Colors.black,
|
||||
width: 0.5,
|
||||
),
|
||||
left: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
right: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
top: BorderSide(
|
||||
color: Colors.transparent,
|
||||
),
|
||||
),
|
||||
),
|
||||
minX: 0,
|
||||
maxX: (timeSeries1.length - 1).toDouble(),
|
||||
maxY: getMaxY() + 0.3,
|
||||
minY: getMinY(),
|
||||
lineBarsData: getData(context),
|
||||
);
|
||||
}
|
||||
|
||||
double getMaxY() {
|
||||
double max = 0;
|
||||
timeSeries1.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble > max) max = resultValueDouble;
|
||||
});
|
||||
timeSeries2.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble > max) max = resultValueDouble;
|
||||
});
|
||||
|
||||
return max.roundToDouble();
|
||||
}
|
||||
|
||||
double getMinY() {
|
||||
double min = timeSeries1[0].sales;
|
||||
timeSeries1.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble < min) min = resultValueDouble;
|
||||
});
|
||||
timeSeries2.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble < min) min = resultValueDouble;
|
||||
});
|
||||
|
||||
int value = min.toInt();
|
||||
|
||||
return value.toDouble();
|
||||
}
|
||||
|
||||
List<LineChartBarData> getData(context) {
|
||||
List<FlSpot> spots = List();
|
||||
for (int index = 0; index < timeSeries1.length; index++) {
|
||||
spots.add(FlSpot(index.toDouble(), timeSeries1[index].sales));
|
||||
}
|
||||
|
||||
List<FlSpot> spots2 = List();
|
||||
for (int index = 0; index < timeSeries2.length; index++) {
|
||||
spots2.add(FlSpot(index.toDouble(), timeSeries2[index].sales));
|
||||
}
|
||||
|
||||
final LineChartBarData lineChartBarData1 = LineChartBarData(
|
||||
spots: spots,
|
||||
isCurved: true,
|
||||
colors: [Colors.red],
|
||||
barWidth: 5,
|
||||
isStrokeCapRound: true,
|
||||
dotData: FlDotData(
|
||||
show: false,
|
||||
),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
);
|
||||
final LineChartBarData lineChartBarData2 = LineChartBarData(
|
||||
spots: spots2,
|
||||
isCurved: true,
|
||||
colors: [Theme.of(context).primaryColor],
|
||||
barWidth: 5,
|
||||
isStrokeCapRound: true,
|
||||
dotData: FlDotData(
|
||||
show: false,
|
||||
),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
);
|
||||
|
||||
return [lineChartBarData1, lineChartBarData2];
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,206 @@
|
||||
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
|
||||
import 'package:fl_chart/fl_chart.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../../Constants.dart';
|
||||
|
||||
class MonthLineChartCurved extends StatelessWidget {
|
||||
final String title;
|
||||
final List<TimeSeriesSales3> timeSeries;
|
||||
final int indexes;
|
||||
final double horizontalInterval;
|
||||
|
||||
MonthLineChartCurved(
|
||||
{this.title,
|
||||
this.timeSeries,
|
||||
this.indexes,
|
||||
this.horizontalInterval = 15.0});
|
||||
|
||||
List<int> xAxixs = List();
|
||||
List<double> yAxixs = List();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
getXaxix();
|
||||
getYaxix();
|
||||
return AspectRatio(
|
||||
aspectRatio: 1.1,
|
||||
child: Container(
|
||||
decoration: const BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(18)),
|
||||
// color: Colors.white,
|
||||
),
|
||||
child: Stack(
|
||||
children: <Widget>[
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: <Widget>[
|
||||
const SizedBox(
|
||||
height: 4,
|
||||
),
|
||||
Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
color: Colors.black, fontSize: 15, letterSpacing: 2),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
right: 18.0, left: 16.0, top: 15, bottom: 15),
|
||||
child: LineChart(
|
||||
sampleData1(context),
|
||||
swapAnimationDuration: const Duration(milliseconds: 250),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 10,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
getXaxix() {
|
||||
for (int index = 0; index < timeSeries.length; index++) {
|
||||
int mIndex = indexes * index;
|
||||
if (mIndex < timeSeries.length) {
|
||||
xAxixs.add(mIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getYaxix() {
|
||||
int indexess = (timeSeries.length * 0.30).toInt();
|
||||
for (int index = 0; index < timeSeries.length; index++) {
|
||||
int mIndex = indexess * index;
|
||||
if (mIndex < timeSeries.length) {
|
||||
yAxixs.add(timeSeries[mIndex].sales);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
LineChartData sampleData1(context) {
|
||||
return LineChartData(
|
||||
lineTouchData: LineTouchData(
|
||||
touchTooltipData: LineTouchTooltipData(
|
||||
tooltipBgColor: Colors.white,
|
||||
),
|
||||
touchCallback: (LineTouchResponse touchResponse) {},
|
||||
handleBuiltInTouches: true,
|
||||
),
|
||||
gridData: FlGridData(
|
||||
horizontalInterval: horizontalInterval,
|
||||
show: true,
|
||||
drawVerticalLine: true,
|
||||
drawHorizontalLine: true),
|
||||
titlesData: FlTitlesData(
|
||||
bottomTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 10,
|
||||
),
|
||||
margin: 22,
|
||||
getTitles: (value) {
|
||||
return '${value.toInt()}';
|
||||
},
|
||||
),
|
||||
leftTitles: SideTitles(
|
||||
showTitles: true,
|
||||
getTextStyles: (value) => const TextStyle(
|
||||
color: Colors.black,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 10,
|
||||
),
|
||||
getTitles: (value) {
|
||||
if (value.toInt() == 0)
|
||||
return '${value.toInt()}';
|
||||
else if (value.toInt() % horizontalInterval == 0)
|
||||
return '${value.toInt()}';
|
||||
else
|
||||
return '';
|
||||
},
|
||||
margin: 12,
|
||||
),
|
||||
),
|
||||
borderData: FlBorderData(
|
||||
show: true,
|
||||
border: const Border(
|
||||
bottom: BorderSide(
|
||||
color: Colors.black,
|
||||
width: 0.5,
|
||||
),
|
||||
left: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
right: BorderSide(
|
||||
color: Colors.black,
|
||||
),
|
||||
top: BorderSide(
|
||||
color: Colors.transparent,
|
||||
),
|
||||
),
|
||||
),
|
||||
minX: 0,
|
||||
maxX: (timeSeries.length - 1).toDouble(),
|
||||
maxY: getMaxY() + 0.3,
|
||||
minY: getMinY(),
|
||||
lineBarsData: getData(context),
|
||||
);
|
||||
}
|
||||
|
||||
double getMaxY() {
|
||||
double max = 0;
|
||||
timeSeries.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble > max) max = resultValueDouble;
|
||||
});
|
||||
|
||||
return max.roundToDouble();
|
||||
}
|
||||
|
||||
double getMinY() {
|
||||
double min = timeSeries[0].sales;
|
||||
timeSeries.forEach((element) {
|
||||
double resultValueDouble = element.sales;
|
||||
if (resultValueDouble < min) min = resultValueDouble;
|
||||
});
|
||||
int value = min.toInt();
|
||||
|
||||
return value.toDouble();
|
||||
}
|
||||
|
||||
List<LineChartBarData> getData(context) {
|
||||
List<FlSpot> spots = List();
|
||||
for (int index = 0; index < timeSeries.length; index++) {
|
||||
spots.add(FlSpot(index.toDouble(), timeSeries[index].sales));
|
||||
}
|
||||
|
||||
final LineChartBarData lineChartBarData1 = LineChartBarData(
|
||||
spots: spots,
|
||||
isCurved: true,
|
||||
colors: [secondaryColor],
|
||||
barWidth: 5,
|
||||
isStrokeCapRound: true,
|
||||
curveSmoothness: 0.0,
|
||||
dotData: FlDotData(
|
||||
show: false,
|
||||
),
|
||||
belowBarData: BarAreaData(
|
||||
show: false,
|
||||
),
|
||||
);
|
||||
|
||||
return [
|
||||
lineChartBarData1,
|
||||
];
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class TabBarWidget extends StatelessWidget with PreferredSizeWidget{
|
||||
final TabController tabController;
|
||||
|
||||
const TabBarWidget({Key key, this.tabController}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Stack(
|
||||
children: <Widget>[
|
||||
Positioned(
|
||||
bottom: 1,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
|
||||
child: Container(
|
||||
color:
|
||||
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.8),
|
||||
height: 70.0,
|
||||
),
|
||||
),
|
||||
),
|
||||
Center(
|
||||
child: Container(
|
||||
height: 55.0,
|
||||
color: Colors.white,
|
||||
child: Center(
|
||||
child: TabBar(
|
||||
isScrollable: true,
|
||||
controller: tabController,
|
||||
indicatorWeight: 5.0,
|
||||
indicatorSize: TabBarIndicatorSize.tab,
|
||||
labelColor: Theme.of(context).primaryColor,
|
||||
labelPadding:
|
||||
EdgeInsets.only(top: 4.0, left: 5.0, right: 5.0),
|
||||
unselectedLabelColor: Colors.grey[800],
|
||||
tabs: [
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width * 0.33,
|
||||
child: Center(
|
||||
child: Texts(TranslationBase.of(context).weekly),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width * 0.33,
|
||||
child: Center(
|
||||
child: Texts(TranslationBase.of(context).monthlyT),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
width: MediaQuery.of(context).size.width * 0.34,
|
||||
child: Center(
|
||||
child: Texts(TranslationBase.of(context).yearly),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
@override
|
||||
Size get preferredSize => Size(double.maxFinite, 60);
|
||||
}
|
||||
@ -0,0 +1,248 @@
|
||||
import 'package:charts_flutter/flutter.dart' as charts;
|
||||
import 'package:diplomaticquarterapp/models/SmartWatch/YearlyStepsResModel.dart';
|
||||
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class StepsTracker extends StatefulWidget {
|
||||
@override
|
||||
_StepsTrackerState createState() => _StepsTrackerState();
|
||||
}
|
||||
|
||||
class _StepsTrackerState extends State<StepsTracker>
|
||||
with SingleTickerProviderStateMixin {
|
||||
TabController _tabController;
|
||||
|
||||
int weeklyStatsAvgValue = 0;
|
||||
int monthlyStatsAvgValue = 0;
|
||||
int yearlyStatsAvgValue = 0;
|
||||
|
||||
int avgStepsValue = 0;
|
||||
int dataLength = 0;
|
||||
|
||||
List<YearlyStepsResModel> yearlyStepsList = List();
|
||||
|
||||
List<TimeSeriesSales> yearlyTimeSeriesData = [];
|
||||
|
||||
bool isDataLoaded = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
_tabController = new TabController(length: 3, vsync: this);
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
getYearlyStepsData();
|
||||
});
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AppScaffold(
|
||||
isShowAppBar: true,
|
||||
appBarTitle: "Steps",
|
||||
isShowDecPage: false,
|
||||
body: Container(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
TabBar(
|
||||
tabs: [
|
||||
Tab(text: TranslationBase.of(context).weekly),
|
||||
Tab(text: TranslationBase.of(context).monthly),
|
||||
Tab(text: TranslationBase.of(context).yearly),
|
||||
],
|
||||
controller: _tabController,
|
||||
),
|
||||
Expanded(
|
||||
child: new TabBarView(
|
||||
physics: NeverScrollableScrollPhysics(),
|
||||
children: [
|
||||
isDataLoaded ? getWeeklyStepsDetails() : Container(),
|
||||
isDataLoaded ? getMonthlyStepsDetails() : Container(),
|
||||
isDataLoaded ? getYearlyStepsDetails() : Container()
|
||||
],
|
||||
controller: _tabController,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
getYearlyStepsData() {
|
||||
avgStepsValue = 0;
|
||||
dataLength = 0;
|
||||
|
||||
DoctorsListService service = new DoctorsListService();
|
||||
GifLoaderDialogUtils.showMyDialog(context);
|
||||
service.getPatientHealthDataStats(6, 3, context).then((res) {
|
||||
GifLoaderDialogUtils.hideDialog(context);
|
||||
print(res['Med_GetYearStepsTransactionsStsList']);
|
||||
yearlyStepsList.clear();
|
||||
res['Med_GetYearStepsTransactionsStsList'].forEach((element) {
|
||||
yearlyStepsList.add(new YearlyStepsResModel.fromJson(element));
|
||||
if (element['ValueSum'] != null) {
|
||||
double value = element['ValueSum'];
|
||||
avgStepsValue += value.toInt();
|
||||
dataLength++;
|
||||
}
|
||||
});
|
||||
|
||||
print(avgStepsValue);
|
||||
print(dataLength);
|
||||
setState(() {
|
||||
yearlyStatsAvgValue = avgStepsValue ~/ dataLength;
|
||||
isDataLoaded = true;
|
||||
});
|
||||
}).catchError((err) {
|
||||
GifLoaderDialogUtils.hideDialog(context);
|
||||
// AppToast.showErrorToast(message: err);
|
||||
print(err);
|
||||
});
|
||||
}
|
||||
|
||||
generateData() {
|
||||
if (yearlyStepsList.length > 0) {
|
||||
yearlyTimeSeriesData.clear();
|
||||
yearlyStepsList.forEach(
|
||||
(element) {
|
||||
yearlyTimeSeriesData.add(
|
||||
TimeSeriesSales(
|
||||
new DateTime(element.year, element.month, 1),
|
||||
element.valueSum != null ? element.valueSum.toInt() : 0,
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
yearlyTimeSeriesData.forEach((element) {
|
||||
print(element.sales);
|
||||
print(element.time);
|
||||
});
|
||||
}
|
||||
return [
|
||||
new charts.Series<TimeSeriesSales, DateTime>(
|
||||
id: 'Sales',
|
||||
colorFn: (_, __) => charts.MaterialPalette.red.shadeDefault,
|
||||
domainFn: (TimeSeriesSales sales, _) => sales.time,
|
||||
measureFn: (TimeSeriesSales sales, _) => sales.sales,
|
||||
data: yearlyTimeSeriesData,
|
||||
)
|
||||
];
|
||||
}
|
||||
|
||||
getWeeklyStepsDetails() {
|
||||
return Container(
|
||||
child: Text("Weekly"),
|
||||
);
|
||||
}
|
||||
|
||||
getMonthlyStepsDetails() {
|
||||
return Container(
|
||||
child: Text("Monthly"),
|
||||
);
|
||||
}
|
||||
|
||||
getYearlyStepsDetails() {
|
||||
return Container(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Container(
|
||||
child: AppTimeSeriesChart(
|
||||
seriesList: generateData(),
|
||||
chartName: "Steps",
|
||||
startDate: DateTime(
|
||||
yearlyStepsList[0].year, yearlyStepsList[0].month, 1),
|
||||
endDate: DateTime(
|
||||
yearlyStepsList[yearlyStepsList.length - 1].year,
|
||||
yearlyStepsList[yearlyStepsList.length - 1].month,
|
||||
1),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.only(top: 5.0),
|
||||
child: Card(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
side: BorderSide(color: Colors.grey[400], width: 0.6)),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(30.0, 15.0, 30.0, 15.0),
|
||||
child:
|
||||
Text("Average Steps", style: TextStyle(fontSize: 18.0)),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.only(bottom: 10.0),
|
||||
child: Text(yearlyStatsAvgValue.toString() + " Steps",
|
||||
style: TextStyle(
|
||||
fontSize: 20.0, fontWeight: FontWeight.bold)),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.all(10.0),
|
||||
child: Divider(
|
||||
color: Colors.grey[500],
|
||||
),
|
||||
),
|
||||
Container(
|
||||
transform: Matrix4.translationValues(0.0, -10.0, 0.0),
|
||||
margin: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 5.0),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text("History", style: TextStyle(fontSize: 14.0)),
|
||||
Row(
|
||||
children: [
|
||||
Text("view more", style: TextStyle(fontSize: 14.0)),
|
||||
Container(
|
||||
margin: EdgeInsets.only(left: 3.0, right: 3.0),
|
||||
transform: Matrix4.translationValues(0.0, 1.5, 0.0),
|
||||
width: 30.0,
|
||||
height: 30.0,
|
||||
child: Image.asset(
|
||||
"assets/images/new-design/view_more.png",
|
||||
fit: BoxFit.contain),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 5.0),
|
||||
child: Card(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
side: BorderSide(color: Colors.grey[400], width: 0.6)),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(30.0, 15.0, 30.0, 15.0),
|
||||
child: Text("Date",
|
||||
style: TextStyle(
|
||||
fontSize: 18.0, fontWeight: FontWeight.bold)),
|
||||
),
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(30.0, 0.0, 30.0, 0.0),
|
||||
child: Text("Steps", style: TextStyle(fontSize: 18.0)),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue