merge
This commit is contained in:
@@ -1,23 +1,30 @@
|
||||
export type Groupe = "Entrainement" | "Competition" | "Loisir"| "";
|
||||
export type Role = "Admin" | "Athlete" | "Coach";
|
||||
|
||||
export class User{
|
||||
id!: number;
|
||||
nom!: String;
|
||||
sessions: Session[] = []; //nb: Admin liaison non symétrique /!\
|
||||
email!: String;
|
||||
role!: Role;
|
||||
}
|
||||
|
||||
export class Admin extends User{
|
||||
role!: Role;
|
||||
|
||||
}
|
||||
|
||||
export class Athlete extends User{
|
||||
nom!: String;
|
||||
groupe!: Groupe;
|
||||
role!: Role;
|
||||
|
||||
|
||||
}
|
||||
|
||||
export class Coach extends User{
|
||||
nom!: String;
|
||||
role!: Role;
|
||||
|
||||
}
|
||||
|
||||
@@ -50,6 +57,7 @@ export function getUserTest():User{
|
||||
const s3 = new Session();
|
||||
user.id = 0;
|
||||
user.nom = "Emilien-Yee NootNoot";
|
||||
user.role = "Coach"
|
||||
s1.creneau = new Date();
|
||||
s1.id = 1;
|
||||
s1.name = "Entrainement Frisbee"
|
||||
@@ -145,5 +153,10 @@ export function getUserTest():User{
|
||||
user.sessions.push(s1);
|
||||
user.sessions.push(s2);
|
||||
user.sessions.push(s3);
|
||||
|
||||
athlete1.role = "Athlete";
|
||||
athlete2.role = "Athlete";
|
||||
athlete3.role = "Athlete";
|
||||
|
||||
return user;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ export const CreateSession = () => {
|
||||
const [activiteDuree, setActiviteDuree] = useState(0);
|
||||
const [isRecurent, setIsRecurent] = useState(false);
|
||||
|
||||
function addAcitivte(){
|
||||
async function addAcitivte(){
|
||||
if (!activiteNom) return;
|
||||
|
||||
const newActivite = new Activite();
|
||||
@@ -23,11 +23,18 @@ export const CreateSession = () => {
|
||||
newActivite.theme=activiteTheme;
|
||||
newActivite.duree= activiteDuree;
|
||||
newActivite.data= new Map<string,string>();
|
||||
setActivities([...activities, newActivite]);
|
||||
try{
|
||||
await sessionService.create(newActivite);
|
||||
console.log("Session créée");
|
||||
|
||||
setActiviteNom("");
|
||||
setActiviteTheme("");
|
||||
setActiviteDuree(0);
|
||||
setActivities([...activities, newActivite]);
|
||||
|
||||
setActiviteNom("");
|
||||
setActiviteTheme("");
|
||||
setActiviteDuree(0);
|
||||
} catch (error) {
|
||||
console.error("Erreur lors de la création de la session", error);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleCreateSession() {
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import { Athlete, Activite } from "../classes";
|
||||
import { Athlete, Activite, Coach, Session } from "../classes";
|
||||
|
||||
type Props = {
|
||||
athletes: Athlete[];
|
||||
activites: Activite[];
|
||||
type AthleteListProps = { athletes: Athlete[] };
|
||||
type ActiviteListProps = { activites: Activite[] };
|
||||
type CoachListProps = { coachs: Coach[] };
|
||||
type SessionListProps = { sessions: Session[]};
|
||||
|
||||
};
|
||||
|
||||
function AthleteList({ athletes }: Props) {
|
||||
function AthleteList({ athletes }: AthleteListProps) {
|
||||
return (
|
||||
<ul className="AthleteList">
|
||||
{athletes.map((athlete) => (
|
||||
@@ -19,7 +18,7 @@ function AthleteList({ athletes }: Props) {
|
||||
);
|
||||
}
|
||||
|
||||
function ActiviteList({ activites }: Props) {
|
||||
function ActiviteList({ activites }: ActiviteListProps) {
|
||||
return (
|
||||
<ul className="ActiviteList">
|
||||
{activites.map((activite) => (
|
||||
@@ -39,4 +38,43 @@ function ActiviteList({ activites }: Props) {
|
||||
);
|
||||
}
|
||||
|
||||
export { AthleteList, ActiviteList };
|
||||
function CoachList({ coachs }: CoachListProps) {
|
||||
return (
|
||||
<ul className="CoachList">
|
||||
{coachs.map((coachs) => (
|
||||
<li key={coachs.id}>
|
||||
<div>
|
||||
<strong>Nom:</strong> {coachs.nom}
|
||||
</div>
|
||||
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
);
|
||||
}
|
||||
|
||||
function SessionList({ sessions }: SessionListProps) {
|
||||
return (
|
||||
<ul className="SessionList">
|
||||
{sessions.map((sessions) => (
|
||||
<li key={sessions.id}>
|
||||
<div>
|
||||
<strong>Nom:</strong> {sessions.name}
|
||||
</div>
|
||||
<div>
|
||||
<strong>Groupe:</strong> {sessions.groupe}
|
||||
</div>
|
||||
<div>
|
||||
<strong>Recurrent:</strong> {sessions.isRecurrent ? "Oui" : "Non"}
|
||||
</div>
|
||||
<div>
|
||||
<strong>Coach:</strong> {sessions.coach ? sessions.coach.nom : "Pas de coach sur la séance"}
|
||||
</div>
|
||||
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
);
|
||||
}
|
||||
|
||||
export { AthleteList, ActiviteList, CoachList , SessionList };
|
||||
@@ -1,13 +1,16 @@
|
||||
import { useState } from "react";
|
||||
import { useLocalData } from "../context/useLocalData";
|
||||
import { AthleteList, ActiviteList } from "./ressourceList";
|
||||
import { Activite, Athlete } from "../classes";
|
||||
// import { Dropdown } from "react-bootstrap"; // not used
|
||||
import { AthleteList, ActiviteList, CoachList, SessionList} from "./ressourceList";
|
||||
import { Activite, Athlete, Coach , Session } from "../classes";
|
||||
|
||||
export default function RessourcePanel() {
|
||||
const { user } = useLocalData();
|
||||
const [showAthletes, setShowAthletes] = useState(false);
|
||||
const [showActivites, setShowActivites] = useState(false);
|
||||
const [showCoachs,setShowCoachs] = useState(false);
|
||||
const [showSessions, setShowSessions] = useState(false);
|
||||
console.log("Rôle utilisateur:", user.role);
|
||||
if (user.role === "Athlete") return null;
|
||||
|
||||
|
||||
const athleteMap: Map<number, Athlete> = new Map();
|
||||
@@ -22,13 +25,51 @@ export default function RessourcePanel() {
|
||||
});
|
||||
const allActivites: Activite[] = Array.from(activiteMap.values());
|
||||
|
||||
const coachMap: Map<number, Coach> = new Map();
|
||||
user.sessions.forEach(session => {
|
||||
if (session.coach) {
|
||||
coachMap.set(session.coach.id, session.coach);
|
||||
}
|
||||
});
|
||||
|
||||
const allCoachs: Coach[] = Array.from(coachMap.values());
|
||||
|
||||
const sessionMap: Map<number, Session> = new Map();
|
||||
user.sessions.forEach(session => {
|
||||
sessionMap.set(session.id, session);
|
||||
});
|
||||
|
||||
const allSessions: Session[] = Array.from(sessionMap.values());
|
||||
|
||||
function onAthletesClick(): void {
|
||||
setShowAthletes(prev => !prev);
|
||||
setShowActivites(false);
|
||||
setShowCoachs(false);
|
||||
setShowSessions(false);
|
||||
|
||||
}
|
||||
function onActivitiesClick(): void {
|
||||
setShowActivites(prev => !prev);
|
||||
setShowAthletes(false);
|
||||
setShowCoachs(false);
|
||||
setShowSessions(false);
|
||||
|
||||
|
||||
}
|
||||
function onCoachClick(): void {
|
||||
setShowCoachs(prev => !prev);
|
||||
setShowActivites(false);
|
||||
setShowAthletes(false);
|
||||
setShowSessions(false);
|
||||
|
||||
}
|
||||
|
||||
function onSessionClick(): void {
|
||||
setShowSessions(prev => !prev);
|
||||
setShowActivites(false);
|
||||
setShowAthletes(false);
|
||||
setShowCoachs(false);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -39,28 +80,46 @@ export default function RessourcePanel() {
|
||||
const v = (e.target as HTMLSelectElement).value;
|
||||
if (v === "athletes") onAthletesClick();
|
||||
else if (v === "activites") onActivitiesClick();
|
||||
else {setShowAthletes(false); setShowActivites(false);
|
||||
}
|
||||
else if (v === "coach") onCoachClick();
|
||||
else if (v === "session") onSessionClick();
|
||||
else {setShowAthletes(false); setShowActivites(false); setShowCoachs(false); setShowSessions(false)}
|
||||
}}>
|
||||
<option>Choissisez la ressource</option>
|
||||
<option value="athletes">Athlètes</option>
|
||||
<option value="activites">Activités</option>
|
||||
{user.role === "Admin" && <option value="coach"> Coach</option>}
|
||||
<option value="session"> Session</option>
|
||||
</select>
|
||||
|
||||
{showAthletes && (
|
||||
<div className="edt_athletes_panel">
|
||||
<h3>Liste des athlètes</h3>
|
||||
<AthleteList athletes={allAthletes} activites={[]}/>
|
||||
<AthleteList athletes={allAthletes} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{showActivites && (
|
||||
<div className="edt_activites_panel">
|
||||
<h3>Liste des activités</h3>
|
||||
<ActiviteList athletes={[]} activites={allActivites} />
|
||||
<ActiviteList activites={allActivites} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{showCoachs && (
|
||||
<div className="edt_coachs_panel">
|
||||
<h3>Liste des coachs</h3>
|
||||
<CoachList coachs={allCoachs} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{showSessions && (
|
||||
<div className="edt_sessions_panel">
|
||||
<h3>Liste des sessions</h3>
|
||||
<SessionList sessions={allSessions} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
20
front_end/src/components/test_app.tsx
Normal file
20
front_end/src/components/test_app.tsx
Normal file
@@ -0,0 +1,20 @@
|
||||
import React, { useState } from "react";
|
||||
import { getUserTest, User, Session } from "../classes";
|
||||
import RessourcePanel from "./ressourcePanel";
|
||||
import { LocalDataContext } from "../context/LocalDataContext";
|
||||
|
||||
export default function TestApp() {
|
||||
const initialUser = getUserTest();
|
||||
initialUser.role = "Athlete"; // Change role here for testing
|
||||
const [user, setUser] = useState<User>(initialUser);
|
||||
const [sessions, setSessions] = useState<Session[]>(initialUser.sessions || []);
|
||||
const [users, setUsers] = useState<User[]>([initialUser]);
|
||||
|
||||
return (
|
||||
<LocalDataContext.Provider value={{ user, setUser, sessions, setSessions, users, setUsers }}>
|
||||
<h1>Test Utilisateur</h1>
|
||||
<div>Nom: {String(user.nom)}</div>
|
||||
<RessourcePanel />
|
||||
</LocalDataContext.Provider>
|
||||
);
|
||||
}
|
||||
@@ -149,7 +149,7 @@ export async function getSessionsAPI(): Promise<Session[]> {
|
||||
}
|
||||
export async function getUsersAPI(): Promise<User[]> {
|
||||
try {
|
||||
const response = await api.get<User[]>("/users");
|
||||
const response = await api.get<User[]>("/coach/all");
|
||||
return response.data;
|
||||
} catch (error) {
|
||||
console.error("Error fetching users:", error);
|
||||
|
||||
Reference in New Issue
Block a user