working on dashboard

merge-requests/648/head
mosazaid 5 years ago
parent 2023ce9b55
commit 72ee88d567

@ -27,55 +27,59 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Swiper( return Container(
onIndexChanged: (index) { // height: MediaQuery.of(context).size.height * 0.35,
if (mounted) { height: 230,
setState(() { child: Swiper(
sliderActiveIndex = index; onIndexChanged: (index) {
widget.sliderChange(index); if (mounted) {
}); setState(() {
} sliderActiveIndex = index;
}, widget.sliderChange(index);
itemBuilder: (BuildContext context, int index) { });
return getSwipeWidget(widget.dashboardItemList, index); }
}, },
itemCount: 3, itemBuilder: (BuildContext context, int index) {
// itemHeight: 300, return getSwipeWidget(widget.dashboardItemList, index);
pagination: new SwiperCustomPagination( },
builder: (BuildContext context, SwiperPluginConfig config) { itemCount: 3,
return new Stack( // itemHeight: 300,
alignment: Alignment.bottomCenter, pagination: new SwiperCustomPagination(
children: [ builder: (BuildContext context, SwiperPluginConfig config) {
Positioned( return new Stack(
bottom: 0, alignment: Alignment.bottomCenter,
child: Center( children: [
child: InkWell( Positioned(
onTap: () {}, bottom: 0,
child: Container( child: Center(
child: Row( child: InkWell(
mainAxisAlignment: MainAxisAlignment.spaceBetween, onTap: () {},
children: [ child: Container(
config.activeIndex == 0 child: Row(
? SwiperRoundedPagination(true) mainAxisAlignment: MainAxisAlignment.spaceBetween,
: SwiperRoundedPagination(false), children: [
config.activeIndex == 1 config.activeIndex == 0
? SwiperRoundedPagination(true) ? SwiperRoundedPagination(true)
: SwiperRoundedPagination(false), : SwiperRoundedPagination(false),
config.activeIndex == 2 config.activeIndex == 1
? SwiperRoundedPagination(true) ? SwiperRoundedPagination(true)
: SwiperRoundedPagination(false), : SwiperRoundedPagination(false),
], config.activeIndex == 2
? SwiperRoundedPagination(true)
: SwiperRoundedPagination(false),
],
),
), ),
), ),
), ),
), )
) ],
], );
); }),
}), viewportFraction: 0.9,
viewportFraction: 0.9, // scale: 0.9,
// scale: 0.9, // control: new SwiperControl(),
// control: new SwiperControl(), ),
); );
} }
@ -83,21 +87,21 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
if (index == 1) if (index == 1)
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
margin: EdgeInsets.only(top: 20, bottom: 20, left: 10, right: 10), margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
child: Padding( child: Padding(
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
child: GetOutPatientStack(dashboardItemList[1]))); child: GetOutPatientStack(dashboardItemList[1])));
if (index == 0) if (index == 0)
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
margin: EdgeInsets.only(top: 20, bottom: 20, left: 10, right: 10), margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
child: Padding( child: Padding(
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
child: GetOutPatientStack(dashboardItemList[0]))); child: GetOutPatientStack(dashboardItemList[0])));
if (index == 2) if (index == 2)
return RoundedContainer( return RoundedContainer(
raduis: 16, raduis: 16,
margin: EdgeInsets.only(top: 20, bottom: 20, left: 10, right: 10), margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
child: child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Expanded( Expanded(
@ -112,61 +116,65 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding(
padding: EdgeInsets.all(8),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.patients,
fontSize: 12,
fontWeight: FontWeight.bold,
fontHeight: 0.5,
),
AppText(
TranslationBase.of(context)
.referral,
fontSize: 22,
fontWeight: FontWeight.bold,
),
],
)),
Expanded( Expanded(
flex: 1, flex: 1,
child: Padding(
padding: EdgeInsets.all(8),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context)
.patients,
fontSize: 12,
fontWeight: FontWeight.bold,
fontHeight: 0.5,
),
AppText(
TranslationBase.of(context)
.referral,
fontSize: 22,
fontWeight: FontWeight.bold,
),
],
))),
Expanded(
flex: 2,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RowCounts( Expanded(
dashboardItemList[2] child: RowCounts(
.summaryoptions[0] dashboardItemList[2]
.kPIParameter, .summaryoptions[0]
dashboardItemList[2] .kPIParameter,
.summaryoptions[0] dashboardItemList[2]
.value, .summaryoptions[0]
Colors.black), .value,
RowCounts( Colors.black),
dashboardItemList[2] ),
.summaryoptions[1] Expanded(
.kPIParameter, child: RowCounts(
dashboardItemList[2] dashboardItemList[2]
.summaryoptions[1] .summaryoptions[1]
.value, .kPIParameter,
Colors.grey), dashboardItemList[2]
RowCounts( .summaryoptions[1]
dashboardItemList[2] .value,
.summaryoptions[2] Colors.grey),
.kPIParameter, ),
dashboardItemList[2] Expanded(
.summaryoptions[2] child: RowCounts(
.value, dashboardItemList[2]
Colors.red), .summaryoptions[2]
.kPIParameter,
dashboardItemList[2]
.summaryoptions[2]
.value,
Colors.red),
),
], ],
), ),
) )
@ -187,7 +195,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
widget.model widget.model
.getPatientCount(dashboardItemList[2]) .getPatientCount(dashboardItemList[2])
.toString(), .toString(),
fontSize: 30, fontSize: 28,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
) )
], ],

@ -202,19 +202,17 @@ class _HomeScreenState extends State<HomeScreen> {
])), ])),
content: Column( content: Column(
children: [ children: [
Container( model.dashboardItemsList.length > 0
height: MediaQuery.of(context).size.height * 0.35, ? DashboardSwipeWidget(
child: model.dashboardItemsList.length > 0 model.dashboardItemsList,
? DashboardSwipeWidget( model,
model.dashboardItemsList, (sliderIndex) {
model, setState(() {
(sliderIndex) { sliderActiveIndex = sliderIndex;
setState(() { });
sliderActiveIndex = sliderIndex; },
}); )
}, : SizedBox(),
)
: SizedBox()),
model.dashboardItemsList.length > 0 model.dashboardItemsList.length > 0
? FractionallySizedBox( ? FractionallySizedBox(
widthFactor: 0.90, widthFactor: 0.90,

@ -19,9 +19,13 @@ class GetOutPatientStack extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
AppText( Container(
value.kPIName, height: 30,
medium: true, child: AppText(
value.kPIName,
medium: true,
fontSize: 14,
),
), ),
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list) Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: list)
], ],

@ -24,7 +24,7 @@ class RowCounts extends StatelessWidget {
name, name,
color: Colors.black, color: Colors.black,
textAlign: TextAlign.start, // from TextAlign.center textAlign: TextAlign.start, // from TextAlign.center
fontSize: 12, fontSize: 11,
textOverflow: TextOverflow.ellipsis, textOverflow: TextOverflow.ellipsis,
), ),
), ),
@ -32,7 +32,7 @@ class RowCounts extends StatelessWidget {
' (' + count.toString() + ')', ' (' + count.toString() + ')',
color: Colors.black, color: Colors.black,
textAlign: TextAlign.center, textAlign: TextAlign.center,
fontSize: 13, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
) )
], ],

Loading…
Cancel
Save