Merge branch 'development_new_design_2.0' into haroon-new-design

merge-update-with-lab-changes
haroon amjad 4 years ago
commit f9b57ce4aa

@ -17,6 +17,8 @@ class LineChartCurved extends StatelessWidget {
double minY = 0; double minY = 0;
double maxY = 0; double maxY = 0;
double intialY = 0;
double lastY = 0;
double minX = 0; double minX = 0;
double maxX = 0; double maxX = 0;
@ -26,6 +28,7 @@ class LineChartCurved extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
getXaxix(); getXaxix();
getYaxix(); getYaxix();
getInitialY();
calculateMaxAndMin(); calculateMaxAndMin();
return AspectRatio( return AspectRatio(
aspectRatio: 1.0, aspectRatio: 1.0,
@ -100,7 +103,7 @@ class LineChartCurved extends StatelessWidget {
touchCallback: (LineTouchResponse touchResponse) {}, touchCallback: (LineTouchResponse touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,
), ),
gridData: FlGridData(show: true, drawVerticalLine: true, drawHorizontalLine: true,horizontalInterval: 14,verticalInterval: 14), gridData: FlGridData(show: true, drawVerticalLine: true, drawHorizontalLine: true, horizontalInterval: 14, verticalInterval: 14),
titlesData: FlTitlesData( titlesData: FlTitlesData(
bottomTitles: SideTitles( bottomTitles: SideTitles(
showTitles: true, showTitles: true,
@ -165,12 +168,14 @@ class LineChartCurved extends StatelessWidget {
), ),
minX: minX, minX: minX,
maxX: maxX, maxX: maxX,
maxY: maxY, maxY: lastY+50,
minY: 0, minY: intialY,
lineBarsData: getData(context), lineBarsData: getData(context),
); );
} }
calculateMaxAndMin() { calculateMaxAndMin() {
getMaxY(); getMaxY();
getMaxX(); getMaxX();
@ -185,12 +190,29 @@ class LineChartCurved extends StatelessWidget {
maxY = 0; maxY = 0;
timeSeries.forEach((element) { timeSeries.forEach((element) {
double resultValueDouble = element.sales; double resultValueDouble = element.sales;
if (resultValueDouble > maxY) maxY = resultValueDouble; if (resultValueDouble > maxY) {
lastY = resultValueDouble;
maxY = resultValueDouble;
}
}); });
print("maxY " + lastY.toString());
return maxY.roundToDouble(); return maxY.roundToDouble();
} }
double getInitialY() {
try {
intialY = timeSeries.first.sales;
timeSeries.forEach((element) {
double resultValueDouble = element.sales;
if (resultValueDouble < intialY) intialY = resultValueDouble;
});
} catch (e) {
intialY = 0;
}
return intialY.roundToDouble();
}
getMaxX() { getMaxX() {
maxX = (timeSeries.length - 1).toDouble(); maxX = (timeSeries.length - 1).toDouble();
} }

Loading…
Cancel
Save