diff --git a/frontend/assets/images/cartes/icon_carte_maladie.png b/frontend/assets/images/cartes/icon_carte_maladie.png deleted file mode 100644 index b065eaa..0000000 Binary files a/frontend/assets/images/cartes/icon_carte_maladie.png and /dev/null differ diff --git a/frontend/assets/images/thermo_croix.png b/frontend/assets/images/thermo_croix.png new file mode 100644 index 0000000..3b9b760 Binary files /dev/null and b/frontend/assets/images/thermo_croix.png differ diff --git a/frontend/lib/models/carte_bulle.dart b/frontend/lib/models/carte_bulle.dart index c2fa7db..c4ab82d 100644 --- a/frontend/lib/models/carte_bulle.dart +++ b/frontend/lib/models/carte_bulle.dart @@ -111,7 +111,7 @@ class CarteBulle { case 'conge_am': return 'assets/images/valise.png'; case 'arret_maladie_am': - return 'assets/images/cartes/icon_carte_maladie.png'; + return 'assets/images/thermo_croix.png'; case 'absence_enfant': case 'absence_enfant_modif': return 'assets/images/sac_lapin.png'; diff --git a/frontend/lib/widgets/quotidien/cartes_feed.dart b/frontend/lib/widgets/quotidien/cartes_feed.dart index 72ca59e..7cfe7ff 100644 --- a/frontend/lib/widgets/quotidien/cartes_feed.dart +++ b/frontend/lib/widgets/quotidien/cartes_feed.dart @@ -590,13 +590,13 @@ class _BulleTile extends StatelessWidget { ], ), ], - if (card.statut == CarteStatut.refusee) ...[ + if (card.isCongeAm && + card.statut == CarteStatut.refusee && + card.lastRefuseComment != null && + card.lastRefuseComment!.trim().isNotEmpty) ...[ const SizedBox(height: 8), Text( - card.lastRefuseComment != null && - card.lastRefuseComment!.trim().isNotEmpty - ? 'Refusé — ${card.lastRefuseComment}' - : 'Refusé', + 'Motif : ${card.lastRefuseComment}', maxLines: 2, overflow: TextOverflow.ellipsis, style: GoogleFonts.merriweather( @@ -605,7 +605,8 @@ class _BulleTile extends StatelessWidget { color: encre.ink, ), ), - ] else if (card.statut == CarteStatut.ouverte && + ] else if (card.isCongeAm && + card.statut == CarteStatut.ouverte && card.isCreator) ...[ const SizedBox(height: 8), Text( @@ -667,13 +668,15 @@ class _BulleTile extends StatelessWidget { ), ], ) - else if (card.statut == CarteStatut.traitee || - card.statut == CarteStatut.refusee) + else if (card.isCongeAm && + (card.statut == CarteStatut.traitee || + card.statut == CarteStatut.refusee)) Expanded( child: Text( + // Accordé à « Demande de congés ». card.statut == CarteStatut.refusee - ? 'Refusé' - : 'Validé', + ? 'Refusée' + : 'Validée', textAlign: TextAlign.center, style: GoogleFonts.merienda( fontSize: 14, @@ -684,8 +687,9 @@ class _BulleTile extends StatelessWidget { ), ), if (card.peutRepondre) const SizedBox(width: 8), - if (!(card.statut == CarteStatut.traitee || - card.statut == CarteStatut.refusee)) + if (!(card.isCongeAm && + (card.statut == CarteStatut.traitee || + card.statut == CarteStatut.refusee))) const Spacer(), InkWell( onTap: () {