Compare commits

..
Author SHA1 Message Date
jmartinandCursor 9cd180bf6a feat(#161): admin peut créer gestionnaire et administrateur.
Assouplit POST /gestionnaires, PATCH /gestionnaires/:id et POST /users/admin
(+ check createAdmin) pour ADMINISTRATEUR. Masque « Ajouter » staff sur le
dashboard gestionnaire. Tests droits Roles + createAdmin.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-10 22:54:49 +02:00
jmartin ca07d2e111 merge(#160): suppressions dashboard front + API #159. 2026-09-10 22:41:02 +02:00
jmartinandCursor 67336c64fe fix(#160): un gestionnaire ne peut plus supprimer un autre depuis la fiche.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-10 22:38:57 +02:00
jmartinandCursor 97afbbcf9a fix(am): hauteur modale fiche AM par onglet (sans scroll inutile).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-10 22:16:06 +02:00
jmartinandCursor e235b30140 feat(#160): suppressions dashboard — poubelle, confirmations et sans_enfant.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-10 22:16:05 +02:00
jmartinandCursor 7f23356273 feat(#159): suppressions métier dossiers/parents/enfants/AM/staff.
SuppressionService + DELETE /dossiers/:numero, cascades DELETE /users et
DELETE /enfants?deleteDossier, flag sans_enfant, specs front #160.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-09 18:01:44 +02:00
jmartinandCursor c8c9cfbc4d feat(#135): mode édition dossier (PATCH fiche, co-parent, enfants).
Wizard edit famille/AM depuis la liste Dossiers ; save parents +
co-parent ; enfants existants en PATCH (photo multipart) sans POST doublon.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-03 16:07:23 +02:00
jmartinandCursor 530e896b66 feat(#135): POST /parents/:id/co-parent — ajout co-parent foyer.
API staff pour foyer mono-parent : compte actif, liens + enfants,
mail création MDP. Mini-specs front/back dans docs/tmp.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-02 23:34:19 +02:00
jmartinandCursor 0029c5ab86 fix(#153): peaufiner cartes dossiers et recherche.
Cartes neutres avec accent icône, photo AM si dispo, hint court
et infobulle de critères sur la barre de recherche.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 19:39:55 +02:00
jmartinandCursor 2ce9e9215f fix(#153): libellé pending-families en NOM Prénom.
Inclut le prénom dans string_agg et expose nom/prenom dans parents[].

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 18:41:25 +02:00
jmartinandCursor 3fdd913367 feat(#153): onglet permanent Dossiers (pending + liste unifiée).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 18:40:00 +02:00
jmartinandCursor 6708f73b06 feat(#153): GET /dossiers — liste unifiée familles + AM.
Endpoint staff pour l’onglet Dossiers : type, n°, libellé, emails,
statut, a_valider, filtre q. Complète GET /dossiers/:numero (#119).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 18:13:32 +02:00
jmartinandCursor f596f062a6 docs(#153): mini-spec front onglet Dossiers permanent.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 18:10:20 +02:00
jmartinandCursor 86701731e3 fix(#129): resserrer les champs enfant pour éviter le scroll.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 13:13:21 +02:00
jmartinandCursor b4abb7d6de fix(#129): peaufiner le wizard famille (co-parent, hauteurs, à naître).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 13:01:54 +02:00
jmartinandCursor cb5c1a5518 feat(#129): wizard admin création dossier famille (create/review).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-24 12:34:24 +02:00
jmartinandCursor 30ca99fb65 feat(#129): POST /parents/dossier — création dossier famille staff.
Factorise createParentDossier (actif + mail MDP) depuis l’inscription
publique qui reste en_attente + mail pending. Miroir #156 AM.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 16:59:09 +02:00
jmartinandCursor 8ee2ca8ea6 fix(#156): caler la modale AM sur les TF et unifier create/review.
ValidationFormMetrics (titres, TF, écarts) pilote la hauteur ; photo
étirée sur le corps ; mêmes widgets create et validation.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 16:49:59 +02:00
jmartinandCursor e3552667bc fix(#156): valider téléphone au blur et NIR en live.
Formatage NIR progressif + contrôles au fil de la saisie ; téléphone
validé à la perte de focus comme e-mail / CP.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 16:28:35 +02:00
jmartinandCursor 4ae334b247 fix(#156): superviser nom, e-mail et CP comme à l’inscription.
IdentityBlock editable : capitalisation live, e-mail/CP normalisés
et validés à la perte de focus (aligné création de compte).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 19:27:20 +02:00
jmartinandCursor 471a62ddb7 feat(#156): wizard admin création dossier AM (create/review).
Généralise ValidationAmWizard en AmDossierWizard ; le + Asmat ouvre
le mode création vers POST /assistantes-maternelles/dossier.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 19:07:14 +02:00
jmartinandCursor 59afeb0a8d feat(#156): POST /assistantes-maternelles/dossier staff (actif + mail MDP).
Factorise createAmDossier depuis register/am ; staff crée un dossier
déjà actif et envoie l’e-mail de création de mot de passe.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 19:03:37 +02:00
jmartinandCursor d2172eafdb docs: snapshot empreinte code / disque (2026-07-22).
Mémoire après alerte disque plein — lignes de code et contexte VPS.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-22 18:27:49 +02:00
jmartinandCursor d247867fa0 feat(#158): front — attach/detach foyer (un seul appel API).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 19:53:31 +02:00
jmartinandCursor 93912d1374 feat(#158): attach/detach enfant au niveau foyer (pivot + co-parent).
POST/DELETE /parents/:id/enfants/:enfantId propagent les liens à tous
les responsables du foyer (co-parent bidirectionnel + même dossier).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 19:47:13 +02:00
jmartinandCursor 925b6d5cd4 fix(#157): texte détach + compteur enfants foyer (interim).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 19:42:36 +02:00
jmartinandCursor b0dddd6695 feat(#157): consommer le flag API sans_responsable.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 19:33:21 +02:00
jmartinandCursor ef7512dc1e feat(#157): autoriser détachement dernier parent + flag sans_responsable.
Supprime la garde totalLinks<=1 ; GET/findOne enfants exposent
sans_responsable pour les orphelins toujours listés.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 19:31:18 +02:00
jmartinandCursor 2ececa711b feat(#157): alerte enfants sans responsable + rattachement foyer.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 19:02:21 +02:00
jmartinandCursor 7a3d997ff9 fix(#132): UX création enfant — champs, genre et validation.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 18:51:00 +02:00
jmartinandCursor 6b89d7b405 fix(#132): envoyer birth_date à la création (enfant né).
Le if imbriqué n’incluait birth_date que pour le cas à naître.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 18:46:48 +02:00
jmartinandCursor f7ac628445 feat(#132): photo à la création enfant staff (multipart + bools).
Transform "true"/"false" pour class-validator ; multipart staff
avec FileInterceptor('photo') inchangé côté stockage.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 18:08:52 +02:00
jmartinandCursor 26e9738ec7 feat(#132): upload photo à la création d'enfant (admin).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 18:07:47 +02:00
jmartinandCursor 0ec3410457 feat(#132): POST /enfants staff — parent_user_id + liens foyer.
Autorise GESTIONNAIRE/ADMIN/SUPER_ADMIN à créer un enfant rattaché
à un foyer existant (JSON + parent_user_id). Parent multipart inchangé.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 18:03:41 +02:00
jmartinandCursor c3acf1970d feat(#132): création enfant admin — modale + sélection famille.
Onglet Enfants « Ajouter » ouvre la fiche en mode création ; bloc Famille/dossier ; client POST /enfants avec parent_user_id (contrat back à livrer).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 18:00:41 +02:00
jmartinandCursor 6fe2b89a61 fix(#151): autoriser GET /relais pour gestionnaire + robustesse combo
- Back: RoleType.GESTIONNAIRE sur GET list/get (CRUD write admin-only)
- Front: ne plus effacer la sélection si le chargement échoue
- Fallback affichage depuis relaisNom de l'utilisateur

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 16:52:46 +02:00
jmartin d6a9b3fd66 Merge branch 'feature/149-clic-case-libre-rattacher-enfant' into develop
Clic case libre → rattacher enfant (#149).
2026-07-17 16:19:14 +02:00
jmartinandCursor 134b9781c8 feat(#149): clic sur case libre pour rattacher un enfant (fiche AM).
Les emplacements vides de la grille ouvrent le même flux que le lien footer, avec hover et respect de la capacité max.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 16:19:12 +02:00
jmartin b936d27445 Merge branch 'feature/148-rattacher-enfant-capacite-max' into develop
Fix capacité max — lien rattacher enfant (#148).
2026-07-17 16:12:54 +02:00
jmartinandCursor 18c1d1eba7 fix(#148): désactiver « Rattacher un enfant » si capacité AM pleine.
Le lien du footer est grisé avec tooltip quand enfants ≥ capacité max ; il se réactive après détachement.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 16:12:53 +02:00
jmartin f74b14c203 Merge branch 'feature/147-modale-selection-am-enfant' into develop
Modale de sélection d'AM (#147) depuis la fiche enfant.
2026-07-17 16:12:23 +02:00
jmartinandCursor f194b5f9e8 feat(#147): modale de sélection d'AM depuis la fiche enfant.
Réutilise AdminSelectListModal avec filtre Libre, cartes saturées en rouge, avertissement + lien fiche AM, et recalcul des places à chaque rattachement.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 16:11:55 +02:00
jmartin 5ab8ae3423 Merge branch 'feature/146-modale-selection-enfant-am' into develop
Modale de sélection d'enfant (#146) pour rattachement AM/parent.
2026-07-17 15:43:10 +02:00
jmartinandCursor 3277f77846 fix(#146): densifier la liste et corriger l'affichage des responsables.
Les cartes compactes montrent plus d'enfants d'un coup ; le nom ne monopolise plus la largeur au détriment des infos.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 15:39:59 +02:00
jmartinandCursor 2d80ad0d7e feat(#146): modale de sélection d'enfant pour rattachement AM/parent.
Recherche dynamique, filtre Sans garde côté AM, confirmation de transfert et détachement préalable pour laisser le point de vigilance places sur l'AM d'origine.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 15:31:47 +02:00
jmartinandCursor 09386f8aa6 feat(#145): lien co-parent cliquable dans la fiche parent.
Même UX que les responsables de la fiche enfant : ouverture de
AdminParentEditModal au clic sur le nom du co-parent.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 14:56:32 +02:00
jmartinandCursor faa50f637c fix(#138): enrichir les noms des responsables sur GET enfant.
GET /enfants/:id ne joint pas parent.user ; on complète les noms via
GET parent pour l'affichage des liens (ex. ouverture depuis la fiche AM).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 13:19:09 +02:00
jmartinandCursor 267fe63aec fix(#138): différer le rattachement AM de la fiche enfant au Sauvegarder.
Attach/détach AM restent locaux comme sur la fiche AM ; la sync API
n'a lieu qu'à l'enregistrement, avec rechargement du statut au retour
de la fiche AM.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 13:12:46 +02:00
jmartinandCursor 90b185740c feat(#138): ouvrir la fiche parent depuis les responsables de la modale enfant.
Les noms du sous-titre deviennent des liens cliquables vers
AdminParentEditModal, comme l'ouverture de fiche AM.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:54:32 +02:00
jmartinandCursor b903dbf60b fix(#138): libellé garde accordé au genre (Gardé / Gardée).
Remplace « En garde » par Gardé/Gardée selon le genre, comme
Scolarisé/Scolarisée.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:51:07 +02:00
jmartinandCursor 291ea26b34 fix(#138): lire le consentement photo sans heuristique photo.
Admin et reprise utilisentent uniquement la valeur API ; plus de
pré-cochage implicite si une photo est présente.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:46:54 +02:00
jmartinandCursor 59919834b9 fix(#138): carte AM dédiée, titre placement et consent_photo au payload.
Améliore la zone AM/scolarisation (carte dédiée + titre), envoie
consent_photo à l'inscription parent, et parse le consentement enfant
de façon plus robuste (heuristique photo tant que le back ne persiste pas).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:37:45 +02:00
jmartinandCursor cf6acbae7c fix(#138): cadre vide en sans garde et passage auto en garde à l'attach AM.
En statut sans_garde, la zone placement affiche toujours le cadre vide ;
sélectionner une AM passe le statut à en garde, et passer à sans_garde
détache l'AM rattachée.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:37:45 +02:00
jmartinandCursor 7951c38d4d feat(#138): refonte modale enfant admin en format paysage.
Alignement sur les fiches AM/parent : photo identité, champs en grille,
zone AM rattachable (y compris à naître) ou carte scolarisation,
suppression réservée au super_admin et ouverture au clic sur la carte
depuis la fiche parent.

Refs: #138
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:37:45 +02:00
jmartinandCursor 77d952a6f7 fix(#144): persister le consentement photo des enfants
- DTO inscription enfant : champ consent_photo
- Inscription + reprise parent : sauvegarde bool + date
- Front payload : envoi consent_photo
- PATCH /enfants : horodatage du consentement

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 12:36:05 +02:00
jmartin b4b546044d merge fix(#143): masquer Supprimer gestionnaire sur sa propre fiche 2026-07-12 12:10:11 +02:00
jmartinandCursor 6788351070 fix(#143): masquer Supprimer quand un gestionnaire édite sa propre fiche
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-12 12:10:06 +02:00
jmartinandCursor 7b69f27ca5 feat(#142): ouvrir la modale au clic sur les cartes du dashboard admin.
Unifie le comportement des listes Parents, AM, Enfants, Gestionnaires, Admins et À valider avec le bouton d'action au survol.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-11 23:18:40 +02:00
jmartinandCursor 8ed68797aa fix(#131): PATCH fiche AM — NIR sans crash date ni effacement NOT NULL
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 23:41:45 +02:00
jmartinandCursor 9ad371a342 fix(#131): aligner PATCH fiche AM back sur le payload front
Étend UpdateAmFicheAdminDto (nir, date/lieu naissance, agreement_date)
et persiste ces champs dans updateFicheAdmin avec validation NIR.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 23:37:42 +02:00
jmartinandCursor 18718670e9 fix(#131): différer rattachement enfants AM jusqu'à Sauvegarder.
Rattachement et détachement restent locaux, recalculent places_available et sont persistés avec le PATCH fiche.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 23:36:06 +02:00
jmartin fbf22f2540 Revert "fix(#131): aligner PATCH fiche AM sur le DTO back actuel."
This reverts commit 43a2cd213b.
2026-07-07 23:13:58 +02:00
jmartinandCursor 43a2cd213b fix(#131): aligner PATCH fiche AM sur le DTO back actuel.
Retire nir, dates et lieux de naissance du body tant que UpdateAmFicheAdminDto ne les accepte pas.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 23:12:38 +02:00
jmartin c865d11dc3 Revert "fix(#131): activer Sauvegarder sur statut, enfants et champs AM."
This reverts commit d03a8e6c8b.
2026-07-07 23:12:09 +02:00
jmartinandCursor d03a8e6c8b fix(#131): activer Sauvegarder sur statut, enfants et champs AM.
Compare l'état de la fiche à un snapshot initial (liste enfants, statut, places, formulaire) et corrige la gélule statut pour les valeurs hors liste.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 23:11:24 +02:00
jmartinandCursor 66c7f22280 feat(#131): grille enfants AM, statuts garde et polish champs admin.
Aligne le front sur les statuts enfant back (garde/sans_garde), refond l’onglet Enfants accueillis en grille 2×2 avec correction des places, et unifie les champs validation éditables/lecture seule.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 23:01:41 +02:00
jmartinandCursor 53721ffbb3 fix(#131): ajouter @Get() manquant sur liste parents
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 22:07:24 +02:00
jmartinandCursor 52e40d0001 feat(#131): back placement AM↔enfant + BDD garde/sans_garde
- API PATCH …/fiche, POST/DELETE …/enfants/:enfantId, GET avec amChildren
- Table enfants_assistantes_maternelles (option D, 1 garde active/enfant)
- Statuts enfant: garde/sans_garde remplacent actif (inscription → sans_garde)
- BDD.sql canonique réécrit; migration pour BDD existantes
- Seed test: hash bcrypt corrigé pour mot de passe « password »

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-07 14:05:39 +02:00
jmartinandCursor 4985726bc6 fix(#131): polish fiche AM — champs pro, places, vigilance et photo.
Fiche pro entièrement éditable, places déclarées en lecture seule avec alerte rouge, icône vigilance sur la liste AM, et cadrage photo aligné sur le wizard validation.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 17:37:21 +02:00
jmartinandCursor 479a32b4bf feat(#131): fiche AM éditable en 3 onglets et widgets admin partagés.
Modale admin AM (identité, dossier pro, enfants), API front avec repli, note back affiliation, et extraction gélule statut / liste enfants pour la fiche parent.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 17:33:41 +02:00
jmartinandCursor 2fd97ddecb fix(#131): aligner la gélule de statut sur l'en-tête parent.
Le titre, le sélecteur de statut et le bouton fermer partagent le même
padding : la gélule n'est plus collée au bord supérieur de la modale.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 16:34:12 +02:00
jmartinandCursor ce474797c4 fix(#131): co_parent en réponse parents + masquage secrets user
Contrat API fiche parent : co_parent peuplé (déjà chargé), sans password
ni tokens sur user/co_parent. Doc tmp front→back.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 23:39:30 +02:00
jmartinandCursor ebf794e1ac feat(#131): en-tête fiche parent avec nom et co-parent.
Affiche le prénom/nom du parent en titre et le co-parent en sous-titre ; note handoff back dans archive/temporaires.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 23:37:04 +02:00
jmartin d55f240f56 Merge branch 'feature/140-dashboard-admin-ch6-famille' into develop
Livraison epic #140 — dashboard admin ch.6 famille (doc 28 §6.1–§6.2).

Inclus :
- Backend : PATCH fiche parent, rattachement/détachement enfant (#115)
- Frontend : fiche parent éditable (#131), onglet Enfants (#137), fiche/liste enfant (#138), affiliation UI (#116), UserService (#130)
- IdentityBlock partagé, parsing parentChildren, avatars web /uploads

Reste ouvert sur tickets dédiés : fiche enfant UI (#138), modale rattacher (#116), fiche AM (#131), création enfant (#129).
2026-06-24 23:22:39 +02:00
jmartinandCursor 966f4a9c9c feat(#140): liste enfants unifiée — cartes, âge précis et cadre scrollable
Partage AdminEnfantUserCard entre fiche parent et onglet Enfants, enrichit ParentChildSummary (photo, dates) et compacte la modale parent.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 23:06:38 +02:00
jmartinandCursor 8494341b56 feat(#140): fiches admin famille — IdentityBlock, parsing enfants et avatars web
Extrait IdentityBlock réutilisable, aligne les modales parent/enfant sur le style validation, corrige le parsing parentChildren et les URLs /uploads en Flutter web.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-21 17:42:00 +02:00
jmartinandCursor 1dddc67933 feat(#140): dashboard admin ch.6 — fiche parent, enfants, affiliation
Back: PATCH /parents/:id/fiche, attach/detach enfant, GET /enfants enrichi.
Front: modale parent éditable, onglet Enfants, fiche enfant, UserService.

Couvre doc 28 §6.1–6.2 ; tickets liés #115 #116 #130 #131 #137 #138.
Hors scope: fiche AM (#131), création admin (#129).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-17 00:35:00 +02:00
jmartinandCursor df776d8200 fix(#112): dates et places AM en reprise (resetForReprise)
Corrige l’ombre des paramètres dateOfBirth, agreementDate et placesAvailable
dans resetForReprise ; renforce le parsing reprise-dossier et ajoute un test.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 19:12:14 +02:00
jmartinandCursor c26ed00374 fix(#112): préremplissage AM complet en reprise + lien login repositionné
Parse dates/places/consentement de façon robuste, rafraîchit l'étape 2 AM
et place « J'ai un numéro de dossier » sous « Créer un compte ».

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 17:29:31 +02:00
jmartinandCursor 9d54d9b19b feat(#112): email accusé resoumission aux parents
Après PATCH reprise-resoumettre (parent), envoi à chaque parent du
dossier : confirmation resoumission + rappel numero_dossier.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 17:26:23 +02:00
jmartinandCursor c438009286 feat(#112): lien login « J'ai un numéro de dossier » + reprise-identify
Modale numéro + e-mail, obtention du token puis redirection vers /reprise.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 17:01:18 +02:00
jmartinandCursor 9b7231f1da fix(#112): afficher photos enfants en reprise + consentement cohérent
Charge existingPhotoUrl dans les cartes enfant (étapes 3 et 5) et pré-coche
le consentement photo lorsqu'une photo est déjà en base.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 17:00:15 +02:00
jmartinandCursor f300505225 feat(#112): aligner reprise front sur dossier complet GET/PATCH
Préremplit parents, enfants, motivation et fiche AM depuis reprise-dossier
et envoie le body PATCH complet (co-parent, enfants par id, champs pro AM).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 16:46:51 +02:00
jmartinandCursor 25c10c885a docs(#112): note alignement front reprise dossier complet
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 16:42:35 +02:00
jmartinandCursor d70577b1c3 feat(#112): reprise après refus — dossier complet GET/PATCH
- GET reprise-dossier : parents[], enfants[], texte_motivation (famille) ou fiche AM (#119)
- PATCH reprise-resoumettre : co-parent, enfants (update par id), motivation, fiche AM
- Resoumission famille : tous les parents en en_attente + invalidation token groupée
- DTOs étendus + est_multiple sur enfants dossier famille
- Tests unitaires getRepriseDossier parent/AM

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 16:39:53 +02:00
jmartinandCursor 671da71752 feat(#112): reprise après refus via lien e-mail (/reprise?token=)
Branche le flux front : chargement du dossier, session reprise, wizards
parent/AM préremplis et resoumission via reprise-resoumettre.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-16 16:28:41 +02:00
76 changed files with 985 additions and 1379 deletions
+1
View File
@@ -33,6 +33,7 @@ model Child {
dateOfBirth DateTime dateOfBirth DateTime
photoUrl String? photoUrl String?
photoConsent Boolean @default(false) photoConsent Boolean @default(false)
isMultiple Boolean @default(false)
isUnborn Boolean @default(false) isUnborn Boolean @default(false)
parentId String parentId String
parent Parent @relation(fields: [parentId], references: [id]) parent Parent @relation(fields: [parentId], references: [id])
+3
View File
@@ -63,6 +63,9 @@ export class Children {
@Column({ type: 'timestamptz', nullable: true, name: 'date_consentement_photo' }) @Column({ type: 'timestamptz', nullable: true, name: 'date_consentement_photo' })
consent_photo_at?: Date; consent_photo_at?: Date;
@Column({ default: false, name: 'est_multiple', type: 'boolean' })
is_multiple: boolean;
// Lien via table de jointure enfants_parents // Lien via table de jointure enfants_parents
@OneToMany(() => ParentsChildren, pc => pc.child) @OneToMany(() => ParentsChildren, pc => pc.child)
parentLinks: ParentsChildren[]; parentLinks: ParentsChildren[];
+4
View File
@@ -564,6 +564,7 @@ export class AuthService {
enfant.status = enfantDto.date_naissance ? StatutEnfantType.SANS_GARDE : StatutEnfantType.A_NAITRE; enfant.status = enfantDto.date_naissance ? StatutEnfantType.SANS_GARDE : StatutEnfantType.A_NAITRE;
enfant.consent_photo = !!enfantDto.consent_photo; enfant.consent_photo = !!enfantDto.consent_photo;
enfant.consent_photo_at = enfant.consent_photo ? new Date() : null!; enfant.consent_photo_at = enfant.consent_photo ? new Date() : null!;
enfant.is_multiple = enfantDto.grossesse_multiple || false;
const enfantEnregistre = await manager.save(Children, enfant); const enfantEnregistre = await manager.save(Children, enfant);
enfantsEnregistres.push(enfantEnregistre); enfantsEnregistres.push(enfantEnregistre);
@@ -1386,6 +1387,9 @@ export class AuthService {
enfant.status = StatutEnfantType.A_NAITRE; enfant.status = StatutEnfantType.A_NAITRE;
} }
} }
if (enfantDto.grossesse_multiple !== undefined) {
enfant.is_multiple = enfantDto.grossesse_multiple;
}
if (enfantDto.consent_photo !== undefined) { if (enfantDto.consent_photo !== undefined) {
enfant.consent_photo = !!enfantDto.consent_photo; enfant.consent_photo = !!enfantDto.consent_photo;
enfant.consent_photo_at = enfant.consent_photo enfant.consent_photo_at = enfant.consent_photo
@@ -55,6 +55,11 @@ export class EnfantInscriptionDto {
@IsString() @IsString()
photo_filename?: string; photo_filename?: string;
@ApiProperty({ example: false, required: false, description: 'Grossesse multiple (jumeaux, triplés, etc.)' })
@IsOptional()
@IsBoolean()
grossesse_multiple?: boolean;
@ApiProperty({ @ApiProperty({
example: true, example: true,
required: false, required: false,
@@ -74,6 +74,11 @@ export class CreateEnfantsDto {
@IsDateString() @IsDateString()
consent_photo_at?: string; consent_photo_at?: string;
@ApiProperty({ default: false })
@Transform(toBoolean)
@IsBoolean()
is_multiple: boolean;
/** /**
* Parent pivot du foyer — obligatoire pour staff (gestionnaire/admin). * Parent pivot du foyer — obligatoire pour staff (gestionnaire/admin).
* Ignoré / interdit en externe pour un PARENT (ticket #132). * Ignoré / interdit en externe pour un PARENT (ticket #132).
@@ -29,6 +29,9 @@ export class EnfantResponseDto {
@ApiProperty({ example: false }) @ApiProperty({ example: false })
consent_photo: boolean; consent_photo: boolean;
@ApiProperty({ example: false })
is_multiple: boolean;
@ApiProperty({ example: 'UUID-parent' }) @ApiProperty({ example: 'UUID-parent' })
parent_id: string; parent_id: string;
} }
@@ -92,6 +92,7 @@ export class EnfantsService {
photo_url: photoUrl, photo_url: photoUrl,
consent_photo: !!dto.consent_photo, consent_photo: !!dto.consent_photo,
consent_photo_at: consentAt, consent_photo_at: consentAt,
is_multiple: !!dto.is_multiple,
}); });
await this.childrenRepository.save(child); await this.childrenRepository.save(child);
@@ -54,6 +54,9 @@ export class DossierFamilleEnfantDto {
description: 'Consentement affichage photo (colonne consentement_photo)', description: 'Consentement affichage photo (colonne consentement_photo)',
}) })
consent_photo?: boolean; consent_photo?: boolean;
@ApiProperty({ required: false, description: 'Grossesse multiple (est_multiple)' })
est_multiple?: boolean;
} }
/** Réponse GET /parents/dossier-famille/:numeroDossier dossier famille complet. Ticket #119 */ /** Réponse GET /parents/dossier-famille/:numeroDossier dossier famille complet. Ticket #119 */
@@ -370,6 +370,7 @@ export class ParentsService {
status: child.status, status: child.status,
photo_url: child.photo_url ?? undefined, photo_url: child.photo_url ?? undefined,
consent_photo: child.consent_photo, consent_photo: child.consent_photo,
est_multiple: child.is_multiple,
}; };
} }
+2 -1
View File
@@ -174,7 +174,8 @@ CREATE TABLE enfants (
date_prevue_naissance DATE, date_prevue_naissance DATE,
photo_url TEXT, photo_url TEXT,
consentement_photo BOOLEAN DEFAULT false, consentement_photo BOOLEAN DEFAULT false,
date_consentement_photo TIMESTAMPTZ date_consentement_photo TIMESTAMPTZ,
est_multiple BOOLEAN DEFAULT false
); );
-- ========================================================== -- ==========================================================
+10 -10
View File
@@ -1,10 +1,10 @@
"id","statut","prenom","nom","genre","date_naissance","date_prevue_naissance","photo_url","consentement_photo","date_consentement_photo" "id","statut","prenom","nom","genre","date_naissance","date_prevue_naissance","photo_url","consentement_photo","date_consentement_photo","est_multiple"
"5e8574b7-63e6-4d48-9af3-8d3bf7a6a6cf","sans_garde","Emma","Dupont","F","2020-06-01",,,False, "5e8574b7-63e6-4d48-9af3-8d3bf7a6a6cf","sans_garde","Emma","Dupont","F","2020-06-01",,,False,,False
"a5c3268e-07eb-41a4-9f6c-2f9f16f37c3d","sans_garde",,,,"2020-01-01","2025-01-01",,False, "a5c3268e-07eb-41a4-9f6c-2f9f16f37c3d","sans_garde",,,,"2020-01-01","2025-01-01",,False,,False
"e1a2b3c4-d5e6-4f7a-8b9c-1d2e3f4a5b6c","sans_garde","Emma","Martin",,"2023-02-15",,,False, "e1a2b3c4-d5e6-4f7a-8b9c-1d2e3f4a5b6c","sans_garde","Emma","Martin",,"2023-02-15",,,False,,False
"e2b3c4d5-e6f7-4a8b-9c1d-2e3f4a5b6c7d","sans_garde","Noah","Martin",,"2023-02-15",,,False, "e2b3c4d5-e6f7-4a8b-9c1d-2e3f4a5b6c7d","sans_garde","Noah","Martin",,"2023-02-15",,,False,,False
"e3c4d5e6-f7a8-4b9c-1d2e-3f4a5b6c7d8e","sans_garde","Léa","Martin",,"2023-02-15",,,False, "e3c4d5e6-f7a8-4b9c-1d2e-3f4a5b6c7d8e","sans_garde","Léa","Martin",,"2023-02-15",,,False,,False
"e4d5e6f7-a8b9-4c1d-2e3f-4a5b6c7d8e9f","sans_garde","Chloé","Rousseau",,"2022-04-20",,,False, "e4d5e6f7-a8b9-4c1d-2e3f-4a5b6c7d8e9f","sans_garde","Chloé","Rousseau",,"2022-04-20",,,False,,False
"e5e6f7a8-b9c1-4d2e-3f4a-5b6c7d8e9f1a","sans_garde","Hugo","Rousseau",,"2024-03-10",,,False, "e5e6f7a8-b9c1-4d2e-3f4a-5b6c7d8e9f1a","sans_garde","Hugo","Rousseau",,"2024-03-10",,,False,,False
"e6f7a8b9-c1d2-4e3f-5a6b-7c8d9e0f1a2b","sans_garde","Maxime","Lecomte",,"2023-04-15",,,False, "e6f7a8b9-c1d2-4e3f-5a6b-7c8d9e0f1a2b","sans_garde","Maxime","Lecomte",,"2023-04-15",,,False,,False
"edd19cd1-bb67-4f14-8a37-c66b75c94537","scolarise","Lucas","Durand","H","2018-09-15",,,False, "edd19cd1-bb67-4f14-8a37-c66b75c94537","scolarise","Lucas","Durand","H","2018-09-15",,,False,,False
1 id statut prenom nom genre date_naissance date_prevue_naissance photo_url consentement_photo date_consentement_photo est_multiple
2 5e8574b7-63e6-4d48-9af3-8d3bf7a6a6cf sans_garde Emma Dupont F 2020-06-01 False False
3 a5c3268e-07eb-41a4-9f6c-2f9f16f37c3d sans_garde 2020-01-01 2025-01-01 False False
4 e1a2b3c4-d5e6-4f7a-8b9c-1d2e3f4a5b6c sans_garde Emma Martin 2023-02-15 False False
5 e2b3c4d5-e6f7-4a8b-9c1d-2e3f4a5b6c7d sans_garde Noah Martin 2023-02-15 False False
6 e3c4d5e6-f7a8-4b9c-1d2e-3f4a5b6c7d8e sans_garde Léa Martin 2023-02-15 False False
7 e4d5e6f7-a8b9-4c1d-2e3f-4a5b6c7d8e9f sans_garde Chloé Rousseau 2022-04-20 False False
8 e5e6f7a8-b9c1-4d2e-3f4a-5b6c7d8e9f1a sans_garde Hugo Rousseau 2024-03-10 False False
9 e6f7a8b9-c1d2-4e3f-5a6b-7c8d9e0f1a2b sans_garde Maxime Lecomte 2023-04-15 False False
10 edd19cd1-bb67-4f14-8a37-c66b75c94537 scolarise Lucas Durand H 2018-09-15 False False
@@ -1,2 +0,0 @@
-- #152 — Suppression grossesse multiple / est_multiple
ALTER TABLE enfants DROP COLUMN IF EXISTS est_multiple;
+4 -4
View File
@@ -69,12 +69,12 @@ ON CONFLICT (id_utilisateur) DO NOTHING;
-- - child B : à naître (statut = 'a_naitre' et date_prevue_naissance requise) -- - child B : à naître (statut = 'a_naitre' et date_prevue_naissance requise)
-- ------------------------------------------------------------ -- ------------------------------------------------------------
INSERT INTO enfants (id, prenom, nom, statut, date_naissance) INSERT INTO enfants (id, prenom, nom, statut, date_naissance, jumeau_multiple)
VALUES ('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'Léo', 'Parent', 'sans_garde', '2022-04-12') VALUES ('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'Léo', 'Parent', 'sans_garde', '2022-04-12', false)
ON CONFLICT (id) DO NOTHING; ON CONFLICT (id) DO NOTHING;
INSERT INTO enfants (id, prenom, nom, statut, date_prevue_naissance) INSERT INTO enfants (id, prenom, nom, statut, date_prevue_naissance, jumeau_multiple)
VALUES ('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'Mila', 'Parent', 'a_naitre', '2026-02-15') VALUES ('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'Mila', 'Parent', 'a_naitre', '2026-02-15', false)
ON CONFLICT (id) DO NOTHING; ON CONFLICT (id) DO NOTHING;
-- ------------------------------------------------------------ -- ------------------------------------------------------------
+7 -7
View File
@@ -49,14 +49,14 @@ VALUES
ON CONFLICT (id_utilisateur) DO NOTHING; ON CONFLICT (id_utilisateur) DO NOTHING;
-- ========== ENFANTS ========== -- ========== ENFANTS ==========
INSERT INTO enfants (id, prenom, nom, genre, date_naissance, statut) INSERT INTO enfants (id, prenom, nom, genre, date_naissance, statut, est_multiple)
VALUES VALUES
('e0000001-0001-0001-0001-000000000001', 'Emma', 'MARTIN', 'F', '2023-02-15', 'sans_garde'), ('e0000001-0001-0001-0001-000000000001', 'Emma', 'MARTIN', 'F', '2023-02-15', 'sans_garde', true),
('e0000002-0002-0002-0002-000000000002', 'Noah', 'MARTIN', 'H', '2023-02-15', 'sans_garde'), ('e0000002-0002-0002-0002-000000000002', 'Noah', 'MARTIN', 'H', '2023-02-15', 'sans_garde', true),
('e0000003-0003-0003-0003-000000000003', 'Léa', 'MARTIN', 'F', '2023-02-15', 'sans_garde'), ('e0000003-0003-0003-0003-000000000003', 'Léa', 'MARTIN', 'F', '2023-02-15', 'sans_garde', true),
('e0000004-0004-0004-0004-000000000004', 'Chloé', 'ROUSSEAU', 'F', '2022-04-20', 'sans_garde'), ('e0000004-0004-0004-0004-000000000004', 'Chloé', 'ROUSSEAU', 'F', '2022-04-20', 'sans_garde', false),
('e0000005-0005-0005-0005-000000000005', 'Hugo', 'ROUSSEAU', 'H', '2024-03-10', 'sans_garde'), ('e0000005-0005-0005-0005-000000000005', 'Hugo', 'ROUSSEAU', 'H', '2024-03-10', 'sans_garde', false),
('e0000006-0006-0006-0006-000000000006', 'Maxime', 'LECOMTE', 'H', '2023-04-15', 'sans_garde') ('e0000006-0006-0006-0006-000000000006', 'Maxime', 'LECOMTE', 'H', '2023-04-15', 'sans_garde', false)
ON CONFLICT (id) DO NOTHING; ON CONFLICT (id) DO NOTHING;
-- ========== ENFANTS_PARENTS (liaison N:N) ========== -- ========== ENFANTS_PARENTS (liaison N:N) ==========
+1
View File
@@ -117,6 +117,7 @@ Table des enfants pris en charge.
| `photo_url` | TEXT | | URL de la photo | | `photo_url` | TEXT | | URL de la photo |
| `consentement_photo` | BOOLEAN | DEFAULT false | Consentement photo | | `consentement_photo` | BOOLEAN | DEFAULT false | Consentement photo |
| `date_consentement_photo` | TIMESTAMPTZ | | Date du consentement | | `date_consentement_photo` | TIMESTAMPTZ | | Date du consentement |
| `est_multiple` | BOOLEAN | DEFAULT false | Indique si grossesse multiple |
--- ---
+3
View File
@@ -276,6 +276,9 @@ export class Enfants {
@Column({ name: 'consentement_photo', type: 'boolean', default: false }) @Column({ name: 'consentement_photo', type: 'boolean', default: false })
consentementPhoto: boolean; consentementPhoto: boolean;
@Column({ name: 'est_multiple', type: 'boolean', default: false })
estMultiple: boolean;
@Column({ @Column({
type: 'enum', type: 'enum',
enum: StatutEnfantType, enum: StatutEnfantType,
@@ -1,65 +0,0 @@
# Mini-spec — Suppression complète grossesse multiple / `est_multiple`
**Ticket** : **#152** — https://git.ptits-pas.fr/jmartin/petitspas/issues/152
**Branche** : `feature/152-remove-est-multiple` (depuis `develop`)
**Périmètre** : **full stack** — BDD + back + front + scripts + docs. **Aucun fantôme.**
---
## Décision
On **supprime tout**. Pas de DTO « ignorés », pas de compat payload.
`forbidNonWhitelisted: true` ⇒ back et front **partent ensemble** (même feature / même déploiement).
---
## Alias retirés
`est_multiple` · `is_multiple` · `grossesse_multiple` · `multipleBirth` · `estMultiple` · `isMultiple` · `jumeau_multiple`
---
## Back / BDD (fait sur la branche)
- [x] Migration `database/migrations/2026_drop_enfants_est_multiple.sql`
- [x] `BDD.sql`, seeds, CSV test
- [x] Entity `Children` sans colonne
- [x] DTO create/inscription/réponse/dossier famille **sans** le champ
- [x] Services auth / enfants / parents : plus de mapping
- [x] Prisma legacy `isMultiple` retiré
## Front (fait sur la branche)
- [x] Modèles admin / dossier / inscription
- [x] Payloads inscription + reprise
- [x] Modale enfant + wizard dossier famille
- [x] Step3 inscription parent
## Scripts / docs
- [x] `tests/scripts/register-parent-*.mjs`
- [x] `docs/10_DATABASE.md`, `docs/99_REGLES-CODAGE.md`
- Docs tmp/archive #112 : mentions historiques OK (archive)
---
## Déploiement
1. Appliquer la migration SQL sur la BDD vivante
2. Deploy back **et** front de cette branche
3. Smoke : création enfant staff, inscription parent, reprise, wizard famille
## Vérif
```bash
rg -n 'est_multiple|is_multiple|grossesse_multiple|multipleBirth|estMultiple|isMultiple|jumeau_multiple' \
backend/src frontend/lib database tests/scripts docs/10_DATABASE.md docs/99_REGLES-CODAGE.md
```
**0** hit (hors ce fichier mini-spec / archives).
## Hors scope
- Métier futur « fratrie / jumeaux » → nouveau ticket
- #155 rename Admin*
- Ticket modales staff
@@ -1,54 +0,0 @@
# Mini-spec — Rename préfixe `Admin*` dashboard partagé (#155)
**Ticket** : **#155**
**Branche** : `feature/155-rename-admin-prefix-dashboard` (depuis `develop`)
**Décision naming** : **option C** — dossier neutre `widgets/dashboard/` + noms **sans** préfixe `Admin`.
---
## Principe
Les widgets partagés **admin + gestionnaire** ne doivent plus sappeler `Admin*`.
On garde `Admin*` seulement là où cest vraiment le rôle administrateur.
## Gardé `Admin*` (hors rename)
| Élément | Raison |
|---------|--------|
| `AdminManagementWidget` | Onglet **Administrateurs** |
| `screens/administrateurs/*` | `AdminDashboardScreen`, `AdminCreateDialog`, `AdminUserFormDialog` |
| `EnfantAdminModel` | Modèle API (pas un widget) — hors scope ticket |
## Renames faits
| Avant | Après |
|-------|--------|
| `widgets/admin/common/admin_child_detail_modal.dart``AdminChildDetailModal` | `widgets/dashboard/child_detail_modal.dart``ChildDetailModal` |
| `admin_am_edit_modal``AdminAmEditModal` | `am_edit_modal``AmEditModal` |
| `admin_parent_edit_modal``AdminParentEditModal` | `parent_edit_modal``ParentEditModal` |
| `admin_user_card``AdminUserCard` | `user_card``UserCard` |
| `admin_enfant_user_card``AdminEnfantUserCard` | `enfant_user_card``EnfantUserCard` |
| `admin_am_photo_frame``AdminAmPhotoFrame` | `am_photo_frame``AmPhotoFrame` |
| `admin_am_children_capacity_grid` | `am_children_capacity_grid``AmChildrenCapacityGrid` |
| `admin_children_affiliation_panel` | `children_affiliation_panel``ChildrenAffiliationPanel` |
| `admin_select_*` / `AdminSelect*` / `AdminFamilleFoyer` | `select_*` / `Select*` / `FamilleFoyer` |
| `admin_status_capsule` | `status_capsule``StatusCapsule` |
| `admin_list_state``AdminListState` | `user_list_state``UserListState` |
| `admin_detail_modal``AdminDetailModal` / `AdminDetailField` | `detail_modal``DetailModal` / `DetailField` |
| `dashboard_admin.dart` | `user_management_sub_bar.dart` (`DashboardUserManagementSubBar` inchangé) |
Dossier `widgets/admin/` conserve encore les panels métier (`user_management_panel`, wizards, etc.) + `AdminManagementWidget`.
**Phase 2** (même ticket #155) : déplacer ces panels → `widgets/dashboard/` — voir [155-suite-move-admin-panels-to-dashboard.md](./155-suite-move-admin-panels-to-dashboard.md).
## Hors scope
- Refonte UX modales (ticket dédié)
- Rename API / back
- Déplacer tout `widgets/admin/``widgets/dashboard/` (panels) — possible follow-up
## Critères
- [x] Plus de préfixe `Admin` sur les composants **partagés** listés
- [ ] Build Flutter / recette dashboard admin + gestionnaire OK
- [x] Pas de changement comportemental (rename mécanique)
@@ -1,203 +0,0 @@
# Mini-spec — Déplacer les panels `widgets/admin/``widgets/dashboard/`
**Ticket** : **#155** (phase 2 — même ticket que le rename `Admin*`)
**Phase 1** : widgets `Admin*``widgets/dashboard/` (déjà sur `feature/155-rename-admin-prefix-dashboard`)
**Branche** : poursuivre / rebaser `feature/155-rename-admin-prefix-dashboard` (ou nouvelle branche depuis `develop` après merge phase 1)
**Nature** : rename / move mécanique — **zéro** changement UX / métier
---
## Contexte
Après la phase 1 (#155), la situation est **hybride** :
| Emplacement | Contenu |
|-------------|---------|
| `widgets/dashboard/` | Composants partagés sans préfixe `Admin*` (modales, cartes, selects, sub-bar…) |
| `widgets/admin/` | **Panels** du dashboard staff (listes, wizards, validation, shell `UserManagementPanel`…) + `AdminManagementWidget` |
Le dossier `admin/` laisse encore croire « réservé administrateur », alors que **gestionnaire** consomme les mêmes panels (`GestionnaireDashboardScreen``UserManagementPanel`).
Ce ticket **termine loption C** au niveau dossier : tout le dashboard staff vit sous `widgets/dashboard/`, sauf ce qui est **vraiment** rôle admin.
---
## Objectif
```
frontend/lib/widgets/admin/<panels & common partagés>
↓ git mv + update imports
frontend/lib/widgets/dashboard/…
```
Critère : un nouveau dev ne doit plus ouvrir `widgets/admin/` pour du code partagé admin+gestionnaire.
---
## Cible darborescence (proposée)
```
widgets/dashboard/
├── (déjà là #155) child_detail_modal.dart, am_edit_modal.dart, user_card.dart, …
├── user_management_panel.dart ← shell onglets
├── user_management_sub_bar.dart ← déjà déplacé #155
├── dossiers_management_widget.dart
├── dossier_list_card.dart
├── parent_management_widget.dart ← corriger le typo managmant au passage ?
├── enfant_management_widget.dart
├── assistante_maternelle_management_widget.dart
├── gestionnaire_management_widget.dart
├── pending_validation_widget.dart
├── parent_dossier_create_modal.dart
├── parent_dossier_wizard.dart
├── am_dossier_create_modal.dart
├── am_dossier_wizard.dart
├── validation_*.dart ← family/am wizards, refus, theme, confirm
├── parametres_panel.dart ← utilisé par écran admin (OK dans dashboard)
├── relais_management_panel.dart
├── common/ ← sous-dossier optionnel
│ ├── suppression_confirm_dialog.dart
│ ├── user_list.dart
│ └── validation_detail_section.dart
└── …
widgets/admin/ ← mince, rôle admin seulement
└── admin_management_widget.dart ← onglet Administrateurs
```
### Variante B (plus stricte)
`AdminManagementWidget` + éventuels helpers purement admin →
`screens/administrateurs/widgets/`
et **suppression** du dossier `widgets/admin/`.
**Reco** : **variante A** (garder `widgets/admin/` minimal avec seulement `AdminManagementWidget`) — moins de churn screens, clair.
---
## Inventaire à déplacer (état actuel)
### Racine `widgets/admin/``widgets/dashboard/`
| Fichier actuel | Notes |
|----------------|--------|
| `user_management_panel.dart` | Shell partagé admin + gestionnaire |
| `dossiers_management_widget.dart` | |
| `dossier_list_card.dart` | |
| `parent_managmant_widget.dart` | Typo historique `managmant`**option** : renommer → `parent_management_widget.dart` dans le même ticket ou ticket typo séparé |
| `enfant_management_widget.dart` | |
| `assistante_maternelle_management_widget.dart` | |
| `gestionnaire_management_widget.dart` | |
| `pending_validation_widget.dart` | |
| `parent_dossier_create_modal.dart` | |
| `parent_dossier_wizard.dart` | |
| `am_dossier_create_modal.dart` | |
| `am_dossier_wizard.dart` | |
| `validation_am_wizard.dart` | |
| `validation_family_wizard.dart` | |
| `validation_dossier_modal.dart` | |
| `validation_modal_theme.dart` | |
| `validation_refus_form.dart` | |
| `validation_valider_confirm_dialog.dart` | |
| `parametres_panel.dart` | Écran admin seulement, mais pas préfixé Admin — OK dashboard |
| `relais_management_panel.dart` | |
### `widgets/admin/common/``widgets/dashboard/common/` (ou plat)
| Fichier | Notes |
|---------|--------|
| `suppression_confirm_dialog.dart` | Partagé (y compris `screens/administrateurs/creation/*`) |
| `user_list.dart` | |
| `validation_detail_section.dart` | |
### **Ne pas** déplacer
| Fichier | Destination |
|---------|-------------|
| `admin_management_widget.dart` | Reste `widgets/admin/` (ou variante B → screens) |
### Déjà fait (#155) — ne pas retraiter
Tout ce qui est déjà sous `widgets/dashboard/` (`child_detail_modal`, `am_edit_modal`, `user_card`, `select_*`, `user_management_sub_bar`, …).
---
## Consommateurs dimports (à mettre à jour)
### Screens
- `screens/administrateurs/admin_dashboardScreen.dart``UserManagementPanel`, `ParametresPanel`
- `screens/gestionnaire/gestionnaire_dashboard_screen.dart``UserManagementPanel`
- `screens/administrateurs/creation/admin_create.dart``suppression_confirm_dialog`
- `screens/administrateurs/creation/gestionnaires_create.dart` — idem
### Widgets déjà en `dashboard/`
- `am_edit_modal`, `child_detail_modal`, `parent_edit_modal`, `select_*` — imports vers `widgets/admin/common/*` ou panels
### Divers
- `widgets/common/identity_block.dart` (si import admin)
- Tous les fichiers **déplacés** entre eux (imports relatifs / package)
### Hors scope rename classes
Sauf décision explicite sur le typo `parent_managmant_widget` → pas de rename de **classes** métier dans ce ticket (seulement chemins de fichiers + imports).
`AdminManagementWidget` **conserve** son nom.
---
## Plan dexécution
1. Partir de `feature/155-rename-admin-prefix-dashboard` (phase 1) **ou** `develop` si phase 1 déjà mergée
2. `git mv` fichiers selon inventaire
3. Remplacer globalement
`package:p_tits_pas/widgets/admin/``package:p_tits_pas/widgets/dashboard/`
**sauf** `…/widgets/admin/admin_management_widget.dart`
4. Corriger imports relatifs cassés
5. Grep de contrôle (ci-dessous)
6. Build Flutter web (Docker) + smoke dashboard admin **et** gestionnaire
7. Merge → squash master si flux habituel
---
## Vérifs
```bash
# Plus de panels partagés sous admin (seul AdminManagement attendu)
find frontend/lib/widgets/admin -name '*.dart'
# Plus dimports panels vers lancien chemin (sauf AdminManagement)
rg -n "widgets/admin/(user_management|dossiers_|parent_|enfant_|assistante|gestionnaire|pending|validation_|parametres|relais|am_dossier|parent_dossier|dossier_list|common/)" frontend/lib
# Screens OK
rg -n "widgets/admin/" frontend/lib/screens
```
Attendu screens : **0** hit vers panels ; éventuellement plus aucun hit `widgets/admin/` sauf si import explicite `AdminManagementWidget` depuis `user_management_panel` (chemin `widgets/admin/admin_management_widget.dart`).
---
## Hors scope
- Refonte UX des modales / panels (ticket dédié annoncé)
- Rename `EnfantAdminModel`
- Rename `screens/administrateurs/`
- Rename `AdminUserFormDialog` / `AdminCreateDialog`
- Changement API / back
- #152 (`est_multiple`) — autre branche
---
## Critères dacceptation
- [ ] Inventaire déplacé selon tableau
- [ ] `widgets/admin/` ne contient plus que `admin_management_widget.dart` (variante A)
- [ ] Imports screens + widgets à jour
- [ ] Build Flutter OK
- [ ] Recette : dashboard **administrateur** et **gestionnaire** (listes, ouverture fiches, validation, création dossier) sans régression
- [ ] Aucun changement comportemental volontaire
---
## Risques / notes
- **Conflits de merge** si dautres features touchent les panels → faire ce ticket quand la surface dashboard est calme (fin 0.1.0 OK)
- Typo `parent_managmant_widget` : soit inclus (bonus), soit ticket cleanup 1-ligne séparé
- Docs darchive citant `widgets/admin/…` : pas obligatoire de mettre à jour ; `docs/27_BRIEFING-FRONTEND.md` oui si encore listé
@@ -1,14 +0,0 @@
# Mini-spec — Uniformisation modale staff (Gestionnaire / Administrateur)
**Ticket** : **#164** — https://git.ptits-pas.fr/jmartin/petitspas/issues/164
**Branche** : `feature/164-staff-modal-uniformisation` (depuis `develop`)
**Périmètre** : **front only** — pas dAPI / BDD
**Milestone** : **0.1.0**
Voir le corps du ticket #164 pour la spec complète.
## Livré
- `frontend/lib/widgets/dashboard/staff_user_form_modal.dart``StaffUserFormModal`
- Ancien `AdminUserFormDialog` / `gestionnaires_create.dart` retiré
- Imports : `user_management_panel`, `gestionnaire_management_widget`, `admin_management_widget`
+4
View File
@@ -185,6 +185,7 @@ class EnfantDossier {
final String? dueDate; final String? dueDate;
final String? photoUrl; final String? photoUrl;
final bool consentPhoto; final bool consentPhoto;
final bool estMultiple;
EnfantDossier({ EnfantDossier({
required this.id, required this.id,
@@ -196,6 +197,7 @@ class EnfantDossier {
this.dueDate, this.dueDate,
this.photoUrl, this.photoUrl,
this.consentPhoto = false, this.consentPhoto = false,
this.estMultiple = false,
}); });
String get fullName => '${firstName ?? ''} ${lastName ?? ''}'.trim(); String get fullName => '${firstName ?? ''} ${lastName ?? ''}'.trim();
@@ -229,6 +231,8 @@ class EnfantDossier {
photoUrl: resolvedPhoto, photoUrl: resolvedPhoto,
consentPhoto: consentPhoto:
json['consent_photo'] == true || json['consentPhoto'] == true, json['consent_photo'] == true || json['consentPhoto'] == true,
estMultiple:
json['est_multiple'] == true || json['estMultiple'] == true,
); );
} }
} }
@@ -12,6 +12,7 @@ class EnfantAdminModel {
final String status; final String status;
final String? photoUrl; final String? photoUrl;
final bool consentPhoto; final bool consentPhoto;
final bool isMultiple;
final List<EnfantParentLink> parentLinks; final List<EnfantParentLink> parentLinks;
/// Flag API #157 (sinon déduit de [parentLinks]). /// Flag API #157 (sinon déduit de [parentLinks]).
final bool? sansResponsable; final bool? sansResponsable;
@@ -26,6 +27,7 @@ class EnfantAdminModel {
required this.status, required this.status,
this.photoUrl, this.photoUrl,
this.consentPhoto = false, this.consentPhoto = false,
this.isMultiple = false,
this.parentLinks = const [], this.parentLinks = const [],
this.sansResponsable, this.sansResponsable,
}); });
@@ -54,6 +56,7 @@ class EnfantAdminModel {
String? status, String? status,
String? photoUrl, String? photoUrl,
bool? consentPhoto, bool? consentPhoto,
bool? isMultiple,
List<EnfantParentLink>? parentLinks, List<EnfantParentLink>? parentLinks,
bool? sansResponsable, bool? sansResponsable,
}) { }) {
@@ -67,6 +70,7 @@ class EnfantAdminModel {
status: status ?? this.status, status: status ?? this.status,
photoUrl: photoUrl ?? this.photoUrl, photoUrl: photoUrl ?? this.photoUrl,
consentPhoto: consentPhoto ?? this.consentPhoto, consentPhoto: consentPhoto ?? this.consentPhoto,
isMultiple: isMultiple ?? this.isMultiple,
parentLinks: parentLinks ?? this.parentLinks, parentLinks: parentLinks ?? this.parentLinks,
sansResponsable: sansResponsable ?? this.sansResponsable, sansResponsable: sansResponsable ?? this.sansResponsable,
); );
@@ -107,6 +111,8 @@ class EnfantAdminModel {
), ),
photoUrl: photoUrl, photoUrl: photoUrl,
consentPhoto: consentPhoto, consentPhoto: consentPhoto,
isMultiple: _parseBool(json['is_multiple']) ||
_parseBool(json['est_multiple']),
parentLinks: links, parentLinks: links,
sansResponsable: sansResponsable, sansResponsable: sansResponsable,
); );
@@ -121,6 +127,7 @@ class EnfantAdminModel {
if (birthDate != null && birthDate!.isNotEmpty) 'birth_date': birthDate, if (birthDate != null && birthDate!.isNotEmpty) 'birth_date': birthDate,
if (dueDate != null && dueDate!.isNotEmpty) 'due_date': dueDate, if (dueDate != null && dueDate!.isNotEmpty) 'due_date': dueDate,
'consent_photo': consentPhoto, 'consent_photo': consentPhoto,
'is_multiple': isMultiple,
}; };
} }
@@ -30,6 +30,7 @@ class ChildData {
String lastName; String lastName;
String dob; // Date de naissance ou prévisionnelle String dob; // Date de naissance ou prévisionnelle
bool photoConsent; bool photoConsent;
bool multipleBirth;
bool isUnbornChild; bool isUnbornChild;
File? imageFile; File? imageFile;
CardColorVertical cardColor; // Nouveau champ pour la couleur de la carte CardColorVertical cardColor; // Nouveau champ pour la couleur de la carte
@@ -39,6 +40,7 @@ class ChildData {
this.lastName = '', this.lastName = '',
this.dob = '', this.dob = '',
this.photoConsent = false, this.photoConsent = false,
this.multipleBirth = false,
this.isUnbornChild = false, this.isUnbornChild = false,
this.imageFile, this.imageFile,
required this.cardColor, // Rendre requis dans le constructeur required this.cardColor, // Rendre requis dans le constructeur
@@ -38,6 +38,7 @@ class ChildData {
/// Valeurs API : `H`, `F`, `Autre` (GenreType backend). Vide tant que non choisi. /// Valeurs API : `H`, `F`, `Autre` (GenreType backend). Vide tant que non choisi.
String genre; String genre;
bool photoConsent; bool photoConsent;
bool multipleBirth;
bool isUnbornChild; bool isUnbornChild;
File? imageFile; File? imageFile;
/// Octets de la photo (fiable à lenvoi API ; [imageFile] peut être absent sur le web). /// Octets de la photo (fiable à lenvoi API ; [imageFile] peut être absent sur le web).
@@ -54,6 +55,7 @@ class ChildData {
this.dob = '', this.dob = '',
this.genre = '', this.genre = '',
this.photoConsent = false, this.photoConsent = false,
this.multipleBirth = false,
this.isUnbornChild = false, this.isUnbornChild = false,
this.imageFile, this.imageFile,
this.imageBytes, this.imageBytes,
@@ -68,6 +70,7 @@ class ChildData {
String? dob, String? dob,
String? genre, String? genre,
bool? photoConsent, bool? photoConsent,
bool? multipleBirth,
bool? isUnbornChild, bool? isUnbornChild,
Object? imageFile = _unsetImage, Object? imageFile = _unsetImage,
Object? imageBytes = _unsetImageBytes, Object? imageBytes = _unsetImageBytes,
@@ -81,6 +84,7 @@ class ChildData {
dob: dob ?? this.dob, dob: dob ?? this.dob,
genre: genre ?? this.genre, genre: genre ?? this.genre,
photoConsent: photoConsent ?? this.photoConsent, photoConsent: photoConsent ?? this.photoConsent,
multipleBirth: multipleBirth ?? this.multipleBirth,
isUnbornChild: isUnbornChild ?? this.isUnbornChild, isUnbornChild: isUnbornChild ?? this.isUnbornChild,
imageFile: identical(imageFile, _unsetImage) ? this.imageFile : imageFile as File?, imageFile: identical(imageFile, _unsetImage) ? this.imageFile : imageFile as File?,
imageBytes: imageBytes:
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/configuration_service.dart'; import 'package:p_tits_pas/services/configuration_service.dart';
import 'package:p_tits_pas/widgets/dashboard/user_management_sub_bar.dart'; import 'package:p_tits_pas/widgets/admin/dashboard_admin.dart';
import 'package:p_tits_pas/widgets/dashboard/parametres_panel.dart'; import 'package:p_tits_pas/widgets/admin/parametres_panel.dart';
import 'package:p_tits_pas/widgets/dashboard/user_management_panel.dart'; import 'package:p_tits_pas/widgets/admin/user_management_panel.dart';
import 'package:p_tits_pas/widgets/app_footer.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/widgets/dashboard/dashboard_bandeau.dart';
@@ -3,7 +3,7 @@ import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/email_utils.dart'; import 'package:p_tits_pas/utils/email_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/email_text_field.dart'; import 'package:p_tits_pas/widgets/email_text_field.dart';
import 'package:p_tits_pas/widgets/french_phone_field.dart'; import 'package:p_tits_pas/widgets/french_phone_field.dart';
@@ -0,0 +1,675 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/relais_model.dart';
import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/utils/email_utils.dart';
import 'package:p_tits_pas/widgets/email_text_field.dart';
import 'package:p_tits_pas/widgets/french_phone_field.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/relais_service.dart';
import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
class AdminUserFormDialog extends StatefulWidget {
final AppUser? initialUser;
final bool withRelais;
final bool adminMode;
final bool readOnly;
const AdminUserFormDialog({
super.key,
this.initialUser,
this.withRelais = true,
this.adminMode = false,
this.readOnly = false,
});
@override
State<AdminUserFormDialog> createState() => _AdminUserFormDialogState();
}
class _AdminUserFormDialogState extends State<AdminUserFormDialog> {
final _formKey = GlobalKey<FormState>();
final _nomController = TextEditingController();
final _prenomController = TextEditingController();
final _emailController = TextEditingController();
final _passwordController = TextEditingController();
final _telephoneController = TextEditingController();
final _passwordToggleFocusNode =
FocusNode(skipTraversal: true, canRequestFocus: false);
bool _isSubmitting = false;
bool _obscurePassword = true;
bool _isLoadingRelais = true;
List<RelaisModel> _relais = [];
String? _selectedRelaisId;
String? _currentUserId;
String? _currentUserRole;
bool get _isEditMode => widget.initialUser != null;
bool get _isSuperAdminTarget =>
(widget.initialUser?.role ?? '').toLowerCase() == 'super_admin';
bool get _isSelfTarget =>
_isEditMode &&
_currentUserId != null &&
widget.initialUser!.id == _currentUserId;
/// Gestionnaire : pas de delete staff. Admin+ seulement (#154 / #160).
bool get _canDeleteTarget {
if (!_isEditMode || widget.readOnly) return false;
if (_isSelfTarget || _isSuperAdminTarget) return false;
return canDeleteGestionnaire(_currentUserRole);
}
bool get _isLockedAdminIdentity =>
_isEditMode && widget.adminMode && _isSuperAdminTarget;
String get _targetRoleKey {
if (widget.initialUser != null) {
return (widget.initialUser!.role).toLowerCase();
}
return widget.adminMode ? 'administrateur' : 'gestionnaire';
}
String get _targetRoleLabel {
switch (_targetRoleKey) {
case 'super_admin':
return 'Super administrateur';
case 'administrateur':
return 'Administrateur';
case 'gestionnaire':
return 'Gestionnaire';
case 'assistante_maternelle':
return 'Assistante maternelle';
case 'parent':
return 'Parent';
default:
return 'Utilisateur';
}
}
IconData get _targetRoleIcon {
switch (_targetRoleKey) {
case 'super_admin':
return Icons.verified_user_outlined;
case 'administrateur':
return Icons.admin_panel_settings_outlined;
case 'gestionnaire':
return Icons.assignment_ind_outlined;
case 'assistante_maternelle':
return Icons.child_care_outlined;
case 'parent':
return Icons.supervisor_account_outlined;
default:
return Icons.person_outline;
}
}
@override
void initState() {
super.initState();
final user = widget.initialUser;
if (user != null) {
_nomController.text = user.nom ?? '';
_prenomController.text = user.prenom ?? '';
_emailController.text = user.email;
_telephoneController.text = formatPhoneForDisplay(user.telephone ?? '');
// En édition, on ne préremplit jamais le mot de passe.
_passwordController.clear();
final initialRelaisId = user.relaisId?.trim();
_selectedRelaisId =
(initialRelaisId == null || initialRelaisId.isEmpty)
? null
: initialRelaisId;
}
if (widget.withRelais) {
_loadRelais();
} else {
_isLoadingRelais = false;
}
_loadCurrentUserId();
}
Future<void> _loadCurrentUserId() async {
final cached = await AuthService.getCurrentUser();
if (!mounted) return;
if (cached != null) {
setState(() {
_currentUserId = cached.id;
_currentUserRole = cached.role;
});
return;
}
final refreshed = await AuthService.refreshCurrentUser();
if (!mounted || refreshed == null) return;
setState(() {
_currentUserId = refreshed.id;
_currentUserRole = refreshed.role;
});
}
@override
void dispose() {
_nomController.dispose();
_prenomController.dispose();
_emailController.dispose();
_passwordController.dispose();
_telephoneController.dispose();
_passwordToggleFocusNode.dispose();
super.dispose();
}
/// Fallback si GET /relais échoue : conserve le relais déjà connu sur l'utilisateur.
List<RelaisModel> _fallbackRelaisFromUser() {
final id = _selectedRelaisId?.trim();
if (id == null || id.isEmpty) return const [];
final nom = (widget.initialUser?.relaisNom ?? '').trim();
return [
RelaisModel(
id: id,
nom: nom.isNotEmpty ? nom : 'Relais actuel',
adresse: '',
actif: true,
),
];
}
Future<void> _loadRelais() async {
try {
final list = await RelaisService.getRelais();
if (!mounted) return;
final uniqueById = <String, RelaisModel>{};
for (final relais in list) {
uniqueById[relais.id] = relais;
}
final filtered = uniqueById.values.where((r) => r.actif).toList();
if (_selectedRelaisId != null &&
!filtered.any((r) => r.id == _selectedRelaisId)) {
final selected = uniqueById[_selectedRelaisId!];
if (selected != null) {
filtered.add(selected);
} else {
// Garder l'id sélectionné et afficher un item de secours (nom carte).
filtered.addAll(_fallbackRelaisFromUser());
}
}
setState(() {
_relais = filtered;
_isLoadingRelais = false;
});
} catch (_) {
if (!mounted) return;
// Ne pas nullifier _selectedRelaisId (#151) — la carte a déjà le bon libellé.
setState(() {
_relais = _fallbackRelaisFromUser();
_isLoadingRelais = false;
});
}
}
String? _required(String? value, String field) {
if (value == null || value.trim().isEmpty) {
return '$field est requis';
}
return null;
}
String? _validateEmail(String? value) {
final base = _required(value, 'Email');
if (base != null) {
return base;
}
return validateEmail(value, allowEmpty: true);
}
String? _validatePassword(String? value) {
if (_isEditMode && (value == null || value.trim().isEmpty)) {
return null;
}
final base = _required(value, 'Mot de passe');
if (base != null) return base;
if (value!.trim().length < 6) return 'Minimum 6 caractères';
return null;
}
String? _validatePhone(String? value) {
if (_isEditMode && (value == null || value.trim().isEmpty)) {
return null;
}
final base = _required(value, 'Téléphone');
if (base != null) {
return base;
}
return validateFrenchNationalPhone(value, allowEmpty: false);
}
String _toTitleCase(String raw) {
final trimmed = raw.trim();
if (trimmed.isEmpty) return trimmed;
final words = trimmed.split(RegExp(r'\s+'));
final normalizedWords = words.map(_capitalizeComposedWord).toList();
return normalizedWords.join(' ');
}
String _capitalizeComposedWord(String word) {
if (word.isEmpty) return word;
final lower = word.toLowerCase();
final separators = <String>{"-", "'", ""};
final buffer = StringBuffer();
var capitalizeNext = true;
for (var i = 0; i < lower.length; i++) {
final char = lower[i];
if (capitalizeNext && RegExp(r'[a-zà-öø-ÿ]').hasMatch(char)) {
buffer.write(char.toUpperCase());
capitalizeNext = false;
} else {
buffer.write(char);
capitalizeNext = separators.contains(char);
}
}
return buffer.toString();
}
Future<void> _submit() async {
if (widget.readOnly) return;
if (_isSubmitting) return;
if (!_formKey.currentState!.validate()) return;
setState(() {
_isSubmitting = true;
});
try {
final normalizedNom = _toTitleCase(_nomController.text);
final normalizedPrenom = _toTitleCase(_prenomController.text);
final normalizedPhone = normalizePhone(_telephoneController.text);
final passwordProvided = _passwordController.text.trim().isNotEmpty;
if (_isEditMode) {
if (widget.adminMode) {
final lockedNom = _toTitleCase(widget.initialUser!.nom ?? '');
final lockedPrenom = _toTitleCase(widget.initialUser!.prenom ?? '');
await UserService.updateAdministrateur(
adminId: widget.initialUser!.id,
nom: _isLockedAdminIdentity ? lockedNom : normalizedNom,
prenom: _isLockedAdminIdentity ? lockedPrenom : normalizedPrenom,
email: _emailController.text.trim(),
telephone: normalizedPhone.isEmpty
? normalizePhone(widget.initialUser!.telephone ?? '')
: normalizedPhone,
password: passwordProvided ? _passwordController.text : null,
);
} else {
final currentUser = widget.initialUser!;
final initialNom = _toTitleCase(currentUser.nom ?? '');
final initialPrenom = _toTitleCase(currentUser.prenom ?? '');
final initialEmail = currentUser.email.trim();
final initialPhone = normalizePhone(currentUser.telephone ?? '');
final onlyRelaisChanged =
normalizedNom == initialNom &&
normalizedPrenom == initialPrenom &&
_emailController.text.trim() == initialEmail &&
normalizedPhone == initialPhone &&
!passwordProvided;
if (onlyRelaisChanged) {
await UserService.updateGestionnaireRelais(
gestionnaireId: currentUser.id,
relaisId: _selectedRelaisId,
);
} else {
await UserService.updateGestionnaire(
gestionnaireId: currentUser.id,
nom: normalizedNom,
prenom: normalizedPrenom,
email: _emailController.text.trim(),
telephone: normalizedPhone.isEmpty ? initialPhone : normalizedPhone,
relaisId: _selectedRelaisId,
password: passwordProvided ? _passwordController.text : null,
);
}
}
} else {
if (widget.adminMode) {
await UserService.createAdministrateur(
nom: normalizedNom,
prenom: normalizedPrenom,
email: _emailController.text.trim(),
password: _passwordController.text,
telephone: normalizePhone(_telephoneController.text),
);
} else {
await UserService.createGestionnaire(
nom: normalizedNom,
prenom: normalizedPrenom,
email: _emailController.text.trim(),
password: _passwordController.text,
telephone: normalizePhone(_telephoneController.text),
relaisId: _selectedRelaisId,
);
}
}
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
_isEditMode
? (widget.adminMode
? 'Administrateur modifié avec succès.'
: 'Gestionnaire modifié avec succès.')
: (widget.adminMode
? 'Administrateur créé avec succès.'
: 'Gestionnaire créé avec succès.'),
),
),
);
Navigator.of(context).pop(true);
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
e.toString().replaceFirst('Exception: ', ''),
),
backgroundColor: Colors.red.shade700,
),
);
} finally {
if (!mounted) return;
setState(() {
_isSubmitting = false;
});
}
}
Future<void> _delete() async {
if (widget.readOnly) return;
if (!_canDeleteTarget) return;
if (!_isEditMode || _isSubmitting) return;
final name = widget.initialUser!.fullName.isEmpty
? widget.initialUser!.email
: widget.initialUser!.fullName;
final confirmed = await showSuppressionConfirmDialog(
context,
title: widget.adminMode
? 'Supprimer l\'administrateur'
: 'Supprimer le gestionnaire',
people: [
widget.adminMode
? SuppressionPersonLine.administrateur(name)
: SuppressionPersonLine.gestionnaire(name),
],
footnotes: const [
'Le compte sera définitivement supprimé.',
],
);
if (!confirmed) return;
setState(() {
_isSubmitting = true;
});
try {
await UserService.deleteUser(widget.initialUser!.id);
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Gestionnaire supprimé.')),
);
Navigator.of(context).pop(true);
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(e.toString().replaceFirst('Exception: ', '')),
backgroundColor: Colors.red.shade700,
),
);
setState(() {
_isSubmitting = false;
});
}
}
@override
Widget build(BuildContext context) {
return AlertDialog(
title: Row(
children: [
CircleAvatar(
radius: 16,
backgroundColor: const Color(0xFFEDE5FA),
child: Icon(
_targetRoleIcon,
size: 20,
color: const Color(0xFF6B3FA0),
),
),
const SizedBox(width: 8),
Expanded(
child: Text(
_isEditMode
? (widget.readOnly
? 'Consulter un "$_targetRoleLabel"'
: 'Modifier un "$_targetRoleLabel"')
: 'Créer un "$_targetRoleLabel"',
),
),
if (_isEditMode && !widget.readOnly)
IconButton(
icon: const Icon(Icons.close),
tooltip: 'Fermer',
onPressed: _isSubmitting
? null
: () => Navigator.of(context).pop(false),
),
],
),
content: SizedBox(
width: 620,
child: Form(
key: _formKey,
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Row(
children: [
Expanded(child: _buildPrenomField()),
const SizedBox(width: 12),
Expanded(child: _buildNomField()),
],
),
const SizedBox(height: 12),
_buildEmailField(),
const SizedBox(height: 12),
Row(
children: [
Expanded(child: _buildPasswordField()),
const SizedBox(width: 12),
Expanded(child: _buildTelephoneField()),
],
),
if (widget.withRelais) ...[
const SizedBox(height: 12),
_buildRelaisField(),
],
],
),
),
),
),
actions: [
if (widget.readOnly) ...[
FilledButton(
onPressed: _isSubmitting ? null : () => Navigator.of(context).pop(false),
child: const Text('Fermer'),
),
] else if (_isEditMode) ...[
if (_canDeleteTarget)
OutlinedButton(
onPressed: _isSubmitting ? null : _delete,
style: OutlinedButton.styleFrom(foregroundColor: Colors.red.shade700),
child: const Text('Supprimer'),
),
FilledButton.icon(
onPressed: _isSubmitting ? null : _submit,
icon: _isSubmitting
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.edit),
label: Text(_isSubmitting ? 'Modification...' : 'Modifier'),
),
] else ...[
OutlinedButton(
onPressed:
_isSubmitting ? null : () => Navigator.of(context).pop(false),
child: const Text('Annuler'),
),
FilledButton.icon(
onPressed: _isSubmitting ? null : _submit,
icon: _isSubmitting
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.person_add_alt_1),
label: Text(_isSubmitting ? 'Création...' : 'Créer'),
),
],
],
);
}
Widget _buildNomField() {
return TextFormField(
controller: _nomController,
readOnly: widget.readOnly || _isLockedAdminIdentity,
textCapitalization: TextCapitalization.words,
decoration: const InputDecoration(
labelText: 'Nom',
border: OutlineInputBorder(),
),
validator: (widget.readOnly || _isLockedAdminIdentity)
? null
: (v) => _required(v, 'Nom'),
);
}
Widget _buildPrenomField() {
return TextFormField(
controller: _prenomController,
readOnly: widget.readOnly || _isLockedAdminIdentity,
textCapitalization: TextCapitalization.words,
decoration: const InputDecoration(
labelText: 'Prénom',
border: OutlineInputBorder(),
),
validator: (widget.readOnly || _isLockedAdminIdentity)
? null
: (v) => _required(v, 'Prénom'),
);
}
Widget _buildEmailField() {
return EmailTextFormField(
controller: _emailController,
readOnly: widget.readOnly,
label: 'Email',
validator: widget.readOnly ? null : _validateEmail,
);
}
Widget _buildPasswordField() {
return TextFormField(
controller: _passwordController,
readOnly: widget.readOnly,
obscureText: _obscurePassword,
enableSuggestions: false,
autocorrect: false,
autofillHints: _isEditMode
? const <String>[]
: const [AutofillHints.newPassword],
decoration: InputDecoration(
labelText: _isEditMode
? 'Nouveau mot de passe'
: 'Mot de passe',
border: const OutlineInputBorder(),
suffixIcon: widget.readOnly
? null
: ExcludeFocus(
child: IconButton(
focusNode: _passwordToggleFocusNode,
onPressed: () {
setState(() {
_obscurePassword = !_obscurePassword;
});
},
icon: Icon(
_obscurePassword ? Icons.visibility_off : Icons.visibility,
),
),
),
),
validator: widget.readOnly ? null : _validatePassword,
);
}
Widget _buildTelephoneField() {
return FrenchPhoneTextFormField(
controller: _telephoneController,
readOnly: widget.readOnly,
label: 'Téléphone (ex: 06 12 34 56 78)',
validator: widget.readOnly ? null : _validatePhone,
);
}
Widget _buildRelaisField() {
final selectedValue = _selectedRelaisId != null &&
_relais.any((relais) => relais.id == _selectedRelaisId)
? _selectedRelaisId
: null;
return Column(
mainAxisSize: MainAxisSize.min,
children: [
DropdownButtonFormField<String?>(
isExpanded: true,
value: selectedValue,
decoration: const InputDecoration(
labelText: 'Relais principal',
border: OutlineInputBorder(),
),
items: [
const DropdownMenuItem<String?>(
value: null,
child: Text('Aucun relais'),
),
..._relais.map(
(relais) => DropdownMenuItem<String?>(
value: relais.id,
child: Text(relais.nom),
),
),
],
onChanged: (_isLoadingRelais || widget.readOnly)
? null
: (value) {
setState(() {
_selectedRelaisId = value;
});
},
),
if (_isLoadingRelais) ...[
const SizedBox(height: 8),
const LinearProgressIndicator(minHeight: 2),
],
],
);
}
}
@@ -121,6 +121,7 @@ class _ParentRegisterStep3ScreenState extends State<ParentRegisterStep3Screen> {
dob: '', dob: '',
isUnbornChild: false, isUnbornChild: false,
photoConsent: false, photoConsent: false,
multipleBirth: false,
cardColor: cardColor, cardColor: cardColor,
); );
registrationData.addChild(newChild); registrationData.addChild(newChild);
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/widgets/dashboard/user_management_panel.dart'; import 'package:p_tits_pas/widgets/admin/user_management_panel.dart';
import 'package:p_tits_pas/widgets/app_footer.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/widgets/dashboard/dashboard_bandeau.dart';
@@ -166,6 +166,7 @@ class ParentRegistrationPayload {
static Map<String, dynamic> _childToJson(ChildData c, int index, String parentNom) { static Map<String, dynamic> _childToJson(ChildData c, int index, String parentNom) {
final map = <String, dynamic>{ final map = <String, dynamic>{
'genre': apiGenres.contains(c.genre) ? c.genre : 'Autre', 'genre': apiGenres.contains(c.genre) ? c.genre : 'Autre',
'grossesse_multiple': c.multipleBirth,
'consent_photo': c.photoConsent, 'consent_photo': c.photoConsent,
}; };
+1
View File
@@ -44,6 +44,7 @@ class RepriseMapper {
dob: dob, dob: dob,
genre: e.gender ?? '', genre: e.gender ?? '',
photoConsent: e.consentPhoto, photoConsent: e.consentPhoto,
multipleBirth: e.estMultiple,
isUnbornChild: isUnborn, isUnbornChild: isUnborn,
cardColor: _childCardColors[index % _childCardColors.length], cardColor: _childCardColors[index % _childCardColors.length],
repriseChildId: e.id, repriseChildId: e.id,
@@ -1,13 +1,13 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/utils/phone_utils.dart'; import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/staff_user_form_modal.dart'; import 'package:p_tits_pas/screens/administrateurs/creation/gestionnaires_create.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart'; import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/common/user_list.dart'; import 'package:p_tits_pas/widgets/admin/common/user_list.dart';
class AdminManagementWidget extends StatefulWidget { class AdminManagementWidget extends StatefulWidget {
final String searchQuery; final String searchQuery;
@@ -100,7 +100,7 @@ class _AdminManagementWidgetState extends State<AdminManagementWidget> {
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (dialogContext) { builder: (dialogContext) {
return StaffUserFormModal( return AdminUserFormDialog(
initialUser: user, initialUser: user,
adminMode: true, adminMode: true,
withRelais: false, withRelais: false,
@@ -183,7 +183,7 @@ class _AdminManagementWidgetState extends State<AdminManagementWidget> {
final isSuperAdmin = _isSuperAdmin(user); final isSuperAdmin = _isSuperAdmin(user);
final canEdit = _canEditAdmin(user); final canEdit = _canEditAdmin(user);
final canDelete = _canDeleteAdmin(user); final canDelete = _canDeleteAdmin(user);
return UserCard( return AdminUserCard(
title: user.fullName, title: user.fullName,
fallbackIcon: isSuperAdmin fallbackIcon: isSuperAdmin
? Icons.verified_user_outlined ? Icons.verified_user_outlined
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/widgets/dashboard/am_dossier_wizard.dart'; import 'package:p_tits_pas/widgets/admin/am_dossier_wizard.dart';
/// Modale de création dossier AM (#156) — même shell que [ValidationDossierModal]. /// Modale de création dossier AM (#156) — même shell que [ValidationDossierModal].
class AmDossierCreateModal extends StatefulWidget { class AmDossierCreateModal extends StatefulWidget {
@@ -14,12 +14,12 @@ import 'package:p_tits_pas/utils/name_format_utils.dart';
import 'package:p_tits_pas/utils/nir_utils.dart'; import 'package:p_tits_pas/utils/nir_utils.dart';
import 'package:p_tits_pas/utils/phone_utils.dart'; import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/utils/postal_utils.dart'; import 'package:p_tits_pas/utils/postal_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/am_photo_frame.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_photo_frame.dart';
import 'package:p_tits_pas/widgets/dashboard/detail_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_detail_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/common/validation_detail_section.dart'; import 'package:p_tits_pas/widgets/admin/common/validation_detail_section.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart'; import 'package:p_tits_pas/widgets/admin/validation_modal_theme.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_refus_form.dart'; import 'package:p_tits_pas/widgets/admin/validation_refus_form.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_valider_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/validation_valider_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart'; import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
import 'package:p_tits_pas/widgets/common/identity_block.dart'; import 'package:p_tits_pas/widgets/common/identity_block.dart';
@@ -221,32 +221,32 @@ class _AmDossierWizardState extends State<AmDossierWizard> {
void _emitStep() => widget.onStepChanged?.call(_step, _stepCount); void _emitStep() => widget.onStepChanged?.call(_step, _stepCount);
List<DetailField> _photoProFields(DossierAM d) { List<AdminDetailField> _photoProFields(DossierAM d) {
final u = d.user; final u = d.user;
return [ return [
DetailField(label: 'NIR', value: _formatNirForDisplay(d.nir)), AdminDetailField(label: 'NIR', value: _formatNirForDisplay(d.nir)),
DetailField( AdminDetailField(
label: 'Date de naissance', label: 'Date de naissance',
value: formatIsoDateFr(u.dateNaissance), value: formatIsoDateFr(u.dateNaissance),
), ),
DetailField( AdminDetailField(
label: 'Ville de naissance', label: 'Ville de naissance',
value: _v(u.lieuNaissanceVille), value: _v(u.lieuNaissanceVille),
), ),
DetailField( AdminDetailField(
label: 'Pays de naissance', label: 'Pays de naissance',
value: _v(u.lieuNaissancePays), value: _v(u.lieuNaissancePays),
), ),
DetailField(label: 'N° Agrément', value: _v(d.numeroAgrement)), AdminDetailField(label: 'N° Agrément', value: _v(d.numeroAgrement)),
DetailField( AdminDetailField(
label: 'Date dagrément', label: 'Date dagrément',
value: formatIsoDateFr(d.dateAgrement), value: formatIsoDateFr(d.dateAgrement),
), ),
DetailField( AdminDetailField(
label: 'Capacité max (enfants)', label: 'Capacité max (enfants)',
value: d.nbMaxEnfants != null ? d.nbMaxEnfants.toString() : '', value: d.nbMaxEnfants != null ? d.nbMaxEnfants.toString() : '',
), ),
DetailField( AdminDetailField(
label: 'Places disponibles', label: 'Places disponibles',
value: d.placesDisponibles != null value: d.placesDisponibles != null
? d.placesDisponibles.toString() ? d.placesDisponibles.toString()
@@ -741,14 +741,14 @@ class _AmDossierWizardState extends State<AmDossierWizard> {
Widget _buildStep1() { Widget _buildStep1() {
// Modale calée sur les TF ; photo étirée sur toute la hauteur utile // Modale calée sur les TF ; photo étirée sur toute la hauteur utile
// (largeur = [AmPhotoFrame.columnWidthForHeight], cadre inclus). // (largeur = [AdminAmPhotoFrame.columnWidthForHeight], cadre inclus).
return LayoutBuilder( return LayoutBuilder(
builder: (context, c) { builder: (context, c) {
final maxRowW = c.maxWidth; final maxRowW = c.maxWidth;
final maxRowH = c.maxHeight.clamp(0.0, double.infinity); final maxRowH = c.maxHeight.clamp(0.0, double.infinity);
final maxPhotoW = (maxRowW - _photoProGap - _proColumnMinWidth) final maxPhotoW = (maxRowW - _photoProGap - _proColumnMinWidth)
.clamp(0.0, double.infinity); .clamp(0.0, double.infinity);
var photoW = AmPhotoFrame.columnWidthForHeight(maxRowH) var photoW = AdminAmPhotoFrame.columnWidthForHeight(maxRowH)
.clamp(_photoColumnMinWidth, 360.0); .clamp(_photoColumnMinWidth, 360.0);
if (photoW > maxPhotoW) photoW = maxPhotoW; if (photoW > maxPhotoW) photoW = maxPhotoW;
@@ -762,7 +762,7 @@ class _AmDossierWizardState extends State<AmDossierWizard> {
final Widget photo; final Widget photo;
if (_isCreate) { if (_isCreate) {
photo = AmPhotoFrame( photo = AdminAmPhotoFrame(
imageBytes: _photoBytes, imageBytes: _photoBytes,
onTap: _pickPhoto, onTap: _pickPhoto,
onClear: _photoBytes != null ? _clearPhoto : null, onClear: _photoBytes != null ? _clearPhoto : null,
@@ -5,10 +5,10 @@ import 'package:p_tits_pas/utils/am_vigilance.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart'; import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/am_edit_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_edit_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/common/user_list.dart'; import 'package:p_tits_pas/widgets/admin/common/user_list.dart';
class AssistanteMaternelleManagementWidget extends StatefulWidget { class AssistanteMaternelleManagementWidget extends StatefulWidget {
final String searchQuery; final String searchQuery;
@@ -130,7 +130,7 @@ class _AssistanteMaternelleManagementWidgetState
itemBuilder: (context, index) { itemBuilder: (context, index) {
final assistante = filteredAssistantes[index]; final assistante = filteredAssistantes[index];
final vigilance = amPlacesVigilanceMessage(assistante); final vigilance = amPlacesVigilanceMessage(assistante);
return UserCard( return AdminUserCard(
title: assistante.user.fullName, title: assistante.user.fullName,
avatarUrl: assistante.user.photoUrl, avatarUrl: assistante.user.photoUrl,
fallbackIcon: Icons.face, fallbackIcon: Icons.face,
@@ -161,7 +161,7 @@ class _AssistanteMaternelleManagementWidgetState
void _openAssistanteDetails(AssistanteMaternelleModel assistante) { void _openAssistanteDetails(AssistanteMaternelleModel assistante) {
showDialog<void>( showDialog<void>(
context: context, context: context,
builder: (context) => AmEditModal( builder: (context) => AdminAmEditModal(
assistante: assistante, assistante: assistante,
onSaved: _loadAssistantes, onSaved: _loadAssistantes,
), ),
@@ -5,7 +5,7 @@ import 'package:p_tits_pas/utils/date_display_utils.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart'; import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
/// Grille 2×2 des places d'accueil AM (max 4, limitée à [capacity]). /// Grille 2×2 des places d'accueil AM (max 4, limitée à [capacity]).
class AmChildrenCapacityGrid extends StatelessWidget { class AdminAmChildrenCapacityGrid extends StatelessWidget {
static const int _gridSlots = 4; static const int _gridSlots = 4;
static const double _slotHeight = 44; static const double _slotHeight = 44;
static const double _gridPadding = 10; static const double _gridPadding = 10;
@@ -23,7 +23,7 @@ class AmChildrenCapacityGrid extends StatelessWidget {
/// Clic sur une case libre → même flux que « Rattacher un enfant » (#149). /// Clic sur une case libre → même flux que « Rattacher un enfant » (#149).
final VoidCallback? onAttachEmpty; final VoidCallback? onAttachEmpty;
const AmChildrenCapacityGrid({ const AdminAmChildrenCapacityGrid({
super.key, super.key,
required this.children, required this.children,
required this.capacity, required this.capacity,
@@ -7,31 +7,31 @@ import 'package:p_tits_pas/utils/date_display_utils.dart';
import 'package:p_tits_pas/utils/nir_utils.dart'; import 'package:p_tits_pas/utils/nir_utils.dart';
import 'package:p_tits_pas/utils/phone_utils.dart'; import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/widgets/dashboard/am_children_capacity_grid.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_children_capacity_grid.dart';
import 'package:p_tits_pas/widgets/dashboard/am_photo_frame.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_photo_frame.dart';
import 'package:p_tits_pas/widgets/dashboard/child_detail_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_child_detail_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/select_enfant_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_select_enfant_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/status_capsule.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_status_capsule.dart';
import 'package:p_tits_pas/widgets/dashboard/common/validation_detail_section.dart'; import 'package:p_tits_pas/widgets/admin/common/validation_detail_section.dart';
import 'package:p_tits_pas/widgets/common/identity_block.dart'; import 'package:p_tits_pas/widgets/common/identity_block.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart'; import 'package:p_tits_pas/widgets/admin/validation_modal_theme.dart';
/// Fiche AM éditable (ticket #131) — identité | fiche pro (photo) | enfants. /// Fiche AM éditable (ticket #131) — identité | fiche pro (photo) | enfants.
class AmEditModal extends StatefulWidget { class AdminAmEditModal extends StatefulWidget {
final AssistanteMaternelleModel assistante; final AssistanteMaternelleModel assistante;
final VoidCallback? onSaved; final VoidCallback? onSaved;
const AmEditModal({ const AdminAmEditModal({
super.key, super.key,
required this.assistante, required this.assistante,
this.onSaved, this.onSaved,
}); });
@override @override
State<AmEditModal> createState() => _AmEditModalState(); State<AdminAmEditModal> createState() => _AdminAmEditModalState();
} }
class _AmEditModalState extends State<AmEditModal> class _AdminAmEditModalState extends State<AdminAmEditModal>
with SingleTickerProviderStateMixin { with SingleTickerProviderStateMixin {
late final TabController _tabCtrl; late final TabController _tabCtrl;
late final TextEditingController _nomCtrl; late final TextEditingController _nomCtrl;
@@ -404,7 +404,7 @@ class _AmEditModalState extends State<AmEditModal>
if (!mounted) return; if (!mounted) return;
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (ctx) => ChildDetailModal( builder: (ctx) => AdminChildDetailModal(
enfant: enfant, enfant: enfant,
onSaved: _refreshChildrenDetails, onSaved: _refreshChildrenDetails,
), ),
@@ -450,7 +450,7 @@ class _AmEditModalState extends State<AmEditModal>
Future<void> _attachChild() async { Future<void> _attachChild() async {
if (_capacityFull || !mounted) return; if (_capacityFull || !mounted) return;
final selected = await SelectEnfantModal.show( final selected = await AdminSelectEnfantModal.show(
context, context,
excludeIds: _children.map((c) => c.id).toSet(), excludeIds: _children.map((c) => c.id).toSet(),
title: 'Rattacher un enfant', title: 'Rattacher un enfant',
@@ -589,7 +589,7 @@ class _AmEditModalState extends State<AmEditModal>
final maxRowH = final maxRowH =
c.maxHeight.isFinite ? c.maxHeight : _proTabHeight; c.maxHeight.isFinite ? c.maxHeight : _proTabHeight;
final bodyH = maxRowH; final bodyH = maxRowH;
final idealPhotoW = bodyH * AmPhotoFrame.idPhotoAspectRatio + 16; final idealPhotoW = bodyH * AdminAmPhotoFrame.idPhotoAspectRatio + 16;
final maxPhotoW = (maxRowW - _photoProGap - _proColumnMinWidth) final maxPhotoW = (maxRowW - _photoProGap - _proColumnMinWidth)
.clamp(0.0, double.infinity); .clamp(0.0, double.infinity);
var photoW = idealPhotoW.clamp(_photoColumnMinWidth, 220.0); var photoW = idealPhotoW.clamp(_photoColumnMinWidth, 220.0);
@@ -600,7 +600,7 @@ class _AmEditModalState extends State<AmEditModal>
children: [ children: [
SizedBox( SizedBox(
width: photoW, width: photoW,
child: AmPhotoFrame( child: AdminAmPhotoFrame(
photoUrl: widget.assistante.user.photoUrl, photoUrl: widget.assistante.user.photoUrl,
), ),
), ),
@@ -728,7 +728,7 @@ class _AmEditModalState extends State<AmEditModal>
), ),
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
AmChildrenCapacityGrid( AdminAmChildrenCapacityGrid(
children: _children, children: _children,
capacity: capacity, capacity: capacity,
onOpen: _openChild, onOpen: _openChild,
@@ -820,7 +820,7 @@ class _AmEditModalState extends State<AmEditModal>
const SizedBox(width: 12), const SizedBox(width: 12),
SizedBox( SizedBox(
width: 160, width: 160,
child: StatusCapsule( child: AdminStatusCapsule(
statut: _statut, statut: _statut,
onChanged: (v) => setState(() { onChanged: (v) => setState(() {
_statut = v; _statut = v;
@@ -5,7 +5,7 @@ import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart'; import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
/// Cadre photo identité AM / enfant (35×45 mm) — même logique que [ValidationAmWizard]. /// Cadre photo identité AM / enfant (35×45 mm) — même logique que [ValidationAmWizard].
class AmPhotoFrame extends StatelessWidget { class AdminAmPhotoFrame extends StatelessWidget {
final String? photoUrl; final String? photoUrl;
final Uint8List? imageBytes; final Uint8List? imageBytes;
final VoidCallback? onTap; final VoidCallback? onTap;
@@ -14,7 +14,7 @@ class AmPhotoFrame extends StatelessWidget {
static const double idPhotoAspectRatio = 35 / 45; static const double idPhotoAspectRatio = 35 / 45;
const AmPhotoFrame({ const AdminAmPhotoFrame({
super.key, super.key,
this.photoUrl, this.photoUrl,
this.imageBytes, this.imageBytes,
@@ -11,24 +11,24 @@ import 'package:p_tits_pas/utils/date_display_utils.dart';
import 'package:p_tits_pas/utils/enfant_status_utils.dart'; import 'package:p_tits_pas/utils/enfant_status_utils.dart';
import 'package:p_tits_pas/utils/name_format_utils.dart'; import 'package:p_tits_pas/utils/name_format_utils.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart'; import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/am_edit_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_edit_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/am_photo_frame.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_photo_frame.dart';
import 'package:p_tits_pas/widgets/dashboard/parent_edit_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_parent_edit_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/select_am_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_select_am_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/select_famille_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_select_famille_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/common/validation_detail_section.dart'; import 'package:p_tits_pas/widgets/admin/common/validation_detail_section.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart'; import 'package:p_tits_pas/widgets/admin/validation_modal_theme.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart'; import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
/// Fiche enfant consultation / édition (#138) ou création (#132). /// Fiche enfant consultation / édition (#138) ou création (#132).
class ChildDetailModal extends StatefulWidget { class AdminChildDetailModal extends StatefulWidget {
final EnfantAdminModel? enfant; final EnfantAdminModel? enfant;
final VoidCallback? onSaved; final VoidCallback? onSaved;
final VoidCallback? onDeleted; final VoidCallback? onDeleted;
final bool isCreating; final bool isCreating;
const ChildDetailModal({ const AdminChildDetailModal({
super.key, super.key,
required EnfantAdminModel this.enfant, required EnfantAdminModel this.enfant,
this.onSaved, this.onSaved,
@@ -36,7 +36,7 @@ class ChildDetailModal extends StatefulWidget {
}) : isCreating = false; }) : isCreating = false;
/// Création depuis l'onglet Enfants (#132). /// Création depuis l'onglet Enfants (#132).
const ChildDetailModal.create({ const AdminChildDetailModal.create({
super.key, super.key,
this.onSaved, this.onSaved,
}) : enfant = null, }) : enfant = null,
@@ -44,10 +44,10 @@ class ChildDetailModal extends StatefulWidget {
isCreating = true; isCreating = true;
@override @override
State<ChildDetailModal> createState() => _ChildDetailModalState(); State<AdminChildDetailModal> createState() => _AdminChildDetailModalState();
} }
class _ChildDetailModalState extends State<ChildDetailModal> { class _AdminChildDetailModalState extends State<AdminChildDetailModal> {
late final TextEditingController _prenomCtrl; late final TextEditingController _prenomCtrl;
late final TextEditingController _nomCtrl; late final TextEditingController _nomCtrl;
late final TextEditingController _birthCtrl; late final TextEditingController _birthCtrl;
@@ -55,6 +55,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
late String _status; late String _status;
late String? _gender; late String? _gender;
late bool _consentPhoto; late bool _consentPhoto;
late bool _isMultiple;
bool _dirty = false; bool _dirty = false;
bool _saving = false; bool _saving = false;
bool _deleting = false; bool _deleting = false;
@@ -65,7 +66,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
String? _baselineAmUserId; String? _baselineAmUserId;
/// Famille choisie en mode création (#132). /// Famille choisie en mode création (#132).
FamilleFoyer? _selectedFamily; AdminFamilleFoyer? _selectedFamily;
/// Liens parents locaux (édition) — mis à jour après rattachement foyer (#157). /// Liens parents locaux (édition) — mis à jour après rattachement foyer (#157).
List<EnfantParentLink>? _localParentLinks; List<EnfantParentLink>? _localParentLinks;
@@ -141,6 +142,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
_gender = _normalizeGender(e?.gender, allowUnknown: _isUnborn); _gender = _normalizeGender(e?.gender, allowUnknown: _isUnborn);
} }
_consentPhoto = e?.consentPhoto ?? false; _consentPhoto = e?.consentPhoto ?? false;
_isMultiple = e?.isMultiple ?? false;
for (final c in [_prenomCtrl, _nomCtrl]) { for (final c in [_prenomCtrl, _nomCtrl]) {
c.addListener(_onNameChanged); c.addListener(_onNameChanged);
} }
@@ -283,7 +285,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
if (!mounted) return; if (!mounted) return;
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (ctx) => ParentEditModal( builder: (ctx) => AdminParentEditModal(
parent: parent, parent: parent,
onSaved: () => widget.onSaved?.call(), onSaved: () => widget.onSaved?.call(),
), ),
@@ -381,6 +383,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
else if (_dateToIso(_birthCtrl.text) != null) else if (_dateToIso(_birthCtrl.text) != null)
'birth_date': _dateToIso(_birthCtrl.text), 'birth_date': _dateToIso(_birthCtrl.text),
'consent_photo': _consentPhoto, 'consent_photo': _consentPhoto,
'is_multiple': _isMultiple,
}, },
); );
if (!mounted) return; if (!mounted) return;
@@ -457,6 +460,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
'birth_date': _dateToIso(_birthCtrl.text), 'birth_date': _dateToIso(_birthCtrl.text),
}, },
'consent_photo': _consentPhoto, 'consent_photo': _consentPhoto,
'is_multiple': _isMultiple,
}, },
); );
if (!mounted) return; if (!mounted) return;
@@ -624,7 +628,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
if (am == null) return; if (am == null) return;
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (ctx) => AmEditModal( builder: (ctx) => AdminAmEditModal(
assistante: am, assistante: am,
onSaved: () async { onSaved: () async {
await _reloadPlacementFromServer(); await _reloadPlacementFromServer();
@@ -676,7 +680,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
} }
if (!mounted) return; if (!mounted) return;
final selected = await SelectAmModal.show( final selected = await AdminSelectAmModal.show(
context, context,
excludeIds: { excludeIds: {
if (_linkedAm != null) _linkedAm!.user.id, if (_linkedAm != null) _linkedAm!.user.id,
@@ -986,7 +990,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
final maxRowW = c.maxWidth; final maxRowW = c.maxWidth;
final maxRowH = c.maxHeight; final maxRowH = c.maxHeight;
final idealPhotoW = final idealPhotoW =
maxRowH * AmPhotoFrame.idPhotoAspectRatio + 16; maxRowH * AdminAmPhotoFrame.idPhotoAspectRatio + 16;
final maxPhotoW = (maxRowW - _photoProGap - _proColumnMinWidth) final maxPhotoW = (maxRowW - _photoProGap - _proColumnMinWidth)
.clamp(0.0, double.infinity); .clamp(0.0, double.infinity);
var photoW = idealPhotoW.clamp(_photoColumnMinWidth, _photoColumnMaxWidth); var photoW = idealPhotoW.clamp(_photoColumnMinWidth, _photoColumnMaxWidth);
@@ -1001,7 +1005,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Expanded( Expanded(
child: AmPhotoFrame( child: AdminAmPhotoFrame(
photoUrl: widget.isCreating photoUrl: widget.isCreating
? null ? null
: widget.enfant?.photoUrl, : widget.enfant?.photoUrl,
@@ -1329,7 +1333,7 @@ class _ChildDetailModalState extends State<ChildDetailModal> {
Future<void> _pickFamily() async { Future<void> _pickFamily() async {
if (_busy) return; if (_busy) return;
final selected = await SelectFamilleModal.show( final selected = await AdminSelectFamilleModal.show(
context, context,
title: 'Choisir une famille', title: 'Choisir une famille',
); );
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/parent_child_summary.dart'; import 'package:p_tits_pas/models/parent_child_summary.dart';
import 'package:p_tits_pas/widgets/dashboard/enfant_user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_enfant_user_card.dart';
/// Liste scrollable d'enfants rattachés (fiche parent / fiche AM). /// Liste scrollable d'enfants rattachés (fiche parent / fiche AM).
class ChildrenAffiliationPanel extends StatelessWidget { class AdminChildrenAffiliationPanel extends StatelessWidget {
final List<ParentChildSummary> children; final List<ParentChildSummary> children;
final ScrollController scrollController; final ScrollController scrollController;
final void Function(ParentChildSummary child) onOpen; final void Function(ParentChildSummary child) onOpen;
@@ -14,7 +14,7 @@ class ChildrenAffiliationPanel extends StatelessWidget {
static const double _itemHeight = 58; static const double _itemHeight = 58;
static const double defaultViewportHeight = _itemHeight * 2.5 + 8; static const double defaultViewportHeight = _itemHeight * 2.5 + 8;
const ChildrenAffiliationPanel({ const AdminChildrenAffiliationPanel({
super.key, super.key,
required this.children, required this.children,
required this.scrollController, required this.scrollController,
@@ -62,7 +62,7 @@ class ChildrenAffiliationPanel extends StatelessWidget {
itemCount: children.length, itemCount: children.length,
itemBuilder: (_, i) { itemBuilder: (_, i) {
final c = children[i]; final c = children[i];
return EnfantUserCard.fromSummary( return AdminEnfantUserCard.fromSummary(
c, c,
onCardTap: () => onOpen(c), onCardTap: () => onOpen(c),
actions: [ actions: [
@@ -1,23 +1,23 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class DetailField { class AdminDetailField {
final String label; final String label;
final String value; final String value;
const DetailField({ const AdminDetailField({
required this.label, required this.label,
required this.value, required this.value,
}); });
} }
class DetailModal extends StatelessWidget { class AdminDetailModal extends StatelessWidget {
final String title; final String title;
final String? subtitle; final String? subtitle;
final List<DetailField> fields; final List<AdminDetailField> fields;
final VoidCallback onEdit; final VoidCallback onEdit;
final VoidCallback onDelete; final VoidCallback onDelete;
const DetailModal({ const AdminDetailModal({
super.key, super.key,
required this.title, required this.title,
this.subtitle, this.subtitle,
@@ -4,7 +4,7 @@ import 'package:p_tits_pas/models/parent_child_summary.dart';
import 'package:p_tits_pas/utils/date_display_utils.dart'; import 'package:p_tits_pas/utils/date_display_utils.dart';
import 'package:p_tits_pas/utils/enfant_status_utils.dart'; import 'package:p_tits_pas/utils/enfant_status_utils.dart';
import 'package:p_tits_pas/utils/enfant_vigilance.dart'; import 'package:p_tits_pas/utils/enfant_vigilance.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
List<String> enfantAdminSubtitleLines({ List<String> enfantAdminSubtitleLines({
required String status, required String status,
@@ -29,7 +29,7 @@ List<String> enfantAdminSubtitleLines({
} }
/// Carte enfant admin (photo, nom, âge) — même rendu onglet Enfants / fiche parent. /// Carte enfant admin (photo, nom, âge) — même rendu onglet Enfants / fiche parent.
class EnfantUserCard extends StatelessWidget { class AdminEnfantUserCard extends StatelessWidget {
final String title; final String title;
final String? photoUrl; final String? photoUrl;
final List<String> subtitleLines; final List<String> subtitleLines;
@@ -40,7 +40,7 @@ class EnfantUserCard extends StatelessWidget {
final Color? borderColor; final Color? borderColor;
final String? vigilanceTooltip; final String? vigilanceTooltip;
const EnfantUserCard({ const AdminEnfantUserCard({
super.key, super.key,
required this.title, required this.title,
this.photoUrl, this.photoUrl,
@@ -53,7 +53,7 @@ class EnfantUserCard extends StatelessWidget {
this.vigilanceTooltip, this.vigilanceTooltip,
}); });
factory EnfantUserCard.fromEnfant( factory AdminEnfantUserCard.fromEnfant(
EnfantAdminModel enfant, { EnfantAdminModel enfant, {
List<String> extraSubtitleLines = const [], List<String> extraSubtitleLines = const [],
List<Widget> actions = const [], List<Widget> actions = const [],
@@ -67,7 +67,7 @@ class EnfantUserCard extends StatelessWidget {
.map((l) => l.parentName ?? 'Parent') .map((l) => l.parentName ?? 'Parent')
.join(', '); .join(', ');
final orphan = enfantHasNoResponsable(enfant); final orphan = enfantHasNoResponsable(enfant);
return EnfantUserCard( return AdminEnfantUserCard(
title: enfant.fullName, title: enfant.fullName,
photoUrl: enfant.photoUrl, photoUrl: enfant.photoUrl,
subtitleLines: enfantAdminSubtitleLines( subtitleLines: enfantAdminSubtitleLines(
@@ -92,7 +92,7 @@ class EnfantUserCard extends StatelessWidget {
); );
} }
factory EnfantUserCard.fromSummary( factory AdminEnfantUserCard.fromSummary(
ParentChildSummary child, { ParentChildSummary child, {
List<String> extraSubtitleLines = const [], List<String> extraSubtitleLines = const [],
List<Widget> actions = const [], List<Widget> actions = const [],
@@ -100,7 +100,7 @@ class EnfantUserCard extends StatelessWidget {
EdgeInsetsGeometry? margin, EdgeInsetsGeometry? margin,
EdgeInsetsGeometry? contentPadding, EdgeInsetsGeometry? contentPadding,
}) { }) {
return EnfantUserCard( return AdminEnfantUserCard(
title: child.fullName, title: child.fullName,
photoUrl: child.photoUrl, photoUrl: child.photoUrl,
subtitleLines: enfantAdminSubtitleLines( subtitleLines: enfantAdminSubtitleLines(
@@ -118,7 +118,7 @@ class EnfantUserCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return UserCard( return AdminUserCard(
title: title, title: title,
fallbackIcon: Icons.child_care_outlined, fallbackIcon: Icons.child_care_outlined,
avatarUrl: photoUrl, avatarUrl: photoUrl,
@@ -1,13 +1,13 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class UserListState extends StatelessWidget { class AdminListState extends StatelessWidget {
final bool isLoading; final bool isLoading;
final String? error; final String? error;
final bool isEmpty; final bool isEmpty;
final String emptyMessage; final String emptyMessage;
final Widget list; final Widget list;
const UserListState({ const AdminListState({
super.key, super.key,
required this.isLoading, required this.isLoading,
required this.error, required this.error,
@@ -4,30 +4,30 @@ import 'package:p_tits_pas/models/parent_child_summary.dart';
import 'package:p_tits_pas/models/parent_model.dart'; import 'package:p_tits_pas/models/parent_model.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/widgets/dashboard/child_detail_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_child_detail_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/children_affiliation_panel.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_children_affiliation_panel.dart';
import 'package:p_tits_pas/widgets/dashboard/select_enfant_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_select_enfant_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/status_capsule.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_status_capsule.dart';
import 'package:p_tits_pas/widgets/common/identity_block.dart'; import 'package:p_tits_pas/widgets/common/identity_block.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart'; import 'package:p_tits_pas/widgets/admin/validation_modal_theme.dart';
/// Fiche parent éditable (doc 28 §6.1, tickets #131 / #138). /// Fiche parent éditable (doc 28 §6.1, tickets #131 / #138).
/// Shell et typo alignés sur [ValidationDossierModal] / wizards validation. /// Shell et typo alignés sur [ValidationDossierModal] / wizards validation.
class ParentEditModal extends StatefulWidget { class AdminParentEditModal extends StatefulWidget {
final ParentModel parent; final ParentModel parent;
final VoidCallback? onSaved; final VoidCallback? onSaved;
const ParentEditModal({ const AdminParentEditModal({
super.key, super.key,
required this.parent, required this.parent,
this.onSaved, this.onSaved,
}); });
@override @override
State<ParentEditModal> createState() => _ParentEditModalState(); State<AdminParentEditModal> createState() => _AdminParentEditModalState();
} }
class _ParentEditModalState extends State<ParentEditModal> { class _AdminParentEditModalState extends State<AdminParentEditModal> {
late final TextEditingController _nomCtrl; late final TextEditingController _nomCtrl;
late final TextEditingController _prenomCtrl; late final TextEditingController _prenomCtrl;
late final TextEditingController _emailCtrl; late final TextEditingController _emailCtrl;
@@ -129,7 +129,7 @@ class _ParentEditModalState extends State<ParentEditModal> {
if (!mounted) return; if (!mounted) return;
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (ctx) => ParentEditModal( builder: (ctx) => AdminParentEditModal(
parent: parent, parent: parent,
onSaved: () async { onSaved: () async {
try { try {
@@ -244,7 +244,7 @@ class _ParentEditModalState extends State<ParentEditModal> {
if (!mounted) return; if (!mounted) return;
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (ctx) => ChildDetailModal( builder: (ctx) => AdminChildDetailModal(
enfant: enfant, enfant: enfant,
onSaved: _reloadChildren, onSaved: _reloadChildren,
), ),
@@ -322,7 +322,7 @@ class _ParentEditModalState extends State<ParentEditModal> {
Future<void> _attachChild() async { Future<void> _attachChild() async {
if (!mounted) return; if (!mounted) return;
final selected = await SelectEnfantModal.show( final selected = await AdminSelectEnfantModal.show(
context, context,
excludeIds: _children.map((c) => c.id).toSet(), excludeIds: _children.map((c) => c.id).toSet(),
title: 'Rattacher un enfant', title: 'Rattacher un enfant',
@@ -350,7 +350,7 @@ class _ParentEditModalState extends State<ParentEditModal> {
} }
Widget _childrenPanel() { Widget _childrenPanel() {
return ChildrenAffiliationPanel( return AdminChildrenAffiliationPanel(
children: _children, children: _children,
scrollController: _childrenScrollCtrl, scrollController: _childrenScrollCtrl,
onOpen: _openChild, onOpen: _openChild,
@@ -437,7 +437,7 @@ class _ParentEditModalState extends State<ParentEditModal> {
const SizedBox(width: 12), const SizedBox(width: 12),
SizedBox( SizedBox(
width: 160, width: 160,
child: StatusCapsule( child: AdminStatusCapsule(
statut: _statut, statut: _statut,
onChanged: (v) => setState(() { onChanged: (v) => setState(() {
_statut = v; _statut = v;
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/assistante_maternelle_model.dart'; import 'package:p_tits_pas/models/assistante_maternelle_model.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/am_vigilance.dart'; import 'package:p_tits_pas/utils/am_vigilance.dart';
import 'package:p_tits_pas/widgets/dashboard/am_edit_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_edit_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/select_list_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_select_list_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart'; import 'package:p_tits_pas/widgets/admin/validation_modal_theme.dart';
List<String> _amSelectSubtitleLines(AssistanteMaternelleModel am) { List<String> _amSelectSubtitleLines(AssistanteMaternelleModel am) {
final lines = <String>[]; final lines = <String>[];
@@ -28,22 +28,22 @@ List<String> _amSelectSubtitleLines(AssistanteMaternelleModel am) {
} }
/// Sélection d'une AM à rattacher (fiche enfant) — ticket #147. /// Sélection d'une AM à rattacher (fiche enfant) — ticket #147.
/// S'appuie sur [SelectListModal] (shell partagé avec #146). /// S'appuie sur [AdminSelectListModal] (shell partagé avec #146).
class SelectAmModal { class AdminSelectAmModal {
SelectAmModal._(); AdminSelectAmModal._();
static Future<AssistanteMaternelleModel?> show( static Future<AssistanteMaternelleModel?> show(
BuildContext context, { BuildContext context, {
Set<String> excludeIds = const {}, Set<String> excludeIds = const {},
String title = 'Choisir une assistante maternelle', String title = 'Choisir une assistante maternelle',
}) { }) {
return SelectListModal.show<AssistanteMaternelleModel>( return AdminSelectListModal.show<AssistanteMaternelleModel>(
context, context,
title: title, title: title,
searchHint: 'Rechercher par nom, prénom ou zone…', searchHint: 'Rechercher par nom, prénom ou zone…',
emptyMessage: 'Aucune assistante maternelle disponible', emptyMessage: 'Aucune assistante maternelle disponible',
noResultsMessage: 'Aucune AM avec place libre pour cette recherche', noResultsMessage: 'Aucune AM avec place libre pour cette recherche',
toggleFilter: const SelectToggleFilter<AssistanteMaternelleModel>( toggleFilter: const AdminSelectToggleFilter<AssistanteMaternelleModel>(
label: 'Libre', label: 'Libre',
initialValue: true, initialValue: true,
whenEnabled: amHasFreePlace, whenEnabled: amHasFreePlace,
@@ -76,7 +76,7 @@ class SelectAmModal {
_resolveAmSelection(ctx, am, reload), _resolveAmSelection(ctx, am, reload),
itemBuilder: (context, am, onSelect) { itemBuilder: (context, am, onSelect) {
final full = !amHasFreePlace(am); final full = !amHasFreePlace(am);
return UserCard( return AdminUserCard(
title: am.user.fullName, title: am.user.fullName,
avatarUrl: am.user.photoUrl, avatarUrl: am.user.photoUrl,
fallbackIcon: Icons.face, fallbackIcon: Icons.face,
@@ -150,7 +150,7 @@ class _AmNoPlaceWarningDialogState extends State<_AmNoPlaceWarningDialog> {
if (!mounted) return; if (!mounted) return;
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (ctx) => AmEditModal( builder: (ctx) => AdminAmEditModal(
assistante: _am, assistante: _am,
onSaved: () async { onSaved: () async {
try { try {
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/enfant_admin_model.dart'; import 'package:p_tits_pas/models/enfant_admin_model.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/enfant_status_utils.dart'; import 'package:p_tits_pas/utils/enfant_status_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/enfant_user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_enfant_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/select_list_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_select_list_modal.dart';
/// Sélection d'un enfant à rattacher (fiche AM / fiche parent) — ticket #146. /// Sélection d'un enfant à rattacher (fiche AM / fiche parent) — ticket #146.
/// S'appuie sur [SelectListModal] (shell partagé avec #147). /// S'appuie sur [AdminSelectListModal] (shell partagé avec #147).
class SelectEnfantModal { class AdminSelectEnfantModal {
SelectEnfantModal._(); AdminSelectEnfantModal._();
static Future<EnfantAdminModel?> show( static Future<EnfantAdminModel?> show(
BuildContext context, { BuildContext context, {
@@ -17,7 +17,7 @@ class SelectEnfantModal {
/// Affiché uniquement depuis la fiche AM : filtre les enfants déjà en garde. /// Affiché uniquement depuis la fiche AM : filtre les enfants déjà en garde.
bool showSansGardeFilter = false, bool showSansGardeFilter = false,
}) { }) {
return SelectListModal.show<EnfantAdminModel>( return AdminSelectListModal.show<EnfantAdminModel>(
context, context,
title: title, title: title,
searchHint: 'Rechercher par nom ou prénom…', searchHint: 'Rechercher par nom ou prénom…',
@@ -26,7 +26,7 @@ class SelectEnfantModal {
? 'Aucun enfant sans garde pour cette recherche' ? 'Aucun enfant sans garde pour cette recherche'
: 'Aucun résultat pour cette recherche', : 'Aucun résultat pour cette recherche',
toggleFilter: showSansGardeFilter toggleFilter: showSansGardeFilter
? SelectToggleFilter<EnfantAdminModel>( ? AdminSelectToggleFilter<EnfantAdminModel>(
label: 'Sans garde', label: 'Sans garde',
initialValue: true, initialValue: true,
whenEnabled: (e) => whenEnabled: (e) =>
@@ -50,7 +50,7 @@ class SelectEnfantModal {
return name.contains(q) || fn.contains(q) || ln.contains(q); return name.contains(q) || fn.contains(q) || ln.contains(q);
}, },
itemBuilder: (context, e, onSelect) { itemBuilder: (context, e, onSelect) {
return EnfantUserCard.fromEnfant( return AdminEnfantUserCard.fromEnfant(
e, e,
onCardTap: onSelect, onCardTap: onSelect,
margin: const EdgeInsets.only(bottom: 4), margin: const EdgeInsets.only(bottom: 4),
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/parent_model.dart'; import 'package:p_tits_pas/models/parent_model.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/widgets/dashboard/select_list_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_select_list_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
/// Foyer / famille sélectionnable pour rattacher un nouvel enfant (#132 / #157). /// Foyer / famille sélectionnable pour rattacher un nouvel enfant (#132 / #157).
class FamilleFoyer { class AdminFamilleFoyer {
/// Parent pivot pour `POST /enfants` (`parent_user_id`). /// Parent pivot pour `POST /enfants` (`parent_user_id`).
final String pivotParentUserId; final String pivotParentUserId;
/// Co-parent éventuel (rattachement foyer #157). /// Co-parent éventuel (rattachement foyer #157).
@@ -14,7 +14,7 @@ class FamilleFoyer {
final String displayTitle; final String displayTitle;
final List<String> parentNames; final List<String> parentNames;
const FamilleFoyer({ const AdminFamilleFoyer({
required this.pivotParentUserId, required this.pivotParentUserId,
required this.displayTitle, required this.displayTitle,
required this.parentNames, required this.parentNames,
@@ -42,10 +42,10 @@ class FamilleFoyer {
} }
/// Construit la liste des foyers uniques à partir de `GET /parents`. /// Construit la liste des foyers uniques à partir de `GET /parents`.
List<FamilleFoyer> buildFamilleFoyers(List<ParentModel> parents) { List<AdminFamilleFoyer> buildFamilleFoyers(List<ParentModel> parents) {
final seenDossiers = <String>{}; final seenDossiers = <String>{};
final seenUserIds = <String>{}; final seenUserIds = <String>{};
final foyers = <FamilleFoyer>[]; final foyers = <AdminFamilleFoyer>[];
for (final p in parents) { for (final p in parents) {
final dossier = (p.user.numeroDossier ?? '').trim(); final dossier = (p.user.numeroDossier ?? '').trim();
@@ -70,7 +70,7 @@ List<FamilleFoyer> buildFamilleFoyers(List<ParentModel> parents) {
: (names.isNotEmpty ? names.first : 'Famille'); : (names.isNotEmpty ? names.first : 'Famille');
foyers.add( foyers.add(
FamilleFoyer( AdminFamilleFoyer(
pivotParentUserId: p.user.id, pivotParentUserId: p.user.id,
coParentUserId: co?.id, coParentUserId: co?.id,
numeroDossier: dossier.isNotEmpty ? dossier : null, numeroDossier: dossier.isNotEmpty ? dossier : null,
@@ -87,14 +87,14 @@ List<FamilleFoyer> buildFamilleFoyers(List<ParentModel> parents) {
} }
/// Sélection d'une famille / dossier pour créer un enfant — ticket #132. /// Sélection d'une famille / dossier pour créer un enfant — ticket #132.
class SelectFamilleModal { class AdminSelectFamilleModal {
SelectFamilleModal._(); AdminSelectFamilleModal._();
static Future<FamilleFoyer?> show( static Future<AdminFamilleFoyer?> show(
BuildContext context, { BuildContext context, {
String title = 'Choisir une famille', String title = 'Choisir une famille',
}) { }) {
return SelectListModal.show<FamilleFoyer>( return AdminSelectListModal.show<AdminFamilleFoyer>(
context, context,
title: title, title: title,
searchHint: 'Rechercher par dossier, nom…', searchHint: 'Rechercher par dossier, nom…',
@@ -111,7 +111,7 @@ class SelectFamilleModal {
return dossier.contains(q) || title.contains(q) || names.contains(q); return dossier.contains(q) || title.contains(q) || names.contains(q);
}, },
itemBuilder: (context, f, onSelect) { itemBuilder: (context, f, onSelect) {
return UserCard( return AdminUserCard(
title: f.displayTitle, title: f.displayTitle,
fallbackIcon: Icons.family_restroom, fallbackIcon: Icons.family_restroom,
subtitleLines: [ subtitleLines: [
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart'; import 'package:p_tits_pas/widgets/admin/validation_modal_theme.dart';
/// Filtre optionnel (switch) sur la même ligne que la barre de recherche. /// Filtre optionnel (switch) sur la même ligne que la barre de recherche.
class SelectToggleFilter<T> { class AdminSelectToggleFilter<T> {
final String label; final String label;
final bool initialValue; final bool initialValue;
@@ -10,7 +10,7 @@ class SelectToggleFilter<T> {
/// [whenEnabled] renvoie `true`. /// [whenEnabled] renvoie `true`.
final bool Function(T item) whenEnabled; final bool Function(T item) whenEnabled;
const SelectToggleFilter({ const AdminSelectToggleFilter({
required this.label, required this.label,
required this.whenEnabled, required this.whenEnabled,
this.initialValue = true, this.initialValue = true,
@@ -19,7 +19,7 @@ class SelectToggleFilter<T> {
/// Shell générique « rechercher + liste + sélection » pour les modales admin. /// Shell générique « rechercher + liste + sélection » pour les modales admin.
/// Utilisé par la sélection d'enfant (#146) et la sélection d'AM (#147). /// Utilisé par la sélection d'enfant (#146) et la sélection d'AM (#147).
class SelectListModal<T> extends StatefulWidget { class AdminSelectListModal<T> extends StatefulWidget {
final String title; final String title;
final String searchHint; final String searchHint;
final Future<List<T>> Function() loadItems; final Future<List<T>> Function() loadItems;
@@ -40,7 +40,7 @@ class SelectListModal<T> extends StatefulWidget {
final int minVisibleCards; final int minVisibleCards;
/// Switch optionnel à droite du champ de recherche (ex. « Sans garde », « Libre »). /// Switch optionnel à droite du champ de recherche (ex. « Sans garde », « Libre »).
final SelectToggleFilter<T>? toggleFilter; final AdminSelectToggleFilter<T>? toggleFilter;
/// Si fourni, appelé avant de valider la sélection. /// Si fourni, appelé avant de valider la sélection.
/// Retourne l'élément à pop (éventuellement rafraîchi), ou `null` pour annuler. /// Retourne l'élément à pop (éventuellement rafraîchi), ou `null` pour annuler.
@@ -50,7 +50,7 @@ class SelectListModal<T> extends StatefulWidget {
Future<void> Function() reload, Future<void> Function() reload,
)? resolveSelect; )? resolveSelect;
const SelectListModal({ const AdminSelectListModal({
super.key, super.key,
required this.title, required this.title,
required this.loadItems, required this.loadItems,
@@ -82,7 +82,7 @@ class SelectListModal<T> extends StatefulWidget {
double modalWidth = 930, double modalWidth = 930,
double cardExtent = 52, double cardExtent = 52,
int minVisibleCards = 8, int minVisibleCards = 8,
SelectToggleFilter<T>? toggleFilter, AdminSelectToggleFilter<T>? toggleFilter,
Future<T?> Function( Future<T?> Function(
BuildContext context, BuildContext context,
T item, T item,
@@ -91,7 +91,7 @@ class SelectListModal<T> extends StatefulWidget {
}) { }) {
return showDialog<T>( return showDialog<T>(
context: context, context: context,
builder: (ctx) => SelectListModal<T>( builder: (ctx) => AdminSelectListModal<T>(
title: title, title: title,
loadItems: loadItems, loadItems: loadItems,
matchesQuery: matchesQuery, matchesQuery: matchesQuery,
@@ -109,11 +109,11 @@ class SelectListModal<T> extends StatefulWidget {
} }
@override @override
State<SelectListModal<T>> createState() => State<AdminSelectListModal<T>> createState() =>
_SelectListModalState<T>(); _AdminSelectListModalState<T>();
} }
class _SelectListModalState<T> extends State<SelectListModal<T>> { class _AdminSelectListModalState<T> extends State<AdminSelectListModal<T>> {
final _searchCtrl = TextEditingController(); final _searchCtrl = TextEditingController();
List<T> _all = []; List<T> _all = [];
bool _loading = true; bool _loading = true;
@@ -1,13 +1,13 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
/// Gélule de sélection du statut utilisateur (fiches admin parent / AM). /// Gélule de sélection du statut utilisateur (fiches admin parent / AM).
class StatusCapsule extends StatelessWidget { class AdminStatusCapsule extends StatelessWidget {
final String statut; final String statut;
final ValueChanged<String>? onChanged; final ValueChanged<String>? onChanged;
static const statuts = ['actif', 'en_attente', 'suspendu', 'refuse']; static const statuts = ['actif', 'en_attente', 'suspendu', 'refuse'];
const StatusCapsule({ const AdminStatusCapsule({
super.key, super.key,
required this.statut, required this.statut,
this.onChanged, this.onChanged,
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:p_tits_pas/services/api/api_config.dart'; import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart'; import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
class UserCard extends StatefulWidget { class AdminUserCard extends StatefulWidget {
final String title; final String title;
final List<String> subtitleLines; final List<String> subtitleLines;
final String? avatarUrl; final String? avatarUrl;
@@ -21,7 +21,7 @@ class UserCard extends StatefulWidget {
final EdgeInsetsGeometry? margin; final EdgeInsetsGeometry? margin;
final EdgeInsetsGeometry? contentPadding; final EdgeInsetsGeometry? contentPadding;
const UserCard({ const AdminUserCard({
super.key, super.key,
required this.title, required this.title,
required this.subtitleLines, required this.subtitleLines,
@@ -41,10 +41,10 @@ class UserCard extends StatefulWidget {
}); });
@override @override
State<UserCard> createState() => _UserCardState(); State<AdminUserCard> createState() => _AdminUserCardState();
} }
class _UserCardState extends State<UserCard> { class _AdminUserCardState extends State<AdminUserCard> {
bool _isHovered = false; bool _isHovered = false;
@override @override
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/widgets/dashboard/user_list_state.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_list_state.dart';
class UserList extends StatelessWidget { class UserList extends StatelessWidget {
final bool isLoading; final bool isLoading;
@@ -28,7 +28,7 @@ class UserList extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
UserListState( AdminListState(
isLoading: isLoading, isLoading: isLoading,
error: error, error: error,
isEmpty: isEmpty, isEmpty: isEmpty,
@@ -4,7 +4,7 @@ import 'package:p_tits_pas/utils/email_utils.dart';
import 'package:p_tits_pas/utils/nir_utils.dart'; import 'package:p_tits_pas/utils/nir_utils.dart';
import 'package:p_tits_pas/utils/phone_utils.dart'; import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/utils/postal_utils.dart'; import 'package:p_tits_pas/utils/postal_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/detail_modal.dart'; import 'admin_detail_modal.dart';
/// Réglages des formulaires validation / wizard AM — **jouer sur ces 3 leviers**. /// Réglages des formulaires validation / wizard AM — **jouer sur ces 3 leviers**.
class ValidationFormMetrics { class ValidationFormMetrics {
@@ -60,7 +60,7 @@ class ValidationFormMetrics {
class ValidationDetailSection extends StatelessWidget { class ValidationDetailSection extends StatelessWidget {
/// Si null ou vide, pas de bandeau titre (gain de place vertical, ex. wizard AM). /// Si null ou vide, pas de bandeau titre (gain de place vertical, ex. wizard AM).
final String? title; final String? title;
final List<DetailField> fields; final List<AdminDetailField> fields;
/// Nombre de champs par ligne (1 = plein largeur, 2 = deux côte à côte). Ex. [2, 2, 1, 2] pour identité. /// Nombre de champs par ligne (1 = plein largeur, 2 = deux côte à côte). Ex. [2, 2, 1, 2] pour identité.
final List<int>? rowLayout; final List<int>? rowLayout;
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
/// Carte dossier unifiée (#153) — fond neutre, accent couleur sur licône. /// Carte dossier unifiée (#153) — fond neutre, accent couleur sur licône.
class DossierListCard extends StatelessWidget { class DossierListCard extends StatelessWidget {
@@ -54,7 +54,7 @@ class DossierListCard extends StatelessWidget {
if (!emptyKids && countLabel != null) countLabel, if (!emptyKids && countLabel != null) countLabel,
]; ];
return UserCard( return AdminUserCard(
title: num, title: num,
subtitleLines: subtitle, subtitleLines: subtitle,
avatarUrl: !isFamille && avatar.isNotEmpty ? avatar : null, avatarUrl: !isFamille && avatar.isNotEmpty ? avatar : null,
@@ -3,10 +3,10 @@ import 'package:p_tits_pas/models/dossier_list_item.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart'; import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/dossier_list_card.dart'; import 'package:p_tits_pas/widgets/admin/dossier_list_card.dart';
import 'package:p_tits_pas/widgets/dashboard/pending_validation_widget.dart'; import 'package:p_tits_pas/widgets/admin/pending_validation_widget.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_dossier_modal.dart'; import 'package:p_tits_pas/widgets/admin/validation_dossier_modal.dart';
/// Onglet permanent « Dossiers » (#153) : pending en haut + liste unifiée en bas. /// Onglet permanent « Dossiers » (#153) : pending en haut + liste unifiée en bas.
class DossiersManagementWidget extends StatefulWidget { class DossiersManagementWidget extends StatefulWidget {
@@ -5,10 +5,10 @@ import 'package:p_tits_pas/models/enfant_admin_model.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart'; import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/child_detail_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_child_detail_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/enfant_user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_enfant_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/common/user_list.dart'; import 'package:p_tits_pas/widgets/admin/common/user_list.dart';
/// Onglet liste globale des enfants (doc 28 §6.2, ticket #137). /// Onglet liste globale des enfants (doc 28 §6.2, ticket #137).
class EnfantManagementWidget extends StatefulWidget { class EnfantManagementWidget extends StatefulWidget {
@@ -68,7 +68,7 @@ class _EnfantManagementWidgetState extends State<EnfantManagementWidget> {
Future<void> _openEnfant(EnfantAdminModel enfant) async { Future<void> _openEnfant(EnfantAdminModel enfant) async {
await showDialog<void>( await showDialog<void>(
context: context, context: context,
builder: (ctx) => ChildDetailModal( builder: (ctx) => AdminChildDetailModal(
enfant: enfant, enfant: enfant,
onSaved: _loadEnfants, onSaved: _loadEnfants,
onDeleted: _loadEnfants, onDeleted: _loadEnfants,
@@ -224,7 +224,7 @@ class _EnfantManagementWidgetState extends State<EnfantManagementWidget> {
itemCount: filtered.length, itemCount: filtered.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final enfant = filtered[index]; final enfant = filtered[index];
return EnfantUserCard.fromEnfant( return AdminEnfantUserCard.fromEnfant(
enfant, enfant,
onCardTap: () => _openEnfant(enfant), onCardTap: () => _openEnfant(enfant),
actions: [ actions: [
@@ -1,12 +1,12 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/widgets/dashboard/staff_user_form_modal.dart'; import 'package:p_tits_pas/screens/administrateurs/creation/gestionnaires_create.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart'; import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/common/user_list.dart'; import 'package:p_tits_pas/widgets/admin/common/user_list.dart';
class GestionnaireManagementWidget extends StatefulWidget { class GestionnaireManagementWidget extends StatefulWidget {
final String searchQuery; final String searchQuery;
@@ -74,7 +74,7 @@ class _GestionnaireManagementWidgetState
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (dialogContext) { builder: (dialogContext) {
return StaffUserFormModal(initialUser: user); return AdminUserFormDialog(initialUser: user);
}, },
); );
if (changed == true) { if (changed == true) {
@@ -141,7 +141,7 @@ class _GestionnaireManagementWidgetState
final user = filteredGestionnaires[index]; final user = filteredGestionnaires[index];
final isSelf = final isSelf =
_currentUserId != null && _currentUserId == user.id; _currentUserId != null && _currentUserId == user.id;
return UserCard( return AdminUserCard(
title: user.fullName, title: user.fullName,
fallbackIcon: Icons.assignment_ind_outlined, fallbackIcon: Icons.assignment_ind_outlined,
avatarUrl: user.photoUrl, avatarUrl: user.photoUrl,
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:p_tits_pas/services/configuration_service.dart'; import 'package:p_tits_pas/services/configuration_service.dart';
import 'package:p_tits_pas/utils/email_utils.dart'; import 'package:p_tits_pas/utils/email_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/relais_management_panel.dart'; import 'package:p_tits_pas/widgets/admin/relais_management_panel.dart';
/// Panneau Paramètres admin : Email (SMTP), Personnalisation, Avancé. /// Panneau Paramètres admin : Email (SMTP), Personnalisation, Avancé.
class ParametresPanel extends StatefulWidget { class ParametresPanel extends StatefulWidget {
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/widgets/dashboard/parent_dossier_wizard.dart'; import 'package:p_tits_pas/widgets/admin/parent_dossier_wizard.dart';
/// Modale de création dossier famille (#129) — même shell que [AmDossierCreateModal]. /// Modale de création dossier famille (#129) — même shell que [AmDossierCreateModal].
class ParentDossierCreateModal extends StatefulWidget { class ParentDossierCreateModal extends StatefulWidget {
@@ -14,11 +14,11 @@ import 'package:p_tits_pas/utils/enfant_status_utils.dart';
import 'package:p_tits_pas/utils/name_format_utils.dart'; import 'package:p_tits_pas/utils/name_format_utils.dart';
import 'package:p_tits_pas/utils/phone_utils.dart'; import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/utils/postal_utils.dart'; import 'package:p_tits_pas/utils/postal_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/am_photo_frame.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_am_photo_frame.dart';
import 'package:p_tits_pas/widgets/dashboard/common/validation_detail_section.dart'; import 'package:p_tits_pas/widgets/admin/common/validation_detail_section.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart'; import 'package:p_tits_pas/widgets/admin/validation_modal_theme.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_refus_form.dart'; import 'package:p_tits_pas/widgets/admin/validation_refus_form.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_valider_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/validation_valider_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart'; import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
import 'package:p_tits_pas/widgets/common/identity_block.dart'; import 'package:p_tits_pas/widgets/common/identity_block.dart';
@@ -860,7 +860,7 @@ class _ParentDossierWizardState extends State<ParentDossierWizard> {
child: SizedBox( child: SizedBox(
width: pw, width: pw,
height: ph, height: ph,
child: AmPhotoFrame( child: AdminAmPhotoFrame(
photoUrl: child.photoBytes == null photoUrl: child.photoBytes == null
? child.existingPhotoUrl ? child.existingPhotoUrl
: null, : null,
@@ -1466,6 +1466,7 @@ class _ParentDossierWizardState extends State<ParentDossierWizard> {
final map = <String, dynamic>{ final map = <String, dynamic>{
'genre': c.genre, 'genre': c.genre,
'consent_photo': true, 'consent_photo': true,
'grossesse_multiple': false,
}; };
if (prenom.length >= 2) { if (prenom.length >= 2) {
@@ -1722,6 +1723,7 @@ class _ParentDossierWizardState extends State<ParentDossierWizard> {
'status': status, 'status': status,
'gender': gender, 'gender': gender,
'consent_photo': true, 'consent_photo': true,
'is_multiple': false,
}; };
if (prenom.length >= 2) map['first_name'] = prenom; if (prenom.length >= 2) map['first_name'] = prenom;
if (nom.length >= 2) map['last_name'] = nom; if (nom.length >= 2) map['last_name'] = nom;
@@ -4,10 +4,10 @@ import 'package:p_tits_pas/models/parent_model.dart';
import 'package:p_tits_pas/services/auth_service.dart'; import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart'; import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/parent_edit_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_parent_edit_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/user_card.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_user_card.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/common/user_list.dart'; import 'package:p_tits_pas/widgets/admin/common/user_list.dart';
class ParentManagementWidget extends StatefulWidget { class ParentManagementWidget extends StatefulWidget {
final String searchQuery; final String searchQuery;
@@ -146,7 +146,7 @@ class _ParentManagementWidgetState extends State<ParentManagementWidget> {
itemCount: filteredParents.length, itemCount: filteredParents.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final parent = filteredParents[index]; final parent = filteredParents[index];
return UserCard( return AdminUserCard(
title: parent.user.fullName, title: parent.user.fullName,
fallbackIcon: Icons.supervisor_account_outlined, fallbackIcon: Icons.supervisor_account_outlined,
avatarUrl: parent.user.photoUrl, avatarUrl: parent.user.photoUrl,
@@ -189,7 +189,7 @@ class _ParentManagementWidgetState extends State<ParentManagementWidget> {
void _openParentDetails(ParentModel parent) { void _openParentDetails(ParentModel parent) {
showDialog<void>( showDialog<void>(
context: context, context: context,
builder: (context) => ParentEditModal( builder: (context) => AdminParentEditModal(
parent: parent, parent: parent,
onSaved: _loadParents, onSaved: _loadParents,
), ),
@@ -3,9 +3,9 @@ import 'package:p_tits_pas/models/dossier_list_item.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/models/pending_family.dart'; import 'package:p_tits_pas/models/pending_family.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/widgets/dashboard/dossier_list_card.dart'; import 'package:p_tits_pas/widgets/admin/dossier_list_card.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_dossier_modal.dart'; import 'package:p_tits_pas/widgets/admin/validation_dossier_modal.dart';
/// Section « dossiers à valider » (liste unifiée AM + familles). Ticket #107 / #153. /// Section « dossiers à valider » (liste unifiée AM + familles). Ticket #107 / #153.
class PendingValidationWidget extends StatefulWidget { class PendingValidationWidget extends StatefulWidget {
@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
import 'package:p_tits_pas/models/relais_model.dart'; import 'package:p_tits_pas/models/relais_model.dart';
import 'package:p_tits_pas/utils/phone_utils.dart'; import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/services/relais_service.dart'; import 'package:p_tits_pas/services/relais_service.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart'; import 'package:p_tits_pas/widgets/admin/common/suppression_confirm_dialog.dart';
class RelaisManagementPanel extends StatefulWidget { class RelaisManagementPanel extends StatefulWidget {
const RelaisManagementPanel({super.key}); const RelaisManagementPanel({super.key});
@@ -1,15 +1,15 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/widgets/dashboard/staff_user_form_modal.dart'; import 'package:p_tits_pas/screens/administrateurs/creation/gestionnaires_create.dart';
import 'package:p_tits_pas/widgets/admin/admin_management_widget.dart'; import 'package:p_tits_pas/widgets/admin/admin_management_widget.dart';
import 'package:p_tits_pas/widgets/dashboard/am_dossier_create_modal.dart'; import 'package:p_tits_pas/widgets/admin/am_dossier_create_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/assistante_maternelle_management_widget.dart'; import 'package:p_tits_pas/widgets/admin/assistante_maternelle_management_widget.dart';
import 'package:p_tits_pas/widgets/dashboard/child_detail_modal.dart'; import 'package:p_tits_pas/widgets/admin/common/admin_child_detail_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/user_management_sub_bar.dart'; import 'package:p_tits_pas/widgets/admin/dashboard_admin.dart';
import 'package:p_tits_pas/widgets/dashboard/dossiers_management_widget.dart'; import 'package:p_tits_pas/widgets/admin/dossiers_management_widget.dart';
import 'package:p_tits_pas/widgets/dashboard/enfant_management_widget.dart'; import 'package:p_tits_pas/widgets/admin/enfant_management_widget.dart';
import 'package:p_tits_pas/widgets/dashboard/gestionnaire_management_widget.dart'; import 'package:p_tits_pas/widgets/admin/gestionnaire_management_widget.dart';
import 'package:p_tits_pas/widgets/dashboard/parent_dossier_create_modal.dart'; import 'package:p_tits_pas/widgets/admin/parent_dossier_create_modal.dart';
import 'package:p_tits_pas/widgets/dashboard/parent_managmant_widget.dart'; import 'package:p_tits_pas/widgets/admin/parent_managmant_widget.dart';
class UserManagementPanel extends StatefulWidget { class UserManagementPanel extends StatefulWidget {
/// Afficher l'onglet Administrateurs (sinon sans Administrateurs). /// Afficher l'onglet Administrateurs (sinon sans Administrateurs).
@@ -348,7 +348,7 @@ class _UserManagementPanelState extends State<UserManagementPanel> {
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (dialogContext) { builder: (dialogContext) {
return ChildDetailModal.create( return AdminChildDetailModal.create(
onSaved: () { onSaved: () {
if (!mounted) return; if (!mounted) return;
setState(() => _enfantRefreshTick++); setState(() => _enfantRefreshTick++);
@@ -385,7 +385,7 @@ class _UserManagementPanelState extends State<UserManagementPanel> {
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (dialogContext) { builder: (dialogContext) {
return const StaffUserFormModal(); return const AdminUserFormDialog();
}, },
); );
@@ -403,7 +403,7 @@ class _UserManagementPanelState extends State<UserManagementPanel> {
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (dialogContext) { builder: (dialogContext) {
return const StaffUserFormModal( return const AdminUserFormDialog(
adminMode: true, adminMode: true,
withRelais: false, withRelais: false,
); );
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/dossier_unifie.dart'; import 'package:p_tits_pas/models/dossier_unifie.dart';
import 'package:p_tits_pas/widgets/dashboard/am_dossier_wizard.dart'; import 'package:p_tits_pas/widgets/admin/am_dossier_wizard.dart';
/// Wrapper historique (#107) — délègue à [AmDossierWizard.review]. /// Wrapper historique (#107) — délègue à [AmDossierWizard.review].
class ValidationAmWizard extends StatelessWidget { class ValidationAmWizard extends StatelessWidget {
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/dossier_unifie.dart'; import 'package:p_tits_pas/models/dossier_unifie.dart';
import 'package:p_tits_pas/services/user_service.dart'; import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/widgets/dashboard/am_dossier_wizard.dart'; import 'package:p_tits_pas/widgets/admin/am_dossier_wizard.dart';
import 'package:p_tits_pas/widgets/dashboard/parent_dossier_wizard.dart'; import 'package:p_tits_pas/widgets/admin/parent_dossier_wizard.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_am_wizard.dart'; import 'package:p_tits_pas/widgets/admin/validation_am_wizard.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_family_wizard.dart'; import 'package:p_tits_pas/widgets/admin/validation_family_wizard.dart';
/// Modale (dialog) : charge le dossier par numéro puis affiche le wizard AM ou Famille. /// Modale (dialog) : charge le dossier par numéro puis affiche le wizard AM ou Famille.
/// Ticket #107 / #119 (review), #135 (`openAsEdit`). /// Ticket #107 / #119 (review), #135 (`openAsEdit`).
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/dossier_unifie.dart'; import 'package:p_tits_pas/models/dossier_unifie.dart';
import 'package:p_tits_pas/widgets/dashboard/parent_dossier_wizard.dart'; import 'package:p_tits_pas/widgets/admin/parent_dossier_wizard.dart';
/// Wrapper historique (#107) — délègue à [ParentDossierWizard.review]. /// Wrapper historique (#107) — délègue à [ParentDossierWizard.review].
class ValidationFamilyWizard extends StatelessWidget { class ValidationFamilyWizard extends StatelessWidget {
@@ -3,7 +3,7 @@ import 'package:p_tits_pas/models/dossier_unifie.dart';
import 'package:p_tits_pas/models/user.dart'; import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/utils/name_format_utils.dart'; import 'package:p_tits_pas/utils/name_format_utils.dart';
import 'package:p_tits_pas/utils/phone_utils.dart'; import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/widgets/dashboard/common/validation_detail_section.dart'; import 'package:p_tits_pas/widgets/admin/common/validation_detail_section.dart';
/// Valeurs affichées dans un [IdentityBlock] en lecture seule. /// Valeurs affichées dans un [IdentityBlock] en lecture seule.
class IdentityValues { class IdentityValues {
@@ -1,794 +0,0 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/relais_model.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/relais_service.dart';
import 'package:p_tits_pas/services/user_service.dart';
import 'package:p_tits_pas/utils/email_utils.dart';
import 'package:p_tits_pas/utils/name_format_utils.dart';
import 'package:p_tits_pas/utils/phone_utils.dart';
import 'package:p_tits_pas/utils/staff_deletion_rights.dart';
import 'package:p_tits_pas/widgets/dashboard/common/suppression_confirm_dialog.dart';
import 'package:p_tits_pas/widgets/dashboard/common/validation_detail_section.dart';
import 'package:p_tits_pas/widgets/dashboard/validation_modal_theme.dart';
/// Modale création / édition / consultation staff (gestionnaire / admin) — #164.
class StaffUserFormModal extends StatefulWidget {
final AppUser? initialUser;
final bool withRelais;
final bool adminMode;
final bool readOnly;
const StaffUserFormModal({
super.key,
this.initialUser,
this.withRelais = true,
this.adminMode = false,
this.readOnly = false,
});
@override
State<StaffUserFormModal> createState() => _StaffUserFormModalState();
}
class _StaffUserFormModalState extends State<StaffUserFormModal> {
static const double _modalWidth = 930;
final _formKey = GlobalKey<FormState>();
final _nomController = TextEditingController();
final _prenomController = TextEditingController();
final _emailController = TextEditingController();
final _passwordController = TextEditingController();
final _telephoneController = TextEditingController();
final _passwordToggleFocusNode =
FocusNode(skipTraversal: true, canRequestFocus: false);
bool _isSubmitting = false;
bool _obscurePassword = true;
bool _isLoadingRelais = true;
bool _dirty = false;
List<RelaisModel> _relais = [];
String? _selectedRelaisId;
String? _currentUserId;
String? _currentUserRole;
String _baselineNom = '';
String _baselinePrenom = '';
String _baselineEmail = '';
String _baselinePhone = '';
String? _baselineRelaisId;
bool get _isEditMode => widget.initialUser != null;
bool get _isSuperAdminTarget =>
(widget.initialUser?.role ?? '').toLowerCase() == 'super_admin';
bool get _isSelfTarget =>
_isEditMode &&
_currentUserId != null &&
widget.initialUser!.id == _currentUserId;
bool get _canDeleteTarget {
if (!_isEditMode || widget.readOnly) return false;
if (_isSelfTarget || _isSuperAdminTarget) return false;
return canDeleteGestionnaire(_currentUserRole);
}
bool get _isLockedAdminIdentity =>
_isEditMode && widget.adminMode && _isSuperAdminTarget;
bool get _fieldsEnabled => !widget.readOnly && !_isSubmitting;
String get _targetRoleKey {
if (widget.initialUser != null) {
return (widget.initialUser!.role).toLowerCase();
}
return widget.adminMode ? 'administrateur' : 'gestionnaire';
}
String get _targetRoleLabel {
switch (_targetRoleKey) {
case 'super_admin':
return 'Super administrateur';
case 'administrateur':
return 'Administrateur';
case 'gestionnaire':
return 'Gestionnaire';
default:
return 'Utilisateur';
}
}
IconData get _targetRoleIcon {
switch (_targetRoleKey) {
case 'super_admin':
return Icons.verified_user_outlined;
case 'administrateur':
return Icons.admin_panel_settings_outlined;
case 'gestionnaire':
return Icons.assignment_ind_outlined;
default:
return Icons.person_outline;
}
}
@override
void initState() {
super.initState();
final user = widget.initialUser;
if (user != null) {
_nomController.text = user.nom ?? '';
_prenomController.text = user.prenom ?? '';
_emailController.text = user.email;
_telephoneController.text = formatPhoneForDisplay(user.telephone ?? '');
_passwordController.clear();
final initialRelaisId = user.relaisId?.trim();
_selectedRelaisId =
(initialRelaisId == null || initialRelaisId.isEmpty)
? null
: initialRelaisId;
_captureBaseline();
}
for (final c in [
_nomController,
_prenomController,
_emailController,
_passwordController,
_telephoneController,
]) {
c.addListener(_onFieldChanged);
}
if (widget.withRelais) {
_loadRelais();
} else {
_isLoadingRelais = false;
}
_loadCurrentUserId();
}
void _captureBaseline() {
_baselineNom = formatPersonNameCase(_nomController.text);
_baselinePrenom = formatPersonNameCase(_prenomController.text);
_baselineEmail = normalizeEmailText(_emailController.text);
_baselinePhone = normalizePhone(_telephoneController.text);
_baselineRelaisId = _selectedRelaisId;
}
void _onFieldChanged() {
if (widget.readOnly || !_isEditMode) return;
final dirty = _computeDirty();
if (dirty != _dirty) setState(() => _dirty = dirty);
}
bool _computeDirty() {
if (!_isEditMode) return true;
final nom = formatPersonNameCase(_nomController.text);
final prenom = formatPersonNameCase(_prenomController.text);
final email = normalizeEmailText(_emailController.text);
final phone = normalizePhone(_telephoneController.text);
final passwordProvided = _passwordController.text.trim().isNotEmpty;
return nom != _baselineNom ||
prenom != _baselinePrenom ||
email != _baselineEmail ||
phone != _baselinePhone ||
passwordProvided ||
_selectedRelaisId != _baselineRelaisId;
}
Future<void> _loadCurrentUserId() async {
final cached = await AuthService.getCurrentUser();
if (!mounted) return;
if (cached != null) {
setState(() {
_currentUserId = cached.id;
_currentUserRole = cached.role;
});
return;
}
final refreshed = await AuthService.refreshCurrentUser();
if (!mounted || refreshed == null) return;
setState(() {
_currentUserId = refreshed.id;
_currentUserRole = refreshed.role;
});
}
@override
void dispose() {
for (final c in [
_nomController,
_prenomController,
_emailController,
_passwordController,
_telephoneController,
]) {
c.removeListener(_onFieldChanged);
c.dispose();
}
_passwordToggleFocusNode.dispose();
super.dispose();
}
List<RelaisModel> _fallbackRelaisFromUser() {
final id = _selectedRelaisId?.trim();
if (id == null || id.isEmpty) return const [];
final nom = (widget.initialUser?.relaisNom ?? '').trim();
return [
RelaisModel(
id: id,
nom: nom.isNotEmpty ? nom : 'Relais actuel',
adresse: '',
actif: true,
),
];
}
Future<void> _loadRelais() async {
try {
final list = await RelaisService.getRelais();
if (!mounted) return;
final uniqueById = <String, RelaisModel>{};
for (final relais in list) {
uniqueById[relais.id] = relais;
}
final filtered = uniqueById.values.where((r) => r.actif).toList();
if (_selectedRelaisId != null &&
!filtered.any((r) => r.id == _selectedRelaisId)) {
final selected = uniqueById[_selectedRelaisId!];
if (selected != null) {
filtered.add(selected);
} else {
filtered.addAll(_fallbackRelaisFromUser());
}
}
setState(() {
_relais = filtered;
_isLoadingRelais = false;
});
} catch (_) {
if (!mounted) return;
setState(() {
_relais = _fallbackRelaisFromUser();
_isLoadingRelais = false;
});
}
}
String? _required(String? value, String field) {
if (value == null || value.trim().isEmpty) {
return '$field est requis';
}
return null;
}
String? _validatePassword(String? value) {
if (_isEditMode && (value == null || value.trim().isEmpty)) {
return null;
}
final base = _required(value, 'Mot de passe');
if (base != null) return base;
if (value!.trim().length < 6) return 'Minimum 6 caractères';
return null;
}
Future<void> _submit() async {
if (widget.readOnly) return;
if (_isSubmitting) return;
if (_isEditMode && !_dirty) return;
if (!_formKey.currentState!.validate()) return;
setState(() => _isSubmitting = true);
try {
final normalizedNom = formatPersonNameCase(_nomController.text);
final normalizedPrenom = formatPersonNameCase(_prenomController.text);
final normalizedPhone = normalizePhone(_telephoneController.text);
final passwordProvided = _passwordController.text.trim().isNotEmpty;
if (_isEditMode) {
if (widget.adminMode) {
final lockedNom = formatPersonNameCase(widget.initialUser!.nom ?? '');
final lockedPrenom =
formatPersonNameCase(widget.initialUser!.prenom ?? '');
await UserService.updateAdministrateur(
adminId: widget.initialUser!.id,
nom: _isLockedAdminIdentity ? lockedNom : normalizedNom,
prenom: _isLockedAdminIdentity ? lockedPrenom : normalizedPrenom,
email: normalizeEmailText(_emailController.text),
telephone: normalizedPhone.isEmpty
? normalizePhone(widget.initialUser!.telephone ?? '')
: normalizedPhone,
password: passwordProvided ? _passwordController.text : null,
);
} else {
final currentUser = widget.initialUser!;
final initialNom = formatPersonNameCase(currentUser.nom ?? '');
final initialPrenom = formatPersonNameCase(currentUser.prenom ?? '');
final initialEmail = normalizeEmailText(currentUser.email);
final initialPhone = normalizePhone(currentUser.telephone ?? '');
final onlyRelaisChanged = normalizedNom == initialNom &&
normalizedPrenom == initialPrenom &&
normalizeEmailText(_emailController.text) == initialEmail &&
normalizedPhone == initialPhone &&
!passwordProvided;
if (onlyRelaisChanged) {
await UserService.updateGestionnaireRelais(
gestionnaireId: currentUser.id,
relaisId: _selectedRelaisId,
);
} else {
await UserService.updateGestionnaire(
gestionnaireId: currentUser.id,
nom: normalizedNom,
prenom: normalizedPrenom,
email: normalizeEmailText(_emailController.text),
telephone:
normalizedPhone.isEmpty ? initialPhone : normalizedPhone,
relaisId: _selectedRelaisId,
password: passwordProvided ? _passwordController.text : null,
);
}
}
} else {
if (widget.adminMode) {
await UserService.createAdministrateur(
nom: normalizedNom,
prenom: normalizedPrenom,
email: normalizeEmailText(_emailController.text),
password: _passwordController.text,
telephone: normalizePhone(_telephoneController.text),
);
} else {
await UserService.createGestionnaire(
nom: normalizedNom,
prenom: normalizedPrenom,
email: normalizeEmailText(_emailController.text),
password: _passwordController.text,
telephone: normalizePhone(_telephoneController.text),
relaisId: _selectedRelaisId,
);
}
}
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
_isEditMode
? (widget.adminMode
? 'Administrateur modifié avec succès.'
: 'Gestionnaire modifié avec succès.')
: (widget.adminMode
? 'Administrateur créé avec succès.'
: 'Gestionnaire créé avec succès.'),
),
),
);
Navigator.of(context).pop(true);
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(e.toString().replaceFirst('Exception: ', '')),
backgroundColor: Colors.red.shade700,
),
);
} finally {
if (mounted) {
setState(() => _isSubmitting = false);
}
}
}
Future<void> _delete() async {
if (widget.readOnly) return;
if (!_canDeleteTarget) return;
if (!_isEditMode || _isSubmitting) return;
final name = widget.initialUser!.fullName.isEmpty
? widget.initialUser!.email
: widget.initialUser!.fullName;
final confirmed = await showSuppressionConfirmDialog(
context,
title: widget.adminMode
? 'Supprimer l\'administrateur'
: 'Supprimer le gestionnaire',
people: [
widget.adminMode
? SuppressionPersonLine.administrateur(name)
: SuppressionPersonLine.gestionnaire(name),
],
footnotes: const [
'Le compte sera définitivement supprimé.',
],
);
if (!confirmed) return;
setState(() => _isSubmitting = true);
try {
await UserService.deleteUser(widget.initialUser!.id);
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
widget.adminMode
? 'Administrateur supprimé.'
: 'Gestionnaire supprimé.',
),
),
);
Navigator.of(context).pop(true);
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(e.toString().replaceFirst('Exception: ', '')),
backgroundColor: Colors.red.shade700,
),
);
setState(() => _isSubmitting = false);
}
}
String _headerTitle() {
if (!_isEditMode) {
return widget.adminMode
? 'Créer un administrateur'
: 'Créer un gestionnaire';
}
final prenom = (_prenomController.text.trim().isNotEmpty
? _prenomController.text
: (widget.initialUser?.prenom ?? ''))
.trim();
final nom = (_nomController.text.trim().isNotEmpty
? _nomController.text
: (widget.initialUser?.nom ?? ''))
.trim();
final full = '$prenom $nom'.trim();
if (full.isNotEmpty) return full;
return widget.initialUser?.email ?? _targetRoleLabel;
}
Widget _buildFooter() {
if (widget.readOnly) {
return Row(
children: [
TextButton(
onPressed:
_isSubmitting ? null : () => Navigator.of(context).pop(false),
child: const Text('Fermer'),
),
],
);
}
if (!_isEditMode) {
return Row(
children: [
TextButton(
onPressed:
_isSubmitting ? null : () => Navigator.of(context).pop(false),
child: const Text('Annuler'),
),
const Spacer(),
ElevatedButton(
style: ValidationModalTheme.primaryElevatedStyle,
onPressed: _isSubmitting ? null : _submit,
child: _isSubmitting
? const SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: const Text('Créer'),
),
],
);
}
return Row(
children: [
if (_canDeleteTarget)
OutlinedButton(
onPressed: _isSubmitting ? null : _delete,
style: OutlinedButton.styleFrom(
foregroundColor: Colors.red.shade700,
),
child: const Text('Supprimer'),
),
if (_canDeleteTarget) const SizedBox(width: 8),
TextButton(
onPressed:
_isSubmitting ? null : () => Navigator.of(context).pop(false),
child: const Text('Fermer'),
),
const Spacer(),
ElevatedButton(
style: ValidationModalTheme.primaryElevatedStyle,
onPressed: !_dirty || _isSubmitting ? null : _submit,
child: _isSubmitting
? const SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: Text(_dirty ? 'Sauvegarder' : 'Aucune modification'),
),
],
);
}
Widget _namedField({
required String label,
required TextEditingController controller,
required String requiredLabel,
bool enabled = true,
}) {
return ValidationLabeledField(
label: label,
field: SizedBox(
height: ValidationFormMetrics.fieldHeight,
child: TextFormField(
controller: controller,
enabled: enabled,
textCapitalization: TextCapitalization.words,
textAlignVertical: TextAlignVertical.center,
inputFormatters: const [PersonNameInputFormatter()],
style: ValidationFormMetrics.fieldTextStyle,
decoration: ValidationFieldDecoration.input(),
validator: (!enabled || widget.readOnly)
? null
: (v) => _required(v, requiredLabel),
),
),
);
}
Widget _passwordField() {
return ValidationLabeledField(
label: _isEditMode ? 'Nouveau mot de passe' : 'Mot de passe',
field: SizedBox(
height: ValidationFormMetrics.fieldHeight,
child: TextFormField(
controller: _passwordController,
enabled: _fieldsEnabled,
obscureText: _obscurePassword,
enableSuggestions: false,
autocorrect: false,
autofillHints: _isEditMode
? const <String>[]
: const [AutofillHints.newPassword],
textAlignVertical: TextAlignVertical.center,
style: ValidationFormMetrics.fieldTextStyle,
decoration: ValidationFieldDecoration.input().copyWith(
suffixIcon: widget.readOnly
? null
: ExcludeFocus(
child: IconButton(
focusNode: _passwordToggleFocusNode,
onPressed: !_fieldsEnabled
? null
: () {
setState(() {
_obscurePassword = !_obscurePassword;
});
},
icon: Icon(
_obscurePassword
? Icons.visibility_off
: Icons.visibility,
),
),
),
errorStyle: TextStyle(color: Colors.red.shade700, fontSize: 11),
errorMaxLines: 2,
),
validator: widget.readOnly ? null : _validatePassword,
),
),
);
}
Widget _relaisField() {
final selectedValue = _selectedRelaisId != null &&
_relais.any((relais) => relais.id == _selectedRelaisId)
? _selectedRelaisId
: null;
return ValidationLabeledField(
label: 'Relais principal',
field: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
SizedBox(
height: ValidationFormMetrics.fieldHeight,
child: DropdownButtonFormField<String?>(
isExpanded: true,
value: selectedValue,
decoration: ValidationFieldDecoration.input(),
style: ValidationFormMetrics.fieldTextStyle,
items: [
const DropdownMenuItem<String?>(
value: null,
child: Text('Aucun relais'),
),
..._relais.map(
(relais) => DropdownMenuItem<String?>(
value: relais.id,
child: Text(relais.nom),
),
),
],
onChanged: (_isLoadingRelais || !_fieldsEnabled)
? null
: (value) {
setState(() {
_selectedRelaisId = value;
if (_isEditMode) {
_dirty = _computeDirty();
}
});
},
),
),
if (_isLoadingRelais) ...[
const SizedBox(height: 8),
const LinearProgressIndicator(minHeight: 2),
],
],
),
);
}
@override
Widget build(BuildContext context) {
final nameEnabled =
_fieldsEnabled && !_isLockedAdminIdentity;
return Dialog(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: _modalWidth),
child: Form(
key: _formKey,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(18, 16, 4, 10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 2, right: 10),
child: Icon(
_targetRoleIcon,
size: 22,
color: ValidationModalTheme.primaryActionBackground,
),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_headerTitle(),
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.w700,
),
),
if (_isEditMode) ...[
const SizedBox(height: 4),
Text(
_targetRoleLabel,
style: TextStyle(
fontSize: 13,
color: Colors.grey.shade700,
),
),
],
],
),
),
IconButton(
padding: EdgeInsets.zero,
constraints: const BoxConstraints(
minWidth: 40,
minHeight: 40,
),
icon: const Icon(Icons.close),
onPressed: _isSubmitting
? null
: () => Navigator.of(context).pop(false),
tooltip: 'Fermer',
),
],
),
),
const Divider(height: 1),
Padding(
padding: const EdgeInsets.fromLTRB(20, 16, 20, 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: _namedField(
label: 'Prénom',
controller: _prenomController,
requiredLabel: 'Prénom',
enabled: nameEnabled,
),
),
const SizedBox(width: 12),
Expanded(
child: _namedField(
label: 'Nom',
controller: _nomController,
requiredLabel: 'Nom',
enabled: nameEnabled,
),
),
],
),
SizedBox(height: ValidationFormMetrics.rowGapBelow),
ValidationLabeledField(
label: 'Email',
field: IgnorePointer(
ignoring: !_fieldsEnabled,
child: ValidationEmailField(
controller: _emailController,
hintText: 'ex. nom@domaine.fr',
),
),
),
SizedBox(height: ValidationFormMetrics.rowGapBelow),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(child: _passwordField()),
const SizedBox(width: 12),
Expanded(
child: ValidationLabeledField(
label: 'Téléphone',
field: IgnorePointer(
ignoring: !_fieldsEnabled,
child: ValidationPhoneField(
controller: _telephoneController,
hintText: '06 12 34 56 78',
allowEmpty: _isEditMode,
),
),
),
),
],
),
if (widget.withRelais) ...[
SizedBox(height: ValidationFormMetrics.rowGapBelow),
_relaisField(),
],
],
),
),
const Divider(height: 1),
Padding(
padding: const EdgeInsets.fromLTRB(12, 10, 16, 14),
child: _buildFooter(),
),
],
),
),
),
);
}
}
@@ -74,7 +74,8 @@ try {
date_naissance: '2022-04-20', date_naissance: '2022-04-20',
genre: 'F', genre: 'F',
photo_base64: toDataUri(chloeJpg), photo_base64: toDataUri(chloeJpg),
photo_filename: 'chloe_rousseau.jpg' photo_filename: 'chloe_rousseau.jpg',
grossesse_multiple: false,
}, },
{ {
prenom: 'Hugo', prenom: 'Hugo',
@@ -82,7 +83,8 @@ try {
date_naissance: '2024-03-10', date_naissance: '2024-03-10',
genre: 'H', genre: 'H',
photo_base64: toDataUri(hugoJpg), photo_base64: toDataUri(hugoJpg),
photo_filename: 'hugo_rousseau.jpg' photo_filename: 'hugo_rousseau.jpg',
grossesse_multiple: false,
}, },
], ],
presentation_dossier: presentationDossier, presentation_dossier: presentationDossier,
@@ -40,7 +40,8 @@ const body = {
date_naissance: '2023-04-15', date_naissance: '2023-04-15',
genre: 'H', genre: 'H',
photo_base64: toDataUri(path.join(photosDir, 'lecomte-maxime.png')), photo_base64: toDataUri(path.join(photosDir, 'lecomte-maxime.png')),
photo_filename: 'maxime_lecomte.png' photo_filename: 'maxime_lecomte.png',
grossesse_multiple: false,
}, },
], ],
presentation_dossier: presentationDossier, presentation_dossier: presentationDossier,
@@ -46,7 +46,8 @@ const body = {
date_naissance: '2023-02-15', date_naissance: '2023-02-15',
genre: 'F', genre: 'F',
photo_base64: toDataUri(path.join(photosDir, 'martin-emma.png')), photo_base64: toDataUri(path.join(photosDir, 'martin-emma.png')),
photo_filename: 'emma_martin.png' photo_filename: 'emma_martin.png',
grossesse_multiple: true,
}, },
{ {
prenom: 'Noah', prenom: 'Noah',
@@ -54,7 +55,8 @@ const body = {
date_naissance: '2023-02-15', date_naissance: '2023-02-15',
genre: 'H', genre: 'H',
photo_base64: toDataUri(path.join(photosDir, 'martin-noah.png')), photo_base64: toDataUri(path.join(photosDir, 'martin-noah.png')),
photo_filename: 'noah_martin.png' photo_filename: 'noah_martin.png',
grossesse_multiple: true,
}, },
{ {
prenom: 'Léa', prenom: 'Léa',
@@ -62,7 +64,8 @@ const body = {
date_naissance: '2023-02-15', date_naissance: '2023-02-15',
genre: 'F', genre: 'F',
photo_base64: toDataUri(path.join(photosDir, 'martin-lea.png')), photo_base64: toDataUri(path.join(photosDir, 'martin-lea.png')),
photo_filename: 'lea_martin.png' photo_filename: 'lea_martin.png',
grossesse_multiple: true,
}, },
], ],
presentation_dossier: presentationDossier, presentation_dossier: presentationDossier,