dashboard changes

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

@ -236,11 +236,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
top: MediaQuery.of(context).size.height * .1,
child: Container(
height: MediaQuery.of(context).size.height * 0.52,
child: Column(
child: model.dashboardItemsList.length > 0
? Column(
children: [
RoundedContainer(
height:
MediaQuery.of(context).size.height * 0.24,
MediaQuery.of(context).size.height *
0.24,
margin: 5,
child: Column(children: [
Expanded(
@ -251,7 +253,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
flex: 5,
child: Padding(
padding:
const EdgeInsets.all(5.0),
const EdgeInsets
.all(5.0),
child: Column(
mainAxisAlignment:
MainAxisAlignment
@ -264,38 +267,45 @@ class _DashboardScreenState extends State<DashboardScreen> {
model
.dashboardItemsList[
0]
.summaryoptions[0]
.summaryoptions[
0]
.kPIParameter,
model
.dashboardItemsList[
0]
.summaryoptions[0]
.summaryoptions[
0]
.value,
Colors.red),
rowCount(
model
.dashboardItemsList[
0]
.summaryoptions[1]
.summaryoptions[
1]
.kPIParameter,
model
.dashboardItemsList[
0]
.summaryoptions[1]
.summaryoptions[
1]
.value,
Colors.black),
rowCount(
model
.dashboardItemsList[
0]
.summaryoptions[2]
.summaryoptions[
2]
.kPIParameter,
model
.dashboardItemsList[
0]
.summaryoptions[2]
.summaryoptions[
2]
.value,
Colors.grey[800]),
Colors
.grey[800]),
],
))),
Expanded(
@ -314,23 +324,28 @@ class _DashboardScreenState extends State<DashboardScreen> {
.inPatient,
fontSize: 11,
fontWeight:
FontWeight.bold,
FontWeight
.bold,
),
AppText(
getPatientCount(model
.dashboardItemsList[0])
getPatientCount(
model.dashboardItemsList[
0])
.toString(),
fontSize: 11,
fontWeight:
FontWeight.bold,
FontWeight
.bold,
)
],
),
top: MediaQuery.of(context)
top: MediaQuery.of(
context)
.size
.height *
0.08,
left: MediaQuery.of(context)
left: MediaQuery.of(
context)
.size
.width *
0.10)
@ -340,7 +355,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Expanded(
flex: 1,
child: Padding(
padding: const EdgeInsets.all(5.0),
padding:
const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
@ -350,16 +366,20 @@ class _DashboardScreenState extends State<DashboardScreen> {
.dashboardItemsList[0]
.summaryoptions[3]
.kPIParameter,
model.dashboardItemsList[0]
.summaryoptions[3].value,
model
.dashboardItemsList[0]
.summaryoptions[3]
.value,
Colors.grey),
rowCount(
model
.dashboardItemsList[0]
.summaryoptions[4]
.kPIParameter,
model.dashboardItemsList[0]
.summaryoptions[4].value,
model
.dashboardItemsList[0]
.summaryoptions[4]
.value,
Colors.grey[300]),
],
)),
@ -367,7 +387,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
])),
RoundedContainer(
height:
MediaQuery.of(context).size.height * 0.24,
MediaQuery.of(context).size.height *
0.24,
margin: 5,
child: Column(children: [
Expanded(
@ -378,7 +399,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
flex: 5,
child: Padding(
padding:
const EdgeInsets.all(5.0),
const EdgeInsets
.all(5.0),
child: Column(
mainAxisAlignment:
MainAxisAlignment
@ -391,38 +413,45 @@ class _DashboardScreenState extends State<DashboardScreen> {
model
.dashboardItemsList[
1]
.summaryoptions[0]
.summaryoptions[
0]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[0]
.summaryoptions[
0]
.value,
Colors.red),
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[1]
.summaryoptions[
1]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[1]
.summaryoptions[
1]
.value,
Colors.black),
rowCount(
model
.dashboardItemsList[
1]
.summaryoptions[2]
.summaryoptions[
2]
.kPIParameter,
model
.dashboardItemsList[
1]
.summaryoptions[2]
.summaryoptions[
2]
.value,
Colors.grey[800]),
Colors
.grey[800]),
],
))),
Expanded(
@ -441,26 +470,31 @@ class _DashboardScreenState extends State<DashboardScreen> {
.outPatient,
fontSize: 11,
fontWeight:
FontWeight.bold,
FontWeight
.bold,
textOverflow:
TextOverflow
.ellipsis,
),
AppText(
getPatientCount(model
.dashboardItemsList[1])
getPatientCount(
model.dashboardItemsList[
1])
.toString(),
fontSize: 11,
fontWeight:
FontWeight.bold,
FontWeight
.bold,
)
],
),
top: MediaQuery.of(context)
top: MediaQuery.of(
context)
.size
.height *
0.08,
left: MediaQuery.of(context)
left: MediaQuery.of(
context)
.size
.width *
0.09)
@ -471,7 +505,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Expanded(
flex: 1,
child: Padding(
padding: const EdgeInsets.all(5.0),
padding:
const EdgeInsets.all(5.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
@ -481,31 +516,38 @@ class _DashboardScreenState extends State<DashboardScreen> {
.dashboardItemsList[1]
.summaryoptions[3]
.kPIParameter,
model.dashboardItemsList[1]
.summaryoptions[3].value,
model
.dashboardItemsList[1]
.summaryoptions[3]
.value,
Colors.grey),
rowCount(
model
.dashboardItemsList[1]
.summaryoptions[4]
.kPIParameter,
model.dashboardItemsList[1]
.summaryoptions[4].value,
model
.dashboardItemsList[1]
.summaryoptions[4]
.value,
Colors.grey[300]),
rowCount(
model
.dashboardItemsList[1]
.summaryoptions[5]
.kPIParameter,
model.dashboardItemsList[1]
.summaryoptions[5].value,
model
.dashboardItemsList[1]
.summaryoptions[5]
.value,
Colors.grey[200])
],
)),
)
]))
],
))
)
: SizedBox())
//ExpandableCardContainer(
// expandedChild: Container(
// margin: EdgeInsets.only(left: 10, right: 10),

Loading…
Cancel
Save