Merge remote-tracking branch 'origin/main'

front_end/src/components/createSession.tsx

@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { Session, User, Coach, Activite, Groupe } from "../classes";
 import { useLocalData } from "../context/useLocalData";
-import { sessionService } from "../api";
+import { activiteService, sessionService } from "../api";
 
 export const CreateSession = () => {
     const {user} = useLocalData()
@@ -24,7 +24,7 @@ export const CreateSession = () => {
         newActivite.duree= activiteDuree;
         newActivite.data= new Map<string,string>();
         try{
-            await sessionService.create(newActivite);
+            await activiteService.create(newActivite);
             console.log("Session créée");
 
             setActivities([...activities, newActivite]);

front_end/src/components/login.tsx

@@ -59,7 +59,7 @@ export const Login =() =>{
 
 
     function handleLogin(): void {
-        keycloak.login()
+        keycloak.login();
         //TODO setUser
     }
 
@@ -80,6 +80,9 @@ export const Login =() =>{
                 <div>
                     User nom : { user.nom}
                 </div>
+                <div>
+                    User role : { user.role}
+                </div>
             
             </div>
             }

front_end/src/components/ressourceList.tsx

@@ -1,23 +1,82 @@
+import React from "react";
 import { Athlete, Activite, Coach, Session, Ligne } from "../classes";
+import {calculStatsAthlete, niveauAlerte} from "../utils/athleteUtils";
 import {calculTempsDeJeuParLigne} from "../utils/ligneUtils";
 
 
-type AthleteListProps = { athletes: Athlete[] };
+type AthleteListProps = { athletes: Athlete[], sessions: Session[]};
 type ActiviteListProps = { activites: Activite[] };
 type CoachListProps = { coachs: Coach[] };
 type SessionListProps = { sessions: Session[]};
 type LigneListProps = { lignes: Ligne[], tempsDeJeuParLigne: Map<number, number> };
 
-function AthleteList({ athletes }: AthleteListProps) {
+function AthleteList({ athletes, sessions }: AthleteListProps) {
+    const [dateDebut, setDateDebut] = React.useState(new Date());
+    const [dateFin, setDateFin] = React.useState(new Date());
+    const [seuilCritique, setSeuilCritique] = React.useState(0);
+    const [seuilMax, setSeuilMax] = React.useState(0);
+
+    const dateToDatetimeLocal = (date: Date) => {
+        const pad = (n: number) => n.toString().padStart(2, "0");
+        return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}`;
+    };
+
     return (
-        <ul className="AthleteList">
-            {athletes.map((athlete) => (
-                <li key={athlete.id}>
-                    <div><strong>Nom:</strong> {athlete.nom}</div>
-                    <div><strong>Groupe:</strong> {athlete.groupe}</div>
-                </li>
-            ))}
-        </ul>
+        <>
+            <div className="creneau-stats">
+                <label>
+                    Début :
+                    <input
+                        type="datetime-local"
+                        value={dateToDatetimeLocal(dateDebut)}
+                        onChange={e => setDateDebut(new Date(e.target.value))}
+                    />
+                </label>
+
+                <label>
+                    Fin :
+                    <input
+                        type="datetime-local"
+                        value={dateToDatetimeLocal(dateFin)}
+                        onChange={e => setDateFin(new Date(e.target.value))}
+                    />
+                </label>
+                <label>
+                    Seuil critique :
+                    <input
+                        type="number"
+                        value={seuilCritique}
+                        min={1}
+                        onChange={e => setSeuilCritique(Number(e.target.value))}
+                    />
+                </label>
+                <label>Seuil max :
+                    <input
+                        type="number"
+                        value={seuilMax}
+                        min={1}
+                        onChange={e => setSeuilMax(Number(e.target.value))}
+                    />
+                </label>
+            </div>
+
+            <ul className="AthleteList">
+                {athletes.map(a => {
+                    const stats = calculStatsAthlete(sessions, a, dateDebut, dateFin);
+                    const alerte = niveauAlerte(stats, seuilCritique, seuilMax);
+
+                    return (
+                        <li key={a.id}>
+                            <div><strong>Nom:</strong> {a.nom}</div>
+                            <div><strong>Groupe:</strong> {a.groupe}</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>
+                        </li>
+                    );
+                })}
+            </ul>
+        </>
     );
 }
 

front_end/src/components/ressourcePanel.tsx

@@ -91,7 +91,7 @@ import { unescapeLeadingUnderscores } from "typescript";
 		    {value==="athletes" && (
 		        <div className="edt_athletes_panel">
 		            <h3>Liste des athlètes</h3>
-		            <AthleteList athletes={allAthletes} />
+		            <AthleteList athletes={allAthletes} sessions={allSessions} />
 		        </div>
 		    )}