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

design bugs

Browse Source
ipd-changes-for-vida-plus
mosazaid 5 years ago
parent 98c33d550d
commit c900969496
6 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,3 +1,4 @@
import 'package:date_time_picker/date_time_picker.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart'; import 'package:doctor_app_flutter/widgets/charts/app_time_series_chart.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -14,6 +15,11 @@ class LineChartCurved extends StatelessWidget {
List<int> xAxixs = List(); List<int> xAxixs = List();
List<double> yAxixs = List(); List<double> yAxixs = List();
// DateFormat format = DateFormat("yyyy-MM-dd");
DateFormat yearFormat = DateFormat("yyyy/MMM");
DateFormat monthFormat = DateFormat("MMM");
bool isDatesSameYear = true;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
getXaxix(); getXaxix();
@ -38,7 +44,7 @@ class LineChartCurved extends StatelessWidget {
children: [ children: [
AppText( AppText(
title, title,
fontSize: SizeConfig.textMultiplier * 2.5, fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -47,7 +53,9 @@ class LineChartCurved extends StatelessWidget {
], ],
), ),
), ),
SizedBox(height: 16,), SizedBox(
height: 16,
),
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.only(right: 18.0, left: 16.0), padding: const EdgeInsets.only(right: 18.0, left: 16.0),
@ -74,6 +82,7 @@ class LineChartCurved extends StatelessWidget {
} }
} }
} }
getYaxix() { getYaxix() {
int indexess = (timeSeries.length * 0.30).toInt(); int indexess = (timeSeries.length * 0.30).toInt();
for (int index = 0; index < timeSeries.length; index++) { for (int index = 0; index < timeSeries.length; index++) {
@ -89,7 +98,6 @@ class LineChartCurved extends StatelessWidget {
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, tooltipBgColor: Colors.white,
), ),
touchCallback: (LineTouchResponse touchResponse) {}, touchCallback: (LineTouchResponse touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,
@ -107,8 +115,19 @@ class LineChartCurved extends StatelessWidget {
//rotateAngle:-65, //rotateAngle:-65,
margin: 22, margin: 22,
getTitles: (value) { getTitles: (value) {
if (timeSeries.length < 15) {
if (timeSeries.length > value.toInt()) { if (timeSeries.length > value.toInt()) {
DateTime dateTime = timeSeries[value.toInt()].time;
if (isDatesSameYear) {
return monthFormat.format(dateTime);
} else {
return yearFormat.format(dateTime);
}
} else {
return '';
}
/*if (timeSeries.length < 15) {
if (timeSeries.length > value.toInt()) {
DateTime dateTime = timeSeries[value.toInt()].time;
return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}'; return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
} else } else
return ''; return '';
@ -120,7 +139,7 @@ class LineChartCurved extends StatelessWidget {
if (xAxixs.contains(value.toInt())) { if (xAxixs.contains(value.toInt())) {
return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}'; return '${timeSeries[value.toInt()].time.month}/ ${timeSeries[value.toInt()].time.year}';
} }
} }*/
return ''; return '';
}, },
), ),
@ -198,8 +217,16 @@ class LineChartCurved extends StatelessWidget {
List<LineChartBarData> getData(context) { List<LineChartBarData> getData(context) {
List<FlSpot> spots = List(); List<FlSpot> spots = List();
isDatesSameYear = true;
int previousDateYear = 0;
for (int index = 0; index < timeSeries.length; index++) { for (int index = 0; index < timeSeries.length; index++) {
spots.add(FlSpot(index.toDouble(), timeSeries[index].sales)); spots.add(FlSpot(index.toDouble(), timeSeries[index].sales));
if (isDatesSameYear == false ||
(previousDateYear != 0 &&
previousDateYear != timeSeries[index].time.year)) {
isDatesSameYear = false;
}
previousDateYear = timeSeries[index].time.year;
} }
final LineChartBarData lineChartBarData1 = LineChartBarData( final LineChartBarData lineChartBarData1 = LineChartBarData(

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

@ -40,7 +40,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
children: [ children: [
AppText( AppText(
title, title,
fontSize: SizeConfig.textMultiplier * 2.5, fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',

16
lib/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart
Unescape Escape View File

@ -62,7 +62,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
),*/ ),*/
child: AppText( child: AppText(
TranslationBase.of(context).date, TranslationBase.of(context).date,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -84,7 +84,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
),*/ ),*/
child: AppText( child: AppText(
widget.title2, widget.title2,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -106,7 +106,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
),*/ ),*/
child: AppText( child: AppText(
widget.title3, widget.title3,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -123,8 +123,8 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
color: Colors.black, color: Colors.black,
), ),
Table( Table(
border: TableBorder.symmetric( border: TableBorder(
inside: BorderSide(width: 1.0, color: Colors.grey[300]), horizontalInside: BorderSide(width: 1.0, color: Colors.grey[300]),
), ),
children: fullData(projectViewModel), children: fullData(projectViewModel),
), ),
@ -165,7 +165,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
child: AppText( child: AppText(
'${projectViewModel.isArabic ? DateUtils.getWeekDayArabic(elementDate.weekday) : DateUtils.getWeekDay(elementDate.weekday)}, ${elementDate.day} ${projectViewModel.isArabic ? DateUtils.getMonthArabic(elementDate.month) : DateUtils.getMonth(elementDate.month)}, ${elementDate.year} ', '${projectViewModel.isArabic ? DateUtils.getWeekDayArabic(elementDate.weekday) : DateUtils.getWeekDay(elementDate.weekday)}, ${elementDate.day} ${projectViewModel.isArabic ? DateUtils.getMonthArabic(elementDate.month) : DateUtils.getMonth(elementDate.month)}, ${elementDate.year} ',
// textAlign: TextAlign.center, // textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -179,7 +179,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
child: AppText( child: AppText(
'${vital.toJson()[widget.viewKey1]}', '${vital.toJson()[widget.viewKey1]}',
// textAlign: TextAlign.center, // textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -193,7 +193,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
child: AppText( child: AppText(
'${vital.toJson()[widget.viewKey2]}', '${vital.toJson()[widget.viewKey2]}',
// textAlign: TextAlign.center, // textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',

8
lib/screens/patients/profile/vital_sign/vital_sign_details_wideget.dart
Unescape Escape View File

@ -55,7 +55,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
),*/ ),*/
child: AppText( child: AppText(
TranslationBase.of(context).date, TranslationBase.of(context).date,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -77,7 +77,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
),*/ ),*/
child: AppText( child: AppText(
widget.title2, widget.title2,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -94,8 +94,8 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
color: Colors.black, color: Colors.black,
), ),
Table( Table(
border: TableBorder.symmetric( border: TableBorder(
inside: BorderSide(width: 1.0, color: Colors.grey[300]), horizontalInside: BorderSide(width: 1.0, color: Colors.grey[300]),
), ),
children: fullData(projectViewModel), children: fullData(projectViewModel),
), ),

2
lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart
Unescape Escape View File

@ -63,7 +63,7 @@ class VitalSingChartAndDetials extends StatelessWidget {
children: [ children: [
AppText( AppText(
"Graph Details", "Graph Details",
fontSize: SizeConfig.textMultiplier * 2.8, fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',

2
lib/screens/patients/profile/vital_sign/vital_sing_chart_blood_pressure.dart
Unescape Escape View File

@ -68,7 +68,7 @@ class VitalSingChartBloodPressure extends StatelessWidget {
children: [ children: [
AppText( AppText(
"Graph Details", "Graph Details",
fontSize: SizeConfig.textMultiplier * 2.8, fontSize: SizeConfig.textMultiplier * 2.3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.black, backGroundcolor: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',

Write Preview
Loading…
Cancel
Save