jmartin/petitspas
1
0
Fork 0
Code Issues 47 Pull Requests Actions Packages Projects Releases Wiki Activity

release: squash merge develop → master

Browse Source 
Quotidien / Epic C : feed bulles parent (#173), module Cartes (#194/#195),
evenements_agenda (#205), couples garde AM (#169–#171), API absences (#172).

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jmartin
2026-10-05 15:44:10 +02:00
co-authored by Cursor
parent ba6078feab
commit da024d997a
94 changed files with 6263 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/lib/screens/am/am_dashboard_screen.dart
+152 -42
View File
@@ -1,11 +1,16 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/widgets/app_footer.dart';
import 'package:p_tits_pas/widgets/dashboard/dashboard_bandeau.dart';
import 'package:p_tits_pas/services/couple_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Dashboard assistante maternelle – page blanche avec bandeau générique.
/// Contenu détaillé à venir.
/// Dashboard assistante maternelle – coquille 3 colonnes quotidien (#169).
/// Colonne gauche : sélecteur de couple enfant–parent(s) (#170).
/// Métier cartes / blog / messagerie : tickets C/D/E.
class AmDashboardScreen extends StatefulWidget {
const AmDashboardScreen({super.key});
@@ -14,13 +19,19 @@ class AmDashboardScreen extends StatefulWidget {
}
class _AmDashboardScreenState extends State<AmDashboardScreen> {
int selectedTabIndex = 0;
QuotidienNavSection _section = QuotidienNavSection.liaison;
AppUser? _user;
List<CoupleGarde> _couples = const [];
String? _selectedCoupleId;
bool _couplesLoading = true;
String? _couplesError;
@override
void initState() {
super.initState();
_loadUser();
_loadCouples();
}
Future<void> _loadUser() async {
@@ -28,51 +39,150 @@ class _AmDashboardScreenState extends State<AmDashboardScreen> {
if (mounted) setState(() => _user = user);
}
Future<void> _loadCouples() async {
setState(() {
_couplesLoading = true;
_couplesError = null;
});
try {
final res = await CoupleGardeService.getAmCouplesGarde();
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id;
_couplesLoading = false;
});
} catch (e) {
if (!mounted) return;
setState(() {
_couplesError = e.toString().replaceFirst('Exception: ', '');
_couplesLoading = false;
});
}
}
Future<void> _selectCouple(CoupleGarde couple) async {
if (couple.id == _selectedCoupleId) return;
setState(() => _selectedCoupleId = couple.id);
try {
final res = await CoupleGardeService.definirAmCoupleCourant(couple.id);
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id ?? couple.id;
});
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
"Impossible de changer d'enfant : "
'${e.toString().replaceFirst('Exception: ', '')}',
),
),
);
}
}
String get _displayName {
final n = _user?.fullName.trim() ?? '';
if (n.isNotEmpty) return n;
final email = _user?.email.trim() ?? '';
if (email.isNotEmpty) return email.split('@').first;
return 'Assistante maternelle';
}
void _soon(String label) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('$label — à venir')),
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: PreferredSize(
preferredSize: const Size.fromHeight(60.0),
child: DashboardBandeau(
tabItems: const [
DashboardTabItem(label: 'Mon tableau de bord'),
DashboardTabItem(label: 'Paramètres'),
],
selectedTabIndex: selectedTabIndex,
onTabSelected: (index) => setState(() => selectedTabIndex = index),
userDisplayName: _user?.fullName.isNotEmpty == true
? _user!.fullName
: 'Assistante maternelle',
userEmail: _user?.email,
userRole: _user?.role,
onProfileTap: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Modification du profil – à venir')),
);
},
onSettingsTap: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Paramètres – à venir')),
);
},
onLogout: () {},
showLogoutConfirmation: true,
),
return QuotidienShell(
selectedSection: _section,
onSectionSelected: (s) => setState(() => _section = s),
userDisplayName: _displayName,
userEmail: _user?.email,
onProfileTap: () => _soon('Profil'),
onSettingsTap: () => _soon('Paramètres'),
// L'AM n'a pas de bouton "Recherche AM" dans le bandeau
onSearchAmTap: null,
leftColumn: _LeftColumn(
couples: _couples,
selectedCoupleId: _selectedCoupleId,
loading: _couplesLoading,
error: _couplesError,
onRetry: _loadCouples,
onCoupleSelected: _selectCouple,
),
body: Column(
centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog',
subtitle:
'Fil du quotidien (affichage par défaut)\n(à brancher — ticket #179).',
icon: Icons.auto_stories_outlined,
),
rightColumn: const QuotidienColumnPlaceholder(
title: 'Messagerie',
subtitle:
'Mess. Parents · Mess. RPE\n(à brancher — ticket #185).',
icon: Icons.chat_bubble_outline,
),
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
contratBody: const QuotidienStubPage(
title: 'Contrat',
message: 'Contrat — contenu à venir (stub #187).',
),
);
}
}
class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId;
final bool loading;
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
const _LeftColumn({
required this.couples,
required this.selectedCoupleId,
required this.loading,
required this.error,
required this.onRetry,
required this.onCoupleSelected,
});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(14),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: Center(
child: Text(
'Dashboard AM – à venir',
style: Theme.of(context).textTheme.titleLarge,
),
CoupleSelectorBandeau(
mode: CoupleBandeauMode.assistanteMaternelle,
couples: couples,
selectedCoupleId: selectedCoupleId,
loading: loading,
errorMessage: error,
onRetry: onRetry,
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
const Expanded(
child: QuotidienColumnPlaceholder(
title: 'Cartes',
subtitle:
'Absences, congés AM, sorties à valider\n(à brancher — ticket #174).',
icon: Icons.style_outlined,
),
),
const AppFooter(),
],
),
);
}
}
frontend/lib/screens/auth/parent_register_step3_screen.dart
+1
View File
@@ -41,6 +41,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
CardColorVertical.red,
CardColorVertical.green,
CardColorVertical.blue,
CardColorVertical.aqua,
];
// Garder une trace des couleurs déjà utilisées
frontend/lib/screens/home/parent_screen/ParentDashboardScreen.dart
+12 -14
View File
@@ -3,13 +3,14 @@ import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/couple_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/cartes_feed.dart';
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
/// Colonne gauche : sélecteur de couple enfant–nounou (#167).
/// Métier cartes / blog / messagerie : tickets C/D/E.
/// Colonne gauche : sélecteur de couple (#167) + feed bulles (#173).
class ParentDashboardScreen extends StatefulWidget {
const ParentDashboardScreen({super.key});
@@ -62,7 +63,6 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
Future<void> _selectCouple(CoupleGarde couple) async {
if (couple.id == _selectedCoupleId) return;
// Optimiste : on bascule tout de suite, l'API persiste ensuite.
setState(() => _selectedCoupleId = couple.id);
try {
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
@@ -115,6 +115,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
error: _couplesError,
onRetry: _loadCouples,
onCoupleSelected: _selectCouple,
onAjouterBulle: () => _soon('Ajouter une bulle'),
),
centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog',
@@ -128,10 +129,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
icon: Icons.chat_bubble_outline,
),
agendaBody: const QuotidienStubPage(
title: 'Agenda',
message: 'Agenda — contenu à venir (stub #187).',
),
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
contratBody: const QuotidienStubPage(
title: 'Contrat',
message: 'Contrat — contenu à venir (stub #187).',
@@ -140,7 +138,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
}
}
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173 à venir).
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173).
class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId;
@@ -148,6 +146,7 @@ class _LeftColumn extends StatelessWidget {
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
final VoidCallback onAjouterBulle;
const _LeftColumn({
required this.couples,
@@ -156,6 +155,7 @@ class _LeftColumn extends StatelessWidget {
required this.error,
required this.onRetry,
required this.onCoupleSelected,
required this.onAjouterBulle,
});
@override
@@ -174,12 +174,10 @@ class _LeftColumn extends StatelessWidget {
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
const Expanded(
child: QuotidienColumnPlaceholder(
title: 'Cartes',
subtitle:
'Absences, congés AM, sorties à valider\n(à brancher — ticket #173).',
icon: Icons.style_outlined,
Expanded(
child: CartesFeed(
placementId: selectedCoupleId,
onAjouterBulle: onAjouterBulle,
),
),
],
frontend/lib/screens/home/parent_screen/agenda_absences_stub.dart
+192
View File
@@ -0,0 +1,192 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/absence_garde.dart';
import 'package:p_tits_pas/services/api/absences_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
class AgendaAbsencesStub extends StatefulWidget {
final String? placementId;
const AgendaAbsencesStub({super.key, this.placementId});
@override
State<AgendaAbsencesStub> createState() => _AgendaAbsencesStubState();
}
class _AgendaAbsencesStubState extends State<AgendaAbsencesStub> {
List<AbsenceGarde> _absences = [];
bool _loading = true;
String? _error;
@override
void initState() {
super.initState();
_loadAbsences();
}
@override
void didUpdateWidget(covariant AgendaAbsencesStub oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.placementId != widget.placementId) {
_loadAbsences();
}
}
Future<void> _loadAbsences() async {
setState(() {
_loading = true;
_error = null;
});
try {
final absences = await AbsencesGardeService.getAbsences(
placementId: widget.placementId,
);
if (!mounted) return;
setState(() {
_absences = absences;
_loading = false;
});
} catch (e) {
if (!mounted) return;
setState(() {
_error = e.toString();
_loading = false;
});
}
}
@override
Widget build(BuildContext context) {
return Container(
color: QuotidienTheme.ivory,
child: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 600),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Icon(
Icons.calendar_month_outlined,
size: 64,
color: QuotidienTheme.peach,
),
const SizedBox(height: 24),
Text(
"Agenda (Stub) - Lignes d'absence",
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
color: QuotidienTheme.ink,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 12),
Text(
'ID Placement courant: ${widget.placementId ?? 'Tous'}',
textAlign: TextAlign.center,
style: const TextStyle(color: QuotidienTheme.muted),
),
const SizedBox(height: 24),
Expanded(
child: _buildList(),
),
],
),
),
),
);
}
Widget _buildList() {
if (_loading) {
return const Center(child: CircularProgressIndicator());
}
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.error_outline, color: Colors.red, size: 48),
const SizedBox(height: 16),
Text(_error!, style: const TextStyle(color: Colors.red)),
const SizedBox(height: 16),
ElevatedButton(
onPressed: _loadAbsences,
child: const Text('Réessayer'),
),
],
),
);
}
if (_absences.isEmpty) {
return const Center(
child: Text('Aucune absence ou congé trouvé.',
style: TextStyle(color: QuotidienTheme.muted)),
);
}
return ListView.separated(
itemCount: _absences.length,
separatorBuilder: (_, __) => const Divider(),
itemBuilder: (context, index) {
final abs = _absences[index];
return ListTile(
leading: _getIcon(abs.type),
title: Text('${abs.type} (${abs.statut})'),
subtitle: Text(
'Du ${abs.dateDebut} au ${abs.dateFin}\n'
'Enfant: ${abs.prenomEnfant ?? 'N/A'}, AM: ${abs.prenomAm ?? 'N/A'}',
),
trailing: IconButton(
icon: const Icon(Icons.delete_outline, color: Colors.red),
onPressed: () => _confirmDelete(abs),
),
);
},
);
}
Icon _getIcon(String type) {
switch (type) {
case 'absence_enfant':
return const Icon(Icons.child_care, color: QuotidienTheme.coral);
case 'conge_am':
return const Icon(Icons.beach_access, color: QuotidienTheme.turquoise);
case 'arret_maladie_am':
return const Icon(Icons.medical_services, color: QuotidienTheme.coral);
default:
return const Icon(Icons.event);
}
}
Future<void> _confirmDelete(AbsenceGarde abs) async {
final confirm = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Supprimer ?'),
content: Text("Supprimer l'absence ${abs.type} du ${abs.dateDebut} ?"),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('Annuler'),
),
TextButton(
onPressed: () => Navigator.pop(context, true),
style: TextButton.styleFrom(foregroundColor: Colors.red),
child: const Text('Supprimer'),
),
],
),
);
if (confirm == true) {
try {
await AbsencesGardeService.supprimerAbsence(abs.id);
_loadAbsences();
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Erreur: $e')),
);
}
}
}
}