vital-sign- fixes

merge-requests/556/head
mosazaid 5 years ago
parent b27c236888
commit d06cf27724

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -84,17 +85,27 @@ class VitalSignItem extends StatelessWidget {
), ),
Container( Container(
width: double.infinity, width: double.infinity,
child: Align( child: Column(
alignment: Alignment.topLeft, children: [
child: Container( Align(
margin: EdgeInsets.only(left: 5, right: 5), alignment: Alignment.topRight,
child: AppText( child: Icon(
"$des", EvaIcons.eye,
fontFamily: 'Poppins', ),
fontSize: SizeConfig.textMultiplier * 1.3,
fontWeight: FontWeight.bold,
), ),
), Align(
alignment: Alignment.topLeft,
child: Container(
margin: EdgeInsets.only(left: 5, right: 5),
child: AppText(
"$des",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.3,
fontWeight: FontWeight.bold,
),
),
),
],
), ),
), ),
], ],

@ -3,6 +3,7 @@ import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-
import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_details_blood_pressurewideget.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.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_expandable_notifier.dart'; import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -38,54 +39,54 @@ class VitalSingChartBloodPressure extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
generateData(); generateData();
return Padding( return timeSeriesData1.length != 0 || timeSeriesData2.length != 0
padding: const EdgeInsets.all(10.0), ? Padding(
child: Column( padding: const EdgeInsets.all(10.0),
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12)
),
child: LineChartCurvedBloodPressure(
title: name,
timeSeries1: timeSeriesData1,
timeSeries2: timeSeriesData2,
indexes: timeSeriesData1.length ~/ 5.5,
),
),
Container(
margin: EdgeInsets.symmetric(horizontal: 8, vertical: 16),
padding: EdgeInsets.only(top: 16, right: 18.0, left: 16.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12)
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: <Widget>[
AppText( Container(
"Graph Details", margin: EdgeInsets.symmetric(horizontal: 8),
fontSize: SizeConfig.textMultiplier * 2.3, decoration: BoxDecoration(
fontWeight: FontWeight.bold, color: Colors.white,
borderRadius: BorderRadius.circular(12)),
fontFamily: 'Poppins', child: LineChartCurvedBloodPressure(
title: name,
timeSeries1: timeSeriesData1,
timeSeries2: timeSeriesData2,
indexes: timeSeriesData1.length ~/ 5.5,
),
), ),
SizedBox(height: 8,), Container(
VitalSignBloodPressureWidget( margin: EdgeInsets.symmetric(horizontal: 8, vertical: 16),
vitalList: vitalList, padding: EdgeInsets.only(top: 16, right: 18.0, left: 16.0),
title1: title1, decoration: BoxDecoration(
title2: title2, color: Colors.white,
title3: title3, borderRadius: BorderRadius.circular(12)),
viewKey1: viewKey1, child: Column(
viewKey2: viewKey2, crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
"Graph Details",
fontSize: SizeConfig.textMultiplier * 2.3,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
),
SizedBox(
height: 8,
),
VitalSignBloodPressureWidget(
vitalList: vitalList,
title1: title1,
title2: title2,
title3: title3,
viewKey1: viewKey1,
viewKey2: viewKey2,
),
],
),
), ),
], /*AppExpandableNotifier(
),
),
/*AppExpandableNotifier(
// isExpand: true, // isExpand: true,
headerWid: LineChartCurvedBloodPressure( headerWid: LineChartCurvedBloodPressure(
title: name, title: name,
@ -102,9 +103,16 @@ class VitalSingChartBloodPressure extends StatelessWidget {
viewKey2: viewKey2, viewKey2: viewKey2,
), ),
),*/ ),*/
], ],
), ),
); )
: Container(
width: double.infinity,
height: MediaQuery.of(context).size.height,
child: Center(
child: AppText(TranslationBase.of(context).vitalSignDetailEmpty),
),
);
} }
generateData() { generateData() {

Loading…
Cancel
Save