diff --git a/front_end/src/classes.tsx b/front_end/src/classes.tsx index 180072e..4021ee2 100644 --- a/front_end/src/classes.tsx +++ b/front_end/src/classes.tsx @@ -52,14 +52,17 @@ export function getUserTest():User{ s1.creneau = new Date(); s1.id = 1; s1.name = "Entrainement Frisbee" + s1.isRecurrent = true; var date2 = new Date(); date2.setDate(date2.getDate() + 2); s2.creneau = date2; s2.id = 2; - s2.name = "entraintement2" + s2.isRecurrent = false; + s2.name = "entraintement 2" s3.creneau = date2; s3.id = 3; - s3.name = "entraintement3" + s3.isRecurrent = false; + s3.name = "entraintement 3" const athlete1 = new Athlete(); athlete1.id = 1; diff --git a/front_end/src/components/edt.tsx b/front_end/src/components/edt.tsx index ddda902..e429ae9 100644 --- a/front_end/src/components/edt.tsx +++ b/front_end/src/components/edt.tsx @@ -42,7 +42,10 @@ export const EDT =() =>{ var newWeek: Session[] = [] user.sessions.forEach(session => { - if(session.creneau >= date && session.creneau <= maxDate){ + if( session.isRecurrent ){ + newWeek.push(session); + } + if(session.creneau >= date && session.creneau <= maxDate && !session.isRecurrent){ newWeek.push(session); } });