From 5a57fc78f3e318669a3cc02a98a82e1cf4be08d9 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Fri, 19 Apr 2024 09:31:55 +0200
Subject: [PATCH 1/4] Generalize the ExternalCurriculumList interface so it
 fits for inscriptionRequest, Studentlist, and inscriptionform

---
 .../src/Apps/Inscription/AboutRequest.vue     |  2 +-
 .../Inscription/ExternalCurriculumList.vue    | 73 +++++++++++++++----
 frontend/src/Apps/Login.vue                   | 58 ++-------------
 3 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/frontend/src/Apps/Inscription/AboutRequest.vue b/frontend/src/Apps/Inscription/AboutRequest.vue
index 15c72f5..ec8ed74 100644
--- a/frontend/src/Apps/Inscription/AboutRequest.vue
+++ b/frontend/src/Apps/Inscription/AboutRequest.vue
@@ -62,7 +62,7 @@ async function editEquivalence(id, newstate){
     </div>
   </div>
   <div v-if="list==true">
-    <ExternalCurriculumList :ext-curr-list="externalCurriculum" :inscr-req-id="request.id"></ExternalCurriculumList>
+    <ExternalCurriculumList :ext-curr-list="externalCurriculum" :mode="0"></ExternalCurriculumList>
     <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>
diff --git a/frontend/src/Apps/Inscription/ExternalCurriculumList.vue b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
index eba1cdf..c467853 100644
--- a/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
+++ b/frontend/src/Apps/Inscription/ExternalCurriculumList.vue
@@ -4,15 +4,23 @@
   import {getSelf} from "@/rest/Users.js";
   import {createExternalCurriculum, getExternalCurriculumByUser} from "@/rest/externalCurriculum.js";
 
-  //mode 0 = externalcurr related to inscrreq, 1 = externalcurr related to user
+  //mode 0 = externalcurr related to inscrreq, 1 = externalcurr related to user, 2 inscription procedure
   const props = defineProps(["extCurrList", "mode"])
 
-  const extCurrList = ref(props.extCurrList)
+  //Only usefull to pass the external curr array in the inscription procedure
+  const externalCurrTab = defineModel();
+
+  const extCurrList = ref({})
+  let extNum = 0
+  const User = ref({})
+
+  if (props.mode === 1){
+    User.value = await getSelf()
+  }
 
-  const User = await getSelf()
 
   const list = ref(true)
-
+  const editmode = ref(false)
   const notcompletedCheck = ref(false);
 
   const externalCurr = reactive({
@@ -28,22 +36,49 @@
 
   if (props.mode === 1){
     externalCurr.userRegNo = props.extCurrList[0].user.regNo
+  }else if(props.mode === 2){
+    extCurrList.value = externalCurrTab.value
+  }
+
+  if(props.mode !== 2){
+    extCurrList.value = props.extCurrList
+    console.log("oe")
+  }
+
+  function deleteExtCursus(extcursus){
+    externalCurrTab.value.splice(externalCurrTab.value.indexOf(extcursus),1)
   }
 
   async function postExternalCurr(){
-    await createExternalCurriculum(externalCurr.inscriptionRequestId, externalCurr.school, externalCurr.formation, externalCurr.completion, externalCurr.startYear, externalCurr.endYear, externalCurr.justifdocUrl, externalCurr.userRegNo);
-    //We refresh the list
-    extCurrList.value = await getExternalCurriculumByUser(externalCurr.userRegNo);
-    list.value = !list.value;
+    if (props.mode === 1){
+      await createExternalCurriculum(externalCurr.inscriptionRequestId, externalCurr.school, externalCurr.formation, externalCurr.completion, externalCurr.startYear, externalCurr.endYear, externalCurr.justifdocUrl, externalCurr.userRegNo);
+      //We refresh the list
+      extCurrList.value = await getExternalCurriculumByUser(externalCurr.userRegNo);
+      list.value = !list.value;
+    }else if (props.mode === 2){
+      externalCurrTab.value.push({
+        inscriptionRequestId : externalCurr.inscriptionRequestId,
+          school:externalCurr.school,
+          formation :externalCurr.formation,
+          completion : externalCurr.completion,
+          startYear : externalCurr.startYear,
+          endYear: externalCurr.endYear,
+          justifdocUrl : externalCurr.justifdocUrl,
+          userRegNo : externalCurr.userRegNo
+      });
+      extCurrList.value = externalCurrTab.value
+      list.value = !list.value;
+      console.log(externalCurrTab.value)
+    }
   }
 </script>
 
 <template style="margin-top:5%;">
   <div v-if="list">
-    <div v-if="User.regNo === externalCurr.userRegNo" style="margin-left: 2%;margin-top: 2%">
+    <div v-if="props.mode === 2||User.regNo === externalCurr.userRegNo" style="margin-left: 2%;margin-top: 2%">
       <button @click="list = !list">Add external curriculum</button>
     </div>
-    <div style="display:flex; justify-content:center; " v-for="item in extCurrList">
+    <div style="display:flex; justify-content:center; " v-for="(item, index) in extCurrList">
       <div class="bodu">
         <div class="container">
           <div class="status"><a style="margin-left:30px">{{item.state}}</a></div>
@@ -51,6 +86,8 @@
           <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 class="edit" v-if="props.mode === 2"><button @click="list=!list;externalCurr.justifdocUrl=item.justifDocUrl; externalCurr.endYear = item.endYear; externalCurr.startYear = item.startYear; externalCurr.school = item.school;externalCurr.completion = item.completion;externalCurr.formation=item.formation;editmode=!editmode;extNum=index">Edit</button></div>
+          <div class="delete" v-if="props.mode === 2"><button @click="deleteExtCursus(item)">Delete</button></div>
         </div>
       </div>
     </div>
@@ -82,7 +119,8 @@
         <input type="number" v-model="externalCurr.endYear">
       </div>
       <div class="inputBox" style="margin-top: 3%; margin-bottom: 3%">
-        <input type="submit" value="Upload curriculum" @click="postExternalCurr()">
+        <input v-if="!editmode" type="submit" value="Upload curriculum" @click="postExternalCurr()">
+        <input v-else type="submit" value="Edit curriculum" @click="externalCurrTab[extNum] = {inscriptionRequestId : externalCurr.inscriptionRequestId,school:externalCurr.school,formation :externalCurr.formation,completion : externalCurr.completion,startYear : externalCurr.startYear,endYear: externalCurr.endYear,justifdocUrl : externalCurr.justifdocUrl,userRegNo : externalCurr.userRegNo};editmode=!editmode;list=!list">
       </div>
     </form>
   </div>
@@ -94,9 +132,9 @@
   height:100px;
   font-size:30px;
   display:grid;
-  grid-template-columns:15% 10% 20% 15% 13.1%;
+  grid-template-columns:5% 10% 20% 15% 20% 10%;
   grid-template-areas:
-    "status school formation completion download";
+    "status school formation completion download edit delete";
   column-gap:10px;
 }
 
@@ -106,6 +144,15 @@
   font-size: 70%;
 }
 
+.edit{
+  grid-area: edit;
+  align-self: center;
+}
+
+.delete{
+  grid-area: delete;
+  align-self: center;
+}
 .school{
   grid-area:school;
   align-self:center;
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index 705012f..bb83a18 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -7,6 +7,8 @@
   import {toast} from 'vue3-toastify'
   import 'vue3-toastify/dist/index.css';
   import {createExternalCurriculum} from "@/rest/externalCurriculum.js";
+  import ManageCourses from "@/Apps/ManageCourses.vue";
+  import ExternalCurriculumList from "@/Apps/Inscription/ExternalCurriculumList.vue";
 
   const loginPage= ref(true)
   const page = ref(0)
@@ -90,16 +92,11 @@
       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>
 
 
 <template>
-    <div class="setup">
+    <div class="setup" v-if="page !== 4">
       <div v-if="loginPage">
       <div class='loginBox' style="margin-top:30%;">
           <form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"class="form">
@@ -216,57 +213,16 @@
                 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="page++">Gèrer mon parcours extérieur</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 v-if="page===4">
+    <ExternalCurriculumList v-model="externalCurrTab" :mode="2"></ExternalCurriculumList>
+    <button style="margin-top: 2%;width: 5%; margin-left: 2%" @click="page--">Back</button>
   </div>
 </template>
 

From 25575fa4e08e96d6248fa083c7076ab9b11c6308 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Fri, 19 Apr 2024 12:26:48 +0200
Subject: [PATCH 2/4] Implements some files uploading in the inscription form
 and change inscriptionRequest and Curriculum for the cursus acceptance
 attestation feature

---
 .../Clyde/EndPoints/MockController.java       | 20 ++++----
 .../Services/CurriculumCourseService.java     |  2 +-
 .../ovh/herisson/Clyde/Tables/Curriculum.java | 13 ++++-
 .../ovh/herisson/Clyde/Tables/FileType.java   |  3 +-
 .../Inscription/InscriptionRequest.java       | 12 ++++-
 frontend/src/Apps/Login.vue                   | 47 ++++++++++++++++---
 frontend/src/rest/Users.js                    |  5 +-
 7 files changed, 80 insertions(+), 22 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 6ff0707..d9320a9 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -83,13 +83,15 @@ public class MockController {
         minervalRepository.save(minerval);
         // Course / Curriculum part
 
-        Curriculum infoBab1 = new Curriculum(1,"info");
-        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");
-        Curriculum chemistryBab2 = new Curriculum(2, "chemistry");
+        Curriculum infoBab1 = new Curriculum(1,"info", false);
+        Curriculum chemistryBab1 = new Curriculum(1,"chemistry", false);
+        Curriculum psychologyBab1 = new Curriculum(1,"psychology", false);
+        Curriculum infoBab2 = new Curriculum(2,"info", false);
+        Curriculum masterinfo1 = new Curriculum(4, "info", false);
+        Curriculum masterinfo2 = new Curriculum(5, "info", false);
+        Curriculum chemistryBab2 = new Curriculum(2, "chemistry", false);
+        Curriculum ingebab1 = new Curriculum(1, "ingénieur", true);
+
         curriculumService.save(infoBab1);
         curriculumService.save(chemistryBab1);
         curriculumService.save(psychologyBab1);
@@ -97,6 +99,7 @@ public class MockController {
         curriculumService.save(masterinfo1);
         curriculumService.save(masterinfo2);
         curriculumService.save(chemistryBab2);
+        curriculumService.save(ingebab1);
 
         ucr.save(new UserCurriculum(joe, infoBab1, 2022, false));
         ucr.save(new UserCurriculum(joe, chemistryBab1, 2023, true));
@@ -128,8 +131,7 @@ public class MockController {
         CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,commun));
         CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
 
-
-        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);
+        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, null);
 
         inscriptionService.save(inscriptionRequest);
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java
index 19549d0..b522da3 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java
@@ -46,7 +46,7 @@ public class CurriculumCourseService {
         toReturn.put("curriculumId", curriculum.getCurriculumId());
         toReturn.put("year", curriculum.getYear());
         toReturn.put("option", curriculum.getOption());
-
+        toReturn.put("requireCertificate", curriculum.isRequireCertificate());
 
         return  toReturn;
     }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Curriculum.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Curriculum.java
index 67075d1..4bcac40 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Curriculum.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Curriculum.java
@@ -12,9 +12,13 @@ public class Curriculum {
     private int curriculumId;
     private int year;
     private String option;
-    public Curriculum(int year, String option){
+
+    //True if the curriculum need an entry exam
+    private boolean requireCertificate;
+    public Curriculum(int year, String option, boolean requireCertificate){
         this.year = year;
         this.option = option;
+        this.requireCertificate = requireCertificate;
     }
 
     public Curriculum() {}
@@ -39,4 +43,11 @@ public class Curriculum {
         this.option = option;
     }
 
+    public void setRequireCertificate(boolean requireCertificate) {
+        this.requireCertificate = requireCertificate;
+    }
+
+    public boolean isRequireCertificate() {
+        return requireCertificate;
+    }
 }
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 e7a081b..ad5eab4 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
@@ -3,5 +3,6 @@ package ovh.herisson.Clyde.Tables;
 public enum FileType {
     ProfilePicture,
     EducationCertificate,
-    JustificationDocument
+    JustificationDocument,
+    IdentityCard,
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/InscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/InscriptionRequest.java
index 07c720f..1d0271c 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/InscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/InscriptionRequest.java
@@ -22,11 +22,12 @@ public class InscriptionRequest {
     private String profilePicture;
     private String password;
     private String identityCard;
+    private String admissionDocUrl;
     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, RequestState equivalenceState){
+    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, String admissionDocUrl){
         this.lastName = lastName;
         this.firstName = firstName;
         this.address = address;
@@ -40,6 +41,7 @@ public class InscriptionRequest {
         this.identityCard = identityCard;
         this.submissionDate = submissionDate;
         this.equivalenceState = equivalenceState;
+        this.admissionDocUrl = admissionDocUrl;
     }
 
     public int getId() {
@@ -149,4 +151,12 @@ public class InscriptionRequest {
     public void setEquivalenceState(RequestState equivalenceState) {
         this.equivalenceState = equivalenceState;
     }
+
+    public String getAdmissionDocUrl() {
+        return admissionDocUrl;
+    }
+
+    public void setAdmissionDocUrl(String admissionDocUrl) {
+        this.admissionDocUrl = admissionDocUrl;
+    }
 }
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index bb83a18..531259b 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -3,7 +3,7 @@
   import i18n from '@/i18n.js'
   import {login, register, disconnect, isLogged} from '@/rest/Users.js'
   import {getAllCurriculums, getcurriculum} from '@/rest/curriculum.js'
-  import { uploadProfilePicture } from '@/rest/uploads.js'
+  import {uploadFile, uploadProfilePicture} from '@/rest/uploads.js'
   import {toast} from 'vue3-toastify'
   import 'vue3-toastify/dist/index.css';
   import {createExternalCurriculum} from "@/rest/externalCurriculum.js";
@@ -45,10 +45,13 @@
  
   const imageSaved = ref(false)
   let ppData = ""
-
+  let requiredCertif = false
   //Contains the id of the newly created request (useful to link the student's formations informations to the request)
   let requestId = ""
 
+  const idcardfile = ref({})
+  const justifcardfile = ref({})
+
   const curricula= await getAllCurriculums();
   
   function goBackHome(){
@@ -87,11 +90,28 @@
 
   //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, outputs.curriculum, ppData, null, new Date(), outputs.equivalenceState);
+    //We upload the two files and we get their paths on the server
+    const identityCardFile = await uploadFile(idcardfile.value, "IdentityCard")
+    const justifFile = ref(null)
+
+    if (curricula[outputs.curriculum-1].requireCertificate){
+      justifFile.value = await uploadFile(justifcardfile.value, "JustificationDocument")
+    }
+
+    let justif;
+    if (justifFile.value !== null){
+      justif = justifFile.value.url
+    }else{
+      justif = null
+    }
+
+    const val = await register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, identityCardFile.url, new Date(), outputs.equivalenceState, justif);
+
     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);
     }
   }
+
 </script>
 
 
@@ -203,10 +223,23 @@
               </div>
             </div>
             <div v-if="page === 2">
-              <form novalidate enctype="multipart/form-data" class="inputBox">
-                Carte d'identité :
-              </form>
-              <button @click="page++">{{i18n("login.guest.nextpage")}}</button>
+              <p style="color:rgb(239,60,168);">Carte d'indentité :</p>
+              <label class="browser">
+                Parcourir . . .
+                <input  type="file" @change="idcardfile = $event.target.files">
+              </label>
+              <div v-if="curricula[outputs.curriculum-1].requireCertificate === true" style="margin-top: 3%; margin-bottom: 4%">
+                <p style="color:rgb(239,60,168);">Ce cursus requiert une attestation de réussite d'un examen d'entrée</p>
+                <div style="margin-top: 2%">
+                  <p style="color:rgb(239,60,168);">Attestation:</p>
+                  <label class="browser">
+                    Parcourir . . .
+                    <input  type="file" @change="justifcardfile = $event.target.files">
+                  </label>
+                </div>
+              </div>
+              <button @click="page++;">{{i18n("login.guest.nextpage")}}</button>
+
             </div>
             <div v-if="page === 3">
               <p>
diff --git a/frontend/src/rest/Users.js b/frontend/src/rest/Users.js
index 7daa99b..9efade4 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, equivalence){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate, equivalence,admissionDocUrl){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -39,7 +39,8 @@ export async function register(firstname, lastname, birthDate, password, email,
     	profilePicture: imageId,
 		identityCard : identityCardId,
 		submissionDate : submissionDate,
-		equivalenceState : equivalence
+		equivalenceState : equivalence,
+		admissionDocUrl: admissionDocUrl
 	});
 }
 

From 69fb4e881ee7c15abef5bbef2db75c6903e0d89d Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Fri, 19 Apr 2024 15:53:31 +0200
Subject: [PATCH 3/4] Add the Teacher approval for reregister requests

---
 .../Inscription/RequestsController.java       | 72 ++++++++++++-----
 .../Clyde/Tables/ChangeCurriculumRequest.java | 14 +++-
 .../Inscription/ReInscriptionRequest.java     | 81 -------------------
 .../Inscription/AboutChangeCurriculum.vue     | 14 +++-
 .../src/Apps/Inscription/ManageRequests.vue   | 10 ++-
 frontend/src/Apps/Profil.vue                  |  2 +-
 frontend/src/rest/requests.js                 |  4 +
 7 files changed, 91 insertions(+), 106 deletions(-)
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ReInscriptionRequest.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 f423984..0d9dbd5 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
@@ -176,6 +176,16 @@ public class RequestsController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    //We look in the usercursus table if the student has already the previous year of a curriculum
+    public boolean studentHasPrevYear(Curriculum curriculum, User user){
+        ArrayList<UserCurriculum> userCurrList = userCurriculumRepository.findByUserOrderByCurriculum(user);
+        for (int i = 0; i < userCurrList.size(); i++){
+            if (userCurrList.get(i).getCurriculum().getOption().equals(curriculum.getOption()) && userCurrList.get(i).getCurriculum().getYear() == curriculum.getYear()-1){
+                return true;
+            }
+        }
+        return false;
+    }
     @PostMapping("/changecurriculumreq")
     public ResponseEntity<String> addChangeCurrReq(@RequestBody Map<String,Object> reqInfos){
         User user = userRepository.findById((Integer) reqInfos.get("userId"));
@@ -191,8 +201,12 @@ public class RequestsController {
 
         Curriculum destinationCurriculum = curriculumRepository.findById((Integer) reqInfos.get("newcursus"));
 
-        ChangeCurriculumRequest changeCurriculumRequest = new ChangeCurriculumRequest(user, actualCurriculum, destinationCurriculum, new Date(), RequestState.Pending);
+        ChangeCurriculumRequest changeCurriculumRequest = new ChangeCurriculumRequest(user, actualCurriculum, destinationCurriculum, new Date(), RequestState.Pending, RequestState.Unrequired);
 
+        //Si l'année du cursus est plus grande que 1 et que l'étudiant n'a pas dans sa liste de cursus l'année d'en dessous alors on demande l'accord du prof
+        if (destinationCurriculum.getYear() > 1 && !studentHasPrevYear(destinationCurriculum, user)){
+            changeCurriculumRequest.setTeacherApprovalState(RequestState.Pending);
+        }
         changeCurriculumRequestRepository.save(changeCurriculumRequest);
 
         return new ResponseEntity<>(HttpStatus.OK);
@@ -228,27 +242,49 @@ public class RequestsController {
 
         toEdit.setState(newState);
 
-        if (newState == RequestState.Accepted){
+        if (newState == RequestState.Accepted && (toEdit.getTeacherApprovalState() == RequestState.Accepted || toEdit.getTeacherApprovalState() == RequestState.Unrequired)){
             //If actual curriculum is not null then we need to set that the user doesn't follow it anymore
-            User u = toEdit.getUser();
-            if (toEdit.getActualCurriculum() != null){
-                ArrayList<UserCurriculum> listcurr = userCurriculumRepository.findByUserOrderByCurriculum(u);
-
-                for (int i = 0; i < listcurr.size(); i++){
-                    if (listcurr.get(i).getCurriculum() == toEdit.getActualCurriculum()){
-                        listcurr.get(i).setActual(false);
-                    }
-                }
-
-                userCurriculumRepository.saveAll(listcurr);
-            }
-
-            Calendar c = Calendar.getInstance();
-            UserCurriculum userCurriculum = new UserCurriculum(u, toEdit.getDestinationCurriculum(), c.get(Calendar.YEAR), true);
-            userCurriculumRepository.save(userCurriculum);
+            acceptProcedure(toEdit);
         }
 
         changeCurriculumRequestRepository.save(toEdit);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @PatchMapping("/changecurriculumreqteacher/{id}/{newteacherstate}")
+    public ResponseEntity<String> editCCReqTeacherState(@RequestHeader("Authorization") String token, @PathVariable long id, @PathVariable RequestState newteacherstate){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
+            return new UnauthorizedResponse<>(null);
+
+        ChangeCurriculumRequest toEdit = changeCurriculumRequestRepository.findById(id);
+
+        toEdit.setState(newteacherstate);
+
+        if (newteacherstate == RequestState.Accepted && toEdit.getState() == RequestState.Accepted){
+            //If actual curriculum is not null then we need to set that the user doesn't follow it anymore
+            acceptProcedure(toEdit);
+        }
+
+        changeCurriculumRequestRepository.save(toEdit);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    private void acceptProcedure(ChangeCurriculumRequest toEdit) {
+        User u = toEdit.getUser();
+        if (toEdit.getActualCurriculum() != null){
+            ArrayList<UserCurriculum> listcurr = userCurriculumRepository.findByUserOrderByCurriculum(u);
+
+            for (int i = 0; i < listcurr.size(); i++){
+                if (listcurr.get(i).getCurriculum() == toEdit.getActualCurriculum()){
+                    listcurr.get(i).setActual(false);
+                }
+            }
+
+            userCurriculumRepository.saveAll(listcurr);
+        }
+
+        Calendar c = Calendar.getInstance();
+        UserCurriculum userCurriculum = new UserCurriculum(u, toEdit.getDestinationCurriculum(), c.get(Calendar.YEAR), true);
+        userCurriculumRepository.save(userCurriculum);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ChangeCurriculumRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ChangeCurriculumRequest.java
index 72feebd..a309023 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ChangeCurriculumRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ChangeCurriculumRequest.java
@@ -26,14 +26,16 @@ public class ChangeCurriculumRequest {
 
     private RequestState state;
 
+    private RequestState teacherApprovalState;
     public ChangeCurriculumRequest(){}
 
-    public ChangeCurriculumRequest(User user, Curriculum actualCurriculum, Curriculum destinationCurriculum, Date date, RequestState state){
+    public ChangeCurriculumRequest(User user, Curriculum actualCurriculum, Curriculum destinationCurriculum, Date date, RequestState state, RequestState teacherApprovalState){
         this.user = user;
         this.actualCurriculum = actualCurriculum;
         this.destinationCurriculum = destinationCurriculum;
         this.date = date;
         this.state = state;
+        this.teacherApprovalState = teacherApprovalState;
     }
 
     public User getUser() {
@@ -80,4 +82,14 @@ public class ChangeCurriculumRequest {
     public int getId() {
         return id;
     }
+
+    public RequestState getTeacherApprovalState() {
+        return teacherApprovalState;
+    }
+
+    public void setTeacherApprovalState(RequestState teacherApprovalState) {
+        this.teacherApprovalState = teacherApprovalState;
+    }
 }
+
+
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ReInscriptionRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ReInscriptionRequest.java
deleted file mode 100644
index cafffe6..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ReInscriptionRequest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-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 {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    private User user;
-
-    @ManyToOne
-    @JoinColumn(name = "Curriculum")
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    private Curriculum newCurriculum;
-    private RequestState state;
-
-    //Permet de différencier les demandes de changement et une réinscription dans le même Curriculum
-    //Pour la réinscription on va le mettre a 0
-    private boolean type = false;
-
-    public ReInscriptionRequest(){}
-
-    public ReInscriptionRequest(User user, Curriculum newCurriculum, RequestState state, boolean type){
-        this.user = user;
-        this.newCurriculum = newCurriculum;
-        this.state = state;
-        this.type = type;
-    }
-
-    public ReInscriptionRequest(User user, Curriculum newCurriculum, RequestState state){
-        this.user = user;
-        this.newCurriculum = newCurriculum;
-        this.state = state;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Curriculum getNewCurriculum() {
-        return newCurriculum;
-    }
-
-    public void setNewCurriculum(Curriculum newCurriculum) {
-        this.newCurriculum = newCurriculum;
-    }
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-
-    public boolean isType() {
-        return type;
-    }
-
-    public void setType(boolean type) {
-        this.type = type;
-    }
-}
diff --git a/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue b/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue
index 1427446..82c850d 100644
--- a/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue
+++ b/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue
@@ -1,21 +1,21 @@
 <script setup>
 
 import {
-  addUninscReq, editChangeCurrReq,
+  addUninscReq, editChangeCurrReq, editChangeCurrReqTeacherState,
   editScholarshipReq,
   editUnregReq, getChangeCurrReqById,
   getScholarshipReqById,
   getUnregisterbyId
 } from "@/rest/requests.js";
 import i18n from "@/i18n.js";
-import {getUser} from "@/rest/Users.js";
+import {getSelf, getUser} from "@/rest/Users.js";
 import {reactive, ref} from "vue";
 import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 
 const props = defineProps(["reqId"])
 const req = ref(await getChangeCurrReqById(props.reqId))
 
-
+const user = await getSelf()
 //0 liste, 1 profil
 const windowstate = ref(0);
 
@@ -24,6 +24,10 @@ const tag = req.value.user.regNo
 async function uploadandrefreshChangeRequest(state){
     await editChangeCurrReq(req.value.id, state);
 }
+
+async function editChangeCurrReqTeacherApproval(state){
+    await editChangeCurrReqTeacherState(req.value.id, state)
+}
 </script>
 
 
@@ -52,6 +56,10 @@ async function uploadandrefreshChangeRequest(state){
             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshChangeRequest('Accepted')">Accept</button>
             <button v-if="req.state === 'Pending'" @click="req.state='Refused';uploadandrefreshChangeRequest('Refused')" style="margin-left: 2%;">Refuse</button>
           </div>
+          <div v-if="user.role === 'Teacher' || user.role === 'Admin'">
+            <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Accepted';editChangeCurrReqTeacherApproval('Accepted')">Accept equivalence</button>
+            <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Refused';editChangeCurrReqTeacherApproval('Refused')">Refuse equivalence</button>
+          </div>
         </div>
       </div>
     </div>
diff --git a/frontend/src/Apps/Inscription/ManageRequests.vue b/frontend/src/Apps/Inscription/ManageRequests.vue
index cb8345e..8fd7ddf 100644
--- a/frontend/src/Apps/Inscription/ManageRequests.vue
+++ b/frontend/src/Apps/Inscription/ManageRequests.vue
@@ -114,11 +114,12 @@
           <div class="reqState">{{item.state}}</div>
           <div class="infos"><button @click="windowsState=4;targetId=item.id">More infos</button></div>
         </div>
-        <div class="container" v-if="requestType === 'curriculum change'" style="grid-template-columns:17% 15% 12% 15%;grid-template-areas:'date reqState regno studentfirstname studentlastname infos';">
+        <div class="container" v-if="requestType === 'curriculum change'" style="grid-template-columns:17% 20% 15% 5%;grid-template-areas:'date reqState teacherApproval regno studentfirstname studentlastname infos';">
           <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="reqState">IS approval : {{item.state}}</div>
+          <div class="teacherApproval">Teacher approval : {{item.teacherApprovalState}}</div>
           <div class="infos"><button @click="windowsState=5;targetId=item.id">More infos</button></div>
         </div>
       </div>
@@ -156,6 +157,11 @@
     grid-area: equivalencestate;
     align-self: center;
   }
+
+  .teacherApproval{
+    grid-area: teacherApproval;
+    align-self: center;
+  }
   .studentfirstname{
     grid-area: studentfirstname;
     align-self: center;
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 70e2451..a9164b2 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -375,7 +375,7 @@
             The cursus you selected has some prerequisites
           </div>
           <div>
-            <button @click=" windowState = 0;postChangeCurrReq(changecurrdata);changecurrdata.actualcursus=null;changecurrdata.newcursus=null">{{i18n("courses.confirm")}}</button>
+            <button @click=" windowState = 0;postChangeCurrReq(changecurrdata);changecurrdata.actualcursus=null;changecurrdata.newcursus=1">{{i18n("courses.confirm")}}</button>
             <button @click="windowState = 0; resetInputs(personnalInfos,patternInfos);" style="float:right;">{{i18n("courses.back")}}</button>
           </div>
         </div>
diff --git a/frontend/src/rest/requests.js b/frontend/src/rest/requests.js
index 96c1b14..1d0dfe9 100644
--- a/frontend/src/rest/requests.js
+++ b/frontend/src/rest/requests.js
@@ -62,4 +62,8 @@ export async function getChangeCurrReqById(id){
 
 export async function editChangeCurrReq(id, newState){
     return restPatch("/changecurriculumreq/"+id+"/"+newState)
+}
+
+export async function editChangeCurrReqTeacherState(id, newState){
+    return restPatch("/changecurriculumreqteacher/"+id+"/"+newState)
 }
\ No newline at end of file

From 4e14370d4ffdd3dff1f3b56032812a2c2e893d09 Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Fri, 19 Apr 2024 19:25:28 +0200
Subject: [PATCH 4/4] Add the exemptions gestion and improve the navigation
 between requests

---
 .../Inscription/RequestsController.java       |  22 ++++
 .../ExemptionsRequestRepository.java          |   2 +-
 .../Tables/Inscription/ExemptionsRequest.java |   4 +
 .../Inscription/AboutChangeCurriculum.vue     |  15 ++-
 .../src/Apps/Inscription/AboutExemption.vue   | 116 ++++++++++++++++++
 .../src/Apps/Inscription/AboutRequest.vue     |   7 +-
 .../src/Apps/Inscription/ManageRequests.vue   |  17 ++-
 frontend/src/rest/requests.js                 |   8 ++
 8 files changed, 178 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/Apps/Inscription/AboutExemption.vue

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 0d9dbd5..74d1bf0 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
@@ -88,6 +88,28 @@ public class RequestsController {
         return new ResponseEntity<>(toReturn, HttpStatus.OK);
     }
 
+    @GetMapping(value = "/exemptionsreq/{id}")
+    public ResponseEntity<ExemptionsRequest> getExemptionRequestbyId(@RequestHeader("Authorization") String token, @PathVariable long id){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
+            return new UnauthorizedResponse<>(null);
+
+        ExemptionsRequest exemptionsRequest = err.findById(id);
+
+        return new ResponseEntity<>(exemptionsRequest, HttpStatus.OK);
+    }
+
+    @PatchMapping(value = "/exemptionsreq/{id}/{newstate}")
+    public ResponseEntity<String> changeExemptionReqState(@RequestHeader("Authorization") String token, @PathVariable long id, @PathVariable RequestState newstate){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
+            return new UnauthorizedResponse<>(null);
+
+        ExemptionsRequest exemptionsRequest = err.findById(id);
+        exemptionsRequest.setState(newstate);
+        err.save(exemptionsRequest);
+
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     //Get all the scholarships requests
     @GetMapping(value = "/scholarshipreq")
     public ResponseEntity<ArrayList<ScholarshipRequest>> getAllScholarshipRequests(@RequestHeader("Authorization") String token){
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java
index 3f66e80..d644ef1 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ExemptionsRequestRepository.java
@@ -4,5 +4,5 @@ import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.Inscription.ExemptionsRequest;
 
 public interface ExemptionsRequestRepository extends CrudRepository<ExemptionsRequest, Long> {
-
+    ExemptionsRequest findById(long id);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java
index 75ee926..8942bb6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java
@@ -80,4 +80,8 @@ public class ExemptionsRequest {
     public void setDate(Date date) {
         this.date = date;
     }
+
+    public int getId() {
+        return id;
+    }
 }
diff --git a/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue b/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue
index 82c850d..9a3f40d 100644
--- a/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue
+++ b/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue
@@ -17,10 +17,12 @@ const req = ref(await getChangeCurrReqById(props.reqId))
 
 const user = await getSelf()
 //0 liste, 1 profil
-const windowstate = ref(0);
+const localwindowstate = ref(0);
 
 const tag = req.value.user.regNo
 
+const windowState = defineModel("windowState")
+
 async function uploadandrefreshChangeRequest(state){
     await editChangeCurrReq(req.value.id, state);
 }
@@ -32,7 +34,7 @@ async function editChangeCurrReqTeacherApproval(state){
 
 
 <template>
-  <div class="body" v-if="windowstate === 0">
+  <div class="body" v-if="localwindowstate === 0">
     <div class="container">
       <div class="globalInfos">
         <div class="infosContainer">
@@ -50,7 +52,7 @@ async function editChangeCurrReqTeacherApproval(state){
             Wanted cursus : Bac {{req.destinationCurriculum.year}} {{req.destinationCurriculum.option}}
           </div>
           <div>
-            <button @click="windowstate++"> See profile </button>
+            <button @click="localwindowstate++"> See profile </button>
           </div>
           <div>
             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshChangeRequest('Accepted')">Accept</button>
@@ -64,9 +66,12 @@ async function editChangeCurrReqTeacherApproval(state){
       </div>
     </div>
   </div>
-  <div v-if="windowstate === 1">
+  <div v-if="localwindowstate === 0">
+    <button @click="windowState = 0" style="margin-left: 10%">Back</button>
+  </div>
+  <div v-if="localwindowstate === 1">
     <AboutStudent :target="tag"></AboutStudent>
-    <button @click="windowstate--;">Return to request</button>
+    <button @click="localwindowstate--;">Back</button>
   </div>
 </template>
 
diff --git a/frontend/src/Apps/Inscription/AboutExemption.vue b/frontend/src/Apps/Inscription/AboutExemption.vue
new file mode 100644
index 0000000..366c32a
--- /dev/null
+++ b/frontend/src/Apps/Inscription/AboutExemption.vue
@@ -0,0 +1,116 @@
+<script setup>
+
+import {
+  addUninscReq,
+  editExempReqState,
+  editScholarshipReq,
+  getExempReq,
+  getScholarshipReqById
+} from "@/rest/requests.js";
+import i18n from "@/i18n.js";
+import {getUser} from "@/rest/Users.js";
+import {reactive, ref} from "vue";
+import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
+
+const props = defineProps(["reqId"])
+
+const req = ref(await getExempReq(props.reqId))
+
+const profile = ref(false)
+
+const windowState = defineModel("windowState")
+
+async function editExemp(newstate){
+  await editExempReqState(req.value.id, newstate)
+}
+</script>
+
+
+<template>
+  <div class="body" v-if="profile === false">
+    <div class="container">
+      <div class="globalInfos">
+        <div class="infosContainer">
+          <div>
+            Firstname/Name : {{req.user.firstName}} {{req.user.lastName}}
+          </div>
+          <div>
+            Course: {{req.course.title}}
+          </div>
+          <div>
+            State : {{req.state}}
+          </div>
+          <div>
+            <button @click="profile = !profile">Voir le profil</button>
+          </div>
+          <div>
+            <button>Download justification document</button>
+          </div>
+          <div>
+            <button v-if="req.state === 'Pending'" @click="req.state='Accepted';editExemp('Accepted')">Accept</button>
+            <button v-if="req.state === 'Pending'" @click="req.state='Refused';editExemp('Refused')" style="margin-left: 2%;">Refuse</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div v-else>
+    <AboutStudent :target="req.user.regNo"></AboutStudent>
+    <button @click="profile=!profile">Back</button>
+  </div>
+  <div>
+    <button v-if="profile===false" @click="windowState = 0" style="margin-left: 30%">Back</button>
+  </div>
+</template>
+
+<style scoped>
+.container{
+  min-width:675px;
+  display:grid;
+  grid-template-columns:10vw 50vw;
+  grid-template-rows:200px auto;
+  column-gap:2.7%;
+  row-gap:45px;
+  grid-template-areas:
+  "profilPic globalInfos"
+  "minfos minfos";
+}
+
+.profilPic{
+  width:100%;
+  grid-area:profilPic;
+}
+
+.globalInfos {
+  grid-area:globalInfos;
+  align-self :center;
+
+}
+
+.body {
+  min-width:960px;
+  width:100%;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  margin-top:7%;
+}
+
+.subContainter{
+  width:100%;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  border:4px solid black;
+}
+
+.infosContainer {
+  min-width:350px;
+  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/Apps/Inscription/AboutRequest.vue b/frontend/src/Apps/Inscription/AboutRequest.vue
index ec8ed74..c6d15df 100644
--- a/frontend/src/Apps/Inscription/AboutRequest.vue
+++ b/frontend/src/Apps/Inscription/AboutRequest.vue
@@ -16,6 +16,8 @@ const user = await getSelf();
 const list = ref(false);
 const externalCurriculum = await getExternalCurriculumByInscrReq(request.id)
 
+//Get the parent page windowState to display the correct button
+const windowState = defineModel("windowState")
 function getPP(){
   if(request.profilePictureUrl === null){
     return "/Clyde.png"
@@ -61,12 +63,15 @@ async function editEquivalence(id, newstate){
       </div>
     </div>
   </div>
+  <div v-if="list == false">
+    <button @click="windowState = 0">Back</button>
+  </div>
   <div v-if="list==true">
     <ExternalCurriculumList :ext-curr-list="externalCurriculum" :mode="0"></ExternalCurriculumList>
     <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>
+      <button style="margin-left: 2%" @click="list=false">Back</button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/Apps/Inscription/ManageRequests.vue b/frontend/src/Apps/Inscription/ManageRequests.vue
index 8fd7ddf..1aa9bf0 100644
--- a/frontend/src/Apps/Inscription/ManageRequests.vue
+++ b/frontend/src/Apps/Inscription/ManageRequests.vue
@@ -1,6 +1,6 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import {ref} from 'vue'
+  import {ref, vModelSelect} from 'vue'
   import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
   import AboutRequest from "@/Apps/Inscription/AboutRequest.vue";
   import {
@@ -12,6 +12,7 @@
   import AboutScholarship from "@/Apps/Inscription/AboutScholarship.vue";
   import AboutUnregister from "@/Apps/Inscription/AboutUnregister.vue";
   import AboutChangeCurriculum from "@/Apps/Inscription/AboutChangeCurriculum.vue";
+  import AboutExemption from "@/Apps/Inscription/AboutExemption.vue";
 
   const requests = ref(await getAllRegisters());
   let targetId = "";
@@ -19,8 +20,8 @@
   const requestType = ref("inscription");
   const filterType = ref("None");
 
-  //0 = liste, 1 = détails, 2 = sure?, 3 = manage scholarship, 4 manage unregister, 5 = manage curriculum change
-  let windowsState = ref(0);
+  //0 = liste, 1 = détails, 2 = sure?, 3 = manage scholarship, 4 manage unregister, 5 = manage curriculum change, 6 = manage exemptions
+  const windowsState = ref(0);
 
   async function upPage(id,review){
     await validateRegister(id,review);
@@ -52,7 +53,7 @@
 
 <template>
   <div v-if="windowsState === 1">
-    <AboutRequest :target="targetId"></AboutRequest>
+    <AboutRequest :target="targetId" v-model:window-state="windowsState"></AboutRequest>
   </div>
   <div v-if="windowsState === 0">
     <div style="margin-top: 2%;margin-left: 2%">
@@ -104,7 +105,7 @@
           <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 class="infos"><button @click="windowsState=6;targetId=item.id">More infos</button></div>
         </div>
         <div class="container" v-if="requestType === 'unregister'" style="grid-template-columns:17% 15% 12% 15%;grid-template-areas:'date reqState regno studentfirstname studentlastname infos';">
           <div class="date" v-if="item.date != undefined">{{item.date.slice(0,10)}}</div>
@@ -138,9 +139,13 @@
   </div>
   <div v-if="windowsState === 4">
     <AboutUnregister :req-id="targetId"></AboutUnregister>
+    <button @click="windowsState=0">Back</button>
   </div>
   <div v-if="windowsState === 5">
-    <AboutChangeCurriculum :req-id="targetId"></AboutChangeCurriculum>
+    <AboutChangeCurriculum :req-id="targetId" v-model:window-state="windowsState"></AboutChangeCurriculum>
+  </div>
+  <div v-if="windowsState === 6">
+    <AboutExemption :req-id="targetId" v-model:window-state="windowsState"></AboutExemption>
   </div>
 </template>
 
diff --git a/frontend/src/rest/requests.js b/frontend/src/rest/requests.js
index 1d0dfe9..d87b9fe 100644
--- a/frontend/src/rest/requests.js
+++ b/frontend/src/rest/requests.js
@@ -66,4 +66,12 @@ export async function editChangeCurrReq(id, newState){
 
 export async function editChangeCurrReqTeacherState(id, newState){
     return restPatch("/changecurriculumreqteacher/"+id+"/"+newState)
+}
+
+export async function getExempReq(id){
+    return restGet("/exemptionsreq/"+id)
+}
+
+export async function editExempReqState(id, newstate){
+    return restPatch("/exemptionsreq/"+id+"/"+newstate)
 }
\ No newline at end of file