Xeewy/TravelMate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Implement group balance and expense management with new navigation and data handling

Browse Source
This commit is contained in:
Dayron
2025-10-28 13:06:42 +01:00
parent 94f1abfbc7
commit df1bb6da4a
10 changed files with 390 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/components/account/account_content.dart
View File

@@ -7,7 +7,8 @@ import '../../blocs/account/account_state.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:travel_mate/components/error/error_content.dart';
import '../../blocs/user/user_state.dart' as user_state;
import '../../repositories/group_repository.dart'; // Ajouter cet import
import 'group_expenses_page.dart'; // Ajouter cet import
class AccountContent extends StatefulWidget {
const AccountContent({super.key});
@@ -17,6 +18,8 @@ class AccountContent extends StatefulWidget {
}
class _AccountContentState extends State<AccountContent> {
final _groupRepository = GroupRepository(); // Ajouter cette ligne
@override
void initState() {
super.initState();
@@ -45,6 +48,44 @@ class _AccountContentState extends State<AccountContent> {
}
}
// Nouvelle méthode pour naviguer vers la page des dépenses de groupe
Future<void> _navigateToGroupExpenses(Account account) async {
try {
// Récupérer le groupe associé au compte
final group = await _groupRepository.getGroupByTripId(account.tripId);
if (group != null && mounted) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => GroupExpensesPage(
account: account,
group: group,
),
),
);
} else {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Groupe non trouvé pour ce compte'),
backgroundColor: Colors.red,
),
);
}
}
} catch (e) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Erreur lors du chargement du groupe: $e'),
backgroundColor: Colors.red,
),
);
}
}
}
@override
Widget build(BuildContext context) {
return BlocBuilder<UserBloc, user_state.UserState>(
@@ -221,7 +262,7 @@ class _AccountContentState extends State<AccountContent> {
),
subtitle: Text(memberInfo),
trailing: const Icon(Icons.chevron_right),
onTap: () {},
onTap: () => _navigateToGroupExpenses(account), // Modifier cette ligne
),
);
} catch (e) {
@@ -234,6 +275,4 @@ class _AccountContentState extends State<AccountContent> {
);
}
}
}
}

264
lib/components/account/group_expenses_page.dart
View File

@@ -0,0 +1,264 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../blocs/expense/expense_bloc.dart';
import '../../blocs/expense/expense_event.dart';
import '../../blocs/expense/expense_state.dart';
import '../../blocs/balance/balance_bloc.dart';
import '../../blocs/balance/balance_event.dart';
import '../../blocs/balance/balance_state.dart';
import '../../blocs/user/user_bloc.dart';
import '../../blocs/user/user_state.dart' as user_state;
import '../../models/account.dart';
import '../../models/group.dart';
import 'add_expense_dialog.dart';
import 'balances_tab.dart';
import 'expenses_tab.dart';
import 'settlements_tab.dart';
class GroupExpensesPage extends StatefulWidget {
final Account account;
final Group group;
const GroupExpensesPage({
super.key,
required this.account,
required this.group,
});
@override
State<GroupExpensesPage> createState() => _GroupExpensesPageState();
}
class _GroupExpensesPageState extends State<GroupExpensesPage>
with SingleTickerProviderStateMixin {
late TabController _tabController;
@override
void initState() {
super.initState();
_tabController = TabController(length: 3, vsync: this);
_loadData();
}
@override
void dispose() {
_tabController.dispose();
super.dispose();
}
void _loadData() {
// Charger les dépenses du groupe
context.read<ExpenseBloc>().add(LoadExpensesByGroup(widget.group.id));
// Charger les balances du groupe
context.read<BalanceBloc>().add(LoadGroupBalances(widget.group.id));
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(widget.account.name),
backgroundColor: Theme.of(context).primaryColor,
foregroundColor: Colors.white,
elevation: 0,
bottom: TabBar(
controller: _tabController,
indicatorColor: Colors.white,
labelColor: Colors.white,
unselectedLabelColor: Colors.white70,
tabs: const [
Tab(
icon: Icon(Icons.balance),
text: 'Balances',
),
Tab(
icon: Icon(Icons.receipt_long),
text: 'Dépenses',
),
Tab(
icon: Icon(Icons.payment),
text: 'Règlements',
),
],
),
),
body: MultiBlocListener(
listeners: [
BlocListener<ExpenseBloc, ExpenseState>(
listener: (context, state) {
if (state is ExpenseOperationSuccess) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(state.message),
backgroundColor: Colors.green,
),
);
_loadData(); // Recharger les données après une opération
} else if (state is ExpenseError) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(state.message),
backgroundColor: Colors.red,
),
);
}
},
),
],
child: TabBarView(
controller: _tabController,
children: [
// Onglet Balances
BlocBuilder<BalanceBloc, BalanceState>(
builder: (context, state) {
if (state is BalanceLoading) {
return const Center(child: CircularProgressIndicator());
} else if (state is GroupBalancesLoaded) {
return BalancesTab(balances: state.balances);
} else if (state is BalanceError) {
return _buildErrorState('Erreur lors du chargement des balances: ${state.message}');
}
return _buildEmptyState('Aucune balance disponible');
},
),
// Onglet Dépenses
BlocBuilder<ExpenseBloc, ExpenseState>(
builder: (context, state) {
if (state is ExpenseLoading) {
return const Center(child: CircularProgressIndicator());
} else if (state is ExpensesLoaded) {
return ExpensesTab(
expenses: state.expenses,
group: widget.group,
);
} else if (state is ExpenseError) {
return _buildErrorState('Erreur lors du chargement des dépenses: ${state.message}');
}
return _buildEmptyState('Aucune dépense trouvée');
},
),
// Onglet Règlements
BlocBuilder<BalanceBloc, BalanceState>(
builder: (context, state) {
if (state is BalanceLoading) {
return const Center(child: CircularProgressIndicator());
} else if (state is GroupBalancesLoaded) {
return SettlementsTab(settlements: state.settlements);
} else if (state is BalanceError) {
return _buildErrorState('Erreur lors du chargement des règlements: ${state.message}');
}
return _buildEmptyState('Aucun règlement nécessaire');
},
),
],
),
),
floatingActionButton: FloatingActionButton(
onPressed: _showAddExpenseDialog,
heroTag: "add_expense_fab",
tooltip: 'Ajouter une dépense',
child: const Icon(Icons.add),
),
);
}
Widget _buildErrorState(String message) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.error_outline,
size: 80,
color: Colors.red[300],
),
const SizedBox(height: 16),
Text(
'Erreur',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.red[600],
),
),
const SizedBox(height: 8),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 32),
child: Text(
message,
style: TextStyle(
fontSize: 16,
color: Colors.grey[600],
),
textAlign: TextAlign.center,
),
),
const SizedBox(height: 32),
ElevatedButton.icon(
onPressed: _loadData,
icon: const Icon(Icons.refresh),
label: const Text('Réessayer'),
),
],
),
);
}
Widget _buildEmptyState(String message) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.info_outline,
size: 80,
color: Colors.grey[400],
),
const SizedBox(height: 16),
Text(
'Aucune donnée',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.grey[600],
),
),
const SizedBox(height: 8),
Text(
message,
style: TextStyle(
fontSize: 16,
color: Colors.grey[500],
),
textAlign: TextAlign.center,
),
],
),
);
}
void _showAddExpenseDialog() {
final userState = context.read<UserBloc>().state;
if (userState is user_state.UserLoaded) {
showDialog(
context: context,
builder: (context) => AddExpenseDialog(
group: widget.group,
currentUser: userState.user,
),
);
} else {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Erreur: utilisateur non connecté'),
backgroundColor: Colors.red,
),
);
}
}
}