merge

front_end/src/components/object/detailSession.tsx

@@ -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,10 +110,14 @@ function DetailSession({session,open,setOpen}:Props){
                             {activites.map((activite,index)=>(
                                 <div>
                                     {activite.nom}
+                                    {canEdit && (
                                         <button className="deleteButton" onClick={() => handleDeleteActivite(activite)}>x</button>
+                                    )}
                                 </div>
                             ))}
+                            {canEdit && (
                                 <button  className="addButton" onClick={() => handleAddActivite()}>+</button>
+                            )}
                                 {loading && <div className='top_left_loading'><Loading/></div>}
                         </div>
                         

front_end/src/components/object/user.tsx

@@ -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>