dev_v3.13.6_voipcall
devamirsaleemahmad 2 years ago
parent 49d3df8c87
commit 519f396e76

@ -8,10 +8,10 @@ import '../../../Constants.dart';
class LineChartCurved extends StatelessWidget {
final String title;
final List<TimeSeriesSales2> timeSeries;
final int indexes;
final int? indexes;
final double horizontalInterval;
LineChartCurved({this.title, this.timeSeries, this.indexes, this.horizontalInterval = 20.0});
LineChartCurved({required this.title, required this.timeSeries, this.indexes, this.horizontalInterval = 20.0});
List<int> xAxixs = [];
List<double> yAxixs = [];
@ -49,7 +49,7 @@ class LineChartCurved extends StatelessWidget {
Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
title,
title!,
style: TextStyle(color: Colors.black, fontSize: 16, letterSpacing: -0.64, fontWeight: FontWeight.w600),
textAlign: TextAlign.center,
),
@ -79,7 +79,7 @@ class LineChartCurved extends StatelessWidget {
getXaxix() {
for (int index = 0; index < timeSeries.length; index++) {
int mIndex = indexes * index;
int mIndex = indexes! * index;
if (mIndex < timeSeries.length) {
xAxixs.add(mIndex);
}
@ -88,7 +88,7 @@ class LineChartCurved extends StatelessWidget {
getYaxix() {
for (int index = 0; index < timeSeries.length; index++) {
int mIndex = indexes * index;
int mIndex = indexes! * index;
if (mIndex < timeSeries.length) {
yAxixs.add(timeSeries[mIndex].sales);
}
@ -101,7 +101,7 @@ class LineChartCurved extends StatelessWidget {
touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white,
),
touchCallback: (touchEvent, LineTouchResponse touchResponse) {},
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true,
),
gridData: FlGridData(show: true, drawVerticalLine: true, drawHorizontalLine: true, horizontalInterval: 14, verticalInterval: 14),
@ -239,7 +239,7 @@ class LineChartCurved extends StatelessWidget {
final LineChartBarData lineChartBarData1 = LineChartBarData(
spots: spots,
isCurved: true,
colors: [secondaryColor],
colors: [secondaryColor!],
barWidth: 1.5,
isStrokeCapRound: true,
dotData: FlDotData(

@ -11,7 +11,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
final List<TimeSeriesSales2> timeSeries2;
final int indexes;
LineChartCurvedBloodPressure({this.title, this.timeSeries1, this.indexes, this.timeSeries2});
LineChartCurvedBloodPressure({required this.title, required this.timeSeries1, required this.indexes, required this.timeSeries2});
List<int> xAxixs =[];
List<double> yAxixs =[];
@ -142,7 +142,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white,
),
touchCallback: (touchEvent, LineTouchResponse touchResponse) {},
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true,
),
gridData: FlGridData(show: true, drawVerticalLine: true, drawHorizontalLine: true, horizontalInterval: 14, verticalInterval: 14),

@ -15,8 +15,7 @@ class VitalSignBloodPressureWidget extends StatefulWidget {
final String viewKey1;
final String viewKey2;
VitalSignBloodPressureWidget(
{Key key, this.vitalList, this.title1, this.title2, this.viewKey1, this.title3, this.viewKey2});
VitalSignBloodPressureWidget({Key? key, required this.vitalList, required this.title1, required this.title2, required this.viewKey1, required this.title3, required this.viewKey2});
@override
_VitalSignDetailsWidgetState createState() => _VitalSignDetailsWidgetState();
@ -29,8 +28,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
return Container(
decoration: BoxDecoration(
color: Colors.transparent,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(10.0), topRight: Radius.circular(10.0)),
borderRadius: BorderRadius.only(topLeft: Radius.circular(10.0), topRight: Radius.circular(10.0)),
border: Border.all(color: Colors.grey, width: 1),
),
margin: EdgeInsets.all(20),
@ -41,7 +39,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
children: <Widget>[
Table(
border: TableBorder.symmetric(
inside: BorderSide(width: 2.0, color: Colors.grey[300]),
inside: BorderSide(width: 2.0, color: Colors.grey[300]!),
),
children: fullData(projectViewModel),
),
@ -59,9 +57,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.only(
topLeft:projectViewModel.isArabic? Radius.circular(0.0):Radius.circular(10.0),
topRight: projectViewModel.isArabic? Radius.circular(10.0):Radius.circular(0.0)
),
topLeft: projectViewModel.isArabic ? Radius.circular(0.0) : Radius.circular(10.0), topRight: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0.0)),
),
child: Center(
child: Texts(
@ -76,7 +72,6 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
child: Container(
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
),
child: Center(
child: Texts(widget.title2, color: Colors.white),
@ -88,9 +83,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.only(
topRight: projectViewModel.isArabic? Radius.circular(0.0):Radius.circular(10.0),
topLeft: projectViewModel.isArabic? Radius.circular(10.0):Radius.circular(0.0)
),
topRight: projectViewModel.isArabic ? Radius.circular(0.0) : Radius.circular(10.0), topLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0.0)),
),
child: Center(
child: Texts(widget.title3, color: Colors.white),
@ -108,7 +101,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
color: Colors.white,
child: Center(
child: Texts(
'${projectViewModel.isArabic ? DateUtil.getWeekDayArabic(vital.vitalSignDate.weekday) : DateUtil.getWeekDay(vital.vitalSignDate.weekday)}, ${vital.vitalSignDate.day} ${projectViewModel.isArabic ? DateUtil.getMonthArabic(vital.vitalSignDate.month) : DateUtil.getMonth(vital.vitalSignDate.month)}, ${vital.vitalSignDate.year} ',
'${projectViewModel.isArabic ? DateUtil.getWeekDayArabic(vital.vitalSignDate!.weekday) : DateUtil.getWeekDay(vital.vitalSignDate!.weekday)}, ${vital.vitalSignDate!.day} ${projectViewModel.isArabic ? DateUtil.getMonthArabic(vital.vitalSignDate!.month) : DateUtil.getMonth(vital.vitalSignDate!.month)}, ${vital.vitalSignDate!.year} ',
textAlign: TextAlign.center,
),
),

Loading…
Cancel
Save