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 @@
+
+
+
+
+
Coucou
+
+
+
+
\ No newline at end of file