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

Merge remote-tracking branch 'refs/remotes/origin/main'

Browse Source
This commit is contained in:
Alexis Leboeuf
2026-01-09 18:54:28 +01:00
parent 8a078410b1 c234dd3f48
commit 8ea47c5ca1
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ public class SessionResource {
@PreAuthorize("hasRole('coach')") @PreAuthorize("hasRole('coach')")
public ResponseEntity<?> create(@RequestBody SessionDTO dto) { public ResponseEntity<?> create(@RequestBody SessionDTO dto) {
try { try {
if(sessionDAO.findById(dto.getId()).isPresent()) { if (sessionDAO.findById(dto.getId()).isPresent()) {
return ResponseEntity.status(HttpStatus.OK).body("Session with ID " + dto.getId() + " already exists."); return ResponseEntity.status(HttpStatus.OK).body("Session with ID " + dto.getId() + " already exists.");
} }
@@ -114,17 +114,34 @@ public class SessionResource {
return ResponseEntity.noContent().build(); return ResponseEntity.noContent().build();
} }
//Commented because not finished @GetMapping("/{id}/activities")
@PreAuthorize("hasRole('coach') or hasRole('athlete')")
public ResponseEntity<?> getActivitiesBySessionId(@PathVariable Integer id) {
try {
Session session = sessionDAO.findById(id).orElseThrow();
List<Activite> activites = session.getActivites();
List<ActiviteDTO> activiteDTOs = new ArrayList<>();
for (Activite activite : activites) {
ActiviteDTO dto = new ActiviteDTO();
dto.setId(activite.getId());
dto.setName(activite.getName());
activiteDTOs.add(dto);
}
return ResponseEntity.ok(activiteDTOs);
} catch (Exception ex) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
}
}
@GetMapping("/{id_session}/activities/add/{id_act}") @GetMapping("/{id_session}/activities/add/{id_act}")
@PreAuthorize("hasRole('coach') or hasRole('admin')") @PreAuthorize("hasRole('coach') or hasRole('admin')")
public ResponseEntity<?> addActivity(@PathVariable Integer id_sess, @PathVariable Integer id_act) { public ResponseEntity<?> addActivity(@PathVariable Integer id_sess, @PathVariable Integer id_act) {
Session s = sessionDAO.findById(id_sess).get(); Session s = sessionDAO.findById(id_sess).get();
if(s.equals(null)){ if (s.equals(null)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Session not found"); return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Session not found");
} }
Activite a = activiteDAO.findById(id_act).get(); Activite a = activiteDAO.findById(id_act).get();
if(a.equals(null)){ if (a.equals(null)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Activite not found"); return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Activite not found");
} }
List<Activite> l = s.getActivites(); List<Activite> l = s.getActivites();
@@ -167,7 +184,7 @@ public class SessionResource {
private Session maptoEntity(SessionDTO dto) { private Session maptoEntity(SessionDTO dto) {
Session session = new Session(); Session session = new Session();
System.out.println("ID "+ session.getId()); System.out.println("ID " + session.getId());
session.setName(dto.getName()); session.setName(dto.getName());
session.setIsRecurrent(dto.getIsRecurrent()); session.setIsRecurrent(dto.getIsRecurrent());
session.setCreneau(dto.getCreneau()); session.setCreneau(dto.getCreneau());

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

@@ -4,17 +4,12 @@ import ObjectSession from "./object/session";
import {calculStatsAthlete, niveauAlerte} from "../utils/athleteUtils"; import {calculStatsAthlete, niveauAlerte} from "../utils/athleteUtils";
import {calculTempsDeJeuParLigne} from "../utils/ligneUtils"; import {calculTempsDeJeuParLigne} from "../utils/ligneUtils";
import ObjectActivite from "./object/activite"; import ObjectActivite from "./object/activite";
type AthleteListProps = { athletes: Athlete[], sessions: Session[]}; type AthleteListProps = { athletes: Athlete[], sessions: Session[]};
type ActiviteListProps = { activites: Activite[] }; type ActiviteListProps = { activites: Activite[] };
type CoachListProps = { coachs: Coach[] }; type CoachListProps = { coachs: Coach[] };
type SessionListProps = { sessions: Session[]}; type SessionListProps = { sessions: Session[]};
type LigneListProps = { lignes: Ligne[], tempsDeJeuParLigne: Map<number, number> }; type LigneListProps = { lignes: Ligne[], tempsDeJeuParLigne: Map<number, number> };
function AthleteList({ athletes, sessions }: AthleteListProps) { function AthleteList({ athletes, sessions }: AthleteListProps) {
const [dateDebut, setDateDebut] = React.useState(new Date()); const [dateDebut, setDateDebut] = React.useState(new Date());
const [dateFin, setDateFin] = React.useState(new Date()); const [dateFin, setDateFin] = React.useState(new Date());