[Frontend] Refactorisation inscription Parents avec Provider (#38 #39)

Refactorisation complète du parcours d'inscription des parents pour utiliser Provider au lieu du passage de données par paramètres de navigation. Modifications principales : - Utilisation de Provider pour partager UserRegistrationData entre les étapes - Simplification du routeur (suppression des paramètres) - Amélioration de la persistance des données entre les étapes - Meilleure expérience utilisateur lors de la navigation Fichiers modifiés : - models/user_registration_data.dart : Modèle avec ChangeNotifier - screens/auth/parent_register_step1-5_screen.dart : Intégration Provider - navigation/app_router.dart : Simplification du routing - main.dart : Configuration du Provider - login_screen.dart : Ajout navigation vers inscription - register_choice_screen.dart : Navigation vers parcours parent/AM - utils/data_generator.dart : Génération de données de test Refs: #38 (Étape 3 Enfants), #39 (Étapes 4-6 Finalisation)
2026-01-27 16:44:23 +01:00
parent dbd56637e1
commit 29bee9fa80
11 changed files with 505 additions and 325 deletions
@@ -12,20 +12,23 @@ import '../../widgets/app_custom_checkbox.dart'; // Import du nouveau widget Che
 import '../../models/user_registration_data.dart'; // Import du modèle de données
 import '../../utils/data_generator.dart'; // Import du générateur
 import '../../models/card_assets.dart'; // Import des enums de cartes
+import 'package:provider/provider.dart'; // Assurer l'import
+import 'package:go_router/go_router.dart';

 // La classe _ChildFormData est supprimée car on utilise ChildData du modèle

 class ParentRegisterStep3Screen extends StatefulWidget {
-  final UserRegistrationData registrationData; // Accepte les données
+  // final UserRegistrationData registrationData; // Supprimé

-  const ParentRegisterStep3Screen({super.key, required this.registrationData});
+  const ParentRegisterStep3Screen({super.key /*, required this.registrationData */}); // Modifié

  @override
-  State<ParentRegisterStep3Screen> createState() => _ParentRegisterStep3ScreenState();
+  _ParentRegisterStep3ScreenState createState() =>
+      _ParentRegisterStep3ScreenState();
 }

 class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
-  late UserRegistrationData _registrationData; // Stocke l'état complet
+  // late UserRegistrationData _registrationData; // Supprimé
  final ScrollController _scrollController = ScrollController(); // Pour le défilement horizontal
  bool _isScrollable = false;
  bool _showLeftFade = false;
@@ -52,14 +55,18 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
  @override
  void initState() {
    super.initState();
-    _registrationData = widget.registrationData;
+    final registrationData = Provider.of<UserRegistrationData>(context, listen: false);
+    // _registrationData = registrationData; // Supprimé
+
    // Initialiser les couleurs utilisées avec les enfants existants
-    for (var child in _registrationData.children) {
+    for (var child in registrationData.children) {
      _usedColors.add(child.cardColor);
    }
-    // S'il n'y a pas d'enfant, en ajouter un automatiquement avec des données générées
-    if (_registrationData.children.isEmpty) {
-      _addChild(); 
+    // S'il n'y a pas d'enfant, en ajouter un automatiquement APRÈS le premier build
+    if (registrationData.children.isEmpty) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _addChild(registrationData);
+      });
    }
    _scrollController.addListener(_scrollListener);
    WidgetsBinding.instance.addPostFrameCallback((_) => _scrollListener());
@@ -87,7 +94,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
    }
  }

-  void _addChild() {
+  void _addChild(UserRegistrationData registrationData) { // Prend registrationData
    setState(() {
      bool isUnborn = DataGenerator.boolean();
      
@@ -98,7 +105,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
      );
      
      final newChild = ChildData(
-        lastName: _registrationData.parent1.lastName,
+        lastName: registrationData.parent1.lastName,
        firstName: DataGenerator.firstName(),
        dob: DataGenerator.dob(isUnborn: isUnborn),
        isUnbornChild: isUnborn,
@@ -106,7 +113,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
        multipleBirth: DataGenerator.boolean(),
        cardColor: cardColor,
      );
-      _registrationData.addChild(newChild);
+      registrationData.addChild(newChild);
      _usedColors.add(cardColor);
    });
    WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -117,33 +124,42 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
    });
  }

-  void _removeChild(int index) {
-    if (_registrationData.children.length > 1 && index >= 0 && index < _registrationData.children.length) {
+  void _removeChild(int index, UserRegistrationData registrationData) {
+    if (registrationData.children.length > 1 && index >= 0 && index < registrationData.children.length) {
      setState(() {
        // Ne pas retirer la couleur de _usedColors pour éviter sa réutilisation
-        _registrationData.children.removeAt(index);
+        registrationData.children.removeAt(index);
      });
      WidgetsBinding.instance.addPostFrameCallback((_) => _scrollListener());
    }
  }

-  Future<void> _pickImage(int childIndex) async {
+  Future<void> _pickImage(int childIndex, UserRegistrationData registrationData) async {
    final ImagePicker picker = ImagePicker();
    try {
      final XFile? pickedFile = await picker.pickImage(
        source: ImageSource.gallery, imageQuality: 70, maxWidth: 1024, maxHeight: 1024);
      if (pickedFile != null) {
-        setState(() {
-          if (childIndex < _registrationData.children.length) {
-            _registrationData.children[childIndex].imageFile = File(pickedFile.path);
-          }
-        });
+        if (childIndex < registrationData.children.length) {
+          final oldChild = registrationData.children[childIndex];
+          final updatedChild = ChildData(
+            firstName: oldChild.firstName,
+            lastName: oldChild.lastName,
+            dob: oldChild.dob,
+            photoConsent: oldChild.photoConsent,
+            multipleBirth: oldChild.multipleBirth,
+            isUnbornChild: oldChild.isUnbornChild,
+            imageFile: File(pickedFile.path),
+            cardColor: oldChild.cardColor,
+          );
+          registrationData.updateChild(childIndex, updatedChild);
+        }
      } 
    } catch (e) { print("Erreur image: $e"); }
  }

-  Future<void> _selectDate(BuildContext context, int childIndex) async {
-    final ChildData currentChild = _registrationData.children[childIndex];
+  Future<void> _selectDate(BuildContext context, int childIndex, UserRegistrationData registrationData) async {
+    final ChildData currentChild = registrationData.children[childIndex];
    final DateTime now = DateTime.now();
    DateTime initialDatePickerDate = now;
    DateTime firstDatePickerDate = DateTime(1980); DateTime lastDatePickerDate = now;
@@ -175,14 +191,24 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
      lastDate: lastDatePickerDate, locale: const Locale('fr', 'FR'),
    );
    if (picked != null) {
-      setState(() {
-        currentChild.dob = "${picked.day.toString().padLeft(2, '0')}/${picked.month.toString().padLeft(2, '0')}/${picked.year}";
-      });
+      final oldChild = registrationData.children[childIndex];
+      final updatedChild = ChildData(
+          firstName: oldChild.firstName,
+          lastName: oldChild.lastName,
+          dob: "${picked.day.toString().padLeft(2, '0')}/${picked.month.toString().padLeft(2, '0')}/${picked.year}",
+          photoConsent: oldChild.photoConsent,
+          multipleBirth: oldChild.multipleBirth,
+          isUnbornChild: oldChild.isUnbornChild,
+          imageFile: oldChild.imageFile,
+          cardColor: oldChild.cardColor,
+      );
+      registrationData.updateChild(childIndex, updatedChild);
    }
  }

  @override
  Widget build(BuildContext context) {
+    final registrationData = Provider.of<UserRegistrationData>(context /*, listen: true par défaut */);
    final screenSize = MediaQuery.of(context).size;
    return Scaffold(
      body: Stack(
@@ -221,36 +247,57 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
                          controller: _scrollController, 
                          scrollDirection: Axis.horizontal,
                          padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                          itemCount: _registrationData.children.length + 1,
+                          itemCount: registrationData.children.length + 1,
                          itemBuilder: (context, index) {
-                            if (index < _registrationData.children.length) {
+                            if (index < registrationData.children.length) {
                              // Carte Enfant
                              return Padding(
                                padding: const EdgeInsets.only(right: 20.0),
                                child: _ChildCardWidget(
-                                  key: ValueKey(_registrationData.children[index].hashCode), // Utiliser une clé basée sur les données
-                                  childData: _registrationData.children[index],
+                                  key: ValueKey(registrationData.children[index].hashCode), // Utiliser une clé basée sur les données
+                                  childData: registrationData.children[index],
                                  childIndex: index,
-                                  onPickImage: () => _pickImage(index),
-                                  onDateSelect: () => _selectDate(context, index),
-                                  onFirstNameChanged: (value) => setState(() => _registrationData.children[index].firstName = value),
-                                  onLastNameChanged: (value) => setState(() => _registrationData.children[index].lastName = value),
-                                  onTogglePhotoConsent: (newValue) => setState(() => _registrationData.children[index].photoConsent = newValue),
-                                  onToggleMultipleBirth: (newValue) => setState(() => _registrationData.children[index].multipleBirth = newValue),
-                                  onToggleIsUnborn: (newValue) => setState(() {
-                                     _registrationData.children[index].isUnbornChild = newValue;
-                                     // Générer une nouvelle date si on change le statut
-                                     _registrationData.children[index].dob = DataGenerator.dob(isUnborn: newValue);
-                                   }),
-                                  onRemove: () => _removeChild(index),
-                                  canBeRemoved: _registrationData.children.length > 1,
+                                  onPickImage: () => _pickImage(index, registrationData),
+                                  onDateSelect: () => _selectDate(context, index, registrationData),
+                                  onFirstNameChanged: (value) => setState(() => registrationData.updateChild(index, ChildData(
+                                    firstName: value, lastName: registrationData.children[index].lastName, dob: registrationData.children[index].dob, photoConsent: registrationData.children[index].photoConsent,
+                                    multipleBirth: registrationData.children[index].multipleBirth, isUnbornChild: registrationData.children[index].isUnbornChild, imageFile: registrationData.children[index].imageFile, cardColor: registrationData.children[index].cardColor
+                                  ))),
+                                  onLastNameChanged: (value) => setState(() => registrationData.updateChild(index, ChildData(
+                                    firstName: registrationData.children[index].firstName, lastName: value, dob: registrationData.children[index].dob, photoConsent: registrationData.children[index].photoConsent,
+                                    multipleBirth: registrationData.children[index].multipleBirth, isUnbornChild: registrationData.children[index].isUnbornChild, imageFile: registrationData.children[index].imageFile, cardColor: registrationData.children[index].cardColor
+                                  ))),
+                                  onTogglePhotoConsent: (newValue) {
+                                    final oldChild = registrationData.children[index];
+                                    registrationData.updateChild(index, ChildData(
+                                      firstName: oldChild.firstName, lastName: oldChild.lastName, dob: oldChild.dob, photoConsent: newValue,
+                                      multipleBirth: oldChild.multipleBirth, isUnbornChild: oldChild.isUnbornChild, imageFile: oldChild.imageFile, cardColor: oldChild.cardColor
+                                    ));
+                                  },
+                                  onToggleMultipleBirth: (newValue) {
+                                     final oldChild = registrationData.children[index];
+                                    registrationData.updateChild(index, ChildData(
+                                      firstName: oldChild.firstName, lastName: oldChild.lastName, dob: oldChild.dob, photoConsent: oldChild.photoConsent,
+                                      multipleBirth: newValue, isUnbornChild: oldChild.isUnbornChild, imageFile: oldChild.imageFile, cardColor: oldChild.cardColor
+                                    ));
+                                  },
+                                  onToggleIsUnborn: (newValue) {
+                                     final oldChild = registrationData.children[index];
+                                     registrationData.updateChild(index, ChildData(
+                                        firstName: oldChild.firstName, lastName: oldChild.lastName, dob: DataGenerator.dob(isUnborn: newValue),
+                                        photoConsent: oldChild.photoConsent, multipleBirth: oldChild.multipleBirth, isUnbornChild: newValue, 
+                                        imageFile: oldChild.imageFile, cardColor: oldChild.cardColor
+                                     ));
+                                   },
+                                  onRemove: () => _removeChild(index, registrationData),
+                                  canBeRemoved: registrationData.children.length > 1,
                                ),
                              );
                            } else {
                              // Bouton Ajouter
                              return Center(
                                child: HoverReliefWidget(
-                                  onPressed: _addChild,
+                                  onPressed: () => _addChild(registrationData),
                                  borderRadius: BorderRadius.circular(15),
                                  child: Image.asset('assets/images/plus.png', height: 80, width: 80),
                                ),
@@ -272,7 +319,13 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
            left: 40,
            child: IconButton(
              icon: Transform(alignment: Alignment.center, transform: Matrix4.rotationY(math.pi), child: Image.asset('assets/images/chevron_right.png', height: 40)),
-              onPressed: () => Navigator.pop(context),
+              onPressed: () {
+                if (context.canPop()) {
+                  context.pop();
+                } else {
+                  context.go('/parent-register-step2');
+                }
+              },
              tooltip: 'Retour',
            ),
          ),
@@ -282,8 +335,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
            child: IconButton(
              icon: Image.asset('assets/images/chevron_right.png', height: 40),
              onPressed: () {
-                // TODO: Validation (si nécessaire)
-                Navigator.pushNamed(context, '/parent-register/step4', arguments: _registrationData);
+                context.go('/parent-register-step4'); 
              },
              tooltip: 'Suivant',
            ),