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

Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon

Browse Source
This commit is contained in:
trochas
2026-01-09 12:58:37 +01:00
parent 39e8be7427 42134e0db6
commit 2651c34df5
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java
View File

@@ -44,7 +44,8 @@ public class SessionResource {
public ResponseEntity<?> create(@RequestBody SessionDTO dto) { public ResponseEntity<?> create(@RequestBody SessionDTO dto) {
try { try {
Session session = maptoEntity(dto); Session session = maptoEntity(dto);
session.setCoach(coachDAO.findById(dto.getCoachId()).orElse(null)); Coach c = coachDAO.findById(dto.getCoachId()).orElse(null);
session.setCoach(c);
sessionDAO.save(session); sessionDAO.save(session);
return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(session)); return ResponseEntity.status(HttpStatus.CREATED).body(maptoDTO(session));
} catch (Exception ex) { } catch (Exception ex) {

2
docker-compose.yml
View File

@@ -9,6 +9,7 @@ services:
- "8080:8080" - "8080:8080"
volumes: volumes:
- ./keycloak/:/opt/keycloak/data/import/ - ./keycloak/:/opt/keycloak/data/import/
- keycloak_data:/opt/keycloak/data
environment: environment:
KEYCLOAK_ADMIN: admin KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD} KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
@@ -37,5 +38,6 @@ services:
volumes: volumes:
postgres_data: postgres_data:
keycloak_data:
version: "3.9" version: "3.9"

5
front_end/src/components/ressourcePanel.tsx
View File

@@ -4,6 +4,7 @@ import { Activite, Athlete, Coach , Session, Ligne, Admin } from "../classes";
import {calculTempsDeJeuParLigne} from "../utils/ligneUtils"; import {calculTempsDeJeuParLigne} from "../utils/ligneUtils";
import { keyboard } from "@testing-library/user-event/dist/keyboard"; import { keyboard } from "@testing-library/user-event/dist/keyboard";
import ObjectSession from "./object/session"; import ObjectSession from "./object/session";
import ObjectActivite from "./object/activite";
import ObjectUser from "./object/user"; import ObjectUser from "./object/user";
import { getAllSessionsAPI } from "../requetes"; import { getAllSessionsAPI } from "../requetes";
import { useKeycloak } from "@react-keycloak/web"; import { useKeycloak } from "@react-keycloak/web";
@@ -84,8 +85,8 @@ import { useKeycloak } from "@react-keycloak/web";
)) ))
)} )}
{value==="activites" && ( {value==="activites" && (
allSessions.map((session) => ( //TODO allActivites.map((activite) => (
<ObjectSession session={session}/> <ObjectActivite activite={activite}/>
)) ))
)} )}
{value==="coachs" && ( {value==="coachs" && (

5
front_end/src/requetes.tsx
View File

@@ -135,10 +135,9 @@ export async function postActivityAPI(session: Session, activity: Activite){
export async function postAthlete(athlete: Athlete):Promise<Athlete>{ export async function postAthlete(athlete: Athlete):Promise<Athlete>{
try { try {
//const response = await api.post<Athlete>("/athlete/create/",athlete.toDTO); const response = await api.post<Athlete>("/athlete/create/",athlete.toDTO);
const response = await athleteService.create(athlete.toDTO());
console.log(response); console.log(response);
return new Athlete(response.data); return response.data;
} catch (error) { } catch (error) {
console.error("Error fetching coachs:", error); console.error("Error fetching coachs:", error);
throw error; throw error;