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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
tuanvu
2026-01-09 14:50:30 +01:00
parent b806446763 5ce2fe71a5
commit 6156df6fef
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,22 +146,7 @@ public class SessionResource {
session.setCreneau(dto.getCreneau()); session.setCreneau(dto.getCreneau());
session.setDuree(dto.getDuree()); session.setDuree(dto.getDuree());
session.setGroupe(dto.getGroupe()); session.setGroupe(dto.getGroupe());
// Coach
if (dto.getCoachId() != null) {
Coach coach = new Coach();
coach.setId(dto.getCoachId());
session.setCoach(coach);
}
// Athletes
if (dto.getAthleteIds() != null) {
List<Athlete> athletes = athleteDAO.findAllById(dto.getAthleteIds());
session.setAthletes(athletes);
}
// Activites
if (dto.getActiviteIds() != null) {
List<Activite> activites = activiteDAO.findAllById(dto.getActiviteIds());
session.setActivites(activites);
}
return session; return session;
} }
} }

1
front_end/src/components/createSession.tsx
View File

@@ -35,6 +35,7 @@ export const CreateSession = () => {
async function handleCreateSession() { async function handleCreateSession() {
if(user instanceof Coach){ if(user instanceof Coach){
session.name = name;
session.groupe = groupe; session.groupe = groupe;
session.creneau = creneau; session.creneau = creneau;
session.duree = duree; session.duree = duree;

14
front_end/src/requetes.tsx
View File

@@ -22,12 +22,14 @@ export async function loginOrRegister(keycloak:Keycloak): Promise<User|null>{
const roles = keycloak.tokenParsed?.realm_access?.roles const roles = keycloak.tokenParsed?.realm_access?.roles
if(roles!=null){ if(roles!=null){
if(roles.includes("admin")){ if(roles.includes("admin")){
const id = keycloak.tokenParsed?.sub; const newAdmin: Admin = new Admin();
if(id!=null){ newAdmin.keycloakId = keycloak.tokenParsed.sub || "";
const response = await athleteService.create(id); newAdmin.email = keycloak.tokenParsed.email || "";
const admin = new Admin(response.data); newAdmin.nom = keycloak.tokenParsed.family_name || "";
return admin; newAdmin.prenom = keycloak.tokenParsed.given_name || "";
} const response = await athleteService.create(newAdmin.toDTO());
const admin = new Admin(response.data);
return admin;
} }
else if(roles.includes("coach")){ else if(roles.includes("coach")){
const newCoach: Coach = new Coach(); const newCoach: Coach = new Coach();