vuminh224/hackathon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
trochas
2026-01-10 19:55:50 +01:00
parent 62b9231d38 3a74f6b52d
commit b9e67589ed
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
front_end/src/components/object/detailSession.tsx
View File

@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { Activite, Athlete, Session } from "../../classes";
import { Activite, Admin, Athlete, Coach, Session } from "../../classes";
import { dateToString, hoursToString } from "../edt";
import { Modal } from "../Modal";
import CreateActivite from "../createActivite";
@@ -22,6 +22,8 @@ function DetailSession({session,open,setOpen}:Props){
const [loading,setLoading] = useState<boolean>(false);
const [join,setJoin] = useState<boolean>(user instanceof Athlete && user.sessions.includes(session));
//Vérification pour l'ajout et la suppression des activités
const canEdit = user instanceof Admin || user instanceof Coach;
const sDate = session.creneau;
function handleDeleteActivite(activite:Activite): void {
@@ -108,11 +110,15 @@ function DetailSession({session,open,setOpen}:Props){
{activites.map((activite,index)=>(
<div>
{activite.nom}
<button className="deleteButton" onClick={() => handleDeleteActivite(activite)}>x</button>
</div>
{canEdit && (
<button className="deleteButton" onClick={() => handleDeleteActivite(activite)}>x</button>
)}
</div>
))}
<button className="addButton" onClick={() => handleAddActivite()}>+</button>
{loading && <div className='top_left_loading'><Loading/></div>}
{canEdit && (
<button className="addButton" onClick={() => handleAddActivite()}>+</button>
)}
{loading && <div className='top_left_loading'><Loading/></div>}
</div>
</div>

12
front_end/src/components/object/user.tsx
View File

@@ -21,7 +21,15 @@ function ObjectUser({user}:Props){
const [open, setOpen] = useState<boolean>(false);
const [open2, setOpen2] = useState<boolean>(false);
const [loading,setLoading] = useState<boolean>(false);
const [sessions,setSessions] = useState<Session[]>([]);
// Initialisation sécurisée des sessions
function getInitialSessions(): Session[] {
if (user instanceof Athlete || user instanceof Coach) return [...(user.sessions || [])];
return [];
}
const [sessions, setSessions] = useState<Session[]>(getInitialSessions());
@@ -87,7 +95,7 @@ function ObjectUser({user}:Props){
return(
<div>
<div className="object" onClick={() => handleOpen()}>
<div>{user.nom}</div>
<div>{user.prenom} {user.nom}</div>
{/* <div>{user2.role}</div> */}
</div>