diff --git a/front_end/src/classes.tsx b/front_end/src/classes.tsx index a22ad88..a7aa095 100644 --- a/front_end/src/classes.tsx +++ b/front_end/src/classes.tsx @@ -106,6 +106,7 @@ export function getUserTest():User{ s1.name = "Entrainement Frisbee" s1.isRecurrent = true; s1.ligne = [ligne1]; + s1.duree= 90; var date2 = new Date(); date2.setDate(date2.getDate() + 2); s2.creneau = date2; @@ -113,11 +114,13 @@ export function getUserTest():User{ s2.isRecurrent = false; s2.name = "entraintement 2" s2.ligne = [ligne2]; + s2.duree= 120; s3.creneau = date2; s3.id = 3; s3.isRecurrent = false; s3.name = "entraintement 3" - s3.ligne = [ligne3]; + s3.ligne = [ligne3, ligne1]; + s3.duree= 120; diff --git a/front_end/src/components/ressourceList.tsx b/front_end/src/components/ressourceList.tsx index b21912a..0eca026 100644 --- a/front_end/src/components/ressourceList.tsx +++ b/front_end/src/components/ressourceList.tsx @@ -1,10 +1,12 @@ import { Athlete, Activite, Coach, Session, Ligne } from "../classes"; +import {calculTempsDeJeuParLigne} from "../utils/ligneUtils"; + type AthleteListProps = { athletes: Athlete[] }; type ActiviteListProps = { activites: Activite[] }; type CoachListProps = { coachs: Coach[] }; type SessionListProps = { sessions: Session[]}; -type LigneListProps = { lignes: Ligne[]}; +type LigneListProps = { lignes: Ligne[], tempsDeJeuParLigne: Map }; function AthleteList({ athletes }: AthleteListProps) { return ( @@ -81,7 +83,7 @@ function SessionList({ sessions }: SessionListProps) { ); } -function LigneList({ lignes }: LigneListProps) { +function LigneList({ lignes, tempsDeJeuParLigne }: LigneListProps) { return (