From 3c28db8a2f8c7071257b2f0b814524ee48412749 Mon Sep 17 00:00:00 2001
From: Theo Gautier <theo.gautier@octo.com>
Date: Thu, 14 Dec 2023 14:51:21 +0100
Subject: [PATCH] retours revue

---
 assets/icons/actions/filter.svg             |  2 +-
 components/action/ActionRow.tsx             |  3 ++-
 components/action/FiltresStatutsActions.tsx |  1 +
 components/action/OngletActions.tsx         |  5 +++--
 components/action/TableauActionsJeune.tsx   |  9 +++++++-
 components/action/TagStatutAction.tsx       | 23 +++++++++++++++------
 components/action/propsStatutsActions.ts    |  5 -----
 components/agenda-jeune/AgendaRow.tsx       | 17 ++++++++++++++-
 interfaces/action.ts                        |  1 -
 9 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/assets/icons/actions/filter.svg b/assets/icons/actions/filter.svg
index 23a53cac5..639cb8d84 100644
--- a/assets/icons/actions/filter.svg
+++ b/assets/icons/actions/filter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="inherit"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M11 18h2c.55 0 1-.45 1-1s-.45-1-1-1h-2c-.55 0-1 .45-1 1s.45 1 1 1zM3 7c0 .55.45 1 1 1h16c.55 0 1-.45 1-1s-.45-1-1-1H4c-.55 0-1 .45-1 1zm4 6h10c.55 0 1-.45 1-1s-.45-1-1-1H7c-.55 0-1 .45-1 1s.45 1 1 1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="inherit"><path d="M11 18h2c.6 0 1-.4 1-1s-.4-1-1-1h-2c-.5 0-1 .5-1 1s.5 1 1 1M3 7c0 .6.5 1 1 1h16c.6 0 1-.4 1-1s-.4-1-1-1H4a1 1 0 0 0-1 1m4 6h10c.6 0 1-.4 1-1s-.4-1-1-1H7c-.5 0-1 .5-1 1s.5 1 1 1"/></svg>
diff --git a/components/action/ActionRow.tsx b/components/action/ActionRow.tsx
index 47f042863..29f1b7d7b 100644
--- a/components/action/ActionRow.tsx
+++ b/components/action/ActionRow.tsx
@@ -74,7 +74,8 @@ export default function ActionRow({ action, jeuneId }: ActionRowProps) {
       <TD className='rounded-r-base w-[160px]'>
         <span className='flex items-center justify-between'>
           <TagStatutAction
-            status={actionEstEnRetard ? StatutAction.EnRetard : action.status}
+            status={action.status}
+            actionEstEnRetard={actionEstEnRetard}
           />
           <IconComponent
             name={IconName.ChevronRight}
diff --git a/components/action/FiltresStatutsActions.tsx b/components/action/FiltresStatutsActions.tsx
index fe5257260..e8a750582 100644
--- a/components/action/FiltresStatutsActions.tsx
+++ b/components/action/FiltresStatutsActions.tsx
@@ -61,6 +61,7 @@ export default function FiltresStatutsActions({
         aria-expanded={afficherFiltresStatuts}
         onClick={() => setAfficherFiltresStatuts(!afficherFiltresStatuts)}
         aria-label='Statut - Filtrer les actions'
+        title='Filtrer les actions par statut'
         className='flex items-center p-4 w-full h-full'
       >
         Statut
diff --git a/components/action/OngletActions.tsx b/components/action/OngletActions.tsx
index d2ac6468e..3567886b4 100644
--- a/components/action/OngletActions.tsx
+++ b/components/action/OngletActions.tsx
@@ -114,7 +114,7 @@ export default function OngletActions({
         filtresParEtatsQualification,
         tri
       ).then(({ actions, metadonnees }) => {
-        if (filtresParStatuts.includes(StatutAction.EnRetard))
+        /*if (filtresParStatuts.includes(StatutAction.EnRetard))
           setActionsAffichees(
             actions.filter(
               (action) =>
@@ -122,7 +122,8 @@ export default function OngletActions({
                 action.status === StatutAction.EnCours
             )
           )
-        else setActionsAffichees(actions)
+        else */
+        setActionsAffichees(actions)
 
         setNombrePages(metadonnees.nombrePages)
         setIsLoading(false)
diff --git a/components/action/TableauActionsJeune.tsx b/components/action/TableauActionsJeune.tsx
index c58a4f3ce..29fd9d135 100644
--- a/components/action/TableauActionsJeune.tsx
+++ b/components/action/TableauActionsJeune.tsx
@@ -67,6 +67,12 @@ export default function TableauActionsJeune({
   const headerColumnWithButtonHover = 'rounded-base hover:bg-primary_lighten'
   const columnHeaderButtonStyle = 'flex items-center w-full h-full p-4'
 
+  function getOrdreTriParDate() {
+    return `Trier les actions ordre ${
+      getIsSortedDesc() ? 'antéchronologique' : 'chronologique'
+    }`
+  }
+
   function filtrerActionsParStatuts(statutsSelectionnes: StatutAction[]) {
     setStatutsValides(statutsSelectionnes)
     onFiltres({
@@ -113,7 +119,8 @@ export default function TableauActionsJeune({
               <TH className={headerColumnWithButtonHover} estCliquable={true}>
                 <button
                   onClick={trierParDateEcheance}
-                  aria-label='Date de l’action - trier les actions'
+                  aria-label={`Date de l’action - ${getOrdreTriParDate()}`}
+                  title={getOrdreTriParDate()}
                   className={columnHeaderButtonStyle}
                 >
                   Date de l’action
diff --git a/components/action/TagStatutAction.tsx b/components/action/TagStatutAction.tsx
index 40d548509..f0dd728b1 100644
--- a/components/action/TagStatutAction.tsx
+++ b/components/action/TagStatutAction.tsx
@@ -6,14 +6,25 @@ import { StatutAction } from 'interfaces/action'
 
 interface TagStatutActionProps {
   status: StatutAction
+  actionEstEnRetard: boolean
 }
 
-export default function TagStatutAction({ status }: TagStatutActionProps) {
-  const {
-    label,
-    color,
-    altColor: backgroundColor,
-  } = propsStatutsActions[status]
+export default function TagStatutAction({
+  status,
+  actionEstEnRetard,
+}: TagStatutActionProps) {
+  const { label, color, altColor: backgroundColor } = determineAttributs()
+
+  function determineAttributs() {
+    if (actionEstEnRetard)
+      return {
+        label: 'En retard',
+        color: 'warning',
+        altColor: 'warning_lighten',
+      }
+    return propsStatutsActions[status]
+  }
+
   return (
     <TagStatut
       label={label}
diff --git a/components/action/propsStatutsActions.ts b/components/action/propsStatutsActions.ts
index 536968fa7..ad0b4a658 100644
--- a/components/action/propsStatutsActions.ts
+++ b/components/action/propsStatutsActions.ts
@@ -27,11 +27,6 @@ const propsStatutsActions: {
     color: 'success',
     altColor: 'success_lighten',
   },
-  EnRetard: {
-    label: 'En retard',
-    color: 'warning',
-    altColor: 'warning_lighten',
-  },
 }
 
 export default propsStatutsActions
diff --git a/components/agenda-jeune/AgendaRow.tsx b/components/agenda-jeune/AgendaRow.tsx
index 95a82dc37..5a9adba70 100644
--- a/components/agenda-jeune/AgendaRow.tsx
+++ b/components/agenda-jeune/AgendaRow.tsx
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import React from 'react'
@@ -5,6 +6,7 @@ import React from 'react'
 import TagStatutAction from 'components/action/TagStatutAction'
 import IconComponent, { IconName } from 'components/ui/IconComponent'
 import { TagStatut } from 'components/ui/Indicateurs/Tag'
+import { StatutAction } from 'interfaces/action'
 import { EntreeAgenda } from 'interfaces/agenda'
 import { StructureConseiller } from 'interfaces/conseiller'
 
@@ -44,6 +46,14 @@ export default function AgendaRow({ entree, idBeneficiaire }: AgendaRowProps) {
   }
   const { href, iconName, label } = props[entree.type]
 
+  function determineActionEnRetard() {
+    return (
+      entree.type === 'action' &&
+      entree.statut === StatutAction.EnCours &&
+      entree.date < DateTime.now()
+    )
+  }
+
   return (
     <li className='mt-4 text-base-regular rounded-base shadow-base hover:bg-primary_lighten'>
       <Link
@@ -66,7 +76,12 @@ export default function AgendaRow({ entree, idBeneficiaire }: AgendaRowProps) {
           {entree.typeSession && entree.sousTitre && entree.sousTitre}
         </div>
         <div className='flex justify-end'>
-          {entree.statut && <TagStatutAction status={entree.statut} />}
+          {entree.statut && (
+            <TagStatutAction
+              status={entree.statut}
+              actionEstEnRetard={determineActionEnRetard()}
+            />
+          )}
           {entree.source === StructureConseiller.MILO && (
             <>
               {entree.type === 'session' && entree.typeSession && (
diff --git a/interfaces/action.ts b/interfaces/action.ts
index 35cb52916..64ea4ef6a 100644
--- a/interfaces/action.ts
+++ b/interfaces/action.ts
@@ -38,7 +38,6 @@ export enum StatutAction {
   Terminee = 'Terminee',
   Qualifiee = 'Qualifiee',
   Annulee = 'Annulee',
-  EnRetard = 'EnRetard',
 }
 
 export enum EtatQualificationAction {