From ad0e7b3e354ac9d6bed0570ff18ada6432be06a8 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Sat, 23 Mar 2024 14:08:03 +0100
Subject: [PATCH 01/25] =?UTF-8?q?-=20Ajoute=20un=20champ=20year=20dans=20U?=
 =?UTF-8?q?serCurriculum=20pour=20diff=C3=A9rencier=20les=20anciers=20curs?=
 =?UTF-8?q?us=20de=20l'actuel=20pour=20l'=C3=A9tudiant=20-=20Ajoute=20la?=
 =?UTF-8?q?=20table=20ExemptionsRequest=20-=20Ajoute=20la=20table=20Schola?=
 =?UTF-8?q?rshipRequest=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 @@
+<script setup>
+</script>
+
+<template>
+  <div class="aboutbox">
+    <h1 class="test">Coucou</h1>
+  </div>
+</template>
+
+<style scoped>
+.aboutbox {
+  background-color: rgb(24,24,24);
+  width: 400px;
+  display:flex;
+  justify-content: center;
+  padding: 40px;
+  border-radius: 20px;
+  box-shadow:0 5px 25px #000000;
+}
+
+.test{
+  color: red;
+}
+</style>
\ No newline at end of file

From 67fa630ecfbe0105212a04f8b4f3c8d7b55aacd4 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Sat, 23 Mar 2024 18:04:36 +0100
Subject: [PATCH 02/25] e

---
 frontend/src/Apps/AboutStudent.vue | 84 +++++++++++++++++++++++++-----
 frontend/src/rest/apps.js          |  3 ++
 2 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/frontend/src/Apps/AboutStudent.vue b/frontend/src/Apps/AboutStudent.vue
index 442fd35..aaaeafc 100644
--- a/frontend/src/Apps/AboutStudent.vue
+++ b/frontend/src/Apps/AboutStudent.vue
@@ -1,24 +1,82 @@
 <script setup>
+  import i18n from "@/i18n.js"
+  import {getSelf, getUser} from '../rest/Users.js'
+  import {ref} from "vue";
+
+  const user = await getSelf();
+
+  function getPP(){
+    if(user.value.profilePictureUrl === null){
+      return "/Clyde.png"
+    }
+    return user.profilePictureUrl
+  }
 </script>
 
 <template>
-  <div class="aboutbox">
-    <h1 class="test">Coucou</h1>
+  <div class="body">
+    <div class="container">
+      <div class="profilPic">
+        <img class="subContainter" :src=getPP()>
+      </div>
+      <div class = "globalInfos">
+        <div class="infosContainer">
+          <div>
+            {{user.firstName}} {{user.lastName}}
+          </div>
+          <div>
+            E-mail: {{user.email}}
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
+
 </template>
 
-<style scoped>
-.aboutbox {
-  background-color: rgb(24,24,24);
-  width: 400px;
-  display:flex;
-  justify-content: center;
-  padding: 40px;
-  border-radius: 20px;
-  box-shadow:0 5px 25px #000000;
+
+<style>
+.container{
+
+  display:grid;
+  grid-template-columns:200px 900px;
+  grid-template-rows:200px auto;
+  column-gap:30px;
+  row-gap:45px;
+  grid-template-areas:
+  "profilPic globalInfos"
+  "minfos minfos";
 }
 
-.test{
-  color: red;
+.profilPic{
+  grid-area:profilPic;
+}
+
+.globalInfos {
+  grid-area:globalInfos;
+  align-self :center;
+
+}
+
+.body {
+  width:100%;
+  margin-bottom:10px;
+}
+
+.subContainter{
+  width:100%;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  border:4px solid black;
+}
+
+.infosContainer {
+  padding-bottom:50px;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
 }
 </style>
\ No newline at end of file
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 99cbc10..44fb7c4 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -9,6 +9,7 @@ import Profil from "@/Apps/Profil.vue"
 import Courses from "@/Apps/ManageCourses.vue"
 import Users from "@/Apps/UsersList.vue"
 import Students from "@/Apps/StudentsList.vue"
+import AboutStudent from "@/Apps/AboutStudent.vue";
 
 const apps = {
 		'/login': LoginPage,
@@ -17,6 +18,7 @@ const apps = {
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
 		'/students-list' : Students,
+		'/about-students': AboutStudent
 }
 
 const appsList = {
@@ -28,6 +30,7 @@ const appsList = {
 		'ManageCourses': { path: '#/manage-courses', icon: 'fa-book', text: i18n("app.manage.courses") },
 		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
 		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
+		'AboutStudent':{ path: '#/about-users', icon: 'fa-users', text:i18n("app.aboutStudent")}
 }
 
 const currentPath = ref(window.location.hash)

From eafff6ec2d9c2f605cc414f461e75289fd9add71 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Mon, 25 Mar 2024 09:57:35 +0100
Subject: [PATCH 03/25] =?UTF-8?q?Ajoute=20le=20d=C3=A9tail=20des=20=C3=A9t?=
 =?UTF-8?q?udiants=20(big=20update)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Clyde/EndPoints/CurriculumController.java |  23 +++-
 .../Clyde/EndPoints/MockController.java       |  17 ++-
 .../UserCurriculumRepository.java             |   4 +
 .../Clyde/Services/CurriculumService.java     |   1 -
 .../Clyde/Services/UserCurriculumService.java |  32 +++++-
 frontend/src/Apps/AboutStudent.vue            | 106 ++++++++++++++++--
 frontend/src/Apps/Profil.vue                  |   1 -
 frontend/src/Apps/StudentsList.vue            |  21 +++-
 frontend/src/rest/apps.js                     |   2 -
 frontend/src/rest/curriculum.js               |   4 +
 10 files changed, 188 insertions(+), 23 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index 409e269..bef813a 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -8,7 +8,9 @@ import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.User;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -22,11 +24,14 @@ public class CurriculumController {
     private final UserCurriculumService userCurriculumServ;
     private final CurriculumCourseService curriculumCourseServ;
 
-    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ){
+    private final UserService userServ;
+
+    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ, UserService userServ){
         this.curriculumServ = curriculumServ;
         this.authServ = authServ;
         this.userCurriculumServ = userCurriculumServ;
         this.curriculumCourseServ = curriculumCourseServ;
+        this.userServ = userServ;
     }
 
     @GetMapping("/curriculum/{id}")
@@ -52,6 +57,22 @@ public class CurriculumController {
         return new ResponseEntity<>(curriculumCourseServ.getDepthCurriculum(curriculum),HttpStatus.OK);
     }
 
+
+    //Return the list of all curicullums of an user
+    @GetMapping("/onescurriculum/{userId}")
+    public ResponseEntity<Map<String ,Object>> findOnesCurriculum(@RequestHeader("Authorization") String token, @PathVariable String userId){
+        if (authServ.getUserFromToken(token) == null)
+            return new UnauthorizedResponse<>(null);
+
+        User u = userServ.getUserById(Long.parseLong(userId));
+        HashMap<String,Object> toReturn = userCurriculumServ.findAllCurriculumByStudent(u);
+
+        if (toReturn == null)
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        return new ResponseEntity<>(toReturn,HttpStatus.OK);
+    }
+
     @GetMapping("/curriculums")
     public ResponseEntity<Iterable<Map<String, Object>>> findAllIndDepth(){
         return new ResponseEntity<>(curriculumCourseServ.getAllDepthCurriculum(),HttpStatus.OK);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 0b7a1b4..76414ed 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -3,6 +3,7 @@ package ovh.herisson.Clyde.EndPoints;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
+import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.*;
@@ -26,8 +27,9 @@ public class MockController {
     public final InscriptionService inscriptionService;
     ArrayList<User> mockUsers;
 
+    public final UserCurriculumRepository ucr;
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
@@ -35,6 +37,7 @@ public class MockController {
         this.curriculumService = curriculumService;
         this.courseService = courseService;
         this.inscriptionService = inscriptionService;
+        this.ucr = ucr;
     }
 
     /** Saves an example of each user type by :
@@ -47,15 +50,14 @@ public class MockController {
     public void postMock(){
 
         // user part
-
-
         User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,passwordEncoder.encode("admin"));
         User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
         User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
         User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
         User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
         User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,passwordEncoder.encode("inscriptionService"));
-        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
+        User popo = new User("Smith", "Paul", "paulsmith@gmail.com", "306 rue du poulet", "belgique", new Date(0), null, Role.Student, passwordEncoder.encode("jesuispaulleroi"));
+        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo, popo));
 
         userRepo.saveAll(mockUsers);
 
@@ -64,11 +66,18 @@ public class MockController {
         Curriculum infoBab1 = new Curriculum(1,"info");
         Curriculum chemistryBab1 = new Curriculum(1,"chemistry");
         Curriculum psychologyBab1 = new Curriculum(1,"psychology");
+        Curriculum infoBab2 = new Curriculum(2,"info");
 
         curriculumService.save(infoBab1);
         curriculumService.save(chemistryBab1);
         curriculumService.save(psychologyBab1);
+        curriculumService.save(infoBab2);
 
+        ucr.save(new UserCurriculum(joe, infoBab1, 2022));
+        ucr.save(new UserCurriculum(joe, chemistryBab1, 2023));
+        ucr.save(new UserCurriculum(joe, psychologyBab1, 2020));
+        ucr.save(new UserCurriculum(popo, infoBab1, 2022));
+        ucr.save(new UserCurriculum(popo, infoBab2, 2023));
 
         Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
         Course chemistry1 = new Course(12, "Thermochimie",joke);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/UserCurriculumRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/UserCurriculumRepository.java
index 32f207a..2f1c2a3 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/UserCurriculumRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/UserCurriculumRepository.java
@@ -6,8 +6,12 @@ import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.User;
 import ovh.herisson.Clyde.Tables.UserCurriculum;
 
+import java.util.ArrayList;
+
 public interface UserCurriculumRepository extends CrudRepository<UserCurriculum, Long> {
 
     @Query("select uc.curriculum from UserCurriculum uc where uc.user = ?1")
     Curriculum findByUser(User student);
+
+    ArrayList<UserCurriculum> findByUserOrderByCurriculum(User student);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumService.java
index af04d78..790c51f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumService.java
@@ -18,7 +18,6 @@ public class CurriculumService {
     public Curriculum findById(long id){
         return curriculumRepo.findById(id);
     }
-
     public void delete(Curriculum curriculum) {
         curriculumRepo.delete(curriculum);
     }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
index 6484e2b..99c4669 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
@@ -1,20 +1,50 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.Repositories.CurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.User;
+import ovh.herisson.Clyde.Tables.UserCurriculum;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 
 @Service
 public class UserCurriculumService {
 
     private final UserCurriculumRepository userCurriculumRepository;
+    private final CurriculumRepository curriculumRepo;
 
-    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository) {
+    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository, CurriculumRepository curriculumRepo) {
         this.userCurriculumRepository = userCurriculumRepository;
+        this.curriculumRepo = curriculumRepo;
     }
 
     public Curriculum findByUser(User student){
         return userCurriculumRepository.findByUser(student);
     }
+
+    public HashMap<String,Object> findAllCurriculumByStudent(User student) {
+        ArrayList<UserCurriculum> list = userCurriculumRepository.findByUserOrderByCurriculum(student);
+
+        ArrayList<HashMap<String, Object>> curriculumlist = new ArrayList<HashMap<String, Object>>();
+
+        for (int i = 0; i < list.size(); i++) {
+            HashMap<String, Object> element = new HashMap<>();
+            Curriculum c = list.get(i).getCurriculum();
+
+
+            element.put("curriculumId", c.getCurriculumId());
+            element.put("year", c.getYear());
+            element.put("option", c.getOption());
+            element.put("dateyear", list.get(i).getYear());
+            curriculumlist.add(element);
+        }
+
+        HashMap<String, Object> toReturn = new HashMap<String, Object>();
+        toReturn.put("curriculumList", curriculumlist);
+        return toReturn;
+    }
+
 }
diff --git a/frontend/src/Apps/AboutStudent.vue b/frontend/src/Apps/AboutStudent.vue
index aaaeafc..52f0fe1 100644
--- a/frontend/src/Apps/AboutStudent.vue
+++ b/frontend/src/Apps/AboutStudent.vue
@@ -1,16 +1,29 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import {getSelf, getUser} from '../rest/Users.js'
-  import {ref} from "vue";
+  import {getUser} from '../rest/Users.js'
+  import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
 
-  const user = await getSelf();
+  const props = defineProps(['target']);
+  let user = await getUser(props.target);
+  let UserCurriculum = await getSomeonesCurriculumList(props.target);
 
   function getPP(){
-    if(user.value.profilePictureUrl === null){
+    if(user.profilePictureUrl === null){
       return "/Clyde.png"
     }
     return user.profilePictureUrl
   }
+
+  //Cette function renvoie l'année académique concernée si on est dans l'année 2023-2024 elle renvoie 2023
+  //car dans la db l'année scolaire 2023-2024 est representée juste par 2023 (le même système s'applique pour chaque années on prend la borne inférieure
+  function getYear(){
+    let date = new Date();
+    if (date.getMonth() <= 6){
+      return date.getFullYear()-1
+    }
+    return date.getFullYear()
+  }
+
 </script>
 
 <template>
@@ -22,11 +35,46 @@
       <div class = "globalInfos">
         <div class="infosContainer">
           <div>
-            {{user.firstName}} {{user.lastName}}
+            FirstName/Name : {{user.firstName}} {{user.lastName}}
           </div>
           <div>
             E-mail: {{user.email}}
           </div>
+          <div>
+            Adresse : {{user.address}}
+          </div>
+          <div>
+            Pays : {{user.country}}
+          </div>
+          <div>
+            Date de naissance : {{user.birthDate}}
+          </div>
+        </div>
+      </div>
+      <div class="moreInfos">
+        <div class = "oldcursus">
+          <div class="listTitle">
+            Anciens Cursus
+          </div>
+          <div  class="listElement">
+            <div class=" containerElement" v-for="item in UserCurriculum.curriculumList">
+              <div class="year" v-if="parseInt(item.dateyear) !== getYear()">Bac {{item.year}}</div>
+              <div class="option" v-if="parseInt(item.dateyear) !== getYear()">{{item.option}}</div>
+              <div class="dateyear" v-if="parseInt(item.dateyear) !== getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
+            </div>
+          </div>
+        </div>
+        <div class="newcursus"  >
+          <div class="listTitle">
+            Cursus Actuel
+          </div>
+          <div  class="listElement">
+            <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" >
+                <div class="year" v-if="parseInt(item.dateyear) === getYear()">Bac {{item.year}}</div>
+                <div class="option" v-if="parseInt(item.dateyear) === getYear()">{{item.option}}</div>
+                <div class="dateyear" v-if="parseInt(item.dateyear) === getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -35,9 +83,8 @@
 </template>
 
 
-<style>
+<style scoped>
 .container{
-
   display:grid;
   grid-template-columns:200px 900px;
   grid-template-rows:200px auto;
@@ -79,4 +126,49 @@
   background-color:rgb(50,50,50);
   border-radius:20px;
 }
+
+.moreInfos {
+  display:grid;
+  grid-template-rows:200px auto;
+  column-gap:50px;
+  row-gap:45px;
+  grid-template-areas:
+  "minfos minfos";
+  grid-template-columns:600px 600px;
+}
+
+.listTitle{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width:250px;
+  margin-left:auto;
+  margin-right:auto;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;margin-bottom:10px;
+}
+
+.listElement{
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  margin-bottom:10px;
+}
+
+.containerElement{
+  justify-content:center;
+  display:grid;
+  grid-template-columns:100px 100px 300px;
+  grid-template-areas:
+    "year option dateyear";
+  column-gap:40px;
+  padding-left: 25px;
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 3e2eacc..36f926a 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -210,7 +210,6 @@
 <style scoped>
 
 .container{
-  
   display:grid;
   grid-template-columns:200px 900px;
   grid-template-rows:200px auto;
diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue
index cf4ef0e..1f62066 100644
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@@ -1,19 +1,29 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import { reactive  } from 'vue'
+  import {provide, reactive, ref} from 'vue'
   import { getStudents } from '../rest/Users.js'
-
+  import AboutStudent from "@/Apps/AboutStudent.vue";
   const users = await getStudents();
-</script> 
+
+  let targetRegNo = "";
+  let list = ref(true);
+</script>
+
 <template>
-  <div v-for="item in users">
+  <div v-if="list === false">
+    <AboutStudent :target=targetRegNo />
+    <button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
+  </div>
+  <div v-for="item in users" v-if="list === true">
     <div class="bodu">
       <div class="container">
         <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
         <div class="option"><a>{{item.role}}</a></div>
         <div class="surname"><a>{{item.lastName}}</a></div>
         <div class="firstname"><a>{{item.firstName}}</a></div>
-        <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
+        <div class="infos">
+          <button style="background-color:rgb(105,05,105);" @click="list = false; targetRegNo = item.regNo;">{{i18n("request.moreInfos")}} </button>
+        </div>
     </div>
     </div>
   </div>
@@ -29,7 +39,6 @@
     grid-template-areas:
     "status option surname firstname infos"; 
     column-gap:10px;
-    
   }
   
   .infos {
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 44fb7c4..eb3b919 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -18,7 +18,6 @@ const apps = {
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
 		'/students-list' : Students,
-		'/about-students': AboutStudent
 }
 
 const appsList = {
@@ -30,7 +29,6 @@ const appsList = {
 		'ManageCourses': { path: '#/manage-courses', icon: 'fa-book', text: i18n("app.manage.courses") },
 		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
 		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
-		'AboutStudent':{ path: '#/about-users', icon: 'fa-users', text:i18n("app.aboutStudent")}
 }
 
 const currentPath = ref(window.location.hash)
diff --git a/frontend/src/rest/curriculum.js b/frontend/src/rest/curriculum.js
index b13c2ed..29815ab 100644
--- a/frontend/src/rest/curriculum.js
+++ b/frontend/src/rest/curriculum.js
@@ -48,3 +48,7 @@ export async function altercurriculum(id, courses){
 export async function getSelfCurriculum(){
   return restGet("/curriculum");
 }
+
+export async function getSomeonesCurriculumList(user){
+	return restGet("/onescurriculum/"+user)
+}

From 839ca414ce1291b3e6a4512ff3159f3a744e977e Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Wed, 27 Mar 2024 14:12:20 +0100
Subject: [PATCH 04/25] =?UTF-8?q?Ajoute=20le=20d=C3=A9tail=20des=20demande?=
 =?UTF-8?q?s=20d'inscriptions=20(big=20update)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/Apps/AboutRequest.vue | 141 +++++++++++++++++++++++++++++
 frontend/src/Apps/Inscription.vue  |  38 +++++---
 2 files changed, 167 insertions(+), 12 deletions(-)
 create mode 100644 frontend/src/Apps/AboutRequest.vue

diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/AboutRequest.vue
new file mode 100644
index 0000000..c443ad0
--- /dev/null
+++ b/frontend/src/Apps/AboutRequest.vue
@@ -0,0 +1,141 @@
+<script setup>
+import i18n from "@/i18n.js"
+import {getUser} from '../rest/Users.js'
+import {getcurriculum, getSomeonesCurriculumList} from "@/rest/curriculum.js";
+import {getRegisters} from "@/rest/ServiceInscription.js";
+
+const props = defineProps(['target']);
+let request = await getRegisters(props.target);
+const cursus = await getcurriculum(request.curriculum);
+
+function getPP(){
+  if(request.profilePicture === null){
+    return "/Clyde.png"
+  }
+  return request.profilePicture;
+}
+</script>
+
+<template>
+  <div class="body">
+    <div class="container">
+      <div class="profilPic">
+        <img class="subContainter" :src=getPP()>
+      </div>
+      <div class = "globalInfos">
+        <div class="infosContainer">
+          <div>
+            FirstName/Name : {{request.firstName}} {{request.lastName}}
+          </div>
+          <div>
+            E-mail: {{request.email}}
+          </div>
+          <div>
+            Adresse : {{request.address}}
+          </div>
+          <div>
+            Pays : {{request.country}}
+          </div>
+          <div>
+            Date de naissance : {{request.birthDate}}
+          </div>
+          <div>
+            Cursus voulu : BAB {{cursus.year}} {{cursus.option}}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+
+<style scoped>
+.container{
+  display:grid;
+  grid-template-columns:200px 900px;
+  grid-template-rows:200px auto;
+  column-gap:30px;
+  row-gap:45px;
+  grid-template-areas:
+  "profilPic globalInfos"
+  "minfos minfos";
+}
+
+.profilPic{
+  grid-area:profilPic;
+}
+
+.globalInfos {
+  grid-area:globalInfos;
+  align-self :center;
+
+}
+
+.body {
+  width:100%;
+  margin-bottom:10px;
+}
+
+.subContainter{
+  width:100%;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  border:4px solid black;
+}
+
+.infosContainer {
+  padding-bottom:50px;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+}
+
+.moreInfos {
+  display:grid;
+  grid-template-rows:200px auto;
+  column-gap:50px;
+  row-gap:45px;
+  grid-template-areas:
+  "minfos minfos";
+  grid-template-columns:600px 600px;
+}
+
+.listTitle{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width:250px;
+  margin-left:auto;
+  margin-right:auto;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;margin-bottom:10px;
+}
+
+.listElement{
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  margin-bottom:10px;
+}
+
+.containerElement{
+  justify-content:center;
+  display:grid;
+  grid-template-columns:100px 100px 300px;
+  grid-template-areas:
+    "year option dateyear";
+  column-gap:40px;
+  padding-left: 25px;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index 94a1811..b5a5333 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -2,9 +2,13 @@
   import i18n from "@/i18n.js"
   import {ref} from 'vue'
   import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
+  import AboutRequest from "@/Apps/AboutRequest.vue";
 
   const requests = ref(await getAllRegisters());
-  console.log(requests);
+  let targetId = "";
+
+  //0 = liste, 1 = détails, 2 = sure?
+  let windowsState = ref(0);
 
   async function upPage(id,review){
     await validateRegister(id,review);
@@ -15,19 +19,29 @@
 
 
 
-<template> 
-  <div  v-for="item of requests">
-  <div class="bodu" v-if="item.state === 'Pending'">
-  <div class="container">
- 
-    <div class="id"><a>{{item.id}}</a></div>
-    <div class="surname"><a>{{item.lastName}}</a></div>
-    <div class="firstname"><a>{{item.firstName}}</a></div>
-    <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}</button></div>
-    <div class="accept"><button @click="upPage(item.id,'Accepted')" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
-    <div class="refuse"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
+<template>
+  <div v-if="windowsState === 1">
+    <AboutRequest :target="targetId"></AboutRequest>
+    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
   </div>
+  <div v-if="windowsState === 0">
+    <div  v-for="item of requests">
+    <div class="bodu" v-if="item.state === 'Pending'">
+    <div class="container">
+      <div class="id"><a>{{item.id}}</a></div>
+      <div class="surname"><a>{{item.lastName}}</a></div>
+      <div class="firstname"><a>{{item.firstName}}</a></div>
+      <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div>
+      <div class="accept"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
+      <div class="refuse"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
+    </div>
+    </div>
+    </div>
   </div>
+  <div v-if="windowsState === 2">
+    <p>Etes vous sur de vouloir accepter cette demande ?</p>
+    <button style="background-color:rgb(105,05,105);" @click="upPage(targetId,'Accepted');windowsState=0;">Valider</button>
+    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
   </div>
 </template>
 

From 94f12f0a8605c31b9cb8c6d63c8dae5ccf6e1e8b Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Wed, 27 Mar 2024 16:04:55 +0100
Subject: [PATCH 05/25] Add the date and identitycard feature to
 inscriptionRequest

---
 .../Clyde/EndPoints/MockController.java       |  3 +-
 .../Clyde/Services/ProtectionService.java     |  3 +-
 .../Clyde/Tables/InscriptionRequest.java      | 24 ++++++++++++++--
 frontend/src/Apps/Inscription.vue             | 28 +++++++++++--------
 frontend/src/Apps/Login.vue                   | 13 ++++++---
 5 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 76414ed..df79ede 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -101,10 +101,9 @@ public class MockController {
         CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
 
 
-        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
+        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password", null, new Date());
 
         inscriptionService.save(inscriptionRequest);
-        
     }
 }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
index 44e53a7..43b6ce9 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
@@ -87,7 +87,8 @@ public class ProtectionService {
         toReturn.put("curriculum", inscriptionRequest.getCurriculumId());
         toReturn.put("state", inscriptionRequest.getState());
         toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
-
+        toReturn.put("identityCard", inscriptionRequest.getIdentityCard());
+        toReturn.put("submissionDate", inscriptionRequest.getSubmissionDate());
         return toReturn;
     }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
index 18e20d0..b01644e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
@@ -19,10 +19,12 @@ public class InscriptionRequest {
     private Long curriculumId;
     private RequestState state;
     private String profilePicture;
-
     private String password;
+    private String identityCard;
+    private Date submissionDate;
     public InscriptionRequest(){}
-    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password){
+
+    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password, String identityCard, Date submissionDate){
         this.lastName = lastName;
         this.firstName = firstName;
         this.address = address;
@@ -33,6 +35,8 @@ public class InscriptionRequest {
         this.state = state;
         this.profilePicture = profilePicture;
         this.password = password;
+        this.identityCard = identityCard;
+        this.submissionDate = submissionDate;
     }
 
     public int getId() {
@@ -118,4 +122,20 @@ public class InscriptionRequest {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getIdentityCard() {
+        return identityCard;
+    }
+
+    public void setIdentityCard(String identityCard) {
+        this.identityCard = identityCard;
+    }
+
+    public Date getSubmissionDate() {
+        return submissionDate;
+    }
+
+    public void setSubmissionDate(Date submissionDate) {
+        this.submissionDate = submissionDate;
+    }
 }
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index b5a5333..6f79966 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -26,14 +26,15 @@
   </div>
   <div v-if="windowsState === 0">
     <div  v-for="item of requests">
-    <div class="bodu" v-if="item.state === 'Pending'">
+    <div class="bodu">
     <div class="container">
-      <div class="id"><a>{{item.id}}</a></div>
-      <div class="surname"><a>{{item.lastName}}</a></div>
-      <div class="firstname"><a>{{item.firstName}}</a></div>
+      <div class="date">{{item.submissionDate.slice(0, 10)}}</div>
+      <div class="state">{{item.state}}</div>
+      <div class="surname">{{item.lastName}}</div>
+      <div class="firstname">{{item.firstName}}</div>
+      <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
+      <div class="refuse" v-if="item.state === 'Pending'"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
       <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div>
-      <div class="accept"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
-      <div class="refuse"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
     </div>
     </div>
     </div>
@@ -51,11 +52,10 @@
     height:100px;
     font-size:20px;
     display:grid;
-    grid-template-columns:[firstCol-start]100px[firstCol-end secondCol-start]150px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol];
+    grid-template-columns:[firstCol-start]150px[firstCol-end secondCol-start]200px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol];
     grid-template-areas:
-    "id type surname firstname infos accept refuse"; 
+    "date state surname firstname accept refuse infos";
     column-gap:10px;
-    
   }
   
   .infos {
@@ -77,8 +77,14 @@
     grid-area:titles;
     background-color:rgb(215,215,215);
   }
-  .id{
-    grid-area:id;
+  .date{
+    grid-area:date;
+    margin-left:40px;
+    align-self:center;
+  }
+
+  .state{
+    grid-area:state;
     margin-left:40px;
     align-self:center;
   }
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index b43b152..cf68d13 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -115,7 +115,7 @@
                 <a>{{i18n("login.guest.alregister")}}</a>
               </div>
             </div>
-            <div v-else>
+            <div v-if="page === 1">
               <div class="inputBox">
                 <p>{{i18n("login.guest.email")}}</p>
                 <input type="mail" v-model="outputs.email">
@@ -136,12 +136,11 @@
                 <p>{{i18n("Curriculum").toUpperCase()}}</p> 
                   <select v-model="outputs.curriculum">
                     <option v-for="item in curricula">{{item.curriculumId}}</option>
-                    
                   </select>
               </div>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData);">
-                  {{i18n("login.guest.submit")}}
+                <button style="margin-top:25px;" @click="page++">
+                  {{i18n("login.guest.nextpage")}}
                 </button>
               </div>
               <div  class="switchpage">
@@ -151,6 +150,12 @@
                 <a>{{i18n("login.guest.alregister")}}</a>
               </div>
             </div>
+            <div v-if="page === 2">
+              <form novalidate enctype="multipart/form-data" class="inputBox">
+                Carte d'identité :
+
+              </form>
+            </div>
           </form>
          </div>
         </div>

From a3c9d6a7c02318b6ec29c974050a07c5f24c8e8e Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Fri, 29 Mar 2024 10:55:59 +0100
Subject: [PATCH 06/25] Fix the profilepicture url issue (it wasn't sent to the
 db)

add a prototype of a more generic uploadfile function in uploads.js

makes the distinction between a master cursus and a bachelor cursus in display
---
 .../Clyde/EndPoints/MockController.java       |  4 +++
 frontend/src/Apps/AboutRequest.vue            |  4 +--
 frontend/src/Apps/Inscription.vue             |  1 -
 frontend/src/Apps/Login.vue                   | 29 ++++++++++++++-----
 frontend/src/rest/Users.js                    |  8 +++--
 frontend/src/rest/uploads.js                  | 14 ++++++++-
 6 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index df79ede..96e7be4 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -67,11 +67,15 @@ public class MockController {
         Curriculum chemistryBab1 = new Curriculum(1,"chemistry");
         Curriculum psychologyBab1 = new Curriculum(1,"psychology");
         Curriculum infoBab2 = new Curriculum(2,"info");
+        Curriculum masterinfo1 = new Curriculum(4, "info");
+        Curriculum masterinfo2 = new Curriculum(5, "info");
 
         curriculumService.save(infoBab1);
         curriculumService.save(chemistryBab1);
         curriculumService.save(psychologyBab1);
         curriculumService.save(infoBab2);
+        curriculumService.save(masterinfo1);
+        curriculumService.save(masterinfo2);
 
         ucr.save(new UserCurriculum(joe, infoBab1, 2022));
         ucr.save(new UserCurriculum(joe, chemistryBab1, 2023));
diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/AboutRequest.vue
index c443ad0..a818e18 100644
--- a/frontend/src/Apps/AboutRequest.vue
+++ b/frontend/src/Apps/AboutRequest.vue
@@ -9,10 +9,10 @@ let request = await getRegisters(props.target);
 const cursus = await getcurriculum(request.curriculum);
 
 function getPP(){
-  if(request.profilePicture === null){
+  if(request.profilePictureUrl === null){
     return "/Clyde.png"
   }
-  return request.profilePicture;
+  return request.profilePictureUrl;
 }
 </script>
 
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index 6f79966..b02cfcd 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -13,7 +13,6 @@
   async function upPage(id,review){
     await validateRegister(id,review);
     requests.value = await getAllRegisters();
-
   }
 </script>
 
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index cf68d13..036b6fb 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -24,9 +24,12 @@
 
   const submitValue= ref(i18n("login.guest.submit"))
   const passwordConfirm=ref("")
- 
+
+  //Allows to display MA or BAB for years
+  let yearprefix = "";
+
   const imageSaved = ref(false)
-  const ppData = ref(false)
+  let ppData = "";
 
   const curricula= await getAllCurriculums();
   
@@ -50,7 +53,20 @@
   disconnect();
   window.location.reload();}
 
-  
+  async function uploadPP(arg){
+    const data = await uploadProfilePicture(arg);
+    ppData = data.url;
+    console.log(ppData);
+  }
+
+  //This functions makes the distinction between a master cursus (year 4 or more) and a bachelor cursus (year 3 or less)
+  function getCursusDisplay(cursus){
+    if (cursus.year <= 3){
+      return "BAB " + cursus.year + " " + cursus.option;
+    }else{
+      return "MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
+    }
+  }
 
 </script>
 
@@ -130,16 +146,16 @@
               </div>
               <form novalidate enctype="multipart/form-data" class="inputBox">
               	<p>{{i18n("profile.picture").toUpperCase()}}</p> 
-				<input type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
+				        <input type="file" @change="uploadPP($event.target.files); imageSaved = true;" accept="image/*">
               </form>
               <div class="inputBox">
                 <p>{{i18n("Curriculum").toUpperCase()}}</p> 
                   <select v-model="outputs.curriculum">
-                    <option v-for="item in curricula">{{item.curriculumId}}</option>
+                    <option v-for="item in curricula">{{getCursusDisplay(item)}}</option>
                   </select>
               </div>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="page++">
+                <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date());">
                   {{i18n("login.guest.nextpage")}}
                 </button>
               </div>
@@ -153,7 +169,6 @@
             <div v-if="page === 2">
               <form novalidate enctype="multipart/form-data" class="inputBox">
                 Carte d'identité :
-
               </form>
             </div>
           </form>
diff --git a/frontend/src/rest/Users.js b/frontend/src/rest/Users.js
index 760bfc7..6d9d05b 100644
--- a/frontend/src/rest/Users.js
+++ b/frontend/src/rest/Users.js
@@ -26,7 +26,7 @@ export function disconnect(){
  * @param curriculum 
  * @param imageId	id of the image in database returned when uploaded
  */
-export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -36,7 +36,9 @@ export async function register(firstname, lastname, birthDate, password, email,
 		address: address,
 		country: country,
 		curriculumId: curriculumId,
-    profilePictureUrl: imageId,
+    	profilePicture: imageId,
+		identityCard : identityCardId,
+		submissionDate : submissionDate
 	});
 }
 
@@ -52,7 +54,7 @@ export async function register(firstname, lastname, birthDate, password, email,
  * @param country
  * @param imageId	id of the image in database returned when uploaded
  *
- * PS: the password is not is not required as it is generated by the backend and sent to the user
+ * PS: the password is not required as it is generated by the backend and sent to the user
  * by mail. it's up to the user to change it if he cares about security
  */
 export async function createUser(firstname, lastname, birthDate, email, address, country, role, imageId){
diff --git a/frontend/src/rest/uploads.js b/frontend/src/rest/uploads.js
index 48623cf..856024d 100644
--- a/frontend/src/rest/uploads.js
+++ b/frontend/src/rest/uploads.js
@@ -7,5 +7,17 @@ import { restPostFile } from '@/rest/restConsumer.js'
 export async function uploadProfilePicture(file){
 	const formData = new FormData();
 	formData.append("file", file[0]);
-	return restPostFile("/upload/ProfilePicture", formData)
+
+	return restPostFile("/upload/ProfilePicture", formData);
 }
+
+
+/**
+ * More generic version of the upload method
+ */
+
+export async function uploadFile(file, type){
+	const formData = new FormData();
+	formData.append("file", file[0]);
+	return restPostFile("/upload/"+type, formData)
+}
\ No newline at end of file

From 4a314449ad6b5d88fe8af6e65ac75a8c8794dfe7 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Fri, 29 Mar 2024 15:31:02 +0100
Subject: [PATCH 07/25] Add the backend logic for ExternalCurriculum class
 (need to do one more endpoint)

---
 .../Clyde/EndPoints/CurriculumController.java |  16 +++
 .../ExternalCurriculumRepository.java         |  11 ++
 .../Clyde/Services/UserCurriculumService.java |  31 ++++-
 .../Clyde/Tables/ExternalCurriculum.java      | 113 ++++++++++++++++++
 .../ovh/herisson/Clyde/Tables/University.java |  27 +++++
 frontend/src/Apps/Login.vue                   |   6 +-
 6 files changed, 202 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/University.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index bef813a..3c6dc37 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -115,4 +115,20 @@ public class CurriculumController {
         curriculumServ.delete(toDelete);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @GetMapping("/externalcurriculum/{userId}")
+    public ResponseEntity<Map<String,Object>> getStudentsExternalCursus(@RequestHeader("Authorization") String token, @PathVariable String userId){
+        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
+            return new UnauthorizedResponse<>(null);
+
+        User u = userServ.getUserById(Long.parseLong(userId));
+        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByStudent(u);
+
+        if (toReturn == null)
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        return new ResponseEntity<>(toReturn,HttpStatus.OK);
+    }
+
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
new file mode 100644
index 0000000..32346a4
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
@@ -0,0 +1,11 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ExternalCurriculum;
+import ovh.herisson.Clyde.Tables.User;
+
+import java.util.ArrayList;
+
+public interface ExternalCurriculumRepository extends CrudRepository<ExternalCurriculum, Long> {
+    ArrayList<ExternalCurriculum> getExternalCurriculumByUser(User user);
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
index 99c4669..0b0cebf 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
@@ -2,8 +2,10 @@ package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.CurriculumRepository;
+import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.ExternalCurriculum;
 import ovh.herisson.Clyde.Tables.User;
 import ovh.herisson.Clyde.Tables.UserCurriculum;
 
@@ -16,9 +18,11 @@ public class UserCurriculumService {
     private final UserCurriculumRepository userCurriculumRepository;
     private final CurriculumRepository curriculumRepo;
 
-    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository, CurriculumRepository curriculumRepo) {
+    private final ExternalCurriculumRepository externalCurriculumRepo;
+    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository, CurriculumRepository curriculumRepo, ExternalCurriculumRepository externalCurriculumRepo) {
         this.userCurriculumRepository = userCurriculumRepository;
         this.curriculumRepo = curriculumRepo;
+        this.externalCurriculumRepo = externalCurriculumRepo;
     }
 
     public Curriculum findByUser(User student){
@@ -47,4 +51,29 @@ public class UserCurriculumService {
         return toReturn;
     }
 
+
+    public HashMap<String,Object> findAllExternalCurriculumByStudent(User student) {
+        ArrayList<ExternalCurriculum> list = externalCurriculumRepo.getExternalCurriculumByUser(student);
+
+        ArrayList<HashMap<String, Object>> externalCurriculumList = new ArrayList<HashMap<String, Object>>();
+
+        for (int i = 0; i < list.size(); i++) {
+            HashMap<String, Object> element = new HashMap<>();
+            element.put("id", list.get(0).getId());
+            element.put("user", list.get(0).getUser());
+            element.put("university", list.get(0).getUniversity());
+            element.put("formation", list.get(0).getFormation());
+            element.put("completion", list.get(0).getCompletion());
+            element.put("startYear", list.get(0).getStartYear());
+            element.put("endYear", list.get(0).getEndYear());
+            element.put("justifDocUrl", list.get(0).getJustifdocUrl());
+            element.put("state", list.get(0).getState());
+            externalCurriculumList.add(element);
+        }
+
+        HashMap<String, Object> toReturn = new HashMap<String, Object>();
+        toReturn.put("externalCurriculumList", externalCurriculumList);
+        return toReturn;
+    }
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
new file mode 100644
index 0000000..6e0d90f
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
@@ -0,0 +1,113 @@
+package ovh.herisson.Clyde.Tables;
+
+
+import jakarta.persistence.*;
+
+//This table stores a student's curriculum from another university
+@Entity
+public class ExternalCurriculum {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @ManyToOne
+    @JoinColumn(name="Users")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name="University")
+    private University university;
+
+    private String formation;
+
+    //This string denotes the completion of the external formation or the last year completed by the student in this formation
+    private String completion;
+
+    private int startYear;
+    private int endYear;
+    private String justifdocUrl;
+
+    //Accepted if the document justifies the claimed formation
+    private RequestState state;
+
+    public ExternalCurriculum(){}
+
+    public ExternalCurriculum(User user, University university, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
+        this.user = user;
+        this.university = university;
+        this.formation = formation;
+        this.completion = completion;
+        this.startYear = startYear;
+        this.endYear = endYear;
+        this.justifdocUrl = justifdocUrl;
+        this.state = state;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public University getUniversity() {
+        return university;
+    }
+
+    public void setUniversity(University university) {
+        this.university = university;
+    }
+
+    public String getFormation() {
+        return formation;
+    }
+
+    public void setFormation(String formation) {
+        this.formation = formation;
+    }
+
+    public String getCompletion(){
+        return completion;
+    }
+
+    public void setCompletion(String completion) {
+        this.completion = completion;
+    }
+
+    public int getStartYear() {
+        return startYear;
+    }
+
+    public void setStartYear(int startYear) {
+        this.startYear = startYear;
+    }
+
+    public int getEndYear() {
+        return endYear;
+    }
+
+    public void setEndYear(int endYear) {
+        this.endYear = endYear;
+    }
+
+    public void setJustifdocUrl(String justifdocUrl) {
+        this.justifdocUrl = justifdocUrl;
+    }
+
+    public String getJustifdocUrl() {
+        return justifdocUrl;
+    }
+
+    public RequestState getState() {
+        return state;
+    }
+
+    public void setState(RequestState state) {
+        this.state = state;
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/University.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/University.java
new file mode 100644
index 0000000..7a60db1
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/University.java
@@ -0,0 +1,27 @@
+package ovh.herisson.Clyde.Tables;
+
+
+import jakarta.persistence.*;
+
+@Entity
+public class University {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    private String name;
+
+    public University(){}
+
+    public University(String name){
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index 036b6fb..590e3ea 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -27,7 +27,6 @@
 
   //Allows to display MA or BAB for years
   let yearprefix = "";
-
   const imageSaved = ref(false)
   let ppData = "";
 
@@ -154,6 +153,11 @@
                     <option v-for="item in curricula">{{getCursusDisplay(item)}}</option>
                   </select>
               </div>
+              <p style="color:rgb(239,60,168);">
+                Si vous êtes déja inscrits dans cette université veuillez vous connecter a votre compte et utilisez les fonctions
+                changer de cursus/réinscription sinon continuez ici.
+              </p>
+
               <div style="align-self:center;" class="inputBox">
                 <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date());">
                   {{i18n("login.guest.nextpage")}}

From 0e26e1a0dbf6d02098945511e26bef8bef25b119 Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Sat, 30 Mar 2024 23:23:33 +0100
Subject: [PATCH 08/25] adding compose for launching properly everything

---
 backend/Dockerfile                            | 14 +++++--
 backend/settings.gradle.kts                   | 13 +++++++
 .../java/ovh/herisson/Clyde/JdbcConfig.java   | 37 -------------------
 .../src/main/resources/application.properties | 11 +++++-
 compose.yaml                                  | 22 +++++++++++
 frontend/Dockerfile                           | 11 ++++++
 frontend/src/rest/restConsumer.js             |  2 +-
 7 files changed, 68 insertions(+), 42 deletions(-)
 create mode 100644 backend/settings.gradle.kts
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java
 create mode 100644 compose.yaml
 create mode 100644 frontend/Dockerfile

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 5475dc9..89e069b 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,6 +1,14 @@
+## Building phase
+FROM gradle:jdk21-alpine 
+# WORKDIR /app/back
+  
+COPY . .
+RUN gradle build -x test
+
+## Running Phase
 FROM eclipse-temurin:21-jdk-alpine
-VOLUME /tmp
 VOLUME /cdn
-ENV SPRING_PROFILES_ACTIVE=prod
-COPY build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar
+# ENV SPRING_PROFILES_ACTIVE=prod
+COPY build/libs/Clyde-0.0.1-SNAPSHOT.jar app.jar
+EXPOSE 8080
 ENTRYPOINT ["java", "-jar", "/app.jar"]
diff --git a/backend/settings.gradle.kts b/backend/settings.gradle.kts
new file mode 100644
index 0000000..7d39fc5
--- /dev/null
+++ b/backend/settings.gradle.kts
@@ -0,0 +1,13 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.6/userguide/multi_project_builds.html in the Gradle documentation.
+ */
+
+plugins {
+    // Apply the foojay-resolver plugin to allow automatic download of JDKs
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+}
+
+rootProject.name = "Clyde"
diff --git a/backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java b/backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java
deleted file mode 100644
index 801e549..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package ovh.herisson.Clyde;
-
-import javax.sql.DataSource;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@Configuration
-@EnableScheduling
-public class JdbcConfig {
-
-	@Bean
-	@Profile("!prod")
-	public DataSource psqlSource(){
-		DriverManagerDataSource source = new DriverManagerDataSource();
-		source.setDriverClassName("org.postgresql.Driver");
-		source.setUrl("jdbc:postgresql://localhost:5442/clyde");
-		source.setUsername("devel");
-		source.setPassword("devel");
-
-		return source;
-	}
-
-	@Bean
-	@Profile("prod")
-	public DataSource psqlSourceProd(){
-		DriverManagerDataSource source = new DriverManagerDataSource();
-		source.setDriverClassName("org.postgresql.Driver");
-		source.setUrl("jdbc:postgresql:clyde?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/var/run/postgresql/.s.PGSQL.5432");
-		source.setUsername("clyde");
-
-		return source;
-	}
-}
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 5d00d8e..190c76b 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,3 +1,12 @@
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
-spring.sql.init.mode=always
\ No newline at end of file
+spring.sql.init.mode=always
+
+# spring.datasource.url=jdbc:postgresql://localhost:5442/clyde
+spring.datasource.url=jdbc:postgresql://db:5432/clyde
+spring.datasource.username=devel
+spring.datasource.password=devel
+
+# spring.config.activate.on-profile=prod
+# spring.datasource.url=jdbc:postgresql:clyde?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=/var/run/postgresql/.s.PGSQL.5432
+# spring.datasource.username=clyde
diff --git a/compose.yaml b/compose.yaml
new file mode 100644
index 0000000..a127b25
--- /dev/null
+++ b/compose.yaml
@@ -0,0 +1,22 @@
+services: 
+  db:
+    image: 'postgres:16'
+    environment:
+      - 'POSTGRES_DB=clyde'
+      - 'POSTGRES_USER=devel'
+      - 'POSTGRES_PASSWORD=devel'
+    # Uncomment this to allow connections to the db from outside the container
+    # ports: 
+    #   - '5442:5432'
+  back:
+    build: backend/.
+    ports:
+      - "8080:8080"
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
+  front:
+    build: frontend/.
+    ports:
+      - "8000:8080"
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 0000000..2df53ae
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,11 @@
+# https://v2.vuejs.org/v2/cookbook/dockerize-vuejs-app
+FROM node:lts-alpine
+RUN npm install -g http-server
+WORKDIR /app/front
+COPY package*.json ./
+RUN npm install
+COPY . .
+ENV VITE_CLYDE_MODE=container
+RUN npm run build
+EXPOSE 8080
+CMD [ "http-server", "dist" ]
diff --git a/frontend/src/rest/restConsumer.js b/frontend/src/rest/restConsumer.js
index 2ac4cc3..1af979e 100644
--- a/frontend/src/rest/restConsumer.js
+++ b/frontend/src/rest/restConsumer.js
@@ -1,7 +1,7 @@
 import { getCookie } from '../utils.js'
 import { toast } from 'vue3-toastify'
 
-const restURL = import.meta.env.PROD ? "https://clyde.herisson.ovh/api" : "http://localhost:8080"
+const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8080": import.meta.env.DEV ? "http://localhost:8080" : "https://clyde.herisson.ovh/api"
 
 export async function restGet(endPoint) {
 	return await _rest(endPoint, {method: "GET"});

From 2e2837fec4a5b3905f8967bdb2ba1a5366e38b6d Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Sat, 30 Mar 2024 23:33:16 +0100
Subject: [PATCH 09/25] adding info about compose

---
 README.md | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5a99ac9..2d33f08 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,33 @@ Projet du groupe 01:
 - William Karpinski: Extension gestion des horaires
 - Léo Moulin: Extension inscription des étudiants
 
+## Running
+
+Le projet peut être lancé grace à docker compose.
+
+```sh
+$ docker compose up 
+```
+
+Dans le cas ou vous modifiers des fichiers, pour éviter que les images de docker soient recrées avec les changement
+
+```sh
+$ docker compose up --force-recreate --build
+```
+
 ## Dévelopement
 
-```
-$ ./gradlew backend:run frontend:run --parallel
-```
+Dans le cas ou vous êtes dans une phase de développement, il est plus simple d'utiliser gradle pour lancer le backend et frontend dans un mode de développement.
+**Attention**: Ce mode n'est pas fait pour être utilisé en production!
 
+```sh
+$ ./gradlew run --parallel
+```
 permet de lancer le frontend sur [http://localhost:5173](http://localhost:5173) ansi que le frontend sur [http://localhost:8080](http://localhost:8080) 
+
+Ceci requière également docker pour lancer une instance de postgresql pris en charge par spring.
+
+Il est possible de se passer entièrement de docker en supprimant la dépendance dans le fichier `backend/build.gradle.kts`: ~~`developmentOnly("org.springframework.boot:spring-boot-docker-compose")`~~
+Il est alors nécéssaire d'avoir une instance de postgresql tournant sur `localhost:5432` avec une table `clyde`, utilisateur: `devel` et password: `devel`
+(cette configuration peut également être changée dans le fichier resources/application.properties de spring)
+

From bce53305b3bc810bbea5370d0c15a387f68b262c Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Mon, 1 Apr 2024 10:40:36 +0200
Subject: [PATCH 10/25] Merge master into my branch

---
 .../herisson/Clyde/EndPoints/CurriculumController.java   | 2 +-
 frontend/src/Apps/Login.vue                              | 9 +++++----
 frontend/src/Apps/StudentsList.vue                       | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index 3c6dc37..0fc0e4c 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -117,7 +117,7 @@ public class CurriculumController {
     }
 
     @GetMapping("/externalcurriculum/{userId}")
-    public ResponseEntity<Map<String,Object>> getStudentsExternalCursus(@RequestHeader("Authorization") String token, @PathVariable String userId){
+    public ResponseEntity<Map<String,Object>> getStudentsExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable String userId){
         if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
             return new UnauthorizedResponse<>(null);
 
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index ae8bd7e..df0d248 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -26,7 +26,7 @@
   const passwordConfirm=ref("")
  
   const imageSaved = ref(false)
-  const ppData = ref(false)
+  let ppData = ""
 
   const curricula= await getAllCurriculums();
   
@@ -142,8 +142,9 @@
                 <p>{{i18n("login.guest.country")}}</p>
                 <input type="text" v-model="outputs.country">
               </div>
-              <form class="inputBox"novalidate enctype="multipart/form-data">
+              <form class="inputBox" novalidate enctype="multipart/form-data">
               	<p>{{i18n("profile.picture").toUpperCase()}}</p>
+              </form>
               <label class="browser">
                 Parcourir . . .
 				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
@@ -234,7 +235,7 @@
   z-index: 100;
   font-family:sans-serif ; 
   color:rgb(239,60,168);
-  transition:0.5;
+  transition: 0.5;
 
 }
 
@@ -256,7 +257,7 @@
   outline:none;
   border-radius: 4px;
   font-size:0.8em;
-  align-self:right;
+  align-self: right;
 
 }
 
diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue
index 2305069..ded264b 100644
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@@ -14,8 +14,7 @@
     <AboutStudent :target=targetRegNo />
     <button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
   </div>
-  <div v-for="item in users" v-if="list === true">
-  <div style="display:flex; justify-content:center; " v-for="item in users">
+  <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true">
     <div class="bodu">
       <div class="container">
         <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>

From 8442101c40a8c1a278af6a52ec05015cf0e64024 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Mon, 1 Apr 2024 11:43:42 +0200
Subject: [PATCH 11/25] Fixed some css

---
 frontend/src/Apps/AboutRequest.vue | 20 +++++++++++++++++---
 frontend/src/Apps/AboutStudent.vue | 14 +++++++++++---
 frontend/src/Apps/Inscription.vue  | 14 +++++++-------
 frontend/src/Apps/Login.vue        | 13 ++++++++-----
 frontend/src/Apps/StudentsList.vue |  8 ++++----
 5 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/AboutRequest.vue
index a818e18..186f75c 100644
--- a/frontend/src/Apps/AboutRequest.vue
+++ b/frontend/src/Apps/AboutRequest.vue
@@ -52,10 +52,11 @@ function getPP(){
 
 <style scoped>
 .container{
+  min-width:675px;
   display:grid;
-  grid-template-columns:200px 900px;
+  grid-template-columns:10vw 50vw;
   grid-template-rows:200px auto;
-  column-gap:30px;
+  column-gap:2.7%;
   row-gap:45px;
   grid-template-areas:
   "profilPic globalInfos"
@@ -64,6 +65,7 @@ function getPP(){
 
 .profilPic{
   grid-area:profilPic;
+  width:100%;
 }
 
 .globalInfos {
@@ -73,8 +75,12 @@ function getPP(){
 }
 
 .body {
+  min-width:960px;
   width:100%;
-  margin-bottom:10px;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  margin-top:5%;
 }
 
 .subContainter{
@@ -138,4 +144,12 @@ function getPP(){
   column-gap:40px;
   padding-left: 25px;
 }
+button{
+  font-size:15px;
+  height:50px;
+  width:100px;
+  border:none;
+  border-radius:20px;
+
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/AboutStudent.vue b/frontend/src/Apps/AboutStudent.vue
index 52f0fe1..394014a 100644
--- a/frontend/src/Apps/AboutStudent.vue
+++ b/frontend/src/Apps/AboutStudent.vue
@@ -85,10 +85,11 @@
 
 <style scoped>
 .container{
+  min-width:675px;
   display:grid;
-  grid-template-columns:200px 900px;
+  grid-template-columns:10vw 50vw;
   grid-template-rows:200px auto;
-  column-gap:30px;
+  column-gap:2.7%;
   row-gap:45px;
   grid-template-areas:
   "profilPic globalInfos"
@@ -106,8 +107,12 @@
 }
 
 .body {
+  min-width:960px;
   width:100%;
-  margin-bottom:10px;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  margin-top:5%;
 }
 
 .subContainter{
@@ -135,6 +140,9 @@
   grid-template-areas:
   "minfos minfos";
   grid-template-columns:600px 600px;
+  align-items:center;
+  justify-content:center;
+  margin-left: 320%;
 }
 
 .listTitle{
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index b02cfcd..2788cf5 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -21,10 +21,10 @@
 <template>
   <div v-if="windowsState === 1">
     <AboutRequest :target="targetId"></AboutRequest>
-    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
+    <button style="background-color:rgb(105,05,105);margin-left: 30%" @click="windowsState=0;">Retour</button>
   </div>
   <div v-if="windowsState === 0">
-    <div  v-for="item of requests">
+    <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
     <div class="bodu">
     <div class="container">
       <div class="date">{{item.submissionDate.slice(0, 10)}}</div>
@@ -38,7 +38,7 @@
     </div>
     </div>
   </div>
-  <div v-if="windowsState === 2">
+  <div style='display:flex; justify-content:center; min-width:1140px;margin-top: 10%' v-if="windowsState === 2">
     <p>Etes vous sur de vouloir accepter cette demande ?</p>
     <button style="background-color:rgb(105,05,105);" @click="upPage(targetId,'Accepted');windowsState=0;">Valider</button>
     <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
@@ -51,7 +51,7 @@
     height:100px;
     font-size:20px;
     display:grid;
-    grid-template-columns:[firstCol-start]150px[firstCol-end secondCol-start]200px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol];
+    grid-template-columns:15% 15% 10% 14.2% 14.2% 14.2% 14.2%;
     grid-template-areas:
     "date state surname firstname accept refuse infos";
     column-gap:10px;
@@ -74,7 +74,7 @@
 
   .titles {
     grid-area:titles;
-    background-color:rgb(215,215,215);
+    align-self:center;
   }
   .date{
     grid-area:date;
@@ -119,8 +119,8 @@
   }
 
   .bodu {
-    width:100%;
-    margin-bottom:10px;
+    margin-top:2%;
+    width:66%;
     border:2px solid black;
     border-radius:9px;
     background-color:rgb(50,50,50);
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index df0d248..a1cf99a 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -53,18 +53,22 @@
   async function uploadPP(arg){
     const data = await uploadProfilePicture(arg);
     ppData = data.url;
-    console.log(ppData);
   }
 
   //This functions makes the distinction between a master cursus (year 4 or more) and a bachelor cursus (year 3 or less)
   function getCursusDisplay(cursus){
     if (cursus.year <= 3){
-      return "BAB " + cursus.year + " " + cursus.option;
+      return cursus.curriculumId + " BAB " + cursus.year + " " + cursus.option;
     }else{
-      return "MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
+      return cursus.curriculumId + " MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
     }
   }
 
+  //This function return the id of a decorated cursus (decorated by the function up)
+  function parseDecoratedCursus(cursus){
+    let id = cursus.substring(0, cursus.indexOf(" ")+1);
+    return id;
+  }
 </script>
 
 
@@ -164,7 +168,7 @@
                 changer de cursus/réinscription sinon continuez ici.
               </p>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date());">
+                <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, parseDecoratedCursus(outputs.curriculum), ppData, null, new Date());">
                   {{i18n("login.guest.nextpage")}}
                 </button>
               </div>
@@ -249,7 +253,6 @@
 
 .switchpage{
   width:100px;
-  background:rgb(255, 0,255);
   border: none;
   padding-right:0;
   padding-top:10px;
diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue
index ded264b..62f4acb 100644
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@@ -12,7 +12,7 @@
 <template style="margin-top:5%;">
   <div v-if="list === false">
     <AboutStudent :target=targetRegNo />
-    <button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
+    <button style="background-color:rgb(105,05,105);width:5%; margin-left: 10%;" @click="list = true;">Back</button>
   </div>
   <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true">
     <div class="bodu">
@@ -35,7 +35,7 @@
     height:100px;
     font-size:30px;
     display:grid;
-    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
+    grid-template-columns:21.7% 21.7% 21.7% 20% 13.1%;
     grid-template-areas:
     "status option surname firstname infos"; 
     column-gap:10px;
@@ -74,8 +74,8 @@
 
   button{
     font-size:15px;
-     height:50px;
-     width:75%;
+    height:50px;
+    width:75%;
     border:none;
     border-radius:20px;
 

From cb36aa8a3070ac1d53a7e73d28ea9c1403bab4fe Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Mon, 1 Apr 2024 22:49:24 +0200
Subject: [PATCH 12/25] Fixing file locations

---
 backend/Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 89e069b..1ed9969 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,14 +1,15 @@
 ## Building phase
-FROM gradle:jdk21-alpine 
-# WORKDIR /app/back
+FROM gradle:jdk21-alpine AS BUILD
+WORKDIR /backend
   
 COPY . .
 RUN gradle build -x test
 
 ## Running Phase
 FROM eclipse-temurin:21-jdk-alpine
+WORKDIR /backend
 VOLUME /cdn
 # ENV SPRING_PROFILES_ACTIVE=prod
-COPY build/libs/Clyde-0.0.1-SNAPSHOT.jar app.jar
+COPY --from=BUILD /backend/build/libs/Clyde-0.0.1-SNAPSHOT.jar /backend/app.jar
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "/app.jar"]
+ENTRYPOINT ["java", "-jar", "/backend/app.jar"]

From 3761fa6f49c2df313c209c88794c03b9dfb5dcc5 Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Tue, 2 Apr 2024 00:21:15 +0200
Subject: [PATCH 13/25] Adding cdn support with compose

Now when you upload a file, the path is stored to the db and the file is
accesible on the client with : `localhost:8000/cdn/3ed026aa-366f-4f33-bc51-fb59d37e35ee.png` for instance.
---
 compose.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compose.yaml b/compose.yaml
index a127b25..ec5f6bc 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -12,11 +12,18 @@ services:
     build: backend/.
     ports:
       - "8080:8080"
+    volumes:
+      - cdn:/backend/cdn
     ulimits:
       nofile:
         soft: 65536
         hard: 65536
   front:
     build: frontend/.
+    volumes:
+      - cdn:/app/front/dist/cdn
     ports:
       - "8000:8080"
+
+volumes:
+  cdn:

From 648b73b585c54367b58006ee3803590a5dc56057 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Thu, 4 Apr 2024 16:54:11 +0200
Subject: [PATCH 14/25] Fix the implementation of externalCurriculum upload

---
 .../Clyde/EndPoints/CurriculumController.java |  27 ++--
 .../ExternalCurriculumRepository.java         |   3 +-
 .../Clyde/Services/UserCurriculumService.java |  13 +-
 .../Clyde/Tables/ExternalCurriculum.java      |  30 ++---
 .../Clyde/Tables/InscriptionRequest.java      |   1 -
 frontend/src/Apps/Login.vue                   | 125 ++++++++++++++++--
 frontend/src/rest/curriculum.js               |  12 ++
 7 files changed, 167 insertions(+), 44 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index 0fc0e4c..4be7ba9 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -4,11 +4,11 @@ package ovh.herisson.Clyde.EndPoints;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.*;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
+import ovh.herisson.Clyde.Tables.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,15 +23,18 @@ public class CurriculumController {
 
     private final UserCurriculumService userCurriculumServ;
     private final CurriculumCourseService curriculumCourseServ;
-
+    private final InscriptionRepository ir;
     private final UserService userServ;
 
-    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ, UserService userServ){
+    private final ExternalCurriculumRepository ecr;
+    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ, InscriptionRepository ir, UserService userServ, ExternalCurriculumRepository ecr){
         this.curriculumServ = curriculumServ;
         this.authServ = authServ;
         this.userCurriculumServ = userCurriculumServ;
         this.curriculumCourseServ = curriculumCourseServ;
+        this.ir = ir;
         this.userServ = userServ;
+        this.ecr = ecr;
     }
 
     @GetMapping("/curriculum/{id}")
@@ -116,13 +119,12 @@ public class CurriculumController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @GetMapping("/externalcurriculum/{userId}")
-    public ResponseEntity<Map<String,Object>> getStudentsExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable String userId){
+    @GetMapping("/externalcurriculum/{inscriptionRequestId}")
+    public ResponseEntity<Map<String,Object>> getInscriptionRequestExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable String inscriptionRequestId){
         if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
             return new UnauthorizedResponse<>(null);
 
-        User u = userServ.getUserById(Long.parseLong(userId));
-        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByStudent(u);
+        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByInscriptionRequestId(Long.parseLong(inscriptionRequestId));
 
         if (toReturn == null)
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@@ -131,4 +133,11 @@ public class CurriculumController {
     }
 
 
+    //Note : everyone can post some externalcurriculums (the validity of the elements is assured by the inscription service)
+    @PostMapping("/externalcurriculum")
+    public ResponseEntity<ExternalCurriculum> postExternalCurriculum(@RequestBody ExternalCurriculum ec){
+        ec.setState(RequestState.Pending);
+        return new ResponseEntity<>(ecr.save(ec), HttpStatus.OK);
+    }
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
index 32346a4..5835fab 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
@@ -2,10 +2,11 @@ package ovh.herisson.Clyde.Repositories;
 
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.ExternalCurriculum;
+import ovh.herisson.Clyde.Tables.InscriptionRequest;
 import ovh.herisson.Clyde.Tables.User;
 
 import java.util.ArrayList;
 
 public interface ExternalCurriculumRepository extends CrudRepository<ExternalCurriculum, Long> {
-    ArrayList<ExternalCurriculum> getExternalCurriculumByUser(User user);
+    ArrayList<ExternalCurriculum> getExternalCurriculumByInscriptionRequestId(Long id);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
index 0b0cebf..7c65e2e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
@@ -4,10 +4,7 @@ import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.CurriculumRepository;
 import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.ExternalCurriculum;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.UserCurriculum;
+import ovh.herisson.Clyde.Tables.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,16 +49,16 @@ public class UserCurriculumService {
     }
 
 
-    public HashMap<String,Object> findAllExternalCurriculumByStudent(User student) {
-        ArrayList<ExternalCurriculum> list = externalCurriculumRepo.getExternalCurriculumByUser(student);
+    public HashMap<String,Object> findAllExternalCurriculumByInscriptionRequestId(Long id) {
+        ArrayList<ExternalCurriculum> list = externalCurriculumRepo.getExternalCurriculumByInscriptionRequestId(id);
 
         ArrayList<HashMap<String, Object>> externalCurriculumList = new ArrayList<HashMap<String, Object>>();
 
         for (int i = 0; i < list.size(); i++) {
             HashMap<String, Object> element = new HashMap<>();
             element.put("id", list.get(0).getId());
-            element.put("user", list.get(0).getUser());
-            element.put("university", list.get(0).getUniversity());
+            element.put("inscriptionRequestId", list.get(0).getInscriptionRequestId());
+            element.put("school", list.get(0).getSchool());
             element.put("formation", list.get(0).getFormation());
             element.put("completion", list.get(0).getCompletion());
             element.put("startYear", list.get(0).getStartYear());
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
index 6e0d90f..5193f22 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
@@ -10,13 +10,9 @@ public class ExternalCurriculum {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
-    @ManyToOne
-    @JoinColumn(name="Users")
-    private User user;
+    private Long inscriptionRequestId;
 
-    @ManyToOne
-    @JoinColumn(name="University")
-    private University university;
+    private String school;
 
     private String formation;
 
@@ -32,9 +28,9 @@ public class ExternalCurriculum {
 
     public ExternalCurriculum(){}
 
-    public ExternalCurriculum(User user, University university, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
-        this.user = user;
-        this.university = university;
+    public ExternalCurriculum(Long ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
+        this.inscriptionRequestId = ir;
+        this.school = school;
         this.formation = formation;
         this.completion = completion;
         this.startYear = startYear;
@@ -47,20 +43,20 @@ public class ExternalCurriculum {
         return id;
     }
 
-    public User getUser() {
-        return user;
+    public Long getInscriptionRequestId() {
+        return inscriptionRequestId;
     }
 
-    public void setUser(User user) {
-        this.user = user;
+    public void setInscriptionRequest(Long inscriptionRequestId) {
+        this.inscriptionRequestId = inscriptionRequestId;
     }
 
-    public University getUniversity() {
-        return university;
+    public String getSchool() {
+        return school;
     }
 
-    public void setUniversity(University university) {
-        this.university = university;
+    public void setSchool(String school) {
+        this.school = school;
     }
 
     public String getFormation() {
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
index b01644e..bbcf921 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
@@ -15,7 +15,6 @@ public class InscriptionRequest {
     private String email;
     private String country;
     private Date birthDate;
-
     private Long curriculumId;
     private RequestState state;
     private String profilePicture;
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index a1cf99a..5bbf682 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -1,16 +1,15 @@
 <script setup>
   import {reactive, ref } from 'vue'
   import i18n from '@/i18n.js'
-  import { login , register , disconnect, isLogged} from '@/rest/Users.js'
-  import { getAllCurriculums } from '@/rest/curriculum.js'
+  import {login, register, disconnect, isLogged} from '@/rest/Users.js'
+  import {createExternalCurriculum, getAllCurriculums, getcurriculum} from '@/rest/curriculum.js'
   import { uploadProfilePicture } from '@/rest/uploads.js'
   import {toast} from 'vue3-toastify'
   import 'vue3-toastify/dist/index.css';
 
-
   const loginPage= ref(true)
   const page = ref(0)
-  
+
   const outputs = reactive({
     surname:null,
     firstname:null,
@@ -22,12 +21,30 @@
     curriculum:null,
   })
 
+  const notcompletedCheck = ref(false);
+
+  const externalCurr = reactive({
+    inscriptionRequestId : null,
+    school:null,
+    formation :null,
+    completion : null,
+    startYear : null,
+    endYear: null,
+    justifdocUrl : null
+  })
+
+  //Stores some externalCurriculums in order to upload them all at the confirmation of the registration request
+  const externalCurrTab = ref([]);
+
   const submitValue= ref(i18n("login.guest.submit"))
   const passwordConfirm=ref("")
  
   const imageSaved = ref(false)
   let ppData = ""
 
+  //Contains the id of the newly created request (useful to link the student's formations informations to the request)
+  let requestId = ""
+
   const curricula= await getAllCurriculums();
   
   function goBackHome(){
@@ -69,6 +86,26 @@
     let id = cursus.substring(0, cursus.indexOf(" ")+1);
     return id;
   }
+
+  async function getCurriculumYear(curriculumId){
+    const curriculum = await getcurriculum(curriculumId);
+    return parseInt(curriculum.year);
+  }
+
+
+
+  //Post the register request and return the id of the newly created request and also post the external curriculum list in the database
+  async function postRegisterReq(){
+    const val = await register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, parseDecoratedCursus(outputs.curriculum), ppData, null, new Date());
+    for (let item in externalCurrTab.value){
+      await createExternalCurriculum(val.id, externalCurrTab.value[item].school, externalCurrTab.value[item].formation, externalCurrTab.value[item].completion, externalCurrTab.value[item].startYear, externalCurrTab.value[item].endYear, externalCurrTab.value[item].justifdocUrl);
+    }
+  }
+
+
+  function deleteExtCursus(extcursus){
+    externalCurrTab.value.splice(externalCurrTab.value.indexOf(extcursus),1)
+  }
 </script>
 
 
@@ -168,7 +205,7 @@
                 changer de cursus/réinscription sinon continuez ici.
               </p>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, parseDecoratedCursus(outputs.curriculum), ppData, null, new Date());">
+                <button style="margin-top:25px;" @click="page++;">
                   {{i18n("login.guest.nextpage")}}
                 </button>
               </div>
@@ -183,11 +220,65 @@
               <form novalidate enctype="multipart/form-data" class="inputBox">
                 Carte d'identité :
               </form>
+              <button @click="page++">{{i18n("login.guest.nextpage")}}</button>
+            </div>
+            <div v-if="page === 3">
+              <p>
+                Vous avez séléctionné un cursus qui possède des prérequis veuillez ajouter vos formations antérieures
+                dans l'enseignement supérieur, votre dossier sera vérifié par un membre du service d'inscription.
+              </p>
+              <button @click="page++">Ajouter une formation</button>
+              <button @click="postRegisterReq();">Envoyer la demande d'inscription</button>
+            </div>
+            <div v-if="page===4">
+              <form @submit.prevent=""class="form">
+                <div class="inputBox">
+                  <p>Ecole</p>
+                  <input type="text" v-model="externalCurr.school">
+                </div>
+                <div class="inputBox">
+                  <p>Formation</p>
+                  <input type="text" v-model="externalCurr.formation">
+                </div>
+                <div class="inputBox">
+                  <p>Cochez la case si vous n'avez terminé cette formation</p>
+                  <input v-model="notcompletedCheck" type="checkbox" id="checkboxformation">
+                  <div v-if="notcompletedCheck">
+                    <p>En quelle année de la formation vous êtes vous arrété (exemple: 3ème) ?</p>
+                    <input type="text" v-model="externalCurr.completion">
+                  </div>
+                </div>
+                <div class="inputBox">
+                  <p>Année de début</p>
+                  <input type="text" v-model="externalCurr.startYear">
+                </div>
+                <div class="inputBox">
+                  <p>Année de fin</p>
+                  <input type="text" v-model="externalCurr.endYear">
+                </div>
+                <div class="inputBox" style="margin-bottom:35px;">
+                  <input type="submit" v-model="submitValue" @click="externalCurrTab.push({inscriptionReqId:null, school:externalCurr.school, formation:externalCurr.formation, completion:externalCurr.completion, startYear:externalCurr.startYear, endYear:externalCurr.endYear, justifdocUrl:externalCurr.justifdocUrl});console.log(externalCurrTab);page--;">
+                </div>
+              </form>
             </div>
           </form>
          </div>
     </div>
   </div>
+  <div style="display:flex; justify-content:center; " v-for="item in externalCurrTab" v-if="page===3">
+    <div class="bodu">
+      <div class="container">
+        <div class="school"><a style="margin-left:30px;">{{item.school}}</a></div>
+        <div class="formation"><a>{{item.formation}}</a></div>
+        <div class="edit">
+          <button style="background-color:rgb(105,05,105);font-size:15px;height:50px;width:75%;border:none;border-radius:20px;" @click="externalCurr.school=item.school; externalCurr.completion=item.completion; externalCurr.formation=item.formation;externalCurr.endYear=item.endYear; externalCurr.startYear=item.startYear; externalCurr.justifdocUrl;page++;">Edit </button>
+        </div>
+        <div class="remove">
+          <button style="background-color:rgb(105,05,105);font-size:15px;height:50px;width:75%;border:none;border-radius:20px;" @click="deleteExtCursus(item)">Remove </button>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style scoped>
@@ -196,9 +287,8 @@
   margin-left: auto;
   margin-right:auto;
   min-width:400px;
-
   width:25%;
-  height:60%;
+  height:50%;
 }
 
 
@@ -251,6 +341,14 @@
   cursor: pointer;
 }
 
+.bodu {
+  margin-top:2%;
+  width:50%;
+  border:2px solid black;
+  border-radius:9px;
+  background-color:rgb(50,50,50);
+}
+
 .switchpage{
   width:100px;
   border: none;
@@ -290,11 +388,22 @@ input[type=file]{
   background:#FFFFFF;
 }
 
+.container{
+  margin-top: 2%;
+  color:white;
+  height:60px;
+  font-size:30px;
+  display:grid;
+  grid-template-columns:30% 30% 20% 20%;
+  grid-template-areas:
+    "school formation completion edit remove";
+  column-gap:10px;
+}
+
 button:active ,.switchpage:active{
   opacity:0.8;
 
 }
 
 
-
 </style>
diff --git a/frontend/src/rest/curriculum.js b/frontend/src/rest/curriculum.js
index 29815ab..32b9878 100644
--- a/frontend/src/rest/curriculum.js
+++ b/frontend/src/rest/curriculum.js
@@ -52,3 +52,15 @@ export async function getSelfCurriculum(){
 export async function getSomeonesCurriculumList(user){
 	return restGet("/onescurriculum/"+user)
 }
+
+export async function createExternalCurriculum(inscriptionRequestId,school, formation, completion, startYear, endYear, justifdocUrl){
+	return restPost("/externalcurriculum", {
+		inscriptionRequestId: inscriptionRequestId,
+		school:school,
+		formation :formation,
+		completion : completion,
+		startYear : startYear,
+		endYear: endYear,
+		justifdocUrl : justifdocUrl
+	})
+}

From 3c721de18bd818d5554c21ca9825c9a12a40f9ed Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Sat, 6 Apr 2024 16:12:11 +0200
Subject: [PATCH 15/25] Big commit: make some changes to profile to provide an
 interface for a student to manage his courses.

implements the submission of exemptions request
---
 .../Clyde/EndPoints/CourseController.java     |   1 +
 .../Clyde/EndPoints/CurriculumController.java |   4 +-
 .../Clyde/EndPoints/MockController.java       |   3 +-
 .../Clyde/EndPoints/RequestsController.java   |  32 ++++
 .../ExemptionsRequestRepository.java          |   8 +
 .../Clyde/Tables/ExemptionsRequest.java       |  31 ++--
 .../ovh/herisson/Clyde/Tables/FileType.java   |   5 +-
 frontend/src/Apps/AboutRequest.vue            |  57 ++++++-
 frontend/src/Apps/AboutStudent.vue            |   2 +-
 frontend/src/Apps/CourseList.vue              | 145 ++++++++++++++++++
 frontend/src/Apps/Profil.vue                  | 135 ++++++++++------
 frontend/src/rest/ServiceInscription.js       |   2 +-
 frontend/src/rest/curriculum.js               |   4 +
 frontend/src/rest/requests.js                 |   5 +
 14 files changed, 360 insertions(+), 74 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ExemptionsRequestRepository.java
 create mode 100644 frontend/src/Apps/CourseList.vue
 create mode 100644 frontend/src/rest/requests.js

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CourseController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CourseController.java
index d5e87a8..474e2cb 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CourseController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CourseController.java
@@ -135,4 +135,5 @@ public class CourseController {
         courseServ.delete(courseServ.findById(id));
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index 4be7ba9..5f917e4 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -120,11 +120,11 @@ public class CurriculumController {
     }
 
     @GetMapping("/externalcurriculum/{inscriptionRequestId}")
-    public ResponseEntity<Map<String,Object>> getInscriptionRequestExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable String inscriptionRequestId){
+    public ResponseEntity<Map<String,Object>> getInscriptionRequestExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable long inscriptionRequestId){
         if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
             return new UnauthorizedResponse<>(null);
 
-        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByInscriptionRequestId(Long.parseLong(inscriptionRequestId));
+        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByInscriptionRequestId(inscriptionRequestId);
 
         if (toReturn == null)
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 96e7be4..3fda0d5 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -79,6 +79,7 @@ public class MockController {
 
         ucr.save(new UserCurriculum(joe, infoBab1, 2022));
         ucr.save(new UserCurriculum(joe, chemistryBab1, 2023));
+        ucr.save(new UserCurriculum(joe, infoBab1, 2023));
         ucr.save(new UserCurriculum(joe, psychologyBab1, 2020));
         ucr.save(new UserCurriculum(popo, infoBab1, 2022));
         ucr.save(new UserCurriculum(popo, infoBab2, 2023));
@@ -96,7 +97,7 @@ public class MockController {
 
         CurriculumCourseService.save(new CurriculumCourse(infoBab1,progra1));
         CurriculumCourseService.save(new CurriculumCourse(infoBab1,commun));
-
+        CurriculumCourseService.save(new CurriculumCourse(infoBab1, psycho1));
         CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,psycho1));
         CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,commun));
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
new file mode 100644
index 0000000..e5865d2
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
@@ -0,0 +1,32 @@
+package ovh.herisson.Clyde.EndPoints;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import ovh.herisson.Clyde.Repositories.ExemptionsRequestRepository;
+import ovh.herisson.Clyde.Tables.ExemptionsRequest;
+import ovh.herisson.Clyde.Tables.RequestState;
+
+@RestController
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+public class RequestsController {
+
+    public final ExemptionsRequestRepository err;
+
+    public RequestsController(ExemptionsRequestRepository err) {
+        this.err = err;
+    }
+
+    @PostMapping(value="/exemptionreq")
+    public ResponseEntity<String> register(@RequestBody ExemptionsRequest exemptionsRequest){
+
+        exemptionsRequest.setState(RequestState.Pending);
+
+        err.save(exemptionsRequest);
+
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExemptionsRequestRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExemptionsRequestRepository.java
new file mode 100644
index 0000000..917af1e
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExemptionsRequestRepository.java
@@ -0,0 +1,8 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ExemptionsRequest;
+
+public interface ExemptionsRequestRepository extends CrudRepository<ExemptionsRequest, Long> {
+
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
index 1feacc8..ba01d15 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
@@ -9,21 +9,16 @@ public class ExemptionsRequest {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    private User user;
-
-    @ManyToOne
-    @JoinColumn(name = "Course")
-    private Course course;
+    private long userRegNo;
+    private long courseId;
     private String justifDocument;
 
     private RequestState state;
 
 
-    public ExemptionsRequest(User user, Course course, String justifDocument, RequestState state){
-        this.user = user;
-        this.course = course;
+    public ExemptionsRequest(Long userRegNo, long courseId, String justifDocument, RequestState state){
+        this.userRegNo = userRegNo;
+        this.courseId = courseId;
         this.justifDocument = justifDocument;
         this.state = state;
     }
@@ -31,20 +26,20 @@ public class ExemptionsRequest {
 
     public ExemptionsRequest(){}
 
-    public User getUser() {
-        return user;
+    public Long getUserRegNo() {
+        return userRegNo;
     }
 
-    public void setUser(User user) {
-        this.user = user;
+    public void setUserRegNo(Long userRegNo) {
+        this.userRegNo = userRegNo;
     }
 
-    public Course getCourse() {
-        return course;
+    public long getCourseId() {
+        return courseId;
     }
 
-    public void setCourse(Course course) {
-        this.course = course;
+    public void setCourseId(long courseId) {
+        this.courseId = courseId;
     }
 
     public String getJustifDocument() {
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
index 18ce1be..e7a081b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
@@ -1,8 +1,7 @@
 package ovh.herisson.Clyde.Tables;
 
 public enum FileType {
-
     ProfilePicture,
-
-    EducationCertificate
+    EducationCertificate,
+    JustificationDocument
 }
diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/AboutRequest.vue
index 186f75c..05c76c5 100644
--- a/frontend/src/Apps/AboutRequest.vue
+++ b/frontend/src/Apps/AboutRequest.vue
@@ -1,13 +1,15 @@
 <script setup>
 import i18n from "@/i18n.js"
 import {getUser} from '../rest/Users.js'
-import {getcurriculum, getSomeonesCurriculumList} from "@/rest/curriculum.js";
+import {getcurriculum, getExternalCurriculumListByInscrReq, getSomeonesCurriculumList} from "@/rest/curriculum.js";
 import {getRegisters} from "@/rest/ServiceInscription.js";
+import {get} from "jsdom/lib/jsdom/named-properties-tracker.js";
 
 const props = defineProps(['target']);
 let request = await getRegisters(props.target);
 const cursus = await getcurriculum(request.curriculum);
-
+const externalCurriculum = await getExternalCurriculumListByInscrReq(request.id)
+console.log(externalCurriculum)
 function getPP(){
   if(request.profilePictureUrl === null){
     return "/Clyde.png"
@@ -44,6 +46,19 @@ function getPP(){
           </div>
         </div>
       </div>
+      <div class="moreInfos">
+        <div class = "oldcursus">
+          <div class="listTitle">
+            Cursus extérieurs a l'univesité
+          </div>
+          <div  class="listElement">
+            <div class=" containerElement" v-for="item in externalCurriculum">
+              <div class="formation">item.formation</div>
+              <div class="school">item.school</div>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 
@@ -152,4 +167,42 @@ button{
   border-radius:20px;
 
 }
+
+.moreInfos {
+  display:grid;
+  grid-template-rows:200px auto;
+  column-gap:50px;
+  row-gap:45px;
+  grid-template-areas:
+  "minfos minfos";
+  grid-template-columns:600px 600px;
+  align-items:center;
+  justify-content:center;
+  margin-left: 320%;
+}
+
+.listTitle{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width:250px;
+  margin-left:auto;
+  margin-right:auto;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;margin-bottom:10px;
+}
+
+.listElement{
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  margin-bottom:10px;
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/AboutStudent.vue b/frontend/src/Apps/AboutStudent.vue
index 394014a..087559a 100644
--- a/frontend/src/Apps/AboutStudent.vue
+++ b/frontend/src/Apps/AboutStudent.vue
@@ -64,7 +64,7 @@
             </div>
           </div>
         </div>
-        <div class="newcursus"  >
+        <div class="newcursus">
           <div class="listTitle">
             Cursus Actuel
           </div>
diff --git a/frontend/src/Apps/CourseList.vue b/frontend/src/Apps/CourseList.vue
new file mode 100644
index 0000000..77a7dba
--- /dev/null
+++ b/frontend/src/Apps/CourseList.vue
@@ -0,0 +1,145 @@
+<script setup>
+
+import {reactive, ref} from "vue";
+import i18n from "@/i18n.js";
+import {getCourse} from "@/rest/courses.js";
+import {getcurriculum} from "@/rest/curriculum.js";
+import {uploadFile, uploadProfilePicture} from "@/rest/uploads.js";
+import {createExemptionsRequest} from "@/rest/requests.js";
+import {getSelf} from "@/rest/Users.js";
+
+const props = defineProps(["cursuslist"])
+const selectedCurriculum = ref(props.cursuslist[0])
+const user = await getSelf()
+
+const courseslist = ref(await getcurriculum(selectedCurriculum.value.curriculumId))
+const list = ref(true)
+
+const ppData = ref({})
+async function updateCourseList(){
+  courseslist.value = await getcurriculum(selectedCurriculum.value.curriculumId)
+}
+
+async function uploadfileandgetpath(file, type){
+  const a = await uploadFile(file, type);
+  exemptReq.justifDocument = a.url
+}
+
+async function postExemptionRequest(file, type){
+  const a = await uploadFile(file, type);
+  exemptReq.justifDocument = a.url
+  await createExemptionsRequest(exemptReq)
+}
+const exemptReq = reactive({
+  userRegNo : user.regNo,
+  courseId : null,
+  justifDocument : "e",
+  state : null
+})
+</script>
+
+<template style="margin-top:5%;">
+  <div v-if="list == true">
+    <span>Selected Cursus :   </span>
+    <select v-model="selectedCurriculum" @change="updateCourseList">
+      <option v-for="item in props.cursuslist" :value="item">Bac {{item.year}} {{item.option}}</option>
+    </select>
+    <div style="display:flex; justify-content:center;" v-for="item in courseslist.courses">
+      <div class="bodu">
+        <div class="container">
+          <div class="title">{{item.title}}</div>
+          <div class="firstname">{{item.owner.firstName}}</div>
+          <div class="lastname">{{item.owner.lastName}}</div>
+          <div class="credits">credits : {{item.credits}}</div>
+          <div class="askexemption"><button style="background-color:rgb(105,0,0);" @click="list= !list;exemptReq.courseId=item.courseId">Ask exemption</button></div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div v-else>
+      <p>Please upload the justification document for the exemption </p>
+    <label class="browser">
+      <input  type="file" @change="ppData.value = $event.target.files" accept="image/*" ref="filepath">
+    </label>
+    <button style="width:15%; margin-top: 5%;" @click="postExemptionRequest(ppData.value, 'JustificationDocument');">
+      Submit exemption request
+    </button>
+  </div>
+</template>
+
+<style scoped>
+.container{
+  color:white;
+  height:100px;
+  font-size:30px;
+  display:grid;
+  grid-template-columns:30% 20% 15% 15% 15%;
+  grid-template-areas:"title firstname lastname credits askexemption";
+  column-gap:10px;
+}
+
+.title {
+  grid-area:title;
+  align-self:center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  font-size: 50%;
+  margin-left:30px;
+}
+
+.credits {
+  grid-area:credits;
+  align-self:center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  font-size: 50%;
+}
+
+.askexemption {
+  grid-area:askexemption;
+  align-self:center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
+}
+.lastname{
+  grid-area:lastname;
+  align-self:center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  font-size: 50%;
+}
+
+
+.firstname{
+  grid-area:firstname;
+  align-self:center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  font-size: 50%;
+  padding-left: 30%;
+}
+
+
+.bodu {
+  margin-top:2%;
+  width:100%;
+  border:2px solid black;
+  border-radius:9px;
+  background-color:rgb(50,50,50);
+}
+
+button{
+  border:none;
+  background-color:rgb(239, 60, 168);
+  border-radius:10px;
+  height:35px;
+  margin-top:10px;
+
+}
+</style>
+
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 643cc7d..2471429 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -1,16 +1,18 @@
 <script setup>
   import {reactive, ref } from 'vue'
   import {getSelf,alterSelf,disconnect,deleteUser} from '../rest/Users.js'
-  import {getSelfCurriculum, getAllCurriculums} from '../rest/curriculum.js'
+  import {getSelfCurriculum, getAllCurriculums, getSomeonesCurriculumList} from '../rest/curriculum.js'
   import {getCourses} from "../rest/courses.js"
   import i18n from "@/i18n.js"
   import { uploadProfilePicture } from '@/rest/uploads.js'
+  import CourseList from "@/Apps/CourseList.vue";
 
   const user = ref(await getSelf());
   const UserCurriculum = ref(""); 
   const curricula = ref (await getAllCurriculums());
+
   if(user.value.role === "Student"){
-    UserCurriculum.value = await getSelfCurriculum();
+    UserCurriculum.value = await getSomeonesCurriculumList(user.value.regNo);
   }
 
   if(user.role === "Teacher"){
@@ -19,6 +21,7 @@
   const modif = ref(false);
   const curric = ref(false);
   const reg = ref(false);
+  const courseslist = ref(false);
 
   const pattern = {
     profilPictureUrl:null,
@@ -86,17 +89,35 @@
     }
     return user.profilePictureUrl
   }
+
+  function getYear(){
+    let date = new Date();
+    if (date.getMonth() <= 6){
+      return date.getFullYear()-1
+    }
+    return date.getFullYear()
+  }
+
+  //This function travels through the student cursus array and extract the current cursus of the student
+  function getActualCurriculumList(){
+    let actualCurriculumList = [];
+    for (let i = 0; i < UserCurriculum.value.curriculumList.length; i++){
+      if (UserCurriculum.value.curriculumList[i].dateyear === getYear()){
+        actualCurriculumList.push(UserCurriculum.value.curriculumList[i]);
+      }
+    }
+    return actualCurriculumList
+  }
 </script>
 
 <template>
   <div class="body">
-  <div class="container">
+  <div class="container" v-if="courseslist == false">
     <div class="profilPic">
       <img class="subContainter" :src=getPP()>
-
     </div>
       <div class="globalInfos">
-        <div v-if="modif==false && curric==false && reg==false " class="infosContainer" >
+        <div v-if="modif==false && curric==false && reg==false" class="infosContainer">
           <div>
             {{user.firstName}} {{user.lastName}}   
           </div>
@@ -119,6 +140,9 @@
           <div v-if="(user.role==='Student')">
             <button @click="curric=!curric">{{i18n("profile.change.curriculum")}}</button>
           </div>
+          <div v-if="(user.role==='Student')">
+            <button @click="courseslist=!courseslist">Manage Courses</button>
+          </div>
         </div>
         <div v-else-if="modif" class="infosContainer">
           <div>
@@ -182,29 +206,38 @@
             <button @click=" reg=!reg; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
           </div>
         </div>
-
       </div>
-      
       <div v-if="modif==false && curric==false && reg==false "class="moreInfos">
-
-        <div v-if="(user.role ==='Student')">
-          <div class="listTitle">
-            {{i18n("profile.course.list")}}
+          <div class = "oldcursus">
+            <div class="listTitle">
+              Anciens Cursus
+            </div>
+            <div  class="listElement">
+              <div class=" containerElement" v-for="item in UserCurriculum.curriculumList">
+                <div class="year" v-if="parseInt(item.dateyear) !== getYear()">Bac {{item.year}}</div>
+                <div class="option" v-if="parseInt(item.dateyear) !== getYear()">{{item.option}}</div>
+                <div class="dateyear" v-if="parseInt(item.dateyear) !== getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
+              </div>
+            </div>
           </div>
-          <div  class="listElement" v-for="item in UserCurriculum.courses">
-          <div class=" containerElement">
-            <div class="name"> {{item.title}} </div>
-            <div class="teacher">{{item.owner.lastName}}</div> 
-            <div class="credits">Credits:{{item.credits}}</div>  
+          <div class="actualcursus">
+            <div class="listTitle">
+              Cursus Actuel
+            </div>
+            <div  class="listElement">
+              <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" >
+                <div class="year" v-if="parseInt(item.dateyear) === getYear()">Bac {{item.year}}</div>
+                <div class="option" v-if="parseInt(item.dateyear) === getYear()">{{item.option}}</div>
+                <div class="dateyear" v-if="parseInt(item.dateyear) === getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
+              </div>
+            </div>
           </div>
-          </div>
-        </div>
-        
-        <div>
-        </div>
-    
       </div>
   </div>
+    <div v-if="courseslist === true" style="width: 80%">
+      <CourseList :cursuslist="getActualCurriculumList()"/>
+      <button style="width: 10%; margin-top: 5%" @click="courseslist = false">Return to profile</button>
+    </div>
 </div>
 </template>
 <style scoped>
@@ -240,7 +273,32 @@
 }
 
 .moreInfos {
-  grid-area:minfos;
+  margin-top: 50%;
+  display:grid;
+  grid-template-rows:200px auto;
+  column-gap:50px;
+  row-gap:45px;
+  grid-template-areas:
+  "minfos minfos";
+  grid-template-columns:600px 600px;
+  align-items:center;
+  justify-content:center;
+  margin-left: 320%;
+}
+
+.listTitle{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width:250px;
+  margin-left:auto;
+  margin-right:auto;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;margin-bottom:10px;
 }
 .body {
     min-width:960px;
@@ -250,16 +308,17 @@
     justify-content:center;
     margin-top:5%;
   }
- .containerElement{ 
+ .containerElement{
    justify-content:center;
-    display:grid;
-    grid-template-columns:38.8% 38.8% 22.4%;
-    grid-template-areas:
-    "name teacher credits"; 
-    column-gap:10px;
+   display:grid;
+   grid-template-columns:100px 100px 300px;
+   grid-template-areas:
+    "year option dateyear";
+   column-gap:40px;
+   padding-left: 25px;
     
   }
-  
+
   .name {
     grid-area:name;
     align-self:center;
@@ -275,24 +334,8 @@
     align-self:center;
   }
 
-.listTitle{
-    min-width:197px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width:8vw;
-    margin-left:auto;
-    margin-right:auto;
-    border:2px solid black;
-    font-size:25px;
-    color:white;
-    padding:20px;
-    background-color:rgb(50,50,50);
-    border-radius:20px;margin-bottom:10px;
-}
 
 .listElement{
-  min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
diff --git a/frontend/src/rest/ServiceInscription.js b/frontend/src/rest/ServiceInscription.js
index 5489713..878f38b 100644
--- a/frontend/src/rest/ServiceInscription.js
+++ b/frontend/src/rest/ServiceInscription.js
@@ -3,7 +3,7 @@
  *
  * TODO: On time of writing, the backend doesn't support these endpoints so it could be modified in the future.
  */
-import {restGet, restPatch} from './restConsumer.js'
+import {restGet, restPatch, restPost} from './restConsumer.js'
 
 /**
  * create a new register requests that can be recovered by the registering service
diff --git a/frontend/src/rest/curriculum.js b/frontend/src/rest/curriculum.js
index 32b9878..d468dcf 100644
--- a/frontend/src/rest/curriculum.js
+++ b/frontend/src/rest/curriculum.js
@@ -64,3 +64,7 @@ export async function createExternalCurriculum(inscriptionRequestId,school, form
 		justifdocUrl : justifdocUrl
 	})
 }
+
+export async function getExternalCurriculumListByInscrReq(inscriptionRequestId){
+	return restGet("/externalCurriculum/"+parseInt(inscriptionRequestId))
+}
diff --git a/frontend/src/rest/requests.js b/frontend/src/rest/requests.js
new file mode 100644
index 0000000..643d1d9
--- /dev/null
+++ b/frontend/src/rest/requests.js
@@ -0,0 +1,5 @@
+import {restPost} from "@/rest/restConsumer.js";
+
+export async function createExemptionsRequest(exempReq){
+    return restPost("/exemptionreq", exempReq)
+}
\ No newline at end of file

From 194b14f02b18b05ca586945a515a4a917fc562ee Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Mon, 8 Apr 2024 10:18:28 +0200
Subject: [PATCH 16/25] Implements the backend logic for the minerval gestion

---
 .../Clyde/EndPoints/MinervalController.java   | 45 +++++++++++++
 .../Repositories/MinervalRepository.java      | 10 +++
 .../ovh/herisson/Clyde/Tables/Minerval.java   | 64 +++++++++++++++++++
 3 files changed, 119 insertions(+)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/Minerval.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
new file mode 100644
index 0000000..7d93a04
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
@@ -0,0 +1,45 @@
+package ovh.herisson.Clyde.EndPoints;
+
+import org.apache.coyote.Response;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Repositories.MinervalRepository;
+import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
+import ovh.herisson.Clyde.Services.AuthenticatorService;
+import ovh.herisson.Clyde.Tables.Minerval;
+import ovh.herisson.Clyde.Tables.Role;
+
+import java.util.*;
+
+@RestController
+public class MinervalController {
+    private final AuthenticatorService authServ;
+    private final MinervalRepository mr;
+
+    public MinervalController(AuthenticatorService authServ, MinervalRepository mr) {
+        this.authServ = authServ;
+        this.mr = mr;
+    }
+
+    //A new minerval entry is posted when the inscription service accept a registration request
+    @PostMapping("/minerval/{studentRegNo}")
+    public ResponseEntity<Object> postMinerval(@RequestHeader("Authorization") String token, @PathVariable long studentRegNo){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
+            return new UnauthorizedResponse<>(null);
+
+        Calendar c = new GregorianCalendar();
+
+        mr.save(new Minerval(studentRegNo, 0, 835, c.get(Calendar.YEAR)));
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @GetMapping("/minerval/{studentRegNo}")
+    public ResponseEntity<Minerval> getCurrentMinervalbyRegNo(@PathVariable long studentRegNo){
+        ArrayList<Minerval> mlist = mr.getMinervalsByStudentRegNoOrderByYearDesc(studentRegNo);
+
+        //The list is ordered by year in descending order then the index 0 contains the actual minerval (for this year)
+        Minerval m = mlist.get(0);
+        return new ResponseEntity<>(m, HttpStatus.OK);
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
new file mode 100644
index 0000000..37c46d7
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
@@ -0,0 +1,10 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.Minerval;
+
+import java.util.ArrayList;
+
+public interface MinervalRepository extends CrudRepository<Minerval, Long> {
+    public ArrayList<Minerval> getMinervalsByStudentRegNoOrderByYearDesc(Long studentRegNo);
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Minerval.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Minerval.java
new file mode 100644
index 0000000..b54e5db
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Minerval.java
@@ -0,0 +1,64 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
+public class Minerval {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    private long studentRegNo;
+    private int paidAmount;
+    private int toPay;
+
+    //If the academic year is 2023-2024 then 2023 will be stored here (we take the lowest year)
+    private int year;
+    public Minerval(){}
+
+    public Minerval(long studentRegNo, int paidAmount, int toPay, int year){
+        this.studentRegNo = studentRegNo;
+        this.paidAmount = paidAmount;
+        this.toPay = toPay;
+        this.year = year;
+    }
+
+    public long getStudentRegNo() {
+        return studentRegNo;
+    }
+
+    public void setStudentRegNo(long studentRegNo) {
+        this.studentRegNo = studentRegNo;
+    }
+
+    public int getPaidAmount() {
+        return paidAmount;
+    }
+
+    public void setPaidAmount(int paidAmount) {
+        this.paidAmount = paidAmount;
+    }
+
+    public int getToPay() {
+        return toPay;
+    }
+
+    public void setToPay(int toPay) {
+        this.toPay = toPay;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public long getId() {
+        return id;
+    }
+}

From e6e147af263c67311ca3fc990f17989a98106b2e Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Mon, 8 Apr 2024 14:50:37 +0200
Subject: [PATCH 17/25] Implements the school fees gestion for a student and a
 payment table containing a history of all the financial transactions of the
 system

---
 .../Clyde/EndPoints/MinervalController.java   | 11 +++
 .../Clyde/EndPoints/MockController.java       |  8 +-
 .../Clyde/EndPoints/PaymentController.java    | 42 ++++++++++
 .../Repositories/MinervalRepository.java      |  2 +
 .../Clyde/Repositories/PaymentRepository.java | 10 +++
 .../Clyde/Services/InscriptionService.java    | 19 +++--
 .../ovh/herisson/Clyde/Tables/Payment.java    | 84 +++++++++++++++++++
 frontend/src/Apps/Inscription.vue             |  3 +
 frontend/src/Apps/Profil.vue                  | 59 +++++++++++--
 frontend/src/rest/minerval.js                 |  9 ++
 frontend/src/rest/payment.js                  |  6 ++
 11 files changed, 238 insertions(+), 15 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/PaymentController.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/PaymentRepository.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/Payment.java
 create mode 100644 frontend/src/rest/minerval.js
 create mode 100644 frontend/src/rest/payment.js

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
index 7d93a04..27efc58 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
@@ -13,6 +13,7 @@ import ovh.herisson.Clyde.Tables.Role;
 import java.util.*;
 
 @RestController
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class MinervalController {
     private final AuthenticatorService authServ;
     private final MinervalRepository mr;
@@ -42,4 +43,14 @@ public class MinervalController {
         Minerval m = mlist.get(0);
         return new ResponseEntity<>(m, HttpStatus.OK);
     }
+
+    @PatchMapping("/minerval")
+    public ResponseEntity<Object> updateMinerval(@RequestBody Minerval updatedMinerval){
+        Minerval minerval = mr.findById(updatedMinerval.getId());
+
+        minerval.setPaidAmount(updatedMinerval.getPaidAmount());
+        minerval.setToPay(updatedMinerval.getToPay());
+        mr.save(minerval);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 3fda0d5..0a5d145 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -2,6 +2,7 @@ package ovh.herisson.Clyde.EndPoints;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Repositories.MinervalRepository;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
@@ -29,7 +30,9 @@ public class MockController {
 
     public final UserCurriculumRepository ucr;
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr){
+    public final MinervalRepository minervalRepository;
+
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
@@ -38,6 +41,7 @@ public class MockController {
         this.courseService = courseService;
         this.inscriptionService = inscriptionService;
         this.ucr = ucr;
+        this.minervalRepository = minervalRepository;
     }
 
     /** Saves an example of each user type by :
@@ -61,6 +65,8 @@ public class MockController {
 
         userRepo.saveAll(mockUsers);
 
+        Minerval minerval = new Minerval(joe.getRegNo(), 0, 852, 2023);
+        minervalRepository.save(minerval);
         // Course / Curriculum part
 
         Curriculum infoBab1 = new Curriculum(1,"info");
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/PaymentController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/PaymentController.java
new file mode 100644
index 0000000..b2bf755
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/PaymentController.java
@@ -0,0 +1,42 @@
+package ovh.herisson.Clyde.EndPoints;
+
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Repositories.PaymentRepository;
+import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
+import ovh.herisson.Clyde.Tables.Minerval;
+import ovh.herisson.Clyde.Tables.Payment;
+import ovh.herisson.Clyde.Tables.Role;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+@RestController
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+public class PaymentController {
+
+    private final PaymentRepository paymentRepository;
+
+    public PaymentController(PaymentRepository paymentRepository){
+        this.paymentRepository = paymentRepository;
+    }
+
+    //Post a payment record
+    @PostMapping("/payment")
+    public ResponseEntity<Object> postPayment(@RequestBody Payment payment){
+        paymentRepository.save(payment);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
+    //Get all payment records of a student
+    @GetMapping("/payment/{studentRegNo}")
+    public ResponseEntity<ArrayList<Payment>> getPaymentsByUser(@PathVariable long studentRegNo){
+        ArrayList<Payment> toReturn = paymentRepository.getPaymentsByStudentRegNo(studentRegNo);
+        return new ResponseEntity<>(toReturn, HttpStatus.OK);
+    }
+
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
index 37c46d7..5af1cab 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
@@ -7,4 +7,6 @@ import java.util.ArrayList;
 
 public interface MinervalRepository extends CrudRepository<Minerval, Long> {
     public ArrayList<Minerval> getMinervalsByStudentRegNoOrderByYearDesc(Long studentRegNo);
+
+    public Minerval findById(long id);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/PaymentRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/PaymentRepository.java
new file mode 100644
index 0000000..2e196f4
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/PaymentRepository.java
@@ -0,0 +1,10 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.Payment;
+
+import java.util.ArrayList;
+
+public interface PaymentRepository extends CrudRepository<Payment, Long> {
+    public ArrayList<Payment> getPaymentsByStudentRegNo(long regNo);
+}
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 48e2717..8e31b39 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
@@ -2,14 +2,8 @@ package ovh.herisson.Clyde.Services;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Repositories.InscriptionRepository;
-import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.User;
-import ovh.herisson.Clyde.Tables.UserCurriculum;
+import ovh.herisson.Clyde.Repositories.*;
+import ovh.herisson.Clyde.Tables.*;
 
 @Service
 public class InscriptionService {
@@ -22,14 +16,16 @@ public class InscriptionService {
 
     private final CurriculumRepository curriculumRepo;
 
+    private final MinervalRepository minervalRepository;
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 
 
-    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo){
+    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo, MinervalRepository minervalRepository){
         this.inscriptionRepo = inscriptionRepo;
         this.userRepo = userRepo;
         this.userCurriculumRepo = userCurriculumRepo;
         this.curriculumRepo = curriculumRepo;
+        this.minervalRepository = minervalRepository;
     }
 
     public InscriptionRequest save(InscriptionRequest inscriptionRequest){
@@ -82,6 +78,11 @@ public class InscriptionService {
 
             userRepo.save(userFromRequest);
             userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()),0));
+
+            //Create a minerval for the new student
+            Minerval minerval = new Minerval(userFromRequest.getRegNo(), 0, 852, 2023);
+            minervalRepository.save(minerval);
+
         }
         inscrRequest.setState(requestState);
         save(inscrRequest);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Payment.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Payment.java
new file mode 100644
index 0000000..ae4189e
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Payment.java
@@ -0,0 +1,84 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+import java.util.Date;
+
+@Entity
+public class Payment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    private long studentRegNo;
+    private String card;
+    private String client;
+    private Date expDate;
+    private int amount;
+    private Date date;
+    public Payment(){}
+
+    public Payment(long studentRegNo, String card, String client, Date expDate, int amount, Date date){
+        this.studentRegNo = studentRegNo;
+        this.card = card;
+        this.client = client;
+        this.expDate = expDate;
+        this.amount = amount;
+        this.date = date;
+    }
+
+    public long getStudentRegNo() {
+        return studentRegNo;
+    }
+
+    public void setStudentRegNo(long studentRegNo) {
+        this.studentRegNo = studentRegNo;
+    }
+
+    public String getCard() {
+        return card;
+    }
+
+    public void setCard(String card) {
+        this.card = card;
+    }
+
+    public String getClient() {
+        return client;
+    }
+
+    public void setClient(String client) {
+        this.client = client;
+    }
+
+    public Date getExpDate() {
+        return expDate;
+    }
+
+    public void setExpDate(Date expDate) {
+        this.expDate = expDate;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+}
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index 2788cf5..7069c9e 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -12,6 +12,9 @@
 
   async function upPage(id,review){
     await validateRegister(id,review);
+    if (review == "Accepted"){
+
+    }
     requests.value = await getAllRegisters();
   }
 </script>
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 2471429..4d6052f 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -6,12 +6,15 @@
   import i18n from "@/i18n.js"
   import { uploadProfilePicture } from '@/rest/uploads.js'
   import CourseList from "@/Apps/CourseList.vue";
+  import {editMinerval, getCurrentMinerval} from "@/rest/minerval.js";
+  import {postPayment} from "@/rest/payment.js";
 
   const user = ref(await getSelf());
   const UserCurriculum = ref(""); 
   const curricula = ref (await getAllCurriculums());
-
+  const minerv = ref({});
   if(user.value.role === "Student"){
+    minerv.value = ref(await getCurrentMinerval(user.value.regNo));
     UserCurriculum.value = await getSomeonesCurriculumList(user.value.regNo);
   }
 
@@ -22,7 +25,8 @@
   const curric = ref(false);
   const reg = ref(false);
   const courseslist = ref(false);
-
+  const minerval = ref(false);
+  const paymentPage = ref(false);
   const pattern = {
     profilPictureUrl:null,
     email:null,
@@ -37,7 +41,16 @@
     id:null,
   }
 
-  
+  //Used to modelize a payment
+  const paymentData={
+    studentRegNo: user.value.regNo,
+    date:null,
+    card:null,
+    client:null,
+    expDate:null,
+    amount: null
+  }
+  const paymentAmount = ref(0);
   let toModify= Object.assign({}, pattern);
   let personnalInfos =  Object.assign({}, patternInfos);
   
@@ -117,7 +130,7 @@
       <img class="subContainter" :src=getPP()>
     </div>
       <div class="globalInfos">
-        <div v-if="modif==false && curric==false && reg==false" class="infosContainer">
+        <div v-if="modif==false && curric==false && reg==false && minerval==false && paymentPage == false" class="infosContainer">
           <div>
             {{user.firstName}} {{user.lastName}}   
           </div>
@@ -142,6 +155,42 @@
           </div>
           <div v-if="(user.role==='Student')">
             <button @click="courseslist=!courseslist">Manage Courses</button>
+            <button @click="minerval = !minerval" style="margin-left: 2%">Manage minerval</button>
+          </div>
+        </div>
+        <div v-else-if="minerval" class="infosContainer">
+          <div v-if="minerv.value.toPay != 0">
+            Payment : {{minerv.value.toPay}}€ left to pay
+            <div v-if="minerv.value.paidAmount <= 50">
+              <button @click="minerval = !minerval; paymentPage = !paymentPage; paymentAmount = 50">Pay deposit (50€)</button>
+            </div>
+            <div>
+              <button @click="minerval = !minerval; paymentPage = !paymentPage; paymentAmount = minerv.value.toPay">Pay all the rest ({{minerv.value.toPay}}€)</button>
+            </div>
+          </div>
+          <div v-else>
+            Payment : School fees have already been paid this year
+          </div>
+        </div>
+        <div v-else-if="paymentPage" class="infosContainer">
+          Proceed to payment of {{paymentAmount}}€
+          <div style="margin-top: 1%">
+            Client:
+            <input type="text" v-model="paymentData.client">
+          </div>
+          <div style="margin-top: 1%">
+            Card:
+            <input type="text" v-model="paymentData.card">
+          </div>
+          <div style="margin-top: 1%">
+            ExpDate:
+            <input type="date" v-model="paymentData.expDate">
+          </div>
+          <div style="margin-top: 1%">
+            <button @click="paymentPage=!paymentPage;minerval=!minerval;paymentData.amount=paymentAmount;paymentData.date=new Date();postPayment(paymentData);minerv.value.toPay -= paymentAmount; minerv.value.paidAmount += paymentAmount; editMinerval(minerv.value)">Process Payment</button>
+          </div>
+          <div>
+            <button @click="minerval = !minerval; paymentPage = !paymentPage;">Back</button>
           </div>
         </div>
         <div v-else-if="modif" class="infosContainer">
@@ -207,7 +256,7 @@
           </div>
         </div>
       </div>
-      <div v-if="modif==false && curric==false && reg==false "class="moreInfos">
+      <div v-if="modif==false && curric==false && reg==false && minerval==false"class="moreInfos">
           <div class = "oldcursus">
             <div class="listTitle">
               Anciens Cursus
diff --git a/frontend/src/rest/minerval.js b/frontend/src/rest/minerval.js
new file mode 100644
index 0000000..1606678
--- /dev/null
+++ b/frontend/src/rest/minerval.js
@@ -0,0 +1,9 @@
+import {restGet, restPatch, restPost} from "@/rest/restConsumer.js";
+
+export async function getCurrentMinerval(userRegNo){
+    return restGet("/minerval/"+userRegNo)
+}
+
+export async function editMinerval(updatedMinerval){
+    return restPatch("/minerval", updatedMinerval)
+}
diff --git a/frontend/src/rest/payment.js b/frontend/src/rest/payment.js
new file mode 100644
index 0000000..a194457
--- /dev/null
+++ b/frontend/src/rest/payment.js
@@ -0,0 +1,6 @@
+import {restPost} from "@/rest/restConsumer.js";
+
+export async function postPayment(payment){
+    return restPost("/payment", payment)
+}
+

From 21a5dbdb229c76deda3a4cc1639dcb6c4c79ca4d Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Tue, 9 Apr 2024 15:58:10 +0200
Subject: [PATCH 18/25] Implements the possibility to ask for a scholarship for
 a student

---
 .../Clyde/EndPoints/RequestsController.java   | 18 +++++-
 .../ScholarshipRequestRepository.java         |  8 +++
 .../Clyde/Tables/ScholarshipRequest.java      | 64 +++++++++++++------
 frontend/src/Apps/CourseList.vue              |  5 --
 frontend/src/Apps/Profil.vue                  | 56 +++++++++++++++-
 frontend/src/rest/requests.js                 |  4 ++
 6 files changed, 126 insertions(+), 29 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ScholarshipRequestRepository.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
index e5865d2..3c94497 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
@@ -7,26 +7,42 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import ovh.herisson.Clyde.Repositories.ExemptionsRequestRepository;
+import ovh.herisson.Clyde.Repositories.ScholarshipRequestRepository;
 import ovh.herisson.Clyde.Tables.ExemptionsRequest;
 import ovh.herisson.Clyde.Tables.RequestState;
+import ovh.herisson.Clyde.Tables.ScholarshipRequest;
 
 @RestController
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class RequestsController {
 
     public final ExemptionsRequestRepository err;
+    public final ScholarshipRequestRepository srr;
 
-    public RequestsController(ExemptionsRequestRepository err) {
+    public RequestsController(ExemptionsRequestRepository err, ScholarshipRequestRepository srr) {
         this.err = err;
+        this.srr = srr;
     }
 
     @PostMapping(value="/exemptionreq")
     public ResponseEntity<String> register(@RequestBody ExemptionsRequest exemptionsRequest){
 
+        //This line ensures that the request is sent in pending state not matter what
         exemptionsRequest.setState(RequestState.Pending);
 
         err.save(exemptionsRequest);
 
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
+
+    @PostMapping(value="/scholarshipreq")
+    public ResponseEntity<String> register(@RequestBody ScholarshipRequest scholarshipRequest){
+
+        //This line ensures that the request is sent in pending state not matter what
+        scholarshipRequest.setState(RequestState.Pending);
+
+        srr.save(scholarshipRequest);
+
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScholarshipRequestRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScholarshipRequestRepository.java
new file mode 100644
index 0000000..4404a11
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScholarshipRequestRepository.java
@@ -0,0 +1,8 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ScholarshipRequest;
+
+public interface ScholarshipRequestRepository extends CrudRepository<ScholarshipRequest, Long> {
+
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
index 1182911..6d8b27d 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
@@ -2,35 +2,39 @@ package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
 
+import java.util.Date;
+
 @Entity
 public class ScholarshipRequest {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
+    private long id;
 
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    private User user;
+    private long userId;
     private RequestState state;
-    private String requestForm;
+    private Date date;
     private int amount;
 
+    private String taxDocUrl;
+    private String residencyDocUrl;
 
-    public ScholarshipRequest(User user, RequestState state, String requestForm, int amount){
-        this.user = user;
+    public ScholarshipRequest(long userId, RequestState state, int amount, Date date, String taxDocUrl, String residencyDocUrl){
+        this.userId = userId;
         this.state = state;
-        this.requestForm = requestForm;
         this.amount = amount;
+        this.date = date;
+        this.taxDocUrl = taxDocUrl;
+        this.residencyDocUrl = residencyDocUrl;
     }
 
     public ScholarshipRequest(){}
 
-    public User getUser() {
-        return user;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setUser(User user) {
-        this.user = user;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
     public RequestState getState() {
@@ -41,14 +45,6 @@ public class ScholarshipRequest {
         this.state = state;
     }
 
-    public String getRequestForm() {
-        return requestForm;
-    }
-
-    public void setRequestForm(String requestForm) {
-        this.requestForm = requestForm;
-    }
-
     public int getAmount() {
         return amount;
     }
@@ -56,4 +52,32 @@ public class ScholarshipRequest {
     public void setAmount(int amount) {
         this.amount = amount;
     }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getResidencyDocUrl() {
+        return residencyDocUrl;
+    }
+
+    public void setResidencyDocUrl(String residencyDocUrl) {
+        this.residencyDocUrl = residencyDocUrl;
+    }
+
+    public String getTaxDocUrl() {
+        return taxDocUrl;
+    }
+
+    public void setTaxDocUrl(String taxDocUrl) {
+        this.taxDocUrl = taxDocUrl;
+    }
 }
diff --git a/frontend/src/Apps/CourseList.vue b/frontend/src/Apps/CourseList.vue
index 77a7dba..22df6fc 100644
--- a/frontend/src/Apps/CourseList.vue
+++ b/frontend/src/Apps/CourseList.vue
@@ -20,11 +20,6 @@ async function updateCourseList(){
   courseslist.value = await getcurriculum(selectedCurriculum.value.curriculumId)
 }
 
-async function uploadfileandgetpath(file, type){
-  const a = await uploadFile(file, type);
-  exemptReq.justifDocument = a.url
-}
-
 async function postExemptionRequest(file, type){
   const a = await uploadFile(file, type);
   exemptReq.justifDocument = a.url
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 4d6052f..65fd97b 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -4,10 +4,11 @@
   import {getSelfCurriculum, getAllCurriculums, getSomeonesCurriculumList} from '../rest/curriculum.js'
   import {getCourses} from "../rest/courses.js"
   import i18n from "@/i18n.js"
-  import { uploadProfilePicture } from '@/rest/uploads.js'
+  import {uploadFile, uploadProfilePicture} from '@/rest/uploads.js'
   import CourseList from "@/Apps/CourseList.vue";
   import {editMinerval, getCurrentMinerval} from "@/rest/minerval.js";
   import {postPayment} from "@/rest/payment.js";
+  import {createScholarshipRequest} from "@/rest/requests.js";
 
   const user = ref(await getSelf());
   const UserCurriculum = ref(""); 
@@ -27,6 +28,8 @@
   const courseslist = ref(false);
   const minerval = ref(false);
   const paymentPage = ref(false);
+  const scholarship = ref(false);
+  const scholarshipinfos = ref(false);
   const pattern = {
     profilPictureUrl:null,
     email:null,
@@ -50,6 +53,17 @@
     expDate:null,
     amount: null
   }
+
+  //Used to modelize a scholarship request
+  const scholarshipData=reactive({
+    userId: user.value.regNo,
+    state:null,
+    date:null,
+    amount:0,
+    taxDocUrl : "",
+    residencyDocUrl : ""
+  })
+
   const paymentAmount = ref(0);
   let toModify= Object.assign({}, pattern);
   let personnalInfos =  Object.assign({}, patternInfos);
@@ -121,6 +135,18 @@
     }
     return actualCurriculumList
   }
+
+  async function postScholarshipRequest(file1, type1, file2, type2){
+    const a = await uploadFile(file1, type1)
+    scholarshipData.taxDocUrl =  a.url;
+
+    const b = await uploadFile(file2, type2)
+    scholarshipData.residencyDocUrl = b.url;
+
+    scholarshipData.date = Date.now();
+
+    await createScholarshipRequest(scholarshipData)
+  }
 </script>
 
 <template>
@@ -130,7 +156,7 @@
       <img class="subContainter" :src=getPP()>
     </div>
       <div class="globalInfos">
-        <div v-if="modif==false && curric==false && reg==false && minerval==false && paymentPage == false" class="infosContainer">
+        <div v-if="modif==false && curric==false && reg==false && minerval==false && paymentPage == false && scholarship==false" class="infosContainer">
           <div>
             {{user.firstName}} {{user.lastName}}   
           </div>
@@ -171,6 +197,30 @@
           <div v-else>
             Payment : School fees have already been paid this year
           </div>
+          <div>
+            <button @click="scholarship=!scholarship; minerval=!minerval">Ask for a scholarship</button>
+          </div>
+        </div>
+        <div v-else-if="scholarship && !scholarshipinfos" class="infosContainer">
+          <p>Please upload the required documents</p>
+          <div>
+            Tax justification document :
+            <input type="file" @change="scholarshipData.taxDocUrl = $event.target.files">
+          </div>
+          <div>
+            Residency justification document :
+            <input type="file" style="margin-top:2%" @change="scholarshipData.residencyDocUrl = $event.target.files">
+          </div>
+          <button style="margin-top: 5%" @click="scholarshipinfos = !scholarshipinfos;postScholarshipRequest(scholarshipData.taxDocUrl, 'JustificationDocument',scholarshipData.residencyDocUrl, 'JustificationDocument');">Submit scholarship request</button>
+        </div>
+        <div v-else-if="scholarship && scholarshipinfos" class="infosContainer">
+          <div>
+            Your request has been sent to the inscription service you will get notified when
+            the request is reviewed.
+          </div>
+          <button @click="scholarshipinfos=!scholarshipinfos; scholarship=!scholarship">
+            Go back to profile
+          </button>
         </div>
         <div v-else-if="paymentPage" class="infosContainer">
           Proceed to payment of {{paymentAmount}}€
@@ -256,7 +306,7 @@
           </div>
         </div>
       </div>
-      <div v-if="modif==false && curric==false && reg==false && minerval==false"class="moreInfos">
+      <div v-if="modif==false && curric==false && reg==false && minerval==false && scholarship == false"class="moreInfos">
           <div class = "oldcursus">
             <div class="listTitle">
               Anciens Cursus
diff --git a/frontend/src/rest/requests.js b/frontend/src/rest/requests.js
index 643d1d9..140be60 100644
--- a/frontend/src/rest/requests.js
+++ b/frontend/src/rest/requests.js
@@ -2,4 +2,8 @@ import {restPost} from "@/rest/restConsumer.js";
 
 export async function createExemptionsRequest(exempReq){
     return restPost("/exemptionreq", exempReq)
+}
+
+export async function createScholarshipRequest(scholReq){
+    return restPost("/scholarshipreq", scholReq)
 }
\ No newline at end of file

From 9d0b3da9d31cbe6102a85e348947cb973336b366 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Wed, 10 Apr 2024 14:40:41 +0200
Subject: [PATCH 19/25] Implements the backend and frontend methods to get some
 scholarshipRequests and exemptionsRequest

Extends the inscription.vue so that it also list scholarship and exemptions requests (not only inscription) this vue should be renamed later. Also implements some filters and parameters to select the data displayed in the list.
---
 .../Clyde/EndPoints/MockController.java       | 12 ++-
 .../Clyde/EndPoints/RequestsController.java   | 68 ++++++++++---
 .../Clyde/Tables/ExemptionsRequest.java       | 45 ++++++---
 .../Clyde/Tables/ScholarshipRequest.java      | 19 ++--
 frontend/src/Apps/CourseList.vue              |  3 +-
 frontend/src/Apps/Inscription.vue             | 98 ++++++++++++++++---
 frontend/src/Apps/Profil.vue                  |  4 +-
 frontend/src/rest/requests.js                 | 14 ++-
 8 files changed, 199 insertions(+), 64 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 0a5d145..1b675ee 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -2,10 +2,7 @@ package ovh.herisson.Clyde.EndPoints;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.MinervalRepository;
-import ovh.herisson.Clyde.Repositories.TokenRepository;
-import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.UserRepository;
+import ovh.herisson.Clyde.Repositories.*;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.*;
 import java.util.ArrayList;
@@ -32,7 +29,9 @@ public class MockController {
 
     public final MinervalRepository minervalRepository;
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository){
+    public final ScholarshipRequestRepository scholarshipRequestRepository;
+
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository, ScholarshipRequestRepository scholarshipRequestRepository){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
@@ -42,6 +41,7 @@ public class MockController {
         this.inscriptionService = inscriptionService;
         this.ucr = ucr;
         this.minervalRepository = minervalRepository;
+        this.scholarshipRequestRepository = scholarshipRequestRepository;
     }
 
     /** Saves an example of each user type by :
@@ -100,6 +100,8 @@ public class MockController {
         courseService.save(psycho1);
         courseService.save(commun);
 
+        ScholarshipRequest ssr1 = new ScholarshipRequest(joe, RequestState.Pending, 0, new Date(), "test", "test");
+        scholarshipRequestRepository.save(ssr1);
 
         CurriculumCourseService.save(new CurriculumCourse(infoBab1,progra1));
         CurriculumCourseService.save(new CurriculumCourse(infoBab1,commun));
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
index 3c94497..0d39bf7 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
@@ -2,15 +2,18 @@ package ovh.herisson.Clyde.EndPoints;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Repositories.CourseRepository;
 import ovh.herisson.Clyde.Repositories.ExemptionsRequestRepository;
 import ovh.herisson.Clyde.Repositories.ScholarshipRequestRepository;
-import ovh.herisson.Clyde.Tables.ExemptionsRequest;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.ScholarshipRequest;
+import ovh.herisson.Clyde.Repositories.UserRepository;
+import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
+import ovh.herisson.Clyde.Services.AuthenticatorService;
+import ovh.herisson.Clyde.Tables.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Map;
 
 @RestController
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
@@ -18,17 +21,25 @@ public class RequestsController {
 
     public final ExemptionsRequestRepository err;
     public final ScholarshipRequestRepository srr;
+    public final UserRepository userRepository;
+    public final AuthenticatorService authServ;
 
-    public RequestsController(ExemptionsRequestRepository err, ScholarshipRequestRepository srr) {
+    public final CourseRepository courseRepository;
+
+    public RequestsController(ExemptionsRequestRepository err, ScholarshipRequestRepository srr, UserRepository userRepository, AuthenticatorService authServ, CourseRepository courseRepository) {
         this.err = err;
         this.srr = srr;
+        this.userRepository = userRepository;
+        this.authServ = authServ;
+        this.courseRepository = courseRepository;
     }
 
     @PostMapping(value="/exemptionreq")
-    public ResponseEntity<String> register(@RequestBody ExemptionsRequest exemptionsRequest){
+    public ResponseEntity<String> createExemptionReq(@RequestBody Map<String, Object> exemptionsRequestInfo){
+        User user = userRepository.findById((Integer) exemptionsRequestInfo.get("userRegNo"));
+        Course course = courseRepository.findById((Integer) exemptionsRequestInfo.get("courseId"));
 
-        //This line ensures that the request is sent in pending state not matter what
-        exemptionsRequest.setState(RequestState.Pending);
+        ExemptionsRequest exemptionsRequest = new ExemptionsRequest(user, course, (String) exemptionsRequestInfo.get("justifDocument"), RequestState.Pending, new Date());
 
         err.save(exemptionsRequest);
 
@@ -36,13 +47,38 @@ public class RequestsController {
     }
 
     @PostMapping(value="/scholarshipreq")
-    public ResponseEntity<String> register(@RequestBody ScholarshipRequest scholarshipRequest){
+    public ResponseEntity<String> createScholarshipReq(@RequestBody Map<String, Object> scholarshipRequestInfo){
+        User user = userRepository.findById((Integer)scholarshipRequestInfo.get("userId"));
+        ScholarshipRequest toCreate = new ScholarshipRequest(user, RequestState.Pending, 0, new Date(), (String) scholarshipRequestInfo.get("taxDocUrl"), (String) scholarshipRequestInfo.get("residencyDocUrl"));
 
-        //This line ensures that the request is sent in pending state not matter what
-        scholarshipRequest.setState(RequestState.Pending);
-
-        srr.save(scholarshipRequest);
+        srr.save(toCreate);
 
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
+
+    //Get all the exemptions Request
+    @GetMapping(value = "/exemptionsreq")
+    public ResponseEntity<ArrayList<ExemptionsRequest>> getAllExemptionsRequests(@RequestHeader("Authorization") String token){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
+            return new UnauthorizedResponse<>(null);
+
+        ArrayList<ExemptionsRequest> toReturn = new ArrayList<>();
+
+        err.findAll().forEach(toReturn::add);
+
+        return new ResponseEntity<>(toReturn, HttpStatus.OK);
+    }
+
+    //Get all the scholarships requests
+    @GetMapping(value = "/scholarshipreq")
+    public ResponseEntity<ArrayList<ScholarshipRequest>> getAllScholarshipRequests(@RequestHeader("Authorization") String token){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
+            return new UnauthorizedResponse<>(null);
+
+        ArrayList<ScholarshipRequest> toReturn = new ArrayList<>();
+
+        srr.findAll().forEach(toReturn::add);
+
+        return new ResponseEntity<>(toReturn, HttpStatus.OK);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
index ba01d15..c38e559 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
@@ -2,6 +2,10 @@ package ovh.herisson.Clyde.Tables;
 
 
 import jakarta.persistence.*;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import java.util.Date;
 
 @Entity
 public class ExemptionsRequest {
@@ -9,37 +13,44 @@ public class ExemptionsRequest {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
-    private long userRegNo;
-    private long courseId;
+    @JoinColumn(name = "Users")
+    @ManyToOne(fetch = FetchType.EAGER)
+    private User user;
+
+    @JoinColumn(name = "Course")
+    @ManyToOne(fetch = FetchType.EAGER)
+    private Course course;
     private String justifDocument;
 
     private RequestState state;
 
+    private Date date;
 
-    public ExemptionsRequest(Long userRegNo, long courseId, String justifDocument, RequestState state){
-        this.userRegNo = userRegNo;
-        this.courseId = courseId;
+    public ExemptionsRequest(User user, Course course, String justifDocument, RequestState state, Date date){
+        this.user = user;
+        this.course = course;
         this.justifDocument = justifDocument;
         this.state = state;
+        this.date = date;
     }
 
 
     public ExemptionsRequest(){}
 
-    public Long getUserRegNo() {
-        return userRegNo;
+    public User getUser() {
+        return user;
     }
 
-    public void setUserRegNo(Long userRegNo) {
-        this.userRegNo = userRegNo;
+    public void setUser(User user) {
+        this.user = user;
     }
 
-    public long getCourseId() {
-        return courseId;
+    public Course getCourse() {
+        return course;
     }
 
-    public void setCourseId(long courseId) {
-        this.courseId = courseId;
+    public void setCourse(Course course) {
+        this.course = course;
     }
 
     public String getJustifDocument() {
@@ -58,4 +69,12 @@ public class ExemptionsRequest {
     public void setState(RequestState state) {
         this.state = state;
     }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
index 6d8b27d..3de71ba 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
@@ -1,6 +1,8 @@
 package ovh.herisson.Clyde.Tables;
 
 import jakarta.persistence.*;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
 
 import java.util.Date;
 
@@ -10,16 +12,17 @@ public class ScholarshipRequest {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
 
-    private long userId;
+    @JoinColumn(name="Users")
+    @ManyToOne(fetch = FetchType.EAGER)
+    private User user;
     private RequestState state;
     private Date date;
     private int amount;
-
     private String taxDocUrl;
     private String residencyDocUrl;
 
-    public ScholarshipRequest(long userId, RequestState state, int amount, Date date, String taxDocUrl, String residencyDocUrl){
-        this.userId = userId;
+    public ScholarshipRequest(User user, RequestState state, int amount, Date date, String taxDocUrl, String residencyDocUrl){
+        this.user = user;
         this.state = state;
         this.amount = amount;
         this.date = date;
@@ -29,12 +32,12 @@ public class ScholarshipRequest {
 
     public ScholarshipRequest(){}
 
-    public Long getUserId() {
-        return userId;
+    public User getUser() {
+        return user;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public void setUser(User user) {
+        this.user = user;
     }
 
     public RequestState getState() {
diff --git a/frontend/src/Apps/CourseList.vue b/frontend/src/Apps/CourseList.vue
index 22df6fc..7442076 100644
--- a/frontend/src/Apps/CourseList.vue
+++ b/frontend/src/Apps/CourseList.vue
@@ -28,8 +28,7 @@ async function postExemptionRequest(file, type){
 const exemptReq = reactive({
   userRegNo : user.regNo,
   courseId : null,
-  justifDocument : "e",
-  state : null
+  justifDocument : "",
 })
 </script>
 
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index 7069c9e..e306d38 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -3,10 +3,14 @@
   import {ref} from 'vue'
   import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
   import AboutRequest from "@/Apps/AboutRequest.vue";
+  import {getAllExemptionsRequest, getAllScholarShipsRequest} from "@/rest/requests.js";
 
   const requests = ref(await getAllRegisters());
   let targetId = "";
 
+  const requestType = ref("inscription");
+  const filterType = ref("None");
+
   //0 = liste, 1 = détails, 2 = sure?
   let windowsState = ref(0);
 
@@ -17,6 +21,18 @@
     }
     requests.value = await getAllRegisters();
   }
+
+  async function loadRequests(){
+    if (requestType.value === "inscription"){
+      requests.value = await getAllRegisters();
+    }
+    if (requestType.value === "scholarship"){
+      requests.value = await getAllScholarShipsRequest();
+    }
+    if(requestType.value === "exemption"){
+      requests.value = await getAllExemptionsRequest();
+    }
+  }
 </script>
 
 
@@ -27,18 +43,55 @@
     <button style="background-color:rgb(105,05,105);margin-left: 30%" @click="windowsState=0;">Retour</button>
   </div>
   <div v-if="windowsState === 0">
+    <div style="margin-top: 2%;margin-left: 2%">
+      <span>Request type :   </span>
+      <select v-model="requestType" @change="loadRequests()">
+        <option>inscription</option>
+        <option>scholarship</option>
+        <option>exemption</option>
+      </select>
+      <span style="margin-left: 5%">
+        Filter :
+        <select v-model="filterType">
+          <option>None</option>
+          <option>Pending</option>
+          <option>Accepted</option>
+          <option>Refused</option>
+      </select>
+      </span>
+    </div>
     <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
-    <div class="bodu">
-    <div class="container">
-      <div class="date">{{item.submissionDate.slice(0, 10)}}</div>
-      <div class="state">{{item.state}}</div>
-      <div class="surname">{{item.lastName}}</div>
-      <div class="firstname">{{item.firstName}}</div>
-      <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
-      <div class="refuse" v-if="item.state === 'Pending'"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
-      <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div>
-    </div>
-    </div>
+      <div class="bodu" v-if="filterType == 'None' || filterType == item.state">
+        <div class="container" style="grid-template-columns:15% 15% 10% 14.2% 14.2% 14.2% 14.2%;grid-template-areas:'date state surname firstname accept refuse infos';" v-if="requestType === 'inscription'">
+          <!--
+            The condition below avoids an error occuring because loadRequests() finishes after the vue refresh
+            then submissionDate is undefined an it triggers an error in the console despite the fact that it is working
+            properly at the end.
+           -->
+          <div class="date" v-if="item.submissionDate !== undefined">{{item.submissionDate.slice(0, 10)}}</div>
+          <div class="state">{{item.state}}</div>
+          <div class="surname">{{item.lastName}}</div>
+          <div class="firstname">{{item.firstName}}</div>
+          <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
+          <div class="refuse" v-if="item.state === 'Pending'"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
+          <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div>
+        </div>
+        <div class="container" style="grid-template-columns:25% 15% 15% 25% 14.2%;grid-template-areas:'date reqState studentfirstname studentlastname  infos';" v-if="requestType === 'scholarship'">
+          <div class="date" v-if="item.date !== undefined"> {{item.date.slice(0,10)}}</div>
+          <div class="studentfirstname">{{item.user.firstName}}</div>
+          <div class="studentlastname">{{item.user.lastName}}</div>
+          <div class="reqState">{{item.state}}</div>
+          <div class="infos"><button>More infos</button></div>
+        </div>
+        <div class="container" style="grid-template-columns:17% 15% 12% 15% 25%;grid-template-areas:'date reqState studentfirstname studentlastname course infos';"v-if="requestType === 'exemption'">
+          <div class="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div>
+          <div class="studentfirstname">{{item.user.firstName}}</div>
+          <div class="studentlastname">{{item.user.lastName}}</div>
+          <div class="course">{{item.course.title}}</div>
+          <div class="reqState">{{item.state}}</div>
+          <div class="infos"><button>More infos</button></div>
+        </div>
+      </div>
     </div>
   </div>
   <div style='display:flex; justify-content:center; min-width:1140px;margin-top: 10%' v-if="windowsState === 2">
@@ -54,12 +107,27 @@
     height:100px;
     font-size:20px;
     display:grid;
-    grid-template-columns:15% 15% 10% 14.2% 14.2% 14.2% 14.2%;
-    grid-template-areas:
-    "date state surname firstname accept refuse infos";
     column-gap:10px;
   }
-  
+
+  .studentfirstname{
+    grid-area: studentfirstname;
+    align-self: center;
+  }
+
+  .studentlastname{
+    grid-area: studentlastname;
+    align-self: center;
+  }
+
+  .course{
+    grid-area: course;
+    align-self: center;
+  }
+  .reqState{
+    grid-area: reqState;
+    align-self: center;
+  }
   .infos {
     grid-area:infos;
     align-self:center;
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 65fd97b..7d3edb8 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -306,8 +306,8 @@
           </div>
         </div>
       </div>
-      <div v-if="modif==false && curric==false && reg==false && minerval==false && scholarship == false"class="moreInfos">
-          <div class = "oldcursus">
+      <div v-if="user.role == 'Student' && modif==false && curric==false && reg==false && minerval==false && scholarship == false" class="moreInfos">
+        <div class = "oldcursus">
             <div class="listTitle">
               Anciens Cursus
             </div>
diff --git a/frontend/src/rest/requests.js b/frontend/src/rest/requests.js
index 140be60..eda7418 100644
--- a/frontend/src/rest/requests.js
+++ b/frontend/src/rest/requests.js
@@ -1,9 +1,17 @@
-import {restPost} from "@/rest/restConsumer.js";
+import {restGet, restPost} from "@/rest/restConsumer.js";
 
 export async function createExemptionsRequest(exempReq){
     return restPost("/exemptionreq", exempReq)
 }
 
-export async function createScholarshipRequest(scholReq){
-    return restPost("/scholarshipreq", scholReq)
+export async function createScholarshipRequest(reqInfo){
+    return restPost("/scholarshipreq", reqInfo)
+}
+
+export async function getAllScholarShipsRequest(){
+    return restGet("/scholarshipreq")
+}
+
+export async function getAllExemptionsRequest(){
+    return restGet("/exemptionsreq")
 }
\ No newline at end of file

From 0c04bed7990d4994b35dc82b766536b22543239a Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Wed, 10 Apr 2024 22:00:08 +0200
Subject: [PATCH 20/25] this is a test dw

---
 .../Clyde/EndPoints/CurriculumController.java | 22 -----------------
 .../Clyde/Services/UserCurriculumService.java | 24 -------------------
 .../Clyde/Tables/ExternalCurriculum.java      | 16 +++++++------
 frontend/src/Apps/Login.vue                   |  3 ++-
 frontend/src/rest/curriculum.js               | 14 -----------
 frontend/src/rest/externalCurriculum.js       | 17 +++++++++++++
 6 files changed, 28 insertions(+), 68 deletions(-)
 create mode 100644 frontend/src/rest/externalCurriculum.js

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index 5f917e4..88a339b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -118,26 +118,4 @@ public class CurriculumController {
         curriculumServ.delete(toDelete);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
-    @GetMapping("/externalcurriculum/{inscriptionRequestId}")
-    public ResponseEntity<Map<String,Object>> getInscriptionRequestExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable long inscriptionRequestId){
-        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
-            return new UnauthorizedResponse<>(null);
-
-        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByInscriptionRequestId(inscriptionRequestId);
-
-        if (toReturn == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(toReturn,HttpStatus.OK);
-    }
-
-
-    //Note : everyone can post some externalcurriculums (the validity of the elements is assured by the inscription service)
-    @PostMapping("/externalcurriculum")
-    public ResponseEntity<ExternalCurriculum> postExternalCurriculum(@RequestBody ExternalCurriculum ec){
-        ec.setState(RequestState.Pending);
-        return new ResponseEntity<>(ecr.save(ec), HttpStatus.OK);
-    }
-
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
index 7c65e2e..544307b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
@@ -49,28 +49,4 @@ public class UserCurriculumService {
     }
 
 
-    public HashMap<String,Object> findAllExternalCurriculumByInscriptionRequestId(Long id) {
-        ArrayList<ExternalCurriculum> list = externalCurriculumRepo.getExternalCurriculumByInscriptionRequestId(id);
-
-        ArrayList<HashMap<String, Object>> externalCurriculumList = new ArrayList<HashMap<String, Object>>();
-
-        for (int i = 0; i < list.size(); i++) {
-            HashMap<String, Object> element = new HashMap<>();
-            element.put("id", list.get(0).getId());
-            element.put("inscriptionRequestId", list.get(0).getInscriptionRequestId());
-            element.put("school", list.get(0).getSchool());
-            element.put("formation", list.get(0).getFormation());
-            element.put("completion", list.get(0).getCompletion());
-            element.put("startYear", list.get(0).getStartYear());
-            element.put("endYear", list.get(0).getEndYear());
-            element.put("justifDocUrl", list.get(0).getJustifdocUrl());
-            element.put("state", list.get(0).getState());
-            externalCurriculumList.add(element);
-        }
-
-        HashMap<String, Object> toReturn = new HashMap<String, Object>();
-        toReturn.put("externalCurriculumList", externalCurriculumList);
-        return toReturn;
-    }
-
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
index 5193f22..534a108 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
@@ -10,7 +10,9 @@ public class ExternalCurriculum {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
-    private Long inscriptionRequestId;
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name="InscriptionRequest")
+    private InscriptionRequest inscriptionRequest;
 
     private String school;
 
@@ -28,8 +30,8 @@ public class ExternalCurriculum {
 
     public ExternalCurriculum(){}
 
-    public ExternalCurriculum(Long ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
-        this.inscriptionRequestId = ir;
+    public ExternalCurriculum(InscriptionRequest ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
+        this.inscriptionRequest = ir;
         this.school = school;
         this.formation = formation;
         this.completion = completion;
@@ -43,12 +45,12 @@ public class ExternalCurriculum {
         return id;
     }
 
-    public Long getInscriptionRequestId() {
-        return inscriptionRequestId;
+    public InscriptionRequest getInscriptionRequest() {
+        return inscriptionRequest;
     }
 
-    public void setInscriptionRequest(Long inscriptionRequestId) {
-        this.inscriptionRequestId = inscriptionRequestId;
+    public void setInscriptionRequest(InscriptionRequest inscriptionRequest) {
+        this.inscriptionRequest = inscriptionRequest;
     }
 
     public String getSchool() {
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index 5bbf682..af8f89a 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -2,10 +2,11 @@
   import {reactive, ref } from 'vue'
   import i18n from '@/i18n.js'
   import {login, register, disconnect, isLogged} from '@/rest/Users.js'
-  import {createExternalCurriculum, getAllCurriculums, getcurriculum} from '@/rest/curriculum.js'
+  import {getAllCurriculums, getcurriculum} from '@/rest/curriculum.js'
   import { uploadProfilePicture } from '@/rest/uploads.js'
   import {toast} from 'vue3-toastify'
   import 'vue3-toastify/dist/index.css';
+  import {createExternalCurriculum} from "@/rest/externalCurriculum.js";
 
   const loginPage= ref(true)
   const page = ref(0)
diff --git a/frontend/src/rest/curriculum.js b/frontend/src/rest/curriculum.js
index d468dcf..a34328c 100644
--- a/frontend/src/rest/curriculum.js
+++ b/frontend/src/rest/curriculum.js
@@ -53,18 +53,4 @@ export async function getSomeonesCurriculumList(user){
 	return restGet("/onescurriculum/"+user)
 }
 
-export async function createExternalCurriculum(inscriptionRequestId,school, formation, completion, startYear, endYear, justifdocUrl){
-	return restPost("/externalcurriculum", {
-		inscriptionRequestId: inscriptionRequestId,
-		school:school,
-		formation :formation,
-		completion : completion,
-		startYear : startYear,
-		endYear: endYear,
-		justifdocUrl : justifdocUrl
-	})
-}
 
-export async function getExternalCurriculumListByInscrReq(inscriptionRequestId){
-	return restGet("/externalCurriculum/"+parseInt(inscriptionRequestId))
-}
diff --git a/frontend/src/rest/externalCurriculum.js b/frontend/src/rest/externalCurriculum.js
new file mode 100644
index 0000000..cda2cf1
--- /dev/null
+++ b/frontend/src/rest/externalCurriculum.js
@@ -0,0 +1,17 @@
+import {restGet, restPost} from "@/rest/restConsumer.js";
+
+export async function createExternalCurriculum(inscriptionRequestId,school, formation, completion, startYear, endYear, justifdocUrl){
+    return restPost("/externalcurriculum", {
+        inscriptionRequestId: inscriptionRequestId,
+        school:school,
+        formation :formation,
+        completion : completion,
+        startYear : startYear,
+        endYear: endYear,
+        justifdocUrl : justifdocUrl
+    })
+}
+
+export async function getExternalCurriculumListByInscrReq(inscriptionRequestId){
+    return restGet("/externalCurriculum/"+parseInt(inscriptionRequestId))
+}
\ No newline at end of file

From 706481ed1af157d17fd4a738f95fbc2fee089558 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Wed, 10 Apr 2024 23:09:38 +0200
Subject: [PATCH 21/25] Fix and simplifie the post and get for
 externalCurriculum

---
 .../Clyde/EndPoints/CurriculumController.java |  1 +
 .../ExternalCurriculumController.java         | 44 +++++++++++++++++++
 .../ExternalCurriculumRepository.java         |  2 +-
 frontend/src/Apps/AboutRequest.vue            |  6 ++-
 frontend/src/rest/externalCurriculum.js       | 11 ++---
 5 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index 88a339b..c9e78de 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -118,4 +118,5 @@ public class CurriculumController {
         curriculumServ.delete(toDelete);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java
new file mode 100644
index 0000000..03b56e4
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java
@@ -0,0 +1,44 @@
+package ovh.herisson.Clyde.EndPoints;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.InscriptionRepository;
+import ovh.herisson.Clyde.Tables.ExternalCurriculum;
+import ovh.herisson.Clyde.Tables.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.RequestState;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+@RestController
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+public class ExternalCurriculumController {
+
+    public final ExternalCurriculumRepository ecr;
+    public final InscriptionRepository inscriptionRepository;
+
+    public ExternalCurriculumController(ExternalCurriculumRepository ecr, InscriptionRepository inscriptionRepository) {
+        this.ecr = ecr;
+        this.inscriptionRepository = inscriptionRepository;
+    }
+
+    //everyone can post some externalcurriculums (the validity of the elements is assured by the inscription service)
+    @PostMapping("/externalcurriculum")
+    public ResponseEntity<ExternalCurriculum> postExternalCurriculum(@RequestBody Map<String, Object> externalCurrInfos){
+        InscriptionRequest ir = inscriptionRepository.findById((Integer) externalCurrInfos.get("inscriptionRequestId"));
+
+        ExternalCurriculum toSave = new ExternalCurriculum(ir, (String) externalCurrInfos.get("school"),(String) externalCurrInfos.get("formation"),(String) externalCurrInfos.get("completion"), (Integer)externalCurrInfos.get("startYear"), (Integer)externalCurrInfos.get("endYear"), (String)externalCurrInfos.get("justifDocUrl"), RequestState.Pending);
+
+        return new ResponseEntity<>(ecr.save(toSave), HttpStatus.OK);
+    }
+
+    @GetMapping("/externalcurriculum/{inscReqId}")
+    public ResponseEntity<ArrayList<ExternalCurriculum>> getExternalCurrListByInscrReq(@PathVariable long inscReqId){
+        InscriptionRequest ir = inscriptionRepository.findById(inscReqId);
+
+        ArrayList<ExternalCurriculum> toReturn = ecr.getExternalCurriculumByInscriptionRequest(ir);
+        return new ResponseEntity<>(toReturn, HttpStatus.OK);
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
index 5835fab..81f9d1e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
@@ -8,5 +8,5 @@ import ovh.herisson.Clyde.Tables.User;
 import java.util.ArrayList;
 
 public interface ExternalCurriculumRepository extends CrudRepository<ExternalCurriculum, Long> {
-    ArrayList<ExternalCurriculum> getExternalCurriculumByInscriptionRequestId(Long id);
+    ArrayList<ExternalCurriculum> getExternalCurriculumByInscriptionRequest(InscriptionRequest ir);
 }
diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/AboutRequest.vue
index 05c76c5..c363acd 100644
--- a/frontend/src/Apps/AboutRequest.vue
+++ b/frontend/src/Apps/AboutRequest.vue
@@ -1,14 +1,16 @@
 <script setup>
 import i18n from "@/i18n.js"
 import {getUser} from '../rest/Users.js'
-import {getcurriculum, getExternalCurriculumListByInscrReq, getSomeonesCurriculumList} from "@/rest/curriculum.js";
+import {getcurriculum,getSomeonesCurriculumList} from "@/rest/curriculum.js";
 import {getRegisters} from "@/rest/ServiceInscription.js";
 import {get} from "jsdom/lib/jsdom/named-properties-tracker.js";
+import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js";
 
 const props = defineProps(['target']);
 let request = await getRegisters(props.target);
 const cursus = await getcurriculum(request.curriculum);
-const externalCurriculum = await getExternalCurriculumListByInscrReq(request.id)
+
+const externalCurriculum = await getExternalCurriculumByInscrReq(request.id)
 console.log(externalCurriculum)
 function getPP(){
   if(request.profilePictureUrl === null){
diff --git a/frontend/src/rest/externalCurriculum.js b/frontend/src/rest/externalCurriculum.js
index cda2cf1..2f2ed70 100644
--- a/frontend/src/rest/externalCurriculum.js
+++ b/frontend/src/rest/externalCurriculum.js
@@ -1,4 +1,5 @@
 import {restGet, restPost} from "@/rest/restConsumer.js";
+import {parseInteger} from "jsdom/lib/jsdom/living/helpers/strings.js";
 
 export async function createExternalCurriculum(inscriptionRequestId,school, formation, completion, startYear, endYear, justifdocUrl){
     return restPost("/externalcurriculum", {
@@ -6,12 +7,12 @@ export async function createExternalCurriculum(inscriptionRequestId,school, form
         school:school,
         formation :formation,
         completion : completion,
-        startYear : startYear,
-        endYear: endYear,
+        startYear : parseInteger(startYear),
+        endYear: parseInteger(endYear),
         justifdocUrl : justifdocUrl
     })
 }
 
-export async function getExternalCurriculumListByInscrReq(inscriptionRequestId){
-    return restGet("/externalCurriculum/"+parseInt(inscriptionRequestId))
-}
\ No newline at end of file
+export async function getExternalCurriculumByInscrReq(inscrReqId){
+    return restGet("/externalcurriculum/"+inscrReqId);
+}

From 4199663d648a1f32e506326abd7cbc288aacadff Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Thu, 11 Apr 2024 16:45:48 +0200
Subject: [PATCH 22/25] Huge commit - Rework the inscription requests system so
 that it considers the equivalence systems and the impact of the teacher in
 the inscription procedure.

---
 .../ExternalCurriculumController.java         |   8 ++
 .../EndPoints/InscriptionController.java      |  19 +++
 .../Clyde/EndPoints/LoginController.java      |  19 ++-
 .../Clyde/EndPoints/MockController.java       |  10 +-
 .../ExternalCurriculumRepository.java         |   2 +
 .../Clyde/Services/InscriptionService.java    |  69 +++++-----
 .../Clyde/Services/ProtectionService.java     |   1 +
 .../Clyde/Tables/InscriptionRequest.java      |  12 +-
 .../herisson/Clyde/Tables/RequestState.java   |   3 +-
 .../ovh/herisson/Clyde/Tables/University.java |  27 ----
 frontend/src/Apps/AboutRequest.vue            | 122 ++++--------------
 frontend/src/Apps/ExternalCurriculumList.vue  | 103 +++++++++++++++
 frontend/src/Apps/Inscription.vue             |  15 ++-
 frontend/src/Apps/Login.vue                   |  15 +--
 frontend/src/rest/ServiceInscription.js       |   1 +
 frontend/src/rest/Users.js                    |   5 +-
 frontend/src/rest/externalCurriculum.js       |   8 +-
 frontend/src/rest/requests.js                 |   6 +-
 18 files changed, 253 insertions(+), 192 deletions(-)
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/University.java
 create mode 100644 frontend/src/Apps/ExternalCurriculumList.vue

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java
index 03b56e4..43daeb9 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java
@@ -41,4 +41,12 @@ public class ExternalCurriculumController {
         ArrayList<ExternalCurriculum> toReturn = ecr.getExternalCurriculumByInscriptionRequest(ir);
         return new ResponseEntity<>(toReturn, HttpStatus.OK);
     }
+
+    @PatchMapping("/externalcurriculum/{extcurrid}/{newstate}")
+    public ResponseEntity<Object> changeExternalCurrState(@PathVariable long extcurrid, @PathVariable RequestState newstate){
+        ExternalCurriculum externalCurriculum = ecr.getExternalCurriculumById(extcurrid);
+        externalCurriculum.setState(newstate);
+        ecr.save(externalCurriculum);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java
index 35c4852..9f47263 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java
@@ -1,5 +1,6 @@
 package ovh.herisson.Clyde.EndPoints;
 
+import org.apache.tomcat.util.http.parser.Authorization;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -79,4 +80,22 @@ public class InscriptionController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+
+    //Allow teacher or admin to accept or refuse the equivalence
+    @PatchMapping("/request/registerequiv/{id}/{newstate}")
+    public ResponseEntity<Object> editRegisterEquiv(@RequestHeader("Authorization") String token, @PathVariable long id, @PathVariable RequestState newstate){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Teacher}, token))
+            return new UnauthorizedResponse<>(null);
+
+        InscriptionRequest toEdit = inscriptionServ.getById(id);
+        toEdit.setEquivalenceState(newstate);
+
+        inscriptionServ.save(toEdit);
+
+        if (toEdit.getState() == RequestState.Accepted && (toEdit.getEquivalenceState() == RequestState.Accepted || toEdit.getEquivalenceState() == RequestState.Unrequired))
+        {
+            inscriptionServ.createUser(toEdit);
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java
index ef3c559..0b1d7c5 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java
@@ -5,10 +5,15 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Repositories.CurriculumRepository;
+import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.ProtectionService;
+import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.RequestState;
+
 import java.util.Date;
 import java.util.Map;
 
@@ -16,7 +21,7 @@ import java.util.Map;
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
 public class LoginController {
     private final AuthenticatorService authServ;
-
+    private final CurriculumRepository curriculumRepository;
     static public class RequestLogin{
         private final String identifier;
         private final String password;
@@ -29,8 +34,9 @@ public class LoginController {
         }
     }
 
-    public LoginController(AuthenticatorService authServ){
+    public LoginController(AuthenticatorService authServ, CurriculumRepository curriculumRepository){
         this.authServ = authServ;
+        this.curriculumRepository = curriculumRepository;
     }
 
     @PostMapping(value = "/login")
@@ -48,9 +54,18 @@ public class LoginController {
 
     @PostMapping("/register")
     public ResponseEntity<Map<String,Object>> register(@RequestBody InscriptionRequest inscriptionRequest){
+        //We ensure here that if the targeted cursus year is more than first grade then we need the teacher equivalence approval
+        Curriculum curr = curriculumRepository.findById(inscriptionRequest.getCurriculumId());
+
+        if (curr.getYear() > 1){
+            inscriptionRequest.setEquivalenceState(RequestState.Pending);
+        }else{
+            inscriptionRequest.setEquivalenceState(RequestState.Unrequired);
+        }
 
         InscriptionRequest returnedInscriptionRequest = authServ.register(inscriptionRequest);
 
+
         return new ResponseEntity<>(ProtectionService.requestWithoutPassword(returnedInscriptionRequest), HttpStatus.CREATED);
     }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 1b675ee..0a80647 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -21,7 +21,7 @@ public class MockController {
     public final CurriculumCourseService CurriculumCourseService;
     public final CurriculumService curriculumService;
     public final CourseService courseService;
-
+    public final ExternalCurriculumRepository externalCurriculumRepository;
     public final InscriptionService inscriptionService;
     ArrayList<User> mockUsers;
 
@@ -31,13 +31,14 @@ public class MockController {
 
     public final ScholarshipRequestRepository scholarshipRequestRepository;
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository, ScholarshipRequestRepository scholarshipRequestRepository){
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, ExternalCurriculumRepository externalCurriculumRepository, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository, ScholarshipRequestRepository scholarshipRequestRepository){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
         this.CurriculumCourseService = CurriculumCourseService;
         this.curriculumService = curriculumService;
         this.courseService = courseService;
+        this.externalCurriculumRepository = externalCurriculumRepository;
         this.inscriptionService = inscriptionService;
         this.ucr = ucr;
         this.minervalRepository = minervalRepository;
@@ -114,9 +115,12 @@ public class MockController {
         CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
 
 
-        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password", null, new Date());
+        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 4,RequestState.Pending,"yes.png","password", null, new Date(), RequestState.Pending);
 
         inscriptionService.save(inscriptionRequest);
+
+        ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, RequestState.Pending);
+        externalCurriculumRepository.save(externalCurriculum);
     }
 }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
index 81f9d1e..6c39473 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
@@ -9,4 +9,6 @@ import java.util.ArrayList;
 
 public interface ExternalCurriculumRepository extends CrudRepository<ExternalCurriculum, Long> {
     ArrayList<ExternalCurriculum> getExternalCurriculumByInscriptionRequest(InscriptionRequest ir);
+
+    ExternalCurriculum getExternalCurriculumById(long id);
 }
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 8e31b39..a645098 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
@@ -47,48 +47,43 @@ public class InscriptionService {
         if (inscrRequest == null)
             return false;
 
-        // if th state is the same we don't send an email
-        if (requestState == inscrRequest.getState())
-            return false;
-
-        /** todo send an email to tell the poster of the inscrRequest (inscrRequest.getEmail())
-         *  to notify them that the state of their request changed
-         *  FooEmailFormat toSend = (String.format("Your request state changed from %s to %s"),
-         *                                              inscrRequest.getState(), requestState)
-         * FooEmailSender.send(toSend, inscrRequest.getEmail())
-         */
-
-
-        //saves the user from the request if accepted
-        if (requestState == RequestState.Accepted)
-        {
-            if (curriculumRepo.findById(inscrRequest.getCurriculumId()) == null)
-                return false;
-
-            User userFromRequest = new User(
-                    inscrRequest.getLastName(),
-                    inscrRequest.getFirstName(),
-                    inscrRequest.getEmail(),
-                    inscrRequest.getAddress(),
-                    inscrRequest.getCountry(),
-                    inscrRequest.getBirthDate(),
-                    inscrRequest.getProfilePicture(),
-                    inscrRequest.getPassword()
-            );
-
-            userRepo.save(userFromRequest);
-            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()),0));
-
-            //Create a minerval for the new student
-            Minerval minerval = new Minerval(userFromRequest.getRegNo(), 0, 852, 2023);
-            minervalRepository.save(minerval);
-
-        }
         inscrRequest.setState(requestState);
         save(inscrRequest);
+
+        //saves the user from the request if accepted from teacher and inscription services
+        if (requestState == RequestState.Accepted && (inscrRequest.getEquivalenceState() == RequestState.Accepted || inscrRequest.getEquivalenceState() == RequestState.Unrequired))
+        {
+            return createUser(inscrRequest);
+        }
         return true;
     }
 
+    public boolean createUser(InscriptionRequest inscrRequest){
+        //We must send an email here
+
+        if (curriculumRepo.findById(inscrRequest.getCurriculumId()) == null)
+            return false;
+
+        User userFromRequest = new User(
+                inscrRequest.getLastName(),
+                inscrRequest.getFirstName(),
+                inscrRequest.getEmail(),
+                inscrRequest.getAddress(),
+                inscrRequest.getCountry(),
+                inscrRequest.getBirthDate(),
+                inscrRequest.getProfilePicture(),
+                inscrRequest.getPassword()
+        );
+
+        userRepo.save(userFromRequest);
+        userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()),0));
+
+        //Create a minerval for the new student
+        Minerval minerval = new Minerval(userFromRequest.getRegNo(), 0, 852, 2023);
+        minervalRepository.save(minerval);
+
+        return true;
+    }
     public void delete(InscriptionRequest toDelete) {
         inscriptionRepo.delete(toDelete);
     }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
index 43b6ce9..4a36b70 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
@@ -89,6 +89,7 @@ public class ProtectionService {
         toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
         toReturn.put("identityCard", inscriptionRequest.getIdentityCard());
         toReturn.put("submissionDate", inscriptionRequest.getSubmissionDate());
+        toReturn.put("equivalenceState", inscriptionRequest.getEquivalenceState());
         return toReturn;
     }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
index bbcf921..35576c7 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
@@ -21,9 +21,10 @@ public class InscriptionRequest {
     private String password;
     private String identityCard;
     private Date submissionDate;
+    private RequestState equivalenceState;
     public InscriptionRequest(){}
 
-    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password, String identityCard, Date submissionDate){
+    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password, String identityCard, Date submissionDate, RequestState equivalenceState){
         this.lastName = lastName;
         this.firstName = firstName;
         this.address = address;
@@ -36,6 +37,7 @@ public class InscriptionRequest {
         this.password = password;
         this.identityCard = identityCard;
         this.submissionDate = submissionDate;
+        this.equivalenceState = equivalenceState;
     }
 
     public int getId() {
@@ -137,4 +139,12 @@ public class InscriptionRequest {
     public void setSubmissionDate(Date submissionDate) {
         this.submissionDate = submissionDate;
     }
+
+    public RequestState getEquivalenceState() {
+        return equivalenceState;
+    }
+
+    public void setEquivalenceState(RequestState equivalenceState) {
+        this.equivalenceState = equivalenceState;
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/RequestState.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/RequestState.java
index d52f1c9..fd2eeb0 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/RequestState.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/RequestState.java
@@ -3,5 +3,6 @@ package ovh.herisson.Clyde.Tables;
 public enum RequestState {
     Accepted,
     Refused,
-    Pending
+    Pending,
+    Unrequired
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/University.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/University.java
deleted file mode 100644
index 7a60db1..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/University.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-
-import jakarta.persistence.*;
-
-@Entity
-public class University {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    private String name;
-
-    public University(){}
-
-    public University(String name){
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/AboutRequest.vue
index c363acd..9ef8e57 100644
--- a/frontend/src/Apps/AboutRequest.vue
+++ b/frontend/src/Apps/AboutRequest.vue
@@ -1,27 +1,35 @@
 <script setup>
 import i18n from "@/i18n.js"
-import {getUser} from '../rest/Users.js'
+import {getSelf, getUser} from '../rest/Users.js'
 import {getcurriculum,getSomeonesCurriculumList} from "@/rest/curriculum.js";
 import {getRegisters} from "@/rest/ServiceInscription.js";
 import {get} from "jsdom/lib/jsdom/named-properties-tracker.js";
 import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js";
+import {ref} from "vue";
+import ExternalCurriculumList from "@/Apps/ExternalCurriculumList.vue";
+import {editEquivalenceState} from "@/rest/requests.js";
 
 const props = defineProps(['target']);
-let request = await getRegisters(props.target);
+const request = await getRegisters(props.target);
 const cursus = await getcurriculum(request.curriculum);
-
+const user = await getSelf();
+const list = ref(false);
 const externalCurriculum = await getExternalCurriculumByInscrReq(request.id)
-console.log(externalCurriculum)
+
 function getPP(){
   if(request.profilePictureUrl === null){
     return "/Clyde.png"
   }
   return request.profilePictureUrl;
 }
+
+async function editEquivalence(id, newstate){
+  await editEquivalenceState(id, newstate)
+}
 </script>
 
 <template>
-  <div class="body">
+  <div class="body" v-if="list == false">
     <div class="container">
       <div class="profilPic">
         <img class="subContainter" :src=getPP()>
@@ -46,24 +54,20 @@ function getPP(){
           <div>
             Cursus voulu : BAB {{cursus.year}} {{cursus.option}}
           </div>
-        </div>
-      </div>
-      <div class="moreInfos">
-        <div class = "oldcursus">
-          <div class="listTitle">
-            Cursus extérieurs a l'univesité
-          </div>
-          <div  class="listElement">
-            <div class=" containerElement" v-for="item in externalCurriculum">
-              <div class="formation">item.formation</div>
-              <div class="school">item.school</div>
-            </div>
+          <div v-if="cursus.year > 1">
+            <button style="background-color:rgb(105,05,105);margin-left: 5%" @click="list=!list" v-if="(user.role == 'Teacher' || user.role == 'Admin')&& request.equivalenceState == 'Pending'">See external curriculums</button>
           </div>
         </div>
       </div>
     </div>
   </div>
-
+  <div v-if="list==true">
+    <ExternalCurriculumList :ext-curr-list="externalCurriculum" :inscr-req-id="request.id"></ExternalCurriculumList>
+    <div>
+      <button @click="editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">Accept Equivalence</button>
+      <button @click="editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">Refuse Equivalence</button>
+    </div>
+  </div>
 </template>
 
 
@@ -117,50 +121,6 @@ function getPP(){
   border-radius:20px;
 }
 
-.moreInfos {
-  display:grid;
-  grid-template-rows:200px auto;
-  column-gap:50px;
-  row-gap:45px;
-  grid-template-areas:
-  "minfos minfos";
-  grid-template-columns:600px 600px;
-}
-
-.listTitle{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width:250px;
-  margin-left:auto;
-  margin-right:auto;
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;margin-bottom:10px;
-}
-
-.listElement{
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-  margin-bottom:10px;
-}
-
-.containerElement{
-  justify-content:center;
-  display:grid;
-  grid-template-columns:100px 100px 300px;
-  grid-template-areas:
-    "year option dateyear";
-  column-gap:40px;
-  padding-left: 25px;
-}
 button{
   font-size:15px;
   height:50px;
@@ -169,42 +129,4 @@ button{
   border-radius:20px;
 
 }
-
-.moreInfos {
-  display:grid;
-  grid-template-rows:200px auto;
-  column-gap:50px;
-  row-gap:45px;
-  grid-template-areas:
-  "minfos minfos";
-  grid-template-columns:600px 600px;
-  align-items:center;
-  justify-content:center;
-  margin-left: 320%;
-}
-
-.listTitle{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width:250px;
-  margin-left:auto;
-  margin-right:auto;
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;margin-bottom:10px;
-}
-
-.listElement{
-  border:2px solid black;
-  font-size:25px;
-  color:white;
-  padding:20px;
-  background-color:rgb(50,50,50);
-  border-radius:20px;
-  margin-bottom:10px;
-}
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ExternalCurriculumList.vue b/frontend/src/Apps/ExternalCurriculumList.vue
new file mode 100644
index 0000000..3a2dcd2
--- /dev/null
+++ b/frontend/src/Apps/ExternalCurriculumList.vue
@@ -0,0 +1,103 @@
+<script setup>
+  import i18n from "@/i18n.js";
+  import {editExternalCurriculum} from "@/rest/externalCurriculum.js";
+  import {ref} from "vue";
+  import {editEquivalenceState} from "@/rest/requests.js";
+
+  const props = defineProps(["extCurrList","inscrReqId"])
+
+  const extCurrList = ref(props.extCurrList)
+
+</script>
+
+<template style="margin-top:5%;">
+  <div style="display:flex; justify-content:center; " v-for="item in extCurrList">
+    <div class="bodu">
+      <div class="container">
+        <div class="status"><a style="margin-left:30px">{{item.state}}</a></div>
+        <div class="school"><a>{{item.school}}</a></div>
+        <div class="formation"><a>{{item.formation}}</a></div>
+        <div class="completion"><a>{{item.completion}}</a></div>
+        <div class="download"><button>Download document</button></div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<style scoped>
+.container{
+  color:white;
+  height:100px;
+  font-size:30px;
+  display:grid;
+  grid-template-columns:15% 10% 20% 15% 13.1%;
+  grid-template-areas:
+    "status school formation completion download";
+  column-gap:10px;
+}
+
+.status {
+  grid-area:status;
+  align-self:center;
+  font-size: 70%;
+}
+
+.school{
+  grid-area:school;
+  align-self:center;
+  font-size: 70%;
+}
+
+.formation{
+  grid-area:formation;
+  align-self:center;
+  font-size: 70%;
+}
+
+.completion{
+  grid-area:completion;
+  align-self:center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  font-size: 70%;
+}
+
+.accept{
+  grid-area:accept;
+  align-self:center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
+}
+
+.refuse{
+  grid-area: refuse;
+  align-self:center;
+}
+
+.download{
+  grid-area: download;
+  align-self:center;
+}
+button{
+  font-size:15px;
+  height:50px;
+  width:75%;
+  border:none;
+  border-radius:20px;
+
+}
+
+.bodu {
+  margin-top:2%;
+  width:66%;
+  border:2px solid black;
+  border-radius:9px;
+  background-color:rgb(50,50,50);
+}
+
+
+</style>
+
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index e306d38..b2bef3d 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -16,9 +16,7 @@
 
   async function upPage(id,review){
     await validateRegister(id,review);
-    if (review == "Accepted"){
 
-    }
     requests.value = await getAllRegisters();
   }
 
@@ -40,7 +38,7 @@
 <template>
   <div v-if="windowsState === 1">
     <AboutRequest :target="targetId"></AboutRequest>
-    <button style="background-color:rgb(105,05,105);margin-left: 30%" @click="windowsState=0;">Retour</button>
+    <button style="background-color:rgb(105,05,105);margin-left: 30%; margin-top: 5%" @click="windowsState=0;loadRequests()">Retour</button>
   </div>
   <div v-if="windowsState === 0">
     <div style="margin-top: 2%;margin-left: 2%">
@@ -61,15 +59,16 @@
       </span>
     </div>
     <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
-      <div class="bodu" v-if="filterType == 'None' || filterType == item.state">
-        <div class="container" style="grid-template-columns:15% 15% 10% 14.2% 14.2% 14.2% 14.2%;grid-template-areas:'date state surname firstname accept refuse infos';" v-if="requestType === 'inscription'">
+      <div class="bodu" style="width: 95%" v-if="filterType == 'None' || filterType == item.state">
+        <div class="container" style="grid-template-columns:11% 15% 20% 10% 10% 9% 9%;grid-template-areas:'date state equivalencestate surname firstname accept refuse infos';" v-if="requestType === 'inscription'">
           <!--
             The condition below avoids an error occuring because loadRequests() finishes after the vue refresh
             then submissionDate is undefined an it triggers an error in the console despite the fact that it is working
             properly at the end.
            -->
           <div class="date" v-if="item.submissionDate !== undefined">{{item.submissionDate.slice(0, 10)}}</div>
-          <div class="state">{{item.state}}</div>
+          <div class="state" style="font-size: 80%">Approval : {{item.state}}</div>
+          <div class="equivalencestate" style="font-size: 80%">Teacher approval : {{item.equivalenceState}}</div>
           <div class="surname">{{item.lastName}}</div>
           <div class="firstname">{{item.firstName}}</div>
           <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
@@ -110,6 +109,10 @@
     column-gap:10px;
   }
 
+  .equivalencestate{
+    grid-area: equivalencestate;
+    align-self: center;
+  }
   .studentfirstname{
     grid-area: studentfirstname;
     align-self: center;
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index af8f89a..5b0a807 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -20,6 +20,7 @@
     address:null,
     country:null,
     curriculum:null,
+    equivalenceState: "Unrequired"
   })
 
   const notcompletedCheck = ref(false);
@@ -76,18 +77,12 @@
   //This functions makes the distinction between a master cursus (year 4 or more) and a bachelor cursus (year 3 or less)
   function getCursusDisplay(cursus){
     if (cursus.year <= 3){
-      return cursus.curriculumId + " BAB " + cursus.year + " " + cursus.option;
+      return "BAB " + cursus.year + " " + cursus.option;
     }else{
-      return cursus.curriculumId + " MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
+      return "MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
     }
   }
 
-  //This function return the id of a decorated cursus (decorated by the function up)
-  function parseDecoratedCursus(cursus){
-    let id = cursus.substring(0, cursus.indexOf(" ")+1);
-    return id;
-  }
-
   async function getCurriculumYear(curriculumId){
     const curriculum = await getcurriculum(curriculumId);
     return parseInt(curriculum.year);
@@ -97,7 +92,7 @@
 
   //Post the register request and return the id of the newly created request and also post the external curriculum list in the database
   async function postRegisterReq(){
-    const val = await register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, parseDecoratedCursus(outputs.curriculum), ppData, null, new Date());
+    const val = await register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date(), outputs.equivalenceState);
     for (let item in externalCurrTab.value){
       await createExternalCurriculum(val.id, externalCurrTab.value[item].school, externalCurrTab.value[item].formation, externalCurrTab.value[item].completion, externalCurrTab.value[item].startYear, externalCurrTab.value[item].endYear, externalCurrTab.value[item].justifdocUrl);
     }
@@ -198,7 +193,7 @@
               <div class="inputBox">
                 <p>{{i18n("Curriculum").toUpperCase()}}</p> 
                   <select v-model="outputs.curriculum">
-                    <option v-for="item in curricula">{{getCursusDisplay(item)}}</option>
+                    <option v-for="item in curricula" :value="item.curriculumId">{{getCursusDisplay(item)}}</option>
                   </select>
               </div>
               <p style="color:rgb(239,60,168);">
diff --git a/frontend/src/rest/ServiceInscription.js b/frontend/src/rest/ServiceInscription.js
index 878f38b..5c10fde 100644
--- a/frontend/src/rest/ServiceInscription.js
+++ b/frontend/src/rest/ServiceInscription.js
@@ -43,3 +43,4 @@ export async function getAllRegisters(){
 export async function validateRegister(id, state){
   return restPatch("/request/register/" + id, state);
 }
+
diff --git a/frontend/src/rest/Users.js b/frontend/src/rest/Users.js
index 6d9d05b..7daa99b 100644
--- a/frontend/src/rest/Users.js
+++ b/frontend/src/rest/Users.js
@@ -26,7 +26,7 @@ export function disconnect(){
  * @param curriculum 
  * @param imageId	id of the image in database returned when uploaded
  */
-export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate, equivalence){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -38,7 +38,8 @@ export async function register(firstname, lastname, birthDate, password, email,
 		curriculumId: curriculumId,
     	profilePicture: imageId,
 		identityCard : identityCardId,
-		submissionDate : submissionDate
+		submissionDate : submissionDate,
+		equivalenceState : equivalence
 	});
 }
 
diff --git a/frontend/src/rest/externalCurriculum.js b/frontend/src/rest/externalCurriculum.js
index 2f2ed70..73da047 100644
--- a/frontend/src/rest/externalCurriculum.js
+++ b/frontend/src/rest/externalCurriculum.js
@@ -1,4 +1,4 @@
-import {restGet, restPost} from "@/rest/restConsumer.js";
+import {restGet, restPatch, restPost} from "@/rest/restConsumer.js";
 import {parseInteger} from "jsdom/lib/jsdom/living/helpers/strings.js";
 
 export async function createExternalCurriculum(inscriptionRequestId,school, formation, completion, startYear, endYear, justifdocUrl){
@@ -14,5 +14,9 @@ export async function createExternalCurriculum(inscriptionRequestId,school, form
 }
 
 export async function getExternalCurriculumByInscrReq(inscrReqId){
-    return restGet("/externalcurriculum/"+inscrReqId);
+    return restGet("/externalcurriculum/"+inscrReqId)
+}
+
+export async function editExternalCurriculum(extReqId, newState){
+    return restPatch("/externalcurriculum/"+extReqId+"/"+newState)
 }
diff --git a/frontend/src/rest/requests.js b/frontend/src/rest/requests.js
index eda7418..0b52d7e 100644
--- a/frontend/src/rest/requests.js
+++ b/frontend/src/rest/requests.js
@@ -1,4 +1,4 @@
-import {restGet, restPost} from "@/rest/restConsumer.js";
+import {restGet, restPatch, restPost} from "@/rest/restConsumer.js";
 
 export async function createExemptionsRequest(exempReq){
     return restPost("/exemptionreq", exempReq)
@@ -14,4 +14,8 @@ export async function getAllScholarShipsRequest(){
 
 export async function getAllExemptionsRequest(){
     return restGet("/exemptionsreq")
+}
+
+export async function editEquivalenceState(id, newstate){
+    return restPatch("/request/registerequiv/"+id+"/"+newstate)
 }
\ No newline at end of file

From 8ebedec68953c3a55aa17b183bc4d50a8146b0a0 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Thu, 11 Apr 2024 21:06:57 +0200
Subject: [PATCH 23/25] Fix fews things and rename the inscription app to
 managerequests also sort the files

---
 .../EndPoints/ApplicationsController.java     |  4 ++--
 .../Clyde/EndPoints/CurriculumController.java |  4 ++--
 .../ExternalCurriculumController.java         | 21 ++++++-------------
 .../InscriptionController.java                |  7 +++----
 .../{ => Inscription}/MinervalController.java |  7 +++----
 .../{ => Inscription}/PaymentController.java  | 11 +++-------
 .../{ => Inscription}/RequestsController.java |  8 ++++---
 .../Clyde/EndPoints/LoginController.java      |  3 +--
 .../Clyde/EndPoints/MockController.java       | 11 +++++++++-
 .../ExemptionsRequestRepository.java          |  4 ++--
 .../ExternalCurriculumRepository.java         |  7 +++----
 .../InscriptionRepository.java                |  4 ++--
 .../{ => Inscription}/MinervalRepository.java |  4 ++--
 .../{ => Inscription}/PaymentRepository.java  |  4 ++--
 .../ScholarshipRequestRepository.java         |  4 ++--
 .../Clyde/Services/AuthenticatorService.java  |  3 +++
 .../{ => Inscription}/InscriptionService.java |  6 +++++-
 .../Clyde/Services/ProtectionService.java     |  2 +-
 .../Clyde/Services/UserCurriculumService.java |  2 +-
 .../herisson/Clyde/Tables/Applications.java   |  2 +-
 .../{ => Inscription}/ExemptionsRequest.java  |  5 ++++-
 .../{ => Inscription}/ExternalCurriculum.java | 16 ++------------
 .../{ => Inscription}/InscriptionRequest.java |  4 +++-
 .../Tables/{ => Inscription}/Minerval.java    |  2 +-
 .../Tables/{ => Inscription}/Payment.java     |  2 +-
 .../ReInscriptionRequest.java                 |  5 ++++-
 .../{ => Inscription}/ScholarshipRequest.java |  4 +++-
 .../UninscriptionRequest.java                 |  3 ++-
 .../Apps/{ => Inscription}/AboutRequest.vue   | 12 +++++------
 .../Apps/{ => Inscription}/AboutStudent.vue   |  2 +-
 .../src/Apps/{ => Inscription}/CourseList.vue |  0
 .../ExternalCurriculumList.vue                | 15 -------------
 .../ManageRequests.vue}                       | 12 +----------
 frontend/src/Apps/Profil.vue                  |  2 +-
 frontend/src/Apps/StudentsList.vue            |  2 +-
 frontend/src/rest/apps.js                     |  9 ++++----
 frontend/src/rest/externalCurriculum.js       |  3 ---
 37 files changed, 94 insertions(+), 122 deletions(-)
 rename backend/src/main/java/ovh/herisson/Clyde/EndPoints/{ => Inscription}/ExternalCurriculumController.java (70%)
 rename backend/src/main/java/ovh/herisson/Clyde/EndPoints/{ => Inscription}/InscriptionController.java (95%)
 rename backend/src/main/java/ovh/herisson/Clyde/EndPoints/{ => Inscription}/MinervalController.java (92%)
 rename backend/src/main/java/ovh/herisson/Clyde/EndPoints/{ => Inscription}/PaymentController.java (75%)
 rename backend/src/main/java/ovh/herisson/Clyde/EndPoints/{ => Inscription}/RequestsController.java (91%)
 rename backend/src/main/java/ovh/herisson/Clyde/Repositories/{ => Inscription}/ExemptionsRequestRepository.java (57%)
 rename backend/src/main/java/ovh/herisson/Clyde/Repositories/{ => Inscription}/ExternalCurriculumRepository.java (65%)
 rename backend/src/main/java/ovh/herisson/Clyde/Repositories/{ => Inscription}/InscriptionRepository.java (62%)
 rename backend/src/main/java/ovh/herisson/Clyde/Repositories/{ => Inscription}/MinervalRepository.java (73%)
 rename backend/src/main/java/ovh/herisson/Clyde/Repositories/{ => Inscription}/PaymentRepository.java (68%)
 rename backend/src/main/java/ovh/herisson/Clyde/Repositories/{ => Inscription}/ScholarshipRequestRepository.java (57%)
 rename backend/src/main/java/ovh/herisson/Clyde/Services/{ => Inscription}/InscriptionService.java (91%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/ExemptionsRequest.java (90%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/ExternalCurriculum.java (86%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/InscriptionRequest.java (97%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/Minerval.java (96%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/Payment.java (97%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/ReInscriptionRequest.java (91%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/ScholarshipRequest.java (93%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/{ => Inscription}/UninscriptionRequest.java (86%)
 rename frontend/src/Apps/{ => Inscription}/AboutRequest.vue (83%)
 rename frontend/src/Apps/{ => Inscription}/AboutStudent.vue (98%)
 rename frontend/src/Apps/{ => Inscription}/CourseList.vue (100%)
 rename frontend/src/Apps/{ => Inscription}/ExternalCurriculumList.vue (84%)
 rename frontend/src/Apps/{Inscription.vue => Inscription/ManageRequests.vue} (95%)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
index 8d1f1ca..d4fdaa0 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
@@ -64,8 +64,8 @@ public class ApplicationsController {
         if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Secretary,Role.Admin},token))
             authorizedApps.add(Applications.ManageCourses);
 
-        if (!authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin},token)){
-            authorizedApps.add(Applications.Inscription);
+        if (!authServ.isNotIn(new Role[]{Role.InscriptionService,Role.Admin, Role.Teacher},token)){
+            authorizedApps.add(Applications.Requests);
             authorizedApps.add(Applications.StudentsList);}
 
         if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
index c9e78de..efe34e6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
@@ -4,8 +4,8 @@ package ovh.herisson.Clyde.EndPoints;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.InscriptionRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.*;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java
similarity index 70%
rename from backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java
rename to backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java
index 43daeb9..1067071 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ExternalCurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java
@@ -1,13 +1,12 @@
-package ovh.herisson.Clyde.EndPoints;
+package ovh.herisson.Clyde.EndPoints.Inscription;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
-import ovh.herisson.Clyde.Repositories.InscriptionRepository;
-import ovh.herisson.Clyde.Tables.ExternalCurriculum;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.RequestState;
+import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
+import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -29,7 +28,7 @@ public class ExternalCurriculumController {
     public ResponseEntity<ExternalCurriculum> postExternalCurriculum(@RequestBody Map<String, Object> externalCurrInfos){
         InscriptionRequest ir = inscriptionRepository.findById((Integer) externalCurrInfos.get("inscriptionRequestId"));
 
-        ExternalCurriculum toSave = new ExternalCurriculum(ir, (String) externalCurrInfos.get("school"),(String) externalCurrInfos.get("formation"),(String) externalCurrInfos.get("completion"), (Integer)externalCurrInfos.get("startYear"), (Integer)externalCurrInfos.get("endYear"), (String)externalCurrInfos.get("justifDocUrl"), RequestState.Pending);
+        ExternalCurriculum toSave = new ExternalCurriculum(ir, (String) externalCurrInfos.get("school"),(String) externalCurrInfos.get("formation"),(String) externalCurrInfos.get("completion"), (Integer)externalCurrInfos.get("startYear"), (Integer)externalCurrInfos.get("endYear"), (String)externalCurrInfos.get("justifDocUrl"));
 
         return new ResponseEntity<>(ecr.save(toSave), HttpStatus.OK);
     }
@@ -41,12 +40,4 @@ public class ExternalCurriculumController {
         ArrayList<ExternalCurriculum> toReturn = ecr.getExternalCurriculumByInscriptionRequest(ir);
         return new ResponseEntity<>(toReturn, HttpStatus.OK);
     }
-
-    @PatchMapping("/externalcurriculum/{extcurrid}/{newstate}")
-    public ResponseEntity<Object> changeExternalCurrState(@PathVariable long extcurrid, @PathVariable RequestState newstate){
-        ExternalCurriculum externalCurriculum = ecr.getExternalCurriculumById(extcurrid);
-        externalCurriculum.setState(newstate);
-        ecr.save(externalCurriculum);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/InscriptionController.java
similarity index 95%
rename from backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java
rename to backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/InscriptionController.java
index 9f47263..60f4585 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/InscriptionController.java
@@ -1,14 +1,13 @@
-package ovh.herisson.Clyde.EndPoints;
+package ovh.herisson.Clyde.EndPoints.Inscription;
 
-import org.apache.tomcat.util.http.parser.Authorization;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Services.InscriptionService;
+import ovh.herisson.Clyde.Services.Inscription.InscriptionService;
 import ovh.herisson.Clyde.Services.ProtectionService;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
 import ovh.herisson.Clyde.Tables.RequestState;
 import ovh.herisson.Clyde.Tables.Role;
 import java.util.Map;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/MinervalController.java
similarity index 92%
rename from backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
rename to backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/MinervalController.java
index 27efc58..737f472 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MinervalController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/MinervalController.java
@@ -1,13 +1,12 @@
-package ovh.herisson.Clyde.EndPoints;
+package ovh.herisson.Clyde.EndPoints.Inscription;
 
-import org.apache.coyote.Response;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.MinervalRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.MinervalRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Tables.Minerval;
+import ovh.herisson.Clyde.Tables.Inscription.Minerval;
 import ovh.herisson.Clyde.Tables.Role;
 
 import java.util.*;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/PaymentController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/PaymentController.java
similarity index 75%
rename from backend/src/main/java/ovh/herisson/Clyde/EndPoints/PaymentController.java
rename to backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/PaymentController.java
index b2bf755..b70ad59 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/PaymentController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/PaymentController.java
@@ -1,18 +1,13 @@
-package ovh.herisson.Clyde.EndPoints;
+package ovh.herisson.Clyde.EndPoints.Inscription;
 
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Repositories.PaymentRepository;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Tables.Minerval;
-import ovh.herisson.Clyde.Tables.Payment;
-import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Repositories.Inscription.PaymentRepository;
+import ovh.herisson.Clyde.Tables.Inscription.Payment;
 
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 
 @RestController
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java
similarity index 91%
rename from backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
rename to backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java
index 0d39bf7..e67f8ff 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/RequestsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java
@@ -1,15 +1,17 @@
-package ovh.herisson.Clyde.EndPoints;
+package ovh.herisson.Clyde.EndPoints.Inscription;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.CourseRepository;
-import ovh.herisson.Clyde.Repositories.ExemptionsRequestRepository;
-import ovh.herisson.Clyde.Repositories.ScholarshipRequestRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.ExemptionsRequestRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.ScholarshipRequestRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Inscription.ExemptionsRequest;
+import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java
index 0b1d7c5..7ab988d 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java
@@ -6,12 +6,11 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.ProtectionService;
 import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
 import ovh.herisson.Clyde.Tables.RequestState;
 
 import java.util.Date;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 0a80647..1e207e0 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -3,8 +3,17 @@ package ovh.herisson.Clyde.EndPoints;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.*;
+import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.MinervalRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.ScholarshipRequestRepository;
 import ovh.herisson.Clyde.Services.*;
+import ovh.herisson.Clyde.Services.Inscription.InscriptionService;
 import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.Inscription.Minerval;
+import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -119,7 +128,7 @@ public class MockController {
 
         inscriptionService.save(inscriptionRequest);
 
-        ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, RequestState.Pending);
+        ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null);
         externalCurriculumRepository.save(externalCurriculum);
     }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExemptionsRequestRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java
similarity index 57%
rename from backend/src/main/java/ovh/herisson/Clyde/Repositories/ExemptionsRequestRepository.java
rename to backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java
index 917af1e..3f66e80 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExemptionsRequestRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java
@@ -1,7 +1,7 @@
-package ovh.herisson.Clyde.Repositories;
+package ovh.herisson.Clyde.Repositories.Inscription;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.ExemptionsRequest;
+import ovh.herisson.Clyde.Tables.Inscription.ExemptionsRequest;
 
 public interface ExemptionsRequestRepository extends CrudRepository<ExemptionsRequest, Long> {
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java
similarity index 65%
rename from backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
rename to backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java
index 6c39473..41ef507 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ExternalCurriculumRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java
@@ -1,9 +1,8 @@
-package ovh.herisson.Clyde.Repositories;
+package ovh.herisson.Clyde.Repositories.Inscription;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.ExternalCurriculum;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
-import ovh.herisson.Clyde.Tables.User;
+import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
 
 import java.util.ArrayList;
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/InscriptionRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/InscriptionRepository.java
similarity index 62%
rename from backend/src/main/java/ovh/herisson/Clyde/Repositories/InscriptionRepository.java
rename to backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/InscriptionRepository.java
index 0d83e6b..6564377 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/InscriptionRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/InscriptionRepository.java
@@ -1,7 +1,7 @@
-package ovh.herisson.Clyde.Repositories;
+package ovh.herisson.Clyde.Repositories.Inscription;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
 
 
 public interface InscriptionRepository extends CrudRepository<InscriptionRequest,Long> {
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/MinervalRepository.java
similarity index 73%
rename from backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
rename to backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/MinervalRepository.java
index 5af1cab..475ac3c 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/MinervalRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/MinervalRepository.java
@@ -1,7 +1,7 @@
-package ovh.herisson.Clyde.Repositories;
+package ovh.herisson.Clyde.Repositories.Inscription;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Minerval;
+import ovh.herisson.Clyde.Tables.Inscription.Minerval;
 
 import java.util.ArrayList;
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/PaymentRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/PaymentRepository.java
similarity index 68%
rename from backend/src/main/java/ovh/herisson/Clyde/Repositories/PaymentRepository.java
rename to backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/PaymentRepository.java
index 2e196f4..c479a4e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/PaymentRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/PaymentRepository.java
@@ -1,7 +1,7 @@
-package ovh.herisson.Clyde.Repositories;
+package ovh.herisson.Clyde.Repositories.Inscription;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Payment;
+import ovh.herisson.Clyde.Tables.Inscription.Payment;
 
 import java.util.ArrayList;
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScholarshipRequestRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ScholarshipRequestRepository.java
similarity index 57%
rename from backend/src/main/java/ovh/herisson/Clyde/Repositories/ScholarshipRequestRepository.java
rename to backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ScholarshipRequestRepository.java
index 4404a11..5550937 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScholarshipRequestRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ScholarshipRequestRepository.java
@@ -1,7 +1,7 @@
-package ovh.herisson.Clyde.Repositories;
+package ovh.herisson.Clyde.Repositories.Inscription;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.ScholarshipRequest;
+import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
 
 public interface ScholarshipRequestRepository extends CrudRepository<ScholarshipRequest, Long> {
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
index 25c127f..9e517b7 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
@@ -1,7 +1,10 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.Services.Inscription.InscriptionService;
 import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+
 import java.util.Date;
 
 @Service
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java
similarity index 91%
rename from backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
rename to backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java
index a645098..e897c7a 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java
@@ -1,9 +1,13 @@
-package ovh.herisson.Clyde.Services;
+package ovh.herisson.Clyde.Services.Inscription;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.*;
+import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.MinervalRepository;
 import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.Inscription.Minerval;
 
 @Service
 public class InscriptionService {
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
index 4a36b70..1c9b944 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
@@ -1,7 +1,7 @@
 package ovh.herisson.Clyde.Services;
 
 import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
 import ovh.herisson.Clyde.Tables.User;
 
 import java.util.ArrayList;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
index 544307b..8b446df 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/UserCurriculumService.java
@@ -2,7 +2,7 @@ package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.CurriculumRepository;
-import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Tables.*;
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
index 3dadcec..5c39891 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
@@ -18,6 +18,6 @@ public enum Applications {
     UsersList,
 
     // InscriptionService authorization
-    Inscription,
+    Requests,
     StudentsList
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java
similarity index 90%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java
index c38e559..75ee926 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java
@@ -1,9 +1,12 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 
 import jakarta.persistence.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
+import ovh.herisson.Clyde.Tables.Course;
+import ovh.herisson.Clyde.Tables.RequestState;
+import ovh.herisson.Clyde.Tables.User;
 
 import java.util.Date;
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java
similarity index 86%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java
index 534a108..09d59bb 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExternalCurriculum.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java
@@ -1,4 +1,4 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 
 import jakarta.persistence.*;
@@ -25,12 +25,9 @@ public class ExternalCurriculum {
     private int endYear;
     private String justifdocUrl;
 
-    //Accepted if the document justifies the claimed formation
-    private RequestState state;
-
     public ExternalCurriculum(){}
 
-    public ExternalCurriculum(InscriptionRequest ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
+    public ExternalCurriculum(InscriptionRequest ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl){
         this.inscriptionRequest = ir;
         this.school = school;
         this.formation = formation;
@@ -38,7 +35,6 @@ public class ExternalCurriculum {
         this.startYear = startYear;
         this.endYear = endYear;
         this.justifdocUrl = justifdocUrl;
-        this.state = state;
     }
 
     public int getId() {
@@ -100,12 +96,4 @@ public class ExternalCurriculum {
     public String getJustifdocUrl() {
         return justifdocUrl;
     }
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/InscriptionRequest.java
similarity index 97%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/InscriptionRequest.java
index 35576c7..07c720f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/InscriptionRequest.java
@@ -1,6 +1,8 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 import jakarta.persistence.*;
+import ovh.herisson.Clyde.Tables.RequestState;
+
 import java.util.Date;
 
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Minerval.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Minerval.java
similarity index 96%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/Minerval.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Minerval.java
index b54e5db..dac5799 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Minerval.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Minerval.java
@@ -1,4 +1,4 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Payment.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Payment.java
similarity index 97%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/Payment.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Payment.java
index ae4189e..48626e1 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Payment.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/Payment.java
@@ -1,4 +1,4 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ReInscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ReInscriptionRequest.java
similarity index 91%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ReInscriptionRequest.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ReInscriptionRequest.java
index b96ed42..cafffe6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ReInscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ReInscriptionRequest.java
@@ -1,8 +1,11 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 import jakarta.persistence.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
+import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.RequestState;
+import ovh.herisson.Clyde.Tables.User;
 
 @Entity
 public class ReInscriptionRequest {
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ScholarshipRequest.java
similarity index 93%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ScholarshipRequest.java
index 3de71ba..18ebee6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ScholarshipRequest.java
@@ -1,8 +1,10 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 import jakarta.persistence.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
+import ovh.herisson.Clyde.Tables.RequestState;
+import ovh.herisson.Clyde.Tables.User;
 
 import java.util.Date;
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java
similarity index 86%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java
index d2cbf73..2264b67 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java
@@ -1,9 +1,10 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import ovh.herisson.Clyde.Tables.RequestState;
 
 @Entity
 public class UninscriptionRequest {
diff --git a/frontend/src/Apps/AboutRequest.vue b/frontend/src/Apps/Inscription/AboutRequest.vue
similarity index 83%
rename from frontend/src/Apps/AboutRequest.vue
rename to frontend/src/Apps/Inscription/AboutRequest.vue
index 9ef8e57..15c72f5 100644
--- a/frontend/src/Apps/AboutRequest.vue
+++ b/frontend/src/Apps/Inscription/AboutRequest.vue
@@ -1,12 +1,12 @@
 <script setup>
 import i18n from "@/i18n.js"
-import {getSelf, getUser} from '../rest/Users.js'
+import {getSelf, getUser} from '../../rest/Users.js'
 import {getcurriculum,getSomeonesCurriculumList} from "@/rest/curriculum.js";
 import {getRegisters} from "@/rest/ServiceInscription.js";
 import {get} from "jsdom/lib/jsdom/named-properties-tracker.js";
 import {getExternalCurriculumByInscrReq} from "@/rest/externalCurriculum.js";
 import {ref} from "vue";
-import ExternalCurriculumList from "@/Apps/ExternalCurriculumList.vue";
+import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
 import {editEquivalenceState} from "@/rest/requests.js";
 
 const props = defineProps(['target']);
@@ -63,9 +63,10 @@ async function editEquivalence(id, newstate){
   </div>
   <div v-if="list==true">
     <ExternalCurriculumList :ext-curr-list="externalCurriculum" :inscr-req-id="request.id"></ExternalCurriculumList>
-    <div>
-      <button @click="editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">Accept Equivalence</button>
-      <button @click="editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">Refuse Equivalence</button>
+    <div style="margin-left: 15%;margin-top: 5%;">
+      <button style="margin-left: 2%" @click="list = false;editEquivalence(request.id, 'Accepted'); request.equivalenceState='Accepted'">Accept Equivalence</button>
+      <button style="margin-left: 2%" @click="list = false;editEquivalence(request.id, 'Refused'); request.equivalenceState='Refused'">Refuse Equivalence</button>
+      <button style="margin-left: 2%" @click="list=false">Return to profile</button>
     </div>
   </div>
 </template>
@@ -127,6 +128,5 @@ button{
   width:100px;
   border:none;
   border-radius:20px;
-
 }
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/AboutStudent.vue b/frontend/src/Apps/Inscription/AboutStudent.vue
similarity index 98%
rename from frontend/src/Apps/AboutStudent.vue
rename to frontend/src/Apps/Inscription/AboutStudent.vue
index 087559a..640ea1b 100644
--- a/frontend/src/Apps/AboutStudent.vue
+++ b/frontend/src/Apps/Inscription/AboutStudent.vue
@@ -1,6 +1,6 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import {getUser} from '../rest/Users.js'
+  import {getUser} from '../../rest/Users.js'
   import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
 
   const props = defineProps(['target']);
diff --git a/frontend/src/Apps/CourseList.vue b/frontend/src/Apps/Inscription/CourseList.vue
similarity index 100%
rename from frontend/src/Apps/CourseList.vue
rename to frontend/src/Apps/Inscription/CourseList.vue
diff --git a/frontend/src/Apps/ExternalCurriculumList.vue b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
similarity index 84%
rename from frontend/src/Apps/ExternalCurriculumList.vue
rename to frontend/src/Apps/Inscription/ExternalCurriculumList.vue
index 3a2dcd2..d23cf24 100644
--- a/frontend/src/Apps/ExternalCurriculumList.vue
+++ b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
@@ -1,8 +1,6 @@
 <script setup>
   import i18n from "@/i18n.js";
-  import {editExternalCurriculum} from "@/rest/externalCurriculum.js";
   import {ref} from "vue";
-  import {editEquivalenceState} from "@/rest/requests.js";
 
   const props = defineProps(["extCurrList","inscrReqId"])
 
@@ -64,19 +62,6 @@
   font-size: 70%;
 }
 
-.accept{
-  grid-area:accept;
-  align-self:center;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow:ellipsis;
-}
-
-.refuse{
-  grid-area: refuse;
-  align-self:center;
-}
-
 .download{
   grid-area: download;
   align-self:center;
diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription/ManageRequests.vue
similarity index 95%
rename from frontend/src/Apps/Inscription.vue
rename to frontend/src/Apps/Inscription/ManageRequests.vue
index b2bef3d..e45a1a5 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription/ManageRequests.vue
@@ -2,7 +2,7 @@
   import i18n from "@/i18n.js"
   import {ref} from 'vue'
   import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
-  import AboutRequest from "@/Apps/AboutRequest.vue";
+  import AboutRequest from "@/Apps/Inscription/AboutRequest.vue";
   import {getAllExemptionsRequest, getAllScholarShipsRequest} from "@/rest/requests.js";
 
   const requests = ref(await getAllRegisters());
@@ -38,7 +38,6 @@
 <template>
   <div v-if="windowsState === 1">
     <AboutRequest :target="targetId"></AboutRequest>
-    <button style="background-color:rgb(105,05,105);margin-left: 30%; margin-top: 5%" @click="windowsState=0;loadRequests()">Retour</button>
   </div>
   <div v-if="windowsState === 0">
     <div style="margin-top: 2%;margin-left: 2%">
@@ -146,10 +145,6 @@
     align-self:center;
   }
 
-  .titles {
-    grid-area:titles;
-    align-self:center;
-  }
   .date{
     grid-area:date;
     margin-left:40px;
@@ -162,11 +157,6 @@
     align-self:center;
   }
 
-  .type{
-    grid-area:type;
-    align-self:center;
-  }
-
   .surname{
     grid-area:surname;
     align-self:center;
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 7d3edb8..c33a11d 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -5,7 +5,7 @@
   import {getCourses} from "../rest/courses.js"
   import i18n from "@/i18n.js"
   import {uploadFile, uploadProfilePicture} from '@/rest/uploads.js'
-  import CourseList from "@/Apps/CourseList.vue";
+  import CourseList from "@/Apps/Inscription/CourseList.vue";
   import {editMinerval, getCurrentMinerval} from "@/rest/minerval.js";
   import {postPayment} from "@/rest/payment.js";
   import {createScholarshipRequest} from "@/rest/requests.js";
diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue
index 62f4acb..c6adea8 100644
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@@ -2,7 +2,7 @@
   import i18n from "@/i18n.js"
   import {provide, reactive, ref} from 'vue'
   import { getStudents } from '../rest/Users.js'
-  import AboutStudent from "@/Apps/AboutStudent.vue";
+  import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
   const users = await getStudents();
 
   let targetRegNo = "";
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 72b3293..b414e68 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -4,17 +4,18 @@ import i18n from '@/i18n.js'
 
 // Liste des apps
 import LoginPage from '@/Apps/Login.vue'
-import Inscription from "@/Apps/Inscription.vue"
+import Inscription from "@/Apps/Inscription/ManageRequests.vue"
 import Profil from "@/Apps/Profil.vue"
 import Courses from "@/Apps/ManageCourses.vue"
 import Users from "@/Apps/UsersList.vue"
 import Students from "@/Apps/StudentsList.vue"
-import AboutStudent from "@/Apps/AboutStudent.vue";
+import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 import Msg from "@/Apps/Msg.vue"
+import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
 
 const apps = {
 		'/login': LoginPage,
-		'/inscription': Inscription,
+		'/requests': ManageRequests,
 		'/profil': Profil,
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
@@ -27,7 +28,7 @@ const appsList = {
 		'Notification': { path: '#/notifs', icon: 'fa-bell', text: i18n("app.notifications") },
 		'Forum': { path: '#/forum', icon: 'fa-envelope', text: i18n("app.forum") },
 		'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },
-		'Inscription': { path: '#/inscription', icon: 'fa-users', text: i18n("app.inscription.requests") },
+		'Requests': { path: '#/requests', icon: 'fa-users', text: "Requests" },
 		'ManageCourses': { path: '#/manage-courses', icon: 'fa-book', text: i18n("app.manage.courses") },
 		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
 		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
diff --git a/frontend/src/rest/externalCurriculum.js b/frontend/src/rest/externalCurriculum.js
index 73da047..8274cff 100644
--- a/frontend/src/rest/externalCurriculum.js
+++ b/frontend/src/rest/externalCurriculum.js
@@ -17,6 +17,3 @@ export async function getExternalCurriculumByInscrReq(inscrReqId){
     return restGet("/externalcurriculum/"+inscrReqId)
 }
 
-export async function editExternalCurriculum(extReqId, newState){
-    return restPatch("/externalcurriculum/"+extReqId+"/"+newState)
-}

From 98c9d2d754d7c10b5088dad38424fe4210992414 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Fri, 12 Apr 2024 09:28:56 +0200
Subject: [PATCH 24/25] Link the ExternalCurriculum to a user after the
 inscription.

Add the ExternalCurriculum lists in AboutStudent.vue
---
 .../ExternalCurriculumController.java         | 16 +++++++++++++--
 .../Clyde/EndPoints/MockController.java       |  2 +-
 .../ExternalCurriculumRepository.java         |  2 ++
 .../Inscription/InscriptionService.java       | 15 ++++++++++++--
 .../Inscription/ExternalCurriculum.java       | 17 +++++++++++++++-
 .../src/Apps/Inscription/AboutStudent.vue     | 20 ++++++++++++++-----
 .../Inscription/ExternalCurriculumList.vue    |  5 ++---
 frontend/src/rest/externalCurriculum.js       |  4 ++++
 8 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java
index 1067071..e88c759 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/ExternalCurriculumController.java
@@ -5,8 +5,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
+import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
 import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.User;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -17,10 +19,12 @@ public class ExternalCurriculumController {
 
     public final ExternalCurriculumRepository ecr;
     public final InscriptionRepository inscriptionRepository;
+    public final UserRepository userRepository;
 
-    public ExternalCurriculumController(ExternalCurriculumRepository ecr, InscriptionRepository inscriptionRepository) {
+    public ExternalCurriculumController(ExternalCurriculumRepository ecr, InscriptionRepository inscriptionRepository, UserRepository userRepository) {
         this.ecr = ecr;
         this.inscriptionRepository = inscriptionRepository;
+        this.userRepository = userRepository;
     }
 
     //everyone can post some externalcurriculums (the validity of the elements is assured by the inscription service)
@@ -28,7 +32,7 @@ public class ExternalCurriculumController {
     public ResponseEntity<ExternalCurriculum> postExternalCurriculum(@RequestBody Map<String, Object> externalCurrInfos){
         InscriptionRequest ir = inscriptionRepository.findById((Integer) externalCurrInfos.get("inscriptionRequestId"));
 
-        ExternalCurriculum toSave = new ExternalCurriculum(ir, (String) externalCurrInfos.get("school"),(String) externalCurrInfos.get("formation"),(String) externalCurrInfos.get("completion"), (Integer)externalCurrInfos.get("startYear"), (Integer)externalCurrInfos.get("endYear"), (String)externalCurrInfos.get("justifDocUrl"));
+        ExternalCurriculum toSave = new ExternalCurriculum(ir, (String) externalCurrInfos.get("school"),(String) externalCurrInfos.get("formation"),(String) externalCurrInfos.get("completion"), (Integer)externalCurrInfos.get("startYear"), (Integer)externalCurrInfos.get("endYear"), (String)externalCurrInfos.get("justifDocUrl"), null);
 
         return new ResponseEntity<>(ecr.save(toSave), HttpStatus.OK);
     }
@@ -40,4 +44,12 @@ public class ExternalCurriculumController {
         ArrayList<ExternalCurriculum> toReturn = ecr.getExternalCurriculumByInscriptionRequest(ir);
         return new ResponseEntity<>(toReturn, HttpStatus.OK);
     }
+
+    @GetMapping("/externalcurriculumbyuser/{userId}")
+    public ResponseEntity<ArrayList<ExternalCurriculum>> getExternalCurrByUser(@PathVariable long userId){
+        User user = userRepository.findById(userId);
+
+        ArrayList<ExternalCurriculum> toReturn = ecr.getExternalCurriculumByUser(user);
+        return new ResponseEntity<>(toReturn, HttpStatus.OK);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
index 1e207e0..14fd259 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -128,7 +128,7 @@ public class MockController {
 
         inscriptionService.save(inscriptionRequest);
 
-        ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null);
+        ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, null);
         externalCurriculumRepository.save(externalCurriculum);
     }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java
index 41ef507..7b4ee4e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExternalCurriculumRepository.java
@@ -3,11 +3,13 @@ package ovh.herisson.Clyde.Repositories.Inscription;
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
 import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.User;
 
 import java.util.ArrayList;
 
 public interface ExternalCurriculumRepository extends CrudRepository<ExternalCurriculum, Long> {
     ArrayList<ExternalCurriculum> getExternalCurriculumByInscriptionRequest(InscriptionRequest ir);
 
+    ArrayList<ExternalCurriculum> getExternalCurriculumByUser(User user);
     ExternalCurriculum getExternalCurriculumById(long id);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java
index e897c7a..c80e2d9 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java
@@ -3,12 +3,16 @@ package ovh.herisson.Clyde.Services.Inscription;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.*;
+import ovh.herisson.Clyde.Repositories.Inscription.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.Inscription.InscriptionRepository;
 import ovh.herisson.Clyde.Repositories.Inscription.MinervalRepository;
 import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.Inscription.ExternalCurriculum;
 import ovh.herisson.Clyde.Tables.Inscription.InscriptionRequest;
 import ovh.herisson.Clyde.Tables.Inscription.Minerval;
 
+import java.util.ArrayList;
+
 @Service
 public class InscriptionService {
 
@@ -22,14 +26,15 @@ public class InscriptionService {
 
     private final MinervalRepository minervalRepository;
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+    private final ExternalCurriculumRepository externalCurriculumRepository;
 
-
-    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo, MinervalRepository minervalRepository){
+    public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo, MinervalRepository minervalRepository, ExternalCurriculumRepository externalCurriculumRepository){
         this.inscriptionRepo = inscriptionRepo;
         this.userRepo = userRepo;
         this.userCurriculumRepo = userCurriculumRepo;
         this.curriculumRepo = curriculumRepo;
         this.minervalRepository = minervalRepository;
+        this.externalCurriculumRepository = externalCurriculumRepository;
     }
 
     public InscriptionRequest save(InscriptionRequest inscriptionRequest){
@@ -86,6 +91,12 @@ public class InscriptionService {
         Minerval minerval = new Minerval(userFromRequest.getRegNo(), 0, 852, 2023);
         minervalRepository.save(minerval);
 
+        //Assign the externals curriculums from the inscription request to newly created student
+        ArrayList<ExternalCurriculum> extCurrList = externalCurriculumRepository.getExternalCurriculumByInscriptionRequest(inscrRequest);
+        for (int i = 0; i < extCurrList.size(); i++){
+            extCurrList.get(i).setUser(userFromRequest);
+            externalCurriculumRepository.save(extCurrList.get(i));
+        }
         return true;
     }
     public void delete(InscriptionRequest toDelete) {
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java
index 09d59bb..893971b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExternalCurriculum.java
@@ -2,6 +2,7 @@ package ovh.herisson.Clyde.Tables.Inscription;
 
 
 import jakarta.persistence.*;
+import ovh.herisson.Clyde.Tables.User;
 
 //This table stores a student's curriculum from another university
 @Entity
@@ -10,10 +11,15 @@ public class ExternalCurriculum {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
+    //An external curriculum is first linked to an inscription request and when it is accepted and the user is created we link it to the user
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name="InscriptionRequest")
     private InscriptionRequest inscriptionRequest;
 
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name="Users")
+    private User user;
+
     private String school;
 
     private String formation;
@@ -27,7 +33,7 @@ public class ExternalCurriculum {
 
     public ExternalCurriculum(){}
 
-    public ExternalCurriculum(InscriptionRequest ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl){
+    public ExternalCurriculum(InscriptionRequest ir, String school, String formation, String completion, int startYear, int endYear, String justifdocUrl,User user){
         this.inscriptionRequest = ir;
         this.school = school;
         this.formation = formation;
@@ -35,6 +41,7 @@ public class ExternalCurriculum {
         this.startYear = startYear;
         this.endYear = endYear;
         this.justifdocUrl = justifdocUrl;
+        this.user = user;
     }
 
     public int getId() {
@@ -96,4 +103,12 @@ public class ExternalCurriculum {
     public String getJustifdocUrl() {
         return justifdocUrl;
     }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public User getUser() {
+        return user;
+    }
 }
diff --git a/frontend/src/Apps/Inscription/AboutStudent.vue b/frontend/src/Apps/Inscription/AboutStudent.vue
index 640ea1b..03368c2 100644
--- a/frontend/src/Apps/Inscription/AboutStudent.vue
+++ b/frontend/src/Apps/Inscription/AboutStudent.vue
@@ -2,10 +2,15 @@
   import i18n from "@/i18n.js"
   import {getUser} from '../../rest/Users.js'
   import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
+  import {ref} from "vue";
+  import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
+  import {getExternalCurriculumByUser} from "@/rest/externalCurriculum.js";
 
-  const props = defineProps(['target']);
-  let user = await getUser(props.target);
-  let UserCurriculum = await getSomeonesCurriculumList(props.target);
+  const props = defineProps(['target'])
+  const user = await getUser(props.target)
+  const UserCurriculum = await getSomeonesCurriculumList(props.target)
+  const externalcurrlist = await getExternalCurriculumByUser(user.regNo)
+  const extercurrlist = ref(false)
 
   function getPP(){
     if(user.profilePictureUrl === null){
@@ -27,7 +32,7 @@
 </script>
 
 <template>
-  <div class="body">
+  <div class="body" v-if="extercurrlist==false">
     <div class="container">
       <div class="profilPic">
         <img class="subContainter" :src=getPP()>
@@ -49,6 +54,9 @@
           <div>
             Date de naissance : {{user.birthDate}}
           </div>
+          <div>
+            <button @click="extercurrlist=!extercurrlist">See external curriculums</button>
+          </div>
         </div>
       </div>
       <div class="moreInfos">
@@ -79,7 +87,9 @@
       </div>
     </div>
   </div>
-
+  <div v-if="extercurrlist==true">
+      <ExternalCurriculumList :ext-curr-list="externalcurrlist"></ExternalCurriculumList>
+  </div>
 </template>
 
 
diff --git a/frontend/src/Apps/Inscription/ExternalCurriculumList.vue b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
index d23cf24..a642840 100644
--- a/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
+++ b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
@@ -2,10 +2,10 @@
   import i18n from "@/i18n.js";
   import {ref} from "vue";
 
-  const props = defineProps(["extCurrList","inscrReqId"])
+  const props = defineProps(["extCurrList"])
 
   const extCurrList = ref(props.extCurrList)
-
+  console.log(extCurrList)
 </script>
 
 <template style="margin-top:5%;">
@@ -19,7 +19,6 @@
         <div class="download"><button>Download document</button></div>
       </div>
     </div>
-
   </div>
 </template>
 
diff --git a/frontend/src/rest/externalCurriculum.js b/frontend/src/rest/externalCurriculum.js
index 8274cff..f1b403d 100644
--- a/frontend/src/rest/externalCurriculum.js
+++ b/frontend/src/rest/externalCurriculum.js
@@ -17,3 +17,7 @@ export async function getExternalCurriculumByInscrReq(inscrReqId){
     return restGet("/externalcurriculum/"+inscrReqId)
 }
 
+export async function getExternalCurriculumByUser(userId){
+    return restGet("/externalcurriculumbyuser/"+userId)
+}
+

From 05bff0fa7721e0aa11f1aea298d066afe585078a Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Sun, 14 Apr 2024 18:29:23 +0200
Subject: [PATCH 25/25] Add the uninscription request submission

---
 .../Inscription/RequestsController.java       | 15 +++++-
 .../UninscriptionRequestRepository.java       |  7 +++
 .../Inscription/UninscriptionRequest.java     | 50 ++++++++++++++++---
 frontend/src/Apps/Profil.vue                  | 31 ++++++++++--
 frontend/src/rest/requests.js                 |  4 ++
 5 files changed, 94 insertions(+), 13 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/UninscriptionRequestRepository.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java
index e67f8ff..61489bf 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java
@@ -6,12 +6,14 @@ import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.CourseRepository;
 import ovh.herisson.Clyde.Repositories.Inscription.ExemptionsRequestRepository;
 import ovh.herisson.Clyde.Repositories.Inscription.ScholarshipRequestRepository;
+import ovh.herisson.Clyde.Repositories.Inscription.UninscriptionRequestRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Tables.*;
 import ovh.herisson.Clyde.Tables.Inscription.ExemptionsRequest;
 import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
+import ovh.herisson.Clyde.Tables.Inscription.UninscriptionRequest;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -25,14 +27,15 @@ public class RequestsController {
     public final ScholarshipRequestRepository srr;
     public final UserRepository userRepository;
     public final AuthenticatorService authServ;
-
+    public final UninscriptionRequestRepository uninscriptionRequestRepository;
     public final CourseRepository courseRepository;
 
-    public RequestsController(ExemptionsRequestRepository err, ScholarshipRequestRepository srr, UserRepository userRepository, AuthenticatorService authServ, CourseRepository courseRepository) {
+    public RequestsController(ExemptionsRequestRepository err, ScholarshipRequestRepository srr, UserRepository userRepository, AuthenticatorService authServ, UninscriptionRequestRepository uninscriptionRequestRepository, CourseRepository courseRepository) {
         this.err = err;
         this.srr = srr;
         this.userRepository = userRepository;
         this.authServ = authServ;
+        this.uninscriptionRequestRepository = uninscriptionRequestRepository;
         this.courseRepository = courseRepository;
     }
 
@@ -83,4 +86,12 @@ public class RequestsController {
 
         return new ResponseEntity<>(toReturn, HttpStatus.OK);
     }
+
+    @PostMapping(value = "/uninscriptionreq")
+    public ResponseEntity<String> postUnregReq(@RequestBody Map<String,Object> uninscr){
+        User u = userRepository.findById((int) uninscr.get("userId"));
+        UninscriptionRequest ur = new UninscriptionRequest(RequestState.Pending, (String) uninscr.get("reason"), new Date(), u);
+        uninscriptionRequestRepository.save(ur);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/UninscriptionRequestRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/UninscriptionRequestRepository.java
new file mode 100644
index 0000000..6d38b8c
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/UninscriptionRequestRepository.java
@@ -0,0 +1,7 @@
+package ovh.herisson.Clyde.Repositories.Inscription;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.Inscription.UninscriptionRequest;
+
+public interface UninscriptionRequestRepository extends CrudRepository<UninscriptionRequest, Long> {
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java
index 2264b67..e7858c6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UninscriptionRequest.java
@@ -1,20 +1,29 @@
 package ovh.herisson.Clyde.Tables.Inscription;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import ovh.herisson.Clyde.Tables.RequestState;
+import ovh.herisson.Clyde.Tables.User;
+
+import java.util.Date;
 
 @Entity
 public class UninscriptionRequest {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
+    private long id;
     private RequestState state;
+    private String reason;
+    private Date date;
 
-    public UninscriptionRequest(RequestState state){
+    @JoinColumn(name = "Users")
+    @ManyToOne(fetch = FetchType.EAGER)
+    private User user;
+
+    public UninscriptionRequest(RequestState state,String reason, Date date, User user){
         this.state = state;
+        this.reason = reason;
+        this.date = date;
+        this.user = user;
     }
 
     public UninscriptionRequest(){}
@@ -26,4 +35,33 @@ public class UninscriptionRequest {
     public void setState(RequestState state) {
         this.state = state;
     }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Date getDate() {
+        return date;
+    }
 }
+
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index c33a11d..f0a7c2b 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -8,7 +8,7 @@
   import CourseList from "@/Apps/Inscription/CourseList.vue";
   import {editMinerval, getCurrentMinerval} from "@/rest/minerval.js";
   import {postPayment} from "@/rest/payment.js";
-  import {createScholarshipRequest} from "@/rest/requests.js";
+  import {addUninscReq, createScholarshipRequest} from "@/rest/requests.js";
 
   const user = ref(await getSelf());
   const UserCurriculum = ref(""); 
@@ -30,6 +30,9 @@
   const paymentPage = ref(false);
   const scholarship = ref(false);
   const scholarshipinfos = ref(false);
+  const uninscr = ref(false);
+  const sure = ref(0);
+
   const pattern = {
     profilPictureUrl:null,
     email:null,
@@ -64,6 +67,11 @@
     residencyDocUrl : ""
   })
 
+  //Used to post a uninscription request
+  const uninscriptionData = reactive({
+    reason : null,
+    userId : user.value.regNo
+  })
   const paymentAmount = ref(0);
   let toModify= Object.assign({}, pattern);
   let personnalInfos =  Object.assign({}, patternInfos);
@@ -156,7 +164,7 @@
       <img class="subContainter" :src=getPP()>
     </div>
       <div class="globalInfos">
-        <div v-if="modif==false && curric==false && reg==false && minerval==false && paymentPage == false && scholarship==false" class="infosContainer">
+        <div v-if="modif==false && curric==false && reg==false && minerval==false && paymentPage == false && scholarship==false && uninscr == false" class="infosContainer">
           <div>
             {{user.firstName}} {{user.lastName}}   
           </div>
@@ -174,7 +182,7 @@
           </div>
           <div v-if="(user.role==='Student')">
             <button @click="reg=!reg">{{i18n("profile.reRegister")}}</button>
-            <button @click="unRegister()" style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
+            <button @click="uninscr = !uninscr" style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
           </div>
           <div v-if="(user.role==='Student')">
             <button @click="curric=!curric">{{i18n("profile.change.curriculum")}}</button>
@@ -184,6 +192,19 @@
             <button @click="minerval = !minerval" style="margin-left: 2%">Manage minerval</button>
           </div>
         </div>
+        <div v-else-if="uninscr" class="infosContainer">
+            <div v-if="sure != 2">Please enter the reason you leave the university</div>
+            <textarea v-if="sure != 2" v-model="uninscriptionData.reason"></textarea>
+            <div v-if="sure != 2">
+              <button @click="sure++">Submit</button>
+            </div>
+            <div v-if="sure==1">
+              Are you sure that you want to unregister ?
+              <button @click="addUninscReq(uninscriptionData.userId, uninscriptionData.reason);sure++">Yes</button>
+              <button @click="sure=0">No</button>
+            </div>
+            <p v-if="sure==2">You request has been send !</p>
+        </div>
         <div v-else-if="minerval" class="infosContainer">
           <div v-if="minerv.value.toPay != 0">
             Payment : {{minerv.value.toPay}}€ left to pay
@@ -306,7 +327,7 @@
           </div>
         </div>
       </div>
-      <div v-if="user.role == 'Student' && modif==false && curric==false && reg==false && minerval==false && scholarship == false" class="moreInfos">
+      <div v-if="user.role == 'Student' && modif==false && curric==false && reg==false && minerval==false && scholarship == false && uninscr == false" class="moreInfos">
         <div class = "oldcursus">
             <div class="listTitle">
               Anciens Cursus
@@ -405,7 +426,7 @@
     display:flex;
     align-items:center;
     justify-content:center;
-    margin-top:5%;
+    margin-top:7%;
   }
  .containerElement{
    justify-content:center;
diff --git a/frontend/src/rest/requests.js b/frontend/src/rest/requests.js
index 0b52d7e..9df8a1c 100644
--- a/frontend/src/rest/requests.js
+++ b/frontend/src/rest/requests.js
@@ -18,4 +18,8 @@ export async function getAllExemptionsRequest(){
 
 export async function editEquivalenceState(id, newstate){
     return restPatch("/request/registerequiv/"+id+"/"+newstate)
+}
+
+export async function addUninscReq(userId, reason){
+    return restPost("/uninscriptionreq", {"userId" : userId, "reason" : reason})
 }
\ No newline at end of file