diff --git a/lib/pages/pharmacies/screens/lakum-points-year-page.dart b/lib/pages/pharmacies/screens/lakum-points-year-page.dart index 7538e287..79d36983 100644 --- a/lib/pages/pharmacies/screens/lakum-points-year-page.dart +++ b/lib/pages/pharmacies/screens/lakum-points-year-page.dart @@ -1,6 +1,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PointsAmountPerYear.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/lacum-viewmodel.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/pages/pharmacies/widgets/lakum-point-table-row-widget.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; @@ -41,14 +42,34 @@ class _LakumPointsYearPageState extends State { ...List.generate( widget.pointsAmountPerYear.length, (index) => LacumPointsYearWidget( - mediaQuery, - widget.selectedIndexYear == index, - widget.pointsAmountPerYear[index], - () {})), + mediaQuery, + widget.selectedIndexYear == index, + widget.pointsAmountPerYear[index], () { + setState(() { + widget.selectedIndexYear = index; + }); + })), ], ), ), - + SizedBox( + height: 10, + ), + LakumPointTableRowWidget(true, "MONTH", 0, 0, null, 0), + ...List.generate( + widget.pointsAmountPerYear[widget.selectedIndexYear] + .pointsAmountPerMonth.length, + (index) => LakumPointTableRowWidget( + true, + widget.pointsAmountPerYear[widget.selectedIndexYear] + .pointsAmountPerMonth[index].month, + widget.pointsAmountPerYear[widget.selectedIndexYear] + .pointsAmountPerMonth[index].pointsPerMonth, + widget.pointsAmountPerYear[widget.selectedIndexYear] + .pointsAmountPerMonth[index].amountPerMonth, + (){}, + index), + ), ], ), ), diff --git a/lib/pages/pharmacies/widgets/lakum-point-table-row-widget.dart b/lib/pages/pharmacies/widgets/lakum-point-table-row-widget.dart index 5ded2e75..ca465d77 100644 --- a/lib/pages/pharmacies/widgets/lakum-point-table-row-widget.dart +++ b/lib/pages/pharmacies/widgets/lakum-point-table-row-widget.dart @@ -1,15 +1,16 @@ +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/material.dart'; class LakumPointTableRowWidget extends StatefulWidget { final bool isTableTitle; // true : title , false: row - final String tableType; // month, day + final String rowTitle; final double points; final double riyal; final Function onTap; final int rowIndex; - LakumPointTableRowWidget( - this.isTableTitle, this.tableType, this.points, this.riyal, this.onTap, this.rowIndex); + LakumPointTableRowWidget(this.isTableTitle, this.rowTitle, this.points, + this.riyal, this.onTap, this.rowIndex); @override _LakumPointTableRowWidgetState createState() => @@ -20,22 +21,59 @@ class _LakumPointTableRowWidgetState extends State { @override Widget build(BuildContext context) { bool isEven = widget.rowIndex % 2 == 0; - return Container( - child: Column( - children: [ - Row( - children: [ - - ], - ), - const Divider( - color: Color(0xFFD6D6D6), - height: 1, - thickness: 2, - indent: 0, - endIndent: 0, - ), - ], + return InkWell( + onTap: widget.onTap, + child: Container( + color: isEven ? Color(0xffefefef) : Colors.white, + child: Column( + children: [ + Row( + children: [ + Expanded( + child: Container( + child: Texts( + widget.rowTitle, + fontSize: 14, + fontWeight: widget.isTableTitle + ? FontWeight.bold + : FontWeight.normal, + ), + )), + Expanded( + child: Container( + child: Texts( + widget.isTableTitle ? "POINTS" : widget.points, + fontSize: 14, + fontWeight: widget.isTableTitle + ? FontWeight.bold + : FontWeight.normal, + ), + )), + Expanded( + child: Container( + child: Texts( + widget.isTableTitle ? "RIYAL" : widget.riyal, + fontSize: 14, + fontWeight: widget.isTableTitle + ? FontWeight.bold + : FontWeight.normal, + ), + )), + Expanded( + child: widget.isTableTitle + ? Container() + : Icon(Icons.arrow_forward_ios)), + ], + ), + const Divider( + color: Color(0xFFD6D6D6), + height: 1, + thickness: 2, + indent: 0, + endIndent: 0, + ), + ], + ), ), ); }