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

feat: Add logger service and improve expense dialog with enhanced receipt management and calculation logic.

Browse Source
This commit is contained in:
Van Leemput Dayron
2025-11-28 12:54:54 +01:00
parent cad9d42128
commit fd710b8cb8
35 changed files with 2148 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,8 @@ import '../../models/group.dart';
import 'add_expense_dialog.dart';
import 'balances_tab.dart';
import 'expenses_tab.dart';
import 'settlements_tab.dart';
import '../../models/user_balance.dart';
import '../../models/expense.dart';
class GroupExpensesPage extends StatefulWidget {
final Account account;
@@ -31,13 +32,14 @@ class GroupExpensesPage extends StatefulWidget {
class _GroupExpensesPageState extends State<GroupExpensesPage>
with SingleTickerProviderStateMixin {
late TabController _tabController;
ExpenseCategory? _selectedCategory;
String? _selectedPayerId;
@override
void initState() {
super.initState();
_tabController = TabController(length: 3, vsync: this);
_tabController = TabController(length: 2, vsync: this);
_loadData();
}
@@ -50,39 +52,41 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
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) {
final theme = Theme.of(context);
final isDarkMode = theme.brightness == Brightness.dark;
return Scaffold(
backgroundColor: isDarkMode
? theme.scaffoldBackgroundColor
: Colors.grey[50],
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',
),
],
title: const Text(
'Dépenses du voyage',
style: TextStyle(fontWeight: FontWeight.bold),
),
centerTitle: true,
backgroundColor: Colors.transparent,
elevation: 0,
foregroundColor: theme.colorScheme.onSurface,
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () => Navigator.pop(context),
),
actions: [
IconButton(
icon: const Icon(Icons.filter_list),
onPressed: () {
_showFilterDialog();
},
),
],
),
body: MultiBlocListener(
listeners: [
@@ -103,56 +107,107 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
backgroundColor: Colors.red,
),
);
} else if (state is ExpensesLoaded) {
// Rafraîchir les balances quand les dépenses changent (ex: via stream)
context.read<BalanceBloc>().add(
RefreshBalance(widget.group.id),
);
}
},
),
],
child: TabBarView(
controller: _tabController,
child: Column(
children: [
// Onglet Balances
// Summary Card
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}');
if (state is GroupBalancesLoaded) {
return _buildSummaryCard(state.balances, isDarkMode);
}
return _buildEmptyState('Aucune balance disponible');
return const SizedBox.shrink();
},
),
// 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');
},
// Tabs
Container(
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: theme.dividerColor, width: 1),
),
),
child: TabBar(
controller: _tabController,
labelColor: theme.colorScheme.primary,
unselectedLabelColor: theme.colorScheme.onSurface.withValues(
alpha: 0.6,
),
indicatorColor: theme.colorScheme.primary,
indicatorWeight: 3,
labelStyle: const TextStyle(fontWeight: FontWeight.bold),
tabs: const [
Tab(text: 'Toutes les dépenses'),
Tab(text: 'Mes soldes'),
],
),
),
// 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');
},
// Tab View
Expanded(
child: TabBarView(
controller: _tabController,
children: [
// Onglet Dépenses
BlocBuilder<ExpenseBloc, ExpenseState>(
builder: (context, state) {
if (state is ExpenseLoading) {
return const Center(child: CircularProgressIndicator());
} else if (state is ExpensesLoaded) {
final userState = context.read<UserBloc>().state;
final currentUserId = userState is user_state.UserLoaded
? userState.user.id
: '';
var filteredExpenses = state.expenses;
if (_selectedCategory != null) {
filteredExpenses = filteredExpenses
.where((e) => e.category == _selectedCategory)
.toList();
}
if (_selectedPayerId != null) {
filteredExpenses = filteredExpenses
.where((e) => e.paidById == _selectedPayerId)
.toList();
}
return ExpensesTab(
expenses: filteredExpenses,
group: widget.group,
currentUserId: currentUserId,
);
} else if (state is ExpenseError) {
return _buildErrorState('Erreur: ${state.message}');
}
return _buildEmptyState('Aucune dépense trouvée');
},
),
// Onglet Balances (Combiné)
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: ${state.message}');
}
return _buildEmptyState('Aucune balance disponible');
},
),
],
),
),
],
),
@@ -160,8 +215,109 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
floatingActionButton: FloatingActionButton(
onPressed: _showAddExpenseDialog,
heroTag: "add_expense_fab",
backgroundColor: Colors.blue,
foregroundColor: Colors.white,
elevation: 4,
shape: const CircleBorder(),
tooltip: 'Ajouter une dépense',
child: const Icon(Icons.add),
child: const Icon(Icons.add, size: 32),
),
);
}
Widget _buildSummaryCard(List<UserBalance> balances, bool isDarkMode) {
// Trouver la balance de l'utilisateur courant
final userState = context.read<UserBloc>().state;
double myBalance = 0;
if (userState is user_state.UserLoaded) {
final myBalanceObj = balances.firstWhere(
(b) => b.userId == userState.user.id,
orElse: () => const UserBalance(
userId: '',
userName: '',
totalPaid: 0,
totalOwed: 0,
balance: 0,
),
);
myBalance = myBalanceObj.balance;
}
final isPositive = myBalance >= 0;
final color = isPositive ? Colors.green : Colors.red;
final amountStr = '${myBalance.abs().toStringAsFixed(2)} €';
return Container(
margin: const EdgeInsets.all(16),
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: isDarkMode ? Colors.grey[800] : Colors.white,
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.05),
blurRadius: 10,
offset: const Offset(0, 4),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Votre solde total',
style: TextStyle(
color: isDarkMode ? Colors.grey[400] : Colors.grey[600],
fontSize: 14,
),
),
const SizedBox(height: 8),
Row(
children: [
Text(
isPositive ? 'On vous doit ' : 'Vous devez ',
style: TextStyle(
color: color,
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
Text(
amountStr,
style: TextStyle(
color: color,
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
],
),
const SizedBox(height: 8),
Text(
isPositive
? 'Vous êtes en positif sur ce voyage.'
: 'Vous êtes en négatif sur ce voyage.',
style: TextStyle(
color: isDarkMode ? Colors.grey[400] : Colors.grey[600],
fontSize: 14,
),
),
const SizedBox(height: 12),
InkWell(
onTap: () {
_tabController.animateTo(1); // Aller à l'onglet Balances
},
child: Text(
'Voir le détail des soldes',
style: TextStyle(
color: Colors.blue[400],
fontWeight: FontWeight.w500,
fontSize: 14,
),
),
),
],
),
);
}
@@ -171,11 +327,7 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.error_outline,
size: 80,
color: Colors.red[300],
),
Icon(Icons.error_outline, size: 80, color: Colors.red[300]),
const SizedBox(height: 16),
Text(
'Erreur',
@@ -190,10 +342,7 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
padding: const EdgeInsets.symmetric(horizontal: 32),
child: Text(
message,
style: TextStyle(
fontSize: 16,
color: Colors.grey[600],
),
style: TextStyle(fontSize: 16, color: Colors.grey[600]),
textAlign: TextAlign.center,
),
),
@@ -213,11 +362,7 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.info_outline,
size: 80,
color: Colors.grey[400],
),
Icon(Icons.info_outline, size: 80, color: Colors.grey[400]),
const SizedBox(height: 16),
Text(
'Aucune donnée',
@@ -230,10 +375,7 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
const SizedBox(height: 8),
Text(
message,
style: TextStyle(
fontSize: 16,
color: Colors.grey[500],
),
style: TextStyle(fontSize: 16, color: Colors.grey[500]),
textAlign: TextAlign.center,
),
],
@@ -243,14 +385,12 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
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,
),
builder: (context) =>
AddExpenseDialog(group: widget.group, currentUser: userState.user),
);
} else {
ScaffoldMessenger.of(context).showSnackBar(
@@ -261,4 +401,96 @@ class _GroupExpensesPageState extends State<GroupExpensesPage>
);
}
}
}
void _showFilterDialog() {
showDialog(
context: context,
builder: (context) {
return StatefulBuilder(
builder: (context, setState) {
return AlertDialog(
title: const Text('Filtrer les dépenses'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
DropdownButtonFormField<ExpenseCategory>(
// ignore: deprecated_member_use
value: _selectedCategory,
decoration: const InputDecoration(
labelText: 'Catégorie',
border: OutlineInputBorder(),
),
items: [
const DropdownMenuItem<ExpenseCategory>(
value: null,
child: Text('Toutes'),
),
...ExpenseCategory.values.map((category) {
return DropdownMenuItem(
value: category,
child: Text(category.displayName),
);
}),
],
onChanged: (value) {
setState(() => _selectedCategory = value);
},
),
const SizedBox(height: 16),
DropdownButtonFormField<String>(
// ignore: deprecated_member_use
value: _selectedPayerId,
decoration: const InputDecoration(
labelText: 'Payé par',
border: OutlineInputBorder(),
),
items: [
const DropdownMenuItem<String>(
value: null,
child: Text('Tous'),
),
...widget.group.members.map((member) {
return DropdownMenuItem(
value: member.userId,
child: Text(member.firstName),
);
}),
],
onChanged: (value) {
setState(() => _selectedPayerId = value);
},
),
],
),
actions: [
TextButton(
onPressed: () {
setState(() {
_selectedCategory = null;
_selectedPayerId = null;
});
// Also update parent state
this.setState(() {
_selectedCategory = null;
_selectedPayerId = null;
});
Navigator.pop(context);
},
child: const Text('Réinitialiser'),
),
ElevatedButton(
onPressed: () {
// Update parent state
this.setState(() {});
Navigator.pop(context);
},
child: const Text('Appliquer'),
),
],
);
},
);
},
);
}
}