dashboard changes

merge-requests/315/head
Sultan Khan 5 years ago
parent 388c095d7f
commit 6bdd4e06a1

@ -236,276 +236,318 @@ class _DashboardScreenState extends State<DashboardScreen> {
top: MediaQuery.of(context).size.height * .1, top: MediaQuery.of(context).size.height * .1,
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.52, height: MediaQuery.of(context).size.height * 0.52,
child: Column( child: model.dashboardItemsList.length > 0
children: [ ? Column(
RoundedContainer( children: [
height: RoundedContainer(
MediaQuery.of(context).size.height * 0.24, height:
margin: 5, MediaQuery.of(context).size.height *
child: Column(children: [ 0.24,
Expanded( margin: 5,
flex: 3, child: Column(children: [
child: Row( Expanded(
children: [
Expanded(
flex: 5,
child: Padding(
padding:
const EdgeInsets.all(5.0),
child: Column(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
rowCount(
model
.dashboardItemsList[
0]
.summaryoptions[0]
.kPIParameter,
model
.dashboardItemsList[
0]
.summaryoptions[0]
.value,
Colors.red),
rowCount(
model
.dashboardItemsList[
0]
.summaryoptions[1]
.kPIParameter,
model
.dashboardItemsList[
0]
.summaryoptions[1]
.value,
Colors.black),
rowCount(
model
.dashboardItemsList[
0]
.summaryoptions[2]
.kPIParameter,
model
.dashboardItemsList[
0]
.summaryoptions[2]
.value,
Colors.grey[800]),
],
))),
Expanded(
flex: 3,
child: Stack(children: [
Container(
child: GaugeChart(
_createInpatientData(
model))),
Positioned(
child: Column(
children: [
AppText(
TranslationBase.of(
context)
.inPatient,
fontSize: 11,
fontWeight:
FontWeight.bold,
),
AppText(
getPatientCount(model
.dashboardItemsList[0])
.toString(),
fontSize: 11,
fontWeight:
FontWeight.bold,
)
],
),
top: MediaQuery.of(context)
.size
.height *
0.08,
left: MediaQuery.of(context)
.size
.width *
0.10)
])),
],
)),
Expanded(
flex: 1,
child: Padding(
padding: const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
rowCount(
model
.dashboardItemsList[0]
.summaryoptions[3]
.kPIParameter,
model.dashboardItemsList[0]
.summaryoptions[3].value,
Colors.grey),
rowCount(
model
.dashboardItemsList[0]
.summaryoptions[4]
.kPIParameter,
model.dashboardItemsList[0]
.summaryoptions[4].value,
Colors.grey[300]),
],
)),
)
])),
RoundedContainer(
height:
MediaQuery.of(context).size.height * 0.24,
margin: 5,
child: Column(children: [
Expanded(
flex: 3,
child: Row(
children: [
Expanded(
flex: 5,
child: Padding(
padding:
const EdgeInsets.all(5.0),
child: Column(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[0]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[0]
.value,
Colors.red),
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[1]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[1]
.value,
Colors.black),
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[2]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[2]
.value,
Colors.grey[800]),
],
))),
Expanded(
flex: 3, flex: 3,
child: Stack(children: [ child: Row(
Container( children: [
child: GaugeChart( Expanded(
_createOutPatientData( flex: 5,
model))), child: Padding(
Positioned( padding:
child: Column( const EdgeInsets
children: [ .all(5.0),
AppText( child: Column(
TranslationBase.of( mainAxisAlignment:
context) MainAxisAlignment
.outPatient, .spaceBetween,
fontSize: 11, crossAxisAlignment:
fontWeight: CrossAxisAlignment
FontWeight.bold, .start,
textOverflow: children: [
TextOverflow rowCount(
.ellipsis, model
), .dashboardItemsList[
AppText( 0]
getPatientCount(model .summaryoptions[
.dashboardItemsList[1]) 0]
.toString(), .kPIParameter,
fontSize: 11, model
fontWeight: .dashboardItemsList[
FontWeight.bold, 0]
) .summaryoptions[
], 0]
), .value,
top: MediaQuery.of(context) Colors.red),
.size rowCount(
.height * model
0.08, .dashboardItemsList[
left: MediaQuery.of(context) 0]
.size .summaryoptions[
.width * 1]
0.09) .kPIParameter,
]), model
), .dashboardItemsList[
], 0]
)), .summaryoptions[
Expanded( 1]
flex: 1, .value,
child: Padding( Colors.black),
padding: const EdgeInsets.all(5.0), rowCount(
child: Row( model
mainAxisAlignment: .dashboardItemsList[
MainAxisAlignment.start, 0]
children: [ .summaryoptions[
rowCount( 2]
model .kPIParameter,
.dashboardItemsList[1] model
.summaryoptions[3] .dashboardItemsList[
.kPIParameter, 0]
model.dashboardItemsList[1] .summaryoptions[
.summaryoptions[3].value, 2]
Colors.grey), .value,
rowCount( Colors
model .grey[800]),
.dashboardItemsList[1] ],
.summaryoptions[4] ))),
.kPIParameter, Expanded(
model.dashboardItemsList[1] flex: 3,
.summaryoptions[4].value, child: Stack(children: [
Colors.grey[300]), Container(
rowCount( child: GaugeChart(
model _createInpatientData(
.dashboardItemsList[1] model))),
.summaryoptions[5] Positioned(
.kPIParameter, child: Column(
model.dashboardItemsList[1] children: [
.summaryoptions[5].value, AppText(
Colors.grey[200]) TranslationBase.of(
], context)
)), .inPatient,
) fontSize: 11,
])) fontWeight:
], FontWeight
)) .bold,
),
AppText(
getPatientCount(
model.dashboardItemsList[
0])
.toString(),
fontSize: 11,
fontWeight:
FontWeight
.bold,
)
],
),
top: MediaQuery.of(
context)
.size
.height *
0.08,
left: MediaQuery.of(
context)
.size
.width *
0.10)
])),
],
)),
Expanded(
flex: 1,
child: Padding(
padding:
const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
rowCount(
model
.dashboardItemsList[0]
.summaryoptions[3]
.kPIParameter,
model
.dashboardItemsList[0]
.summaryoptions[3]
.value,
Colors.grey),
rowCount(
model
.dashboardItemsList[0]
.summaryoptions[4]
.kPIParameter,
model
.dashboardItemsList[0]
.summaryoptions[4]
.value,
Colors.grey[300]),
],
)),
)
])),
RoundedContainer(
height:
MediaQuery.of(context).size.height *
0.24,
margin: 5,
child: Column(children: [
Expanded(
flex: 3,
child: Row(
children: [
Expanded(
flex: 5,
child: Padding(
padding:
const EdgeInsets
.all(5.0),
child: Column(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[
0]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[
0]
.value,
Colors.red),
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[
1]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[
1]
.value,
Colors.black),
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[
2]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[
2]
.value,
Colors
.grey[800]),
],
))),
Expanded(
flex: 3,
child: Stack(children: [
Container(
child: GaugeChart(
_createOutPatientData(
model))),
Positioned(
child: Column(
children: [
AppText(
TranslationBase.of(
context)
.outPatient,
fontSize: 11,
fontWeight:
FontWeight
.bold,
textOverflow:
TextOverflow
.ellipsis,
),
AppText(
getPatientCount(
model.dashboardItemsList[
1])
.toString(),
fontSize: 11,
fontWeight:
FontWeight
.bold,
)
],
),
top: MediaQuery.of(
context)
.size
.height *
0.08,
left: MediaQuery.of(
context)
.size
.width *
0.09)
]),
),
],
)),
Expanded(
flex: 1,
child: Padding(
padding:
const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
children: [
rowCount(
model
.dashboardItemsList[1]
.summaryoptions[3]
.kPIParameter,
model
.dashboardItemsList[1]
.summaryoptions[3]
.value,
Colors.grey),
rowCount(
model
.dashboardItemsList[1]
.summaryoptions[4]
.kPIParameter,
model
.dashboardItemsList[1]
.summaryoptions[4]
.value,
Colors.grey[300]),
rowCount(
model
.dashboardItemsList[1]
.summaryoptions[5]
.kPIParameter,
model
.dashboardItemsList[1]
.summaryoptions[5]
.value,
Colors.grey[200])
],
)),
)
]))
],
)
: SizedBox())
//ExpandableCardContainer( //ExpandableCardContainer(
// expandedChild: Container( // expandedChild: Container(
// margin: EdgeInsets.only(left: 10, right: 10), // margin: EdgeInsets.only(left: 10, right: 10),

Loading…
Cancel
Save