contructeur classes, type DTO dans TS, clean hard code

This commit is contained in:
trochas
2026-01-08 15:42:11 +01:00
parent 78b82fcfee
commit f2a0f8ca86
7 changed files with 207 additions and 97 deletions

View File

@@ -1,42 +1,51 @@
import { useKeycloak } from '@react-keycloak/web'
import { useEffect } from 'react';
import { getUserTest, User } from '../classes';
import { Athlete, User } from '../classes';
import { useLocalData } from '../context/useLocalData';
import { postAthlete } from '../requetes';
export const Login =() =>{
const {user,setUser} = useLocalData()
const { keycloak } = useKeycloak();
useEffect(() => {
const syncAndLoadUser = async () => {
if (keycloak.authenticated && keycloak.token) {
const tokenParsed = keycloak.tokenParsed;
setUser({
id: 0,
keycloakId: tokenParsed!.sub!,
email: tokenParsed?.email || "",
nom: tokenParsed?.family_name || "",
prenom: tokenParsed?.given_name || "",
role: "athlete",
sessions: []
});
try {
const response = await fetch("http://localhost:8081/api/users/sync", {
method: "POST",
headers: {
"Authorization": `Bearer ${keycloak.token}`,
"Content-Type": "application/json"
},
});
console.log("Sync status:", response.status);
} catch (error) {
console.error("Sync fetch failed:", error);
}
}
};
const syncAndLoadUser = async () => {
const newAthlete:Athlete = new Athlete()
syncAndLoadUser();
}, [keycloak.authenticated, keycloak.token, setUser]);
const athlete:Athlete = await postAthlete(newAthlete)
setUser(athlete);
/*postAthlete
if (keycloak.authenticated && keycloak.token) {
const tokenParsed = keycloak.tokenParsed;
setUser(
{
id: 0,
keycloakId: tokenParsed!.sub!,
email: tokenParsed?.email || "",
nom: tokenParsed?.family_name || "",
prenom: tokenParsed?.given_name || "",
sessions: []
}
);
try {
const response = await fetch("http://localhost:8081/api/users/sync", {
method: "POST",
headers: {
"Authorization": `Bearer ${keycloak.token}`,
"Content-Type": "application/json"
},
});
console.log("Sync status:", response.status);
} catch (error) {
console.error("Sync fetch failed:", error);
}
}*/
};
syncAndLoadUser();
}, [keycloak.authenticated, keycloak.token, setUser]);
function handleLogin(): void {
@@ -61,9 +70,6 @@ export const Login =() =>{
<div>
User nom : { user.nom}
</div>
<div>
User role : { user.role}
</div>
</div>
}

View File

@@ -101,20 +101,18 @@ function ObjectUser({admin=null,athlete=null,coach=null}:Props){
return(
<div>
<div className="object" onClick={() => handleOpen()}>
<div>{user2.nom} ({user2.role})</div>
<div>{user2.nom}</div>
{/* <div>{user2.role}</div> */}
</div>
{open &&
<Modal isOpen={open} onClose={() => setOpen(false)}>
<div className="object_modal">
<div>{user2.nom} ({user2.role})</div>
<div>{user2.nom}</div>
<div>{user2.email}</div>
<div className='list_object'>
<div>Sessions :</div>
{user.sessions.map((session,index)=>(
<ObjectSession session={session}/>
))}
{/* TODO */}
</div>
</div>

View File

@@ -72,7 +72,7 @@ function AthleteList({ athletes, sessions }: AthleteListProps) {
return (
<li key={a.id}>
<div><strong>Nom:</strong> {a.nom}</div>
<div><strong>Groupe:</strong> {a.groupe}</div>
<div><strong>Groupe:</strong> {a.groupes}</div>
<div><strong>Nombre de sessions:</strong> {stats.nbSessions}</div>
<div><strong>Sessions/semaine:</strong> {stats.nbSessionsPerWeek.toFixed(2)}</div>
<div><strong>Alerte:</strong> {alerte}</div>

View File

@@ -1,6 +1,6 @@
import { useState } from "react";
import { useLocalData } from "../context/useLocalData";
import { Activite, Athlete, Coach , Session, Ligne, getUserTest } from "../classes";
import { Activite, Athlete, Coach , Session, Ligne, Admin } from "../classes";
import {calculTempsDeJeuParLigne} from "../utils/ligneUtils";
import { keyboard } from "@testing-library/user-event/dist/keyboard";
import ObjectSession from "./object/session";
@@ -10,14 +10,11 @@ import ObjectUser from "./object/user";
export type keyWord = "athletes" | "activites" | "coachs" | "sessions"| "lignes";
export default function RessourcePanel() {
//const { user } = useLocalData();
const user = getUserTest(); //TODO
const { user } = useLocalData();
//const user = getUserTest(); //TODO
const [value,setValue] = useState<keyWord>("athletes");
console.log("Rôle utilisateur:", user.role);
console.log(user.nom);
console.log(user.prenom);
console.log(user.email);
if (user.role === "athlete") return null;
if (user instanceof Athlete) return null;
const allAthletes: Athlete[] = [];
@@ -28,26 +25,8 @@ import ObjectUser from "./object/user";
const allSessions: Session[] = [];
const ligneMap: Map<number, Ligne> = new Map();
user.sessions.forEach(session => {
if (session.ligne) {
const allLignes: Ligne[] = [];
session.ligne.forEach(ligne => {
ligneMap.set(ligne.id, ligne);
});
}
});
const allLignes: Ligne[] = Array.from(ligneMap.values());
// Calculer le temps de jeu pour chaque ligne
const tempsDeJeuParLigne: Map<number, number> = new Map();
allLignes.forEach(ligne => {
const tempsTotal = calculTempsDeJeuParLigne(allSessions, ligne);
tempsDeJeuParLigne.set(ligne.id, tempsTotal);
ligne.tempsDeJeu = tempsTotal;
});
@@ -63,7 +42,7 @@ import ObjectUser from "./object/user";
}}>
<option value="athletes">Athlètes</option>
<option value="activites">Activités</option>
{user.role === "admin" && <option value="coachs"> Coachs</option>}
{user instanceof Admin && <option value="coachs"> Coachs</option>}
<option value="sessions"> Sessions</option>
<option value="lignes"> Lignes</option>