Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix chart issues

Browse Source
merge-requests/951/head
Elham Rababh 3 years ago
parent 1b12354581
commit ed9c77465f
3 changed files with 104 additions and 45 deletions
Show Stats Download Patch File Download Diff File

77
lib/screens/patients/profile/vital_sign/LineChartCurved.dart
Unescape Escape View File

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

68
lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
Unescape Escape View File

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

4
lib/screens/patients/profile/vte_assessment/vte_assessment_screen.dart
Unescape Escape View File

@ -41,9 +41,9 @@ class _ProgressNoteState extends State<VteAssessmentScreen> {
isDischargedPatient = routeArgs['isDischargedPatient'];
return BaseView<VteAssessmentViewModel>(
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(
baseViewModel: model,

Write Preview
Loading…
Cancel
Save