Merge branch 'Dec_fixes' into 'development'
Dec fixes See merge request Cloud_Solution/doctor_app_flutter!916merge-requests/917/merge
commit
3c8d1fdf39
@ -0,0 +1,170 @@
|
|||||||
|
import 'package:charts_flutter/flutter.dart' as charts;
|
||||||
|
import 'package:doctor_app_flutter/config/size_config.dart';
|
||||||
|
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
|
||||||
|
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/dashboard/guage_chart.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/dashboard/row_count.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:flutter/material.dart';
|
||||||
|
|
||||||
|
import 'label.dart';
|
||||||
|
|
||||||
|
class DashboardReferralPatient extends StatelessWidget {
|
||||||
|
final List<DashboardModel> dashboardItemList;
|
||||||
|
final double height;
|
||||||
|
final DashboardViewModel model;
|
||||||
|
|
||||||
|
const DashboardReferralPatient({Key key, this.dashboardItemList, this.height, this.model}) : super(key: key);
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Container(
|
||||||
|
margin: EdgeInsets.only(bottom: 20, top: 10, left: 5, right: 5),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
|
||||||
|
color: Colors.white,
|
||||||
|
borderRadius: BorderRadius.only(
|
||||||
|
topLeft: Radius.circular(20),
|
||||||
|
topRight: Radius.circular(20),
|
||||||
|
bottomLeft: Radius.circular(20),
|
||||||
|
bottomRight: Radius.circular(20)
|
||||||
|
),
|
||||||
|
boxShadow: [
|
||||||
|
BoxShadow(
|
||||||
|
color: Colors.grey.withOpacity(0.5),
|
||||||
|
spreadRadius: 0,
|
||||||
|
blurRadius: 9,
|
||||||
|
offset: Offset(0, 0), // changes position of shadow
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
child: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [
|
||||||
|
Expanded(
|
||||||
|
flex: 1,
|
||||||
|
child: Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
flex: 4,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(5.0),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: EdgeInsets.all(8),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: SizeConfig.getHeightMultiplier(height: height) *
|
||||||
|
(SizeConfig.isHeightVeryShort?
|
||||||
|
3
|
||||||
|
: SizeConfig.isHeightShort?
|
||||||
|
2
|
||||||
|
: 2)),
|
||||||
|
Label(
|
||||||
|
firstLine: TranslationBase.of(context).patients,
|
||||||
|
secondLine: TranslationBase.of(context).referral,
|
||||||
|
color: Color(0xFF2B353E),
|
||||||
|
secondLineFontSize: SizeConfig.getHeightMultiplier(height: height) *
|
||||||
|
(SizeConfig.isHeightVeryShort?
|
||||||
|
5
|
||||||
|
: SizeConfig.isHeightShort?
|
||||||
|
7
|
||||||
|
: 12),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: SizeConfig.getHeightMultiplier(height: height) *
|
||||||
|
(SizeConfig.isHeightVeryShort?
|
||||||
|
5
|
||||||
|
: SizeConfig.isHeightShort?
|
||||||
|
10
|
||||||
|
: 5))
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 1,
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
RowCounts(
|
||||||
|
dashboardItemList[2].summaryoptions[0].kPIParameter,
|
||||||
|
dashboardItemList[2].summaryoptions[0].value,
|
||||||
|
Colors.black,
|
||||||
|
height: height,
|
||||||
|
),
|
||||||
|
RowCounts(
|
||||||
|
dashboardItemList[2].summaryoptions[1].kPIParameter,
|
||||||
|
dashboardItemList[2].summaryoptions[1].value,
|
||||||
|
Colors.grey,
|
||||||
|
height: height,
|
||||||
|
),
|
||||||
|
RowCounts(
|
||||||
|
dashboardItemList[2].summaryoptions[2].kPIParameter,
|
||||||
|
dashboardItemList[2].summaryoptions[2].value,
|
||||||
|
Colors.red,
|
||||||
|
height: height,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
flex: 3,
|
||||||
|
child: Stack(children: [
|
||||||
|
Container(padding: EdgeInsets.all(0), child: GaugeChart(_createReferralData(dashboardItemList))),
|
||||||
|
Positioned(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
AppText(
|
||||||
|
model.getPatientCount(dashboardItemList[2]).toString(),
|
||||||
|
fontSize: SizeConfig.textMultiplier * 3.0,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
top: height * (SizeConfig.isHeightVeryShort ? 0.35 : 0.40),
|
||||||
|
left: 0,
|
||||||
|
right: 0)
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<charts.Series<GaugeSegment, String>> _createReferralData(List<DashboardModel> dashboardItemList) {
|
||||||
|
final data = [
|
||||||
|
new GaugeSegment(dashboardItemList[2].summaryoptions[0].kPIParameter,
|
||||||
|
getValue(dashboardItemList[1].summaryoptions[0].value), charts.MaterialPalette.black),
|
||||||
|
new GaugeSegment(dashboardItemList[2].summaryoptions[1].kPIParameter,
|
||||||
|
getValue(dashboardItemList[1].summaryoptions[1].value), charts.MaterialPalette.gray.shadeDefault),
|
||||||
|
new GaugeSegment(dashboardItemList[2].summaryoptions[2].kPIParameter,
|
||||||
|
getValue(dashboardItemList[1].summaryoptions[2].value), charts.MaterialPalette.red.shadeDefault),
|
||||||
|
];
|
||||||
|
|
||||||
|
return [
|
||||||
|
new charts.Series<GaugeSegment, String>(
|
||||||
|
id: 'Segments',
|
||||||
|
domainFn: (GaugeSegment segment, _) => segment.segment,
|
||||||
|
measureFn: (GaugeSegment segment, _) => segment.size,
|
||||||
|
data: data,
|
||||||
|
colorFn: (GaugeSegment segment, _) => segment.color,
|
||||||
|
)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
static int getValue(value) {
|
||||||
|
return value == 0 ? 1 : value;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
// ignore: must_be_immutable
|
||||||
|
import 'package:doctor_app_flutter/config/size_config.dart';
|
||||||
|
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class Label extends StatelessWidget {
|
||||||
|
Label({
|
||||||
|
Key key, this.firstLine, this.secondLine, this.color= const Color(0xFF2E303A), this.secondLineFontSize, this.firstLineFontSize,
|
||||||
|
}) : super(key: key);
|
||||||
|
final String firstLine;
|
||||||
|
final String secondLine;
|
||||||
|
Color color;
|
||||||
|
final double secondLineFontSize;
|
||||||
|
final double firstLineFontSize;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
|
||||||
|
return Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
AppText(
|
||||||
|
firstLine,
|
||||||
|
fontSize: firstLineFontSize??SizeConfig.getTextMultiplierBasedOnWidth() *(SizeConfig.isWidthLarge?2:3) ,
|
||||||
|
// fontWeight: FontWeight.bold,
|
||||||
|
color: color,
|
||||||
|
fontHeight: .5,
|
||||||
|
letterSpacing: -0.72,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
),
|
||||||
|
AppText(
|
||||||
|
secondLine,
|
||||||
|
color: color,
|
||||||
|
fontSize: secondLineFontSize??SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?4:6.40),
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
letterSpacing: -1.44,
|
||||||
|
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,44 +1,52 @@
|
|||||||
|
import 'package:doctor_app_flutter/config/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:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class GetActivityButton extends StatelessWidget {
|
class GetActivityCard extends StatelessWidget {
|
||||||
final value;
|
final value;
|
||||||
|
|
||||||
GetActivityButton(this.value);
|
GetActivityCard(this.value);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
double width = SizeConfig.heightMultiplier* (SizeConfig.isHeightVeryShort?16:SizeConfig.isHeightShort?14:SizeConfig.isHeightLarge?15:13);
|
||||||
return Container(
|
return Container(
|
||||||
width: MediaQuery.of(context).size.height * 0.125,
|
width: width,
|
||||||
padding: EdgeInsets.all(5),
|
padding: EdgeInsets.symmetric(horizontal: SizeConfig.heightMultiplier * .4, vertical: SizeConfig.heightMultiplier * .2),
|
||||||
margin: EdgeInsets.all(5),
|
margin: EdgeInsets.all(SizeConfig.widthMultiplier *1),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
|
border: Border.all(width: 1, color: Color(0xFFEFEFEF)),
|
||||||
borderRadius: BorderRadius.circular(15),
|
borderRadius: BorderRadius.circular(15),
|
||||||
),
|
),
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.fromLTRB(8, 0, 8, 0),
|
padding: const EdgeInsets.fromLTRB(8,8, 8, 4),
|
||||||
|
child: Center(
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
AppText(
|
AppText(
|
||||||
value.value.toString(),
|
value.value.toString(),
|
||||||
fontSize: 27,
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* 25,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
color: Color(0xFF2B353E),
|
color: AppGlobal.appTextColor,
|
||||||
|
letterSpacing: -0.93,
|
||||||
),
|
),
|
||||||
AppText(
|
AppText(
|
||||||
value.kPIParameter,
|
value.kPIParameter,
|
||||||
textOverflow: TextOverflow.clip,
|
textOverflow: TextOverflow.clip,
|
||||||
fontSize: 10,
|
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9),
|
||||||
color: Color(0xFF2B353E),
|
color: AppGlobal.appTextColor,
|
||||||
textAlign: TextAlign.start,
|
textAlign: TextAlign.start,
|
||||||
fontWeight: FontWeight.w700,
|
fontWeight: FontWeight.w600,
|
||||||
|
letterSpacing: -0.33,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue