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

Category stats modal does not maintain filters state
enrique-lozano · Nov 30, 2023 · 8934313 · 8934313
2 parents afc26ac + d468951
commit 8934313
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/lib/app/stats/widgets/movements_distribution/category_stats_modal.dart b/lib/app/stats/widgets/movements_distribution/category_stats_modal.dart
@@ -29,10 +29,10 @@ class SubcategoryModalItem {
 
 class CategoryStatsModal extends StatelessWidget {
   const CategoryStatsModal(
-      {super.key, required this.categoryData, required this.dateRanges});
+      {super.key, required this.categoryData, required this.filters});
 
   final TrDistributionChartItem<Category> categoryData;
-  final (DateTime?, DateTime?) dateRanges;
+  final TransactionFilters filters;
 
   Future<List<SubcategoryModalItem>> getSubcategoriesData(
       BuildContext context) async {
@@ -105,13 +105,14 @@ class CategoryStatsModal extends StatelessWidget {
                     ],
                   ),
                   IconButton(
-                    onPressed: () => context.pushRoute(TransactionsRoute(
-                        filters: TransactionFilters(
-                      categories: [categoryData.category.id],
-                      includeParentCategoriesInSearch: true,
-                      minDate: dateRanges.$1,
-                      maxDate: dateRanges.$2,
-                    ))),
+                    onPressed: () => context.pushRoute(
+                      TransactionsRoute(
+                        filters: filters.copyWith(
+                          categories: [categoryData.category.id],
+                          includeParentCategoriesInSearch: true,
+                        ),
+                      ),
+                    ),
                     icon: const Icon(Icons.open_in_new),
                   )
                 ],
@@ -122,7 +123,9 @@ class CategoryStatsModal extends StatelessWidget {
                 children: [
                   Text(
                     DateRangeService().getTextOfRange(
-                        startDate: dateRanges.$1, endDate: dateRanges.$2),
+                      startDate: filters.minDate,
+                      endDate: filters.maxDate,
+                    ),
                     style: const TextStyle(fontWeight: FontWeight.w300),
                   ),
                   CurrencyDisplayer(

diff --git a/lib/app/stats/widgets/movements_distribution/chart_by_categories.dart b/lib/app/stats/widgets/movements_distribution/chart_by_categories.dart
@@ -51,6 +51,20 @@ class _ChartByCategoriesState extends State<ChartByCategories> {
   int touchedIndex = -1;
   late TransactionType transactionsType;
 
+  TransactionFilters _getTransactionFilters() {
+    return widget.filters.copyWith(
+      status:
+          TransactionStatus.getStatusThatCountsForStats(widget.filters.status),
+      transactionTypes: [
+        if (transactionsType == TransactionType.expense)
+          TransactionType.expense,
+        if (transactionsType == TransactionType.income) TransactionType.income
+      ],
+      minDate: widget.startDate,
+      maxDate: widget.endDate,
+    );
+  }
+
   Future<List<TrDistributionChartItem<Category>>> getEvolutionData(
     BuildContext context,
   ) async {
@@ -59,20 +73,7 @@ class _ChartByCategoriesState extends State<ChartByCategories> {
     final transactionService = TransactionService.instance;
 
     final transactions = await transactionService
-        .getTransactions(
-          filters: widget.filters.copyWith(
-            status: TransactionStatus.getStatusThatCountsForStats(
-                widget.filters.status),
-            transactionTypes: [
-              if (transactionsType == TransactionType.expense)
-                TransactionType.expense,
-              if (transactionsType == TransactionType.income)
-                TransactionType.income
-            ],
-            minDate: widget.startDate,
-            maxDate: widget.endDate,
-          ),
-        )
+        .getTransactions(filters: _getTransactionFilters())
         .first;
 
     for (final transaction in transactions) {
@@ -358,7 +359,7 @@ class _ChartByCategoriesState extends State<ChartByCategories> {
                           builder: (context) {
                             return CategoryStatsModal(
                               categoryData: dataCategory,
-                              dateRanges: (widget.startDate, widget.endDate),
+                              filters: _getTransactionFilters(),
                             );
                           });
                     },