fix chart issues

merge-requests/951/head
Elham Rababh 4 years ago
parent 1b12354581
commit ed9c77465f

@ -16,8 +16,8 @@ class LineChartCurved extends StatelessWidget {
List<double> yAxixs = List(); List<double> yAxixs = List();
// DateFormat format = DateFormat("yyyy-MM-dd"); // DateFormat format = DateFormat("yyyy-MM-dd");
DateFormat yearFormat = DateFormat("yyyy/MMM"); DateFormat yearFormat = DateFormat("yyyy/MMM/dd");
DateFormat monthFormat = DateFormat("MMM"); DateFormat monthFormat = DateFormat("dd/MMM");
bool isDatesSameYear = true; bool isDatesSameYear = true;
@override @override
@ -96,6 +96,7 @@ class LineChartCurved extends StatelessWidget {
} }
} }
LineChartData sampleData1(context) { LineChartData sampleData1(context) {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
@ -164,27 +165,21 @@ class LineChartCurved extends StatelessWidget {
), ),
leftTitles: SideTitles( leftTitles: SideTitles(
showTitles: true, showTitles: true,
getTextStyles: (context, value) { getTextStyles: (cxt, value) => const TextStyle(
return TextStyle(
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 10, fontSize: 10,
); ),
}, interval:getInterval(),
getTitles: (value) {
// if (timeSeries.length < 10) { // getTitles: (value) {
// return '${value.toInt()}'; // if (value.toInt() == 0)
// } else {
// if (value == getMinY())
// return '${value.toInt()}';
// if (value == getMaxY())
// return '${value.toInt()}'; // return '${value.toInt()}';
// if (yAxixs.contains(value)) { // else if (value.toInt() % horizontalInterval == 0)
// return '${value.toInt()}'; // return '${value.toInt()}';
// } // else
// return ''; // return '';
// } // },
return '${value.toInt()}';
},
margin: 12, margin: 12,
), ),
), ),
@ -208,12 +203,44 @@ class LineChartCurved extends StatelessWidget {
), ),
minX: 0, minX: 0,
maxX: (timeSeries.length - 1).toDouble(), maxX: (timeSeries.length - 1).toDouble(),
maxY: getMaxY() + 0.3, maxY: getMaxY() + getInterval(),
minY: getMinY(), minY: 0,
lineBarsData: getData(context), 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();
// }
double getInterval(){
return getMaxY() - getMinY() <= 100
? 20
: getMaxY() - getMinY() <= 1000
? 100
: 200;
}
double getMaxY() { double getMaxY() {
double max = 0; double max = 0;
timeSeries.forEach((element) { timeSeries.forEach((element) {

@ -168,12 +168,12 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
), ),
leftTitles: SideTitles( leftTitles: SideTitles(
showTitles: true, showTitles: true,
getTextStyles: (context, value) { getTextStyles: (cxt, value) => const TextStyle(
return TextStyle(
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 10, fontSize: 10,
); ),
}, interval:getInterval(),
getTitles: (value) { getTitles: (value) {
return '${value.toInt()}'; return '${value.toInt()}';
}, },
@ -199,23 +199,31 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
), ),
), ),
minX: 0, minX: 0,
maxX: (timeSeries1.length - 1).toDouble(), maxX: 0,
maxY: getMaxY() + 0.3, maxY: getMaxY() + getInterval(),
minY: getMinY(), minY: 0,
lineBarsData: getData(context), lineBarsData: getData(context),
); );
} }
double getInterval(){
return getMaxY() - getMinY() <= 100
? 20
: getMaxY() - getMinY() <= 1000
? 100
: 200;
}
double getMaxY() { double getMaxY() {
double max = 0; double max = 0;
timeSeries1.forEach((element) { timeSeries1.forEach((element) {
double resultValueDouble = element.sales; double resultValueDouble = element.sales;
if (resultValueDouble > max) max = resultValueDouble; if (resultValueDouble > max) max = resultValueDouble;
}); });
timeSeries2.forEach((element) {
double resultValueDouble = element.sales;
if (resultValueDouble > max) max = resultValueDouble;
});
return max.roundToDouble(); return max.roundToDouble();
} }
@ -226,15 +234,39 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
double resultValueDouble = element.sales; double resultValueDouble = element.sales;
if (resultValueDouble < min) min = resultValueDouble; if (resultValueDouble < min) min = resultValueDouble;
}); });
timeSeries2.forEach((element) {
double resultValueDouble = element.sales;
if (resultValueDouble < min) min = resultValueDouble;
});
int value = min.toInt(); int value = min.toInt();
return value.toDouble(); return value.toDouble();
} }
// 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<LineChartBarData> getData(context) {
List<FlSpot> spots = List(); List<FlSpot> spots = List();

@ -41,9 +41,9 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
isDischargedPatient = routeArgs['isDischargedPatient']; isDischargedPatient = routeArgs['isDischargedPatient'];
return BaseView<VteAssessmentViewModel>( return BaseView<VteAssessmentViewModel>(
onModelReady: (model) => model.getVteAssessment(patientId: patient.patientId, onModelReady: (model) => model.getVteAssessment(patientId: patient.patientId,
admissionNo: 2016023498 // admissionNo: 2016023498
// admissionNo:int.parse(patient.admissionNo) admissionNo:int.parse(patient.admissionNo)
), ),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,

Loading…
Cancel
Save