diff --git a/frontend/lib/utils/enfant_status_utils.dart b/frontend/lib/utils/enfant_status_utils.dart index 9ea84b5..deb5f03 100644 --- a/frontend/lib/utils/enfant_status_utils.dart +++ b/frontend/lib/utils/enfant_status_utils.dart @@ -14,10 +14,10 @@ String normalizeEnfantStatus(String? raw) { return s; } -String _scolariseAccordeAuGenre(String? gender) { +String _accordeAuGenre(String masculin, String feminin, String? gender) { final g = (gender ?? '').trim().toUpperCase(); - if (g == 'F') return 'Scolarisée'; - return 'Scolarisé'; + if (g == 'F') return feminin; + return masculin; } /// Libellé affiché pour un statut enfant. @@ -28,9 +28,9 @@ String enfantStatusLabel(String? status, {String? gender}) { case 'sans_garde': return 'Sans garde'; case 'garde': - return 'En garde'; + return _accordeAuGenre('Gardé', 'Gardée', gender); case 'scolarise': - return _scolariseAccordeAuGenre(gender); + return _accordeAuGenre('Scolarisé', 'Scolarisée', gender); default: return status?.trim().isNotEmpty == true ? status!.trim() : '–'; } diff --git a/frontend/lib/widgets/admin/common/admin_child_detail_modal.dart b/frontend/lib/widgets/admin/common/admin_child_detail_modal.dart index 70b36a3..baf4c0e 100644 --- a/frontend/lib/widgets/admin/common/admin_child_detail_modal.dart +++ b/frontend/lib/widgets/admin/common/admin_child_detail_modal.dart @@ -668,7 +668,7 @@ class _AdminChildDetailModalState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - 'Scolarisé', + enfantStatusLabel('scolarise', gender: _gender), style: TextStyle( fontSize: 16, fontWeight: FontWeight.w700, diff --git a/frontend/lib/widgets/admin/user_management_panel.dart b/frontend/lib/widgets/admin/user_management_panel.dart index 9de03bc..d272864 100644 --- a/frontend/lib/widgets/admin/user_management_panel.dart +++ b/frontend/lib/widgets/admin/user_management_panel.dart @@ -215,7 +215,7 @@ class _UserManagementPanelState extends State { value: 'garde', child: Padding( padding: EdgeInsets.only(left: 10), - child: Text('En garde', style: TextStyle(fontSize: 12)), + child: Text('Gardé', style: TextStyle(fontSize: 12)), ), ), DropdownMenuItem(