added account filter

lib/domains/transaction/models/transaction_line.dart

@@ -1,11 +1,15 @@
+import 'package:equatable/equatable.dart';
 import 'package:krezus/repositories/transactions/models/transaction.dart';
 
-class TransactionLine {
+class TransactionLine extends Equatable{
-  Transaction transaction;
+  final Transaction transaction;
-  double subTotal;
+  final double subTotal;
 
-  TransactionLine({
+  const TransactionLine({
     required this.transaction,
     required this.subTotal,
   });
+  
+  @override
+  List<Object?> get props => [transaction, subTotal];
 }

lib/domains/transaction/transaction_bloc.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:formz/formz.dart';
@@ -7,6 +9,7 @@ import 'package:krezus/domains/transaction/models/transaction_date.dart';
 import 'package:krezus/domains/transaction/models/transaction_description.dart';
 import 'package:krezus/domains/transaction/models/transaction_line.dart';
 import 'package:krezus/domains/transaction/models/transaction_value.dart';
+import 'package:krezus/repositories/metadata/models/account.dart';
 import 'package:krezus/repositories/metadata/models/category.dart';
 import 'package:krezus/repositories/transactions/models/transaction.dart';
 import 'package:krezus/repositories/transactions/transactions_repository.dart';
@@ -33,18 +36,19 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     on<TransactionSetCurrent>(_onTransactionSetCurrent);
     on<TransactionDeleteCurrent>(_onTransactionDeleteCurrent);
     on<TransactionFilterCategory>(_onTransactionFilterCategory);
+    on<TransactionFilterAccount>(_onTransactionFilterAccount);
 
     _transactionsRepository
       .getTransactionsStream()
       .listen((transactions) => add(TransactionsLoad(transactions)));
   }
 
-  _onAccountLoad(TransactionsLoad event, Emitter<TransactionState> emit) {
+  FutureOr<void> _onAccountLoad(TransactionsLoad event, Emitter<TransactionState> emit) {
     var computeResult = _computeTransactionLine(event.transactions);
     emit(state.copyWith(
       transactions: event.transactions,
       transactionsLines: computeResult.list,
-      transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
+      transactionsLinesFiltered: _applyFilters(computeResult.list),
       globalTotal: computeResult.globalTotal,
       accountsTotals: computeResult.accountsTotals,
     ));
@@ -73,7 +77,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     return (list: output, globalTotal: globalTotal, accountsTotals: accountsTotals, categories: categories.toList());
   }
 
-  _onTransactionDateChange(
+  FutureOr<void> _onTransactionDateChange(
     TransactionDateChange event, Emitter<TransactionState> emit
   ) {
     final transactionDate = TransactionDate.dirty(event.date);
@@ -83,7 +87,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionCategoryChange(
+  FutureOr<void> _onTransactionCategoryChange(
     TransactionCategoryChange event, Emitter<TransactionState> emit
   ) {
     final transactionCategory = TransactionCategory.dirty(event.category);
@@ -93,7 +97,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionDescriptionChange(
+  FutureOr<void> _onTransactionDescriptionChange(
     TransactionDescriptionChange event, Emitter<TransactionState> emit
   ) {
     final transactionDescription = TransactionDescription.dirty(event.description);
@@ -103,7 +107,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionAccountChange(
+  FutureOr<void> _onTransactionAccountChange(
     TransactionAccountChange event, Emitter<TransactionState> emit
   ) {
     final transactionAccount = TransactionAccount.dirty(event.account);
@@ -113,7 +117,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionValueChange(
+  FutureOr<void> _onTransactionValueChange(
     TransactionValueChange event, Emitter<TransactionState> emit
   ) {
     try {
@@ -131,19 +135,19 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     }
   }
 
-  _onTransactionOpenAddDialog(
+  FutureOr<void> _onTransactionOpenAddDialog(
     TransactionOpenAddDialog event, Emitter<TransactionState> emit
   ) {
     emit(state.copyWith(showAddDialog: true));
   }
 
-  _onTransactionHideAddDialog(
+  FutureOr<void> _onTransactionHideAddDialog(
     TransactionHideAddDialog event, Emitter<TransactionState> emit
   ) {
     emit(state.copyWith(showAddDialog: false));
   }
 
-  _onTransactionAddDialog(
+  FutureOr<void> _onTransactionAddDialog(
     TransactionAdd event, Emitter<TransactionState> emit
   ) {
     if (state.isValid) {
@@ -174,14 +178,14 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
         // transactionValue: const TransactionValue.pure(),
         transactions: transactions,
         transactionsLines: computeResult.list,
-        transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
+        transactionsLinesFiltered: _applyFilters(computeResult.list),
         globalTotal: computeResult.globalTotal,
         accountsTotals: computeResult.accountsTotals,
       ));
     }
   }
 
-  _onTransactionSetCurrent(
+  FutureOr<void> _onTransactionSetCurrent(
     TransactionSetCurrent event, Emitter<TransactionState> emit
   ) {
     Transaction? transaction = event.transaction;
@@ -206,7 +210,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     }
   }
 
-  _onTransactionDeleteCurrent(
+  FutureOr<void> _onTransactionDeleteCurrent(
     TransactionDeleteCurrent event, Emitter<TransactionState> emit
   ) {
     Transaction? currentTransaction = state.currentTransaction;
@@ -224,33 +228,72 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
         transactionValue: const TransactionValue.pure(),
         transactions: transactions,
         transactionsLines: computeResult.list,
-        transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
+        transactionsLinesFiltered: _applyFilters(computeResult.list),
         globalTotal: computeResult.globalTotal,
         accountsTotals: computeResult.accountsTotals,
       ));
     }
   }
-  
 
-  _onTransactionFilterCategory(TransactionFilterCategory event, Emitter<TransactionState> emit) {
+  FutureOr<void> _onTransactionFilterCategory(TransactionFilterCategory event, Emitter<TransactionState> emit) {
-    List<TransactionLine> transactionsLinesFiltered = state.transactionsLines;
+    emit(TransactionState(
-    String? categoryLabel = event.category?.label;
+      globalTotal: state.globalTotal,
-    if (categoryLabel != null) {
+      accountsTotals: state.accountsTotals,
-      transactionsLinesFiltered = state.transactionsLines.where((transaction) => transaction.transaction.category == categoryLabel).toList();
+      transactions: state.transactions,
-    }
+      transactionsLines: state.transactionsLines,
+      transactionsLinesFiltered: state.transactionsLinesFiltered,
+      transactionDate: state.transactionDate,
+      transactionCategory: state.transactionCategory,
+      transactionDescription: state.transactionDescription,
+      transactionAccount: state.transactionAccount,
+      transactionValue: state.transactionValue,
+      isValid: state.isValid,
+      showAddDialog: state.showAddDialog,
+      currentTransaction: state.currentTransaction,
+      categoryFilter: event.category,
+      accountFilter: state.accountFilter,
+    ));
 
     emit(state.copyWith(
-      transactionsLinesFiltered: transactionsLinesFiltered,
+      transactionsLinesFiltered: _applyFilters(state.transactionsLines),
-      categoryFilter: event.category,
     ));
   }
 
-  List<TransactionLine> _applyCategoryFilter(List<TransactionLine> transactionsLines) {
+  FutureOr<void> _onTransactionFilterAccount(TransactionFilterAccount event, Emitter<TransactionState> emit) {
+    emit(TransactionState(
+      globalTotal: state.globalTotal,
+      accountsTotals: state.accountsTotals,
+      transactions: state.transactions,
+      transactionsLines: state.transactionsLines,
+      transactionsLinesFiltered: state.transactionsLinesFiltered,
+      transactionDate: state.transactionDate,
+      transactionCategory: state.transactionCategory,
+      transactionDescription: state.transactionDescription,
+      transactionAccount: state.transactionAccount,
+      transactionValue: state.transactionValue,
+      isValid: state.isValid,
+      showAddDialog: state.showAddDialog,
+      currentTransaction: state.currentTransaction,
+      categoryFilter: state.categoryFilter,
+      accountFilter: event.account,
+    ));
+    emit(state.copyWith(
+      transactionsLinesFiltered: _applyFilters(state.transactionsLines),
+    ));
+  }
+
+  List<TransactionLine> _applyFilters(List<TransactionLine> transactionsLines) {
     List<TransactionLine> transactionsLinesFiltered = transactionsLines;
     String? categoryLabel = state.categoryFilter?.label;
     if (categoryLabel != null) {
-      transactionsLinesFiltered = state.transactionsLines.where((transaction) => transaction.transaction.category == categoryLabel).toList();
+      transactionsLinesFiltered = transactionsLinesFiltered.where((transaction) => transaction.transaction.category == categoryLabel).toList();
     }
+
+    String? accountLabel = state.accountFilter?.label;
+    if (accountLabel != null) {
+      transactionsLinesFiltered = transactionsLinesFiltered.where((transaction) => transaction.transaction.account == accountLabel).toList();
+    }
+
     return transactionsLinesFiltered;
   }
 }

lib/domains/transaction/transaction_event.dart

@@ -77,4 +77,10 @@ final class TransactionFilterCategory extends TransactionEvent {
   final Category? category;
 
   const TransactionFilterCategory(this.category);
+}
+
+final class TransactionFilterAccount extends TransactionEvent {
+  final Account? account;
+
+  const TransactionFilterAccount(this.account);
 }

lib/domains/transaction/transaction_state.dart

@@ -8,6 +8,7 @@ final class TransactionState extends Equatable {
   final List<TransactionLine> transactionsLines;
   final List<TransactionLine> transactionsLinesFiltered;
   final Category? categoryFilter;
+  final Account? accountFilter;
 
   final TransactionDate transactionDate;
   final TransactionCategory transactionCategory;
@@ -34,6 +35,7 @@ final class TransactionState extends Equatable {
     this.showAddDialog = false,
     this.currentTransaction,
     this.categoryFilter,
+    this.accountFilter,
   });
 
   TransactionState copyWith({
@@ -51,6 +53,7 @@ final class TransactionState extends Equatable {
     bool? showAddDialog,
     Transaction? currentTransaction,
     Category? categoryFilter,
+    Account? accountFilter,
   }) {
     return TransactionState(
       globalTotal: globalTotal ?? this.globalTotal,
@@ -66,12 +69,16 @@ final class TransactionState extends Equatable {
       isValid: isValid ?? this.isValid,
       showAddDialog: showAddDialog ?? this.showAddDialog,
       currentTransaction: currentTransaction ?? this.currentTransaction,
-      categoryFilter: categoryFilter,
+      categoryFilter: categoryFilter ?? this.categoryFilter,
+      accountFilter: accountFilter ?? this.accountFilter,
     );
   }
 
   @override
   List<Object?> get props => [
+    transactions,
+    transactionsLines,
+    transactionsLinesFiltered,
     transactionDate,
     transactionCategory,
     transactionDescription,
@@ -81,6 +88,7 @@ final class TransactionState extends Equatable {
     showAddDialog,
     currentTransaction,
     categoryFilter,
+    accountFilter,
   ];
   
 }

lib/pages/transactions/widgets/account_filter.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:krezus/domains/account/account_bloc.dart';
+import 'package:krezus/domains/transaction/transaction_bloc.dart';
+import 'package:krezus/repositories/metadata/models/account.dart';
+
+class AccountFilter extends StatelessWidget {
+  const AccountFilter({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final accountState = context.watch<AccountBloc>().state;
+
+    return BlocBuilder<TransactionBloc, TransactionState>(
+      buildWhen: (previous, current) => previous.accountFilter != current.accountFilter,
+      builder: (context, state) => SizedBox(
+        width: 300,
+        child: DropdownButtonFormField<Account>(
+          value: state.accountFilter,
+          onChanged: (value) => context.read<TransactionBloc>().add(TransactionFilterAccount(value!)),
+          items: accountState.accounts.map((e) => DropdownMenuItem(value: e, child: Text(e.label))).toList(),
+          decoration: InputDecoration(
+            suffixIcon: IconButton(
+              icon: const Icon(Icons.filter_alt_off),
+              onPressed: () => context.read<TransactionBloc>().add(const TransactionFilterAccount(null)),
+            ),
+            hintText: 'Account',
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(5),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/transactions/widgets/category_filter.dart

@@ -10,10 +10,11 @@ class CategoryFilter extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final categoryState = context.watch<CategoryBloc>().state;
+
     return BlocBuilder<TransactionBloc, TransactionState>(
       buildWhen: (previous, current) => previous.categoryFilter != current.categoryFilter,
       builder: (context, state) => SizedBox(
-        width: 500,
+        width: 300,
         child: DropdownButtonFormField<krezus_category.Category>(
           value: state.categoryFilter,
           onChanged: (value) => context.read<TransactionBloc>().add(TransactionFilterCategory(value!)),

lib/pages/transactions/widgets/transactions_actions.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:krezus/domains/transaction/transaction_bloc.dart';
+import 'package:krezus/pages/transactions/widgets/account_filter.dart';
 import 'package:krezus/pages/transactions/widgets/category_filter.dart';
 import 'package:krezus/pages/transactions/widgets/transaction_add_dialog.dart';
 
@@ -31,6 +32,7 @@ class TransactionsActions extends StatelessWidget {
           ],
         ),
         const CategoryFilter(),
+        const AccountFilter(),
       ],
     );
   }
@@ -47,6 +49,7 @@ class TransactionsActions extends StatelessWidget {
           ),
         ),
         const CategoryFilter(),
+        const AccountFilter(),
         IconButton(
           onPressed: () => TransactionAddDialog.show(context, null),
           icon: const Icon(

lib/pages/transactions/widgets/transactions_list.dart

@@ -15,10 +15,10 @@ class TransactionsList extends StatelessWidget {
           itemCount: state.transactionsLinesFiltered.length,
           itemBuilder: (context, index) => TransactionLine(
             transaction: state.transactionsLinesFiltered[index].transaction,
-            subTotal: state.transactionsLinesFiltered[index].subTotal
+            subTotal: state.transactionsLinesFiltered[index].subTotal,
-          )
+          ),
-        )
+        ),
-      )
+      ),
     );
   }
 }

lib/repositories/transactions/models/transaction.dart

@@ -1,14 +1,15 @@
+import 'package:equatable/equatable.dart';
 import 'package:uuid/uuid.dart';
 
-class Transaction {
+class Transaction extends Equatable {
-  String uuid;
+  final String uuid;
-  DateTime date;
+  final DateTime date;
-  String category;
+  final String category;
-  String description;
+  final String description;
-  String account;
+  final String account;
-  double value;
+  final double value;
 
-  Transaction({
+  const Transaction({
     required this.uuid,
     required this.date,
     required this.category,
@@ -36,4 +37,7 @@ class Transaction {
     'account': account,
     'value': value.toString(),
   };
+  
+  @override
+  List<Object?> get props => [uuid, date, category, description, account, value];
 }