budget mockup, account settings & transactions filter

lib/domains/account/account_bloc.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:csv/csv.dart';
@@ -49,6 +50,11 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
     on<AccountLoad>(_onAccountLoad);
     // on<AccountExportJSON>(_onAccountImportJSON);
     // on<AccountExportCSV>(_onAccountImportJSON);
+    on<AccountAdd>(_onAccountAdd);
+    on<AccountRemove>(_onAcountRemove);
+    on<AccountEditLabel>(_onAccountEditLabel);
+    on<AccountEditSaving>(_onAccountEditSaving);
+    on<AccountEditColor>(_onAccountEditColor);
 
     _metadataRepository
       .getAccountsStream()
@@ -103,7 +109,7 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
 
           String accountLabel = line[3];
           if (accounts[accountLabel] == null) {
-            accounts[accountLabel] = Account(label: accountLabel);
+            accounts[accountLabel] = Account(label: accountLabel, color: 'FF74feff');
           }
 
           return Transaction(
@@ -134,4 +140,72 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
       state.copyWith(event.subAccounts)
     );
   }
+
+  _onAccountAdd(AccountAdd event, Emitter<AccountState> emit) async {
+    String uuid = const Uuid().v8();
+    Account account = Account(
+      label: 'Account $uuid',
+      color: 'FF74feff',
+      saving: false
+    );
+    emit(
+      state.copyWith(await _saveAccount(account))
+    );
+  }
+
+  _onAcountRemove(AccountRemove event, Emitter<AccountState> emit) async {
+    Account accountToRemove = event.account;
+    List<Account> accounts = state.accounts;
+    List<Transaction> transactions = _transactionsRepository.getTransactions();
+
+    if (transactions.any((transaction) => transaction.account == accountToRemove.label)) {
+      emit(AccountRemoveFail());
+      emit(AccountState(accounts: accounts));
+    } else {
+      accounts.removeWhere((account) => account.label == accountToRemove.label);
+      emit(AccountRemoveSucess());
+      emit(
+        state.copyWith(await _metadataRepository.saveAccounts(accounts))
+      );
+    }
+  }
+
+  _onAccountEditLabel(AccountEditLabel event, Emitter<AccountState> emit) async {
+    Account account = event.account;
+    account.label = event.label;
+    emit(
+      state.copyWith(await _saveAccount(account))
+    );
+  }
+
+  _onAccountEditSaving(AccountEditSaving event, Emitter<AccountState> emit) async {
+    Account account = event.account;
+    account.saving = event.saving;
+    emit(
+      state.copyWith(await _saveAccount(account))
+    );
+  }
+
+  _onAccountEditColor(AccountEditColor event, Emitter<AccountState> emit) async {
+    Account account = event.account;
+    account.color = event.color;
+    emit(
+      state.copyWith(await _saveAccount(account))
+    );
+  }
+
+  Future<List<Account>> _saveAccount(Account accountToSave) async {
+    List<Account> accounts = _metadataRepository.getAccounts();
+
+    try {
+      Account accountFound = accounts.firstWhere((account) => account.label == accountToSave.label);
+      accountFound.color = accountToSave.color;
+      accountFound.saving = accountToSave.saving;
+    } catch (e) {
+      accounts.add(accountToSave);
+    }
+
+    await _metadataRepository.saveAccounts(accounts);
+    return accounts;
+  }
 }

lib/domains/account/account_event.dart

@@ -30,3 +30,44 @@ final class AccountLoad extends AccountEvent {
   @override
   List<Object> get props => [subAccounts]; 
 }
+
+final class AccountEditColor extends AccountEvent {
+  final Account account;
+  final String color;
+
+  const AccountEditColor(this.account, this.color);
+
+  @override
+  List<Object> get props => [account, color]; 
+}
+
+final class AccountEditSaving extends AccountEvent {
+  final Account account;
+  final bool saving;
+
+  const AccountEditSaving(this.account, this.saving);
+
+  @override
+  List<Object> get props => [account, saving]; 
+}
+
+final class AccountEditLabel extends AccountEvent {
+  final Account account;
+  final String label;
+
+  const AccountEditLabel(this.account, this.label);
+
+  @override
+  List<Object> get props => [account, label]; 
+}
+
+final class AccountRemove extends AccountEvent {
+  final Account account;
+
+  const AccountRemove(this.account);
+
+  @override
+  List<Object> get props => [account]; 
+}
+
+final class AccountAdd extends AccountEvent {}

lib/domains/account/account_state.dart

@@ -1,6 +1,6 @@
 part of 'account_bloc.dart';
 
-final class AccountState extends Equatable {
+final class AccountState {
   final List<Account> accounts;
 
   const AccountState({
@@ -12,7 +12,7 @@ final class AccountState extends Equatable {
       accounts: accounts ?? this.accounts,
     );
   }
-
-  @override
-  List<Object?> get props => [accounts];
 }
+
+final class AccountRemoveFail extends AccountState {}
+final class AccountRemoveSucess extends AccountState {}

lib/domains/charts/chart_bloc.dart

@@ -7,7 +7,6 @@ import 'package:tunas/domains/charts/models/chart_item.dart';
 import 'package:tunas/repositories/metadata/metadata_repository.dart';
 import 'package:tunas/repositories/metadata/models/category.dart';
 import 'package:tunas/repositories/transactions/models/transaction.dart';
-import 'package:tunas/repositories/transactions/models/transactions.dart';
 import 'package:tunas/repositories/transactions/transactions_repository.dart';
 
 part 'chart_event.dart';
@@ -138,7 +137,7 @@ class ChartBloc extends Bloc<ChartEvent, ChartState> {
       scopedMonthlyTotals[transactionDateDay] = FlSpot(transactionDateDay.toDouble(), transactionLine.subTotal);
 
       final category = state.categories[transaction.category];
-      if (category == null || category.saving) {
+      if (category == null || category.transfert) {
         continue;
       }
 

lib/domains/transaction/transaction_bloc.dart

@@ -1,4 +1,3 @@
-
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:formz/formz.dart';
@@ -8,6 +7,7 @@ import 'package:tunas/domains/transaction/models/transaction_date.dart';
 import 'package:tunas/domains/transaction/models/transaction_description.dart';
 import 'package:tunas/domains/transaction/models/transaction_line.dart';
 import 'package:tunas/domains/transaction/models/transaction_value.dart';
+import 'package:tunas/repositories/metadata/models/category.dart';
 import 'package:tunas/repositories/transactions/models/transaction.dart';
 import 'package:tunas/repositories/transactions/transactions_repository.dart';
 import 'package:uuid/uuid.dart';
@@ -32,6 +32,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     on<TransactionAdd>(_onTransactionAddDialog);
     on<TransactionSetCurrent>(_onTransactionSetCurrent);
     on<TransactionDeleteCurrent>(_onTransactionDeleteCurrent);
+    on<TransactionFilterCategory>(_onTransactionFilterCategory);
 
     _transactionsRepository
       .getTransactionsStream()
@@ -43,6 +44,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     emit(state.copyWith(
       transactions: event.transactions,
       transactionsLines: computeResult.list,
+      transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
       globalTotal: computeResult.globalTotal,
       accountsTotals: computeResult.accountsTotals,
     ));
@@ -172,6 +174,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
         transactionValue: const TransactionValue.pure(),
         transactions: transactions,
         transactionsLines: computeResult.list,
+        transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
         globalTotal: computeResult.globalTotal,
         accountsTotals: computeResult.accountsTotals,
       ));
@@ -221,10 +224,33 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
         transactionValue: const TransactionValue.pure(),
         transactions: transactions,
         transactionsLines: computeResult.list,
+        transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
         globalTotal: computeResult.globalTotal,
         accountsTotals: computeResult.accountsTotals,
       ));
     }
   }
   
+
+  _onTransactionFilterCategory(TransactionFilterCategory event, Emitter<TransactionState> emit) {
+    List<TransactionLine> transactionsLinesFiltered = state.transactionsLines;
+    String? categoryLabel = event.category?.label;
+    if (categoryLabel != null) {
+      transactionsLinesFiltered = state.transactionsLines.where((transaction) => transaction.transaction.category == categoryLabel).toList();
+    }
+
+    emit(state.copyWith(
+      transactionsLinesFiltered: transactionsLinesFiltered,
+      categoryFilter: event.category,
+    ));
+  }
+
+  List<TransactionLine> _applyCategoryFilter(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();
+    }
+    return transactionsLinesFiltered;
+  }
 }

lib/domains/transaction/transaction_event.dart

@@ -71,4 +71,10 @@ final class TransactionSetCurrent extends TransactionEvent {
 
 final class TransactionDeleteCurrent extends TransactionEvent {
   const TransactionDeleteCurrent();
+}
+
+final class TransactionFilterCategory extends TransactionEvent {
+  final Category? category;
+
+  const TransactionFilterCategory(this.category);
 }

lib/domains/transaction/transaction_state.dart

@@ -6,6 +6,8 @@ final class TransactionState extends Equatable {
   
   final List<Transaction> transactions;
   final List<TransactionLine> transactionsLines;
+  final List<TransactionLine> transactionsLinesFiltered;
+  final Category? categoryFilter;
 
   final TransactionDate transactionDate;
   final TransactionCategory transactionCategory;
@@ -22,6 +24,7 @@ final class TransactionState extends Equatable {
     this.accountsTotals = const <String, double>{},
     this.transactions = const [],
     this.transactionsLines = const [],
+    this.transactionsLinesFiltered = const [],
     this.transactionDate = const TransactionDate.pure(),
     this.transactionCategory = const TransactionCategory.pure(),
     this.transactionDescription = const TransactionDescription.pure(),
@@ -29,7 +32,8 @@ final class TransactionState extends Equatable {
     this.transactionValue = const TransactionValue.pure(),
     this.isValid = false,
     this.showAddDialog = false,
-    this.currentTransaction
+    this.currentTransaction,
+    this.categoryFilter,
   });
 
   TransactionState copyWith({
@@ -37,6 +41,7 @@ final class TransactionState extends Equatable {
     Map<String, double>? accountsTotals,
     List<Transaction>? transactions,
     List<TransactionLine>? transactionsLines,
+    List<TransactionLine>? transactionsLinesFiltered,
     TransactionDate? transactionDate,
     TransactionCategory? transactionCategory,
     TransactionDescription? transactionDescription,
@@ -45,12 +50,14 @@ final class TransactionState extends Equatable {
     bool? isValid,
     bool? showAddDialog,
     Transaction? currentTransaction,
+    Category? categoryFilter,
   }) {
     return TransactionState(
       globalTotal: globalTotal ?? this.globalTotal,
       accountsTotals: accountsTotals ?? this.accountsTotals,
       transactions: transactions ?? this.transactions,
       transactionsLines: transactionsLines ?? this.transactionsLines,
+      transactionsLinesFiltered: transactionsLinesFiltered ?? this.transactionsLinesFiltered,
       transactionDate: transactionDate ?? this.transactionDate,
       transactionCategory: transactionCategory ?? this.transactionCategory,
       transactionDescription: transactionDescription ?? this.transactionDescription,
@@ -59,6 +66,7 @@ final class TransactionState extends Equatable {
       isValid: isValid ?? this.isValid,
       showAddDialog: showAddDialog ?? this.showAddDialog,
       currentTransaction: currentTransaction ?? this.currentTransaction,
+      categoryFilter: categoryFilter,
     );
   }
 
@@ -72,6 +80,7 @@ final class TransactionState extends Equatable {
     isValid,
     showAddDialog,
     currentTransaction,
+    categoryFilter,
   ];
   
 }