From ad0e7b3e354ac9d6bed0570ff18ada6432be06a8 Mon Sep 17 00:00:00 2001 From: LeoMoulin Date: Sat, 23 Mar 2024 14:08:03 +0100 Subject: [PATCH] =?UTF-8?q?-=20Ajoute=20un=20champ=20year=20dans=20UserCur?= =?UTF-8?q?riculum=20pour=20diff=C3=A9rencier=20les=20anciers=20cursus=20d?= =?UTF-8?q?e=20l'actuel=20pour=20l'=C3=A9tudiant=20-=20Ajoute=20la=20table?= =?UTF-8?q?=20ExemptionsRequest=20-=20Ajoute=20la=20table=20ScholarshipReq?= =?UTF-8?q?uest=20-=20Ajoute=20la=20table=20UninscriptionRequest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Clyde/Services/InscriptionService.java | 2 +- .../Clyde/Tables/ExemptionsRequest.java | 66 +++++++++++++++++++ .../Clyde/Tables/ScholarshipRequest.java | 59 +++++++++++++++++ .../Clyde/Tables/UninscriptionRequest.java | 28 ++++++++ .../herisson/Clyde/Tables/UserCurriculum.java | 13 +++- frontend/src/Apps/AboutStudent.vue | 24 +++++++ 6 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java create mode 100644 frontend/src/Apps/AboutStudent.vue diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java index 311dbf2..48e2717 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java @@ -81,7 +81,7 @@ public class InscriptionService { ); userRepo.save(userFromRequest); - userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()))); + userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()),0)); } inscrRequest.setState(requestState); save(inscrRequest); diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java new file mode 100644 index 0000000..1feacc8 --- /dev/null +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java @@ -0,0 +1,66 @@ +package ovh.herisson.Clyde.Tables; + + +import jakarta.persistence.*; + +@Entity +public class ExemptionsRequest { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int id; + + @ManyToOne + @JoinColumn(name = "Users") + private User user; + + @ManyToOne + @JoinColumn(name = "Course") + private Course course; + private String justifDocument; + + private RequestState state; + + + public ExemptionsRequest(User user, Course course, String justifDocument, RequestState state){ + this.user = user; + this.course = course; + this.justifDocument = justifDocument; + this.state = state; + } + + + public ExemptionsRequest(){} + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public Course getCourse() { + return course; + } + + public void setCourse(Course course) { + this.course = course; + } + + public String getJustifDocument() { + return justifDocument; + } + + public void setJustifDocument(String justifDocument) { + this.justifDocument = justifDocument; + } + + + public RequestState getState() { + return state; + } + + public void setState(RequestState state) { + this.state = state; + } +} diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java new file mode 100644 index 0000000..1182911 --- /dev/null +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java @@ -0,0 +1,59 @@ +package ovh.herisson.Clyde.Tables; + +import jakarta.persistence.*; + +@Entity +public class ScholarshipRequest { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int id; + + @ManyToOne + @JoinColumn(name = "Users") + private User user; + private RequestState state; + private String requestForm; + private int amount; + + + public ScholarshipRequest(User user, RequestState state, String requestForm, int amount){ + this.user = user; + this.state = state; + this.requestForm = requestForm; + this.amount = amount; + } + + public ScholarshipRequest(){} + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public RequestState getState() { + return state; + } + + public void setState(RequestState state) { + this.state = state; + } + + public String getRequestForm() { + return requestForm; + } + + public void setRequestForm(String requestForm) { + this.requestForm = requestForm; + } + + public int getAmount() { + return amount; + } + + public void setAmount(int amount) { + this.amount = amount; + } +} diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java new file mode 100644 index 0000000..d2cbf73 --- /dev/null +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java @@ -0,0 +1,28 @@ +package ovh.herisson.Clyde.Tables; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +@Entity +public class UninscriptionRequest { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int id; + private RequestState state; + + public UninscriptionRequest(RequestState state){ + this.state = state; + } + + public UninscriptionRequest(){} + + public RequestState getState() { + return state; + } + + public void setState(RequestState state) { + this.state = state; + } +} diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCurriculum.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCurriculum.java index f42e588..b79295b 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCurriculum.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCurriculum.java @@ -21,9 +21,12 @@ public class UserCurriculum { @OnDelete(action = OnDeleteAction.CASCADE) private Curriculum curriculum; - public UserCurriculum(User user, Curriculum curriculum){ + private int year; + + public UserCurriculum(User user, Curriculum curriculum, int year){ this.user = user; this.curriculum = curriculum; + this.year = year; } public UserCurriculum() {} @@ -47,4 +50,12 @@ public class UserCurriculum { public void setCurriculum(Curriculum curriculum) { this.curriculum = curriculum; } + + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } } diff --git a/frontend/src/Apps/AboutStudent.vue b/frontend/src/Apps/AboutStudent.vue new file mode 100644 index 0000000..442fd35 --- /dev/null +++ b/frontend/src/Apps/AboutStudent.vue @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file