Merge pull request #124 from enrique-lozano/hot-fixes

Allow entering in the stats page with a custom date range and filters
enrique-lozano · Feb 23, 2024 · 77240fc · 77240fc
2 parents 370b42c + 0609ad4
commit 77240fc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/lib/app/home/dashboard.page.dart b/lib/app/home/dashboard.page.dart
@@ -312,7 +312,10 @@ class _DashboardPageState extends State<DashboardPage> {
                         child: CardWithHeader(
                           title: t.financial_health.display,
                           onHeaderButtonClick: () => RouteUtils.pushRoute(
-                              context, const StatsPage(initialIndex: 0)),
+                              context,
+                              StatsPage(
+                                  dateRangeService: dateRangeService,
+                                  initialIndex: 0)),
                           bodyPadding: const EdgeInsets.only(right: 8),
                           body: StreamBuilder(
                             stream: FinanceHealthService().getHealthyValue(
@@ -343,7 +346,11 @@ class _DashboardPageState extends State<DashboardPage> {
                             ),
                             onHeaderButtonClick: () {
                               RouteUtils.pushRoute(
-                                  context, const StatsPage(initialIndex: 2));
+                                context,
+                                StatsPage(
+                                    dateRangeService: dateRangeService,
+                                    initialIndex: 2),
+                              );
                             }),
                       ),
                     ],
@@ -364,7 +371,11 @@ class _DashboardPageState extends State<DashboardPage> {
                                 datePeriodState: dateRangeService),
                             onHeaderButtonClick: () {
                               RouteUtils.pushRoute(
-                                  context, const StatsPage(initialIndex: 1));
+                                context,
+                                StatsPage(
+                                    dateRangeService: dateRangeService,
+                                    initialIndex: 1),
+                              );
                             }),
                       ),
                       ResponsiveRowColumnItem(
@@ -379,7 +390,11 @@ class _DashboardPageState extends State<DashboardPage> {
                             ),
                             onHeaderButtonClick: () {
                               RouteUtils.pushRoute(
-                                  context, const StatsPage(initialIndex: 3));
+                                context,
+                                StatsPage(
+                                    dateRangeService: dateRangeService,
+                                    initialIndex: 3),
+                              );
                             }),
                       ),
                     ],

diff --git a/lib/app/stats/stats_page.dart b/lib/app/stats/stats_page.dart
@@ -19,23 +19,34 @@ import 'package:monekin/i18n/translations.g.dart';
 import '../accounts/all_accounts_balance.dart';
 
 class StatsPage extends StatefulWidget {
-  const StatsPage({super.key, this.initialIndex = 0});
+  const StatsPage({
+    super.key,
+    this.initialIndex = 0,
+    this.filters = const TransactionFilters(),
+    this.dateRangeService = const DatePeriodState(),
+  });
 
   final int initialIndex;
 
+  final TransactionFilters filters;
+  final DatePeriodState dateRangeService;
+
   @override
   State<StatsPage> createState() => _StatsPageState();
 }
 
 class _StatsPageState extends State<StatsPage> {
-  DatePeriodState dateRangeService = const DatePeriodState();
   final accountService = AccountService.instance;
 
-  TransactionFilters filters = const TransactionFilters();
+  late TransactionFilters filters;
+  late DatePeriodState dateRangeService;
 
   @override
   void initState() {
     super.initState();
+
+    filters = widget.filters;
+    dateRangeService = widget.dateRangeService;
   }
 
   Widget buildContainerWithPadding(