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,7 +85,15 @@ class VitalSignItem extends StatelessWidget {
), ),
Container( Container(
width: double.infinity, width: double.infinity,
child: Align( child: Column(
children: [
Align(
alignment: Alignment.topRight,
child: Icon(
EvaIcons.eye,
),
),
Align(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
child: Container( child: Container(
margin: EdgeInsets.only(left: 5, right: 5), margin: EdgeInsets.only(left: 5, right: 5),
@ -96,6 +105,8 @@ class VitalSignItem extends StatelessWidget {
), ),
), ),
), ),
],
),
), ),
], ],
), ),

@ -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,7 +39,8 @@ 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(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -47,8 +49,7 @@ class VitalSingChartBloodPressure extends StatelessWidget {
margin: EdgeInsets.symmetric(horizontal: 8), margin: EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(12) borderRadius: BorderRadius.circular(12)),
),
child: LineChartCurvedBloodPressure( child: LineChartCurvedBloodPressure(
title: name, title: name,
timeSeries1: timeSeriesData1, timeSeries1: timeSeriesData1,
@ -61,8 +62,7 @@ class VitalSingChartBloodPressure extends StatelessWidget {
padding: EdgeInsets.only(top: 16, right: 18.0, left: 16.0), padding: EdgeInsets.only(top: 16, right: 18.0, left: 16.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(12) borderRadius: BorderRadius.circular(12)),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -70,10 +70,11 @@ class VitalSingChartBloodPressure extends StatelessWidget {
"Graph Details", "Graph Details",
fontSize: SizeConfig.textMultiplier * 2.3, fontSize: SizeConfig.textMultiplier * 2.3,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
SizedBox(height: 8,), SizedBox(
height: 8,
),
VitalSignBloodPressureWidget( VitalSignBloodPressureWidget(
vitalList: vitalList, vitalList: vitalList,
title1: title1, title1: title1,
@ -104,6 +105,13 @@ class VitalSingChartBloodPressure extends StatelessWidget {
),*/ ),*/
], ],
), ),
)
: Container(
width: double.infinity,
height: MediaQuery.of(context).size.height,
child: Center(
child: AppText(TranslationBase.of(context).vitalSignDetailEmpty),
),
); );
} }

Loading…
Cancel
Save