diff --git a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Admin.java b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Admin.java index 6870a17..0c64f03 100644 --- a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Admin.java +++ b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Admin.java @@ -1,8 +1,5 @@ package hackathon.FrisbYEE.jpa.metier; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.OneToOne; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Athlete.java b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Athlete.java index 475dcdf..36a38f0 100644 --- a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Athlete.java +++ b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Athlete.java @@ -1,11 +1,10 @@ package hackathon.FrisbYEE.jpa.metier; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; -import jakarta.persistence.OneToOne; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; + import java.util.ArrayList; import java.util.List; import jakarta.persistence.Access; @@ -14,7 +13,7 @@ import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; @Entity -@Data @NoArgsConstructor +@Getter @Setter @NoArgsConstructor @Access(AccessType.FIELD) public class Athlete extends User{ diff --git a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Coach.java b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Coach.java index b209d7f..9b619dc 100644 --- a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Coach.java +++ b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/Coach.java @@ -1,9 +1,6 @@ package hackathon.FrisbYEE.jpa.metier; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import jakarta.persistence.OneToOne; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/User.java b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/User.java index c31aeb1..188bd09 100644 --- a/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/User.java +++ b/back_end/src/main/java/hackathon/FrisbYEE/jpa/metier/User.java @@ -2,7 +2,6 @@ package hackathon.FrisbYEE.jpa.metier; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import lombok.Getter; import lombok.NoArgsConstructor; @@ -14,7 +13,6 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import jakarta.persistence.CascadeType; @Entity @Getter diff --git a/front_end/src/classes.tsx b/front_end/src/classes.tsx index 365dda1..cf5c7e6 100644 --- a/front_end/src/classes.tsx +++ b/front_end/src/classes.tsx @@ -107,6 +107,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; @@ -114,11 +115,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 (