From db895a609128e847eb059e4fde08ff919ed2e466 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sat, 23 Mar 2024 14:38:26 +0100
Subject: [PATCH 01/66] added temporary fix to docker issue

---
 backend/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index b7cabcd..b0bf79b 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+	// developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")

From 47c5c1486293fad9ae81419fbd4467ce6c968807 Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Fri, 22 Mar 2024 13:54:30 +0100
Subject: [PATCH 02/66] Make app use full space

---
 frontend/src/App.vue         | 9 +++++----
 frontend/src/assets/main.css | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 7d79e82..d5d55a4 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -86,12 +86,9 @@ window.addEventListener('hashchange', () => {
     </ul>
     </div>
     <div class="page">
-      <div style=" margin:50px;">
         <Suspense>
-        
-		<component :is="currentView" />
+				<component :is="currentView" />
         </Suspense>
-      </div>
     </div>
   </div>
 </template>
@@ -99,6 +96,8 @@ window.addEventListener('hashchange', () => {
 <style scoped>
   
   .container{
+			height: 100%;
+			width: 100%;
     display:grid;
     grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
     grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
@@ -111,6 +110,8 @@ window.addEventListener('hashchange', () => {
 
   .page {
     grid-area:page;
+		height: 100%;
+		width: 100%;
     place-self:center;
   }
 
diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css
index 55e6d15..54ce8d8 100644
--- a/frontend/src/assets/main.css
+++ b/frontend/src/assets/main.css
@@ -1,4 +1,11 @@
 body {
    background-color: rgb(53, 25, 60);
    margin:0;
+   width: 100vw;
+   height: 100vh;
+}
+
+#app {
+   width: 100%;
+   height: 100%;
 }

From 3af83a58d302b98f2dc53ed3e37ed1201cbd9b73 Mon Sep 17 00:00:00 2001
From: Wawilski <Karpinskiwal@gmail.com>
Date: Fri, 22 Mar 2024 20:14:20 +0100
Subject: [PATCH 03/66] Just to merge

---
 frontend/src/App.vue        |  2 +-
 frontend/src/Apps/Login.vue | 44 +++++++++++--------------------------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d5d55a4..6dcad67 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -52,7 +52,7 @@ window.addEventListener('hashchange', () => {
             <a class="icon" href="#Notifications">
                 <div class="fa-solid fa-bell"  style="margin-top: 7px; margin-bottom: 3px;"></div>
             </a></li>
-        <li @click="active=!active"  class="option"style="float: right;" title=settings>
+        <li @click="active=!active" class="option"style="float: right;" title=settings>
             <a class="icon" >
                 <div  class="fa-solid fa-gear"  style="margin-top: 7px; margin-bottom: 3px;"></div>
                 <div v-if="active" class="dropdown">
diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index b43b152..25a4024 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -55,11 +55,11 @@
 </script>
 
 
-<template>
+<template style="background-color:rgba(255,255,255,0.05); border-radius:50px" >
       <div class='loginBox'>
 
         <div v-if="loginPage">
-          <form @submit.prevent=" login(outputs.email,outputs.password);goBackHome();"class="form">
+          <form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif;">
               {{i18n("login.guest.signin")}}
             </h1>
@@ -80,7 +80,7 @@
           </form>
         </div>
 
-        <div v-else>
+        <div  v-else>
           <form class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
               {{i18n("login.guest.welcome")}}
@@ -157,31 +157,14 @@
 </template>
 
 <style scoped>
-.Home{
-  position:absolute;
- 	display: flex;
-  z-index: 100;
-	padding: 8px 16px;
-	color:rgb(255, 255, 255);
-	text-decoration: none;
-}
-
-.Home:hover{
-  width:40px;
-  background-color: black;
-	border-radius:6px;
-	color:white;
-  transform: translate(0px ,1px);
-}
-
 
 .loginBox {
   background-color: rgb(24,24,24);
-  width: 400px;
-  display:flex;
+  width: 100%;
+  height:100%;
   justify-content: center;
-  padding: 40px;
-  border-radius: 20px;
+  padding: 10%;
+  border-radius: 5%;
   box-shadow:0 5px 25px #000000;
   
 }
@@ -190,9 +173,8 @@
   width:100%;
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items:center;
-  gap: 15px;
+  gap: 3%;
 }
 
 
@@ -200,12 +182,12 @@
   
   width:100%;
   border: none;
-  margin-right: 50px;
-  padding-left: 10px;
-  padding-top:10px;
-  padding-bottom:10px;
+  margin-right: 12.5%;
+  padding-left: 2.5%;
+  padding-top:2.5%;
+  padding-bottom:2.5%;
   outline:none;
-  border-radius: 4px;
+  border-radius: 10px;
   font-size:1.35em;
 }
 

From 95054fa973ba5c990d4fec126ee1527c1461d0b8 Mon Sep 17 00:00:00 2001
From: Wawilski <Karpinskiwal@gmail.com>
Date: Sat, 23 Mar 2024 13:57:46 +0100
Subject: [PATCH 04/66] Login 'fixed'

---
 frontend/src/Apps/Login.vue | 60 +++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue
index 25a4024..82caa80 100644
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@@ -55,10 +55,10 @@
 </script>
 
 
-<template style="background-color:rgba(255,255,255,0.05); border-radius:50px" >
-      <div class='loginBox'>
-
+<template>
+    <div class="setup">
         <div v-if="loginPage">
+      <div class='loginBox' style="margin-top:30%;">
           <form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif;">
               {{i18n("login.guest.signin")}}
@@ -74,14 +74,15 @@
             <div class="register">
               <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a>
             </div>
-            <div class="inputBox">
+            <div class="inputBox" style="margin-bottom:35px;">
               <input type="submit" v-model="submitValue">
             </div>
           </form>
         </div>
-
-        <div  v-else>
-          <form class="form">
+      </div>
+        <div v-else>
+          <div class='loginBox' style="margin-top:30%; margin-bottom:50%;">
+            <form class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
               {{i18n("login.guest.welcome")}}
             </h1>
@@ -128,9 +129,12 @@
                 <p>{{i18n("login.guest.country")}}</p>
                 <input type="text" v-model="outputs.country">
               </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/*">
+              <form class="inputBox"novalidate enctype="multipart/form-data">
+              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
+              <label class="browser">
+                Parcourir . . .
+				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
+              </label>
               </form>
               <div class="inputBox">
                 <p>{{i18n("Curriculum").toUpperCase()}}</p> 
@@ -153,17 +157,25 @@
             </div>
           </form>
          </div>
-        </div>
+    </div>
+  </div>
 </template>
 
 <style scoped>
 
+.setup {
+  margin-left: auto;
+  margin-right:auto;
+  min-width:400px;
+
+  width:25%;
+  height:60%;
+}
+
 .loginBox {
   background-color: rgb(24,24,24);
-  width: 100%;
-  height:100%;
+  display:flex;
   justify-content: center;
-  padding: 10%;
   border-radius: 5%;
   box-shadow:0 5px 25px #000000;
   
@@ -202,8 +214,9 @@
 
 .register{
   color:rgb(239,60,168);
-  width: 100%;
-  display:flex;
+  width:70%;
+  margin-bottom:20px;
+  margin-top:20px;
   cursor: pointer;
 }
 
@@ -232,6 +245,21 @@ input[type=submit],button,select{
 
 }
 
+input[type=file]{
+  display:none;
+}
+
+.browser{
+  display:inline-block;
+  cursor:pointer;
+  border-radius:20px;
+  background-color:rgb(239,60,168);
+  padding:5%;
+  font-size:1.35em;
+  font-family:sans-serif;
+  background:#FFFFFF;
+}
+
 button:active ,.switchpage:active{
   opacity:0.8;
 

From 951feed3c84358a20d533c4405b58e8a6af4fc9e Mon Sep 17 00:00:00 2001
From: Wawilski <Karpinskiwal@gmail.com>
Date: Sat, 23 Mar 2024 23:56:24 +0100
Subject: [PATCH 05/66] Full screen apps

---
 frontend/src/Apps/Inscription.vue   | 12 ++++-----
 frontend/src/Apps/ManageCourses.vue | 40 ++++++++++++++++++++---------
 frontend/src/Apps/Profil.vue        | 20 ++++++++++-----
 frontend/src/Apps/StudentsList.vue  | 28 +++++---------------
 frontend/src/Apps/UsersList.vue     | 21 ++++++---------
 5 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue
index 94a1811..95581ce 100644
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@@ -16,10 +16,9 @@
 
 
 <template> 
-  <div  v-for="item of requests">
+  <div style='display:flex; justify-content:center; min-width:1140px;' 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>
@@ -37,10 +36,9 @@
     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:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
     grid-template-areas:
     "id type surname firstname infos accept refuse"; 
-    column-gap:10px;
     
   }
   
@@ -99,9 +97,9 @@
 
   }
 
-  .bodu {
-    width:100%;
-    margin-bottom:10px;
+ .bodu {
+    margin-top:2%;
+    width:66%;
     border:2px solid black;
     border-radius:9px;
     background-color:rgb(50,50,50);
diff --git a/frontend/src/Apps/ManageCourses.vue b/frontend/src/Apps/ManageCourses.vue
index 475057c..7337633 100644
--- a/frontend/src/Apps/ManageCourses.vue
+++ b/frontend/src/Apps/ManageCourses.vue
@@ -105,7 +105,8 @@
       </button>
     </div>
     <div v-if="createMod">
-      <form class="listElement">
+      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
+        
         <div style="margin-bottom:20px;">
          {{i18n("name")}} : 
         <input v-model="toAdd.title">
@@ -125,7 +126,7 @@
       </form>
     </div>
     <div v-if="deleteMod">
-      <form class="listElement">
+      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
         <div style="margin-bottom:20px;">
           {{i18n("courses.toDelete")}} :
          <select style="max-width:200px;" class="teacher" v-model="toRemove">
@@ -138,7 +139,7 @@
       </form>
     </div>
 
-    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title">
+    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title" style="width:50%;margin-left:auto; margin-right:auto;">
       <div  v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
         <button   @click="editElementID = item.title; setModify(item); ">
         {{i18n("courses.modify")}}
@@ -148,7 +149,8 @@
         <button @click="editElementID= '';patchCourse(item)"> {{i18n("courses.confirm")}} </button>
         <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
       </div>
-      <div  class="listElement" > 
+      <div  class="listElement" >
+
       <div class="containerElement" v-if="editElementID !== item.title" >
 
         <div class="name"> {{item.title}} </div>
@@ -172,17 +174,27 @@
 <style scoped>
 .body {
     width:100%;
-    margin-bottom:10px;
+    margin-top:3.5%;
   }
+
+.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;
+}
+
  .containerElement{ 
-   justify-content:center;
+    justify-content:center;
     display:grid;
-    grid-template-columns:350px 350px 200px;
+    grid-template-columns:38.8% 38.8% 22.4%;
     grid-template-areas:
     "name teacher credits"; 
-    column-gap:10px;
-    
-  }
+    column-gap:10px;  }
   
   .name {
     grid-area:name;
@@ -200,6 +212,7 @@
   }
 
 .listElement{
+ min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
@@ -207,6 +220,7 @@
   background-color:rgb(50,50,50);
   border-radius:20px;
   margin-bottom:10px;
+
 }
 
 .modify{
@@ -255,10 +269,11 @@
   }
 
   .listTitle{
+    min-width:380px;
     display: flex;
     justify-content: center;
     align-items: center;
-    width:400px;
+    width:25%;
     margin-left:auto;
     margin-right:auto;
     border:2px solid black;
@@ -266,7 +281,8 @@
     color:white;
     padding:20px;
     background-color:rgb(50,50,50);
-    border-radius:20px;margin-bottom:10px;
+    border-radius:20px;
+    margin-bottom:10px;
 
     button:hover{
       opacity:0.8;
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue
index 3e2eacc..643cc7d 100644
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@@ -210,11 +210,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"
@@ -222,6 +222,7 @@
 }
 
 .profilPic{
+  width:100%;
   grid-area:profilPic;
 }
 
@@ -242,13 +243,17 @@
   grid-area:minfos;
 }
 .body {
+    min-width:960px;
     width:100%;
-    margin-bottom:10px;
+    display:flex;
+    align-items:center;
+    justify-content:center;
+    margin-top:5%;
   }
  .containerElement{ 
    justify-content:center;
     display:grid;
-    grid-template-columns:350px 350px 200px;
+    grid-template-columns:38.8% 38.8% 22.4%;
     grid-template-areas:
     "name teacher credits"; 
     column-gap:10px;
@@ -271,10 +276,11 @@
   }
 
 .listTitle{
+    min-width:197px;
     display: flex;
     justify-content: center;
     align-items: center;
-    width:200px;
+    width:8vw;
     margin-left:auto;
     margin-right:auto;
     border:2px solid black;
@@ -286,6 +292,7 @@
 }
 
 .listElement{
+  min-width:625px;
   border:2px solid black;
   font-size:25px;
   color:white;
@@ -296,6 +303,7 @@
 }
 
 .infosContainer {
+min-width:350px;
 padding-bottom:50px;
 border:2px solid black;
 font-size:25px;
diff --git a/frontend/src/Apps/StudentsList.vue b/frontend/src/Apps/StudentsList.vue
index cf4ef0e..1ab3ff8 100644
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@@ -5,8 +5,8 @@
 
   const users = await getStudents();
 </script> 
-<template>
-  <div v-for="item in users">
+<template style="margin-top:5%;">
+  <div style="display:flex; justify-content:center; " v-for="item in users">
     <div class="bodu">
       <div class="container">
         <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
@@ -25,10 +25,9 @@
     height:100px;
     font-size:30px;
     display:grid;
-    grid-template-columns:250px 250px 250px 250px 150px;
+    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
     grid-template-areas:
     "status option surname firstname infos"; 
-    column-gap:10px;
     
   }
   
@@ -42,21 +41,6 @@
     align-self:center;
   }
 
-  .refuse{
-    grid-area:refuse;
-    align-self:center;
-  }
-
-  .titles {
-    grid-area:titles;
-    background-color:rgb(215,215,215);
-  }
-  .id{
-    grid-area:id;
-    margin-left:40px;
-    align-self:center;
-  }
-
   .status{
     grid-area:status;
     align-self:center;
@@ -81,15 +65,15 @@
   button{
     font-size:15px;
      height:50px;
-     width:100px;
+     width:75%;
     border:none;
     border-radius:20px;
 
   }
 
   .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/UsersList.vue b/frontend/src/Apps/UsersList.vue
index 4ba12d3..59e60c4 100644
--- a/frontend/src/Apps/UsersList.vue
+++ b/frontend/src/Apps/UsersList.vue
@@ -7,8 +7,8 @@
   const users = await getAllUsers();
   
 </script> 
-<template>
-  <div v-for="item in users">
+<template style="margin-top:5%;">
+  <div style="display:flex; justify-content:center; min-width:1140px;" v-for="item in users">
     <div class="bodu">
       <div class="container">
         <div class="role"><a style="margin-left:30px">{{i18n(item.role)}}</a></div>
@@ -22,23 +22,20 @@
 
 <style scoped>
   .container{
-    justify-content:center;
-    align-items:center;
     color:white;
     height:100px;
     font-size:30px;
     display:grid;
-    grid-template-columns:250px 250px 250px 150px;
+    grid-template-columns:27.7% 27.7% 27.7% 16.9%;
     grid-template-areas:
     "role surname firstname infos"; 
-    column-gap:10px;
-    
+
   }
   
   .infos {
 
     grid-area:infos;
-    align-items:center;
+    align-self:center;
   }
 
   .role {
@@ -67,20 +64,18 @@
   button{
     font-size:15px;
      height:50px;
-     width:100px;
+     width:75%;
     border:none;
     border-radius:20px;
 
   }
 
   .bodu {
-    width:100%;
-    margin-bottom:10px;
+    margin-top:2%;
+    width:66%;
     border:2px solid black;
     border-radius:9px;
     background-color:rgb(50,50,50);
   }
-
-
 </style>
 

From 2805fede4bb1307be2a69b9f973826e2cdcf285f Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Fri, 29 Mar 2024 15:32:08 +0100
Subject: [PATCH 06/66] researcher profile page separations

---
 frontend/src/Apps/ResearcherProfile.vue | 109 ++++++++++++++++++++++++
 frontend/src/rest/apps.js               |   2 +
 2 files changed, 111 insertions(+)
 create mode 100644 frontend/src/Apps/ResearcherProfile.vue

diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ResearcherProfile.vue
new file mode 100644
index 0000000..da2a72e
--- /dev/null
+++ b/frontend/src/Apps/ResearcherProfile.vue
@@ -0,0 +1,109 @@
+<script setup>
+
+</script>
+
+<template>
+<div id="main">
+  <div id="profilePicture">
+    <img src="/Clyde.png">
+  </div>
+  <div id="researcherInfos">
+    <div class="surrounded" >
+      John Doe
+
+    </div>
+    <div class="surrounded" >
+      Orcid :
+      12144-2144-12336-B
+
+    </div>
+    <div class="surrounded" >
+      Email : John.Doe@umons.ac.be
+
+    </div>
+
+    <div class="surrounded" >
+      site :
+      <a href="http://localhost:5173" style="color: #007aff">here</a>
+
+    </div>
+    <div class="surrounded" >
+      Domain : physics, IT
+    </div>
+    <div id="coAuthorList" class="surrounded">
+     Co-authors list : D
+    </div>
+
+  </div>
+  <div id="stats">
+    <div class="surrounded">
+      Stat type : <select name="stats" id="stats-select">
+      <option value="views">Views</option>
+      <option value="co-authors">Co-authors</option>
+      <option value="articles">Articles</option>
+      <option value="language">Languages</option>
+    </select>
+    </div>
+    <div class="surrounded">
+      Class by: <select name="classedBy" id="classed-select">
+      <option value="years">Years</option>
+      <option value="months">Months</option>
+      <option value="topics">Topics</option>
+
+    </select>
+    </div>
+
+  </div>
+  <div id="articles">
+
+  </div>
+</div>
+</template>
+
+<style scoped>
+
+#main {
+  display: grid;
+  grid-template-columns: 22% auto;
+  grid-template-rows: 26% auto;
+  height: 100%;
+  width: 100%;
+}
+
+
+#profilePicture {
+  display: flex;
+  justify-content: center;
+}
+#profilePicture img{
+  align-self: center;
+  justify-self: center;
+  width:60%;
+}
+
+#researcherInfos {
+  display: grid;
+  grid-template-columns: auto auto auto;
+  column-gap: 5px;
+  grid-template-rows: auto auto ;
+}
+.surrounded {
+  border:2px solid black;
+  color:white;
+  background-color:rgb(50,50,50);
+  font-size: x-large;
+  align-self: center;
+  text-align: center;
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius:20px;margin-bottom:10px;
+}
+
+#stats {
+}
+
+
+#articles {
+  background-color: orange;
+}
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 99cbc10..491d20e 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 ResearcherProfile from "@/Apps/ResearcherProfile.vue";
 
 const apps = {
 		'/login': LoginPage,
@@ -17,6 +18,7 @@ const apps = {
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
 		'/students-list' : Students,
+		'/researcher-profile' : ResearcherProfile,
 }
 
 const appsList = {

From c1b2742a8f680c5aeb845e1d32dc7d7f283a2ad4 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sat, 30 Mar 2024 12:23:56 +0100
Subject: [PATCH 07/66] better select buttons

---
 frontend/src/Apps/ResearcherProfile.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ResearcherProfile.vue
index da2a72e..3ef306a 100644
--- a/frontend/src/Apps/ResearcherProfile.vue
+++ b/frontend/src/Apps/ResearcherProfile.vue
@@ -1,5 +1,7 @@
 <script setup>
 
+
+
 </script>
 
 <template>
@@ -49,8 +51,11 @@
       <option value="years">Years</option>
       <option value="months">Months</option>
       <option value="topics">Topics</option>
-
     </select>
+
+     
+
+
     </div>
 
   </div>
@@ -90,7 +95,6 @@
 .surrounded {
   border:2px solid black;
   color:white;
-  background-color:rgb(50,50,50);
   font-size: x-large;
   align-self: center;
   text-align: center;
@@ -98,7 +102,20 @@
   border-radius:20px;margin-bottom:10px;
 }
 
+.surrounded select {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  border: 1px solid black;
+  color: white;
+  background-color: rgb(255,255,255,0.1);
+  font-size: large;
+  align-self: center;
+  text-align: center;
+
+}
+
 #stats {
+
 }
 
 

From 91ee3adbcd471d23c63bdd1c41dc1953f18b7fcf Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sat, 30 Mar 2024 13:10:11 +0100
Subject: [PATCH 08/66] adding the dependance

---
 frontend/package-lock.json              | 15 ++++++++++++
 frontend/package.json                   |  1 +
 frontend/src/Apps/ResearcherProfile.vue | 32 ++++++++++++++++++++++++-
 frontend/src/main.js                    |  5 +++-
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 809af17..b33e0cd 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -8,6 +8,7 @@
       "name": "clyde",
       "version": "0.0.0",
       "dependencies": {
+        "@canvasjs/vue-charts": "^1.0.4",
         "vite-plugin-top-level-await": "^1.4.1",
         "vue": "^3.4.15",
         "vue3-toastify": "^0.2.1"
@@ -29,6 +30,20 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@canvasjs/charts": {
+      "version": "3.7.45",
+      "resolved": "https://registry.npmjs.org/@canvasjs/charts/-/charts-3.7.45.tgz",
+      "integrity": "sha512-FPMX8wn+PEHzAa/GLBsL5lWB81AzKZLw51t7SiSUjMbtUN5/OIrmDcwUTw+53/Bbdd9gm2LLmxAdZsQ75JI31g=="
+    },
+    "node_modules/@canvasjs/vue-charts": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@canvasjs/vue-charts/-/vue-charts-1.0.4.tgz",
+      "integrity": "sha512-PzOA8xeb/f68a39uoFZNn843dGPU36bsqmbO5DWjP7k6FwkK5AeGkYa/H3RHC02Xc6mG68vg9aFNj2Fyqhu4UQ==",
+      "dependencies": {
+        "@canvasjs/charts": "^3.7.5",
+        "vue": ">=3.0.0"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index c02c826..b303f78 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,6 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@canvasjs/vue-charts": "^1.0.4",
     "vite-plugin-top-level-await": "^1.4.1",
     "vue": "^3.4.15",
     "vue3-toastify": "^0.2.1"
diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ResearcherProfile.vue
index 3ef306a..0c0476c 100644
--- a/frontend/src/Apps/ResearcherProfile.vue
+++ b/frontend/src/Apps/ResearcherProfile.vue
@@ -1,5 +1,33 @@
 <script setup>
+  import CanvasJSChart from "@canvasjs/vue-charts";
 
+  const chartData ={
+      options: {
+    theme: "light2",
+        animationEnabled: true,
+        title:{
+      text: "Visitors By Channel"
+    },
+    data: [{
+      type: "pie",
+      indexLabel: "{label} (#percent%)",
+      yValueFormatString: "#,##0",
+      toolTipContent: "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
+      dataPoints: [
+        { label: "Organic Traffic", y: 130631 },
+        { label: "Direct", y: 28874 },
+        { label: "Referral", y: 15467 },
+        { label: "Social", y: 10543 },
+        { label: "Email", y: 5613 },
+        { label: "Others", y: 8492 }
+      ]
+    }]
+  },
+  styleOptions: {
+    width: "100%",
+        height: "360px"
+  }
+  }
 
 
 </script>
@@ -52,8 +80,10 @@
       <option value="months">Months</option>
       <option value="topics">Topics</option>
     </select>
+    </div>
+    <div id="statsPie">
+      <CanvasJSChart :data="chartData"/>
 
-     
 
 
     </div>
diff --git a/frontend/src/main.js b/frontend/src/main.js
index a46ba7e..407ec49 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -4,5 +4,8 @@ import 'https://kit.fontawesome.com/fb3bbd0a95.js'
 
 import { createApp } from 'vue'
 import App from './App.vue'
+import CanvasJSChart from '@canvasjs/vue-charts';
 
-createApp(App).mount('#app')
+const app = createApp(App);
+app.use(CanvasJSChart);
+app.mount('#app');

From bd27ffd3cbd4074ff600b0fa1c6f934c532cbdff Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Mon, 1 Apr 2024 19:13:39 +0200
Subject: [PATCH 09/66] search bar not working (to be shared with william)

---
 frontend/src/Apps/ResearcherProfile.vue | 118 +++++++++++++++++-------
 1 file changed, 87 insertions(+), 31 deletions(-)

diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ResearcherProfile.vue
index 0c0476c..e905c27 100644
--- a/frontend/src/Apps/ResearcherProfile.vue
+++ b/frontend/src/Apps/ResearcherProfile.vue
@@ -1,34 +1,54 @@
 <script setup>
-  import CanvasJSChart from "@canvasjs/vue-charts";
+ function inputKeyUp() {
+    let input, filter, ul, li, a, i, txtValue;
+    input = document.getElementById('search-input');
+    filter = input.value.toUpperCase();
+    ul = document.getElementById("myUL");
+    li = ul.getElementsByTagName('li');
 
-  const chartData ={
-      options: {
-    theme: "light2",
-        animationEnabled: true,
-        title:{
-      text: "Visitors By Channel"
-    },
-    data: [{
-      type: "pie",
-      indexLabel: "{label} (#percent%)",
-      yValueFormatString: "#,##0",
-      toolTipContent: "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
-      dataPoints: [
-        { label: "Organic Traffic", y: 130631 },
-        { label: "Direct", y: 28874 },
-        { label: "Referral", y: 15467 },
-        { label: "Social", y: 10543 },
-        { label: "Email", y: 5613 },
-        { label: "Others", y: 8492 }
-      ]
-    }]
-  },
-  styleOptions: {
-    width: "100%",
-        height: "360px"
-  }
+    // Loop through all list items, and hide those who don't match the search query
+    for (i = 0; i < li.length; i++) {
+      a = li[i].getElementsByTagName("a")[0];
+      txtValue = a.textContent || a.innerText;
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        li[i].style.display = "";
+      } else {
+        li[i].style.display = "none";
+      }
+    }
   }
 
+  const mydata = {
+    data() {
+        return {
+          options: {
+          theme: "light2",
+          animationEnabled: true,
+          title:{
+            text: "Visitors By Channel"
+          },
+          data: [{
+            type: "pie",
+            indexLabel: "{label} (#percent%)",
+            yValueFormatString: "#,##0",
+            toolTipContent: "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
+            dataPoints: [
+              { label: "Organic Traffic", y: 130631 },
+              { label: "Direct", y: 28874 },
+              { label: "Referral", y: 15467 },
+              { label: "Social", y: 10543 },
+              { label: "Email", y: 5613 },
+              { label: "Others", y: 8492 }
+            ]
+          }]
+        },
+        styleOptions: {
+          width: "100%",
+          height: "360px"
+        }
+      }
+    }
+  }
 
 </script>
 
@@ -82,14 +102,24 @@
     </select>
     </div>
     <div id="statsPie">
-      <CanvasJSChart :data="chartData"/>
-
+			  <!--  <CanvasJSChart :options="mydata" @chart-ref="chartRef"/> !-->
 
 
     </div>
-
   </div>
   <div id="articles">
+    <input type="text" id="search-input" @onkeyup="inputKeyUp" placeholder="search articles">
+    <ul id="myUL">
+      <li><a href="#">Adele</a></li>
+      <li><a href="#">Agnes</a></li>
+
+      <li><a href="#">Billy</a></li>
+      <li><a href="#">Bob</a></li>
+
+      <li><a href="#">Calvin</a></li>
+      <li><a href="#">Christina</a></li>
+      <li><a href="#">Cindy</a></li>
+    </ul>
 
   </div>
 </div>
@@ -152,5 +182,31 @@
 #articles {
   background-color: orange;
 }
+#search-input{
+  width: 60%;
+  font-size: 16px;
+  padding: 12px 20px 12px 40px;
+  border: 1px solid #ddd;
+  margin-bottom: 12px;
+}
+#myUL{
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+}
 
-</style>
\ No newline at end of file
+#myUL li a {
+  border: 1px solid #ddd; /* Add a border to all links */
+  margin-top: -1px; /* Prevent double borders */
+  background-color: #f6f6f6; /* Grey background color */
+  padding: 12px; /* Add some padding */
+  text-decoration: none; /* Remove default text underline */
+  font-size: 18px; /* Increase the font-size */
+  color: black; /* Add a black text color */
+  display: block; /* Make it into a block element to fill the whole list */
+}
+#myUL li a:hover:not(.header) {
+  background-color: #eee;
+}
+
+</style>

From 91c7f42521a9e8ff9ce6ba4b7e0d2591545a5983 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 2 Apr 2024 19:52:38 +0200
Subject: [PATCH 10/66] finished mock researcher profile

---
 frontend/src/Apps/ResearcherProfile.vue | 50 +++++++++++++------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ResearcherProfile.vue
index e905c27..c61ad6d 100644
--- a/frontend/src/Apps/ResearcherProfile.vue
+++ b/frontend/src/Apps/ResearcherProfile.vue
@@ -1,26 +1,30 @@
 <script setup>
- function inputKeyUp() {
-    let input, filter, ul, li, a, i, txtValue;
-    input = document.getElementById('search-input');
-    filter = input.value.toUpperCase();
-    ul = document.getElementById("myUL");
-    li = ul.getElementsByTagName('li');
 
-    // Loop through all list items, and hide those who don't match the search query
-    for (i = 0; i < li.length; i++) {
-      a = li[i].getElementsByTagName("a")[0];
-      txtValue = a.textContent || a.innerText;
-      if (txtValue.toUpperCase().indexOf(filter) > -1) {
-        li[i].style.display = "";
-      } else {
-        li[i].style.display = "none";
-      }
-    }
-  }
+	 import {ref } from 'vue';
+	 const input = ref('')
+
+
+	 function inputKeyUp() {
+		 let filter,ul,li,a,txtValue
+			filter = input.value.toUpperCase();
+		 if(document.getElementById("myUL")!=null){
+			ul = document.getElementById("myUL");
+			li = ul.getElementsByTagName('li');
+
+			// Loop through all list items, and hide those who don't match the search query
+			for (let i = 0; i < li.length; i++) {
+				a = li[i].getElementsByTagName("a")[0];
+				txtValue = a.textContent || a.innerText;
+				if (txtValue.toUpperCase().indexOf(filter) > -1) {
+					li[i].style.display = "";
+				} else {
+					li[i].style.display = "none";
+				}
+			}
+		 }
+	 }
 
   const mydata = {
-    data() {
-        return {
           options: {
           theme: "light2",
           animationEnabled: true,
@@ -44,11 +48,9 @@
         },
         styleOptions: {
           width: "100%",
-          height: "360px"
+          height: "360px",
         }
       }
-    }
-  }
 
 </script>
 
@@ -102,13 +104,13 @@
     </select>
     </div>
     <div id="statsPie">
-			  <!--  <CanvasJSChart :options="mydata" @chart-ref="chartRef"/> !-->
+			  <CanvasJSChart :options="mydata.options" @chart-ref="chartRef"/> 
 
 
     </div>
   </div>
   <div id="articles">
-    <input type="text" id="search-input" @onkeyup="inputKeyUp" placeholder="search articles">
+    <input type="text" id="search-input" :onkeyup="inputKeyUp()" placeholder="search articles" v-model="input">
     <ul id="myUL">
       <li><a href="#">Adele</a></li>
       <li><a href="#">Agnes</a></li>

From bd7d2c2d51b5b7cbe4fb54702ece6bf5071825a7 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 4 Apr 2024 15:01:10 +0200
Subject: [PATCH 11/66] adding colors to piechart

---
 frontend/src/Apps/ResearcherProfile.vue | 284 +++++++++++++-----------
 1 file changed, 150 insertions(+), 134 deletions(-)

diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ResearcherProfile.vue
index c61ad6d..89d3f58 100644
--- a/frontend/src/Apps/ResearcherProfile.vue
+++ b/frontend/src/Apps/ResearcherProfile.vue
@@ -1,134 +1,140 @@
 <script setup>
-
-	 import {ref } from 'vue';
-	 const input = ref('')
+import { ref } from "vue";
+import {w} from "../../dist/assets/_plugin-vue_export-helper-Bvj9NrzX.js";
+const input = ref("");
+const statsOf = ref("");
+const statsBy = ref("");
 
 
-	 function inputKeyUp() {
-		 let filter,ul,li,a,txtValue
-			filter = input.value.toUpperCase();
-		 if(document.getElementById("myUL")!=null){
-			ul = document.getElementById("myUL");
-			li = ul.getElementsByTagName('li');
+function inputKeyUp() {
+  let filter, ul, li, a, txtValue;
+  filter = input.value.toUpperCase();
+  if (document.getElementById("myUL") != null) {
+    ul = document.getElementById("myUL");
+    li = ul.getElementsByTagName("li");
 
-			// Loop through all list items, and hide those who don't match the search query
-			for (let i = 0; i < li.length; i++) {
-				a = li[i].getElementsByTagName("a")[0];
-				txtValue = a.textContent || a.innerText;
-				if (txtValue.toUpperCase().indexOf(filter) > -1) {
-					li[i].style.display = "";
-				} else {
-					li[i].style.display = "none";
-				}
-			}
-		 }
-	 }
-
-  const mydata = {
-          options: {
-          theme: "light2",
-          animationEnabled: true,
-          title:{
-            text: "Visitors By Channel"
-          },
-          data: [{
-            type: "pie",
-            indexLabel: "{label} (#percent%)",
-            yValueFormatString: "#,##0",
-            toolTipContent: "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
-            dataPoints: [
-              { label: "Organic Traffic", y: 130631 },
-              { label: "Direct", y: 28874 },
-              { label: "Referral", y: 15467 },
-              { label: "Social", y: 10543 },
-              { label: "Email", y: 5613 },
-              { label: "Others", y: 8492 }
-            ]
-          }]
-        },
-        styleOptions: {
-          width: "100%",
-          height: "360px",
-        }
+    // Loop through all list items, and hide those who don't match the search query
+    for (let i = 0; i < li.length; i++) {
+      a = li[i].getElementsByTagName("a")[0];
+      txtValue = a.textContent || a.innerText;
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        li[i].style.display = "";
+      } else {
+        li[i].style.display = "none";
       }
+    }
+  }
+}
 
+const mydata = {
+  chart:null,
+  options: {
+    backgroundColor:null,
+    theme: "light2",
+    animationEnabled: true,
+    title: {
+      fontColor: "white",
+      text: statsOf.value + " By "+ statsBy.value,
+    },
+    data: [
+      {
+        type: "pie",
+        indexLabel: "{label} (#percent%)",
+        yValueFormatString: "#,##0",
+        indexLabelFontColor: "white",
+        toolTipContent:
+          "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
+        dataPoints: [
+          { label: "Organic Traffic", y: 130631 },
+          { label: "Direct", y: 28874 },
+          { label: "Referral", y: 15467 },
+          { label: "Social", y: 10543 },
+          { label: "Email", y: 5613 },
+          { label: "Others", y: 8492 },
+        ],
+      },
+    ],
+  },
+  styleOptions: {
+    width: "100%",
+    height: "100%",
+  },
+  methods : {
+    chartInstance(chart){
+      console.log(chart)
+      this.chart = chart;
+    },
+    update(){
+      this.chart.render();
+      setTimeout(this.update, 1000);
+    }
+  }
+};
 </script>
 
 <template>
-<div id="main">
-  <div id="profilePicture">
-    <img src="/Clyde.png">
-  </div>
-  <div id="researcherInfos">
-    <div class="surrounded" >
-      John Doe
-
+  <div id="main">
+    <div id="profilePicture">
+      <img src="/Clyde.png" />
     </div>
-    <div class="surrounded" >
-      Orcid :
-      12144-2144-12336-B
+    <div id="researcherInfos">
+      <div class="surrounded">John Doe</div>
+      <div class="surrounded">Orcid : 12144-2144-12336-B</div>
+      <div class="surrounded">Email : John.Doe@umons.ac.be</div>
 
+      <div class="surrounded">
+        site :
+        <a href="http://localhost:5173" style="color: #007aff">here</a>
+      </div>
+      <div class="surrounded">Domain : physics, IT</div>
+      <div id="coAuthorList" class="surrounded">Co-authors list : D</div>
     </div>
-    <div class="surrounded" >
-      Email : John.Doe@umons.ac.be
-
-    </div>
-
-    <div class="surrounded" >
-      site :
-      <a href="http://localhost:5173" style="color: #007aff">here</a>
-
-    </div>
-    <div class="surrounded" >
-      Domain : physics, IT
-    </div>
-    <div id="coAuthorList" class="surrounded">
-     Co-authors list : D
-    </div>
-
-  </div>
-  <div id="stats">
-    <div class="surrounded">
-      Stat type : <select name="stats" id="stats-select">
-      <option value="views">Views</option>
-      <option value="co-authors">Co-authors</option>
-      <option value="articles">Articles</option>
-      <option value="language">Languages</option>
-    </select>
-    </div>
-    <div class="surrounded">
-      Class by: <select name="classedBy" id="classed-select">
-      <option value="years">Years</option>
-      <option value="months">Months</option>
-      <option value="topics">Topics</option>
-    </select>
-    </div>
-    <div id="statsPie">
-			  <CanvasJSChart :options="mydata.options" @chart-ref="chartRef"/> 
+    <div id="stats">
+      <div class="surrounded">
+        Stat type :
+        <select @change="mydata.methods.update()" name="stats" id="stats-select" v-model="statsOf">
+          <option value="views">Views</option>
+          <option value="co-authors">Co-authors</option>
+          <option value="articles">Articles</option>
+          <option value="language">Languages</option>
+        </select>
+      </div>
+      <div class="surrounded">
+        Class by:
+        <select @change="mydata.methods.update()"  name="classedBy" id="classed-select" v-model="statsBy">
+          <option selected="selected" value="years">Years</option>
+          <option value="months">Months</option>
+          <option value="topics">Topics</option>
+        </select>
+      </div>
+      <div id="statsPie">
+        <CanvasJSChart :options="mydata.options" :style="mydata.styleOptions" @chart-ref="mydata.methods.chartInstance(this)"/>
+      </div>
+    </div>
+    <div id="articles">
+      <input
+        type="text"
+        id="search-input"
+        :onkeyup="inputKeyUp()"
+        placeholder="search articles"
+        v-model="input"
+      />
+      <ul id="myUL">
+        <li><a href="#">Adele</a></li>
+        <li><a href="#">Agnes</a></li>
 
+        <li><a href="#">Billy</a></li>
+        <li><a href="#">Bob</a></li>
 
+        <li><a href="#">Calvin</a></li>
+        <li><a href="#">Christina</a></li>
+        <li><a href="#">Cindy</a></li>
+      </ul>
     </div>
   </div>
-  <div id="articles">
-    <input type="text" id="search-input" :onkeyup="inputKeyUp()" placeholder="search articles" v-model="input">
-    <ul id="myUL">
-      <li><a href="#">Adele</a></li>
-      <li><a href="#">Agnes</a></li>
-
-      <li><a href="#">Billy</a></li>
-      <li><a href="#">Bob</a></li>
-
-      <li><a href="#">Calvin</a></li>
-      <li><a href="#">Christina</a></li>
-      <li><a href="#">Cindy</a></li>
-    </ul>
-
-  </div>
-</div>
 </template>
 
 <style scoped>
-
 #main {
   display: grid;
   grid-template-columns: 22% auto;
@@ -137,31 +143,33 @@
   width: 100%;
 }
 
-
 #profilePicture {
   display: flex;
   justify-content: center;
 }
-#profilePicture img{
+
+#profilePicture img {
   align-self: center;
   justify-self: center;
-  width:60%;
+  width: 60%;
 }
 
 #researcherInfos {
   display: grid;
   grid-template-columns: auto auto auto;
   column-gap: 5px;
-  grid-template-rows: auto auto ;
+  grid-template-rows: auto auto;
 }
+
 .surrounded {
-  border:2px solid black;
-  color:white;
+  border: 2px solid black;
+  color: white;
   font-size: x-large;
   align-self: center;
   text-align: center;
   background-color: rgba(255, 255, 255, 0.09);
-  border-radius:20px;margin-bottom:10px;
+  border-radius: 20px;
+  margin-bottom: 10px;
 }
 
 .surrounded select {
@@ -169,46 +177,54 @@
   margin-bottom: 2px;
   border: 1px solid black;
   color: white;
-  background-color: rgb(255,255,255,0.1);
+  background-color: rgb(255, 255, 255, 0.1);
   font-size: large;
   align-self: center;
   text-align: center;
-
 }
 
-#stats {
+#statsPie {
 
 }
 
-
 #articles {
   background-color: orange;
 }
-#search-input{
+
+#search-input {
   width: 60%;
   font-size: 16px;
   padding: 12px 20px 12px 40px;
   border: 1px solid #ddd;
   margin-bottom: 12px;
 }
-#myUL{
+
+#myUL {
   list-style-type: none;
   padding: 0;
   margin: 0;
 }
 
 #myUL li a {
-  border: 1px solid #ddd; /* Add a border to all links */
-  margin-top: -1px; /* Prevent double borders */
-  background-color: #f6f6f6; /* Grey background color */
-  padding: 12px; /* Add some padding */
-  text-decoration: none; /* Remove default text underline */
-  font-size: 18px; /* Increase the font-size */
-  color: black; /* Add a black text color */
-  display: block; /* Make it into a block element to fill the whole list */
+  border: 1px solid #ddd;
+  /* Add a border to all links */
+  margin-top: -1px;
+  /* Prevent double borders */
+  background-color: #f6f6f6;
+  /* Grey background color */
+  padding: 12px;
+  /* Add some padding */
+  text-decoration: none;
+  /* Remove default text underline */
+  font-size: 18px;
+  /* Increase the font-size */
+  color: black;
+  /* Add a black text color */
+  display: block;
+  /* Make it into a block element to fill the whole list */
 }
+
 #myUL li a:hover:not(.header) {
   background-color: #eee;
 }
-
 </style>

From dbe28a7fedb16bcadcff283390cfa72e0f5a64ba Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 4 Apr 2024 16:14:19 +0200
Subject: [PATCH 12/66] making the chart responsive

---
 frontend/src/Apps/ResearcherProfile.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ResearcherProfile.vue
index 89d3f58..6dc614c 100644
--- a/frontend/src/Apps/ResearcherProfile.vue
+++ b/frontend/src/Apps/ResearcherProfile.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { ref } from "vue";
-import {w} from "../../dist/assets/_plugin-vue_export-helper-Bvj9NrzX.js";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
@@ -61,11 +60,15 @@ const mydata = {
   },
   methods : {
     chartInstance(chart){
-      console.log(chart)
-      this.chart = chart;
+      mydata.chart = chart
     },
     update(){
-      this.chart.render();
+      mydata.options.title = {
+        fontColor: "white",
+        text: statsOf.value + " By "+ statsBy.value,
+      }
+      mydata.chart.render()
+      console.log(mydata.options.title)
       setTimeout(this.update, 1000);
     }
   }
@@ -108,7 +111,7 @@ const mydata = {
         </select>
       </div>
       <div id="statsPie">
-        <CanvasJSChart :options="mydata.options" :style="mydata.styleOptions" @chart-ref="mydata.methods.chartInstance(this)"/>
+        <CanvasJSChart :options="mydata.options" :style="mydata.styleOptions"  @chart-ref="mydata.methods.chartInstance"/>
       </div>
     </div>
     <div id="articles">

From 3d78851b29ed78257c99aa09f35bfa43ec0ebd81 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 4 Apr 2024 21:27:51 +0200
Subject: [PATCH 13/66] moving file into extensions directory

---
 .../ResearcherProfile.vue                     | 35 ++++++++++++-------
 frontend/src/rest/apps.js                     |  2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)
 rename frontend/src/Apps/{ => ScientificPublications}/ResearcherProfile.vue (86%)

diff --git a/frontend/src/Apps/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
similarity index 86%
rename from frontend/src/Apps/ResearcherProfile.vue
rename to frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 6dc614c..f718277 100644
--- a/frontend/src/Apps/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -1,9 +1,23 @@
+<!----------------------------------------------------
+	File:  ResearcherProfile.vue
+	Author: Maxime Bartha
+	Scope: Extension Publicatons scientifiquess
+	Description: Researcher Profile Page containing his articles and his statistics
+----------------------------------------------------->
+
 <script setup>
 import { ref } from "vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
 
+const jsonMockViewsByYears= [
+  {label: "2004", y:4},
+  {label: "2005", y:99},
+  {label: "2007", y:555},
+  {label: "2009", y:22},
+  {label: "2011", y:1666},
+]
 
 function inputKeyUp() {
   let filter, ul, li, a, txtValue;
@@ -33,7 +47,7 @@ const mydata = {
     animationEnabled: true,
     title: {
       fontColor: "white",
-      text: statsOf.value + " By "+ statsBy.value,
+      text : "please select options",
     },
     data: [
       {
@@ -43,14 +57,6 @@ const mydata = {
         indexLabelFontColor: "white",
         toolTipContent:
           "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
-        dataPoints: [
-          { label: "Organic Traffic", y: 130631 },
-          { label: "Direct", y: 28874 },
-          { label: "Referral", y: 15467 },
-          { label: "Social", y: 10543 },
-          { label: "Email", y: 5613 },
-          { label: "Others", y: 8492 },
-        ],
       },
     ],
   },
@@ -60,16 +66,21 @@ const mydata = {
   },
   methods : {
     chartInstance(chart){
-      mydata.chart = chart
+      mydata.chart = chart;
     },
     update(){
       mydata.options.title = {
         fontColor: "white",
         text: statsOf.value + " By "+ statsBy.value,
       }
+      if (statsOf.value === "views" && statsBy.value === "years") {
+        console.log("yeasear")
+        mydata.options.data[0].dataPoints = jsonMockViewsByYears;
+      }
+
+      console.log(mydata.options.data)
+      mydata.options.title.text = statsOf.value + " By "+ statsBy.value;
       mydata.chart.render()
-      console.log(mydata.options.title)
-      setTimeout(this.update, 1000);
     }
   }
 };
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 491d20e..102073e 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -9,7 +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 ResearcherProfile from "@/Apps/ResearcherProfile.vue";
+import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
 
 const apps = {
 		'/login': LoginPage,

From b8b193f344050454a9787c2e80fca100c4e482b2 Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Fri, 5 Apr 2024 09:44:41 +0200
Subject: [PATCH 14/66] proposition of some fixes

---
 .../ResearcherProfile.vue                     | 48 ++++++++-----------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index f718277..dca20a4 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -6,10 +6,11 @@
 ----------------------------------------------------->
 
 <script setup>
-import { ref } from "vue";
+import { ref, reactive } from "vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
+let chart;
 
 const jsonMockViewsByYears= [
   {label: "2004", y:4},
@@ -39,9 +40,7 @@ function inputKeyUp() {
   }
 }
 
-const mydata = {
-  chart:null,
-  options: {
+const options = reactive({
     backgroundColor:null,
     theme: "light2",
     animationEnabled: true,
@@ -57,33 +56,21 @@ const mydata = {
         indexLabelFontColor: "white",
         toolTipContent:
           "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
-      },
-    ],
-  },
-  styleOptions: {
-    width: "100%",
-    height: "100%",
-  },
-  methods : {
-    chartInstance(chart){
-      mydata.chart = chart;
-    },
-    update(){
-      mydata.options.title = {
+      }]
+	});
+
+function update(){
+      options.title = {
         fontColor: "white",
         text: statsOf.value + " By "+ statsBy.value,
       }
       if (statsOf.value === "views" && statsBy.value === "years") {
-        console.log("yeasear")
-        mydata.options.data[0].dataPoints = jsonMockViewsByYears;
+        options.data[0].dataPoints = jsonMockViewsByYears;
       }
 
-      console.log(mydata.options.data)
-      mydata.options.title.text = statsOf.value + " By "+ statsBy.value;
-      mydata.chart.render()
+      options.title.text = statsOf.value + " By "+ statsBy.value;
+      chart.render()
     }
-  }
-};
 </script>
 
 <template>
@@ -106,7 +93,7 @@ const mydata = {
     <div id="stats">
       <div class="surrounded">
         Stat type :
-        <select @change="mydata.methods.update()" name="stats" id="stats-select" v-model="statsOf">
+        <select @change="update()" id="stats-select" v-model="statsOf">
           <option value="views">Views</option>
           <option value="co-authors">Co-authors</option>
           <option value="articles">Articles</option>
@@ -115,21 +102,21 @@ const mydata = {
       </div>
       <div class="surrounded">
         Class by:
-        <select @change="mydata.methods.update()"  name="classedBy" id="classed-select" v-model="statsBy">
+        <select @change="update()" id="classed-select" v-model="statsBy">
           <option selected="selected" value="years">Years</option>
           <option value="months">Months</option>
           <option value="topics">Topics</option>
         </select>
       </div>
       <div id="statsPie">
-        <CanvasJSChart :options="mydata.options" :style="mydata.styleOptions"  @chart-ref="mydata.methods.chartInstance"/>
+		  <CanvasJSChart :options="options" id=chart @chart-ref="c => chart = c "/>
       </div>
     </div>
     <div id="articles">
       <input
         type="text"
         id="search-input"
-        :onkeyup="inputKeyUp()"
+        @keyup="inputKeyUp()"
         placeholder="search articles"
         v-model="input"
       />
@@ -241,4 +228,9 @@ const mydata = {
 #myUL li a:hover:not(.header) {
   background-color: #eee;
 }
+
+#Chart{
+    width: "100%";
+    height: "100%";
+}
 </style>

From d31547c4cc8f0800ec4540cdbba681a588c619f0 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 7 Apr 2024 15:51:53 +0200
Subject: [PATCH 15/66] added levenshtein distance to search input

---
 .../ResearcherProfile.vue                     | 77 ++++++++++---------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index dca20a4..e369027 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -12,6 +12,14 @@ const statsOf = ref("");
 const statsBy = ref("");
 let chart;
 
+const articleList = [
+    "First Article",
+    "The composition of the light",
+    "The composition of the sand",
+    "Fluctuation in universe beavers",
+    "The Potato War"
+]
+
 const jsonMockViewsByYears= [
   {label: "2004", y:4},
   {label: "2005", y:99},
@@ -20,26 +28,39 @@ const jsonMockViewsByYears= [
   {label: "2011", y:1666},
 ]
 
-function inputKeyUp() {
-  let filter, ul, li, a, txtValue;
-  filter = input.value.toUpperCase();
-  if (document.getElementById("myUL") != null) {
-    ul = document.getElementById("myUL");
-    li = ul.getElementsByTagName("li");
-
-    // Loop through all list items, and hide those who don't match the search query
-    for (let i = 0; i < li.length; i++) {
-      a = li[i].getElementsByTagName("a")[0];
-      txtValue = a.textContent || a.innerText;
-      if (txtValue.toUpperCase().indexOf(filter) > -1) {
-        li[i].style.display = "";
-      } else {
-        li[i].style.display = "none";
-      }
+function searchInList(list, searchInput){
+  if (searchInput === "")
+    return list
+  let retList =[]
+  for (let i = 0; i < list.length; i++) {
+    console.log(list[i] + " et " + searchInput + " vaut " + lDistance(list[i], searchInput) )
+    if (lDistance(list[i], searchInput) < 6){
+      retList.push(list[i])
     }
   }
+  return retList
 }
 
+function lDistance(s,t){
+  if (!s.length) return t.length;
+  if (!t.length) return s.length;
+  const arr = [];
+  for (let i = 0; i <= t.length; i++) {
+    arr[i] = [i];
+    for (let j = 1; j <= s.length; j++) {
+      arr[i][j] =
+          i === 0
+              ? j
+              : Math.min(
+                  arr[i - 1][j] + 1,
+                  arr[i][j - 1] + 1,
+                  arr[i - 1][j - 1] + (s[j - 1] === t[i - 1] ? 0 : 1)
+              );
+    }
+  }
+  return arr[t.length][s.length];
+};
+
 const options = reactive({
     backgroundColor:null,
     theme: "light2",
@@ -113,23 +134,9 @@ function update(){
       </div>
     </div>
     <div id="articles">
-      <input
-        type="text"
-        id="search-input"
-        @keyup="inputKeyUp()"
-        placeholder="search articles"
-        v-model="input"
-      />
-      <ul id="myUL">
-        <li><a href="#">Adele</a></li>
-        <li><a href="#">Agnes</a></li>
-
-        <li><a href="#">Billy</a></li>
-        <li><a href="#">Bob</a></li>
-
-        <li><a href="#">Calvin</a></li>
-        <li><a href="#">Christina</a></li>
-        <li><a href="#">Cindy</a></li>
+      <input type="text" id="search-input" placeholder="search articles" v-model="input"/>
+      <ul id="articlesUL">
+        <li v-for="n in searchInList(articleList,input)">{{n}}</li>
       </ul>
     </div>
   </div>
@@ -189,7 +196,6 @@ function update(){
 }
 
 #articles {
-  background-color: orange;
 }
 
 #search-input {
@@ -200,8 +206,9 @@ function update(){
   margin-bottom: 12px;
 }
 
-#myUL {
+#articlesUL {
   list-style-type: none;
+  color: white;
   padding: 0;
   margin: 0;
 }

From a94167c8a09d7b94b56e467965ca4601f29956b0 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Mon, 8 Apr 2024 11:02:59 +0200
Subject: [PATCH 16/66] scrollable + better search

---
 .../ResearcherProfile.vue                     | 60 +++++++++----------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index e369027..c506f62 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -17,7 +17,11 @@ const articleList = [
     "The composition of the light",
     "The composition of the sand",
     "Fluctuation in universe beavers",
-    "The Potato War"
+    "The Potato War",
+  "The Potato War",
+  "The Potato War",
+  "The Potato War",
+  "The Potato War",
 ]
 
 const jsonMockViewsByYears= [
@@ -34,7 +38,10 @@ function searchInList(list, searchInput){
   let retList =[]
   for (let i = 0; i < list.length; i++) {
     console.log(list[i] + " et " + searchInput + " vaut " + lDistance(list[i], searchInput) )
-    if (lDistance(list[i], searchInput) < 6){
+    if (lDistance(list[i], searchInput) < 10){
+      retList.push(list[i])
+    }
+    else if(list[i].toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
       retList.push(list[i])
     }
   }
@@ -136,7 +143,7 @@ function update(){
     <div id="articles">
       <input type="text" id="search-input" placeholder="search articles" v-model="input"/>
       <ul id="articlesUL">
-        <li v-for="n in searchInList(articleList,input)">{{n}}</li>
+        <li id="articleLi" v-for="n in searchInList(articleList,input)">{{n}}</li>
       </ul>
     </div>
   </div>
@@ -187,10 +194,9 @@ function update(){
   color: white;
   background-color: rgb(255, 255, 255, 0.1);
   font-size: large;
-  align-self: center;
-  text-align: center;
 }
 
+
 #statsPie {
 
 }
@@ -199,6 +205,7 @@ function update(){
 }
 
 #search-input {
+  margin-left: 5px;
   width: 60%;
   font-size: 16px;
   padding: 12px 20px 12px 40px;
@@ -209,35 +216,22 @@ function update(){
 #articlesUL {
   list-style-type: none;
   color: white;
-  padding: 0;
-  margin: 0;
-}
-
-#myUL li a {
-  border: 1px solid #ddd;
-  /* Add a border to all links */
-  margin-top: -1px;
-  /* Prevent double borders */
-  background-color: #f6f6f6;
-  /* Grey background color */
   padding: 12px;
-  /* Add some padding */
-  text-decoration: none;
-  /* Remove default text underline */
-  font-size: 18px;
-  /* Increase the font-size */
-  color: black;
-  /* Add a black text color */
-  display: block;
-  /* Make it into a block element to fill the whole list */
+  margin: 5px;
+  height: 400px;
+  overflow: scroll;
+}
+#articleLi{
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  align-self: center;
+  text-align: left;
+  text-indent: 7px;
+
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius: 20px;
+  margin-bottom: 15px;
 }
 
-#myUL li a:hover:not(.header) {
-  background-color: #eee;
-}
-
-#Chart{
-    width: "100%";
-    height: "100%";
-}
 </style>

From 3167d1f2fc7c3bd710fcf76c36ded7b15eabc5b8 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Mon, 8 Apr 2024 22:56:44 +0200
Subject: [PATCH 17/66] added the Filters button and popup

---
 frontend/package-lock.json                    | 89 +++++++++++++++++++
 frontend/package.json                         |  1 +
 .../FilterComponent.vue                       | 58 ++++++++++++
 .../ResearcherProfile.vue                     | 59 +++++++++---
 4 files changed, 194 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/Apps/ScientificPublications/FilterComponent.vue

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b33e0cd..8f48574 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -9,6 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@canvasjs/vue-charts": "^1.0.4",
+        "@vueuse/core": "^10.9.0",
         "vite-plugin-top-level-await": "^1.4.1",
         "vue": "^3.4.15",
         "vue3-toastify": "^0.2.1"
@@ -768,6 +769,11 @@
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
     },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow=="
+    },
     "node_modules/@vitejs/plugin-vue": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz",
@@ -881,6 +887,89 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
       "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw=="
     },
+    "node_modules/@vueuse/core": {
+      "version": "10.9.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.9.0.tgz",
+      "integrity": "sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "10.9.0",
+        "@vueuse/shared": "10.9.0",
+        "vue-demi": ">=0.14.7"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
+      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "10.9.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.9.0.tgz",
+      "integrity": "sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "10.9.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.9.0.tgz",
+      "integrity": "sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==",
+      "dependencies": {
+        "vue-demi": ">=0.14.7"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
+      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/agent-base": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index b303f78..8edbabe 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@canvasjs/vue-charts": "^1.0.4",
+    "@vueuse/core": "^10.9.0",
     "vite-plugin-top-level-await": "^1.4.1",
     "vue": "^3.4.15",
     "vue3-toastify": "^0.2.1"
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
new file mode 100644
index 0000000..572b728
--- /dev/null
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -0,0 +1,58 @@
+<script setup>
+import { defineProps, defineEmits, ref } from "vue";
+import {onClickOutside} from '@vueuse/core'
+
+const props = defineProps({
+  isOpen: Boolean,
+});
+
+
+const emit = defineEmits(["modal-close"]);
+
+const target = ref(null)
+onClickOutside(target, ()=>emit('modal-close'))
+
+</script>
+
+<template>
+  <div v-if="isOpen" class="modal-mask">
+    <div class="modal-wrapper">
+      <div class="modal-container" ref="target">
+        <div class="modal-header">
+          <slot name="header"> default header </slot>
+        </div>
+        <div class="modal-body">
+          <slot name="content"> default content </slot>
+        </div>
+        <div class="modal-footer">
+          <slot name="footer">
+            <div>
+              <button @click.stop="emit('modal-close')">Submit</button>
+            </div>
+          </slot>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.modal-mask {
+  position: fixed;
+  z-index: 9998;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.modal-container {
+  width: 300px;
+  margin: 150px auto;
+  padding: 20px 30px;
+  background-color: #fff;
+  border-radius: 2px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
+}
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index c506f62..b51e79e 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -7,17 +7,29 @@
 
 <script setup>
 import { ref, reactive } from "vue";
+import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
+const isFilterOpened = ref(false);
 let chart;
 
+const openModal = () => {
+  isFilterOpened.value = true;
+};
+const closeModal = () => {
+  isFilterOpened.value = false;
+};
+const submitHandler = ()=>{
+  //here you do whatever
+}
+
 const articleList = [
-    "First Article",
-    "The composition of the light",
-    "The composition of the sand",
-    "Fluctuation in universe beavers",
-    "The Potato War",
+  "First Article",
+  "The composition of the light",
+  "The composition of the sand",
+  "Fluctuation in universe beavers",
+  "The Potato War",
   "The Potato War",
   "The Potato War",
   "The Potato War",
@@ -66,7 +78,7 @@ function lDistance(s,t){
     }
   }
   return arr[t.length][s.length];
-};
+}
 
 const options = reactive({
     backgroundColor:null,
@@ -103,6 +115,9 @@ function update(){
 
 <template>
   <div id="main">
+    <FilterComponent :isOpen="isFilterOpened" @modal-close="closeModal" @submit="submitHandler" name="first-modal">
+      <template #header> Coucou </template>
+    </FilterComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
@@ -141,7 +156,10 @@ function update(){
       </div>
     </div>
     <div id="articles">
-      <input type="text" id="search-input" placeholder="search articles" v-model="input"/>
+      <div id="search">
+        <input type="text" id="search-input" placeholder="search articles" v-model="input"/>
+        <button id="filterButton" @click="openModal">  Filters </button>
+      </div>
       <ul id="articlesUL">
         <li id="articleLi" v-for="n in searchInList(articleList,input)">{{n}}</li>
       </ul>
@@ -196,23 +214,38 @@ function update(){
   font-size: large;
 }
 
-
 #statsPie {
 
 }
 
-#articles {
+#search{
+  width: 100%;
+  height: 10%;
+  display: inline-flex;
 }
-
 #search-input {
-  margin-left: 5px;
-  width: 60%;
+  margin-left: 25px;
+  width: 75%;
   font-size: 16px;
   padding: 12px 20px 12px 40px;
   border: 1px solid #ddd;
-  margin-bottom: 12px;
+  height: 20px;
+  align-self: center;
 }
 
+#filterButton {
+  align-self: center;
+  margin-left: 2px;
+  font-size: xx-large;
+  color: white;
+  background: rgba(191, 64, 191,0.5);
+  border:2px solid black;
+}
+#filterButton:hover{
+  background: rgba(191, 64, 191);
+}
+
+
 #articlesUL {
   list-style-type: none;
   color: white;

From 0cbe0dd82b5f9d47426a982c7483f430d8dbf425 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 9 Apr 2024 00:57:06 +0200
Subject: [PATCH 18/66] filter popup mock done

---
 .../FilterComponent.vue                       | 83 +++++++++++++++----
 .../ResearcherProfile.vue                     |  2 +-
 2 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 572b728..cff08fd 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -1,12 +1,22 @@
 <script setup>
 import { defineProps, defineEmits, ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
+let checked = ref([])
 
 const props = defineProps({
   isOpen: Boolean,
 });
-
-
+const example = ["A","B", "Lorem Ipsum AAAAAAAAAAAAAAAAAAA",
+"H",
+  "H",
+  "H",
+  "H",
+  "H",
+  "H",
+  "H",
+  "H",
+  "H",
+]
 const emit = defineEmits(["modal-close"]);
 
 const target = ref(null)
@@ -18,19 +28,35 @@ onClickOutside(target, ()=>emit('modal-close'))
   <div v-if="isOpen" class="modal-mask">
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
-        <div class="modal-header">
-          <slot name="header"> default header </slot>
-        </div>
-        <div class="modal-body">
-          <slot name="content"> default content </slot>
-        </div>
-        <div class="modal-footer">
-          <slot name="footer">
-            <div>
-              <button @click.stop="emit('modal-close')">Submit</button>
-            </div>
-          </slot>
+        <div id="filterGrid">
+          <div>
+            <ul>
+              <li v-for="n in example">{{n}}</li>
+            </ul>
+          </div>
+          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div class="vl">
+            <ul>
+              <li v-for="n in example">{{n}}</li>
+            </ul>
+          </div>
+          <div>
+            <ul>
+              <li v-for="n in example">{{n}}</li>
+            </ul>
+          </div>
+          <div class="vl">
+            <ul>
+              <li v-for="n in example">{{n}}</li>
+            </ul>
+          </div>
+          <div class="vl"></div>
         </div>
+        <div>
+          <div id="submit">
+            <button @click.stop="emit('modal-close')">Submit</button>
+          </div>
+      </div>
       </div>
     </div>
   </div>
@@ -46,13 +72,36 @@ onClickOutside(target, ()=>emit('modal-close'))
   height: 100%;
   background-color: rgba(0, 0, 0, 0.5);
 }
+
 .modal-container {
-  width: 300px;
+  width: 70%;
   margin: 150px auto;
   padding: 20px 30px;
-  background-color: #fff;
-  border-radius: 2px;
+  background: rgba(157, 99, 205);
+  border-radius: 12px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
 }
 
+#filterGrid {
+  display: grid;
+  grid-template-columns: auto auto auto;
+  column-gap: 5px;
+  grid-template-rows: auto auto;
+}
+#filterGrid ul {
+  list-style-type: none;
+  padding: 15px;
+  height: 100px;
+  overflow: scroll;
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius: 6px;
+}
+
+.vl {
+  border-left: 6px solid darkmagenta;
+}
+#submit {
+  text-align: end;
+}
+
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index b51e79e..a112f1f 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -21,7 +21,7 @@ const closeModal = () => {
   isFilterOpened.value = false;
 };
 const submitHandler = ()=>{
-  //here you do whatever
+  // call only with those filters the get
 }
 
 const articleList = [

From 9a83d14aea28c6c03af8d020100895cf9838e208 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 9 Apr 2024 17:32:04 +0200
Subject: [PATCH 19/66] added article Popup

---
 .../ArticleComponent.vue                      | 69 +++++++++++++++++
 .../FilterComponent.vue                       | 43 +++--------
 .../ResearcherProfile.vue                     | 75 ++++++++++++-------
 3 files changed, 130 insertions(+), 57 deletions(-)
 create mode 100644 frontend/src/Apps/ScientificPublications/ArticleComponent.vue

diff --git a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
new file mode 100644
index 0000000..5739a57
--- /dev/null
+++ b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
@@ -0,0 +1,69 @@
+<script setup>
+import { defineProps, defineEmits, ref } from "vue";
+import {onClickOutside} from '@vueuse/core'
+let checked = ref([])
+
+const props = defineProps({
+  isOpen: Boolean,
+});
+const example = ["Title","Author",["Co-author1", "co-Authors2"],
+  " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
+  "language",
+    "access",
+]
+const emit = defineEmits(["modal-close"]);
+
+const target = ref(null)
+onClickOutside(target, ()=>emit('modal-close'))
+
+</script>
+
+<template>
+  <div v-if="isOpen" class="modal-mask">
+    <div class="modal-wrapper">
+      <div class="modal-container" ref="target">
+       <ul v-for="n in example"><li>{{n}}</li></ul>
+        <div id="downloads">
+          <button @click.stop="emit('modal-close')">Download BibTex</button>
+          <button @click.stop="emit('modal-close')">Download Article</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.modal-mask {
+  position: fixed;
+  z-index: 9998;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.modal-container {
+  width: 70%;
+  margin: 150px auto;
+  padding: 20px 30px;
+  background: rgba(157, 99, 205);
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
+}
+
+
+#downloads {
+  text-align: end;
+}
+#downloads button {
+  align-self: center;
+  margin-left: 2px;
+  font-size: large;
+  color: white;
+  background: rgba(191, 64, 191,0.5);
+  border:2px solid black;
+  border-radius: 5px;
+}
+
+</style>
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index cff08fd..5282c64 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -7,10 +7,6 @@ const props = defineProps({
   isOpen: Boolean,
 });
 const example = ["A","B", "Lorem Ipsum AAAAAAAAAAAAAAAAAAA",
-"H",
-  "H",
-  "H",
-  "H",
   "H",
   "H",
   "H",
@@ -29,37 +25,19 @@ onClickOutside(target, ()=>emit('modal-close'))
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div id="filterGrid">
-          <div>
-            <ul>
-              <li v-for="n in example">{{n}}</li>
-            </ul>
-          </div>
+          <div> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
           <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl">
-            <ul>
-              <li v-for="n in example">{{n}}</li>
-            </ul>
-          </div>
-          <div>
-            <ul>
-              <li v-for="n in example">{{n}}</li>
-            </ul>
-          </div>
-          <div class="vl">
-            <ul>
-              <li v-for="n in example">{{n}}</li>
-            </ul>
-          </div>
-          <div class="vl"></div>
+          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+      </div>
+        <div id="submit">
+          <button @click.stop="emit('modal-close')">Submit</button>
         </div>
-        <div>
-          <div id="submit">
-            <button @click.stop="emit('modal-close')">Submit</button>
-          </div>
       </div>
-      </div>
-    </div>
   </div>
+ </div>
 </template>
 
 <style scoped>
@@ -93,12 +71,13 @@ onClickOutside(target, ()=>emit('modal-close'))
   padding: 15px;
   height: 100px;
   overflow: scroll;
+  scrollbar-color: #8a2be2 rgb(255,255,255,0.04);
   background-color: rgba(255, 255, 255, 0.09);
   border-radius: 6px;
 }
 
 .vl {
-  border-left: 6px solid darkmagenta;
+  border-left: 6px solid #8a2be2;
 }
 #submit {
   text-align: end;
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index a112f1f..bf07e1a 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -8,10 +8,12 @@
 <script setup>
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
+import ArticleComponent from "@/Apps/ScientificPublications/ArticleComponent.vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
 const isFilterOpened = ref(false);
+const isArticleOpened = ref(false);
 let chart;
 
 const openModal = () => {
@@ -20,22 +22,35 @@ const openModal = () => {
 const closeModal = () => {
   isFilterOpened.value = false;
 };
-const submitHandler = ()=>{
+const submitFilters = ()=>{
   // call only with those filters the get
 }
+const openArticle = (article) => {
+  isArticleOpened.value = true;
+}
+
+const closeArticle = () => {
+  isArticleOpened.value =false;
+}
+
+const downloadBibTex = (article) => {
+//todo
+}
+
+const downloadArticle = (article) => {
+ //todo
+}
+
 
 const articleList = [
-  "First Article",
-  "The composition of the light",
-  "The composition of the sand",
-  "Fluctuation in universe beavers",
-  "The Potato War",
-  "The Potato War",
-  "The Potato War",
-  "The Potato War",
-  "The Potato War",
+  ["The Great Potato War Lorem Ipsum aeaDq Terelumni ","Author",["Co-author1", "co-Authors2"],
+  " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
+  "language",
+    "access",
+  ]
 ]
 
+
 const jsonMockViewsByYears= [
   {label: "2004", y:4},
   {label: "2005", y:99},
@@ -45,17 +60,15 @@ const jsonMockViewsByYears= [
 ]
 
 function searchInList(list, searchInput){
+  let retList= []
   if (searchInput === "")
-    return list
-  let retList =[]
+    return [list[0].slice(0,2)]
   for (let i = 0; i < list.length; i++) {
-    console.log(list[i] + " et " + searchInput + " vaut " + lDistance(list[i], searchInput) )
-    if (lDistance(list[i], searchInput) < 10){
-      retList.push(list[i])
-    }
-    else if(list[i].toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
-      retList.push(list[i])
+    console.log(list[i])
+    if (lDistance(list[i][0], searchInput) < 10 || list[i][0].toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
+      retList.push(list[i].slice(0,2))
     }
+    console.log(list[i][0].toUpperCase().indexOf(searchInput.toUpperCase()))
   }
   return retList
 }
@@ -115,9 +128,9 @@ function update(){
 
 <template>
   <div id="main">
-    <FilterComponent :isOpen="isFilterOpened" @modal-close="closeModal" @submit="submitHandler" name="first-modal">
-      <template #header> Coucou </template>
+    <FilterComponent :isOpen="isFilterOpened" @modal-close="closeModal" @submit="submitFilters">
     </FilterComponent>
+    <ArticleComponent :isOpen="isArticleOpened" @modal-close="closeArticle"></ArticleComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
@@ -161,7 +174,10 @@ function update(){
         <button id="filterButton" @click="openModal">  Filters </button>
       </div>
       <ul id="articlesUL">
-        <li id="articleLi" v-for="n in searchInList(articleList,input)">{{n}}</li>
+        <li id="articleLi" v-for="n in searchInList(articleList,input)">
+          <div class="vl"> {{n[0]}}</div>
+          <div class="vl"> {{n[1]}}</div>
+         <a @click="openArticle"> MoreInfo  </a></li>
       </ul>
     </div>
   </div>
@@ -255,16 +271,25 @@ function update(){
   overflow: scroll;
 }
 #articleLi{
+  display: grid;
+  grid-template-columns: auto auto auto;
   border: 2px solid black;
   color: white;
   font-size: x-large;
-  align-self: center;
-  text-align: left;
+  text-align: center;
   text-indent: 7px;
-
   background-color: rgba(255, 255, 255, 0.09);
-  border-radius: 20px;
+  border-radius: 18px;
   margin-bottom: 15px;
 }
+a{
+  color:#007aff;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.vl {
+  border-right: 2px solid black;
+}
 
 </style>

From f99ed470f8f015286b93f6e0dc301df26801cb8b Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 9 Apr 2024 17:58:02 +0200
Subject: [PATCH 20/66] added comment

---
 .../src/Apps/ScientificPublications/ArticleComponent.vue   | 7 +++++++
 .../src/Apps/ScientificPublications/FilterComponent.vue    | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
index 5739a57..75a93e0 100644
--- a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
@@ -1,3 +1,10 @@
+<!----------------------------------------------------
+	File:  ArticleComponent.vue
+	Author: Maxime Bartha
+	Scope: Extension Publicatons scientifiquess
+	Description: Pop Up summarizing an article
+----------------------------------------------------->
+
 <script setup>
 import { defineProps, defineEmits, ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 5282c64..27e6b8f 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -1,3 +1,9 @@
+<!----------------------------------------------------
+	File:  ArticleComponent.vue
+	Author: Maxime Bartha
+	Scope: Extension Publicatons scientifiquess
+	Description: Pop Up for selecting search Filters
+----------------------------------------------------->
 <script setup>
 import { defineProps, defineEmits, ref } from "vue";
 import {onClickOutside} from '@vueuse/core'

From fdf4993def7a425f29eea3f1eb597980dbe11e12 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 9 Apr 2024 18:24:46 +0200
Subject: [PATCH 21/66] remove unecessary imports

---
 frontend/src/Apps/ScientificPublications/ArticleComponent.vue | 4 ++--
 frontend/src/Apps/ScientificPublications/FilterComponent.vue  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
index 75a93e0..84100b2 100644
--- a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
@@ -2,11 +2,11 @@
 	File:  ArticleComponent.vue
 	Author: Maxime Bartha
 	Scope: Extension Publicatons scientifiquess
-	Description: Pop Up summarizing an article
+	Description: Pop Up summarizing
 ----------------------------------------------------->
 
 <script setup>
-import { defineProps, defineEmits, ref } from "vue";
+import {ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
 let checked = ref([])
 
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 27e6b8f..056db3a 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -5,7 +5,7 @@
 	Description: Pop Up for selecting search Filters
 ----------------------------------------------------->
 <script setup>
-import { defineProps, defineEmits, ref } from "vue";
+import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
 let checked = ref([])
 

From b7a729c899e59a353e3a6241549ec2c02039b0f7 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 9 Apr 2024 19:52:31 +0200
Subject: [PATCH 22/66] added extention entities

---
 .../ovh/herisson/Clyde/Tables/FileType.java   |  4 +-
 .../Tables/ScientificPublications/Access.java |  7 +++
 .../ScientificPublications/Article.java       | 51 +++++++++++++++++++
 .../ArticleCoAuthors.java                     | 27 ++++++++++
 .../ScientificPublications/PublishType.java   |  6 +++
 .../ScientificPublications/Researcher.java    | 25 +++++++++
 .../java/ovh/herisson/Clyde/Tables/User.java  |  2 +-
 7 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java

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..a89de1f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
@@ -4,5 +4,7 @@ public enum FileType {
 
     ProfilePicture,
 
-    EducationCertificate
+    EducationCertificate,
+
+    Article,
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java
new file mode 100644
index 0000000..7914d22
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java
@@ -0,0 +1,7 @@
+package ovh.herisson.Clyde.Tables.ScientificPublications;
+
+public enum Access {
+    OpenSource,
+    Restricted,
+    Private,
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
new file mode 100644
index 0000000..dd5504c
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
@@ -0,0 +1,51 @@
+package ovh.herisson.Clyde.Tables.ScientificPublications;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+import ovh.herisson.Clyde.Tables.User;
+import java.util.Date;
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+public class Article {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String title;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name ="Users")
+    private User author;
+
+    //todo change user to Researcher
+    @CreationTimestamp
+    @Column(nullable = false)
+    private Date releaseDate;
+
+    private PublishType publishType;
+
+    private String pdfLocation;
+
+    private String bibTexLocation;
+
+    private String language;
+
+    private Access access;
+
+    private String domain;
+
+    private String summary;
+
+    private int views;
+}
+
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
new file mode 100644
index 0000000..5407a4b
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
@@ -0,0 +1,27 @@
+package ovh.herisson.Clyde.Tables.ScientificPublications;
+
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ArticleCoAuthors {
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name = "Researcher")
+    private Researcher coAuthor;
+
+    @ManyToOne(fetch = FetchType.EAGER)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "Article")
+    private Article article;
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java
new file mode 100644
index 0000000..9f84e79
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java
@@ -0,0 +1,6 @@
+package ovh.herisson.Clyde.Tables.ScientificPublications;
+
+public enum PublishType {
+    article,
+    slides,
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
new file mode 100644
index 0000000..6366641
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
@@ -0,0 +1,25 @@
+package ovh.herisson.Clyde.Tables.ScientificPublications;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import ovh.herisson.Clyde.Tables.User;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+public class Researcher {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+    @OneToOne
+    private User user;
+    private String orcidId;
+    private String site;
+    private String Domain;
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java
index 2badd32..ba645c8 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/User.java
@@ -28,11 +28,11 @@ public class User {
 	////// Extension Messagerie /////
 	@OneToMany(mappedBy = "author", cascade = CascadeType.ALL)
 	private List<Message> msgs;
-	/////////////////////////////////
 
 	@ManyToMany( mappedBy = "members" )
 	private List<Discussion> discussions;
 
+    /////////////////////////////////
     public User(String lastName, String firstName, String email, String address,
                 String country, Date birthDate, String profilePictureUrl, Role role, String password)
     {

From 40186f9898c21ab9006c79263fde5e09d6ea54be Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 10 Apr 2024 01:14:14 +0200
Subject: [PATCH 23/66] changed button colors

---
 .../Tables/ScientificPublications/PaperType.java   | 14 ++++++++++++++
 .../Tables/ScientificPublications/PublishType.java |  6 ------
 .../ScientificPublications/ArticleComponent.vue    |  3 +++
 .../ScientificPublications/FilterComponent.vue     | 13 +++++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
new file mode 100644
index 0000000..ae69364
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
@@ -0,0 +1,14 @@
+package ovh.herisson.Clyde.Tables.ScientificPublications;
+
+/******************************************************
+ * @file Access.java
+ * @author Maxime Bartha
+ * @scope Extension Publications scientifiques
+ *
+ * Type of the
+ *
+ ******************************************************/
+public enum PublishType {
+    article,
+    slides,
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java
deleted file mode 100644
index 9f84e79..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PublishType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package ovh.herisson.Clyde.Tables.ScientificPublications;
-
-public enum PublishType {
-    article,
-    slides,
-}
diff --git a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
index 84100b2..fa1fe01 100644
--- a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
@@ -72,5 +72,8 @@ onClickOutside(target, ()=>emit('modal-close'))
   border:2px solid black;
   border-radius: 5px;
 }
+#downloads button:hover{
+  background: rgba(191, 64, 191);
+}
 
 </style>
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 056db3a..8b558d6 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -82,6 +82,7 @@ onClickOutside(target, ()=>emit('modal-close'))
   border-radius: 6px;
 }
 
+
 .vl {
   border-left: 6px solid #8a2be2;
 }
@@ -89,4 +90,16 @@ onClickOutside(target, ()=>emit('modal-close'))
   text-align: end;
 }
 
+#submit button {
+  margin-left: 2px;
+  font-size: large;
+  color: white;
+  background: rgba(191, 64, 191,0.5);
+  border:2px solid black;
+  border-radius: 5px;
+}
+#submit button:hover{
+  background: rgba(191, 64, 191);
+}
+
 </style>
\ No newline at end of file

From 783cd8fa9f9ac25eda184f68e98fd4b90279a71b Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 10 Apr 2024 01:14:34 +0200
Subject: [PATCH 24/66] added comments in entities

---
 .../Tables/ScientificPublications/Access.java     | 14 +++++++++++---
 .../Tables/ScientificPublications/Article.java    | 15 +++++++++++----
 .../ScientificPublications/ArticleCoAuthors.java  |  8 ++++++++
 .../Tables/ScientificPublications/PaperType.java  |  6 +++---
 .../Tables/ScientificPublications/Researcher.java |  8 ++++++++
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java
index 7914d22..2e50622 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Access.java
@@ -1,7 +1,15 @@
 package ovh.herisson.Clyde.Tables.ScientificPublications;
 
+/******************************************************
+ * @file Access.java
+ * @author Maxime Bartha
+ * @scope Extension Publications scientifiques
+ *
+ * Access Type for the Articles
+ *
+ ******************************************************/
 public enum Access {
-    OpenSource,
-    Restricted,
-    Private,
+    OpenSource, // everyone can see
+    Restricted, // only Researchers and Staff Members (secretary, teachers and Inscription Service)
+    Private, // only authors and co-authors
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
index dd5504c..446214f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
@@ -1,5 +1,13 @@
 package ovh.herisson.Clyde.Tables.ScientificPublications;
 
+/******************************************************
+ * @file Article.java
+ * @author Maxime Bartha
+ * @scope Extension Publications scientifiques
+ *
+ * Article entity
+ *
+ ******************************************************/
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -24,15 +32,14 @@ public class Article {
 
     @ManyToOne(fetch = FetchType.EAGER)
     @OnDelete(action = OnDeleteAction.CASCADE)
-    @JoinColumn(name ="Users")
-    private User author;
+    @JoinColumn(name ="Researcher")
+    private Researcher author;
 
-    //todo change user to Researcher
     @CreationTimestamp
     @Column(nullable = false)
     private Date releaseDate;
 
-    private PublishType publishType;
+    private PaperType paperType;
 
     private String pdfLocation;
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
index 5407a4b..6048abe 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
@@ -1,5 +1,13 @@
 package ovh.herisson.Clyde.Tables.ScientificPublications;
 
+/******************************************************
+ * @file ArticleCoAuthors
+ * @author Maxime Bartha
+ * @scope Extension Publications scientifiques
+ *
+ * Co-Authors List entity (will be accessed by Articles)
+ *
+ ******************************************************/
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
index ae69364..b3b6196 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
@@ -1,14 +1,14 @@
 package ovh.herisson.Clyde.Tables.ScientificPublications;
 
 /******************************************************
- * @file Access.java
+ * @file PaperType.java
  * @author Maxime Bartha
  * @scope Extension Publications scientifiques
  *
- * Type of the
+ * Type of the scientific paper
  *
  ******************************************************/
-public enum PublishType {
+public enum PaperType {
     article,
     slides,
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
index 6366641..23fea98 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
@@ -1,5 +1,13 @@
 package ovh.herisson.Clyde.Tables.ScientificPublications;
 
+/******************************************************
+ * @file Researcher.java
+ * @author Maxime Bartha
+ * @scope Extension Publications scientifiques
+ *
+ * Researcher entity
+ *
+ ******************************************************/
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

From 8650482d115d1325994385754bf2c69f765a05ac Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 10 Apr 2024 11:50:17 +0200
Subject: [PATCH 25/66] changed "article" to "research" to be more more general

---
 .../ScientificPublications/PaperType.java     |  6 +-
 .../{Article.java => Research.java}           |  5 +-
 ...eCoAuthors.java => ResearchCoAuthors.java} |  4 +-
 .../FilterComponent.vue                       |  2 +-
 ...cleComponent.vue => ResearchComponent.vue} |  4 +-
 .../ResearcherProfile.vue                     | 69 +++++++++++--------
 6 files changed, 50 insertions(+), 40 deletions(-)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/{Article.java => Research.java} (93%)
 rename backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/{ArticleCoAuthors.java => ResearchCoAuthors.java} (93%)
 rename frontend/src/Apps/ScientificPublications/{ArticleComponent.vue => ResearchComponent.vue} (95%)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
index b3b6196..713bd4e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/PaperType.java
@@ -9,6 +9,8 @@ package ovh.herisson.Clyde.Tables.ScientificPublications;
  *
  ******************************************************/
 public enum PaperType {
-    article,
-    slides,
+    Article,
+    Paper,
+    Book,
+    BookChapter,
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
similarity index 93%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
index 446214f..2787f23 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Article.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
@@ -5,7 +5,7 @@ package ovh.herisson.Clyde.Tables.ScientificPublications;
  * @author Maxime Bartha
  * @scope Extension Publications scientifiques
  *
- * Article entity
+ * Research entity
  *
  ******************************************************/
 import jakarta.persistence.*;
@@ -16,14 +16,13 @@ import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
-import ovh.herisson.Clyde.Tables.User;
 import java.util.Date;
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-public class Article {
+public class Research {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
similarity index 93%
rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
rename to backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
index 6048abe..5d3b123 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ArticleCoAuthors.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
@@ -22,7 +22,7 @@ import org.hibernate.annotations.OnDeleteAction;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class ArticleCoAuthors {
+public class ResearchCoAuthors {
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "Researcher")
@@ -31,5 +31,5 @@ public class ArticleCoAuthors {
     @ManyToOne(fetch = FetchType.EAGER)
     @OnDelete(action = OnDeleteAction.CASCADE)
     @JoinColumn(name = "Article")
-    private Article article;
+    private Research research;
 }
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 8b558d6..534fd0c 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -1,5 +1,5 @@
 <!----------------------------------------------------
-	File:  ArticleComponent.vue
+	File:  ResearchComponent.vue
 	Author: Maxime Bartha
 	Scope: Extension Publicatons scientifiquess
 	Description: Pop Up for selecting search Filters
diff --git a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
similarity index 95%
rename from frontend/src/Apps/ScientificPublications/ArticleComponent.vue
rename to frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index fa1fe01..b5d2fc9 100644
--- a/frontend/src/Apps/ScientificPublications/ArticleComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -1,5 +1,5 @@
 <!----------------------------------------------------
-	File:  ArticleComponent.vue
+	File:  ResearchComponent.vue
 	Author: Maxime Bartha
 	Scope: Extension Publicatons scientifiquess
 	Description: Pop Up summarizing
@@ -32,7 +32,7 @@ onClickOutside(target, ()=>emit('modal-close'))
        <ul v-for="n in example"><li>{{n}}</li></ul>
         <div id="downloads">
           <button @click.stop="emit('modal-close')">Download BibTex</button>
-          <button @click.stop="emit('modal-close')">Download Article</button>
+          <button @click.stop="emit('modal-close')">Download Research</button>
         </div>
       </div>
     </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index bf07e1a..766ec11 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -8,46 +8,56 @@
 <script setup>
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
-import ArticleComponent from "@/Apps/ScientificPublications/ArticleComponent.vue";
+import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
 const isFilterOpened = ref(false);
-const isArticleOpened = ref(false);
+const isResearchOpened = ref(false);
 let chart;
 
-const openModal = () => {
+const openFilter = () => {
   isFilterOpened.value = true;
 };
-const closeModal = () => {
+const closeFilter = () => {
   isFilterOpened.value = false;
 };
 const submitFilters = ()=>{
   // call only with those filters the get
 }
-const openArticle = (article) => {
-  isArticleOpened.value = true;
+const openResearch = (article) => {
+  isResearchOpened.value = true;
 }
 
-const closeArticle = () => {
-  isArticleOpened.value =false;
+const closeResearch = () => {
+  isResearchOpened.value =false;
 }
 
-const downloadBibTex = (article) => {
+const downloadBibTex = (research) => {
 //todo
 }
 
-const downloadArticle = (article) => {
+const downloadArticle = (research) => {
  //todo
 }
 
 
-const articleList = [
+const researchList = [
   ["The Great Potato War Lorem Ipsum aeaDq Terelumni ","Author",["Co-author1", "co-Authors2"],
   " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
   "language",
     "access",
-  ]
+  ],
+  ["The First Ever Paper","Author",["Co-author1", "co-Authors2"],
+    " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
+    "language",
+    "access",
+  ],
+  ["the atomic disintegration of particular radioactive cells","Author",["Co-author1", "co-Authors2"],
+    " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
+    "language",
+    "access",
+  ],
 ]
 
 
@@ -59,16 +69,16 @@ const jsonMockViewsByYears= [
   {label: "2011", y:1666},
 ]
 
-function searchInList(list, searchInput){
-  let retList= []
-  if (searchInput === "")
-    return [list[0].slice(0,2)]
+function searchInList(list, searchInput) {
+  let retList = []
+  if (searchInput === ""){
+    list.forEach(r => retList.push(r.slice(0, 2)))
+    return retList
+  }
   for (let i = 0; i < list.length; i++) {
-    console.log(list[i])
     if (lDistance(list[i][0], searchInput) < 10 || list[i][0].toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
       retList.push(list[i].slice(0,2))
     }
-    console.log(list[i][0].toUpperCase().indexOf(searchInput.toUpperCase()))
   }
   return retList
 }
@@ -128,9 +138,8 @@ function update(){
 
 <template>
   <div id="main">
-    <FilterComponent :isOpen="isFilterOpened" @modal-close="closeModal" @submit="submitFilters">
-    </FilterComponent>
-    <ArticleComponent :isOpen="isArticleOpened" @modal-close="closeArticle"></ArticleComponent>
+    <FilterComponent :isOpen="isFilterOpened" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
+    <ArticleComponent :isOpen="isResearchOpened" @modal-close="closeResearch"></ArticleComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
@@ -152,7 +161,7 @@ function update(){
         <select @change="update()" id="stats-select" v-model="statsOf">
           <option value="views">Views</option>
           <option value="co-authors">Co-authors</option>
-          <option value="articles">Articles</option>
+          <option value="researches">Researches</option>
           <option value="language">Languages</option>
         </select>
       </div>
@@ -168,16 +177,16 @@ function update(){
 		  <CanvasJSChart :options="options" id=chart @chart-ref="c => chart = c "/>
       </div>
     </div>
-    <div id="articles">
+    <div id="researches">
       <div id="search">
-        <input type="text" id="search-input" placeholder="search articles" v-model="input"/>
-        <button id="filterButton" @click="openModal">  Filters </button>
+        <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+        <button id="filterButton" @click="openFilter">  Filters </button>
       </div>
-      <ul id="articlesUL">
-        <li id="articleLi" v-for="n in searchInList(articleList,input)">
+      <ul id="researchUL">
+        <li id="researchLi" v-for="n in searchInList(researchList,input)">
           <div class="vl"> {{n[0]}}</div>
           <div class="vl"> {{n[1]}}</div>
-         <a @click="openArticle"> MoreInfo  </a></li>
+         <a @click="openResearch"> MoreInfo  </a></li>
       </ul>
     </div>
   </div>
@@ -262,7 +271,7 @@ function update(){
 }
 
 
-#articlesUL {
+#researchUL {
   list-style-type: none;
   color: white;
   padding: 12px;
@@ -270,7 +279,7 @@ function update(){
   height: 400px;
   overflow: scroll;
 }
-#articleLi{
+#researchLi{
   display: grid;
   grid-template-columns: auto auto auto;
   border: 2px solid black;

From 5e9eccc4f6c52a71d2939b6355bb6aaee2655d01 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 11 Apr 2024 00:24:40 +0200
Subject: [PATCH 26/66] Researches EndPoints

---
 .../ResearchController.java                   |  95 ++++++++++++++++
 .../Clyde/EndPoints/UserController.java       |   2 +-
 .../ResearchCoAuthorsRepository.java          |  14 +++
 .../ResearchRepository.java                   |   9 ++
 .../ResearcherRepository.java                 |   9 ++
 .../ResearchesService.java                    | 106 ++++++++++++++++++
 .../ScientificPublications/Research.java      |  16 ++-
 .../ResearchCoAuthors.java                    |   2 +
 8 files changed, 250 insertions(+), 3 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
new file mode 100644
index 0000000..c3bdf9b
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -0,0 +1,95 @@
+package ovh.herisson.Clyde.EndPoints.ScientificPublications;
+
+import lombok.AllArgsConstructor;
+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.ScientificPublications.ResearchesService;
+import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
+import java.util.Map;
+
+@RestController
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+@AllArgsConstructor
+public class ResearchController {
+
+
+
+   private final ResearchesService researchesServ;
+
+   private final AuthenticatorService authServ;
+
+    /** Is accessible by anyone
+     * but if the user doesn't have the permission to download the research
+     * the return Research Download URL will be null
+     */
+    @GetMapping("/research/{id}")
+    public ResponseEntity<Research> getResearch(@RequestHeader("Authorization") String token, @PathVariable long id){
+
+        Research research = researchesServ.getResearchById(id);
+
+        if (research == null)
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        if (researchesServ.hasNoAccessTo(research,authServ.getUserFromToken(token))){
+           research.setPdfLocation(null);
+        }// If the user doesn't have access to the document he can't download the pdf
+
+        return new ResponseEntity<>(research, HttpStatus.OK);
+    }
+
+    @PostMapping("/research")
+    public ResponseEntity<Research> postResearch(@RequestHeader("Authorization") String token, @RequestBody Research research){
+
+        if (authServ.isNotIn(new Role[]{Role.Admin},token) &&
+                researchesServ.getResearcherByUser(authServ.getUserFromToken(token)) == null){
+            return new UnauthorizedResponse<>(null);
+        } // if the poster isn't a researcher
+
+        return new ResponseEntity<>(researchesServ.saveResearch(research), HttpStatus.OK);
+    }
+
+    @PatchMapping("/research/{id}")
+    public ResponseEntity<String> patchResearch(@RequestHeader("Authorization") String token,
+                                          @RequestBody Map<String,Object> updates,
+                                          @PathVariable long id
+                                          )
+    {
+        Research research = researchesServ.getResearchById(id);
+        Researcher researcher = researchesServ.getResearcherByUser(authServ.getUserFromToken(token));
+
+        if (research == null)
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token) &&
+                researcher != research.getAuthor()) {
+            return new UnauthorizedResponse<>(null);
+        }
+
+      researchesServ.modifyResearchData(research, updates);
+      return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @DeleteMapping("/research/{id}")
+    public ResponseEntity<String> deleteResearch(@RequestHeader("Authorization") String token, @PathVariable long id){
+
+        Research research = researchesServ.getResearchById(id);
+        Researcher researcher = researchesServ.getResearcherByUser(authServ.getUserFromToken(token));
+
+        if (research == null)
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        if (authServ.isNotIn(new Role[]{Role.Admin, Role.Secretary},token) &&
+                researcher != research.getAuthor()){
+            return new UnauthorizedResponse<>(null);
+        }
+
+        researchesServ.delete(research);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
index 20ca9ee..64eec4a 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
@@ -96,7 +96,7 @@ public class UserController {
         if (poster == null) {return new UnauthorizedResponse<>("bad token");}
 
         if (!userService.modifyData(id, updates, poster))
-            return new UnauthorizedResponse<>("there was an issue with the updates requested");
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 
         return new ResponseEntity<>(null, HttpStatus.OK);
     }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
new file mode 100644
index 0000000..70eb16e
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
@@ -0,0 +1,14 @@
+package ovh.herisson.Clyde.Repositories.ScientificPublications;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.Course;
+import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+import ovh.herisson.Clyde.Tables.ScientificPublications.ResearchCoAuthors;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
+public interface ResearchCoAuthorsRepository extends CrudRepository<ResearchCoAuthors,Long> {
+   @Query("select distinct rca.coAuthor from ResearchCoAuthors rca where rca.research = ?1")
+   public Iterable<Researcher> findResearchCoAuthors(Research research);
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
new file mode 100644
index 0000000..09d74ad
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
@@ -0,0 +1,9 @@
+package ovh.herisson.Clyde.Repositories.ScientificPublications;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+
+public interface ResearchRepository extends CrudRepository<Research,Long> {
+
+    public Research findById(long id);
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
new file mode 100644
index 0000000..3cb2f9d
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
@@ -0,0 +1,9 @@
+package ovh.herisson.Clyde.Repositories.ScientificPublications;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+import ovh.herisson.Clyde.Tables.User;
+
+public interface ResearcherRepository extends CrudRepository<Researcher,Long> {
+    public Researcher findByUser(User user);
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
new file mode 100644
index 0000000..e7ca875
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -0,0 +1,106 @@
+package ovh.herisson.Clyde.Services.ScientificPublications;
+
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchCoAuthorsRepository;
+import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchRepository;
+import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearcherRepository;
+import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Access;
+import ovh.herisson.Clyde.Tables.ScientificPublications.PaperType;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+import ovh.herisson.Clyde.Tables.User;
+
+import java.util.Date;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class ResearchesService {
+
+    private final ResearcherRepository researcherRepo;
+    private final ResearchCoAuthorsRepository researchCoAuthorsRepo;
+    private final ResearchRepository articleRepo;
+
+    // Researchers Part
+    public Researcher getResearcherByUser(User user){
+        return researcherRepo.findByUser(user);
+    }
+
+    public boolean isCoAuthor(Research research, Researcher researcher){
+        Iterable<Researcher> coAuthors = researchCoAuthorsRepo.findResearchCoAuthors(research);
+        for (Researcher coAuthor : coAuthors){
+            if (researcher == coAuthor){
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    // researches Part
+    public Research getResearchById(long id) {
+        return articleRepo.findById(id);
+    }
+
+    public boolean hasNoAccessTo(Research research, User user){
+
+        if (research.getAccess() == Access.OpenSource) return false; // if the access is open source even non-users can see it
+        if (user == null) return true; // else you need at least to be a user
+
+        if (research.getAccess() == Access.Restricted &&
+                user.getRole() == Role.Admin || user.getRole() == Role.Secretary ||
+                user.getRole() == Role.Teacher || user.getRole() == Role.InscriptionService)
+            return false; // if the access is restricted only the staff member (above) can access the research
+
+        Researcher researcher = getResearcherByUser(user);
+
+        if (researcher==null)
+            return true;
+
+        return (research.getAccess() != Access.Private || research.getAuthor() != researcher) &&
+                (research.getAccess() != Access.Private || !isCoAuthor(research, researcher));
+        // if the researcher is the author or one of the co-authors of the research will return false
+    }
+
+    public Research saveResearch(Research research) {
+        return articleRepo.save(research);
+    }
+
+    public void modifyResearchData(Research research, Map<String, Object> updates) {
+        for (Map.Entry<String, Object> entry : updates.entrySet()){
+            switch (entry.getKey()){
+                case "title":
+                    research.setTitle((String) entry.getValue());
+                    break;
+                case "date":
+                    research.setReleaseDate((Date) entry.getValue());
+                    break;
+                case "paperType":
+                    research.setPaperType((PaperType) entry.getValue());
+                    break;
+                case "PdfLocation":
+                    research.setPdfLocation((String) entry.getValue());
+                    break;
+                case "bibtexLocation":
+                    research.setBibTexLocation((String) entry.getValue());
+                    break;
+                case "language":
+                    research.setLanguage((String) entry.getValue());
+                    break;
+                case "domain":
+                    research.setDomain((String) entry.getValue());
+                    break;
+                case "summary":
+                    research.setSummary((String) entry.getValue());
+                    break;
+            }
+        }
+        articleRepo.save(research);
+    }
+
+    public void delete(Research research) {
+        articleRepo.delete(research);
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
index 2787f23..3d31056 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
@@ -9,7 +9,6 @@ package ovh.herisson.Clyde.Tables.ScientificPublications;
  *
  ******************************************************/
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -20,7 +19,6 @@ import java.util.Date;
 @Getter
 @Setter
 @NoArgsConstructor
-@AllArgsConstructor
 @Entity
 public class Research {
     @Id
@@ -53,5 +51,19 @@ public class Research {
     private String summary;
 
     private int views;
+
+    public Research(String title, Researcher author, Date releaseDate, PaperType paperType,
+                    String pdfLocation, String bibTexLocation, String language, Access access, String domain, String summary){
+        this.author = author;
+        this.title = title;
+        this.releaseDate = releaseDate;
+        this.paperType = paperType;
+        this.pdfLocation = pdfLocation;
+        this.bibTexLocation = bibTexLocation;
+        this.language = language;
+        this.access = access;
+        this.domain = domain;
+        this.summary = summary;
+    }
 }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
index 5d3b123..1b657ce 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
@@ -8,6 +8,7 @@ package ovh.herisson.Clyde.Tables.ScientificPublications;
  * Co-Authors List entity (will be accessed by Articles)
  *
  ******************************************************/
+import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
@@ -22,6 +23,7 @@ import org.hibernate.annotations.OnDeleteAction;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@Entity
 public class ResearchCoAuthors {
 
     @ManyToOne(fetch = FetchType.EAGER)

From 4720669c2c73316034ada8367cad33d61c7b8366 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 11 Apr 2024 12:29:03 +0200
Subject: [PATCH 27/66] added EndPoints and Mock

---
 .../ScientificPublications/ResearchDTO.java   | 44 +++++++++++++
 .../ScientificPublications/ResearcherDTO.java | 31 +++++++++
 .../Clyde/EndPoints/MockController.java       | 25 ++++++-
 .../ResearchController.java                   | 21 +++++-
 .../ResearcherController.java                 | 65 +++++++++++++++++++
 .../ResearchRepository.java                   |  2 +-
 .../ResearcherRepository.java                 |  4 +-
 .../ResearchesService.java                    | 22 ++++++-
 .../ScientificPublications/Research.java      |  2 +-
 .../ResearchCoAuthors.java                    | 11 ++--
 .../ScientificPublications/Researcher.java    | 12 +++-
 11 files changed, 223 insertions(+), 16 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java

diff --git a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
new file mode 100644
index 0000000..2c35a82
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
@@ -0,0 +1,44 @@
+package ovh.herisson.Clyde.DTO.ScientificPublications;
+
+
+import lombok.Data;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Access;
+import ovh.herisson.Clyde.Tables.ScientificPublications.PaperType;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+
+import java.util.Date;
+
+@Data
+public class ResearchDTO {
+
+    private long id;
+    private String title;
+    private ResearcherDTO researcher;
+    private Date releaseDate;
+    private PaperType paperType;
+    private String pdfLocation;
+    private String language;
+    private Access access;
+    private String domain;
+    private String summary;
+
+    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain, String summary, long id) {
+        this.title = title;
+        this.researcher = researcherDTO;
+        this.releaseDate = releaseDate;
+        this.paperType = paperType;
+        this.pdfLocation = pdfLocation;
+        this.language = language;
+        this.access = access;
+        this.domain = domain;
+        this.summary = summary;
+        this.id = id;
+    }
+
+
+    public static ResearchDTO construct(Research research){
+        return new ResearchDTO(research.getTitle(), ResearcherDTO.construct(research.getAuthor()), research.getReleaseDate(),
+                research.getPaperType(),research.getPdfLocation(),research.getLanguage(),research.getAccess(),
+                research.getDomain(), research.getSummary(), research.getId());
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java
new file mode 100644
index 0000000..c9eebd4
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java
@@ -0,0 +1,31 @@
+package ovh.herisson.Clyde.DTO.ScientificPublications;
+
+import lombok.Data;
+import ovh.herisson.Clyde.Services.ProtectionService;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
+import java.util.Map;
+
+@Data
+public class ResearcherDTO {
+
+    private long id;
+    private Map<String,Object> user;
+    private String site;
+    private String domain;
+    private String orcidId;
+
+
+    private ResearcherDTO(long id, Map<String ,Object> user, String site,String domain,String orcidId){
+        this.domain = domain;
+        this.orcidId = orcidId;
+        this.site = site;
+        this.user = user;
+        this.id = id;
+    }
+
+    public static ResearcherDTO construct(Researcher researcher){
+        return new ResearcherDTO(researcher.getId(), ProtectionService.userWithoutPassword(researcher.getUser()),researcher.getSite(),
+                researcher.getDomain(),researcher.getOrcidId());
+    }
+}
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..422cded 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -5,7 +5,13 @@ import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Services.*;
+import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
 import ovh.herisson.Clyde.Tables.*;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Access;
+import ovh.herisson.Clyde.Tables.ScientificPublications.PaperType;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -24,10 +30,12 @@ public class MockController {
     public final CourseService courseService;
 
     public final InscriptionService inscriptionService;
+
+    public final ResearchesService researchesService;
     ArrayList<User> mockUsers;
 
 
-    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, ResearchesService researchesService){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
@@ -35,6 +43,7 @@ public class MockController {
         this.curriculumService = curriculumService;
         this.courseService = courseService;
         this.inscriptionService = inscriptionService;
+        this.researchesService = researchesService;
     }
 
     /** Saves an example of each user type by :
@@ -95,7 +104,19 @@ public class MockController {
         InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
 
         inscriptionService.save(inscriptionRequest);
-        
+
+
+        ///////////////////////////
+        // extension Publications Scientifiques
+        Researcher jojoResearcherAccount = new Researcher(jojo,"3363-22555-AB33-T",null,"IT");
+
+        Researcher output = researchesService.saveResearcher(jojoResearcherAccount);
+
+        Research jojoResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(),
+                PaperType.Article,null,null,"english",
+                Access.OpenSource,"IT","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
+
+        researchesService.saveResearch(jojoResearch);
     }
 }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index c3bdf9b..cab79d1 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.DTO.ScientificPublications.ResearchDTO;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
@@ -11,6 +12,7 @@ import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 @RestController
@@ -29,7 +31,7 @@ public class ResearchController {
      * the return Research Download URL will be null
      */
     @GetMapping("/research/{id}")
-    public ResponseEntity<Research> getResearch(@RequestHeader("Authorization") String token, @PathVariable long id){
+    public ResponseEntity<ResearchDTO> getResearch(@RequestHeader(value = "Authorization", required = false) String token, @PathVariable long id){
 
         Research research = researchesServ.getResearchById(id);
 
@@ -40,7 +42,22 @@ public class ResearchController {
            research.setPdfLocation(null);
         }// If the user doesn't have access to the document he can't download the pdf
 
-        return new ResponseEntity<>(research, HttpStatus.OK);
+        return new ResponseEntity<>(ResearchDTO.construct(research), HttpStatus.OK);
+    }
+
+    @GetMapping("/researches")
+    public ResponseEntity<Iterable<ResearchDTO>> getResearches(@RequestHeader(value = "Authorization",required = false) String token){
+        Iterable<Research> researches = researchesServ.getAllResearches();
+
+        ArrayList<ResearchDTO> toReturnResearches = new ArrayList<>();
+
+        for (Research research: researches){
+            if (researchesServ.hasNoAccessTo(research,authServ.getUserFromToken(token))){
+                research.setPdfLocation(null);
+            }
+            toReturnResearches.add(ResearchDTO.construct(research));
+        }
+        return new ResponseEntity<>(toReturnResearches,HttpStatus.OK);
     }
 
     @PostMapping("/research")
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
new file mode 100644
index 0000000..bb210f6
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
@@ -0,0 +1,65 @@
+package ovh.herisson.Clyde.EndPoints.ScientificPublications;
+
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.DTO.ScientificPublications.ResearcherDTO;
+import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
+import ovh.herisson.Clyde.Services.AuthenticatorService;
+import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
+import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
+import java.util.ArrayList;
+
+@RestController
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+@AllArgsConstructor
+public class ResearcherController {
+
+    ResearchesService researchesServ;
+    AuthenticatorService authServ;
+
+
+    @GetMapping("/researcher/{id}")
+    public ResponseEntity<ResearcherDTO> getResearcher(@PathVariable long id){
+        Researcher researcher = researchesServ.getResearcherById(id);
+        return new ResponseEntity<>(ResearcherDTO.construct(researcher),HttpStatus.OK);
+    }
+
+    /**
+     * Everyone can access every researcher Account
+     * @return all the researchers accounts
+     */
+    @GetMapping("/researchers")
+    public ResponseEntity<Iterable<ResearcherDTO>> getAllResearchers(){
+        Iterable<Researcher> researchers = researchesServ.getAllResearchers();
+        ArrayList<ResearcherDTO> toReturnResearchersDTO = new ArrayList<>();
+        for (Researcher researcher: researchers){
+            toReturnResearchersDTO.add(ResearcherDTO.construct(researcher));
+        }
+        return new ResponseEntity<>(toReturnResearchersDTO, HttpStatus.OK);
+    }
+
+    @PostMapping("/researcher")
+    public ResponseEntity<ResearcherDTO> postResearcher(@RequestHeader("Authorization") String token, @RequestBody Researcher researcher){
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token)){
+            return new UnauthorizedResponse<>(null);
+        }
+
+        Researcher posted = researchesServ.saveResearcher(researcher);
+
+        return new ResponseEntity<>(ResearcherDTO.construct(posted), HttpStatus.OK);
+    }
+
+    @DeleteMapping("/researcher/{id}")
+    public ResponseEntity<String> deleteResearcher(@RequestHeader ("Authorization") String token, @PathVariable long id){
+       if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
+           return new UnauthorizedResponse<>(null);
+
+       researchesServ.deleteResearcher(researchesServ.getResearcherById(id));
+       return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
index 09d74ad..8c100c6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
@@ -5,5 +5,5 @@ import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
 
 public interface ResearchRepository extends CrudRepository<Research,Long> {
 
-    public Research findById(long id);
+    Research findById(long id);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
index 3cb2f9d..a143972 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
@@ -5,5 +5,7 @@ import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
 import ovh.herisson.Clyde.Tables.User;
 
 public interface ResearcherRepository extends CrudRepository<Researcher,Long> {
-    public Researcher findByUser(User user);
+    Researcher findByUser(User user);
+
+    Researcher findById(long id);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index e7ca875..60a8c3e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -100,7 +100,27 @@ public class ResearchesService {
         articleRepo.save(research);
     }
 
-    public void delete(Research research) {
+    public void deleteResearch(Research research) {
         articleRepo.delete(research);
     }
+
+    public Iterable<Research> getAllResearches() {
+        return articleRepo.findAll();
+    }
+
+    public Researcher saveResearcher(Researcher researcher) {
+       return researcherRepo.save(researcher);
+    }
+
+    public Iterable<Researcher> getAllResearchers() {
+        return researcherRepo.findAll();
+    }
+
+    public Researcher getResearcherById(long id) {
+        return  researcherRepo.findById(id);
+    }
+
+    public void deleteResearcher(Researcher researcher) {
+       researcherRepo.delete(researcher);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
index 3d31056..3bf42a3 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
@@ -1,7 +1,7 @@
 package ovh.herisson.Clyde.Tables.ScientificPublications;
 
 /******************************************************
- * @file Article.java
+ * @file Research.java
  * @author Maxime Bartha
  * @scope Extension Publications scientifiques
  *
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
index 1b657ce..0b78245 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
@@ -1,17 +1,14 @@
 package ovh.herisson.Clyde.Tables.ScientificPublications;
 
 /******************************************************
- * @file ArticleCoAuthors
+ * @file ResearchCoAuthors
  * @author Maxime Bartha
  * @scope Extension Publications scientifiques
  *
  * Co-Authors List entity (will be accessed by Articles)
  *
  ******************************************************/
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -26,6 +23,10 @@ import org.hibernate.annotations.OnDeleteAction;
 @Entity
 public class ResearchCoAuthors {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    Long id;
+
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "Researcher")
     private Researcher coAuthor;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
index 23fea98..1da105c 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
@@ -19,15 +19,21 @@ import ovh.herisson.Clyde.Tables.User;
 @Getter
 @Setter
 @NoArgsConstructor
-@AllArgsConstructor
 @Entity
 public class Researcher {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
-    @OneToOne
+    @OneToOne(cascade=CascadeType.REMOVE, optional=true)
     private User user;
     private String orcidId;
     private String site;
-    private String Domain;
+    private String domain;
+
+    public Researcher(User user, String orcidId, String site, String domain){
+        this.user = user;
+        this.orcidId = orcidId;
+        this.site = site;
+        this.domain = domain;
+    }
 }

From 17cb969160f9b4a73d2d82d37bd3118db03ab47d Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Fri, 12 Apr 2024 01:56:18 +0200
Subject: [PATCH 28/66] added all endPoints

---
 .../Clyde/EndPoints/MockController.java       | 14 +++-
 .../ResearchController.java                   | 72 ++++++++++++++++++-
 .../ResearcherController.java                 | 19 ++++-
 .../ResearchCoAuthorsRepository.java          |  6 +-
 .../ResearchesService.java                    | 64 +++++++++++++++--
 .../ResearchCoAuthors.java                    |  6 +-
 6 files changed, 169 insertions(+), 12 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 422cded..411aa92 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -113,9 +113,21 @@ public class MockController {
         Researcher output = researchesService.saveResearcher(jojoResearcherAccount);
 
         Research jojoResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(),
-                PaperType.Article,null,null,"english",
+                PaperType.Article,"here",null,"english",
                 Access.OpenSource,"IT","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
 
+        Research restrictedResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(),
+                PaperType.Article,"restricted",null,"english",
+                Access.Restricted,"Restricted","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
+
+        Research privateResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(),
+                PaperType.Article,"private",null,"english",
+                Access.Private,"private","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
+
+
+        researchesService.saveResearch(restrictedResearch);
+        researchesService.saveResearch(privateResearch);
+
         researchesService.saveResearch(jojoResearch);
     }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index cab79d1..692b4cc 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -5,6 +5,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.DTO.ScientificPublications.ResearchDTO;
+import ovh.herisson.Clyde.DTO.ScientificPublications.ResearcherDTO;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
@@ -36,7 +37,7 @@ public class ResearchController {
         Research research = researchesServ.getResearchById(id);
 
         if (research == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
 
         if (researchesServ.hasNoAccessTo(research,authServ.getUserFromToken(token))){
            research.setPdfLocation(null);
@@ -81,7 +82,7 @@ public class ResearchController {
         Researcher researcher = researchesServ.getResearcherByUser(authServ.getUserFromToken(token));
 
         if (research == null)
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
 
         if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token) &&
                 researcher != research.getAuthor()) {
@@ -92,6 +93,9 @@ public class ResearchController {
       return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    /** Only Admin, Secretary and author can delete a research
+     *
+     */
     @DeleteMapping("/research/{id}")
     public ResponseEntity<String> deleteResearch(@RequestHeader("Authorization") String token, @PathVariable long id){
 
@@ -106,7 +110,69 @@ public class ResearchController {
             return new UnauthorizedResponse<>(null);
         }
 
-        researchesServ.delete(research);
+        researchesServ.deleteResearch(research);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+
+    /////////////
+    // Co-authors Part
+
+    @GetMapping("/research/{id}/co-authors")
+    public  ResponseEntity<Iterable<ResearcherDTO>> getCoAuthors(@PathVariable long id){
+       Research research = researchesServ.getResearchById(id);
+
+       if (research == null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+
+       Iterable<Researcher> researchers= researchesServ.getCoAuthors(research);
+       ArrayList<ResearcherDTO> toReturn = new ArrayList<>();
+
+       for (Researcher researcher: researchers){
+           toReturn.add(ResearcherDTO.construct(researcher));
+       }
+       return new ResponseEntity<>(toReturn,HttpStatus.OK);
+    }
+
+    @PostMapping("/research/{id}/co-authors")
+    public ResponseEntity<Iterable<ResearcherDTO>> postCoAuthor(@RequestHeader("Authorization") String token,
+                                                              @RequestBody Iterable<Long> researchersId,
+                                                              @PathVariable long id)
+    {
+        Research research = researchesServ.getResearchById(id);
+        if (research == null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+
+        if (authServ.isNotIn(new Role[]{Role.Admin}, token) || research.getAuthor() != researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
+            return new UnauthorizedResponse<>(null);
+
+        if (!researchesServ.saveCoAuthors(researchersId,research))
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        ArrayList<ResearcherDTO> toReturn = new ArrayList<>();
+        for (Long reId: researchersId){
+            toReturn.add(ResearcherDTO.construct(researchesServ.getResearcherById(reId)));
+        }
+
+        return  new ResponseEntity<>(toReturn,HttpStatus.OK);
+    }
+
+    /** deletes the co-author with *coAuthorId* from the research with the *researchId*
+     */
+    @DeleteMapping("/research/{researchId}/co-author/{coAuthorId}")
+    public ResponseEntity<String> deleteCoAuthor(@RequestHeader("Authorization") String token,
+                                                 @PathVariable long researchId,
+                                                 @PathVariable long coAuthorId)
+    {
+        Research research = researchesServ.getResearchById(researchId);
+        Researcher coAuthor = researchesServ.getResearcherById(coAuthorId);
+
+        if (authServ.isNotIn(new Role[]{Role.Admin}, token) || research.getAuthor() != researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
+            return new UnauthorizedResponse<>(null);
+
+        if (coAuthor == null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+
+       if (!researchesServ.deleteCoAuthor(research, coAuthor))
+           return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
         return new ResponseEntity<>(HttpStatus.OK);
     }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
index bb210f6..9108691 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
@@ -12,6 +12,7 @@ import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
 
 import java.util.ArrayList;
+import java.util.Map;
 
 @RestController
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
@@ -53,6 +54,23 @@ public class ResearcherController {
         return new ResponseEntity<>(ResearcherDTO.construct(posted), HttpStatus.OK);
     }
 
+    @PatchMapping("/researcher/{id}")
+    public ResponseEntity<ResearcherDTO> patchResearcher(@RequestHeader("Authorization") String token,
+                                                         @PathVariable long id,
+                                                         @RequestBody Map<String ,Object> updates){
+
+        Researcher researcher = researchesServ.getResearcherById(id); //todo check authorization j'ai pu patch sans le bon token
+        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin}, token)
+                && researcher == researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
+            return new UnauthorizedResponse<>(null);
+
+        if (researcher == null) return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        researchesServ.modifyResearcherData(researcher,updates);
+
+        return new ResponseEntity<>(ResearcherDTO.construct(researcher),HttpStatus.OK);
+    }
+
     @DeleteMapping("/researcher/{id}")
     public ResponseEntity<String> deleteResearcher(@RequestHeader ("Authorization") String token, @PathVariable long id){
        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token))
@@ -61,5 +79,4 @@ public class ResearcherController {
        researchesServ.deleteResearcher(researchesServ.getResearcherById(id));
        return new ResponseEntity<>(HttpStatus.OK);
     }
-
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
index 70eb16e..51f25fb 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
@@ -10,5 +10,9 @@ import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
 
 public interface ResearchCoAuthorsRepository extends CrudRepository<ResearchCoAuthors,Long> {
    @Query("select distinct rca.coAuthor from ResearchCoAuthors rca where rca.research = ?1")
-   public Iterable<Researcher> findResearchCoAuthors(Research research);
+   Iterable<Researcher> findResearchCoAuthors(Research research);
+
+
+   @Query("select rca from ResearchCoAuthors rca where rca.research = ?1 and rca.coAuthor =?2")
+  ResearchCoAuthors findResearchCoAuthors(Research research, Researcher researcher);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index 60a8c3e..a48fb1c 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -6,12 +6,10 @@ import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchCoAuthorsR
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchRepository;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearcherRepository;
 import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.ScientificPublications.Access;
-import ovh.herisson.Clyde.Tables.ScientificPublications.PaperType;
-import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
-import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+import ovh.herisson.Clyde.Tables.ScientificPublications.*;
 import ovh.herisson.Clyde.Tables.User;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Map;
 
@@ -46,11 +44,14 @@ public class ResearchesService {
 
     public boolean hasNoAccessTo(Research research, User user){
 
+
         if (research.getAccess() == Access.OpenSource) return false; // if the access is open source even non-users can see it
         if (user == null) return true; // else you need at least to be a user
 
+        if (user.getRole() == Role.Admin) return false;
+
         if (research.getAccess() == Access.Restricted &&
-                user.getRole() == Role.Admin || user.getRole() == Role.Secretary ||
+                user.getRole() == Role.Secretary ||
                 user.getRole() == Role.Teacher || user.getRole() == Role.InscriptionService)
             return false; // if the access is restricted only the staff member (above) can access the research
 
@@ -123,4 +124,57 @@ public class ResearchesService {
     public void deleteResearcher(Researcher researcher) {
        researcherRepo.delete(researcher);
     }
+
+    public boolean saveCoAuthors(Iterable<Long> researchersId, Research research) {
+
+        if (researchersId == null) return false;
+
+        ArrayList<Researcher> toAdd = new ArrayList<>();
+        for (long researcherId : researchersId){
+            Researcher researcher= researcherRepo.findById(researcherId);
+            if (research== null){
+                return false;
+            }
+            if (!toAdd.contains(researcher))
+            {
+                toAdd.add(researcher);
+            }
+        }
+        for (Researcher researcher: toAdd){
+            researchCoAuthorsRepo.save(new ResearchCoAuthors(researcher,research));
+        }
+        return true;
+    }
+
+    public Iterable<Researcher> getCoAuthors(Research research) {
+        return researchCoAuthorsRepo.findResearchCoAuthors(research);
+    }
+
+    public boolean deleteCoAuthor(Research research,Researcher coAuthor) {
+        ResearchCoAuthors result = researchCoAuthorsRepo.findResearchCoAuthors(research,coAuthor);
+
+        if (result ==null)
+            return false;
+
+        researchCoAuthorsRepo.delete(result);
+        return true;
+    }
+
+    public void modifyResearcherData(Researcher researcher, Map<String, Object> updates) {
+
+        for (Map.Entry<String, Object> entry : updates.entrySet()){
+            switch (entry.getKey()){
+                case "orcidId":
+                    researcher.setOrcidId((String) entry.getValue());
+                    break;
+                case "domain":
+                    researcher.setDomain((String) entry.getValue());
+                    break;
+                case "site":
+                    researcher.setSite((String) entry.getValue());
+                    break;
+           }
+        }
+        researcherRepo.save(researcher);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
index 0b78245..dbc293d 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
@@ -19,7 +19,6 @@ import org.hibernate.annotations.OnDeleteAction;
 @Getter
 @Setter
 @NoArgsConstructor
-@AllArgsConstructor
 @Entity
 public class ResearchCoAuthors {
 
@@ -35,4 +34,9 @@ public class ResearchCoAuthors {
     @OnDelete(action = OnDeleteAction.CASCADE)
     @JoinColumn(name = "Article")
     private Research research;
+
+    public ResearchCoAuthors(Researcher coAuthor, Research research){
+        this.coAuthor = coAuthor;
+        this.research = research;
+    }
 }

From 1498cfa11ed8d9c5afb7114e730854a7c7fbfe6e Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 14 Apr 2024 12:34:04 +0200
Subject: [PATCH 29/66] added comments and fixed logic issue

---
 .../ScientificPublications/ResearchDTO.java   |  7 +++++
 .../ScientificPublications/ResearcherDTO.java |  7 +++++
 .../ResearchController.java                   | 31 +++++++++++++++++++
 .../ResearcherController.java                 | 15 +++++++--
 .../ResearchesService.java                    |  2 ++
 5 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
index 2c35a82..92605be 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.DTO.ScientificPublications;
 
+/******************************************************
+ * @file ResearchDTO.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Research format to return to front (without author's password)
+ ******************************************************/
 
 import lombok.Data;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Access;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java
index c9eebd4..4dffff0 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearcherDTO.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.DTO.ScientificPublications;
 
+/******************************************************
+ * @file ResearcherDTO.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Researcher Format to return to front (without user password)
+ ******************************************************/
 import lombok.Data;
 import ovh.herisson.Clyde.Services.ProtectionService;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index 692b4cc..c9b6270 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -1,5 +1,13 @@
 package ovh.herisson.Clyde.EndPoints.ScientificPublications;
 
+/******************************************************
+ * @file ResearchController.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * API class for the researches
+ ******************************************************/
+
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -46,6 +54,10 @@ public class ResearchController {
         return new ResponseEntity<>(ResearchDTO.construct(research), HttpStatus.OK);
     }
 
+    /**
+     * @param token  used to know if the user can download or not the research pdf
+     * @return every research
+     */
     @GetMapping("/researches")
     public ResponseEntity<Iterable<ResearchDTO>> getResearches(@RequestHeader(value = "Authorization",required = false) String token){
         Iterable<Research> researches = researchesServ.getAllResearches();
@@ -61,6 +73,10 @@ public class ResearchController {
         return new ResponseEntity<>(toReturnResearches,HttpStatus.OK);
     }
 
+    /** post a new research
+     *
+     * @return the research saved
+     */
     @PostMapping("/research")
     public ResponseEntity<Research> postResearch(@RequestHeader("Authorization") String token, @RequestBody Research research){
 
@@ -72,6 +88,9 @@ public class ResearchController {
         return new ResponseEntity<>(researchesServ.saveResearch(research), HttpStatus.OK);
     }
 
+    /** post updates to the research
+     *
+     */
     @PatchMapping("/research/{id}")
     public ResponseEntity<String> patchResearch(@RequestHeader("Authorization") String token,
                                           @RequestBody Map<String,Object> updates,
@@ -118,6 +137,11 @@ public class ResearchController {
     /////////////
     // Co-authors Part
 
+    /** get all the co-authors in a research
+     *
+     * @param id the research id
+     * @return all the co-authors associated with the research
+     */
     @GetMapping("/research/{id}/co-authors")
     public  ResponseEntity<Iterable<ResearcherDTO>> getCoAuthors(@PathVariable long id){
        Research research = researchesServ.getResearchById(id);
@@ -133,6 +157,13 @@ public class ResearchController {
        return new ResponseEntity<>(toReturn,HttpStatus.OK);
     }
 
+    /** post co-authors to the research
+     *
+     * @param token the Authorization header
+     * @param researchersId the co-authors ids
+     * @param id the research id
+     * @return the added researchers
+     */
     @PostMapping("/research/{id}/co-authors")
     public ResponseEntity<Iterable<ResearcherDTO>> postCoAuthor(@RequestHeader("Authorization") String token,
                                                               @RequestBody Iterable<Long> researchersId,
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
index 9108691..d052686 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.EndPoints.ScientificPublications;
 
+/******************************************************
+ * @file ResearcherController.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * API class for the researchers
+ ******************************************************/
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -51,7 +58,9 @@ public class ResearcherController {
 
         Researcher posted = researchesServ.saveResearcher(researcher);
 
-        return new ResponseEntity<>(ResearcherDTO.construct(posted), HttpStatus.OK);
+        if (posted == null) return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+
+        return new ResponseEntity<>(ResearcherDTO.construct(posted), HttpStatus.CREATED);
     }
 
     @PatchMapping("/researcher/{id}")
@@ -59,9 +68,9 @@ public class ResearcherController {
                                                          @PathVariable long id,
                                                          @RequestBody Map<String ,Object> updates){
 
-        Researcher researcher = researchesServ.getResearcherById(id); //todo check authorization j'ai pu patch sans le bon token
+        Researcher researcher = researchesServ.getResearcherById(id);
         if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin}, token)
-                && researcher == researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
+                || researcher == researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
             return new UnauthorizedResponse<>(null);
 
         if (researcher == null) return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index a48fb1c..51f7708 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -110,6 +110,8 @@ public class ResearchesService {
     }
 
     public Researcher saveResearcher(Researcher researcher) {
+
+        if (researcherRepo.findByUser(researcher.getUser()) != null) return null;
        return researcherRepo.save(researcher);
     }
 

From eacdf8d47a94b5b2003cc84a2cdc6c9a3d263cf4 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 14 Apr 2024 23:29:51 +0200
Subject: [PATCH 30/66] stats Service and endpoint todo: statsRepository

---
 .../Clyde/EndPoints/MockController.java       |  4 +-
 .../StatController.java                       | 40 +++++++++++++++++++
 .../ResearchRepository.java                   |  6 +++
 .../StatsRepository.java                      | 27 +++++++++++++
 .../StatisticsService.java                    | 37 +++++++++++++++++
 .../ScientificPublications/Research.java      |  1 -
 6 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
 create mode 100644 backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java

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 411aa92..05f939f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -112,11 +112,11 @@ public class MockController {
 
         Researcher output = researchesService.saveResearcher(jojoResearcherAccount);
 
-        Research jojoResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(),
+        Research jojoResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(0),
                 PaperType.Article,"here",null,"english",
                 Access.OpenSource,"IT","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
 
-        Research restrictedResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(),
+        Research restrictedResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(1111111111),
                 PaperType.Article,"restricted",null,"english",
                 Access.Restricted,"Restricted","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java
new file mode 100644
index 0000000..3809d29
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java
@@ -0,0 +1,40 @@
+package ovh.herisson.Clyde.EndPoints.ScientificPublications;
+
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
+import ovh.herisson.Clyde.Services.ScientificPublications.StatisticsService;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
+import java.util.Map;
+
+@RestController
+@CrossOrigin(originPatterns = "*", allowCredentials = "true")
+@AllArgsConstructor
+public class StatController {
+
+
+    private StatisticsService statServ;
+    private ResearchesService researchesServ;
+
+    /** returns all the statistics in a 2D array
+     *
+     * @param id the researcher's id
+     * @return all the stats in a 2D array
+     */
+    @GetMapping("/stats/{id}")
+    public ResponseEntity<Iterable<Iterable<Map<String, Integer>>>> getStat(@PathVariable Long id){
+
+        Researcher researcher = researchesServ.getResearcherById(id);
+        if (researcher == null) return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        Iterable<Iterable<Map<String,Integer>>> stats = statServ.generateStats(researcher);
+
+        if (stats == null) return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        return new ResponseEntity<>(stats,HttpStatus.OK);
+
+    }
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
index 8c100c6..9952212 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
@@ -2,8 +2,14 @@ package ovh.herisson.Clyde.Repositories.ScientificPublications;
 
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
+import java.util.Map;
 
 public interface ResearchRepository extends CrudRepository<Research,Long> {
 
     Research findById(long id);
+
+    Iterable<Research> findByAuthor(Researcher author);
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
new file mode 100644
index 0000000..c3eedd4
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
@@ -0,0 +1,27 @@
+package ovh.herisson.Clyde.Repositories.ScientificPublications;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+
+import java.util.Map;
+
+public interface StatsRepository extends CrudRepository<Research,Long> {
+
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r group by to_char(r.releaseDate, 'month')")
+    Iterable<Map<String ,Integer>> viewsByMonths();
+
+
+    Iterable<Map<String ,Integer>> viewsByYears();
+    Iterable<Map<String ,Integer>> viewsByTopics();
+    Iterable<Map<String ,Integer>> coAuthorByMonths();
+    Iterable<Map<String ,Integer>> coAuthorsByTopics();
+    Iterable<Map<String ,Integer>> languageByTopics();
+    Iterable<Map<String ,Integer>> languageByYears();
+    Iterable<Map<String ,Integer>> languageByMonths();
+    Iterable<Map<String ,Integer>> researchesByYears();
+    Iterable<Map<String ,Integer>> researchesByTopics();
+    Iterable<Map<String ,Integer>> researchesByMonth();
+
+
+}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
new file mode 100644
index 0000000..d547943
--- /dev/null
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
@@ -0,0 +1,37 @@
+package ovh.herisson.Clyde.Services.ScientificPublications;
+
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchRepository;
+import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearcherRepository;
+import ovh.herisson.Clyde.Repositories.ScientificPublications.StatsRepository;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
+
+import java.security.Key;
+import java.util.*;
+
+@Service
+@AllArgsConstructor
+public class StatisticsService {
+
+
+    private ResearchRepository articleRepo;
+    private StatsRepository statsRepo;
+
+
+    public Iterable<Iterable<Map<String, Integer>>> generateStats(Researcher researcher){
+
+        Iterable<Research> researches = articleRepo.findByAuthor(researcher);
+
+        if (researches == null) return null;
+
+
+        ArrayList<Iterable<Map<String,Integer>>> toReturn = new ArrayList<>();
+
+        toReturn.add(statsRepo.viewsByMonths());
+
+
+        return toReturn;
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
index 3bf42a3..f2fa8ff 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
@@ -32,7 +32,6 @@ public class Research {
     @JoinColumn(name ="Researcher")
     private Researcher author;
 
-    @CreationTimestamp
     @Column(nullable = false)
     private Date releaseDate;
 

From 63d0087d0c7883db8da05c8bfcbfcafd2fcca591 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Mon, 15 Apr 2024 23:35:05 +0200
Subject: [PATCH 31/66] junction front - back

---
 .../Clyde/EndPoints/MockController.java       | 10 +--
 .../ResearchController.java                   | 19 +++++
 .../ResearcherRepository.java                 |  5 ++
 .../StatsRepository.java                      |  4 +-
 .../ResearchesService.java                    |  7 ++
 .../FilterComponent.vue                       | 83 +++++++++++++++----
 .../ResearchComponent.vue                     | 35 ++++++--
 .../ResearcherProfile.vue                     | 70 +++++++---------
 .../ResearcherProfile.js                      | 11 +++
 9 files changed, 176 insertions(+), 68 deletions(-)
 create mode 100644 frontend/src/rest/ScientificPublications/ResearcherProfile.js

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 05f939f..166e64b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -114,15 +114,15 @@ public class MockController {
 
         Research jojoResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(0),
                 PaperType.Article,"here",null,"english",
-                Access.OpenSource,"IT","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
+                Access.OpenSource,"IT","This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms");
 
-        Research restrictedResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(1111111111),
+        Research restrictedResearch = new Research("just another Name",output,new Date(1111111111),
                 PaperType.Article,"restricted",null,"english",
-                Access.Restricted,"Restricted","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
+                Access.Restricted,"Restricted","This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms");
 
-        Research privateResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(),
+        Research privateResearch = new Research("the great Potato War",output,new Date(),
                 PaperType.Article,"private",null,"english",
-                Access.Private,"private","This Article's title speak for itself\n We'll discuss about advanced Graph search Algorithms");
+                Access.Private,"private","This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms");
 
 
         researchesService.saveResearch(restrictedResearch);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index c9b6270..a29917e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -73,6 +73,25 @@ public class ResearchController {
         return new ResponseEntity<>(toReturnResearches,HttpStatus.OK);
     }
 
+
+    @GetMapping("/researches/{id}")
+    public ResponseEntity<Iterable<ResearchDTO>> getResearchesFromResearcher(@RequestHeader(value = "Authorization",required = false) String token,
+                                                                             @PathVariable Long id
+    ){
+        Iterable<Research> researches = researchesServ.getResearchesByAuthor(id);
+        if (researches == null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+
+        ArrayList<ResearchDTO> toReturnResearches = new ArrayList<>();
+
+        for (Research research: researches){
+            if (researchesServ.hasNoAccessTo(research,authServ.getUserFromToken(token))){
+                research.setPdfLocation(null);
+            }
+            toReturnResearches.add(ResearchDTO.construct(research));
+        }
+        return new ResponseEntity<>(toReturnResearches,HttpStatus.OK);
+    }
+
     /** post a new research
      *
      * @return the research saved
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
index a143972..5863bc4 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
@@ -1,6 +1,8 @@
 package ovh.herisson.Clyde.Repositories.ScientificPublications;
 
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
 import ovh.herisson.Clyde.Tables.User;
 
@@ -8,4 +10,7 @@ public interface ResearcherRepository extends CrudRepository<Researcher,Long> {
     Researcher findByUser(User user);
 
     Researcher findById(long id);
+
+    @Query("select r from Research r where r.author = ?1")
+    Iterable<Research> findAllByAuthorId(Researcher author);
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
index c3eedd4..ae025ce 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
@@ -11,7 +11,7 @@ public interface StatsRepository extends CrudRepository<Research,Long> {
     @Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> viewsByMonths();
 
-
+/**
     Iterable<Map<String ,Integer>> viewsByYears();
     Iterable<Map<String ,Integer>> viewsByTopics();
     Iterable<Map<String ,Integer>> coAuthorByMonths();
@@ -22,6 +22,6 @@ public interface StatsRepository extends CrudRepository<Research,Long> {
     Iterable<Map<String ,Integer>> researchesByYears();
     Iterable<Map<String ,Integer>> researchesByTopics();
     Iterable<Map<String ,Integer>> researchesByMonth();
-
+**/
 
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index 51f7708..213c738 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -42,6 +42,13 @@ public class ResearchesService {
         return articleRepo.findById(id);
     }
 
+    public Iterable<Research> getResearchesByAuthor(long authorId){
+        Researcher researcher = researcherRepo.findById(authorId);
+        if (researcher == null) return null;
+
+        return researcherRepo.findAllByAuthorId(researcher);
+    }
+
     public boolean hasNoAccessTo(Research research, User user){
 
 
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 534fd0c..238a31d 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -7,18 +7,71 @@
 <script setup>
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
+import {w} from "../../../dist/assets/_plugin-vue_export-helper-Bvj9NrzX.js";
 let checked = ref([])
+const yearList = ref([])
+const monthList = ref([])
+const accessList = ref([])
+const languageList = ref([])
+const domainList = ref([])
+const paperTypeList = ref([])
 
 const props = defineProps({
   isOpen: Boolean,
+  allArticles: ref([Object])
 });
-const example = ["A","B", "Lorem Ipsum AAAAAAAAAAAAAAAAAAA",
-  "H",
-  "H",
-  "H",
-  "H",
-  "H",
-]
+
+for (let i=0;i< props.allArticles.length;i++) {
+  let r = props.allArticles[i];
+  let year = r.releaseDate.split("-")[0]
+  let month = r.releaseDate.split("-")[1]
+
+  if (!yearList.value.includes(year)) yearList.value.push(year);
+
+  if (!monthList.value.includes(month)) monthList.value.push(month);
+
+  if (!accessList.value.includes(r.access)) accessList.value.push(r.access);
+
+  if (!languageList.value.includes(r.language)) languageList.value.push(r.language);
+
+  if (!domainList.value.includes(r.domain)) domainList.value.push(r.domain);
+
+  if (!paperTypeList.value.includes(r.paperType)) paperTypeList.value.push(r.paperType);
+}
+function monthtoString(month){
+
+  switch (month){
+    case "01":
+      return "january"
+    case "02":
+      return "february"
+    case "03":
+      return "march"
+    case "04":
+      return "april"
+    case "05":
+      return "may"
+    case "06":
+      return "june"
+    case "07":
+      return "july"
+    case "08":
+      return "august"
+    case "09":
+      return "september"
+    case "10":
+      return "november"
+    case "11":
+      return "october"
+    case "12":
+      return "december"
+    default:
+      return "unknown"
+  }
+}
+
+
+
 const emit = defineEmits(["modal-close"]);
 
 const target = ref(null)
@@ -31,15 +84,15 @@ onClickOutside(target, ()=>emit('modal-close'))
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div id="filterGrid">
-          <div> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> example :<ul class="checkers"> <li v-for="n in example"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="checked"> {{monthtoString(n)}} </li> </ul> </div>
+          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
       </div>
         <div id="submit">
-          <button @click.stop="emit('modal-close')">Submit</button>
+          <button @click.stop="emit('modal-close', 'submit')">Submit</button>
         </div>
       </div>
   </div>
@@ -102,4 +155,4 @@ onClickOutside(target, ()=>emit('modal-close'))
   background: rgba(191, 64, 191);
 }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index b5d2fc9..4615c90 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -8,16 +8,20 @@
 <script setup>
 import {ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-let checked = ref([])
 
 const props = defineProps({
   isOpen: Boolean,
+  article: ref(Object)
 });
-const example = ["Title","Author",["Co-author1", "co-Authors2"],
-  " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
-  "language",
-    "access",
-]
+function format(date){
+  let split = date.split("-")
+  let month = split[1]
+  let day = split[2].split("T")[0]
+  let year = split[0]
+  return day +"/"+ month +"/"+ year
+}
+
+
 const emit = defineEmits(["modal-close"]);
 
 const target = ref(null)
@@ -29,8 +33,19 @@ onClickOutside(target, ()=>emit('modal-close'))
   <div v-if="isOpen" class="modal-mask">
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
-       <ul v-for="n in example"><li>{{n}}</li></ul>
-        <div id="downloads">
+       <ul>
+         <li>Article Id : {{article.id}}</li>
+         <li>Title : {{article.title}}</li>
+         <li>Author : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
+         <li>Summary : {{article.summary}}</li>
+         <li>ReleaseDate: {{format(article.releaseDate)}}</li>
+         <li>Language : {{article.language}}</li>
+         <li>PaperType : {{article.paperType}}</li>
+         <li>Domain : {{article.domain}}</li>
+         <li>Access : {{article.access}}</li>
+
+       </ul>
+        <div id="downloads" v-if="article.pdfLocation !== null">
           <button @click.stop="emit('modal-close')">Download BibTex</button>
           <button @click.stop="emit('modal-close')">Download Research</button>
         </div>
@@ -59,6 +74,10 @@ onClickOutside(target, ()=>emit('modal-close'))
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
 }
 
+.modal-container ul{
+  margin-top: 9px;
+}
+
 
 #downloads {
   text-align: end;
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 766ec11..26f9e3e 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -9,13 +9,23 @@
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
+import {fetchResearcher, fetchResearches} from "@/rest/ScientificPublications/ResearcherProfile.js";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
+const articleToDisplay = ref(Object)
+const filters = ref([""])
+const researchList = ref(await fetchResearches(1))
 let chart;
 
+
+const props = defineProps({
+  researcher: ref(Object),
+  filters: ref([""]),
+});
+
 const openFilter = () => {
   isFilterOpened.value = true;
 };
@@ -23,14 +33,15 @@ const closeFilter = () => {
   isFilterOpened.value = false;
 };
 const submitFilters = ()=>{
-  // call only with those filters the get
 }
 const openResearch = (article) => {
   isResearchOpened.value = true;
+  articleToDisplay.value = article;
 }
 
 const closeResearch = () => {
   isResearchOpened.value =false;
+  articleToDisplay.value = null;
 }
 
 const downloadBibTex = (research) => {
@@ -40,25 +51,14 @@ const downloadBibTex = (research) => {
 const downloadArticle = (research) => {
  //todo
 }
+//todo changer dynamiquement le 1 ici en fct de sur quel profil on est
+const  researcher = ref(await fetchResearcher(1))
 
-
-const researchList = [
-  ["The Great Potato War Lorem Ipsum aeaDq Terelumni ","Author",["Co-author1", "co-Authors2"],
-  " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
-  "language",
-    "access",
-  ],
-  ["The First Ever Paper","Author",["Co-author1", "co-Authors2"],
-    " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
-    "language",
-    "access",
-  ],
-  ["the atomic disintegration of particular radioactive cells","Author",["Co-author1", "co-Authors2"],
-    " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum ex tempor leo pulvinar, vitae imperdiet leo pellentesque. Aenean aliquam, ante at tempus sagittis, lorem leo feugiat felis, eget vestibulum tortor est nec libero. Cras sit amet venenatis velit, at rhoncus est. Cras id sem placerat, cursus sem et, aliquam felis. Nullam mi nunc, laoreet eget rutrum ac, blandit nec lorem. Duis fermentum aliquet tortor ac tristique. Aenean ac sagittis nulla, at auctor dolor. Vivamus et neque sodales, vestibulum dolor et, posuere urna. Pellentesque ut elit metus. Cras velit lectus, luctus auctor interdum eu, aliquam nec est. Donec elementum nisl sit amet nibh aliquam ultricies. Nullam felis orci, suscipit eu tincidunt pretium, euismod vel sem. Duis eget vehicula neque, nec gravida leo. Cras pellentesque arcu quis justo lobortis, ut semper massa rhoncus. Quisque sagittis dignissim congue. Nullam tortor ligula, mattis vel cursus id, pretium non lacus.",
-    "language",
-    "access",
-  ],
-]
+function downloadCoAuthors(){
+  const data = JSON.stringify(researcher.value);
+  const blob = new Blob([data], {type:"application/json"});
+  return URL.createObjectURL(blob);
+}
 
 
 const jsonMockViewsByYears= [
@@ -71,13 +71,9 @@ const jsonMockViewsByYears= [
 
 function searchInList(list, searchInput) {
   let retList = []
-  if (searchInput === ""){
-    list.forEach(r => retList.push(r.slice(0, 2)))
-    return retList
-  }
   for (let i = 0; i < list.length; i++) {
-    if (lDistance(list[i][0], searchInput) < 10 || list[i][0].toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
-      retList.push(list[i].slice(0,2))
+    if (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
+      retList.push(list[i])
     }
   }
   return retList
@@ -138,22 +134,20 @@ function update(){
 
 <template>
   <div id="main">
-    <FilterComponent :isOpen="isFilterOpened" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
-    <ArticleComponent :isOpen="isResearchOpened" @modal-close="closeResearch"></ArticleComponent>
+    <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
+    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" @modal-close="closeResearch"></ArticleComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
     <div id="researcherInfos">
-      <div class="surrounded">John Doe</div>
-      <div class="surrounded">Orcid : 12144-2144-12336-B</div>
-      <div class="surrounded">Email : John.Doe@umons.ac.be</div>
-
+      <div class="surrounded">{{researcher.user.lastName}} {{researcher.user.firstName}}</div>
+      <div class="surrounded">Orcid : {{researcher.orcidId}}</div>
+      <div class="surrounded">Email : {{researcher.user.email}}</div>
       <div class="surrounded">
-        site :
-        <a href="http://localhost:5173" style="color: #007aff">here</a>
+        site : <a :href=researcher.site style="color: #007aff"> {{researcher.site}}</a>
       </div>
-      <div class="surrounded">Domain : physics, IT</div>
-      <div id="coAuthorList" class="surrounded">Co-authors list : D</div>
+      <div class="surrounded">Domain : {{researcher.domain}}</div>
+      <div id="coAuthorList" class="surrounded">Co-authors list : <a :href=downloadCoAuthors() download="coAuthors.json"> here </a></div>
     </div>
     <div id="stats">
       <div class="surrounded">
@@ -184,9 +178,9 @@ function update(){
       </div>
       <ul id="researchUL">
         <li id="researchLi" v-for="n in searchInList(researchList,input)">
-          <div class="vl"> {{n[0]}}</div>
-          <div class="vl"> {{n[1]}}</div>
-         <a @click="openResearch"> MoreInfo  </a></li>
+          <div class="vl"> {{n.title}}</div>
+          <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
+         <a @click="openResearch(n)"> MoreInfo  </a></li>
       </ul>
     </div>
   </div>
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
new file mode 100644
index 0000000..3214251
--- /dev/null
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -0,0 +1,11 @@
+import { restGet, restPost, restDelete, restPatch } from '../restConsumer.js'
+
+export async function fetchResearcher(id){
+    return restGet("/researcher/" + id)
+}
+
+export async function fetchResearches(id){
+    return restGet("/researches/" + id)
+}
+
+

From f184de21a84e95cad2c9c3c8ae79782fdff6da69 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 16 Apr 2024 11:24:28 +0200
Subject: [PATCH 32/66] translate month number to name

---
 frontend/src/Apps/ScientificPublications/FilterComponent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 238a31d..f2cb363 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -38,7 +38,7 @@ for (let i=0;i< props.allArticles.length;i++) {
 
   if (!paperTypeList.value.includes(r.paperType)) paperTypeList.value.push(r.paperType);
 }
-function monthtoString(month){
+function monthToString(month){
 
   switch (month){
     case "01":
@@ -87,7 +87,7 @@ onClickOutside(target, ()=>emit('modal-close'))
           <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
           <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
           <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="checked"> {{monthtoString(n)}} </li> </ul> </div>
+          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="checked"> {{monthToString(n)}} </li> </ul> </div>
           <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
           <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
       </div>

From 87b02af68e7117c64e22f9593bbde10b3ab48465 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 16 Apr 2024 11:54:11 +0200
Subject: [PATCH 33/66] added stats SQL queries

---
 .../StatsRepository.java                      | 21 +++++++++++++++----
 .../StatisticsService.java                    |  9 ++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
index ae025ce..95f4da6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
@@ -11,17 +11,30 @@ public interface StatsRepository extends CrudRepository<Research,Long> {
     @Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> viewsByMonths();
 
-/**
+    @Query("select new map(to_char(r.releaseDate,'year') as label, sum  (r.views) as y) from Research r group by to_char(r.releaseDate,'year')")
     Iterable<Map<String ,Integer>> viewsByYears();
+
+
+    @Query("select new map(r.domain as label, sum(r.views) as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> viewsByTopics();
-    Iterable<Map<String ,Integer>> coAuthorByMonths();
-    Iterable<Map<String ,Integer>> coAuthorsByTopics();
+
+
+    @Query("select new map(r.domain as label, r.language as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> languageByTopics();
+
+    @Query("select new map(to_char(r.releaseDate,'year') as label,  r.language as y) from Research r group by to_char(r.releaseDate,'year')")
     Iterable<Map<String ,Integer>> languageByYears();
+
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, r.language as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> languageByMonths();
+
+    @Query("select new map(to_char(r.releaseDate,'year') as label, count(r) as y) from Research r group by to_char(r.releaseDate,'year')")
     Iterable<Map<String ,Integer>> researchesByYears();
+
+    @Query("select new map(r.domain as label, count(r) as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> researchesByTopics();
+
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(r) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> researchesByMonth();
-**/
 
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
index d547943..886285b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
@@ -29,8 +29,17 @@ public class StatisticsService {
 
         ArrayList<Iterable<Map<String,Integer>>> toReturn = new ArrayList<>();
 
+        toReturn.add(statsRepo.viewsByYears());
         toReturn.add(statsRepo.viewsByMonths());
+        toReturn.add(statsRepo.viewsByTopics());
 
+        toReturn.add(statsRepo.researchesByYears());
+        toReturn.add(statsRepo.researchesByMonth());
+        toReturn.add(statsRepo.researchesByTopics());
+
+        toReturn.add(statsRepo.languageByYears());
+        toReturn.add(statsRepo.languageByMonths());
+        toReturn.add(statsRepo.languageByTopics());
 
         return toReturn;
     }

From 388c53e47bab31c1bc21b52ead56c7e348037d2b Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 16 Apr 2024 11:54:53 +0200
Subject: [PATCH 34/66] fixed front

---
 .../Apps/ScientificPublications/ResearcherProfile.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 26f9e3e..eca4019 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -16,9 +16,13 @@ const statsBy = ref("");
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
-const filters = ref([""])
-const researchList = ref(await fetchResearches(1))
+const filters = ref([]);
+const researchList = ref(await fetchResearches(1));
 let chart;
+//todo changer dynamiquement le 1 ici en fct de sur quel profil on est
+const  researcher = ref(await fetchResearcher(1));
+
+
 
 
 const props = defineProps({
@@ -51,8 +55,6 @@ const downloadBibTex = (research) => {
 const downloadArticle = (research) => {
  //todo
 }
-//todo changer dynamiquement le 1 ici en fct de sur quel profil on est
-const  researcher = ref(await fetchResearcher(1))
 
 function downloadCoAuthors(){
   const data = JSON.stringify(researcher.value);
@@ -154,7 +156,6 @@ function update(){
         Stat type :
         <select @change="update()" id="stats-select" v-model="statsOf">
           <option value="views">Views</option>
-          <option value="co-authors">Co-authors</option>
           <option value="researches">Researches</option>
           <option value="language">Languages</option>
         </select>

From 821377a72f4b6c961e4e90f7d22bcbc5a4b71899 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 00:09:30 +0200
Subject: [PATCH 35/66] added addview and download PDF

---
 .../ResearchController.java                   | 12 +++++
 .../ResearchRepository.java                   |  2 +
 .../StatsRepository.java                      | 10 ++--
 .../ResearchesService.java                    | 10 ++++
 .../StatisticsService.java                    |  1 -
 .../ResearchComponent.vue                     |  9 ++--
 .../ResearcherProfile.vue                     | 52 ++++++++-----------
 .../ResearcherProfile.js                      |  6 +++
 8 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index a29917e..8a266a2 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -225,4 +225,16 @@ public class ResearchController {
 
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+
+    ///////
+    //views part
+    @PostMapping("/addView{url}")
+    public ResponseEntity<ResearchDTO> addView(@PathVariable String url){
+        Research research = researchesServ.getResearchByUrl(url);
+        if (research ==null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+
+        return new ResponseEntity<>(ResearchDTO.construct(researchesServ.addView(research)), HttpStatus.OK);
+    }
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
index 9952212..ace303d 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
@@ -12,4 +12,6 @@ public interface ResearchRepository extends CrudRepository<Research,Long> {
 
     Iterable<Research> findByAuthor(Researcher author);
 
+    Research findByPdfLocation(String url);
+
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
index 95f4da6..a228ac9 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
@@ -11,7 +11,7 @@ public interface StatsRepository extends CrudRepository<Research,Long> {
     @Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> viewsByMonths();
 
-    @Query("select new map(to_char(r.releaseDate,'year') as label, sum  (r.views) as y) from Research r group by to_char(r.releaseDate,'year')")
+    @Query("select new map(to_char(r.releaseDate,'YYYY') as label, sum  (r.views) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
     Iterable<Map<String ,Integer>> viewsByYears();
 
 
@@ -19,16 +19,16 @@ public interface StatsRepository extends CrudRepository<Research,Long> {
     Iterable<Map<String ,Integer>> viewsByTopics();
 
 
-    @Query("select new map(r.domain as label, r.language as y) from Research r group by r.domain")
+    @Query("select new map(r.domain as label, count(r.language) as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> languageByTopics();
 
-    @Query("select new map(to_char(r.releaseDate,'year') as label,  r.language as y) from Research r group by to_char(r.releaseDate,'year')")
+    @Query("select new map(to_char(r.releaseDate,'YYYY') as label,  count(r.language) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
     Iterable<Map<String ,Integer>> languageByYears();
 
-    @Query("select new map(to_char(r.releaseDate, 'month') as label, r.language as y) from Research r group by to_char(r.releaseDate, 'month')")
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(r.language) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> languageByMonths();
 
-    @Query("select new map(to_char(r.releaseDate,'year') as label, count(r) as y) from Research r group by to_char(r.releaseDate,'year')")
+    @Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(r) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
     Iterable<Map<String ,Integer>> researchesByYears();
 
     @Query("select new map(r.domain as label, count(r) as y) from Research r group by r.domain")
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index 213c738..0d601c7 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -2,6 +2,7 @@ package ovh.herisson.Clyde.Services.ScientificPublications;
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.DTO.ScientificPublications.ResearchDTO;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchCoAuthorsRepository;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchRepository;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearcherRepository;
@@ -186,4 +187,13 @@ public class ResearchesService {
         }
         researcherRepo.save(researcher);
     }
+
+    public Research getResearchByUrl(String url) {
+        return articleRepo.findByPdfLocation(url);
+    }
+
+    public Research addView(Research research) {
+        research.setViews(research.getViews()+1);
+        articleRepo.save(research);
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
index 886285b..90a60d2 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
@@ -40,7 +40,6 @@ public class StatisticsService {
         toReturn.add(statsRepo.languageByYears());
         toReturn.add(statsRepo.languageByMonths());
         toReturn.add(statsRepo.languageByTopics());
-
         return toReturn;
     }
 }
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 4615c90..48c27e8 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -22,7 +22,7 @@ function format(date){
 }
 
 
-const emit = defineEmits(["modal-close"]);
+const emit = defineEmits(["downloadPdf","downloadBibTex"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))
@@ -43,11 +43,12 @@ onClickOutside(target, ()=>emit('modal-close'))
          <li>PaperType : {{article.paperType}}</li>
          <li>Domain : {{article.domain}}</li>
          <li>Access : {{article.access}}</li>
-
        </ul>
         <div id="downloads" v-if="article.pdfLocation !== null">
-          <button @click.stop="emit('modal-close')">Download BibTex</button>
-          <button @click.stop="emit('modal-close')">Download Research</button>
+          <button @click.stop="emit('downloadBibTex')">Download BibTex</button>
+          <form method="get" :action=article.pdfLocation>
+            <button @click.stop="emit('downloadPdf', article)">Download Research</button>
+          </form>
         </div>
       </div>
     </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index eca4019..39180d3 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -9,7 +9,7 @@
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {fetchResearcher, fetchResearches} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {fetchResearcher, fetchResearches, fetchStats, addView} from "@/rest/ScientificPublications/ResearcherProfile.js";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
@@ -17,16 +17,15 @@ const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
 const filters = ref([]);
-const researchList = ref(await fetchResearches(1));
 let chart;
+
+const researchList = ref(await fetchResearches(1));
 //todo changer dynamiquement le 1 ici en fct de sur quel profil on est
-const  researcher = ref(await fetchResearcher(1));
-
-
-
+const researcher = ref(await fetchResearcher(1));
+const stats = ref(await fetchStats(1))
 
 const props = defineProps({
-  researcher: ref(Object),
+  researcherId: ref(), //int
   filters: ref([""]),
 });
 
@@ -53,7 +52,8 @@ const downloadBibTex = (research) => {
 }
 
 const downloadArticle = (research) => {
- //todo
+  addView(research.url)
+
 }
 
 function downloadCoAuthors(){
@@ -63,14 +63,6 @@ function downloadCoAuthors(){
 }
 
 
-const jsonMockViewsByYears= [
-  {label: "2004", y:4},
-  {label: "2005", y:99},
-  {label: "2007", y:555},
-  {label: "2009", y:22},
-  {label: "2011", y:1666},
-]
-
 function searchInList(list, searchInput) {
   let retList = []
   for (let i = 0; i < list.length; i++) {
@@ -121,23 +113,25 @@ const options = reactive({
 	});
 
 function update(){
-      options.title = {
-        fontColor: "white",
-        text: statsOf.value + " By "+ statsBy.value,
-      }
-      if (statsOf.value === "views" && statsBy.value === "years") {
-        options.data[0].dataPoints = jsonMockViewsByYears;
-      }
+  options.title = {
+    fontColor: "white",
+    text: statsOf.value + " By "+ statsBy.value,
+  }
+ const index = (0 ?statsOf.value === "views": 3 ? statsOf.value === "researches":6) + (0?statsBy.value ==="years":1?statsBy.value==="months":2)
 
-      options.title.text = statsOf.value + " By "+ statsBy.value;
-      chart.render()
-    }
+
+  options.data[0].dataPoints = stats.value[index]
+
+
+  options.title.text = statsOf.value + " By "+ statsBy.value;
+  chart.render();
+}
 </script>
 
 <template>
   <div id="main">
     <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" @modal-close="closeResearch"></ArticleComponent>
+    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" @modal-close="closeResearch" @downloadPdf="downloadArticle" @downloadBibTex="downloadBibTex"></ArticleComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
@@ -157,13 +151,13 @@ function update(){
         <select @change="update()" id="stats-select" v-model="statsOf">
           <option value="views">Views</option>
           <option value="researches">Researches</option>
-          <option value="language">Languages</option>
+          <option value="languages">Languages</option>
         </select>
       </div>
       <div class="surrounded">
         Class by:
         <select @change="update()" id="classed-select" v-model="statsBy">
-          <option selected="selected" value="years">Years</option>
+          <option value="years">Years</option>
           <option value="months">Months</option>
           <option value="topics">Topics</option>
         </select>
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index 3214251..da1a771 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -8,4 +8,10 @@ export async function fetchResearches(id){
     return restGet("/researches/" + id)
 }
 
+export async function fetchStats(id){
+    return restGet("/stats/" +id)
+}
+export async function addView(url){
+    return restPost("/addView/" +url)
+}
 

From 7a05fc1316cda1370d94b70cda20cd9c454ae311 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 00:26:56 +0200
Subject: [PATCH 36/66] fixed spelling mistake

---
 .../ovh/herisson/Clyde/EndPoints/MockController.java   |  2 +-
 .../ScientificPublications/ResearchController.java     |  2 +-
 .../ScientificPublications/ResearchesService.java      |  2 +-
 .../Apps/ScientificPublications/ResearchComponent.vue  |  4 +---
 .../Apps/ScientificPublications/ResearcherProfile.vue  | 10 +++++-----
 .../rest/ScientificPublications/ResearcherProfile.js   |  3 +++
 6 files changed, 12 insertions(+), 11 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 166e64b..f9fe3f9 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -113,7 +113,7 @@ public class MockController {
         Researcher output = researchesService.saveResearcher(jojoResearcherAccount);
 
         Research jojoResearch = new Research("Graphs : Advanced Search Algorithms",output,new Date(0),
-                PaperType.Article,"here",null,"english",
+                PaperType.Article,"here.pdf",null,"english",
                 Access.OpenSource,"IT","This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms");
 
         Research restrictedResearch = new Research("just another Name",output,new Date(1111111111),
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index 8a266a2..b8a4342 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -229,7 +229,7 @@ public class ResearchController {
 
     ///////
     //views part
-    @PostMapping("/addView{url}")
+    @PostMapping("/addView/{url}")
     public ResponseEntity<ResearchDTO> addView(@PathVariable String url){
         Research research = researchesServ.getResearchByUrl(url);
         if (research ==null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index 0d601c7..a9c337d 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -194,6 +194,6 @@ public class ResearchesService {
 
     public Research addView(Research research) {
         research.setViews(research.getViews()+1);
-        articleRepo.save(research);
+        return articleRepo.save(research);
     }
 }
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 48c27e8..dd4316e 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -46,9 +46,7 @@ onClickOutside(target, ()=>emit('modal-close'))
        </ul>
         <div id="downloads" v-if="article.pdfLocation !== null">
           <button @click.stop="emit('downloadBibTex')">Download BibTex</button>
-          <form method="get" :action=article.pdfLocation>
-            <button @click.stop="emit('downloadPdf', article)">Download Research</button>
-          </form>
+          <button @click.stop="emit('downloadPdf')">Download Research</button>
         </div>
       </div>
     </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 39180d3..bbd22f5 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -9,7 +9,7 @@
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {fetchResearcher, fetchResearches, fetchStats, addView} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {fetchResearcher, fetchResearches, fetchStats, addView, getFile} from "@/rest/ScientificPublications/ResearcherProfile.js";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
@@ -48,12 +48,12 @@ const closeResearch = () => {
 }
 
 const downloadBibTex = (research) => {
-//todo
+  getFile(research.bibTexLocation)
 }
 
 const downloadArticle = (research) => {
-  addView(research.url)
-
+  addView(research.pdfLocation)
+  getFile(research.pdfLocation)
 }
 
 function downloadCoAuthors(){
@@ -131,7 +131,7 @@ function update(){
 <template>
   <div id="main">
     <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" @modal-close="closeResearch" @downloadPdf="downloadArticle" @downloadBibTex="downloadBibTex"></ArticleComponent>
+    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" @modal-close="closeResearch" @downloadPdf="downloadArticle(articleToDisplay)" @downloadBibTex="downloadBibTex(articleToDisplay)"></ArticleComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index da1a771..827311d 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -15,3 +15,6 @@ export async function addView(url){
     return restPost("/addView/" +url)
 }
 
+export async function getFile(url){
+    return restGet("/" + url)
+}
\ No newline at end of file

From 24f82812f4687e8a7c9fe85915f6c4efd2e90256 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 12:22:45 +0200
Subject: [PATCH 37/66] added views to research DTO

---
 .../Clyde/DTO/ScientificPublications/ResearchDTO.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
index 92605be..c565735 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
@@ -28,8 +28,9 @@ public class ResearchDTO {
     private Access access;
     private String domain;
     private String summary;
+    private long views;
 
-    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain, String summary, long id) {
+    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain, String summary, long id,long views) {
         this.title = title;
         this.researcher = researcherDTO;
         this.releaseDate = releaseDate;
@@ -40,12 +41,13 @@ public class ResearchDTO {
         this.domain = domain;
         this.summary = summary;
         this.id = id;
+        this.views = views;
     }
 
 
     public static ResearchDTO construct(Research research){
         return new ResearchDTO(research.getTitle(), ResearcherDTO.construct(research.getAuthor()), research.getReleaseDate(),
                 research.getPaperType(),research.getPdfLocation(),research.getLanguage(),research.getAccess(),
-                research.getDomain(), research.getSummary(), research.getId());
+                research.getDomain(), research.getSummary(), research.getId(), research.getViews());
     }
 }

From 5c0dfa359688343acb4983f29af8561f8aab6638 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 12:37:14 +0200
Subject: [PATCH 38/66] fixed stats and added views in researchComp

---
 .../src/Apps/ScientificPublications/ResearchComponent.vue   | 3 ++-
 .../src/Apps/ScientificPublications/ResearcherProfile.vue   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index dd4316e..66c31f7 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -22,7 +22,7 @@ function format(date){
 }
 
 
-const emit = defineEmits(["downloadPdf","downloadBibTex"]);
+const emit = defineEmits(["modal-close","downloadPdf","downloadBibTex"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))
@@ -42,6 +42,7 @@ onClickOutside(target, ()=>emit('modal-close'))
          <li>Language : {{article.language}}</li>
          <li>PaperType : {{article.paperType}}</li>
          <li>Domain : {{article.domain}}</li>
+         <li>Views : {{article.views}}</li>
          <li>Access : {{article.access}}</li>
        </ul>
         <div id="downloads" v-if="article.pdfLocation !== null">
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index bbd22f5..cd7e6cd 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -117,10 +117,10 @@ function update(){
     fontColor: "white",
     text: statsOf.value + " By "+ statsBy.value,
   }
- const index = (0 ?statsOf.value === "views": 3 ? statsOf.value === "researches":6) + (0?statsBy.value ==="years":1?statsBy.value==="months":2)
+ let index = (statsOf.value === "views"?0:(statsOf.value === "researches"?3:6)) + (statsBy.value ==="years"?0:(statsBy.value==="months"?1:2))
 
-
-  options.data[0].dataPoints = stats.value[index]
+  if (statsOf.value !== "" && statsBy.value !== "")
+    options.data[0].dataPoints = stats.value[index]
 
 
   options.title.text = statsOf.value + " By "+ statsBy.value;

From d4c442c64a032285d8f3d3f0772d64cd490f8a8b Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 12:40:52 +0200
Subject: [PATCH 39/66] added ResearchProfile to Apps (to be changed)

---
 .../ovh/herisson/Clyde/EndPoints/ApplicationsController.java | 1 +
 .../main/java/ovh/herisson/Clyde/Tables/Applications.java    | 2 ++
 .../src/rest/ScientificPublications/ResearcherProfile.js     | 5 +++--
 frontend/src/rest/apps.js                                    | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

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 d4fdaa0..f99fd60 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
@@ -47,6 +47,7 @@ public class ApplicationsController {
 
         //if unAuthed
         authorizedApps.add(Applications.Login);
+        authorizedApps.add(Applications.ResearcherProfile);
 
 		User user = authServ.getUserFromToken(token);
 		if(user == null)
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 5c39891..27c299e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
@@ -19,5 +19,7 @@ public enum Applications {
 
     // InscriptionService authorization
     Requests,
+    // profile of a researcher
+    ResearcherProfile,
     StudentsList
 }
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index 827311d..29fbe27 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -12,9 +12,10 @@ export async function fetchStats(id){
     return restGet("/stats/" +id)
 }
 export async function addView(url){
-    return restPost("/addView/" +url)
+    return restPost("/addview/" +url)
 }
 
 export async function getFile(url){
-    return restGet("/" + url)
+    const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
+    await fetch(restURL + "/"+url, {method: "GET"})
 }
\ No newline at end of file
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 59d3c76..8ccba3a 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -34,6 +34,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")},
+		'ResearcherProfile':{path:'#/researcher-profile',icon:'fa-book-bookmark',text:"hihi"},
 }
 
 const currentPath = ref(window.location.hash)

From bdfa2e6389ab4c0be0461edca39c0849a40e7e28 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 12:41:36 +0200
Subject: [PATCH 40/66] backend returns views

---
 .../main/java/ovh/herisson/Clyde/EndPoints/MockController.java  | 2 +-
 .../EndPoints/ScientificPublications/ResearchController.java    | 2 +-
 2 files changed, 2 insertions(+), 2 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 5c8a91b..ed49140 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -141,7 +141,7 @@ public class MockController {
             Researcher output = researchesService.saveResearcher(jojoResearcherAccount);
 
             Research jojoResearch = new Research("Graphs : Advanced Search Algorithms", output, new Date(0),
-                    PaperType.Article, "here.pdf", null, "english",
+                    PaperType.Article, "test.pdf", null, "english",
                     Access.OpenSource, "IT", "This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms");
 
             Research restrictedResearch = new Research("just another Name", output, new Date(1111111111),
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index b8a4342..36b72db 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -229,7 +229,7 @@ public class ResearchController {
 
     ///////
     //views part
-    @PostMapping("/addView/{url}")
+    @PostMapping("/addview/{url}")
     public ResponseEntity<ResearchDTO> addView(@PathVariable String url){
         Research research = researchesServ.getResearchByUrl(url);
         if (research ==null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);

From 6116cbdaa4fcc9dda31b652f12ea08ba54ff7b4e Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 12:41:58 +0200
Subject: [PATCH 41/66] added distinct languages to SQL query

---
 .../ScientificPublications/StatsRepository.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
index a228ac9..0dfabfe 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
@@ -19,22 +19,22 @@ public interface StatsRepository extends CrudRepository<Research,Long> {
     Iterable<Map<String ,Integer>> viewsByTopics();
 
 
-    @Query("select new map(r.domain as label, count(r.language) as y) from Research r group by r.domain")
+    @Query("select new map(r.domain as label, count(distinct r.language) as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> languageByTopics();
 
-    @Query("select new map(to_char(r.releaseDate,'YYYY') as label,  count(r.language) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
+    @Query("select new map(to_char(r.releaseDate,'YYYY') as label,  count(distinct r.language) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
     Iterable<Map<String ,Integer>> languageByYears();
 
-    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(r.language) as y) from Research r group by to_char(r.releaseDate, 'month')")
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r.language) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> languageByMonths();
 
-    @Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(r) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
+    @Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(distinct r) as y) from Research r group by to_char(r.releaseDate,'YYYY')")
     Iterable<Map<String ,Integer>> researchesByYears();
 
-    @Query("select new map(r.domain as label, count(r) as y) from Research r group by r.domain")
+    @Query("select new map(r.domain as label, count(distinct r) as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> researchesByTopics();
 
-    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(r) as y) from Research r group by to_char(r.releaseDate, 'month')")
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> researchesByMonth();
 
 }

From e303048f7ea2250c7d8ba11b58dc946595ccb1a4 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 13:32:46 +0200
Subject: [PATCH 42/66] backend add ManageResearcherProfile

---
 .../Clyde/EndPoints/ApplicationsController.java       | 11 +++++++++--
 .../ScientificPublications/ResearcherController.java  | 10 ++++++++++
 .../java/ovh/herisson/Clyde/Tables/Applications.java  |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

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 f99fd60..5b49c66 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
@@ -1,5 +1,6 @@
 package ovh.herisson.Clyde.EndPoints;
 
+import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -8,6 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
+import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
 import ovh.herisson.Clyde.Tables.Applications;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
@@ -20,7 +22,10 @@ public class ApplicationsController {
 
     AuthenticatorService authServ;
 
-    public ApplicationsController(AuthenticatorService authServ){
+    ResearchesService researchesServ;
+
+    public ApplicationsController(AuthenticatorService authServ, ResearchesService researchesServ){
+        this.researchesServ = researchesServ;
     this.authServ = authServ;
     }
 
@@ -47,7 +52,6 @@ public class ApplicationsController {
 
         //if unAuthed
         authorizedApps.add(Applications.Login);
-        authorizedApps.add(Applications.ResearcherProfile);
 
 		User user = authServ.getUserFromToken(token);
 		if(user == null)
@@ -71,6 +75,9 @@ public class ApplicationsController {
 
         if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
           authorizedApps.add(Applications.UsersList);}
+
+        if (researchesServ.getResearcherByUser(user) != null)
+            authorizedApps.add(Applications.ManageResearcherProfile);
         return authorizedApps;
     }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
index d052686..a0f3eeb 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
@@ -50,6 +50,16 @@ public class ResearcherController {
         return new ResponseEntity<>(toReturnResearchersDTO, HttpStatus.OK);
     }
 
+    @GetMapping("/researcher")
+    public ResponseEntity<ResearcherDTO> getSelf(@RequestHeader("Authorization") String token){
+
+        Researcher self = researchesServ.getResearcherByUser(authServ.getUserFromToken(token));
+
+        if (self ==null) return new UnauthorizedResponse<>(null);
+
+        return new ResponseEntity<>(ResearcherDTO.construct(self), HttpStatus.OK);
+    }
+
     @PostMapping("/researcher")
     public ResponseEntity<ResearcherDTO> postResearcher(@RequestHeader("Authorization") String token, @RequestBody Researcher researcher){
         if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary}, token)){
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 27c299e..a47997f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
@@ -7,7 +7,6 @@ public enum Applications {
     // with any token
     Profile,
 
-
     // Students and higher authorization
     Msg,
     Forum,
@@ -21,5 +20,6 @@ public enum Applications {
     Requests,
     // profile of a researcher
     ResearcherProfile,
+    ManageResearcherProfile,
     StudentsList
 }

From 8c70108a1ca87ff6645912929263c6f65d29c035 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 13:33:35 +0200
Subject: [PATCH 43/66] added translations

---
 frontend/public/i18n/EN.txt | 1 +
 frontend/public/i18n/FR.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt
index e79a8a1..ed8ec8e 100644
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@@ -28,6 +28,7 @@ app.language=Language
 app.manage.profile=Manage profile
 app.studentList=Students List
 app.users=Users
+app.manage.researcherProfile=Manage researcher profile
 request.moreInfos=More Infos
 request.accept=Accept
 request.refuse=Refuse
diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt
index c5f3ebf..8f02c0a 100644
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@@ -28,6 +28,7 @@ app.language=Langue
 app.manage.profile=Gérer le profil
 app.studentList=Liste des étudiants
 app.users=Utilisateurs
+app.manage.researcherProfile= gérer son profil de chercheur
 request.moreInfos=Plus d'Infos
 request.accept=Accepter
 request.refuse=Refuser

From 3ea48c20aa44e617b4074af147de21655a8e2452 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 13:34:39 +0200
Subject: [PATCH 44/66] front add manageProfileApp

---
 .../src/rest/ScientificPublications/ResearcherProfile.js     | 4 ++++
 frontend/src/rest/apps.js                                    | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index 29fbe27..c50c9ff 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -18,4 +18,8 @@ export async function addView(url){
 export async function getFile(url){
     const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
     await fetch(restURL + "/"+url, {method: "GET"})
+}
+
+export async function getSelf(){
+    return restGet("/researcher")
 }
\ No newline at end of file
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 8ccba3a..d1b6d3a 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -13,6 +13,7 @@ import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.v
 import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 import Msg from "@/Apps/Msg.vue"
 import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
+import ManageResearcherProfile from "@/Apps/ScientificPublications/ManageResearcherProfile.vue";
 
 const apps = {
 		'/login': LoginPage,
@@ -21,7 +22,7 @@ const apps = {
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
 		'/students-list' : Students,
-		'/researcher-profile' : ResearcherProfile,
+		'/manage-researcher-profile' : ManageResearcherProfile,
 		'/msg' : Msg,
 }
 
@@ -34,7 +35,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")},
-		'ResearcherProfile':{path:'#/researcher-profile',icon:'fa-book-bookmark',text:"hihi"},
+		'ManageResearcherProfile':{path:'#/researcher-profile',icon:'fa-book-bookmark',text:i18n("app.manage.researcherProfile")},
 }
 
 const currentPath = ref(window.location.hash)

From 47f1bffb241933d0910185f58c5c331efe65ee94 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 23:00:00 +0200
Subject: [PATCH 45/66] backend fixed Patch Research

---
 .../ResearcherController.java                 |  3 ++-
 .../ResearchesService.java                    | 21 ++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
index a0f3eeb..8c3f5cf 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearcherController.java
@@ -80,9 +80,10 @@ public class ResearcherController {
 
         Researcher researcher = researchesServ.getResearcherById(id);
         if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin}, token)
-                || researcher == researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
+                && researcher.getId() != researchesServ.getResearcherByUser(authServ.getUserFromToken(token)).getId())
             return new UnauthorizedResponse<>(null);
 
+
         if (researcher == null) return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 
         researchesServ.modifyResearcherData(researcher,updates);
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index a9c337d..7b822f7 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -83,18 +83,9 @@ public class ResearchesService {
                 case "title":
                     research.setTitle((String) entry.getValue());
                     break;
-                case "date":
-                    research.setReleaseDate((Date) entry.getValue());
-                    break;
                 case "paperType":
                     research.setPaperType((PaperType) entry.getValue());
                     break;
-                case "PdfLocation":
-                    research.setPdfLocation((String) entry.getValue());
-                    break;
-                case "bibtexLocation":
-                    research.setBibTexLocation((String) entry.getValue());
-                    break;
                 case "language":
                     research.setLanguage((String) entry.getValue());
                     break;
@@ -104,6 +95,9 @@ public class ResearchesService {
                 case "summary":
                     research.setSummary((String) entry.getValue());
                     break;
+                case "access":
+                    research.setAccess(Access.valueOf((String) entry.getValue()));
+                    break;
             }
         }
         articleRepo.save(research);
@@ -175,13 +169,16 @@ public class ResearchesService {
         for (Map.Entry<String, Object> entry : updates.entrySet()){
             switch (entry.getKey()){
                 case "orcidId":
-                    researcher.setOrcidId((String) entry.getValue());
+                    if (entry.getValue() != null)
+                        researcher.setOrcidId((String) entry.getValue());
                     break;
                 case "domain":
-                    researcher.setDomain((String) entry.getValue());
+                    if (entry.getValue() != null)
+                        researcher.setDomain((String) entry.getValue());
                     break;
                 case "site":
-                    researcher.setSite((String) entry.getValue());
+                    if (entry.getValue() != null)
+                        researcher.setSite((String) entry.getValue());
                     break;
            }
         }

From 3281bf1d7e28c86efb285e19a6380bb908423e0e Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Wed, 17 Apr 2024 23:00:37 +0200
Subject: [PATCH 46/66] patch Researcher Profile and researches

---
 .../ManageResearcherProfile.vue               | 292 ++++++++++++++++++
 .../ResearchComponent.vue                     | 117 +++++--
 .../ResearchPostComponent.vue                 |  11 +
 .../ScientificPublications/ManageResearch.js  |   8 +
 .../ManageResearcherProfile.js                |   9 +
 .../ResearcherProfile.js                      |   4 -
 frontend/src/rest/apps.js                     |   3 +-
 frontend/src/rest/courses.js                  |   3 +-
 8 files changed, 421 insertions(+), 26 deletions(-)
 create mode 100644 frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
 create mode 100644 frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
 create mode 100644 frontend/src/rest/ScientificPublications/ManageResearch.js
 create mode 100644 frontend/src/rest/ScientificPublications/ManageResearcherProfile.js

diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
new file mode 100644
index 0000000..c30fdd1
--- /dev/null
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -0,0 +1,292 @@
+<script setup>
+import { ref, reactive } from "vue";
+import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
+import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
+import {fetchResearches, } from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {getSelf, patchProfile} from "@/rest/ScientificPublications/ManageResearcherProfile.js";
+import {c, f} from "../../../dist/assets/_plugin-vue_export-helper-Bvj9NrzX.js";
+import ResearchPostComponent from "@/Apps/ScientificPublications/ResearchPostComponent.vue";
+const input = ref("");
+const isFilterOpened = ref(false);
+const isResearchOpened = ref(false);
+const isPostResearchOpened = ref(false);
+const articleToDisplay = ref()
+const filters = ref([]);
+const changing = ref(false);
+
+let toModify= Object.assign({}, {});
+
+const researcher = ref(await getSelf());
+const researchList = ref(await fetchResearches(researcher.value.id));
+
+const props = defineProps({
+  filters: ref([]),
+});
+
+const openFilter = () => {
+  isFilterOpened.value = true;
+};
+const closeFilter = () => {
+  isFilterOpened.value = false;
+};
+const submitFilters = ()=>{
+}
+const openResearch = (article) => {
+  isResearchOpened.value = true;
+  articleToDisplay.value = article;
+}
+
+const closeResearch = () => {
+  isResearchOpened.value =false;
+  articleToDisplay.value = null;
+}
+
+function openPostResearch(){
+  isPostResearchOpened.value = true
+
+}
+
+
+function searchInList(list, searchInput) {
+  let retList = []
+  for (let i = 0; i < list.length; i++) {
+    if (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
+      retList.push(list[i])
+    }
+  }
+  return retList
+}
+
+function lDistance(s,t){
+  if (!s.length) return t.length;
+  if (!t.length) return s.length;
+  const arr = [];
+  for (let i = 0; i <= t.length; i++) {
+    arr[i] = [i];
+    for (let j = 1; j <= s.length; j++) {
+      arr[i][j] =
+          i === 0
+              ? j
+              : Math.min(
+                  arr[i - 1][j] + 1,
+                  arr[i][j - 1] + 1,
+                  arr[i - 1][j - 1] + (s[j - 1] === t[i - 1] ? 0 : 1)
+              );
+    }
+  }
+  return arr[t.length][s.length];
+}
+
+function cancelChanges(){
+  changing.value = false
+  toModify= Object.assign({}, {});
+}
+function confirmChanges(){
+  patchProfile(researcher.value.id, toModify)
+  changing.value = false
+  toModify= Object.assign({}, {});
+}
+
+
+
+
+</script>
+
+<template> <div class="body"><div id="main">
+    <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
+    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage=true @modal-close="closeResearch"></ArticleComponent>
+    <ResearchPostComponent :researcher="researcher" :isOpen="isPostResearchOpened"></ResearchPostComponent>
+    <div id="profilePicture">
+      <img src="/Clyde.png" />
+    </div>
+    <div id="researcherInfos">
+      <div class="surrounded" v-if="!changing">{{researcher.user.lastName}} {{researcher.user.firstName}}</div>
+      <div class="surrounded" v-else> To Be changed in manage (simple) Profile</div>
+
+      <div class="surrounded" v-if="!changing">Orcid : {{researcher.orcidId}}</div>
+      <div class="surrounded" v-else>Orcid : <input v-model="toModify.orcidId"> </input></div>
+
+      <div class="surrounded" v-if="!changing">Email : {{researcher.user.email}}</div>
+      <div class="surrounded" v-else> To Be changed in manage (simple) Profile</div>
+
+      <div class="surrounded" v-if="!changing">
+        site : <a :href=researcher.site style="color: #007aff"> {{researcher.site}}</a>
+      </div>
+      <div class="surrounded" v-else>Site : <input v-model="toModify.site"></input></div>
+
+      <div class="surrounded" v-if="!changing">Domain : {{researcher.domain}}</div>
+      <div class="surrounded" v-else>Domain : <input v-model="toModify.domain"> </input></div>
+
+      <div style="text-align: center; align-self: center" v-if="!changing"> <button class="modifyButton" @click="changing = !changing">Modify Data</button></div>
+      <div v-else style="text-align: center; align-self: center">
+        <button id="confirmButton" @click="confirmChanges">Confirm Changes</button>
+         <button id="cancelButton" @click="cancelChanges">Cancel Changes</button>
+      </div>
+    </div>
+    <div class="postArticle" style="text-align: center">
+     <button class="modifyButton" @click="post">Post a Research</button>
+
+
+    </div>
+    <div id="researches">
+      <div id="search">
+        <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+        <button id="filterButton" @click="openFilter">  Filters </button>
+      </div>
+      <ul id="researchUL">
+        <li id="researchLi" v-for="n in searchInList(researchList,input)">
+          <div class="vl"> {{n.title}}</div>
+          <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
+         <a @click="openResearch(n)"> Modify Research</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+</template>
+
+<style scoped>
+
+#main {
+  display: grid;
+  grid-template-columns: 22% auto;
+  grid-template-rows: 26% auto;
+  height: 100%;
+  width: 100%;
+}
+
+#profilePicture {
+  display: flex;
+  justify-content: center;
+}
+
+#profilePicture img {
+  align-self: center;
+  justify-self: center;
+  width: 60%;
+}
+
+#researcherInfos {
+  display: grid;
+  grid-template-columns: auto auto auto;
+  column-gap: 5px;
+  grid-template-rows: auto auto;
+}
+
+.surrounded {
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  align-self: center;
+  text-align: center;
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius: 20px;
+  margin-bottom: 10px;
+}
+
+.surrounded select {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  border: 1px solid black;
+  color: white;
+  background-color: rgb(255, 255, 255, 0.1);
+  font-size: large;
+}
+
+.modifyButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: xx-large;
+  background-color:rgba(191, 64, 191,0.5);
+  border-radius: 20px;
+}
+
+.modifyButton:hover{
+  background:rgba(191,64,191)
+}
+
+#cancelButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color: red;
+  border-radius: 20px;
+}
+#cancelButton:hover{
+  background: #ff2d55;
+}
+
+#confirmButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color: #07bc0c;
+  border-radius: 20px;
+}
+#confirmButton:hover{
+  background: #4cd964;
+}
+
+#search{
+  width: 100%;
+  height: 10%;
+  display: inline-flex;
+}
+#search-input {
+  margin-left: 25px;
+  width: 75%;
+  font-size: 16px;
+  padding: 12px 20px 12px 40px;
+  border: 1px solid #ddd;
+  height: 20px;
+  align-self: center;
+}
+
+#filterButton {
+  align-self: center;
+  margin-left: 2px;
+  font-size: xx-large;
+  color: white;
+  background: rgba(191, 64, 191,0.5);
+  border:2px solid black;
+}
+#filterButton:hover{
+  background: rgba(191, 64, 191);
+}
+
+
+#researchUL {
+  list-style-type: none;
+  color: white;
+  padding: 12px;
+  margin: 5px;
+  height: 400px;
+  overflow: scroll;
+}
+#researchLi{
+  display: grid;
+  grid-template-columns: auto auto auto;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  text-align: center;
+  text-indent: 7px;
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius: 18px;
+  margin-bottom: 15px;
+}
+a{
+  color:#007aff;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.vl {
+  border-right: 2px solid black;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 66c31f7..e59326e 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -5,13 +5,15 @@
 	Description: Pop Up summarizing
 ----------------------------------------------------->
 
-<script setup>
+<script setup xmlns="http://www.w3.org/1999/html">
 import {ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
+import {patchArticle, deleteArticle} from "@/rest/ScientificPublications/ManageResearch.js";
 
 const props = defineProps({
   isOpen: Boolean,
-  article: ref(Object)
+  article: ref(Object),
+  manage:Boolean,
 });
 function format(date){
   let split = date.split("-")
@@ -21,33 +23,72 @@ function format(date){
   return day +"/"+ month +"/"+ year
 }
 
-
 const emit = defineEmits(["modal-close","downloadPdf","downloadBibTex"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))
 
+let toModify= Object.assign({}, {});
+
+function cancelChanges(){
+  toModify= Object.assign({}, {});
+  emit('modal-close')
+}
+function confirmChanges(){
+  patchArticle(props.article.id, toModify)
+  toModify= Object.assign({}, {});
+  emit('modal-close')
+}
+
+function deleteThisArticle(){
+  deleteArticle(props.article.id)
+  emit('modal-close')
+}
+
+
 </script>
 
 <template>
   <div v-if="isOpen" class="modal-mask">
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
-       <ul>
-         <li>Article Id : {{article.id}}</li>
-         <li>Title : {{article.title}}</li>
-         <li>Author : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
-         <li>Summary : {{article.summary}}</li>
-         <li>ReleaseDate: {{format(article.releaseDate)}}</li>
-         <li>Language : {{article.language}}</li>
-         <li>PaperType : {{article.paperType}}</li>
-         <li>Domain : {{article.domain}}</li>
-         <li>Views : {{article.views}}</li>
-         <li>Access : {{article.access}}</li>
-       </ul>
-        <div id="downloads" v-if="article.pdfLocation !== null">
-          <button @click.stop="emit('downloadBibTex')">Download BibTex</button>
-          <button @click.stop="emit('downloadPdf')">Download Research</button>
+        <div ><ul>
+
+          <li>Article Id : {{article.id}}</li>
+          <li>Title : {{article.title}}</li>
+          <li>Author : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
+          <li>Summary : {{article.summary}}</li>
+          <li>ReleaseDate: {{format(article.releaseDate)}}</li>
+          <li>Language : {{article.language}}</li>
+          <li>PaperType : {{article.paperType}}</li>
+          <li>Domain : {{article.domain}}</li>
+          <li>Views : {{article.views}}</li>
+          <li>Access : {{article.access}}</li>
+        </ul>
+          <div id="downloads" v-if="article.pdfLocation !== null">
+            <button @click.stop="emit('downloadBibTex')">Download BibTex</button>
+            <button @click.stop="emit('downloadPdf')">Download Research</button>
+          </div>
+
+        </div>
+        <div v-if="manage">
+          <div>
+            <ul>
+              <li>Title : <input v-model="toModify.title"></li>
+              <li>Language : <input v-model="toModify.language"></li>
+              <li>Summary : <input v-model="toModify.summary"></li>
+              <li>Domain : <input v-model="toModify.domain"></li>
+              <li>Access :
+                <select @change="update()" id="classed-select" v-model="toModify.access">
+                  <option value="OpenSource">OpenSource</option>
+                  <option value="Restricted">Restricted</option>
+                  <option value="Private">Private</option>
+                </select></li>
+            </ul>
+          </div>
+          <button id="confirmButton" @click="confirmChanges">Confirm Changes</button>
+          <button id="cancelButton" @click="cancelChanges">Cancel Changes</button>
+          <button id="deleteButton" @click="deleteThisArticle">Delete Research </button>
         </div>
       </div>
     </div>
@@ -95,4 +136,44 @@ onClickOutside(target, ()=>emit('modal-close'))
   background: rgba(191, 64, 191);
 }
 
+#deleteButton{
+  margin-left: 80%;
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: large;
+  border-radius: 20px;
+  background-color: red;
+}
+
+#deleteButton:hover{
+  background: #ff2d55;
+}
+
+#cancelButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color:rgba(191, 64, 191,0.5);
+  border-radius: 20px;
+}
+#cancelButton:hover{
+  background:rgba(191,64,191)
+}
+
+#confirmButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color: #07bc0c;
+  border-radius: 20px;
+}
+#confirmButton:hover{
+  background: #4cd964;
+}
 </style>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
new file mode 100644
index 0000000..f79cdd8
--- /dev/null
+++ b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
@@ -0,0 +1,11 @@
+<script setup>
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
new file mode 100644
index 0000000..ac3db81
--- /dev/null
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -0,0 +1,8 @@
+import { restGet, restPost, restDelete, restPatch } from '../restConsumer.js'
+
+export async function deleteArticle(id){
+    await restDelete("/research/" + id)
+}
+export async function patchArticle(id, data){
+    await restPatch("/research/" + id, data)
+}
\ No newline at end of file
diff --git a/frontend/src/rest/ScientificPublications/ManageResearcherProfile.js b/frontend/src/rest/ScientificPublications/ManageResearcherProfile.js
new file mode 100644
index 0000000..61d588c
--- /dev/null
+++ b/frontend/src/rest/ScientificPublications/ManageResearcherProfile.js
@@ -0,0 +1,9 @@
+import { restGet, restPost, restDelete, restPatch } from '../restConsumer.js'
+
+export async function getSelf(){
+    return restGet("/researcher")
+}
+
+export async function patchProfile(id, data){
+    return restPatch("/researcher/" + id, data)
+}
\ No newline at end of file
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index c50c9ff..29fbe27 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -18,8 +18,4 @@ export async function addView(url){
 export async function getFile(url){
     const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
     await fetch(restURL + "/"+url, {method: "GET"})
-}
-
-export async function getSelf(){
-    return restGet("/researcher")
 }
\ No newline at end of file
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index d1b6d3a..83ac451 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -9,7 +9,6 @@ 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 ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
 import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 import Msg from "@/Apps/Msg.vue"
 import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
@@ -35,7 +34,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")},
-		'ManageResearcherProfile':{path:'#/researcher-profile',icon:'fa-book-bookmark',text:i18n("app.manage.researcherProfile")},
+		'ManageResearcherProfile':{path:'#/manage-researcher-profile',icon:'fa-book-bookmark',text:i18n("app.manage.researcherProfile")},
 }
 
 const currentPath = ref(window.location.hash)
diff --git a/frontend/src/rest/courses.js b/frontend/src/rest/courses.js
index 2359a7b..adb9687 100644
--- a/frontend/src/rest/courses.js
+++ b/frontend/src/rest/courses.js
@@ -8,8 +8,7 @@ import { restGet, restPost, restDelete, restPatch } from './restConsumer.js'
  * Create a new course
  */
 export async function createCourse(name, credits, owner){
-  console.log(owner);
-  
+
 	return restPost("/course", {title: name, credits: credits, owner} )
 }
 

From da2c0f472dc7244a56e5d3639381e1cf51f9d473 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 18 Apr 2024 14:39:57 +0200
Subject: [PATCH 47/66] added BibTex File Type

---
 backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 8730c05..e026d18 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java
@@ -3,6 +3,8 @@ package ovh.herisson.Clyde.Tables;
 public enum FileType {
     ProfilePicture,
     EducationCertificate,
-    Article,
+    Research,
+
+    ResearchBibTex,
     JustificationDocument
 }

From 939b4f5492994f800215e927fd45b1b1d5003080 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 18 Apr 2024 14:53:17 +0200
Subject: [PATCH 48/66] Manage ResearcherProfile

---
 .../FilterComponent.vue                       |   1 -
 .../ManageResearcherProfile.vue               |   6 +-
 .../ResearchComponent.vue                     |   2 +-
 .../ResearchPostComponent.vue                 | 165 +++++++++++++++++-
 .../ResearcherProfile.vue                     |   2 +-
 .../ScientificPublications/ManageResearch.js  |  18 +-
 6 files changed, 186 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index f2cb363..acda36b 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -7,7 +7,6 @@
 <script setup>
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-import {w} from "../../../dist/assets/_plugin-vue_export-helper-Bvj9NrzX.js";
 let checked = ref([])
 const yearList = ref([])
 const monthList = ref([])
diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index c30fdd1..6979f38 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -94,8 +94,8 @@ function confirmChanges(){
 
 <template> <div class="body"><div id="main">
     <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage=true @modal-close="closeResearch"></ArticleComponent>
-    <ResearchPostComponent :researcher="researcher" :isOpen="isPostResearchOpened"></ResearchPostComponent>
+    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="true" @modal-close="closeResearch"></ArticleComponent>
+    <ResearchPostComponent :researcher="researcher" :isOpen="isPostResearchOpened" @modal-close="isPostResearchOpened = false"></ResearchPostComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
@@ -124,7 +124,7 @@ function confirmChanges(){
       </div>
     </div>
     <div class="postArticle" style="text-align: center">
-     <button class="modifyButton" @click="post">Post a Research</button>
+     <button class="modifyButton" @click="openPostResearch">Post a Research</button>
 
 
     </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index e59326e..1260b58 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -79,7 +79,7 @@ function deleteThisArticle(){
               <li>Summary : <input v-model="toModify.summary"></li>
               <li>Domain : <input v-model="toModify.domain"></li>
               <li>Access :
-                <select @change="update()" id="classed-select" v-model="toModify.access">
+                <select id="classed-select" v-model="toModify.access">
                   <option value="OpenSource">OpenSource</option>
                   <option value="Restricted">Restricted</option>
                   <option value="Private">Private</option>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
index f79cdd8..a2f1065 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
@@ -1,11 +1,174 @@
 <script setup>
 
+import { ref } from "vue";
+import {onClickOutside} from '@vueuse/core'
+import {uploadPdf, uploadBibTex,postResearch} from "@/rest/ScientificPublications/ManageResearch.js";
+import i18n from "@/i18n.js";
+let toPost = Object.assign({}, {});
+
+const props = defineProps({
+  isOpen: Boolean,
+  researcher: ref(Object)
+});
+
+
+async function uploadResearchPdf(pdf){
+  const data = await uploadPdf(pdf);
+  toPost.pdfLocation = data.url;
+}
+async function uploadResearchBibTexPdf(pdf){
+  const data = await uploadPdf(pdf);
+  toPost.pdfLocation = data.url;
+}
+
+// Date when sent!!
+
+function postNewResearch(){
+  toPost.releaseDate = new Date()
+  toPost.author = props.researcher
+  //the Pdf is required and a title
+  console.log(!toPost.pdfLocation == null|| toPost.title == null || toPost.title === "")
+  if (toPost.pdfLocation == null || toPost.title == null || toPost.title === "") {
+    emit("modal-close")
+    return;
+  }
+  postResearch(toPost)
+  toPost = Object.assign({}, {});
+  emit("modal-close")
+}
+
+function cancelPost(){
+  emit("modal-close")
+  toPost = Object.assign({}, {});
+}
+const emit = defineEmits(["modal-close"]);
+
+const target = ref(null)
+onClickOutside(target, ()=>emit('modal-close'))
+
+
 </script>
 
 <template>
+  <div v-if="isOpen" class="modal-mask">
+    <div class="modal-wrapper">
+      <div class="modal-container" ref="target">
+        <div ><ul>
+
+          <li>Title : <input v-model="toPost.title"></li>
+          <li>Summary : <input v-model="toPost.summary"></li>
+          <li>Language : <input v-model="toPost.language"></li>
+          <li>Domain : <input v-model="toPost.domain"></li>
+          <li>PaperType :  <select  id="classed-select" v-model="toPost.paperType">
+            <option value="Article">Article</option>
+            <option value="Book">Book</option>
+            <option value="BookChapter">Book Chapter</option>
+            <option value="Paper">Paper</option>
+          </select></li>
+          <li>Access : <select  id="classed-select" v-model="toPost.access">
+            <option value="OpenSource">OpenSource</option>
+            <option value="Restricted">Restricted</option>
+            <option value="Private">Private</option>
+          </select></li>
+          <li> Research Pdf :
+            <form novalidate enctype="multipart/form-data" class="inputBox">
+            <input type="file" @change="uploadResearchPdf($event.target.files);" accept="application/pdf">
+          </form></li>
+          <li> Research BibTex :
+          <form novalidate enctype="multipart/form-data" class="inputBox">
+            <input type="file" @change="uploadBibTex($event.target.files);" accept=".bib">
+          </form></li>
+        </ul>
+        </div>
+        <div>
+          <button id="confirmButton" @click="postNewResearch">Confirm Publish</button>
+          <button id="cancelButton" @click="cancelPost">Cancel Publish</button>
+        </div>
+      </div>
+    </div>
+  </div>
 
 </template>
 
 <style scoped>
+.modal-mask {
+  position: fixed;
+  z-index: 9998;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+}
 
-</style>
\ No newline at end of file
+.modal-container {
+  width: 70%;
+  margin: 150px auto;
+  padding: 20px 30px;
+  background: rgba(157, 99, 205);
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
+}
+
+.modal-container ul{
+  margin-top: 9px;
+}
+
+
+#downloads {
+  text-align: end;
+}
+#downloads button {
+  align-self: center;
+  margin-left: 2px;
+  font-size: large;
+  color: white;
+  background: rgba(191, 64, 191,0.5);
+  border:2px solid black;
+  border-radius: 5px;
+}
+#downloads button:hover{
+  background: rgba(191, 64, 191);
+}
+
+#deleteButton{
+  margin-left: 80%;
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: large;
+  border-radius: 20px;
+  background-color: red;
+}
+
+#deleteButton:hover{
+  background: #ff2d55;
+}
+
+#cancelButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color:rgba(191, 64, 191,0.5);
+  border-radius: 20px;
+}
+#cancelButton:hover{
+  background:rgba(191,64,191)
+}
+
+#confirmButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color: #07bc0c;
+  border-radius: 20px;
+}
+#confirmButton:hover{
+  background: #4cd964;
+}
+</style>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index cd7e6cd..68ca685 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -131,7 +131,7 @@ function update(){
 <template>
   <div id="main">
     <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" @modal-close="closeResearch" @downloadPdf="downloadArticle(articleToDisplay)" @downloadBibTex="downloadBibTex(articleToDisplay)"></ArticleComponent>
+    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" @downloadPdf="downloadArticle(articleToDisplay)" @downloadBibTex="downloadBibTex(articleToDisplay)"></ArticleComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index ac3db81..f2dd715 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -1,8 +1,24 @@
-import { restGet, restPost, restDelete, restPatch } from '../restConsumer.js'
+import {restGet, restPost, restDelete, restPatch, restPostFile} from '../restConsumer.js'
 
 export async function deleteArticle(id){
     await restDelete("/research/" + id)
 }
 export async function patchArticle(id, data){
     await restPatch("/research/" + id, data)
+}
+export async function uploadPdf(file){
+    const formData = new FormData();
+    formData.append("file", file[0]);
+
+    return restPostFile("/upload/Research", formData);
+}
+export async function uploadBibTex(file){
+    const formData = new FormData();
+    formData.append("file", file[0]);
+
+    return restPostFile("/upload/Research", formData);
+}
+
+export async function postResearch(data){
+    return restPost("/research", data)
 }
\ No newline at end of file

From 7394a23b45d10cc4bb0ceb7ccc9911ca2dc0c83a Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 18 Apr 2024 16:17:16 +0200
Subject: [PATCH 49/66] added reactivity to post delete	and patch

---
 .../ManageResearcherProfile.vue                    | 14 ++++++++------
 .../ScientificPublications/ResearchComponent.vue   | 12 +++++++-----
 .../ResearchPostComponent.vue                      | 10 +++++-----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index 6979f38..53d837a 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -4,7 +4,6 @@ import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 import {fetchResearches, } from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getSelf, patchProfile} from "@/rest/ScientificPublications/ManageResearcherProfile.js";
-import {c, f} from "../../../dist/assets/_plugin-vue_export-helper-Bvj9NrzX.js";
 import ResearchPostComponent from "@/Apps/ScientificPublications/ResearchPostComponent.vue";
 const input = ref("");
 const isFilterOpened = ref(false);
@@ -43,7 +42,6 @@ const closeResearch = () => {
 
 function openPostResearch(){
   isPostResearchOpened.value = true
-
 }
 
 
@@ -81,12 +79,16 @@ function cancelChanges(){
   changing.value = false
   toModify= Object.assign({}, {});
 }
-function confirmChanges(){
-  patchProfile(researcher.value.id, toModify)
+async function confirmChanges(){
+  await patchProfile(researcher.value.id, toModify)
   changing.value = false
   toModify= Object.assign({}, {});
+  researcher.value = await getSelf();
 }
 
+async function modifiedResearch(){
+  researchList.value = await fetchResearches(researcher.value.id)
+}
 
 
 
@@ -94,8 +96,8 @@ function confirmChanges(){
 
 <template> <div class="body"><div id="main">
     <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="true" @modal-close="closeResearch"></ArticleComponent>
-    <ResearchPostComponent :researcher="researcher" :isOpen="isPostResearchOpened" @modal-close="isPostResearchOpened = false"></ResearchPostComponent>
+    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="true" @modal-close="closeResearch" @modified="modifiedResearch" ></ArticleComponent>
+    <ResearchPostComponent :researcher="researcher" :isOpen="isPostResearchOpened" @modal-close="isPostResearchOpened = false" @posted="modifiedResearch"></ResearchPostComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 1260b58..62babd4 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -23,7 +23,7 @@ function format(date){
   return day +"/"+ month +"/"+ year
 }
 
-const emit = defineEmits(["modal-close","downloadPdf","downloadBibTex"]);
+const emit = defineEmits(["modal-close","downloadPdf","downloadBibTex","modified"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))
@@ -34,15 +34,17 @@ function cancelChanges(){
   toModify= Object.assign({}, {});
   emit('modal-close')
 }
-function confirmChanges(){
-  patchArticle(props.article.id, toModify)
+async function confirmChanges(){
+  await patchArticle(props.article.id, toModify)
   toModify= Object.assign({}, {});
   emit('modal-close')
+  emit("modified")
 }
 
-function deleteThisArticle(){
-  deleteArticle(props.article.id)
+async function deleteThisArticle(){
+  await deleteArticle(props.article.id)
   emit('modal-close')
+  emit("modified")
 }
 
 
diff --git a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
index a2f1065..087c660 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
@@ -23,25 +23,25 @@ async function uploadResearchBibTexPdf(pdf){
 
 // Date when sent!!
 
-function postNewResearch(){
+async function postNewResearch(){
   toPost.releaseDate = new Date()
   toPost.author = props.researcher
-  //the Pdf is required and a title
-  console.log(!toPost.pdfLocation == null|| toPost.title == null || toPost.title === "")
+  //the Pdf and a title are required
   if (toPost.pdfLocation == null || toPost.title == null || toPost.title === "") {
     emit("modal-close")
     return;
   }
-  postResearch(toPost)
+  await postResearch(toPost)
   toPost = Object.assign({}, {});
   emit("modal-close")
+  emit("posted")
 }
 
 function cancelPost(){
   emit("modal-close")
   toPost = Object.assign({}, {});
 }
-const emit = defineEmits(["modal-close"]);
+const emit = defineEmits(["modal-close","posted"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))

From 14c54233281fe3d382a445732c1e555c23a90a02 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 18 Apr 2024 16:47:25 +0200
Subject: [PATCH 50/66] moved getFile() and no download when managing

---
 .../ScientificPublications/ListResearches.vue | 30 +++++++++++++++++++
 .../ResearchComponent.vue                     |  2 +-
 .../ResearcherProfile.vue                     |  3 +-
 .../ScientificPublications/ManageResearch.js  | 11 ++++++-
 .../ResearcherProfile.js                      |  5 ----
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/Apps/ScientificPublications/ListResearches.vue

diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
new file mode 100644
index 0000000..22f225e
--- /dev/null
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -0,0 +1,30 @@
+<script setup>
+
+import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
+import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
+
+
+</script>
+
+<template>
+<div id="main">
+  <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
+  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" @downloadPdf="downloadArticle(articleToDisplay)" @downloadBibTex="downloadBibTex(articleToDisplay)"></ArticleComponent>
+  <div id="researches">
+    <div id="search">
+      <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+      <button id="filterButton" @click="openFilter">  Filters </button>
+    </div>
+    <ul id="researchUL">
+      <li id="researchLi" v-for="n in searchInList(researchList,input)">
+        <div class="vl"> {{n.title}}</div>
+        <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
+        <a @click="openResearch(n)"> MoreInfo  </a></li>
+    </ul>
+  </div>
+</div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 62babd4..2ba631a 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -67,7 +67,7 @@ async function deleteThisArticle(){
           <li>Views : {{article.views}}</li>
           <li>Access : {{article.access}}</li>
         </ul>
-          <div id="downloads" v-if="article.pdfLocation !== null">
+          <div id="downloads" v-if="article.pdfLocation !== null && !manage">
             <button @click.stop="emit('downloadBibTex')">Download BibTex</button>
             <button @click.stop="emit('downloadPdf')">Download Research</button>
           </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 68ca685..4c30020 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -9,7 +9,8 @@
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {fetchResearcher, fetchResearches, fetchStats, addView, getFile} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {fetchResearcher, fetchResearches, fetchStats, addView} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {getFile} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index f2dd715..094a2b1 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -21,4 +21,13 @@ export async function uploadBibTex(file){
 
 export async function postResearch(data){
     return restPost("/research", data)
-}
\ No newline at end of file
+}
+
+export async function fetchResearches(){
+    return restGet("/researches")
+}
+
+export async function getFile(url){
+    const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
+    await fetch(restURL + "/"+url, {method: "GET"})
+}
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index 29fbe27..57754d6 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -13,9 +13,4 @@ export async function fetchStats(id){
 }
 export async function addView(url){
     return restPost("/addview/" +url)
-}
-
-export async function getFile(url){
-    const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
-    await fetch(restURL + "/"+url, {method: "GET"})
 }
\ No newline at end of file

From fed567e9aba2f5e009441fe9c8d47045e16d0089 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 18 Apr 2024 17:17:29 +0200
Subject: [PATCH 51/66] added ListResearch App

---
 frontend/public/i18n/EN.txt                   |  1 +
 frontend/public/i18n/FR.txt                   |  1 +
 .../ScientificPublications/ListResearches.vue | 77 ++++++++++++++++++-
 .../ManageResearcherProfile.vue               |  3 +-
 .../ResearcherProfile.vue                     |  4 +-
 .../ScientificPublications/ManageResearch.js  |  3 +
 .../ResearcherProfile.js                      |  3 -
 frontend/src/rest/apps.js                     |  4 +
 8 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt
index ed8ec8e..0600571 100644
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@@ -29,6 +29,7 @@ app.manage.profile=Manage profile
 app.studentList=Students List
 app.users=Users
 app.manage.researcherProfile=Manage researcher profile
+app.list.researches = List researches
 request.moreInfos=More Infos
 request.accept=Accept
 request.refuse=Refuse
diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt
index 8f02c0a..a057080 100644
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@@ -29,6 +29,7 @@ app.manage.profile=Gérer le profil
 app.studentList=Liste des étudiants
 app.users=Utilisateurs
 app.manage.researcherProfile= gérer son profil de chercheur
+app.list.researches = lister les recherches
 request.moreInfos=Plus d'Infos
 request.accept=Accepter
 request.refuse=Refuser
diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index 22f225e..1ce1df9 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -1,8 +1,83 @@
 <script setup>
-
+import { ref} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
+import {getFile, fetchResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+const input = ref("")
+const isFilterOpened = ref(false);
+const isResearchOpened = ref(false);
+const articleToDisplay = ref(Object)
 
+const researchList = ref(await fetchResearches(1));
+
+const props = defineProps({
+  filters: ref([""]),
+});
+
+const openFilter = () => {
+  isFilterOpened.value = true;
+};
+const closeFilter = () => {
+  isFilterOpened.value = false;
+};
+const submitFilters = ()=>{
+}
+const openResearch = (article) => {
+  isResearchOpened.value = true;
+  articleToDisplay.value = article;
+}
+
+const closeResearch = () => {
+  isResearchOpened.value =false;
+  articleToDisplay.value = null;
+}
+
+const downloadBibTex = (research) => {
+  getFile(research.bibTexLocation)
+}
+
+const downloadArticle = (research) => {
+  addView(research.pdfLocation)
+  getFile(research.pdfLocation)
+}
+
+function downloadCoAuthors(){
+  //todo
+  const data = JSON.stringify(researcher.value);
+  const blob = new Blob([data], {type:"application/json"});
+  return URL.createObjectURL(blob);
+}
+
+
+function searchInList(list, searchInput) {
+  let retList = []
+  for (let i = 0; i < list.length; i++) {
+    if (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
+      retList.push(list[i])
+    }
+  }
+  return retList
+}
+
+function lDistance(s,t){
+  if (!s.length) return t.length;
+  if (!t.length) return s.length;
+  const arr = [];
+  for (let i = 0; i <= t.length; i++) {
+    arr[i] = [i];
+    for (let j = 1; j <= s.length; j++) {
+      arr[i][j] =
+          i === 0
+              ? j
+              : Math.min(
+                  arr[i - 1][j] + 1,
+                  arr[i][j - 1] + 1,
+                  arr[i - 1][j - 1] + (s[j - 1] === t[i - 1] ? 0 : 1)
+              );
+    }
+  }
+  return arr[t.length][s.length];
+}
 
 </script>
 
diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index 53d837a..bff8b98 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive } from "vue";
+import { ref} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 import {fetchResearches, } from "@/rest/ScientificPublications/ResearcherProfile.js";
@@ -10,7 +10,6 @@ const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const isPostResearchOpened = ref(false);
 const articleToDisplay = ref()
-const filters = ref([]);
 const changing = ref(false);
 
 let toModify= Object.assign({}, {});
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 4c30020..473263e 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -9,8 +9,8 @@
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {fetchResearcher, fetchResearches, fetchStats, addView} from "@/rest/ScientificPublications/ResearcherProfile.js";
-import {getFile} from "@/rest/ScientificPublications/ManageResearch.js";
+import {fetchResearcher, fetchResearches, fetchStats} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {getFile, addView} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index 094a2b1..c5437dc 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -31,3 +31,6 @@ export async function getFile(url){
     const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
     await fetch(restURL + "/"+url, {method: "GET"})
 }
+export async function addView(url){
+    return restPost("/addview/" +url)
+}
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index 57754d6..54422f6 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -10,7 +10,4 @@ export async function fetchResearches(id){
 
 export async function fetchStats(id){
     return restGet("/stats/" +id)
-}
-export async function addView(url){
-    return restPost("/addview/" +url)
 }
\ No newline at end of file
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 83ac451..59ba05d 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -13,6 +13,7 @@ import AboutStudent from "@/Apps/Inscription/AboutStudent.vue";
 import Msg from "@/Apps/Msg.vue"
 import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
 import ManageResearcherProfile from "@/Apps/ScientificPublications/ManageResearcherProfile.vue";
+import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 
 const apps = {
 		'/login': LoginPage,
@@ -23,9 +24,11 @@ const apps = {
 		'/students-list' : Students,
 		'/manage-researcher-profile' : ManageResearcherProfile,
 		'/msg' : Msg,
+		'/researches' : ListResearches
 }
 
 const appsList = {
+		'ListResearches': {path:'#/researches', icon:'fa-book-bookmark',text:i18n("app.list.researches")},
 		'Msg': { path: '#/msg', icon: 'fa-comment', text: i18n("app.messages") },
 		'Notification': { path: '#/notifs', icon: 'fa-bell', text: i18n("app.notifications") },
 		'Forum': { path: '#/forum', icon: 'fa-envelope', text: i18n("app.forum") },
@@ -35,6 +38,7 @@ const appsList = {
 		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
 		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
 		'ManageResearcherProfile':{path:'#/manage-researcher-profile',icon:'fa-book-bookmark',text:i18n("app.manage.researcherProfile")},
+
 }
 
 const currentPath = ref(window.location.hash)

From 3f4f6ed49a7991912ab6d9876a6ed88ea2cadc57 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Thu, 18 Apr 2024 18:34:52 +0200
Subject: [PATCH 52/66] added List researches Backend

---
 .../EndPoints/ApplicationsController.java     |   1 +
 .../herisson/Clyde/Tables/Applications.java   |   4 +-
 frontend/public/i18n/EN.txt                   |   2 +-
 frontend/public/i18n/FR.txt                   |   2 +-
 .../ScientificPublications/ListResearches.vue | 108 +++++++++++++++++-
 .../ScientificPublications/ManageResearch.js  |   2 +-
 6 files changed, 111 insertions(+), 8 deletions(-)

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 5b49c66..d95a7ff 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
@@ -52,6 +52,7 @@ public class ApplicationsController {
 
         //if unAuthed
         authorizedApps.add(Applications.Login);
+        authorizedApps.add(Applications.ListResearches);
 
 		User user = authServ.getUserFromToken(token);
 		if(user == null)
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 a47997f..0b4514e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
@@ -21,5 +21,7 @@ public enum Applications {
     // profile of a researcher
     ResearcherProfile,
     ManageResearcherProfile,
-    StudentsList
+
+    //the list of all researches (filterable)
+    ListResearches, StudentsList
 }
diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt
index 0600571..c316597 100644
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@@ -29,7 +29,7 @@ app.manage.profile=Manage profile
 app.studentList=Students List
 app.users=Users
 app.manage.researcherProfile=Manage researcher profile
-app.list.researches = List researches
+app.list.researches=List researches
 request.moreInfos=More Infos
 request.accept=Accept
 request.refuse=Refuse
diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt
index a057080..e86b19b 100644
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@@ -29,7 +29,7 @@ app.manage.profile=Gérer le profil
 app.studentList=Liste des étudiants
 app.users=Utilisateurs
 app.manage.researcherProfile= gérer son profil de chercheur
-app.list.researches = lister les recherches
+app.list.researches=Lister les recherches
 request.moreInfos=Plus d'Infos
 request.accept=Accepter
 request.refuse=Refuser
diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index 1ce1df9..64e048b 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -2,13 +2,14 @@
 import { ref} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {getFile, fetchResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+import {getFile, fetchAllResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("")
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
 
-const researchList = ref(await fetchResearches(1));
+const researchList = ref(await fetchAllResearches());
+const isResearcher = ref(false)
 
 const props = defineProps({
   filters: ref([""]),
@@ -52,7 +53,11 @@ function downloadCoAuthors(){
 function searchInList(list, searchInput) {
   let retList = []
   for (let i = 0; i < list.length; i++) {
-    if (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
+    let researcher = list[i].researcher.user.firstName + " " +list[i].researcher.user.lastName
+    if (isResearcher.value && (lDistance(researcher, searchInput) < 5 || researcher.toUpperCase().indexOf(searchInput.toUpperCase()) > -1)){
+      retList.push(list[i])
+    }
+    if (!isResearcher.value && (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1)){
       retList.push(list[i])
     }
   }
@@ -87,8 +92,12 @@ function lDistance(s,t){
   <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" @downloadPdf="downloadArticle(articleToDisplay)" @downloadBibTex="downloadBibTex(articleToDisplay)"></ArticleComponent>
   <div id="researches">
     <div id="search">
-      <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+      <input v-if="!isResearcher" type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+      <input v-else type="text" id="search-input" placeholder="search for researcher" v-model="input"/>
       <button id="filterButton" @click="openFilter">  Filters </button>
+      <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher">  Toggle Researcher Search</button>
+      <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  UnToggle Researcher Search</button>
+
     </div>
     <ul id="researchUL">
       <li id="researchLi" v-for="n in searchInList(researchList,input)">
@@ -102,4 +111,95 @@ function lDistance(s,t){
 
 <style scoped>
 
+#main {
+  height: 100%;
+  width: 100%;
+}
+
+#search{
+  width: 100%;
+  height: 10%;
+  display: inline-flex;
+}
+#search-input {
+  margin-left: 25px;
+  width: 75%;
+  font-size: 16px;
+  padding: 12px 20px 12px 40px;
+  border: 1px solid #ddd;
+  height: 20px;
+  align-self: center;
+}
+
+#filterButton {
+  align-self: center;
+  margin-left: 2px;
+  font-size: xx-large;
+  color: white;
+  background: rgba(191, 64, 191,0.5);
+  border:2px solid black;
+}
+#filterButton:hover{
+  background: rgba(191, 64, 191);
+}
+
+
+#researchUL {
+  list-style-type: none;
+  color: white;
+  padding: 12px;
+  margin: 5px;
+  height: 100%;
+  overflow: scroll;
+}
+#researchLi{
+  display: grid;
+  grid-template-columns: auto auto auto;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  text-align: center;
+  text-indent: 7px;
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius: 18px;
+  margin-bottom: 15px;
+}
+a{
+  color:#007aff;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.vl {
+  border-right: 2px solid black;
+}
+
+#unToggledResearchButton{
+  align-self: center;
+  margin-left: 2px;
+  font-size: large;
+  color: white;
+  background: #2a1981;
+  border:2px solid black;
+}
+
+#unToggledResearchButton:hover{
+  background: #5ac8fa;
+
+}
+
+#toggledResearchButton {
+  align-self: center;
+  margin-left: 2px;
+  font-size: large;
+  color: white;
+  background: crimson;
+  border:2px solid black;
+}
+#toggledResearchButton:hover{
+  background: #ff2d55;
+}
+
+
+
 </style>
\ No newline at end of file
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index c5437dc..9231367 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -23,7 +23,7 @@ export async function postResearch(data){
     return restPost("/research", data)
 }
 
-export async function fetchResearches(){
+export async function fetchAllResearches(){
     return restGet("/researches")
 }
 

From a168d41aeeb1c79102671158dca44a37041ff614 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Fri, 19 Apr 2024 12:35:07 +0200
Subject: [PATCH 53/66] link listResearchers to ResearcherProfile

---
 frontend/src/App.vue                          |  2 +-
 .../ScientificPublications/ListResearches.vue | 12 +++++----
 .../ResearcherProfile.vue                     | 25 +++++++++++--------
 .../ScientificPublications/ManageResearch.js  |  4 +--
 .../ResearcherProfile.js                      |  4 +++
 frontend/src/rest/apps.js                     |  6 +++--
 6 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 6dcad67..6a17f6c 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -165,7 +165,7 @@ window.addEventListener('hashchange', () => {
 		border-color:black;
 		height: 100%;
 		position: fixed;
-		overflow:;
+		overflow: scroll;
 		transition-duration: .3s;
 	}
 
diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index 64e048b..6c63efa 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -3,6 +3,7 @@ import { ref} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 import {getFile, fetchAllResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+import {fetchResearch} from "@/rest/ScientificPublications/ResearcherProfile.js";
 const input = ref("")
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
@@ -37,9 +38,10 @@ const downloadBibTex = (research) => {
   getFile(research.bibTexLocation)
 }
 
-const downloadArticle = (research) => {
-  addView(research.pdfLocation)
-  getFile(research.pdfLocation)
+async function downloadArticle (research){
+  await addView(research.pdfLocation)
+  await getFile(research.pdfLocation)
+  articleToDisplay.value = await fetchResearch(articleToDisplay.value.id)
 }
 
 function downloadCoAuthors(){
@@ -97,12 +99,12 @@ function lDistance(s,t){
       <button id="filterButton" @click="openFilter">  Filters </button>
       <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher">  Toggle Researcher Search</button>
       <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  UnToggle Researcher Search</button>
-
     </div>
     <ul id="researchUL">
       <li id="researchLi" v-for="n in searchInList(researchList,input)">
         <div class="vl"> {{n.title}}</div>
-        <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
+        <div class="vl"> <a :href="'#/researcher-profile?id=' + n.researcher.id"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</a>
+        </div>
         <a @click="openResearch(n)"> MoreInfo  </a></li>
     </ul>
   </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 473263e..4c9baea 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -9,7 +9,7 @@
 import { ref, reactive } from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {fetchResearcher, fetchResearches, fetchStats} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {fetchResearcher, fetchResearches, fetchStats, fetchResearch} from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getFile, addView} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("");
 const statsOf = ref("");
@@ -20,16 +20,18 @@ const articleToDisplay = ref(Object)
 const filters = ref([]);
 let chart;
 
-const researchList = ref(await fetchResearches(1));
-//todo changer dynamiquement le 1 ici en fct de sur quel profil on est
-const researcher = ref(await fetchResearcher(1));
-const stats = ref(await fetchStats(1))
+const researcherId = window.location.href.split("=")[1]
 
 const props = defineProps({
-  researcherId: ref(), //int
-  filters: ref([""]),
+  filters: ref([]),
 });
 
+
+
+const researchList = ref(await fetchResearches(researcherId));
+const researcher = ref(await fetchResearcher(researcherId));
+const stats = ref(await fetchStats(researcherId))
+
 const openFilter = () => {
   isFilterOpened.value = true;
 };
@@ -52,9 +54,12 @@ const downloadBibTex = (research) => {
   getFile(research.bibTexLocation)
 }
 
-const downloadArticle = (research) => {
-  addView(research.pdfLocation)
-  getFile(research.pdfLocation)
+async function downloadArticle (research) {
+  await addView(research.pdfLocation)
+  await getFile(research.pdfLocation)
+  articleToDisplay.value = await fetchResearch(articleToDisplay.value.id)
+  stats.value = await fetchStats(researcher.value.id)
+  update()
 }
 
 function downloadCoAuthors(){
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index 9231367..49d7ab9 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -29,8 +29,8 @@ export async function fetchAllResearches(){
 
 export async function getFile(url){
     const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
-    await fetch(restURL + "/"+url, {method: "GET"})
+    await fetch(restURL + "/" + url, {method: "GET"})
 }
 export async function addView(url){
-    return restPost("/addview/" +url)
+    return restPost("/addview/" + url)
 }
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index 54422f6..8e98605 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -10,4 +10,8 @@ export async function fetchResearches(id){
 
 export async function fetchStats(id){
     return restGet("/stats/" +id)
+}
+
+export async function fetchResearch(id){
+    return restGet("/research/" +id)
 }
\ No newline at end of file
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index 59ba05d..e3293f0 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -14,6 +14,7 @@ import Msg from "@/Apps/Msg.vue"
 import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
 import ManageResearcherProfile from "@/Apps/ScientificPublications/ManageResearcherProfile.vue";
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
+import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
 
 const apps = {
 		'/login': LoginPage,
@@ -24,7 +25,8 @@ const apps = {
 		'/students-list' : Students,
 		'/manage-researcher-profile' : ManageResearcherProfile,
 		'/msg' : Msg,
-		'/researches' : ListResearches
+		'/researches' : ListResearches,
+		'/researcher-profile': ResearcherProfile
 }
 
 const appsList = {
@@ -44,7 +46,7 @@ const appsList = {
 const currentPath = ref(window.location.hash)
 
 export const currentView = computed(() => {
-		return apps[currentPath.value.slice(1) || '/']
+		return apps[currentPath.value.split("?")[0].slice(1) || '/']
 })
 
 /**

From e998fb2ab4794594074596ea28953d003b49a58b Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Fri, 19 Apr 2024 17:13:15 +0200
Subject: [PATCH 54/66] aled

---
 .../ScientificPublications/ListResearches.vue | 22 +---------
 .../ResearchComponent.vue                     | 42 +++++++++++++++----
 .../ScientificPublications/ManageResearch.js  |  2 +-
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index 6c63efa..5ce4fd5 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -2,8 +2,7 @@
 import { ref} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {getFile, fetchAllResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
-import {fetchResearch} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import { fetchAllResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("")
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
@@ -34,23 +33,6 @@ const closeResearch = () => {
   articleToDisplay.value = null;
 }
 
-const downloadBibTex = (research) => {
-  getFile(research.bibTexLocation)
-}
-
-async function downloadArticle (research){
-  await addView(research.pdfLocation)
-  await getFile(research.pdfLocation)
-  articleToDisplay.value = await fetchResearch(articleToDisplay.value.id)
-}
-
-function downloadCoAuthors(){
-  //todo
-  const data = JSON.stringify(researcher.value);
-  const blob = new Blob([data], {type:"application/json"});
-  return URL.createObjectURL(blob);
-}
-
 
 function searchInList(list, searchInput) {
   let retList = []
@@ -91,7 +73,7 @@ function lDistance(s,t){
 <template>
 <div id="main">
   <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" @downloadPdf="downloadArticle(articleToDisplay)" @downloadBibTex="downloadBibTex(articleToDisplay)"></ArticleComponent>
+  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" ></ArticleComponent>
   <div id="researches">
     <div id="search">
       <input v-if="!isResearcher" type="text" id="search-input" placeholder="search for researches" v-model="input"/>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 2ba631a..33dabec 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -8,13 +8,17 @@
 <script setup xmlns="http://www.w3.org/1999/html">
 import {ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-import {patchArticle, deleteArticle} from "@/rest/ScientificPublications/ManageResearch.js";
+import {patchArticle, deleteArticle, addView} from "@/rest/ScientificPublications/ManageResearch.js";
 
+const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
 const props = defineProps({
   isOpen: Boolean,
   article: ref(Object),
   manage:Boolean,
 });
+
+
+
 function format(date){
   let split = date.split("-")
   let month = split[1]
@@ -23,7 +27,7 @@ function format(date){
   return day +"/"+ month +"/"+ year
 }
 
-const emit = defineEmits(["modal-close","downloadPdf","downloadBibTex","modified"]);
+const emit = defineEmits(["modal-close","modified"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))
@@ -34,6 +38,7 @@ function cancelChanges(){
   toModify= Object.assign({}, {});
   emit('modal-close')
 }
+
 async function confirmChanges(){
   await patchArticle(props.article.id, toModify)
   toModify= Object.assign({}, {});
@@ -46,7 +51,26 @@ async function deleteThisArticle(){
   emit('modal-close')
   emit("modified")
 }
+function downloadPdf(){
+  return (restURL + "/" + props.article.pdfLocation)
+}
 
+function downloadBibTex(){
+  return (restURL + "/" + props.article.bibTexLocation)
+}
+
+async function articleClicked(){
+  await addView(props.article.pdfLocation)
+  emit('modal-close')
+}
+
+/**
+function downloadCoAuthors(){
+  //todo
+  const data = JSON.stringify(researcher.value);
+  const blob = new Blob([data], {type:"application/json"});
+  return URL.createObjectURL(blob);
+} **/
 
 </script>
 
@@ -55,7 +79,6 @@ async function deleteThisArticle(){
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div ><ul>
-
           <li>Article Id : {{article.id}}</li>
           <li>Title : {{article.title}}</li>
           <li>Author : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
@@ -67,11 +90,10 @@ async function deleteThisArticle(){
           <li>Views : {{article.views}}</li>
           <li>Access : {{article.access}}</li>
         </ul>
-          <div id="downloads" v-if="article.pdfLocation !== null && !manage">
-            <button @click.stop="emit('downloadBibTex')">Download BibTex</button>
-            <button @click.stop="emit('downloadPdf')">Download Research</button>
-          </div>
-
+          <button @click="console.log(props.article)"> infos</button>
+          <div id="downloads" v-if="article !== null && !manage">
+            <a :href=downloadPdf() @click.stop="articleClicked" target="_blank">See Research</a>
+            <a :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">See bibTex</a> </div>
         </div>
         <div v-if="manage">
           <div>
@@ -125,7 +147,7 @@ async function deleteThisArticle(){
 #downloads {
   text-align: end;
 }
-#downloads button {
+#downloads a {
   align-self: center;
   margin-left: 2px;
   font-size: large;
@@ -133,6 +155,8 @@ async function deleteThisArticle(){
   background: rgba(191, 64, 191,0.5);
   border:2px solid black;
   border-radius: 5px;
+  text-underline-mode: none;
+  text-decoration: none;
 }
 #downloads button:hover{
   background: rgba(191, 64, 191);
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index 49d7ab9..27750a7 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -29,7 +29,7 @@ export async function fetchAllResearches(){
 
 export async function getFile(url){
     const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
-    await fetch(restURL + "/" + url, {method: "GET"})
+    return await fetch(restURL + "/" + url, {method: "GET"})
 }
 export async function addView(url){
     return restPost("/addview/" + url)

From be7f42aafe15c7de57d4e9945808c34768c2ff2c Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Fri, 19 Apr 2024 17:37:59 +0200
Subject: [PATCH 55/66] fixed POST addview

---
 .../ScientificPublications/ResearchController.java         | 7 ++++---
 .../ScientificPublications/ResearchRepository.java         | 2 ++
 .../src/Apps/ScientificPublications/ResearchComponent.vue  | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index 36b72db..3524d30 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -229,10 +229,11 @@ public class ResearchController {
 
     ///////
     //views part
-    @PostMapping("/addview/{url}")
+    @PostMapping("/addview/cdn/{url}")
     public ResponseEntity<ResearchDTO> addView(@PathVariable String url){
-        Research research = researchesServ.getResearchByUrl(url);
-        if (research ==null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        System.out.println(url);
+        Research research = researchesServ.getResearchByUrl("cdn/" + url);
+        if (research ==null) return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 
         return new ResponseEntity<>(ResearchDTO.construct(researchesServ.addView(research)), HttpStatus.OK);
     }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
index ace303d..f2d1cf2 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
@@ -1,5 +1,6 @@
 package ovh.herisson.Clyde.Repositories.ScientificPublications;
 
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
@@ -12,6 +13,7 @@ public interface ResearchRepository extends CrudRepository<Research,Long> {
 
     Iterable<Research> findByAuthor(Researcher author);
 
+    @Query("select r from Research r where r.pdfLocation = ?1")
     Research findByPdfLocation(String url);
 
 }
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 33dabec..a725ec3 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -62,6 +62,7 @@ function downloadBibTex(){
 async function articleClicked(){
   await addView(props.article.pdfLocation)
   emit('modal-close')
+  emit('modified')
 }
 
 /**

From 6077e65b501644344ae7c91f421cec16e21abed6 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Fri, 19 Apr 2024 19:54:51 +0200
Subject: [PATCH 56/66] added v-if to bibtex download

---
 .../Clyde/DTO/ScientificPublications/ResearchDTO.java       | 6 ++++--
 .../src/Apps/ScientificPublications/ResearchComponent.vue   | 5 ++---
 .../src/Apps/ScientificPublications/ResearcherProfile.vue   | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
index c565735..d56372b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
@@ -24,13 +24,14 @@ public class ResearchDTO {
     private Date releaseDate;
     private PaperType paperType;
     private String pdfLocation;
+    private String bibTexLocation;
     private String language;
     private Access access;
     private String domain;
     private String summary;
     private long views;
 
-    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain, String summary, long id,long views) {
+    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain,String bibTexLocation, String summary, long id,long views) {
         this.title = title;
         this.researcher = researcherDTO;
         this.releaseDate = releaseDate;
@@ -41,6 +42,7 @@ public class ResearchDTO {
         this.domain = domain;
         this.summary = summary;
         this.id = id;
+        this.bibTexLocation = bibTexLocation;
         this.views = views;
     }
 
@@ -48,6 +50,6 @@ public class ResearchDTO {
     public static ResearchDTO construct(Research research){
         return new ResearchDTO(research.getTitle(), ResearcherDTO.construct(research.getAuthor()), research.getReleaseDate(),
                 research.getPaperType(),research.getPdfLocation(),research.getLanguage(),research.getAccess(),
-                research.getDomain(), research.getSummary(), research.getId(), research.getViews());
+                research.getDomain(),research.getBibTexLocation(), research.getSummary(), research.getId(), research.getViews());
     }
 }
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index a725ec3..ede5086 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -91,10 +91,9 @@ function downloadCoAuthors(){
           <li>Views : {{article.views}}</li>
           <li>Access : {{article.access}}</li>
         </ul>
-          <button @click="console.log(props.article)"> infos</button>
-          <div id="downloads" v-if="article !== null && !manage">
+          <div id="downloads" v-if="article.pdfLocation !== null && !manage">
             <a :href=downloadPdf() @click.stop="articleClicked" target="_blank">See Research</a>
-            <a :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">See bibTex</a> </div>
+            <a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">See bibTex</a> </div>
         </div>
         <div v-if="manage">
           <div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 4c9baea..850aab7 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -17,11 +17,10 @@ const statsBy = ref("");
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
-const filters = ref([]);
+const filters = ref();
 let chart;
 
 const researcherId = window.location.href.split("=")[1]
-
 const props = defineProps({
   filters: ref([]),
 });

From 041fe7f95ddfbf1ab8a1edc994d568217bda510c Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sat, 20 Apr 2024 01:12:37 +0200
Subject: [PATCH 57/66] filter and abstraction of researchList

---
 .../FilterComponent.vue                       |  49 +++++---
 .../ScientificPublications/ListResearches.vue |  64 +++++++---
 .../ManageResearcherProfile.vue               |  20 +--
 .../ResearchComponent.vue                     |   1 -
 .../ResearchPostComponent.vue                 |  25 +---
 .../ResearcherProfile.vue                     | 114 +-----------------
 .../ScientificPublications/ManageResearch.js  |   7 --
 7 files changed, 85 insertions(+), 195 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index acda36b..2bba29b 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -7,7 +7,6 @@
 <script setup>
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-let checked = ref([])
 const yearList = ref([])
 const monthList = ref([])
 const accessList = ref([])
@@ -15,27 +14,44 @@ const languageList = ref([])
 const domainList = ref([])
 const paperTypeList = ref([])
 
+const filters = Object.assign({},{
+  year:[],
+  month:[],
+  access:[],
+  language:[],
+  domain:[],
+  paperType:[],
+})
+
 const props = defineProps({
   isOpen: Boolean,
   allArticles: ref([Object])
 });
 
+
+function submit(){
+  emit("modal-close")
+  emit("submit", filters)
+}
+
+
+
 for (let i=0;i< props.allArticles.length;i++) {
   let r = props.allArticles[i];
   let year = r.releaseDate.split("-")[0]
   let month = r.releaseDate.split("-")[1]
 
-  if (!yearList.value.includes(year)) yearList.value.push(year);
+  if (!yearList.value.includes(year) && year !== null) yearList.value.push(year);
 
-  if (!monthList.value.includes(month)) monthList.value.push(month);
+  if (!monthList.value.includes(month) && month !== null) monthList.value.push(month);
 
-  if (!accessList.value.includes(r.access)) accessList.value.push(r.access);
+  if (!accessList.value.includes(r.access) && r.access !== null ) accessList.value.push(r.access);
 
-  if (!languageList.value.includes(r.language)) languageList.value.push(r.language);
+  if (!languageList.value.includes(r.language) && r.language !== null) languageList.value.push(r.language);
 
-  if (!domainList.value.includes(r.domain)) domainList.value.push(r.domain);
+  if (!domainList.value.includes(r.domain) && r.domain !== null) domainList.value.push(r.domain);
 
-  if (!paperTypeList.value.includes(r.paperType)) paperTypeList.value.push(r.paperType);
+  if (!paperTypeList.value.includes(r.paperType) && r.paperType !== null) paperTypeList.value.push(r.paperType);
 }
 function monthToString(month){
 
@@ -68,10 +84,7 @@ function monthToString(month){
       return "unknown"
   }
 }
-
-
-
-const emit = defineEmits(["modal-close"]);
+const emit = defineEmits(["modal-close", "submit"]);
 
 const target = ref(null)
 onClickOutside(target, ()=>emit('modal-close'))
@@ -83,15 +96,15 @@ onClickOutside(target, ()=>emit('modal-close'))
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div id="filterGrid">
-          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="checked"> {{monthToString(n)}} </li> </ul> </div>
-          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
-          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="checked"> {{n}} </li> </ul> </div>
+          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="filters.year"> {{n}} </li> </ul> </div>
+          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="filters.access"> {{n}} </li> </ul> </div>
+          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="filters.language"> {{n}} </li> </ul> </div>
+          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="filters.month"> {{monthToString(n)}} </li> </ul> </div>
+          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="filters.domain"> {{n}} </li> </ul> </div>
+          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="filters.paperType"> {{n}} </li> </ul> </div>
       </div>
         <div id="submit">
-          <button @click.stop="emit('modal-close', 'submit')">Submit</button>
+          <button @click.stop="submit">Submit</button>
         </div>
       </div>
   </div>
diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index 5ce4fd5..8a04c15 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -1,28 +1,45 @@
 <script setup>
-import { ref} from "vue";
+import {ref, watch} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import { fetchAllResearches, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+import {fetchAllResearches} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("")
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
-
-const researchList = ref(await fetchAllResearches());
 const isResearcher = ref(false)
+const filters = ref(null)
+const researchList = ref(await fetchAllResearches())
+
 
 const props = defineProps({
-  filters: ref([""]),
+  researchList:ref(),
+  manage:Boolean
 });
 
+if (typeof props.researchList !== 'undefined'){
+  researchList.value = props.researchList
+}
+watch(
+    () => props.researchList,
+    (newValue) => {
+      researchList.value = newValue
+    }
+);
+
+
 const openFilter = () => {
   isFilterOpened.value = true;
 };
 const closeFilter = () => {
   isFilterOpened.value = false;
 };
-const submitFilters = ()=>{
+const submitFilters = (receivedFilters)=>{
+  filters.value = receivedFilters
+  console.log(filters.value)
 }
+
+
 const openResearch = (article) => {
   isResearchOpened.value = true;
   articleToDisplay.value = article;
@@ -42,7 +59,20 @@ function searchInList(list, searchInput) {
       retList.push(list[i])
     }
     if (!isResearcher.value && (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1)){
-      retList.push(list[i])
+
+      if (filters.value === null) {
+        retList.push(list[i])
+        continue;
+      }
+      if ( (filters.value.access.length === 0 || filters.value.access.includes(list[i].access))
+          && ( filters.value.domain.length === 0|| filters.value.domain.includes(list[i].domain))
+          && ( filters.value.paperType.length === 0 || filters.value.paperType.includes(list[i].paperType))
+          && ( filters.value.year.length === 0|| filters.value.year.includes(list[i].releaseDate.split("-")[0]))
+          && ( filters.value.month.length === 0|| filters.value.month.includes(list[i].releaseDate.split("-")[1]))
+          && ( filters.value.language.length === 0|| filters.value.language.includes(list[i].language)))
+      {
+        retList.push(list[i])
+      }
     }
   }
   return retList
@@ -68,17 +98,19 @@ function lDistance(s,t){
   return arr[t.length][s.length];
 }
 
+const emit = defineEmits(["modified"]);
+
 </script>
 
 <template>
-<div id="main">
-  <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" ></ArticleComponent>
+<div id="researches">
+  <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
+  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="props.manage" @modal-close="closeResearch" @modified="emit('modified')"></ArticleComponent>
   <div id="researches">
     <div id="search">
       <input v-if="!isResearcher" type="text" id="search-input" placeholder="search for researches" v-model="input"/>
       <input v-else type="text" id="search-input" placeholder="search for researcher" v-model="input"/>
-      <button id="filterButton" @click="openFilter">  Filters </button>
+      <button v-if="!isResearcher" id="filterButton" @click="openFilter">  Filters </button>
       <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher">  Toggle Researcher Search</button>
       <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  UnToggle Researcher Search</button>
     </div>
@@ -87,7 +119,8 @@ function lDistance(s,t){
         <div class="vl"> {{n.title}}</div>
         <div class="vl"> <a :href="'#/researcher-profile?id=' + n.researcher.id"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</a>
         </div>
-        <a @click="openResearch(n)"> MoreInfo  </a></li>
+        <a v-if="!manage" @click="openResearch(n)"> MoreInfo  </a>
+        <a v-else @click="openResearch(n)"> Modify Research</a></li>
     </ul>
   </div>
 </div>
@@ -95,11 +128,6 @@ function lDistance(s,t){
 
 <style scoped>
 
-#main {
-  height: 100%;
-  width: 100%;
-}
-
 #search{
   width: 100%;
   height: 10%;
@@ -161,7 +189,7 @@ a{
 #unToggledResearchButton{
   align-self: center;
   margin-left: 2px;
-  font-size: large;
+  font-size:16px ;
   color: white;
   background: #2a1981;
   border:2px solid black;
diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index bff8b98..41dc3c9 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -5,6 +5,7 @@ import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vu
 import {fetchResearches, } from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getSelf, patchProfile} from "@/rest/ScientificPublications/ManageResearcherProfile.js";
 import ResearchPostComponent from "@/Apps/ScientificPublications/ResearchPostComponent.vue";
+import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 const input = ref("");
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
@@ -16,10 +17,7 @@ let toModify= Object.assign({}, {});
 
 const researcher = ref(await getSelf());
 const researchList = ref(await fetchResearches(researcher.value.id));
-
-const props = defineProps({
-  filters: ref([]),
-});
+//todo get the filters
 
 const openFilter = () => {
   isFilterOpened.value = true;
@@ -90,7 +88,6 @@ async function modifiedResearch(){
 }
 
 
-
 </script>
 
 <template> <div class="body"><div id="main">
@@ -129,18 +126,7 @@ async function modifiedResearch(){
 
 
     </div>
-    <div id="researches">
-      <div id="search">
-        <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
-        <button id="filterButton" @click="openFilter">  Filters </button>
-      </div>
-      <ul id="researchUL">
-        <li id="researchLi" v-for="n in searchInList(researchList,input)">
-          <div class="vl"> {{n.title}}</div>
-          <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
-         <a @click="openResearch(n)"> Modify Research</a></li>
-      </ul>
-    </div>
+    <div id="researches"> <ListResearches :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div>
   </div>
 </div>
 </template>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index ede5086..0644895 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -18,7 +18,6 @@ const props = defineProps({
 });
 
 
-
 function format(date){
   let split = date.split("-")
   let month = split[1]
diff --git a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
index 087c660..f3e1684 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
@@ -2,8 +2,7 @@
 
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-import {uploadPdf, uploadBibTex,postResearch} from "@/rest/ScientificPublications/ManageResearch.js";
-import i18n from "@/i18n.js";
+import {uploadPdf,postResearch} from "@/rest/ScientificPublications/ManageResearch.js";
 let toPost = Object.assign({}, {});
 
 const props = defineProps({
@@ -16,9 +15,9 @@ async function uploadResearchPdf(pdf){
   const data = await uploadPdf(pdf);
   toPost.pdfLocation = data.url;
 }
-async function uploadResearchBibTexPdf(pdf){
+async function uploadBibTex(pdf){
   const data = await uploadPdf(pdf);
-  toPost.pdfLocation = data.url;
+  toPost.bibTexLocation = data.url;
 }
 
 // Date when sent!!
@@ -114,10 +113,6 @@ onClickOutside(target, ()=>emit('modal-close'))
   margin-top: 9px;
 }
 
-
-#downloads {
-  text-align: end;
-}
 #downloads button {
   align-self: center;
   margin-left: 2px;
@@ -131,20 +126,6 @@ onClickOutside(target, ()=>emit('modal-close'))
   background: rgba(191, 64, 191);
 }
 
-#deleteButton{
-  margin-left: 80%;
-  align-self: center;
-  text-align: center;
-  border: 2px solid black;
-  color: white;
-  font-size: large;
-  border-radius: 20px;
-  background-color: red;
-}
-
-#deleteButton:hover{
-  background: #ff2d55;
-}
 
 #cancelButton{
   align-self: center;
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 850aab7..e685989 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -11,38 +11,27 @@ import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 import {fetchResearcher, fetchResearches, fetchStats, fetchResearch} from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getFile, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
 const articleToDisplay = ref(Object)
-const filters = ref();
 let chart;
 
 const researcherId = window.location.href.split("=")[1]
-const props = defineProps({
-  filters: ref([]),
-});
-
 
 
 const researchList = ref(await fetchResearches(researcherId));
 const researcher = ref(await fetchResearcher(researcherId));
 const stats = ref(await fetchStats(researcherId))
 
-const openFilter = () => {
-  isFilterOpened.value = true;
-};
 const closeFilter = () => {
   isFilterOpened.value = false;
 };
 const submitFilters = ()=>{
 }
-const openResearch = (article) => {
-  isResearchOpened.value = true;
-  articleToDisplay.value = article;
-}
 
 const closeResearch = () => {
   isResearchOpened.value =false;
@@ -67,37 +56,6 @@ function downloadCoAuthors(){
   return URL.createObjectURL(blob);
 }
 
-
-function searchInList(list, searchInput) {
-  let retList = []
-  for (let i = 0; i < list.length; i++) {
-    if (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
-      retList.push(list[i])
-    }
-  }
-  return retList
-}
-
-function lDistance(s,t){
-  if (!s.length) return t.length;
-  if (!t.length) return s.length;
-  const arr = [];
-  for (let i = 0; i <= t.length; i++) {
-    arr[i] = [i];
-    for (let j = 1; j <= s.length; j++) {
-      arr[i][j] =
-          i === 0
-              ? j
-              : Math.min(
-                  arr[i - 1][j] + 1,
-                  arr[i][j - 1] + 1,
-                  arr[i - 1][j - 1] + (s[j - 1] === t[i - 1] ? 0 : 1)
-              );
-    }
-  }
-  return arr[t.length][s.length];
-}
-
 const options = reactive({
     backgroundColor:null,
     theme: "light2",
@@ -171,18 +129,7 @@ function update(){
 		  <CanvasJSChart :options="options" id=chart @chart-ref="c => chart = c "/>
       </div>
     </div>
-    <div id="researches">
-      <div id="search">
-        <input type="text" id="search-input" placeholder="search for researches" v-model="input"/>
-        <button id="filterButton" @click="openFilter">  Filters </button>
-      </div>
-      <ul id="researchUL">
-        <li id="researchLi" v-for="n in searchInList(researchList,input)">
-          <div class="vl"> {{n.title}}</div>
-          <div class="vl"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</div>
-         <a @click="openResearch(n)"> MoreInfo  </a></li>
-      </ul>
-    </div>
+    <div id="researches"><list-researches :researchList="researchList"></list-researches></div>
   </div>
 </template>
 
@@ -233,66 +180,9 @@ function update(){
   font-size: large;
 }
 
-#statsPie {
-
-}
-
-#search{
-  width: 100%;
-  height: 10%;
-  display: inline-flex;
-}
-#search-input {
-  margin-left: 25px;
-  width: 75%;
-  font-size: 16px;
-  padding: 12px 20px 12px 40px;
-  border: 1px solid #ddd;
-  height: 20px;
-  align-self: center;
-}
-
-#filterButton {
-  align-self: center;
-  margin-left: 2px;
-  font-size: xx-large;
-  color: white;
-  background: rgba(191, 64, 191,0.5);
-  border:2px solid black;
-}
-#filterButton:hover{
-  background: rgba(191, 64, 191);
-}
-
-
-#researchUL {
-  list-style-type: none;
-  color: white;
-  padding: 12px;
-  margin: 5px;
-  height: 400px;
-  overflow: scroll;
-}
-#researchLi{
-  display: grid;
-  grid-template-columns: auto auto auto;
-  border: 2px solid black;
-  color: white;
-  font-size: x-large;
-  text-align: center;
-  text-indent: 7px;
-  background-color: rgba(255, 255, 255, 0.09);
-  border-radius: 18px;
-  margin-bottom: 15px;
-}
 a{
   color:#007aff;
   text-decoration: underline;
   cursor: pointer;
 }
-
-.vl {
-  border-right: 2px solid black;
-}
-
 </style>
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index 27750a7..025c14d 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -12,13 +12,6 @@ export async function uploadPdf(file){
 
     return restPostFile("/upload/Research", formData);
 }
-export async function uploadBibTex(file){
-    const formData = new FormData();
-    formData.append("file", file[0]);
-
-    return restPostFile("/upload/Research", formData);
-}
-
 export async function postResearch(data){
     return restPost("/research", data)
 }

From 54d19eb888b98362ba15fc5d9323570e8e07edfa Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sat, 20 Apr 2024 19:07:27 +0200
Subject: [PATCH 58/66] added Co Author

---
 backend/build.gradle.kts                      |   2 +-
 .../ScientificPublications/ResearchDTO.java   |  12 +-
 .../Clyde/EndPoints/MockController.java       |  19 +-
 .../ResearchController.java                   |  76 +-------
 .../ResearchCoAuthorsRepository.java          |  18 --
 .../ResearchesService.java                    | 165 +++++++++---------
 .../ScientificPublications/Research.java      |  14 +-
 .../ResearchCoAuthors.java                    |  42 -----
 .../ScientificPublications/Researcher.java    |   1 +
 .../ScientificPublications/ListResearches.vue |  19 +-
 .../ResearchComponent.vue                     |  20 ++-
 .../ResearchPostComponent.vue                 |  35 +++-
 .../ResearcherProfile.vue                     |   9 +-
 .../ScientificPublications/ManageResearch.js  |   5 +-
 14 files changed, 186 insertions(+), 251 deletions(-)
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index 8fe2246..794631f 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	// developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")
diff --git a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
index d56372b..5c8f2b3 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/DTO/ScientificPublications/ResearchDTO.java
@@ -12,8 +12,11 @@ import lombok.Data;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Access;
 import ovh.herisson.Clyde.Tables.ScientificPublications.PaperType;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
+import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
 
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 @Data
 public class ResearchDTO {
@@ -21,6 +24,7 @@ public class ResearchDTO {
     private long id;
     private String title;
     private ResearcherDTO researcher;
+    private final Set<ResearcherDTO> coAuthors;
     private Date releaseDate;
     private PaperType paperType;
     private String pdfLocation;
@@ -31,7 +35,7 @@ public class ResearchDTO {
     private String summary;
     private long views;
 
-    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain,String bibTexLocation, String summary, long id,long views) {
+    private ResearchDTO(String title, ResearcherDTO researcherDTO, Date releaseDate, PaperType paperType, String pdfLocation, String language, Access access, String domain, String bibTexLocation, String summary, Set<Researcher> coAuthors, long id, long views) {
         this.title = title;
         this.researcher = researcherDTO;
         this.releaseDate = releaseDate;
@@ -43,6 +47,10 @@ public class ResearchDTO {
         this.summary = summary;
         this.id = id;
         this.bibTexLocation = bibTexLocation;
+        this.coAuthors = new HashSet<>();
+        for (Researcher coAuthor: coAuthors) {
+            this.coAuthors.add(ResearcherDTO.construct(coAuthor));
+        }
         this.views = views;
     }
 
@@ -50,6 +58,6 @@ public class ResearchDTO {
     public static ResearchDTO construct(Research research){
         return new ResearchDTO(research.getTitle(), ResearcherDTO.construct(research.getAuthor()), research.getReleaseDate(),
                 research.getPaperType(),research.getPdfLocation(),research.getLanguage(),research.getAccess(),
-                research.getDomain(),research.getBibTexLocation(), research.getSummary(), research.getId(), research.getViews());
+                research.getDomain(),research.getBibTexLocation(), research.getSummary(), research.getCoAuthors(),research.getId(), research.getViews());
     }
 }
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 ed49140..ad6f18f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -19,9 +19,7 @@ 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;
+import java.util.*;
 
 @RestController
 @CrossOrigin(originPatterns = "*", allowCredentials = "true")
@@ -138,24 +136,29 @@ public class MockController {
             // extension Publications Scientifiques
             Researcher jojoResearcherAccount = new Researcher(jojo, "3363-22555-AB33-T", null, "IT");
 
+            Researcher joResearchAccount = new Researcher(joe,"N555-321213-BED-DD",null, "Physics");
+
+
             Researcher output = researchesService.saveResearcher(jojoResearcherAccount);
+            Researcher joOutput = researchesService.saveResearcher(joResearchAccount);
+
+            Set<Researcher> coAuthor = new HashSet<>();
+            coAuthor.add(joOutput);
 
             Research jojoResearch = new Research("Graphs : Advanced Search Algorithms", output, new Date(0),
                     PaperType.Article, "test.pdf", null, "english",
-                    Access.OpenSource, "IT", "This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms");
-
+                    Access.OpenSource, "IT", "This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms",coAuthor);
             Research restrictedResearch = new Research("just another Name", output, new Date(1111111111),
                     PaperType.Article, "restricted", null, "english",
-                    Access.Restricted, "Restricted", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms");
+                    Access.Restricted, "Restricted", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms", new HashSet<>());
 
             Research privateResearch = new Research("the great Potato War", output, new Date(),
                     PaperType.Article, "private", null, "english",
-                    Access.Private, "private", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms");
+                    Access.Private, "private", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms",null);
 
 
             researchesService.saveResearch(restrictedResearch);
             researchesService.saveResearch(privateResearch);
-
             researchesService.saveResearch(jojoResearch);
 
     }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
index 3524d30..518147f 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/ResearchController.java
@@ -108,6 +108,7 @@ public class ResearchController {
     }
 
     /** post updates to the research
+     * in the updates, the coAuthors have to be referenced by their ids
      *
      */
     @PatchMapping("/research/{id}")
@@ -152,81 +153,6 @@ public class ResearchController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-
-    /////////////
-    // Co-authors Part
-
-    /** get all the co-authors in a research
-     *
-     * @param id the research id
-     * @return all the co-authors associated with the research
-     */
-    @GetMapping("/research/{id}/co-authors")
-    public  ResponseEntity<Iterable<ResearcherDTO>> getCoAuthors(@PathVariable long id){
-       Research research = researchesServ.getResearchById(id);
-
-       if (research == null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-
-       Iterable<Researcher> researchers= researchesServ.getCoAuthors(research);
-       ArrayList<ResearcherDTO> toReturn = new ArrayList<>();
-
-       for (Researcher researcher: researchers){
-           toReturn.add(ResearcherDTO.construct(researcher));
-       }
-       return new ResponseEntity<>(toReturn,HttpStatus.OK);
-    }
-
-    /** post co-authors to the research
-     *
-     * @param token the Authorization header
-     * @param researchersId the co-authors ids
-     * @param id the research id
-     * @return the added researchers
-     */
-    @PostMapping("/research/{id}/co-authors")
-    public ResponseEntity<Iterable<ResearcherDTO>> postCoAuthor(@RequestHeader("Authorization") String token,
-                                                              @RequestBody Iterable<Long> researchersId,
-                                                              @PathVariable long id)
-    {
-        Research research = researchesServ.getResearchById(id);
-        if (research == null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-
-        if (authServ.isNotIn(new Role[]{Role.Admin}, token) || research.getAuthor() != researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
-            return new UnauthorizedResponse<>(null);
-
-        if (!researchesServ.saveCoAuthors(researchersId,research))
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        ArrayList<ResearcherDTO> toReturn = new ArrayList<>();
-        for (Long reId: researchersId){
-            toReturn.add(ResearcherDTO.construct(researchesServ.getResearcherById(reId)));
-        }
-
-        return  new ResponseEntity<>(toReturn,HttpStatus.OK);
-    }
-
-    /** deletes the co-author with *coAuthorId* from the research with the *researchId*
-     */
-    @DeleteMapping("/research/{researchId}/co-author/{coAuthorId}")
-    public ResponseEntity<String> deleteCoAuthor(@RequestHeader("Authorization") String token,
-                                                 @PathVariable long researchId,
-                                                 @PathVariable long coAuthorId)
-    {
-        Research research = researchesServ.getResearchById(researchId);
-        Researcher coAuthor = researchesServ.getResearcherById(coAuthorId);
-
-        if (authServ.isNotIn(new Role[]{Role.Admin}, token) || research.getAuthor() != researchesServ.getResearcherByUser(authServ.getUserFromToken(token)))
-            return new UnauthorizedResponse<>(null);
-
-        if (coAuthor == null) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-
-       if (!researchesServ.deleteCoAuthor(research, coAuthor))
-           return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-
     ///////
     //views part
     @PostMapping("/addview/cdn/{url}")
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
deleted file mode 100644
index 51f25fb..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchCoAuthorsRepository.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package ovh.herisson.Clyde.Repositories.ScientificPublications;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Curriculum;
-import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
-import ovh.herisson.Clyde.Tables.ScientificPublications.ResearchCoAuthors;
-import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
-
-public interface ResearchCoAuthorsRepository extends CrudRepository<ResearchCoAuthors,Long> {
-   @Query("select distinct rca.coAuthor from ResearchCoAuthors rca where rca.research = ?1")
-   Iterable<Researcher> findResearchCoAuthors(Research research);
-
-
-   @Query("select rca from ResearchCoAuthors rca where rca.research = ?1 and rca.coAuthor =?2")
-  ResearchCoAuthors findResearchCoAuthors(Research research, Researcher researcher);
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index 7b822f7..9916bd8 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -2,47 +2,33 @@ package ovh.herisson.Clyde.Services.ScientificPublications;
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.DTO.ScientificPublications.ResearchDTO;
-import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchCoAuthorsRepository;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchRepository;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearcherRepository;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.ScientificPublications.*;
 import ovh.herisson.Clyde.Tables.User;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @AllArgsConstructor
+@SuppressWarnings("unchecked")
 public class ResearchesService {
 
     private final ResearcherRepository researcherRepo;
-    private final ResearchCoAuthorsRepository researchCoAuthorsRepo;
     private final ResearchRepository articleRepo;
 
-    // Researchers Part
-    public Researcher getResearcherByUser(User user){
-        return researcherRepo.findByUser(user);
-    }
-
-    public boolean isCoAuthor(Research research, Researcher researcher){
-        Iterable<Researcher> coAuthors = researchCoAuthorsRepo.findResearchCoAuthors(research);
-        for (Researcher coAuthor : coAuthors){
-            if (researcher == coAuthor){
-                return true;
-            }
-        }
-        return false;
-    }
-
 
     // researches Part
     public Research getResearchById(long id) {
         return articleRepo.findById(id);
     }
 
+    public Research getResearchByUrl(String url) {
+        return articleRepo.findByPdfLocation(url);
+    }
+
+
     public Iterable<Research> getResearchesByAuthor(long authorId){
         Researcher researcher = researcherRepo.findById(authorId);
         if (researcher == null) return null;
@@ -50,29 +36,6 @@ public class ResearchesService {
         return researcherRepo.findAllByAuthorId(researcher);
     }
 
-    public boolean hasNoAccessTo(Research research, User user){
-
-
-        if (research.getAccess() == Access.OpenSource) return false; // if the access is open source even non-users can see it
-        if (user == null) return true; // else you need at least to be a user
-
-        if (user.getRole() == Role.Admin) return false;
-
-        if (research.getAccess() == Access.Restricted &&
-                user.getRole() == Role.Secretary ||
-                user.getRole() == Role.Teacher || user.getRole() == Role.InscriptionService)
-            return false; // if the access is restricted only the staff member (above) can access the research
-
-        Researcher researcher = getResearcherByUser(user);
-
-        if (researcher==null)
-            return true;
-
-        return (research.getAccess() != Access.Private || research.getAuthor() != researcher) &&
-                (research.getAccess() != Access.Private || !isCoAuthor(research, researcher));
-        // if the researcher is the author or one of the co-authors of the research will return false
-    }
-
     public Research saveResearch(Research research) {
         return articleRepo.save(research);
     }
@@ -98,6 +61,18 @@ public class ResearchesService {
                 case "access":
                     research.setAccess(Access.valueOf((String) entry.getValue()));
                     break;
+                case "coAuthors":
+                    Set<Researcher> set = new HashSet<>();
+
+                    for (int id : (List<Integer>) entry.getValue()) {
+
+                        Researcher r = researcherRepo.findById(id);
+                        if (r != null){
+                            set.add(r);
+                        }
+                    }
+                    research.setCoAuthors(set);
+                    break;
             }
         }
         articleRepo.save(research);
@@ -107,6 +82,12 @@ public class ResearchesService {
         articleRepo.delete(research);
     }
 
+
+    // Researchers Part
+    public Researcher getResearcherByUser(User user){
+        return researcherRepo.findByUser(user);
+    }
+
     public Iterable<Research> getAllResearches() {
         return articleRepo.findAll();
     }
@@ -129,41 +110,6 @@ public class ResearchesService {
        researcherRepo.delete(researcher);
     }
 
-    public boolean saveCoAuthors(Iterable<Long> researchersId, Research research) {
-
-        if (researchersId == null) return false;
-
-        ArrayList<Researcher> toAdd = new ArrayList<>();
-        for (long researcherId : researchersId){
-            Researcher researcher= researcherRepo.findById(researcherId);
-            if (research== null){
-                return false;
-            }
-            if (!toAdd.contains(researcher))
-            {
-                toAdd.add(researcher);
-            }
-        }
-        for (Researcher researcher: toAdd){
-            researchCoAuthorsRepo.save(new ResearchCoAuthors(researcher,research));
-        }
-        return true;
-    }
-
-    public Iterable<Researcher> getCoAuthors(Research research) {
-        return researchCoAuthorsRepo.findResearchCoAuthors(research);
-    }
-
-    public boolean deleteCoAuthor(Research research,Researcher coAuthor) {
-        ResearchCoAuthors result = researchCoAuthorsRepo.findResearchCoAuthors(research,coAuthor);
-
-        if (result ==null)
-            return false;
-
-        researchCoAuthorsRepo.delete(result);
-        return true;
-    }
-
     public void modifyResearcherData(Researcher researcher, Map<String, Object> updates) {
 
         for (Map.Entry<String, Object> entry : updates.entrySet()){
@@ -185,12 +131,69 @@ public class ResearchesService {
         researcherRepo.save(researcher);
     }
 
-    public Research getResearchByUrl(String url) {
-        return articleRepo.findByPdfLocation(url);
+
+    //Co Author part
+    public boolean saveCoAuthors(Iterable<Long> researchersId, Research research) {
+
+        if (researchersId == null) return false;
+
+        ArrayList<Researcher> toAdd = new ArrayList<>();
+        for (long researcherId : researchersId){
+            Researcher researcher= researcherRepo.findById(researcherId);
+            if (researcher== null){
+                return false;
+            }
+            if (!toAdd.contains(researcher))
+            {
+                toAdd.add(researcher);
+            }
+        }
+        research.getCoAuthors().addAll(toAdd);
+        articleRepo.save(research);
+        return true;
     }
 
+    public boolean deleteCoAuthor(Research research,Researcher coAuthor) {
+
+        if (!research.getCoAuthors().contains(coAuthor))
+            return false;
+
+        research.getCoAuthors().remove(coAuthor);
+        articleRepo.save(research);
+        return true;
+    }
+
+    // Other stuff
+
     public Research addView(Research research) {
         research.setViews(research.getViews()+1);
         return articleRepo.save(research);
     }
+
+    public boolean hasNoAccessTo(Research research, User user){
+        if (research.getAccess() == Access.OpenSource) return false; // if the access is open source even non-users can see it
+        if (user == null) return true; // else you need at least to be a user
+
+        if (user.getRole() == Role.Admin) return false;
+
+
+        Researcher researcher = getResearcherByUser(user);
+        if (researcher !=null ){
+            if (research.getAuthor().getId() == researcher.getId())
+                return false;
+
+            for (Researcher coAuthor: research.getCoAuthors()){
+                if (coAuthor.getId() == researcher.getId())
+                    return false;
+            }
+        }
+
+        if (research.getAccess() == Access.Restricted && (
+                user.getRole() == Role.Secretary ||
+                user.getRole() == Role.Teacher || user.getRole() == Role.InscriptionService))
+            return false; // if the access is restricted only the staff member (above) can access the research
+
+        return true;
+        // if the researcher is the author or one of the co-authors of the research will return false
+    }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
index f2fa8ff..da0d714 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
@@ -16,10 +16,14 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
 @Getter
 @Setter
 @NoArgsConstructor
 @Entity
+@Table(name = "Research")
 public class Research {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -51,8 +55,15 @@ public class Research {
 
     private int views;
 
+    @ManyToMany(cascade = {CascadeType.MERGE})
+    @JoinTable(name = "ResearchCoAuhors",
+            joinColumns = @JoinColumn(name = "research_id"),
+            inverseJoinColumns = @JoinColumn(name = "researcher_id")
+    )
+    private Set<Researcher> coAuthors;
+
     public Research(String title, Researcher author, Date releaseDate, PaperType paperType,
-                    String pdfLocation, String bibTexLocation, String language, Access access, String domain, String summary){
+                    String pdfLocation, String bibTexLocation, String language, Access access, String domain, String summary,Set<Researcher> coauthors){
         this.author = author;
         this.title = title;
         this.releaseDate = releaseDate;
@@ -63,6 +74,7 @@ public class Research {
         this.access = access;
         this.domain = domain;
         this.summary = summary;
+        this.coAuthors = coauthors;
     }
 }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
deleted file mode 100644
index dbc293d..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/ResearchCoAuthors.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package ovh.herisson.Clyde.Tables.ScientificPublications;
-
-/******************************************************
- * @file ResearchCoAuthors
- * @author Maxime Bartha
- * @scope Extension Publications scientifiques
- *
- * Co-Authors List entity (will be accessed by Articles)
- *
- ******************************************************/
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@Entity
-public class ResearchCoAuthors {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    Long id;
-
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "Researcher")
-    private Researcher coAuthor;
-
-    @ManyToOne(fetch = FetchType.EAGER)
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @JoinColumn(name = "Article")
-    private Research research;
-
-    public ResearchCoAuthors(Researcher coAuthor, Research research){
-        this.coAuthor = coAuthor;
-        this.research = research;
-    }
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
index 1da105c..4fe8a9d 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
@@ -20,6 +20,7 @@ import ovh.herisson.Clyde.Tables.User;
 @Setter
 @NoArgsConstructor
 @Entity
+@Table(name = "Researcher")
 public class Researcher {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index 8a04c15..0997383 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -106,14 +106,14 @@ const emit = defineEmits(["modified"]);
 <div id="researches">
   <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
   <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="props.manage" @modal-close="closeResearch" @modified="emit('modified')"></ArticleComponent>
+  <div id="search">
+    <input v-if="!isResearcher" type="text" id="search-input" placeholder="search for researches" v-model="input"/>
+    <input v-else type="text" id="search-input" placeholder="search for researcher" v-model="input"/>
+    <button v-if="!isResearcher" id="filterButton" @click="openFilter">  Filters </button>
+    <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher">  Toggle Researcher Search</button>
+    <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  UnToggle Researcher Search</button>
+  </div>
   <div id="researches">
-    <div id="search">
-      <input v-if="!isResearcher" type="text" id="search-input" placeholder="search for researches" v-model="input"/>
-      <input v-else type="text" id="search-input" placeholder="search for researcher" v-model="input"/>
-      <button v-if="!isResearcher" id="filterButton" @click="openFilter">  Filters </button>
-      <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher">  Toggle Researcher Search</button>
-      <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  UnToggle Researcher Search</button>
-    </div>
     <ul id="researchUL">
       <li id="researchLi" v-for="n in searchInList(researchList,input)">
         <div class="vl"> {{n.title}}</div>
@@ -128,6 +128,11 @@ const emit = defineEmits(["modified"]);
 
 <style scoped>
 
+#researches{
+  width: 100%;
+  height: 100%;
+  overflow: scroll;
+}
 #search{
   width: 100%;
   height: 10%;
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 0644895..ca19e62 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -64,14 +64,6 @@ async function articleClicked(){
   emit('modified')
 }
 
-/**
-function downloadCoAuthors(){
-  //todo
-  const data = JSON.stringify(researcher.value);
-  const blob = new Blob([data], {type:"application/json"});
-  return URL.createObjectURL(blob);
-} **/
-
 </script>
 
 <template>
@@ -82,6 +74,7 @@ function downloadCoAuthors(){
           <li>Article Id : {{article.id}}</li>
           <li>Title : {{article.title}}</li>
           <li>Author : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
+          <li> Co Authors : <ul id="coAuthors" v-for="n in article.coAuthors"> <li id="coAuthorsLi">  {{n.user.firstName}} {{n.user.lastName}}, </li></ul></li>
           <li>Summary : {{article.summary}}</li>
           <li>ReleaseDate: {{format(article.releaseDate)}}</li>
           <li>Language : {{article.language}}</li>
@@ -125,7 +118,7 @@ function downloadCoAuthors(){
   top: 0;
   left: 0;
   width: 100%;
-  height: 100%;
+  height: 120%;
   background-color: rgba(0, 0, 0, 0.5);
 }
 
@@ -142,6 +135,15 @@ function downloadCoAuthors(){
   margin-top: 9px;
 }
 
+#coAuthors{
+  list-style: none;
+  display: inline;
+  padding: 0;
+}
+#coAuthorsLi{
+  display: inline;
+  margin-right: 2px;
+}
 
 #downloads {
   text-align: end;
diff --git a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
index f3e1684..11dcdbc 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
@@ -2,8 +2,13 @@
 
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-import {uploadPdf,postResearch} from "@/rest/ScientificPublications/ManageResearch.js";
-let toPost = Object.assign({}, {});
+import {uploadFile, postResearch, fetchAllResearchers} from "@/rest/ScientificPublications/ManageResearch.js";
+const allResearcher = ref(await fetchAllResearchers())
+
+const coAuthors = ref([])
+
+let toPost = Object.assign({}, {coAuthors:[]});
+
 
 const props = defineProps({
   isOpen: Boolean,
@@ -12,19 +17,20 @@ const props = defineProps({
 
 
 async function uploadResearchPdf(pdf){
-  const data = await uploadPdf(pdf);
+  const data = await uploadFile(pdf);
   toPost.pdfLocation = data.url;
 }
 async function uploadBibTex(pdf){
-  const data = await uploadPdf(pdf);
+  const data = await uploadFile(pdf);
   toPost.bibTexLocation = data.url;
 }
 
-// Date when sent!!
 
 async function postNewResearch(){
   toPost.releaseDate = new Date()
   toPost.author = props.researcher
+  toPost.coAuthors = coAuthors.value
+  console.log()
   //the Pdf and a title are required
   if (toPost.pdfLocation == null || toPost.title == null || toPost.title === "") {
     emit("modal-close")
@@ -32,6 +38,7 @@ async function postNewResearch(){
   }
   await postResearch(toPost)
   toPost = Object.assign({}, {});
+  coAuthors.value = []
   emit("modal-close")
   emit("posted")
 }
@@ -69,6 +76,8 @@ onClickOutside(target, ()=>emit('modal-close'))
             <option value="Restricted">Restricted</option>
             <option value="Private">Private</option>
           </select></li>
+
+
           <li> Research Pdf :
             <form novalidate enctype="multipart/form-data" class="inputBox">
             <input type="file" @change="uploadResearchPdf($event.target.files);" accept="application/pdf">
@@ -79,11 +88,19 @@ onClickOutside(target, ()=>emit('modal-close'))
           </form></li>
         </ul>
         </div>
+        <div id="CoAuthorList"> Co-Authors List:
+        <ul style="list-style-type: none;" v-for="n in allResearcher">
+          <li v-if="n.id !== props.researcher.id"> <input type="checkbox" :value=n v-model="coAuthors"> {{n.id}} : {{n.user.firstName}} {{n.user.lastName}}</li>
+        </ul>
+
+      </div>
+        <div></div>
         <div>
           <button id="confirmButton" @click="postNewResearch">Confirm Publish</button>
           <button id="cancelButton" @click="cancelPost">Cancel Publish</button>
         </div>
       </div>
+
     </div>
   </div>
 
@@ -101,6 +118,8 @@ onClickOutside(target, ()=>emit('modal-close'))
 }
 
 .modal-container {
+  display: grid;
+  grid-template-columns: 40% 60%;
   width: 70%;
   margin: 150px auto;
   padding: 20px 30px;
@@ -113,6 +132,12 @@ onClickOutside(target, ()=>emit('modal-close'))
   margin-top: 9px;
 }
 
+#coAuthorList{
+  overflow: scroll;
+}
+
+
+
 #downloads button {
   align-self: center;
   margin-left: 2px;
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index e685989..91a015b 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -51,7 +51,14 @@ async function downloadArticle (research) {
 }
 
 function downloadCoAuthors(){
-  const data = JSON.stringify(researcher.value);
+  let coAuthors = []
+  for (let i in researchList.value) {
+    for (const j in researchList.value[i].coAuthors){
+      const coAuthor = researchList.value[i].coAuthors[j]
+      coAuthors.push(coAuthor)
+    }
+  }
+  const data = JSON.stringify(coAuthors);
   const blob = new Blob([data], {type:"application/json"});
   return URL.createObjectURL(blob);
 }
diff --git a/frontend/src/rest/ScientificPublications/ManageResearch.js b/frontend/src/rest/ScientificPublications/ManageResearch.js
index 025c14d..823ec79 100644
--- a/frontend/src/rest/ScientificPublications/ManageResearch.js
+++ b/frontend/src/rest/ScientificPublications/ManageResearch.js
@@ -6,7 +6,7 @@ export async function deleteArticle(id){
 export async function patchArticle(id, data){
     await restPatch("/research/" + id, data)
 }
-export async function uploadPdf(file){
+export async function uploadFile(file){
     const formData = new FormData();
     formData.append("file", file[0]);
 
@@ -27,3 +27,6 @@ export async function getFile(url){
 export async function addView(url){
     return restPost("/addview/" + url)
 }
+export async function fetchAllResearchers(){
+    return await restGet("/researchers")
+}
\ No newline at end of file

From f081b7206fc7fc2ced2174796cd7536bcdd1593a Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sat, 20 Apr 2024 19:56:07 +0200
Subject: [PATCH 59/66] cleaning frontend

---
 .../FilterComponent.vue                       |  25 +++-
 .../ScientificPublications/ListResearches.vue |   1 -
 .../ManageResearcherProfile.vue               | 114 +-----------------
 .../ResearcherProfile.vue                     |  33 +----
 4 files changed, 22 insertions(+), 151 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 2bba29b..3916001 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -8,11 +8,17 @@
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
 const yearList = ref([])
+const yearCheckedList = ref([])
 const monthList = ref([])
+const monthCheckedList = ref([])
 const accessList = ref([])
+const accessCheckedList = ref([])
 const languageList = ref([])
+const languageCheckedList = ref([])
 const domainList = ref([])
+const domainCheckedList = ref([])
 const paperTypeList = ref([])
+const paperTypCheckedList = ref([])
 
 const filters = Object.assign({},{
   year:[],
@@ -23,6 +29,7 @@ const filters = Object.assign({},{
   paperType:[],
 })
 
+
 const props = defineProps({
   isOpen: Boolean,
   allArticles: ref([Object])
@@ -30,6 +37,12 @@ const props = defineProps({
 
 
 function submit(){
+  filters.paperType = paperTypCheckedList.value
+  filters.year = yearCheckedList.value
+  filters.month = monthCheckedList.value
+  filters.access = accessCheckedList.value
+  filters.language = languageCheckedList.value
+  filters.domain = domainCheckedList.value
   emit("modal-close")
   emit("submit", filters)
 }
@@ -96,12 +109,12 @@ onClickOutside(target, ()=>emit('modal-close'))
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div id="filterGrid">
-          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="filters.year"> {{n}} </li> </ul> </div>
-          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="filters.access"> {{n}} </li> </ul> </div>
-          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="filters.language"> {{n}} </li> </ul> </div>
-          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="filters.month"> {{monthToString(n)}} </li> </ul> </div>
-          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="filters.domain"> {{n}} </li> </ul> </div>
-          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="filters.paperType"> {{n}} </li> </ul> </div>
+          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="yearCheckedList"> {{n}} </li> </ul> </div>
+          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="accessCheckedList"> {{n}} </li> </ul> </div>
+          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="languageCheckedList"> {{n}} </li> </ul> </div>
+          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="monthCheckedList"> {{monthToString(n)}} </li> </ul> </div>
+          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="domainCheckedList"> {{n}} </li> </ul> </div>
+          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="paperTypCheckedList"> {{n}} </li> </ul> </div>
       </div>
         <div id="submit">
           <button @click.stop="submit">Submit</button>
diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index 0997383..ecae20c 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -36,7 +36,6 @@ const closeFilter = () => {
 };
 const submitFilters = (receivedFilters)=>{
   filters.value = receivedFilters
-  console.log(filters.value)
 }
 
 
diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index 41dc3c9..c476423 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -1,77 +1,20 @@
 <script setup>
 import { ref} from "vue";
-import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
-import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 import {fetchResearches, } from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getSelf, patchProfile} from "@/rest/ScientificPublications/ManageResearcherProfile.js";
 import ResearchPostComponent from "@/Apps/ScientificPublications/ResearchPostComponent.vue";
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 const input = ref("");
-const isFilterOpened = ref(false);
-const isResearchOpened = ref(false);
 const isPostResearchOpened = ref(false);
-const articleToDisplay = ref()
 const changing = ref(false);
 
 let toModify= Object.assign({}, {});
 
 const researcher = ref(await getSelf());
 const researchList = ref(await fetchResearches(researcher.value.id));
-//todo get the filters
-
-const openFilter = () => {
-  isFilterOpened.value = true;
-};
-const closeFilter = () => {
-  isFilterOpened.value = false;
-};
-const submitFilters = ()=>{
-}
-const openResearch = (article) => {
-  isResearchOpened.value = true;
-  articleToDisplay.value = article;
-}
-
-const closeResearch = () => {
-  isResearchOpened.value =false;
-  articleToDisplay.value = null;
-}
-
 function openPostResearch(){
   isPostResearchOpened.value = true
 }
-
-
-function searchInList(list, searchInput) {
-  let retList = []
-  for (let i = 0; i < list.length; i++) {
-    if (lDistance(list[i].title, searchInput) < 10 || list[i].title.toUpperCase().indexOf(searchInput.toUpperCase()) > -1){
-      retList.push(list[i])
-    }
-  }
-  return retList
-}
-
-function lDistance(s,t){
-  if (!s.length) return t.length;
-  if (!t.length) return s.length;
-  const arr = [];
-  for (let i = 0; i <= t.length; i++) {
-    arr[i] = [i];
-    for (let j = 1; j <= s.length; j++) {
-      arr[i][j] =
-          i === 0
-              ? j
-              : Math.min(
-                  arr[i - 1][j] + 1,
-                  arr[i][j - 1] + 1,
-                  arr[i - 1][j - 1] + (s[j - 1] === t[i - 1] ? 0 : 1)
-              );
-    }
-  }
-  return arr[t.length][s.length];
-}
-
 function cancelChanges(){
   changing.value = false
   toModify= Object.assign({}, {});
@@ -91,8 +34,6 @@ async function modifiedResearch(){
 </script>
 
 <template> <div class="body"><div id="main">
-    <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="true" @modal-close="closeResearch" @modified="modifiedResearch" ></ArticleComponent>
     <ResearchPostComponent :researcher="researcher" :isOpen="isPostResearchOpened" @modal-close="isPostResearchOpened = false" @posted="modifiedResearch"></ResearchPostComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
@@ -126,7 +67,7 @@ async function modifiedResearch(){
 
 
     </div>
-    <div id="researches"> <ListResearches :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div>
+    <div> <ListResearches :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div>
   </div>
 </div>
 </template>
@@ -187,6 +128,7 @@ async function modifiedResearch(){
   font-size: xx-large;
   background-color:rgba(191, 64, 191,0.5);
   border-radius: 20px;
+  margin-bottom: 20px;
 }
 
 .modifyButton:hover{
@@ -219,61 +161,9 @@ async function modifiedResearch(){
   background: #4cd964;
 }
 
-#search{
-  width: 100%;
-  height: 10%;
-  display: inline-flex;
-}
-#search-input {
-  margin-left: 25px;
-  width: 75%;
-  font-size: 16px;
-  padding: 12px 20px 12px 40px;
-  border: 1px solid #ddd;
-  height: 20px;
-  align-self: center;
-}
-
-#filterButton {
-  align-self: center;
-  margin-left: 2px;
-  font-size: xx-large;
-  color: white;
-  background: rgba(191, 64, 191,0.5);
-  border:2px solid black;
-}
-#filterButton:hover{
-  background: rgba(191, 64, 191);
-}
-
-
-#researchUL {
-  list-style-type: none;
-  color: white;
-  padding: 12px;
-  margin: 5px;
-  height: 400px;
-  overflow: scroll;
-}
-#researchLi{
-  display: grid;
-  grid-template-columns: auto auto auto;
-  border: 2px solid black;
-  color: white;
-  font-size: x-large;
-  text-align: center;
-  text-indent: 7px;
-  background-color: rgba(255, 255, 255, 0.09);
-  border-radius: 18px;
-  margin-bottom: 15px;
-}
 a{
   color:#007aff;
   text-decoration: underline;
   cursor: pointer;
 }
-
-.vl {
-  border-right: 2px solid black;
-}
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index 91a015b..d91000c 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -7,17 +7,11 @@
 
 <script setup>
 import { ref, reactive } from "vue";
-import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
-import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
-import {fetchResearcher, fetchResearches, fetchStats, fetchResearch} from "@/rest/ScientificPublications/ResearcherProfile.js";
-import {getFile, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+import {fetchResearcher, fetchResearches, fetchStats} from "@/rest/ScientificPublications/ResearcherProfile.js";
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
-const isFilterOpened = ref(false);
-const isResearchOpened = ref(false);
-const articleToDisplay = ref(Object)
 let chart;
 
 const researcherId = window.location.href.split("=")[1]
@@ -27,29 +21,6 @@ const researchList = ref(await fetchResearches(researcherId));
 const researcher = ref(await fetchResearcher(researcherId));
 const stats = ref(await fetchStats(researcherId))
 
-const closeFilter = () => {
-  isFilterOpened.value = false;
-};
-const submitFilters = ()=>{
-}
-
-const closeResearch = () => {
-  isResearchOpened.value =false;
-  articleToDisplay.value = null;
-}
-
-const downloadBibTex = (research) => {
-  getFile(research.bibTexLocation)
-}
-
-async function downloadArticle (research) {
-  await addView(research.pdfLocation)
-  await getFile(research.pdfLocation)
-  articleToDisplay.value = await fetchResearch(articleToDisplay.value.id)
-  stats.value = await fetchStats(researcher.value.id)
-  update()
-}
-
 function downloadCoAuthors(){
   let coAuthors = []
   for (let i in researchList.value) {
@@ -100,8 +71,6 @@ function update(){
 
 <template>
   <div id="main">
-    <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters()"></FilterComponent>
-    <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="false" @modal-close="closeResearch" @downloadPdf="downloadArticle(articleToDisplay)" @downloadBibTex="downloadBibTex(articleToDisplay)"></ArticleComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>

From 219165aacf8812f59fbe5c6327a49d951c17e557 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 21 Apr 2024 01:37:30 +0200
Subject: [PATCH 60/66] final translation and documentation

---
 .../StatController.java                       |  7 +++
 .../ResearchRepository.java                   |  7 +++
 .../ResearcherRepository.java                 |  7 +++
 .../StatsRepository.java                      |  7 +++
 .../ResearchesService.java                    | 49 +++------------
 .../StatisticsService.java                    |  9 ++-
 .../ScientificPublications/Research.java      |  1 -
 .../ScientificPublications/Researcher.java    |  1 -
 frontend/public/i18n/EN.txt                   | 61 +++++++++++++++++++
 frontend/public/i18n/FR.txt                   | 61 +++++++++++++++++++
 .../FilterComponent.vue                       | 46 +++-----------
 .../ScientificPublications/ListResearches.vue | 24 +++++---
 .../ManageResearcherProfile.vue               | 23 ++++---
 .../ResearchComponent.vue                     | 51 ++++++++--------
 .../ResearchPostComponent.vue                 | 51 ++++++++--------
 .../ResearcherProfile.vue                     | 27 ++++----
 16 files changed, 269 insertions(+), 163 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java
index 3809d29..ef363ae 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ScientificPublications/StatController.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.EndPoints.ScientificPublications;
 
+/******************************************************
+ * @file StatController.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Api class for handling statistics
+ ******************************************************/
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
index f2d1cf2..1aa7b51 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearchRepository.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.Repositories.ScientificPublications;
 
+/******************************************************
+ * @file ResearchRepository.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Repository handling communication with Reseach table
+ ******************************************************/
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
index 5863bc4..ba1e6e8 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/ResearcherRepository.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.Repositories.ScientificPublications;
 
+/******************************************************
+ * @file ResearcherRepository.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Repository handling communication with Reseacher table
+ ******************************************************/
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
index 0dfabfe..6dc1726 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.Repositories.ScientificPublications;
 
+/******************************************************
+ * @file StatsRepository.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Repository handling communication with Reseach table for making statistics
+ ******************************************************/
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index 9916bd8..e7bea68 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -1,5 +1,12 @@
 package ovh.herisson.Clyde.Services.ScientificPublications;
 
+/******************************************************
+ * @file ResearchesService.java
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Service for managing researcher and researches
+ ******************************************************/
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchRepository;
@@ -130,39 +137,6 @@ public class ResearchesService {
         }
         researcherRepo.save(researcher);
     }
-
-
-    //Co Author part
-    public boolean saveCoAuthors(Iterable<Long> researchersId, Research research) {
-
-        if (researchersId == null) return false;
-
-        ArrayList<Researcher> toAdd = new ArrayList<>();
-        for (long researcherId : researchersId){
-            Researcher researcher= researcherRepo.findById(researcherId);
-            if (researcher== null){
-                return false;
-            }
-            if (!toAdd.contains(researcher))
-            {
-                toAdd.add(researcher);
-            }
-        }
-        research.getCoAuthors().addAll(toAdd);
-        articleRepo.save(research);
-        return true;
-    }
-
-    public boolean deleteCoAuthor(Research research,Researcher coAuthor) {
-
-        if (!research.getCoAuthors().contains(coAuthor))
-            return false;
-
-        research.getCoAuthors().remove(coAuthor);
-        articleRepo.save(research);
-        return true;
-    }
-
     // Other stuff
 
     public Research addView(Research research) {
@@ -188,12 +162,9 @@ public class ResearchesService {
             }
         }
 
-        if (research.getAccess() == Access.Restricted && (
-                user.getRole() == Role.Secretary ||
-                user.getRole() == Role.Teacher || user.getRole() == Role.InscriptionService))
-            return false; // if the access is restricted only the staff member (above) can access the research
+        return research.getAccess() != Access.Restricted || (user.getRole() != Role.Secretary &&
+                user.getRole() != Role.Teacher && user.getRole() != Role.InscriptionService);
+        // if the access is restricted only the staff member (above) can access the research
 
-        return true;
-        // if the researcher is the author or one of the co-authors of the research will return false
     }
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
index 90a60d2..350feca 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
@@ -1,14 +1,19 @@
 package ovh.herisson.Clyde.Services.ScientificPublications;
 
+/******************************************************
+ * @file StatisticsService
+ * @author Bartha Maxime
+ * @scope Publications Scientifiques
+ *
+ * Service for managing statistics
+ ******************************************************/
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearchRepository;
-import ovh.herisson.Clyde.Repositories.ScientificPublications.ResearcherRepository;
 import ovh.herisson.Clyde.Repositories.ScientificPublications.StatsRepository;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
 import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
 
-import java.security.Key;
 import java.util.*;
 
 @Service
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
index da0d714..4c41d15 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Research.java
@@ -6,7 +6,6 @@ package ovh.herisson.Clyde.Tables.ScientificPublications;
  * @scope Extension Publications scientifiques
  *
  * Research entity
- *
  ******************************************************/
 import jakarta.persistence.*;
 import lombok.Getter;
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
index 4fe8a9d..60f8328 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
@@ -6,7 +6,6 @@ package ovh.herisson.Clyde.Tables.ScientificPublications;
  * @scope Extension Publications scientifiques
  *
  * Researcher entity
- *
  ******************************************************/
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt
index c316597..030c814 100644
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@@ -54,3 +54,64 @@ Curriculum=curriculum
 Credits=Credits
 InscriptionService=I.S.
 faculty=Faculty
+Year=Year
+Access=Access
+Access.Restricted=Restricted
+Access.OpenSource=OpenSource
+Access.Private=Private
+Language=Language
+Month=Month
+Month.01=january
+Month.02=february
+Month.03=march
+Month.04=april
+Month.05=may
+Month.06=june
+Month.07=july
+Month.08=august
+Month.09=september
+Month.10=october
+Month.11=november
+Month.12=december
+Domain=Domain
+PaperType=PaperType
+Submit=Submit
+Search.Researches=Search For Researches
+Search.Researchers=Search For Researchers
+Filters=Filters
+Toggle.Researcher=Toggle Researcher Search
+Untoggle.Researcher=Toggle Research Search
+MoreInfo=More Info
+Modify.Research=Modify Research
+To.Change.In.Options=To change in regular account options
+Modify.Data=Modify Data
+Confirm.Changes=Confirm Changes
+Cancel.Changes=Cancel Changes
+Post.Research=Post a new Research
+Summary=Summary
+Title=Title
+Views=Number of Views
+See.Research=See Research
+SeeBibTex=See BibTex
+Author=Author
+CoAuthors=Co-Authors
+ReleaseDate=ReleaseDate
+Article.Id=Article Id
+Delete.Research=Delete Research
+Here=Here
+Stat.Type=Stat Type
+Researches=Researches
+Please.Select.Option=Please Select an Option
+Class.By=Class By
+PaperType.Article=Article
+PaperType.Book=Book
+PaperType.Book.Chapter=Book Chapter
+PaperType.Paper=Paper
+Research.Pdf=Research Pdf
+BibTex.Pdf=BibTex Pdf
+CoAuthors.List=Co-Author List
+Confirm.Publish=Confirm Publishing
+Cancel.Publish=Cancel Publishing
+Years=Years
+Months=Months
+By=By
\ No newline at end of file
diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt
index e86b19b..72404ce 100644
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@@ -54,3 +54,64 @@ Curriculum=Cursus
 Credits=Credits
 InscriptionService=S.I.
 faculty=Faculté
+Year=Année
+Access=Accès
+Access.Restricted=Restreint
+Access.OpenSource=Libre
+Access.Private=Privé
+Language=Langue
+Month=Mois
+Month.01=janvier
+Month.02=fevrier
+Month.03=mars
+Month.04=avril
+Month.05=mai
+Month.06=juin
+Month.07=juillet
+Month.08=août
+Month.09=septembre
+Month.10=octobre
+Month.11=novembre
+Month.12=decembre
+Domain=Domaine
+PaperType=Type de recherche
+Submit=Envoyer
+Search.Researches=Chercher Par Recherche
+Search.Researchers=Chercher Par Chercheur
+Filters=Filtres
+Toggle.Researcher=Activer la recherche par chercheur
+Untoggle.Researcher=Désactiver la recherche par chercheur
+MoreInfo=Plus d'info
+Modify.Research=Modifer l'article
+To.Change.In.Options=À changer dans les options
+Modify.Data=Modifier
+Confirm.Changes=Confirmer les Changements
+Cancel.Changes=Abandonner les Changements
+Post.Research=Poster un nouvel article
+Summary=Résumé
+Title=Titre
+Views=Nombre de Vues
+See.Research=Ouvrir l'article
+SeeBibTex=Ouvrir le BibTex
+Author=Autheur
+CoAuthors=Co-Autheurs
+ReleaseDate=Date de Parution
+Article.Id=Id de l'article
+Delete.Research=Supprimer l'article
+Here=Ici
+Stat.Type=Type de Stat
+Researches=Recherches
+Please.Select.Option=Selectionnez des Options
+Class.By=Classifer Par
+PaperType.Article=Article
+PaperType.Book=Livre
+PaperType.Book.Chapter=Chapitre de Livre
+PaperType.Paper=Papier
+Research.Pdf=Pdf de la Recherche
+BibTex.Pdf=BibTex de la Recherche
+CoAuthors.List=Liste des Co-Autheurs
+Confirm.Publish=Confirmer la Publication
+Cancel.Publish=Annuler la Publication
+Years=Années
+Months=Mois
+By=par
diff --git a/frontend/src/Apps/ScientificPublications/FilterComponent.vue b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
index 3916001..27405b4 100644
--- a/frontend/src/Apps/ScientificPublications/FilterComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/FilterComponent.vue
@@ -7,6 +7,7 @@
 <script setup>
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
+import i18n from "@/i18n.js";
 const yearList = ref([])
 const yearCheckedList = ref([])
 const monthList = ref([])
@@ -66,37 +67,6 @@ for (let i=0;i< props.allArticles.length;i++) {
 
   if (!paperTypeList.value.includes(r.paperType) && r.paperType !== null) paperTypeList.value.push(r.paperType);
 }
-function monthToString(month){
-
-  switch (month){
-    case "01":
-      return "january"
-    case "02":
-      return "february"
-    case "03":
-      return "march"
-    case "04":
-      return "april"
-    case "05":
-      return "may"
-    case "06":
-      return "june"
-    case "07":
-      return "july"
-    case "08":
-      return "august"
-    case "09":
-      return "september"
-    case "10":
-      return "november"
-    case "11":
-      return "october"
-    case "12":
-      return "december"
-    default:
-      return "unknown"
-  }
-}
 const emit = defineEmits(["modal-close", "submit"]);
 
 const target = ref(null)
@@ -109,15 +79,15 @@ onClickOutside(target, ()=>emit('modal-close'))
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div id="filterGrid">
-          <div> Year :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="yearCheckedList"> {{n}} </li> </ul> </div>
-          <div class="vl"> Access :<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="accessCheckedList"> {{n}} </li> </ul> </div>
-          <div class="vl"> Language :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="languageCheckedList"> {{n}} </li> </ul> </div>
-          <div> Month :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="monthCheckedList"> {{monthToString(n)}} </li> </ul> </div>
-          <div class="vl"> Domain :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="domainCheckedList"> {{n}} </li> </ul> </div>
-          <div class="vl"> PaperType :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="paperTypCheckedList"> {{n}} </li> </ul> </div>
+          <div> {{i18n("Year")}} :<ul class="checkers"> <li v-for="n in yearList"> <input type="checkbox" :value=n v-model="yearCheckedList"> {{n}} </li> </ul> </div>
+          <div class="vl"> {{i18n("Access")}}:<ul class="checkers"> <li v-for="n in accessList"> <input type="checkbox" :value=n v-model="accessCheckedList"> {{i18n("Access."+n)}} </li> </ul> </div>
+          <div class="vl"> {{i18n("Language")}} :<ul class="checkers"> <li v-for="n in languageList"> <input type="checkbox" :value=n v-model="languageCheckedList"> {{n}} </li> </ul> </div>
+          <div> {{i18n("Month")}} :<ul class="checkers"> <li v-for="n in monthList"> <input type="checkbox" :value=n v-model="monthCheckedList"> {{i18n("Month." + n)}} </li> </ul> </div>
+          <div class="vl"> {{i18n("Domain")}} :<ul class="checkers"> <li v-for="n in domainList"> <input type="checkbox" :value=n v-model="domainCheckedList"> {{n}} </li> </ul> </div>
+          <div class="vl"> {{i18n("PaperType")}} :<ul class="checkers"> <li v-for="n in paperTypeList"> <input type="checkbox" :value=n v-model="paperTypCheckedList"> {{n}} </li> </ul> </div>
       </div>
         <div id="submit">
-          <button @click.stop="submit">Submit</button>
+          <button @click.stop="submit">{{i18n("Submit")}}</button>
         </div>
       </div>
   </div>
diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index ecae20c..f35e349 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -1,8 +1,15 @@
+<!----------------------------------------------------
+	File:  ListResearches.vue
+	Author: Maxime Bartha
+	Scope: Extension Publicatons scientifiquess
+	Description: Listing of the researches with filters
+----------------------------------------------------->
 <script setup>
 import {ref, watch} from "vue";
 import FilterComponent from "@/Apps/ScientificPublications/FilterComponent.vue";
 import ArticleComponent from "@/Apps/ScientificPublications/ResearchComponent.vue";
 import {fetchAllResearches} from "@/rest/ScientificPublications/ManageResearch.js";
+import i18n from "../../i18n.js";
 const input = ref("")
 const isFilterOpened = ref(false);
 const isResearchOpened = ref(false);
@@ -106,11 +113,11 @@ const emit = defineEmits(["modified"]);
   <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
   <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="props.manage" @modal-close="closeResearch" @modified="emit('modified')"></ArticleComponent>
   <div id="search">
-    <input v-if="!isResearcher" type="text" id="search-input" placeholder="search for researches" v-model="input"/>
-    <input v-else type="text" id="search-input" placeholder="search for researcher" v-model="input"/>
-    <button v-if="!isResearcher" id="filterButton" @click="openFilter">  Filters </button>
-    <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher">  Toggle Researcher Search</button>
-    <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  UnToggle Researcher Search</button>
+    <input v-if="!isResearcher" type="text" id="search-input" :placeholder="i18n('Search.Researches')"  v-model="input"/>
+    <input v-else type="text" id="search-input" :placeholder="i18n('Search.Researchers')" v-model="input"/>
+    <button v-if="!isResearcher" id="filterButton" @click="openFilter">  {{i18n("Filters")}} </button>
+    <button v-if="!isResearcher" id="unToggledResearchButton" @click="isResearcher = !isResearcher"> {{i18n("Toggle.Researcher")}}</button>
+    <button v-if="isResearcher" id="toggledResearchButton" @click="isResearcher = !isResearcher">  {{i18n("Untoggle.Researcher")}}</button>
   </div>
   <div id="researches">
     <ul id="researchUL">
@@ -118,8 +125,8 @@ const emit = defineEmits(["modified"]);
         <div class="vl"> {{n.title}}</div>
         <div class="vl"> <a :href="'#/researcher-profile?id=' + n.researcher.id"> {{ n.researcher.user.firstName +" "+ n.researcher.user.lastName }}</a>
         </div>
-        <a v-if="!manage" @click="openResearch(n)"> MoreInfo  </a>
-        <a v-else @click="openResearch(n)"> Modify Research</a></li>
+        <a v-if="!manage" @click="openResearch(n)"> {{i18n("MoreInfo")}}</a>
+        <a v-else @click="openResearch(n)"> {{i18n("Modify.Research")}}</a></li>
     </ul>
   </div>
 </div>
@@ -215,7 +222,4 @@ a{
 #toggledResearchButton:hover{
   background: #ff2d55;
 }
-
-
-
 </style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index c476423..3aff271 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -1,9 +1,16 @@
+<!----------------------------------------------------
+	File:  ManageResearchesProfile.vue
+	Author: Maxime Bartha
+	Scope: Extension Publicatons scientifiquess
+	Description: Managing Researcher Profile page
+----------------------------------------------------->
 <script setup>
 import { ref} from "vue";
 import {fetchResearches, } from "@/rest/ScientificPublications/ResearcherProfile.js";
 import {getSelf, patchProfile} from "@/rest/ScientificPublications/ManageResearcherProfile.js";
 import ResearchPostComponent from "@/Apps/ScientificPublications/ResearchPostComponent.vue";
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
+import i18n from "../../i18n.js";
 const input = ref("");
 const isPostResearchOpened = ref(false);
 const changing = ref(false);
@@ -40,30 +47,30 @@ async function modifiedResearch(){
     </div>
     <div id="researcherInfos">
       <div class="surrounded" v-if="!changing">{{researcher.user.lastName}} {{researcher.user.firstName}}</div>
-      <div class="surrounded" v-else> To Be changed in manage (simple) Profile</div>
+      <div class="surrounded" v-else> {{i18n("To.Change.In.Options")}}</div>
 
       <div class="surrounded" v-if="!changing">Orcid : {{researcher.orcidId}}</div>
       <div class="surrounded" v-else>Orcid : <input v-model="toModify.orcidId"> </input></div>
 
       <div class="surrounded" v-if="!changing">Email : {{researcher.user.email}}</div>
-      <div class="surrounded" v-else> To Be changed in manage (simple) Profile</div>
+      <div class="surrounded" v-else> {{i18n("To.Change.In.Options")}}</div>
 
       <div class="surrounded" v-if="!changing">
-        site : <a :href=researcher.site style="color: #007aff"> {{researcher.site}}</a>
+        Site : <a :href=researcher.site style="color: #007aff"> {{researcher.site}}</a>
       </div>
       <div class="surrounded" v-else>Site : <input v-model="toModify.site"></input></div>
 
-      <div class="surrounded" v-if="!changing">Domain : {{researcher.domain}}</div>
+      <div class="surrounded" v-if="!changing">{{i18n("Domain")}} : {{researcher.domain}}</div>
       <div class="surrounded" v-else>Domain : <input v-model="toModify.domain"> </input></div>
 
-      <div style="text-align: center; align-self: center" v-if="!changing"> <button class="modifyButton" @click="changing = !changing">Modify Data</button></div>
+      <div style="text-align: center; align-self: center" v-if="!changing"> <button class="modifyButton" @click="changing = !changing">{{i18n("Modify.Data")}}</button></div>
       <div v-else style="text-align: center; align-self: center">
-        <button id="confirmButton" @click="confirmChanges">Confirm Changes</button>
-         <button id="cancelButton" @click="cancelChanges">Cancel Changes</button>
+        <button id="confirmButton" @click="confirmChanges"> {{i18n("Confirm.Changes")}}</button>
+         <button id="cancelButton" @click="cancelChanges"> {{i18n("Cancel.Changes")}}</button>
       </div>
     </div>
     <div class="postArticle" style="text-align: center">
-     <button class="modifyButton" @click="openPostResearch">Post a Research</button>
+     <button class="modifyButton" @click="openPostResearch">{{i18n("Post.Research")}}</button>
 
 
     </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index ca19e62..7a73368 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -2,13 +2,14 @@
 	File:  ResearchComponent.vue
 	Author: Maxime Bartha
 	Scope: Extension Publicatons scientifiquess
-	Description: Pop Up summarizing
+	Description: Pop Up summarizing a research infos
 ----------------------------------------------------->
 
 <script setup xmlns="http://www.w3.org/1999/html">
 import {ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
 import {patchArticle, deleteArticle, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+import i18n from "../../i18n.js";
 
 const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
 const props = defineProps({
@@ -71,40 +72,40 @@ async function articleClicked(){
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
         <div ><ul>
-          <li>Article Id : {{article.id}}</li>
-          <li>Title : {{article.title}}</li>
-          <li>Author : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
-          <li> Co Authors : <ul id="coAuthors" v-for="n in article.coAuthors"> <li id="coAuthorsLi">  {{n.user.firstName}} {{n.user.lastName}}, </li></ul></li>
-          <li>Summary : {{article.summary}}</li>
-          <li>ReleaseDate: {{format(article.releaseDate)}}</li>
-          <li>Language : {{article.language}}</li>
-          <li>PaperType : {{article.paperType}}</li>
-          <li>Domain : {{article.domain}}</li>
-          <li>Views : {{article.views}}</li>
-          <li>Access : {{article.access}}</li>
+          <li>{{i18n("Article.Id")}} : {{article.id}}</li>
+          <li>{{i18n("Title")}} : {{article.title}}</li>
+          <li>{{i18n("Author")}} : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
+          <li>{{i18n("CoAuthors")}} : <ul id="coAuthors" v-for="n in article.coAuthors"> <li id="coAuthorsLi">  {{n.user.firstName}} {{n.user.lastName}}, </li></ul></li>
+          <li>{{i18n("Summary")}} : {{article.summary}}</li>
+          <li>{{i18n("ReleaseDate")}} : {{format(article.releaseDate)}}</li>
+          <li>{{i18n("Language")}} : {{article.language}}</li>
+          <li>{{i18n("PaperType")}} : {{article.paperType}}</li>
+          <li>{{i18n("Domain")}} : {{article.domain}}</li>
+          <li>{{i18n("Views")}} : {{article.views}}</li>
+          <li>{{i18n("Access")}} : {{i18n(article.access)}}</li>
         </ul>
           <div id="downloads" v-if="article.pdfLocation !== null && !manage">
-            <a :href=downloadPdf() @click.stop="articleClicked" target="_blank">See Research</a>
-            <a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">See bibTex</a> </div>
+            <a :href=downloadPdf() @click.stop="articleClicked" target="_blank">{{i18n("See.Research")}}</a>
+            <a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">{{i18n("See.BibTex")}}</a> </div>
         </div>
         <div v-if="manage">
           <div>
             <ul>
-              <li>Title : <input v-model="toModify.title"></li>
-              <li>Language : <input v-model="toModify.language"></li>
-              <li>Summary : <input v-model="toModify.summary"></li>
-              <li>Domain : <input v-model="toModify.domain"></li>
-              <li>Access :
+              <li>{{i18n("Title")}} : <input v-model="toModify.title"></li>
+              <li>{{i18n("Language")}} : <input v-model="toModify.language"></li>
+              <li>{{i18n("Summary")}} : <input v-model="toModify.summary"></li>
+              <li>{{i18n("Domain")}} : <input v-model="toModify.domain"></li>
+              <li>{{i18n("Access")}} :
                 <select id="classed-select" v-model="toModify.access">
-                  <option value="OpenSource">OpenSource</option>
-                  <option value="Restricted">Restricted</option>
-                  <option value="Private">Private</option>
+                  <option value="OpenSource">{{i18n("Access.OpenSource")}}</option>
+                  <option value="Restricted">{{i18n("Access.Restricted")}}</option>
+                  <option value="Private">{{i18n("Access.Private")}}</option>
                 </select></li>
             </ul>
           </div>
-          <button id="confirmButton" @click="confirmChanges">Confirm Changes</button>
-          <button id="cancelButton" @click="cancelChanges">Cancel Changes</button>
-          <button id="deleteButton" @click="deleteThisArticle">Delete Research </button>
+          <button id="confirmButton" @click="confirmChanges"> {{i18n("Confirm.Changes")}}</button>
+          <button id="cancelButton" @click="cancelChanges">{{i18n("Cancel.Changes")}}</button>
+          <button id="deleteButton" @click="deleteThisArticle">{{i18n("Delete.Research")}} </button>
         </div>
       </div>
     </div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
index 11dcdbc..717c8ec 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
@@ -1,8 +1,15 @@
+<!----------------------------------------------------
+	File:  ResearchPostComponent.vue
+	Author: Maxime Bartha
+	Scope: Extension Publicatons scientifiquess
+	Description: pop up for posting a research
+----------------------------------------------------->
 <script setup>
 
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
 import {uploadFile, postResearch, fetchAllResearchers} from "@/rest/ScientificPublications/ManageResearch.js";
+import i18n from "../../i18n.js";
 const allResearcher = ref(await fetchAllResearchers())
 
 const coAuthors = ref([])
@@ -61,34 +68,34 @@ onClickOutside(target, ()=>emit('modal-close'))
       <div class="modal-container" ref="target">
         <div ><ul>
 
-          <li>Title : <input v-model="toPost.title"></li>
-          <li>Summary : <input v-model="toPost.summary"></li>
-          <li>Language : <input v-model="toPost.language"></li>
-          <li>Domain : <input v-model="toPost.domain"></li>
-          <li>PaperType :  <select  id="classed-select" v-model="toPost.paperType">
-            <option value="Article">Article</option>
-            <option value="Book">Book</option>
-            <option value="BookChapter">Book Chapter</option>
-            <option value="Paper">Paper</option>
+          <li>{{i18n("Title")}} : <input v-model="toPost.title"></li>
+          <li>{{i18n("Summary")}} : <input v-model="toPost.summary"></li>
+          <li>{{i18n("Language")}} : <input v-model="toPost.language"></li>
+          <li>{{i18n("Domain")}} : <input v-model="toPost.domain"></li>
+          <li>{{i18n("PaperType")}} :  <select  id="classed-select" v-model="toPost.paperType">
+            <option value="Article">{{i18n("PaperType.Article")}}</option>
+            <option value="Book">{{i18n("PaperType.Book")}}</option>
+            <option value="BookChapter">{{i18n("PaperType.Book.Chapter")}}</option>
+            <option value="Paper">{{i18n("PaperType.Paper")}}Paper</option>
           </select></li>
-          <li>Access : <select  id="classed-select" v-model="toPost.access">
-            <option value="OpenSource">OpenSource</option>
-            <option value="Restricted">Restricted</option>
-            <option value="Private">Private</option>
+          <li>{{i18n("Access")}} : <select  id="classed-select" v-model="toPost.access">
+            <option value="OpenSource">{{i18n("Access.OpenSource")}}</option>
+            <option value="Restricted">{{i18n("Access.Restricted")}}</option>
+            <option value="Private">{{i18n("Access.Private")}}</option>
           </select></li>
 
 
-          <li> Research Pdf :
+          <li> {{i18n("Research.Pdf")}} :
             <form novalidate enctype="multipart/form-data" class="inputBox">
             <input type="file" @change="uploadResearchPdf($event.target.files);" accept="application/pdf">
           </form></li>
-          <li> Research BibTex :
+          <li> {{i18n("BibTex.Pdf")}}
           <form novalidate enctype="multipart/form-data" class="inputBox">
             <input type="file" @change="uploadBibTex($event.target.files);" accept=".bib">
           </form></li>
         </ul>
         </div>
-        <div id="CoAuthorList"> Co-Authors List:
+        <div id="CoAuthorList"> {{i18n("CoAuthors.List")}} :
         <ul style="list-style-type: none;" v-for="n in allResearcher">
           <li v-if="n.id !== props.researcher.id"> <input type="checkbox" :value=n v-model="coAuthors"> {{n.id}} : {{n.user.firstName}} {{n.user.lastName}}</li>
         </ul>
@@ -96,14 +103,12 @@ onClickOutside(target, ()=>emit('modal-close'))
       </div>
         <div></div>
         <div>
-          <button id="confirmButton" @click="postNewResearch">Confirm Publish</button>
-          <button id="cancelButton" @click="cancelPost">Cancel Publish</button>
+          <button id="confirmButton" @click="postNewResearch">{{i18n("Confirm.Publish")}}</button>
+          <button id="cancelButton" @click="cancelPost">{{i18n("Cancel.Publish")}}</button>
         </div>
       </div>
-
     </div>
   </div>
-
 </template>
 
 <style scoped>
@@ -132,12 +137,6 @@ onClickOutside(target, ()=>emit('modal-close'))
   margin-top: 9px;
 }
 
-#coAuthorList{
-  overflow: scroll;
-}
-
-
-
 #downloads button {
   align-self: center;
   margin-left: 2px;
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index d91000c..d47d3b8 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -9,6 +9,7 @@
 import { ref, reactive } from "vue";
 import {fetchResearcher, fetchResearches, fetchStats} from "@/rest/ScientificPublications/ResearcherProfile.js";
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
+import i18n from "../../i18n.js";
 const input = ref("");
 const statsOf = ref("");
 const statsBy = ref("");
@@ -40,7 +41,7 @@ const options = reactive({
     animationEnabled: true,
     title: {
       fontColor: "white",
-      text : "please select options",
+      text : i18n("Please.Select.Option"),
     },
     data: [
       {
@@ -64,7 +65,7 @@ function update(){
     options.data[0].dataPoints = stats.value[index]
 
 
-  options.title.text = statsOf.value + " By "+ statsBy.value;
+  options.title.text = i18n(statsOf.value) +" "+ i18n("By") +" " + i18n(statsBy.value);
   chart.render();
 }
 </script>
@@ -79,26 +80,26 @@ function update(){
       <div class="surrounded">Orcid : {{researcher.orcidId}}</div>
       <div class="surrounded">Email : {{researcher.user.email}}</div>
       <div class="surrounded">
-        site : <a :href=researcher.site style="color: #007aff"> {{researcher.site}}</a>
+        Site : <a :href=researcher.site style="color: #007aff"> {{researcher.site}}</a>
       </div>
-      <div class="surrounded">Domain : {{researcher.domain}}</div>
-      <div id="coAuthorList" class="surrounded">Co-authors list : <a :href=downloadCoAuthors() download="coAuthors.json"> here </a></div>
+      <div class="surrounded">{{i18n("Domain")}} : {{researcher.domain}}</div>
+      <div id="coAuthorList" class="surrounded">Co-authors list : <a :href=downloadCoAuthors() download="coAuthors.json">{{i18n("Here")}}</a></div>
     </div>
     <div id="stats">
       <div class="surrounded">
-        Stat type :
+        {{i18n("Stat.Type")}} :
         <select @change="update()" id="stats-select" v-model="statsOf">
-          <option value="views">Views</option>
-          <option value="researches">Researches</option>
-          <option value="languages">Languages</option>
+          <option value="Views">{{i18n("Views")}}</option>
+          <option value="Researches">{{i18n("Researches")}}</option>
+          <option value="Languages">{{i18n("Language")}}</option>
         </select>
       </div>
       <div class="surrounded">
-        Class by:
+        {{i18n("Class.By")}} :
         <select @change="update()" id="classed-select" v-model="statsBy">
-          <option value="years">Years</option>
-          <option value="months">Months</option>
-          <option value="topics">Topics</option>
+          <option value="Years">{{i18n("Years")}}</option>
+          <option value="Months">{{i18n("Months")}}</option>
+          <option value="Topics">{{i18n("Domain")}}</option>
         </select>
       </div>
       <div id="statsPie">

From a79f23fed0dfe0a755cf4762bd29514a51183424 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 21 Apr 2024 15:10:17 +0200
Subject: [PATCH 61/66] added patch coAuthors

---
 .../ScientificPublications/ListResearches.vue |  5 +-
 .../ManageResearcherProfile.vue               |  6 +-
 .../ResearchComponent.vue                     | 57 +++++++++++++++----
 .../ResearchPostComponent.vue                 | 10 ++--
 4 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ListResearches.vue b/frontend/src/Apps/ScientificPublications/ListResearches.vue
index f35e349..d056f72 100644
--- a/frontend/src/Apps/ScientificPublications/ListResearches.vue
+++ b/frontend/src/Apps/ScientificPublications/ListResearches.vue
@@ -21,7 +21,8 @@ const researchList = ref(await fetchAllResearches())
 
 const props = defineProps({
   researchList:ref(),
-  manage:Boolean
+  manage:Boolean,
+  allResearcher:ref()
 });
 
 if (typeof props.researchList !== 'undefined'){
@@ -111,7 +112,7 @@ const emit = defineEmits(["modified"]);
 <template>
 <div id="researches">
   <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
-  <ArticleComponent :article="articleToDisplay" :isOpen="isResearchOpened" :manage="props.manage" @modal-close="closeResearch" @modified="emit('modified')"></ArticleComponent>
+  <ArticleComponent :allResearcher="allResearcher" :article="articleToDisplay" :isOpen="isResearchOpened" :manage="props.manage" @modal-close="closeResearch" @modified="emit('modified')"></ArticleComponent>
   <div id="search">
     <input v-if="!isResearcher" type="text" id="search-input" :placeholder="i18n('Search.Researches')"  v-model="input"/>
     <input v-else type="text" id="search-input" :placeholder="i18n('Search.Researchers')" v-model="input"/>
diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index 3aff271..e9ff8aa 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -11,6 +11,7 @@ import {getSelf, patchProfile} from "@/rest/ScientificPublications/ManageResearc
 import ResearchPostComponent from "@/Apps/ScientificPublications/ResearchPostComponent.vue";
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 import i18n from "../../i18n.js";
+import {fetchAllResearchers} from "@/rest/ScientificPublications/ManageResearch.js";
 const input = ref("");
 const isPostResearchOpened = ref(false);
 const changing = ref(false);
@@ -19,6 +20,7 @@ let toModify= Object.assign({}, {});
 
 const researcher = ref(await getSelf());
 const researchList = ref(await fetchResearches(researcher.value.id));
+const allResearcher = ref(await fetchAllResearchers())
 function openPostResearch(){
   isPostResearchOpened.value = true
 }
@@ -41,7 +43,7 @@ async function modifiedResearch(){
 </script>
 
 <template> <div class="body"><div id="main">
-    <ResearchPostComponent :researcher="researcher" :isOpen="isPostResearchOpened" @modal-close="isPostResearchOpened = false" @posted="modifiedResearch"></ResearchPostComponent>
+    <ResearchPostComponent :allResearcher="allResearcher" :researcher="researcher" :isOpen="isPostResearchOpened" @modal-close="isPostResearchOpened = false" @posted="modifiedResearch"></ResearchPostComponent>
     <div id="profilePicture">
       <img src="/Clyde.png" />
     </div>
@@ -74,7 +76,7 @@ async function modifiedResearch(){
 
 
     </div>
-    <div> <ListResearches :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div>
+    <div> <ListResearches :allResearcher="allResearcher" :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div>
   </div>
 </div>
 </template>
diff --git a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
index 7a73368..bdec01f 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchComponent.vue
@@ -6,19 +6,33 @@
 ----------------------------------------------------->
 
 <script setup xmlns="http://www.w3.org/1999/html">
-import {ref } from "vue";
+import {ref, watch} from "vue";
 import {onClickOutside} from '@vueuse/core'
-import {patchArticle, deleteArticle, addView} from "@/rest/ScientificPublications/ManageResearch.js";
+import {
+  patchArticle,
+  deleteArticle,
+  addView,
+} from "@/rest/ScientificPublications/ManageResearch.js";
 import i18n from "../../i18n.js";
-
+const coAuthors = ref()
 const restURL = import.meta.env.VITE_CLYDE_MODE === 'container' ? "http://localhost:8000": import.meta.env.DEV ? "http://localhost:5173" : "https://clyde.herisson.ovh/api"
 const props = defineProps({
   isOpen: Boolean,
   article: ref(Object),
   manage:Boolean,
+  allResearcher: ref()
 });
 
 
+watch(
+    () => props.article,
+    (newValue) => {
+      if (newValue !== null)
+        coAuthors.value = newValue.coAuthors
+    }
+);
+
+
 function format(date){
   let split = date.split("-")
   let month = split[1]
@@ -30,7 +44,7 @@ function format(date){
 const emit = defineEmits(["modal-close","modified"]);
 
 const target = ref(null)
-onClickOutside(target, ()=>emit('modal-close'))
+onClickOutside(target, ()=>{emit('modal-close'); })
 
 let toModify= Object.assign({}, {});
 
@@ -40,6 +54,9 @@ function cancelChanges(){
 }
 
 async function confirmChanges(){
+  let coAuthorsId =[]
+  coAuthors.value.forEach(n => (coAuthorsId.push(n.id)))
+  toModify.coAuthors = coAuthorsId
   await patchArticle(props.article.id, toModify)
   toModify= Object.assign({}, {});
   emit('modal-close')
@@ -71,7 +88,7 @@ async function articleClicked(){
   <div v-if="isOpen" class="modal-mask">
     <div class="modal-wrapper">
       <div class="modal-container" ref="target">
-        <div ><ul>
+        <div><ul>
           <li>{{i18n("Article.Id")}} : {{article.id}}</li>
           <li>{{i18n("Title")}} : {{article.title}}</li>
           <li>{{i18n("Author")}} : {{article.researcher.user.lastName + " " + article.researcher.user.firstName}}</li>
@@ -88,7 +105,7 @@ async function articleClicked(){
             <a :href=downloadPdf() @click.stop="articleClicked" target="_blank">{{i18n("See.Research")}}</a>
             <a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">{{i18n("See.BibTex")}}</a> </div>
         </div>
-        <div v-if="manage">
+        <div v-if="manage" id="manage">
           <div>
             <ul>
               <li>{{i18n("Title")}} : <input v-model="toModify.title"></li>
@@ -103,9 +120,19 @@ async function articleClicked(){
                 </select></li>
             </ul>
           </div>
+          <div> {{i18n("CoAuthors.List")}} :
+            <ul id="coAuthorListUl" style="list-style-type: none;" v-for="n in props.allResearcher">
+              <li v-if="n.id !== props.article.researcher.id"> <input type="checkbox" :value=n v-model="coAuthors"> {{n.id}} : {{n.user.firstName}} {{n.user.lastName}}</li>
+            </ul>
+
+          </div>
+          <div>
           <button id="confirmButton" @click="confirmChanges"> {{i18n("Confirm.Changes")}}</button>
           <button id="cancelButton" @click="cancelChanges">{{i18n("Cancel.Changes")}}</button>
-          <button id="deleteButton" @click="deleteThisArticle">{{i18n("Delete.Research")}} </button>
+          </div>
+          <div style="text-align: end">
+            <button id="deleteButton" @click="deleteThisArticle">{{i18n("Delete.Research")}} </button>
+          </div>
         </div>
       </div>
     </div>
@@ -135,6 +162,10 @@ async function articleClicked(){
 .modal-container ul{
   margin-top: 9px;
 }
+#manage{
+  display: grid;
+  grid-template-columns: auto auto;
+}
 
 #coAuthors{
   list-style: none;
@@ -149,6 +180,11 @@ async function articleClicked(){
 #downloads {
   text-align: end;
 }
+
+#coAuthorListUl{
+  overflow: scroll;
+}
+
 #downloads a {
   align-self: center;
   margin-left: 2px;
@@ -165,12 +201,11 @@ async function articleClicked(){
 }
 
 #deleteButton{
-  margin-left: 80%;
-  align-self: center;
-  text-align: center;
+  align-self: end;
+  text-align: end;
   border: 2px solid black;
   color: white;
-  font-size: large;
+  font-size: x-large;
   border-radius: 20px;
   background-color: red;
 }
diff --git a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
index 717c8ec..d055f00 100644
--- a/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearchPostComponent.vue
@@ -8,10 +8,8 @@
 
 import { ref } from "vue";
 import {onClickOutside} from '@vueuse/core'
-import {uploadFile, postResearch, fetchAllResearchers} from "@/rest/ScientificPublications/ManageResearch.js";
+import {uploadFile, postResearch} from "@/rest/ScientificPublications/ManageResearch.js";
 import i18n from "../../i18n.js";
-const allResearcher = ref(await fetchAllResearchers())
-
 const coAuthors = ref([])
 
 let toPost = Object.assign({}, {coAuthors:[]});
@@ -19,7 +17,8 @@ let toPost = Object.assign({}, {coAuthors:[]});
 
 const props = defineProps({
   isOpen: Boolean,
-  researcher: ref(Object)
+  researcher: ref(Object),
+  allResearcher:ref()
 });
 
 
@@ -37,7 +36,6 @@ async function postNewResearch(){
   toPost.releaseDate = new Date()
   toPost.author = props.researcher
   toPost.coAuthors = coAuthors.value
-  console.log()
   //the Pdf and a title are required
   if (toPost.pdfLocation == null || toPost.title == null || toPost.title === "") {
     emit("modal-close")
@@ -96,7 +94,7 @@ onClickOutside(target, ()=>emit('modal-close'))
         </ul>
         </div>
         <div id="CoAuthorList"> {{i18n("CoAuthors.List")}} :
-        <ul style="list-style-type: none;" v-for="n in allResearcher">
+        <ul style="list-style-type: none;" v-for="n in props.allResearcher">
           <li v-if="n.id !== props.researcher.id"> <input type="checkbox" :value=n v-model="coAuthors"> {{n.id}} : {{n.user.firstName}} {{n.user.lastName}}</li>
         </ul>
 

From 76dcea186ca11563b0e672c63f2f2d29bb81aa9f Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 21 Apr 2024 17:07:15 +0200
Subject: [PATCH 62/66] added ProfilePicture handling

---
 .../ScientificPublications/ManageResearcherProfile.vue    | 8 +++++++-
 .../src/Apps/ScientificPublications/ResearcherProfile.vue | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index e9ff8aa..82e2d03 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -39,13 +39,19 @@ async function modifiedResearch(){
   researchList.value = await fetchResearches(researcher.value.id)
 }
 
+function getPP(){
+  if(researcher.value.user.profilePictureUrl === null){
+    return "/Clyde.png"
+  }
+  return researcher.value.user.profilePictureUrl
+}
 
 </script>
 
 <template> <div class="body"><div id="main">
     <ResearchPostComponent :allResearcher="allResearcher" :researcher="researcher" :isOpen="isPostResearchOpened" @modal-close="isPostResearchOpened = false" @posted="modifiedResearch"></ResearchPostComponent>
     <div id="profilePicture">
-      <img src="/Clyde.png" />
+      <img :src=getPP() />
     </div>
     <div id="researcherInfos">
       <div class="surrounded" v-if="!changing">{{researcher.user.lastName}} {{researcher.user.firstName}}</div>
diff --git a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
index d47d3b8..9ae1d30 100644
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@@ -18,6 +18,12 @@ let chart;
 const researcherId = window.location.href.split("=")[1]
 
 
+function getPP(){
+  if(researcher.value.user.profilePictureUrl === null){
+    return "/Clyde.png"
+  }
+  return researcher.value.user.profilePictureUrl
+}
 const researchList = ref(await fetchResearches(researcherId));
 const researcher = ref(await fetchResearcher(researcherId));
 const stats = ref(await fetchStats(researcherId))
@@ -73,7 +79,7 @@ function update(){
 <template>
   <div id="main">
     <div id="profilePicture">
-      <img src="/Clyde.png" />
+      <img :src=getPP() />
     </div>
     <div id="researcherInfos">
       <div class="surrounded">{{researcher.user.lastName}} {{researcher.user.firstName}}</div>

From 608b6e4893600e8cabf3dedd6c78881bc1036d0c Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 21 Apr 2024 20:07:21 +0200
Subject: [PATCH 63/66] added reesearcher manager for secretary

---
 .../ResearchesService.java                    |   8 +
 .../ScientificPublications/Researcher.java    |   3 +-
 frontend/public/i18n/EN.txt                   |  10 +-
 frontend/public/i18n/FR.txt                   |   6 +
 frontend/src/Apps/AboutUser.vue               | 207 ++++++++++++++++++
 .../ManageResearcherProfile.vue               |   6 +-
 frontend/src/Apps/UsersList.vue               |  20 +-
 .../ResearcherProfile.js                      |   8 +
 8 files changed, 258 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/Apps/AboutUser.vue

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
index e7bea68..445cf41 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/ResearchesService.java
@@ -114,6 +114,14 @@ public class ResearchesService {
     }
 
     public void deleteResearcher(Researcher researcher) {
+        articleRepo.findAll();
+        for (Research r: articleRepo.findAll())
+        {
+            if (r.getCoAuthors().contains(researcher)){
+                r.getCoAuthors().remove(researcher);
+                articleRepo.save(r);
+            }
+        }
        researcherRepo.delete(researcher);
     }
 
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
index 60f8328..259452b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScientificPublications/Researcher.java
@@ -12,6 +12,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.annotations.OnDelete;
 import ovh.herisson.Clyde.Tables.User;
 
 
@@ -24,7 +25,7 @@ public class Researcher {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
-    @OneToOne(cascade=CascadeType.REMOVE, optional=true)
+    @OneToOne
     private User user;
     private String orcidId;
     private String site;
diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt
index 030c814..7e49b71 100644
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@@ -114,4 +114,12 @@ Confirm.Publish=Confirm Publishing
 Cancel.Publish=Cancel Publishing
 Years=Years
 Months=Months
-By=By
\ No newline at end of file
+By=By
+RegNo=RegNo
+Address=Address
+Country=Country
+BirthDate=Birth Date
+Researcher.Delete=Delete Researcher Profile
+Researcher.Add=Create Researcher Profile
+Confirm=Confirm
+Cancel=Cancel
diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt
index 72404ce..732f41d 100644
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@@ -115,3 +115,9 @@ Cancel.Publish=Annuler la Publication
 Years=Années
 Months=Mois
 By=par
+RegNo=Matricule
+Address=Adresse
+Country=Pays
+BirthDate=Date de Naissance
+Confirm=Confirmer
+Cancel=Annuler
diff --git a/frontend/src/Apps/AboutUser.vue b/frontend/src/Apps/AboutUser.vue
new file mode 100644
index 0000000..88e880f
--- /dev/null
+++ b/frontend/src/Apps/AboutUser.vue
@@ -0,0 +1,207 @@
+<script setup>
+import i18n from "../i18n.js";
+import {ref} from "vue";
+import {fetchAllResearchers} from "@/rest/ScientificPublications/ManageResearch.js";
+import {deleteResearcher, postResearcher} from "@/rest/ScientificPublications/ResearcherProfile.js";
+const props = defineProps(['user'])
+const modifying =ref(false)
+const toModify = Object.assign({},{})
+const toCreate = Object.assign({},{})
+const allResearcher = ref( await fetchAllResearchers())
+const researcher = ref()
+const user = props.user
+const isResearcher = ref(false)
+const creating = ref(false)
+
+for (let i = 0; i < allResearcher.value.length; i++) {
+  if (user.regNo === allResearcher.value[i].user.regNo){
+    researcher.value = allResearcher.value[i]
+    isResearcher.value = true
+  }
+}
+
+function getPP(){
+  if(user.profilePictureUrl === null){
+    return "/Clyde.png"
+  }
+  return user.profilePictureUrl
+}
+
+async function createResearcher(){
+  toCreate.user = user
+  await postResearcher(toCreate)
+  creating.value = false
+  for (let i = 0; i < allResearcher.value.length; i++) {
+    if (user.regNo === allResearcher.value[i].user.regNo){
+      researcher.value = allResearcher.value[i]
+      isResearcher.value = true
+    }
+  }
+  toCreate.value = Object.assign({},{})
+}
+
+async function deleteResearcherById(){
+  isResearcher.value = false
+  await deleteResearcher(researcher.value.id)
+  allResearcher.value = await fetchAllResearchers()
+}
+
+</script>
+
+<template>
+  <div class="body">
+    <div class="container">
+      <div class="profilPic">
+        <img class="subContainer" :src=getPP()>
+      </div>
+      <div class = "globalInfos">
+        <div class="infosContainer">
+          <div>
+            {{i18n("RegNo")}} : {{user.regNo}}
+          </div>
+          <div>
+            {{i18n("name")}} : {{user.firstName}} {{user.lastName}}
+          </div>
+          <div>
+            Role :
+            <span v-if="!modifying"> {{i18n(user.role)}}</span>
+            <select v-else v-model="toModify.role">
+              <option value="Student">{{i18n("Student")}}</option>
+              <option value="Teacher">{{i18n("Teacher")}}</option>
+              <option value="Secretary">{{i18n("Secretary")}}</option>
+              <option value="InscriptionService">{{i18n("InscriptionService")}}</option>
+            </select>
+          </div>
+          <div>
+            E-mail: {{user.email}}
+          </div>
+          <div>
+            {{i18n("Address")}} :
+            <span v-if="!modifying"> {{user.address}}</span>
+            <input v-else type="text" v-model="toModify.address">
+          </div>
+          <div>
+            {{i18n("Country")}} : {{user.country}}
+          </div>
+          <div>
+            {{i18n("BirthDate")}} : {{user.birthDate.split("T")[0]}}
+          </div>
+        </div>
+      </div>
+      <div></div>
+      <button id="ModifyButton" @click="modifying= !modifying"> {{i18n("Modify.Data")}}</button>
+      <div></div>
+      <div>
+        <button v-if="isResearcher" id="deleteButton" @click="deleteResearcherById"> {{i18n("Researcher.Delete")}}</button>
+        <button v-else id="createButton" @click="creating = !creating"> {{i18n("Researcher.Add")}}</button>
+      </div>
+      <div v-if="creating">
+        <button  id="createButton" @click="createResearcher"> {{i18n("Confirm")}}</button>
+        <button  id="deleteButton" @click="creating = !creating"> {{i18n("Cancel")}}</button>
+      </div>
+      <div v-if="creating" style="color: white">
+        <ul>
+          <li>
+            Orcid :
+            <input type="text" v-model="toCreate.orcid"></li>
+          <li>
+            Site :
+            <input type="text" v-model="toCreate.site"></li>
+          <li>
+            {{i18n("Domain")}} :
+            <input type="text" v-model="toCreate.domain"></li>
+        </ul>
+
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+#ModifyButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: xx-large;
+  background-color:rgba(191, 64, 191,0.5);
+  border-radius: 20px;
+}
+#ModifyButton:hover{
+  background:rgba(191,64,191)
+}
+
+.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{
+  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:5%;
+}
+
+.subContainer{
+  width:100%;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  border:4px solid black;
+}
+
+.infosContainer {
+  border:2px solid black;
+  font-size:23px;
+  color:white;
+  background-color:rgb(50,50,50);
+  border-radius:10px;
+}
+
+#deleteButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color: red;
+  border-radius: 20px;
+}
+#deleteButton:hover{
+  background: #ff2d55;
+}
+#createButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color: #07bc0c;
+  border-radius: 20px
+}
+#createButton:hover{
+  background: #4cd964;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
index 82e2d03..7f0490e 100644
--- a/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue
@@ -58,7 +58,7 @@ function getPP(){
       <div class="surrounded" v-else> {{i18n("To.Change.In.Options")}}</div>
 
       <div class="surrounded" v-if="!changing">Orcid : {{researcher.orcidId}}</div>
-      <div class="surrounded" v-else>Orcid : <input v-model="toModify.orcidId"> </input></div>
+      <div class="surrounded" v-else>Orcid : <input v-model="toModify.orcidId"> </div>
 
       <div class="surrounded" v-if="!changing">Email : {{researcher.user.email}}</div>
       <div class="surrounded" v-else> {{i18n("To.Change.In.Options")}}</div>
@@ -66,10 +66,10 @@ function getPP(){
       <div class="surrounded" v-if="!changing">
         Site : <a :href=researcher.site style="color: #007aff"> {{researcher.site}}</a>
       </div>
-      <div class="surrounded" v-else>Site : <input v-model="toModify.site"></input></div>
+      <div class="surrounded" v-else>Site : <input v-model="toModify.site"></div>
 
       <div class="surrounded" v-if="!changing">{{i18n("Domain")}} : {{researcher.domain}}</div>
-      <div class="surrounded" v-else>Domain : <input v-model="toModify.domain"> </input></div>
+      <div class="surrounded" v-else>Domain : <input v-model="toModify.domain"></div>
 
       <div style="text-align: center; align-self: center" v-if="!changing"> <button class="modifyButton" @click="changing = !changing">{{i18n("Modify.Data")}}</button></div>
       <div v-else style="text-align: center; align-self: center">
diff --git a/frontend/src/Apps/UsersList.vue b/frontend/src/Apps/UsersList.vue
index 59e60c4..a000495 100644
--- a/frontend/src/Apps/UsersList.vue
+++ b/frontend/src/Apps/UsersList.vue
@@ -1,20 +1,30 @@
 
 <script setup>
   import i18n from "@/i18n.js"
-  import { reactive  } from 'vue'
   import { getAllUsers } from '../rest/Users.js'
+  import {ref} from "vue";
+  import AboutUser from "@/Apps/AboutUser.vue";
+  const list = ref(true)
+  const targetRegNo =ref()
+
 
   const users = await getAllUsers();
   
 </script> 
 <template style="margin-top:5%;">
-  <div style="display:flex; justify-content:center; min-width:1140px;" v-for="item in users">
-    <div class="bodu">
+  <div v-if="list === false">
+    <AboutUser :user=target />
+    <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; min-width:1140px;" v-for="item in users" v-if="list">
+    <div class="body">
       <div class="container">
         <div class="role"><a style="margin-left:30px">{{i18n(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; target = item;">{{i18n("request.moreInfos")}} </button>
+        </div>
       </div>
     </div>
   </div>
@@ -70,7 +80,7 @@
 
   }
 
-  .bodu {
+  .body {
     margin-top:2%;
     width:66%;
     border:2px solid black;
diff --git a/frontend/src/rest/ScientificPublications/ResearcherProfile.js b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
index 8e98605..1e2be8e 100644
--- a/frontend/src/rest/ScientificPublications/ResearcherProfile.js
+++ b/frontend/src/rest/ScientificPublications/ResearcherProfile.js
@@ -14,4 +14,12 @@ export async function fetchStats(id){
 
 export async function fetchResearch(id){
     return restGet("/research/" +id)
+}
+
+export async function deleteResearcher(id){
+    return restDelete("/researcher/" + id)
+}
+
+export async function postResearcher(data){
+    return restPost("/researcher", data)
 }
\ No newline at end of file

From 1a266cdfbd59bde4bbc9f6b04f8329b226b0a6f3 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 21 Apr 2024 23:14:56 +0200
Subject: [PATCH 64/66] post User by secretary

---
 .../EndPoints/ApplicationsController.java     |   3 +-
 .../Clyde/EndPoints/UserController.java       |   9 +-
 .../herisson/Clyde/Services/UserService.java  |  92 +++++++-------
 .../herisson/Clyde/Tables/Applications.java   |   2 +-
 frontend/public/i18n/EN.txt                   |   7 ++
 frontend/public/i18n/FR.txt                   |   7 ++
 frontend/src/Apps/AboutUser.vue               |  25 ++--
 frontend/src/Apps/CreateUser.vue              | 117 ++++++++++++++++++
 frontend/src/rest/Users.js                    |  31 +----
 frontend/src/rest/apps.js                     |   5 +-
 10 files changed, 208 insertions(+), 90 deletions(-)
 create mode 100644 frontend/src/Apps/CreateUser.vue

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 d95a7ff..36c485e 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java
@@ -74,7 +74,8 @@ public class ApplicationsController {
             authorizedApps.add(Applications.Requests);
             authorizedApps.add(Applications.StudentsList);}
 
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
+        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){
+            authorizedApps.add(Applications.CreateUser);
           authorizedApps.add(Applications.UsersList);}
 
         if (researchesServ.getResearcherByUser(user) != null)
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
index 64eec4a..0496c59 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
@@ -86,19 +86,20 @@ public class UserController {
      * @return a string clarifying the issue (if there is any)
      */
     @PatchMapping("/user/{id}")
-    public ResponseEntity<String> patchUser(@RequestHeader("Authorization") String token,
+    public ResponseEntity<Map<String,Object>> patchUser(@RequestHeader("Authorization") String token,
                                             @RequestBody Map<String,Object> updates,
                                             @PathVariable Long id) {
 
         if (token == null) return new UnauthorizedResponse<>(null);
 
         User poster = authServ.getUserFromToken(token);
-        if (poster == null) {return new UnauthorizedResponse<>("bad token");}
+        if (poster == null) {return new UnauthorizedResponse<>(null);}
 
-        if (!userService.modifyData(id, updates, poster))
+        User modified = userService.modifyData(id,updates,poster);
+        if (modified ==null)
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
 
-        return new ResponseEntity<>(null, HttpStatus.OK);
+        return new ResponseEntity<>(ProtectionService.userWithoutPassword(modified), HttpStatus.OK);
     }
 
     @GetMapping("/teachers")
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java
index 72eabd5..caa20e6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java
@@ -43,61 +43,55 @@ public class UserService {
      * @param targetId the id of the user to update
      * @return if the changes were done or not
      */
-    public boolean modifyData(long targetId, Map<String ,Object> updates, User poster){
+    public User modifyData(long targetId, Map<String ,Object> updates, User poster){
 
         User target = userRepo.findById(targetId);
         if (target == null)
-            return false;
+            return null;
 
-        if (poster.getRegNo().equals(target.getRegNo())){
-            for (Map.Entry<String, Object> entry : updates.entrySet()){
+        if (!target.getRegNo().equals(poster.getRegNo()) && !(poster.getRole() == Role.Secretary) &&
+            !(poster.getRole() == Role.Admin))
+            return null;
 
-                switch (entry.getKey()){
-                    case "firstName":
-                        target.setFirstName((String) entry.getValue());
-                        break;
-                    case "lastName":
-                        target.setLastName((String) entry.getValue());
-                        break;
-                    case "email":
-                        target.setEmail((String) entry.getValue());
-                        break;
-                    case "address":
-                        target.setAddress((String) entry.getValue());
-                        break;
-                    case "country":
-                        target.setCountry((String) entry.getValue());
-                        break;
-                    case "birthDate":
-                        target.setBirthDate((Date) entry.getValue());
-                        break;
-                    case "profilePictureUrl":
-                        target.setProfilePictureUrl((String) entry.getValue());
-                        break;
-                    case "password":
-                        target.setPassword(passwordEncoder.encode((String) entry.getValue()));
-                        break;
-                }
-            }
-            userRepo.save(target);
-            return true;
-        }
-        // the secretary can change roles (for example if a student becomes a teacher)
-        else if (poster.getRole() == Role.Secretary)
-        {
-            for (Map.Entry<String, Object> entry : updates.entrySet()){
-
-                if ( entry.getKey().equals("role")) {
-
-                    if (entry.getValue() == Role.Admin) {return false;}
-
-                    target.setRole((Role) entry.getValue());
-                    userRepo.save(target);
-                    return true;
-                }
+        for (Map.Entry<String, Object> entry : updates.entrySet()){
+            System.out.println(entry.getValue());
+            switch (entry.getKey()){
+                case "firstName":
+                    target.setFirstName((String) entry.getValue());
+                    break;
+                case "lastName":
+                    target.setLastName((String) entry.getValue());
+                    break;
+                case "email":
+                    target.setEmail((String) entry.getValue());
+                    break;
+                case "address":
+                    target.setAddress((String) entry.getValue());
+                    break;
+                case "country":
+                    target.setCountry((String) entry.getValue());
+                    break;
+                case "birthDate":
+                    target.setBirthDate((Date) entry.getValue());
+                    break;
+                case "profilePictureUrl":
+                    target.setProfilePictureUrl((String) entry.getValue());
+                    break;
+                case "password":
+                    target.setPassword((String) entry.getValue());
+                    break;
+                case "role":
+                    //a user can't change his own role
+                    if (poster.getRole()==Role.Secretary || poster.getRole() == Role.Admin){
+                        Role wanted = Role.valueOf((String) entry.getValue());
+                        if (wanted == Role.Admin && poster.getRole() != Role.Admin)
+                            return null;
+                        target.setRole(wanted);
+                    }
             }
         }
-        return false;
+        userRepo.save(target);
+        return target;
     }
 
 
@@ -105,7 +99,7 @@ public class UserService {
         return passwordEncoder.matches(tryingPassword,  user.getPassword());
     }
 
-    public User save(User  user){
+    public User save(User user){
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         return userRepo.save(user);
     }
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 0b4514e..8b6fdc5 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java
@@ -23,5 +23,5 @@ public enum Applications {
     ManageResearcherProfile,
 
     //the list of all researches (filterable)
-    ListResearches, StudentsList
+    ListResearches, CreateUser, StudentsList
 }
diff --git a/frontend/public/i18n/EN.txt b/frontend/public/i18n/EN.txt
index 7e49b71..ac78f9c 100644
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@@ -30,6 +30,7 @@ app.studentList=Students List
 app.users=Users
 app.manage.researcherProfile=Manage researcher profile
 app.list.researches=List researches
+app.Create.User=Create User
 request.moreInfos=More Infos
 request.accept=Accept
 request.refuse=Refuse
@@ -123,3 +124,9 @@ Researcher.Delete=Delete Researcher Profile
 Researcher.Add=Create Researcher Profile
 Confirm=Confirm
 Cancel=Cancel
+LastName=Last Name
+FirstName=First Name
+Profile.Picture=Profile Picture
+Role=Role
+Password=Password
+Create.User=Create User
diff --git a/frontend/public/i18n/FR.txt b/frontend/public/i18n/FR.txt
index 732f41d..9b4e296 100644
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@@ -30,6 +30,7 @@ app.studentList=Liste des étudiants
 app.users=Utilisateurs
 app.manage.researcherProfile= gérer son profil de chercheur
 app.list.researches=Lister les recherches
+app.Create.User=créer un utilisateur
 request.moreInfos=Plus d'Infos
 request.accept=Accepter
 request.refuse=Refuser
@@ -121,3 +122,9 @@ Country=Pays
 BirthDate=Date de Naissance
 Confirm=Confirmer
 Cancel=Annuler
+LastName=Nom de Famille
+FirstName=Prénom
+Profile.Picture=Photo de Profil
+Role=Role
+Password=Mot de Passe
+Create.User=Créer l'utilisateur
diff --git a/frontend/src/Apps/AboutUser.vue b/frontend/src/Apps/AboutUser.vue
index 88e880f..0a3cce1 100644
--- a/frontend/src/Apps/AboutUser.vue
+++ b/frontend/src/Apps/AboutUser.vue
@@ -3,36 +3,37 @@ import i18n from "../i18n.js";
 import {ref} from "vue";
 import {fetchAllResearchers} from "@/rest/ScientificPublications/ManageResearch.js";
 import {deleteResearcher, postResearcher} from "@/rest/ScientificPublications/ResearcherProfile.js";
+import {patchUser} from "@/rest/Users.js";
 const props = defineProps(['user'])
 const modifying =ref(false)
 const toModify = Object.assign({},{})
 const toCreate = Object.assign({},{})
 const allResearcher = ref( await fetchAllResearchers())
 const researcher = ref()
-const user = props.user
+const user = ref(props.user)
 const isResearcher = ref(false)
 const creating = ref(false)
 
 for (let i = 0; i < allResearcher.value.length; i++) {
-  if (user.regNo === allResearcher.value[i].user.regNo){
+  if (user.value.regNo === allResearcher.value[i].user.regNo){
     researcher.value = allResearcher.value[i]
     isResearcher.value = true
   }
 }
 
 function getPP(){
-  if(user.profilePictureUrl === null){
+  if(user.value.profilePictureUrl === null){
     return "/Clyde.png"
   }
-  return user.profilePictureUrl
+  return user.value.profilePictureUrl
 }
 
 async function createResearcher(){
-  toCreate.user = user
+  toCreate.user = user.value
   await postResearcher(toCreate)
   creating.value = false
   for (let i = 0; i < allResearcher.value.length; i++) {
-    if (user.regNo === allResearcher.value[i].user.regNo){
+    if (user.value.regNo === allResearcher.value[i].user.regNo){
       researcher.value = allResearcher.value[i]
       isResearcher.value = true
     }
@@ -46,6 +47,13 @@ async function deleteResearcherById(){
   allResearcher.value = await fetchAllResearchers()
 }
 
+async function modify(){
+  if (modifying.value){
+    user.value = await patchUser(user.value.regNo, toModify)
+  }
+  modifying.value =!modifying.value
+}
+
 </script>
 
 <template>
@@ -89,7 +97,7 @@ async function deleteResearcherById(){
         </div>
       </div>
       <div></div>
-      <button id="ModifyButton" @click="modifying= !modifying"> {{i18n("Modify.Data")}}</button>
+      <button id="ModifyButton" @click="modify"> {{i18n("Modify.Data")}}</button>
       <div></div>
       <div>
         <button v-if="isResearcher" id="deleteButton" @click="deleteResearcherById"> {{i18n("Researcher.Delete")}}</button>
@@ -111,8 +119,6 @@ async function deleteResearcherById(){
             {{i18n("Domain")}} :
             <input type="text" v-model="toCreate.domain"></li>
         </ul>
-
-
       </div>
     </div>
   </div>
@@ -133,6 +139,7 @@ async function deleteResearcherById(){
 }
 
 .container{
+  margin-top: 25px;
   min-width:675px;
   display:grid;
   grid-template-columns:10vw 50vw;
diff --git a/frontend/src/Apps/CreateUser.vue b/frontend/src/Apps/CreateUser.vue
new file mode 100644
index 0000000..7332017
--- /dev/null
+++ b/frontend/src/Apps/CreateUser.vue
@@ -0,0 +1,117 @@
+<script setup>
+
+import i18n from "@/i18n.js";
+import {uploadProfilePicture} from "@/rest/uploads.js";
+import {postUser} from "@/rest/Users.js";
+import {ref} from "vue";
+let toCreate = Object.assign({},{})
+const today =  new Date()
+const date = today.getFullYear() +"-" + ("0" + (today.getMonth()+1)).slice(-2) + "-" + ("0" + today.getDate()).slice(-2);
+
+
+async function createUser(){
+
+  if (toCreate.lastName === null || toCreate.birthDate === null || toCreate.firstName === null ||
+      toCreate.email === null || toCreate.address === null || toCreate.role === null || toCreate.password === null)
+    return
+
+  await postUser(toCreate)
+  toCreate = Object.assign({},{})
+}
+
+async function getProfilePic(data){
+  const pp= await uploadProfilePicture(data)
+  toCreate.profilePictureUrl = pp.url
+}
+
+</script>
+
+<template>
+  <div class="body">
+    <div class="container">
+      <div class = "globalInfos">
+        <div class="infosContainer">
+          <ul>
+            <li>{{i18n("LastName")}} : <input type="text" v-model="toCreate.lastName"></li>
+            <li>{{i18n("FirstName")}} : <input type="text" v-model="toCreate.firstName"></li>
+            <li> E-mail : <input type="text" v-model="toCreate.email"></li>
+            <li>{{i18n("Country")}} : <input type="text" v-model="toCreate.country"></li>
+            <li>{{i18n("Address")}} : <input type="text" v-model="toCreate.address"></li>
+            <li>{{i18n("BirthDate")}} : <input type="date" min="1924-01-01" :max="date" v-model="toCreate.birthDate"></li>
+
+            <li>{{i18n("Profile.Picture")}} :
+              <input  type="file" @change="getProfilePic($event.target.files);" accept="image/*">
+            </li>
+
+
+            <li>{{i18n("Role")}} :
+            <select  v-model="toCreate.role">
+              <option value="Student">{{i18n("Student")}}</option>
+              <option value="Teacher">{{i18n("Teacher")}}</option>
+              <option value="Secretary">{{i18n("Secretary")}}</option>
+              <option value="InscriptionService">{{i18n("InscriptionService")}}</option>
+            </select>
+            </li>
+
+            <li>{{i18n("Password")}} : <input type="password" v-model="toCreate.password"></li>
+
+          </ul>
+          <div style="text-align: end"> <button id="createButton" @click="createUser"> {{i18n("Create.User")}}</button></div>
+        </div>
+    </div>
+  </div>
+  </div>
+</template>
+
+<style scoped>
+
+.container{
+  margin-top: 25px;
+  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";
+}
+.globalInfos {
+  grid-area:globalInfos;
+  align-self :center;
+
+}
+
+.body {
+  min-width:960px;
+  width:100%;
+  display:flex;
+  align-items:center;
+  justify-content:center;
+  margin-top:5%;
+}
+
+
+.infosContainer {
+  border:2px solid black;
+  font-size:23px;
+  color:white;
+  background-color:rgb(50,50,50);
+  border-radius:10px;
+}
+
+#createButton{
+  align-self: center;
+  text-align: center;
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  background-color: #07bc0c;
+  border-radius: 20px
+}
+#createButton:hover{
+  background: #4cd964;
+}
+
+</style>
\ No newline at end of file
diff --git a/frontend/src/rest/Users.js b/frontend/src/rest/Users.js
index 7daa99b..9336ac3 100644
--- a/frontend/src/rest/Users.js
+++ b/frontend/src/rest/Users.js
@@ -13,6 +13,10 @@ export function disconnect(){
 	setCookie("session_token", ";expires= Thu, 01 Jan 1970 00:00:01 GMT")
 }
 
+export async function patchUser(id,data){
+	return restPatch("/user/" +id, data)
+}
+
 /**
  * Register a user (tokenless)
  * 
@@ -43,31 +47,8 @@ export async function register(firstname, lastname, birthDate, password, email,
 	});
 }
 
-/**
- * Register a user (by secretary)
- * 
- * @param firstname
- * @param lastname
- * @param birthdate
- * @param password
- * @param mail
- * @param address
- * @param country
- * @param imageId	id of the image in database returned when uploaded
- *
- * 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){
-	return restPost("/user", {
-		firstname: firstname,
-		lastname: lastname,
-		birthDate: birthDate,
-		password: password,
-		email: email,
-		address: address,
-		country: country,
-	});
+export async function postUser(data){
+	return restPost("/user", data)
 }
 
 /**
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index e3293f0..fdb9330 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -15,6 +15,7 @@ import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
 import ManageResearcherProfile from "@/Apps/ScientificPublications/ManageResearcherProfile.vue";
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
+import CreateUser from "@/Apps/CreateUser.vue";
 
 const apps = {
 		'/login': LoginPage,
@@ -26,7 +27,8 @@ const apps = {
 		'/manage-researcher-profile' : ManageResearcherProfile,
 		'/msg' : Msg,
 		'/researches' : ListResearches,
-		'/researcher-profile': ResearcherProfile
+		'/researcher-profile': ResearcherProfile,
+		'/create-user': CreateUser
 }
 
 const appsList = {
@@ -40,6 +42,7 @@ const appsList = {
 		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
 		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
 		'ManageResearcherProfile':{path:'#/manage-researcher-profile',icon:'fa-book-bookmark',text:i18n("app.manage.researcherProfile")},
+		'CreateUser':{path:'#/create-user',icon:'fa-plus', text:i18n("app.Create.User")}
 
 }
 

From d324d7447d952872ca1b1e95169d1abc9f0db958 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 21 Apr 2024 23:55:07 +0200
Subject: [PATCH 65/66] fixing my dumb merge

---
 backend/build.gradle.kts                      |   2 +-
 .../ApplicationsController.java.orig          | 101 ------
 .../ApplicationsController_BACKUP_12704.java  | 101 ------
 .../ApplicationsController_BASE_12704.java    |  75 -----
 .../ApplicationsController_LOCAL_12704.java   |  85 -----
 .../ApplicationsController_REMOTE_12704.java  |  83 -----
 .../Clyde/EndPoints/MockController.java       |   2 -
 .../Clyde/EndPoints/MockController.java.orig  | 307 ------------------
 .../Clyde/Services/UserService.java.orig      | 193 -----------
 .../Clyde/Tables/Applications.java.orig       |  40 ---
 .../herisson/Clyde/Tables/FileType.java.orig  |  15 -
 frontend/public/i18n/EN.txt.orig              | 295 -----------------
 frontend/public/i18n/FR.txt.orig              | 293 -----------------
 frontend/src/rest/apps.js                     |   5 +-
 frontend/src/rest/apps.js.orig                | 103 ------
 frontend/src/rest/courses.js.orig             |  85 -----
 16 files changed, 3 insertions(+), 1782 deletions(-)
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java.orig
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BACKUP_12704.java
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BASE_12704.java
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_LOCAL_12704.java
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_REMOTE_12704.java
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java.orig
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java.orig
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java.orig
 delete mode 100644 backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java.orig
 delete mode 100644 frontend/public/i18n/EN.txt.orig
 delete mode 100644 frontend/public/i18n/FR.txt.orig
 delete mode 100644 frontend/src/rest/apps.js.orig
 delete mode 100644 frontend/src/rest/courses.js.orig

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index 794631f..9b1bde6 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+	//developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java.orig b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java.orig
deleted file mode 100644
index b8d293f..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java.orig
+++ /dev/null
@@ -1,101 +0,0 @@
-package ovh.herisson.Clyde.EndPoints;
-
-import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
-import ovh.herisson.Clyde.Tables.Applications;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class ApplicationsController {
-
-    AuthenticatorService authServ;
-
-    ResearchesService researchesServ;
-
-    public ApplicationsController(AuthenticatorService authServ, ResearchesService researchesServ){
-        this.researchesServ = researchesServ;
-    this.authServ = authServ;
-    }
-
-
-    /** return a list of authorized applications.
-     *  depends on the token
-     */
-    @GetMapping("/apps")
-    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
-        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
-    }
-
-    @GetMapping("/apps/{identifier}")
-    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
-
-        if (getAuthorizedApplications(token).contains(identifier)){
-            return new ResponseEntity<>(true, HttpStatus.OK);
-        }
-        return new ResponseEntity<>(false, HttpStatus.OK);
-    }
-
-    public ArrayList<Applications> getAuthorizedApplications(String token){
-        ArrayList<Applications> authorizedApps = new ArrayList<>();
-
-        //if unAuthed
-        authorizedApps.add(Applications.Login);
-<<<<<<< HEAD
-        authorizedApps.add(Applications.ListResearches);
-=======
-        authorizedApps.add(Applications.Schedule);
->>>>>>> origin/master
-
-		User user = authServ.getUserFromToken(token);
-		if(user == null)
-            return authorizedApps;
-        // if authed
-        authorizedApps.add(Applications.Profile);
-
-        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Student,Role.Admin},token)) {
-            authorizedApps.add(Applications.Msg);
-            authorizedApps.add(Applications.Forum);
-            authorizedApps.add(Applications.Rdv);
-        }
-
-        if(!authServ.isNotIn(new Role[]{Role.Teacher,Role.Admin},token))
-            authorizedApps.add(Applications.ManageOwnedLessons);
-        //if Teacher or Secretary or Admin add ManageCourses App
-        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, Role.Teacher},token)){
-            authorizedApps.add(Applications.Requests);
-            authorizedApps.add(Applications.StudentsList);}
-
-<<<<<<< HEAD
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){
-            authorizedApps.add(Applications.CreateUser);
-          authorizedApps.add(Applications.UsersList);}
-
-        if (researchesServ.getResearcherByUser(user) != null)
-            authorizedApps.add(Applications.ManageResearcherProfile);
-=======
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
-          authorizedApps.add(Applications.UsersList);
-          authorizedApps.add(Applications.ManageSchedules);
-          authorizedApps.add(Applications.LessonRequests);}
-
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.InscriptionService},token)){
-            authorizedApps.add(Applications.Payments);}
->>>>>>> origin/master
-        return authorizedApps;
-    }
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BACKUP_12704.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BACKUP_12704.java
deleted file mode 100644
index b8d293f..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BACKUP_12704.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package ovh.herisson.Clyde.EndPoints;
-
-import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
-import ovh.herisson.Clyde.Tables.Applications;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class ApplicationsController {
-
-    AuthenticatorService authServ;
-
-    ResearchesService researchesServ;
-
-    public ApplicationsController(AuthenticatorService authServ, ResearchesService researchesServ){
-        this.researchesServ = researchesServ;
-    this.authServ = authServ;
-    }
-
-
-    /** return a list of authorized applications.
-     *  depends on the token
-     */
-    @GetMapping("/apps")
-    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
-        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
-    }
-
-    @GetMapping("/apps/{identifier}")
-    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
-
-        if (getAuthorizedApplications(token).contains(identifier)){
-            return new ResponseEntity<>(true, HttpStatus.OK);
-        }
-        return new ResponseEntity<>(false, HttpStatus.OK);
-    }
-
-    public ArrayList<Applications> getAuthorizedApplications(String token){
-        ArrayList<Applications> authorizedApps = new ArrayList<>();
-
-        //if unAuthed
-        authorizedApps.add(Applications.Login);
-<<<<<<< HEAD
-        authorizedApps.add(Applications.ListResearches);
-=======
-        authorizedApps.add(Applications.Schedule);
->>>>>>> origin/master
-
-		User user = authServ.getUserFromToken(token);
-		if(user == null)
-            return authorizedApps;
-        // if authed
-        authorizedApps.add(Applications.Profile);
-
-        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Student,Role.Admin},token)) {
-            authorizedApps.add(Applications.Msg);
-            authorizedApps.add(Applications.Forum);
-            authorizedApps.add(Applications.Rdv);
-        }
-
-        if(!authServ.isNotIn(new Role[]{Role.Teacher,Role.Admin},token))
-            authorizedApps.add(Applications.ManageOwnedLessons);
-        //if Teacher or Secretary or Admin add ManageCourses App
-        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, Role.Teacher},token)){
-            authorizedApps.add(Applications.Requests);
-            authorizedApps.add(Applications.StudentsList);}
-
-<<<<<<< HEAD
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){
-            authorizedApps.add(Applications.CreateUser);
-          authorizedApps.add(Applications.UsersList);}
-
-        if (researchesServ.getResearcherByUser(user) != null)
-            authorizedApps.add(Applications.ManageResearcherProfile);
-=======
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
-          authorizedApps.add(Applications.UsersList);
-          authorizedApps.add(Applications.ManageSchedules);
-          authorizedApps.add(Applications.LessonRequests);}
-
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.InscriptionService},token)){
-            authorizedApps.add(Applications.Payments);}
->>>>>>> origin/master
-        return authorizedApps;
-    }
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BASE_12704.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BASE_12704.java
deleted file mode 100644
index d4fdaa0..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BASE_12704.java
+++ /dev/null
@@ -1,75 +0,0 @@
-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.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Tables.Applications;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class ApplicationsController {
-
-    AuthenticatorService authServ;
-
-    public ApplicationsController(AuthenticatorService authServ){
-    this.authServ = authServ;
-    }
-
-
-    /** return a list of authorized applications.
-     *  depends on the token
-     */
-    @GetMapping("/apps")
-    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
-        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
-    }
-
-    @GetMapping("/apps/{identifier}")
-    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
-
-        if (getAuthorizedApplications(token).contains(identifier)){
-            return new ResponseEntity<>(true, HttpStatus.OK);
-        }
-        return new ResponseEntity<>(false, HttpStatus.OK);
-    }
-
-    public ArrayList<Applications> getAuthorizedApplications(String token){
-        ArrayList<Applications> authorizedApps = new ArrayList<>();
-
-        //if unAuthed
-        authorizedApps.add(Applications.Login);
-
-		User user = authServ.getUserFromToken(token);
-		if(user == null)
-            return authorizedApps;
-        // if authed
-        authorizedApps.add(Applications.Profile);
-
-        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Student,Role.Admin},token)) {
-            authorizedApps.add(Applications.Msg);
-            authorizedApps.add(Applications.Forum);
-            authorizedApps.add(Applications.Rdv);
-        }
-
-        //if Teacher or Secretary or Admin add ManageCourses App
-        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, Role.Teacher},token)){
-            authorizedApps.add(Applications.Requests);
-            authorizedApps.add(Applications.StudentsList);}
-
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
-          authorizedApps.add(Applications.UsersList);}
-        return authorizedApps;
-    }
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_LOCAL_12704.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_LOCAL_12704.java
deleted file mode 100644
index 36c485e..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_LOCAL_12704.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package ovh.herisson.Clyde.EndPoints;
-
-import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
-import ovh.herisson.Clyde.Tables.Applications;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class ApplicationsController {
-
-    AuthenticatorService authServ;
-
-    ResearchesService researchesServ;
-
-    public ApplicationsController(AuthenticatorService authServ, ResearchesService researchesServ){
-        this.researchesServ = researchesServ;
-    this.authServ = authServ;
-    }
-
-
-    /** return a list of authorized applications.
-     *  depends on the token
-     */
-    @GetMapping("/apps")
-    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
-        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
-    }
-
-    @GetMapping("/apps/{identifier}")
-    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
-
-        if (getAuthorizedApplications(token).contains(identifier)){
-            return new ResponseEntity<>(true, HttpStatus.OK);
-        }
-        return new ResponseEntity<>(false, HttpStatus.OK);
-    }
-
-    public ArrayList<Applications> getAuthorizedApplications(String token){
-        ArrayList<Applications> authorizedApps = new ArrayList<>();
-
-        //if unAuthed
-        authorizedApps.add(Applications.Login);
-        authorizedApps.add(Applications.ListResearches);
-
-		User user = authServ.getUserFromToken(token);
-		if(user == null)
-            return authorizedApps;
-        // if authed
-        authorizedApps.add(Applications.Profile);
-
-        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Student,Role.Admin},token)) {
-            authorizedApps.add(Applications.Msg);
-            authorizedApps.add(Applications.Forum);
-            authorizedApps.add(Applications.Rdv);
-        }
-
-        //if Teacher or Secretary or Admin add ManageCourses App
-        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, Role.Teacher},token)){
-            authorizedApps.add(Applications.Requests);
-            authorizedApps.add(Applications.StudentsList);}
-
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){
-            authorizedApps.add(Applications.CreateUser);
-          authorizedApps.add(Applications.UsersList);}
-
-        if (researchesServ.getResearcherByUser(user) != null)
-            authorizedApps.add(Applications.ManageResearcherProfile);
-        return authorizedApps;
-    }
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_REMOTE_12704.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_REMOTE_12704.java
deleted file mode 100644
index 74f76fa..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_REMOTE_12704.java
+++ /dev/null
@@ -1,83 +0,0 @@
-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.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RestController;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Tables.Applications;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.ArrayList;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class ApplicationsController {
-
-    AuthenticatorService authServ;
-
-    public ApplicationsController(AuthenticatorService authServ){
-    this.authServ = authServ;
-    }
-
-
-    /** return a list of authorized applications.
-     *  depends on the token
-     */
-    @GetMapping("/apps")
-    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
-        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
-    }
-
-    @GetMapping("/apps/{identifier}")
-    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
-
-        if (getAuthorizedApplications(token).contains(identifier)){
-            return new ResponseEntity<>(true, HttpStatus.OK);
-        }
-        return new ResponseEntity<>(false, HttpStatus.OK);
-    }
-
-    public ArrayList<Applications> getAuthorizedApplications(String token){
-        ArrayList<Applications> authorizedApps = new ArrayList<>();
-
-        //if unAuthed
-        authorizedApps.add(Applications.Login);
-        authorizedApps.add(Applications.Schedule);
-
-		User user = authServ.getUserFromToken(token);
-		if(user == null)
-            return authorizedApps;
-        // if authed
-        authorizedApps.add(Applications.Profile);
-
-        if (!authServ.isNotIn(new Role[]{Role.Teacher,Role.Student,Role.Admin},token)) {
-            authorizedApps.add(Applications.Msg);
-            authorizedApps.add(Applications.Forum);
-            authorizedApps.add(Applications.Rdv);
-        }
-
-        if(!authServ.isNotIn(new Role[]{Role.Teacher,Role.Admin},token))
-            authorizedApps.add(Applications.ManageOwnedLessons);
-        //if Teacher or Secretary or Admin add ManageCourses App
-        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, Role.Teacher},token)){
-            authorizedApps.add(Applications.Requests);
-            authorizedApps.add(Applications.StudentsList);}
-
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin},token)){ 
-          authorizedApps.add(Applications.UsersList);
-          authorizedApps.add(Applications.ManageSchedules);
-          authorizedApps.add(Applications.LessonRequests);}
-
-        if (!authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.InscriptionService},token)){
-            authorizedApps.add(Applications.Payments);}
-        return authorizedApps;
-    }
-}
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 d71e159..10634d3 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
@@ -151,8 +151,6 @@ public class MockController {
         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);
-            ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, null);
-            externalCurriculumRepository.save(externalCurriculum);
 
             ///////////////////////////
             // extension Publications Scientifiques
diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java.orig b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java.orig
deleted file mode 100644
index e1faa8c..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java.orig
+++ /dev/null
@@ -1,307 +0,0 @@
-package ovh.herisson.Clyde.EndPoints;
-
-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.Repositories.Inscription.UnregisterRequestRepository;
-import ovh.herisson.Clyde.Services.*;
-import ovh.herisson.Clyde.Services.ScientificPublications.ResearchesService;
-import ovh.herisson.Clyde.Tables.*;
-<<<<<<< HEAD
-import ovh.herisson.Clyde.Tables.ScientificPublications.Access;
-import ovh.herisson.Clyde.Tables.ScientificPublications.PaperType;
-import ovh.herisson.Clyde.Tables.ScientificPublications.Research;
-import ovh.herisson.Clyde.Tables.ScientificPublications.Researcher;
-import ovh.herisson.Clyde.Services.Inscription.InscriptionService;
-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 ovh.herisson.Clyde.Tables.Inscription.*;
->>>>>>> origin/master
-
-import java.util.*;
-
-@RestController
-@CrossOrigin(originPatterns = "*", allowCredentials = "true")
-public class MockController {
-    public final UserService userService;
-    public final UserRepository userRepo;
-    public final TokenRepository tokenRepo;
-    public final TokenService tokenService;
-    public final CurriculumCourseService CurriculumCourseService;
-    public final CurriculumService curriculumService;
-    public final CourseService courseService;
-    public final ExternalCurriculumRepository externalCurriculumRepository;
-    public final InscriptionService inscriptionService;
-<<<<<<< HEAD
-=======
-
-    public final LessonService lessonService;
-    public final ScheduleService scheduleService;
-    public final ScheduleLessonService scheduleLessonService;
-
-    public final LessonRequestService lessonRequestService;
-    ArrayList<User> mockUsers;
->>>>>>> origin/master
-
-    public final ResearchesService researchesService;
-    public final UserCurriculumRepository ucr;
-    public final MinervalRepository minervalRepository;
-    public final ScholarshipRequestRepository scholarshipRequestRepository;
-
-<<<<<<< HEAD
-    ArrayList<User> mockUsers;
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, ExternalCurriculumRepository externalCurriculumRepository,  ResearchesService researchesService, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository, ScholarshipRequestRepository scholarshipRequestRepository){
-=======
-    public final UnregisterRequestRepository uninscriptionRequestRepository;
-    public MockController(UserService userService, UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, ExternalCurriculumRepository externalCurriculumRepository, InscriptionService inscriptionService, UserCurriculumRepository ucr, MinervalRepository minervalRepository, ScholarshipRequestRepository scholarshipRequestRepository, UnregisterRequestRepository unregisterRequestRepository, LessonService lessonService, ScheduleService scheduleService, ScheduleLessonService scheduleLessonService, LessonRequestService lessonRequestService){
-        this.userService = userService;
->>>>>>> origin/master
-        this.tokenRepo = tokenRepo;
-        this.userRepo = userRepo;
-        this.tokenService = tokenService;
-        this.CurriculumCourseService = CurriculumCourseService;
-        this.curriculumService = curriculumService;
-        this.courseService = courseService;
-        this.externalCurriculumRepository = externalCurriculumRepository;
-        this.inscriptionService = inscriptionService;
-<<<<<<< HEAD
-        this.researchesService = researchesService;
-=======
-        this.lessonService = lessonService;
-        this.scheduleService = scheduleService;
-        this.scheduleLessonService = scheduleLessonService;
-        this.lessonRequestService = lessonRequestService;
->>>>>>> origin/master
-        this.ucr = ucr;
-        this.minervalRepository = minervalRepository;
-        this.scholarshipRequestRepository = scholarshipRequestRepository;
-        this.uninscriptionRequestRepository = unregisterRequestRepository;
-    }
-
-    /** Saves an example of each user type by :
-     * email : FooRole@FooRole.com, password : FooRole and token : FooRole
-     * For example the admin as "admin@admin.com" as email and "admin" as both password and token
-     * They all have silly names
-     */
-
-    @PostMapping("/mock")
-    public void postMock() {
-
-<<<<<<< HEAD
-            // 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"));
-            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);
-=======
-        // user part
-        User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,"admin");
-        User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,"student");
-        User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,"secretary");
-        User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,"teacher");
-        User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,"teacher");
-        User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.InscriptionService,"inscriptionService");
-        User popo = new User("Smith", "Paul", "paulsmith@gmail.com", "306 rue du poulet", "belgique", new Date(0), null, Role.Student, "jesuispaulleroi");
-        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo, popo));
-
-        userService.saveAll(mockUsers);
-
-        ExternalCurriculum externalCurriculum = new ExternalCurriculum(null, "HEH", "Bachelier en ingénieur", "completed", 2015, 2017, null, joe);
-        externalCurriculumRepository.save(externalCurriculum);
->>>>>>> origin/master
-
-            Minerval minerval = new Minerval(joe.getRegNo(), 0, 852, 2023);
-            minervalRepository.save(minerval);
-            // Course / Curriculum part
-
-<<<<<<< HEAD
-            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");
-
-            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));
-            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));
-
-            Course progra1 = new Course(5, "Programmation et algorithmique 1", joke);
-            Course chemistry1 = new Course(12, "Thermochimie", joke);
-            Course psycho1 = new Course(21, "Neuroreaction of isolated brain cells", joke);
-            Course commun = new Course(2, "cours commun", joke);
-=======
-        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);
-        curriculumService.save(infoBab2);
-        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));
-        ucr.save(new UserCurriculum(joe, infoBab1, 2023, true));
-        ucr.save(new UserCurriculum(joe, psychologyBab1, 2020, false));
-        ucr.save(new UserCurriculum(popo, infoBab1, 2022, false));
-        ucr.save(new UserCurriculum(popo, infoBab2, 2023, true));
-
-        Course progra1 = new Course(5,"Programmation et algorithmique 1",joke);
-        Course chemistry1 = new Course(12, "Thermochimie",jojo);
-        Course psycho1 = new Course(21, "Neuroreaction of isolated brain cells",joke);
-        Course commun = new Course(2, "cours commun",joke);
->>>>>>> origin/master
-
-            courseService.save(progra1);
-            courseService.save(chemistry1);
-            courseService.save(psycho1);
-            courseService.save(commun);
-
-            ScholarshipRequest ssr1 = new ScholarshipRequest(joe, RequestState.Pending, 0, new Date(), "test", "test");
-            scholarshipRequestRepository.save(ssr1);
-
-<<<<<<< HEAD
-            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));
-
-=======
-        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));
-        CurriculumCourseService.save(new CurriculumCourse(chemistryBab1, chemistry1));
->>>>>>> origin/master
-
-            CurriculumCourseService.save(new CurriculumCourse(chemistryBab1, commun));
-            CurriculumCourseService.save(new CurriculumCourse(chemistryBab1, chemistry1));
-
-<<<<<<< HEAD
-
-            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);
->>>>>>> origin/master
-
-            inscriptionService.save(inscriptionRequest);
-            ExternalCurriculum externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, null);
-            externalCurriculumRepository.save(externalCurriculum);
-
-            ///////////////////////////
-            // extension Publications Scientifiques
-            Researcher jojoResearcherAccount = new Researcher(jojo, "3363-22555-AB33-T", null, "IT");
-
-            Researcher joResearchAccount = new Researcher(joe,"N555-321213-BED-DD",null, "Physics");
-
-
-            Researcher output = researchesService.saveResearcher(jojoResearcherAccount);
-            Researcher joOutput = researchesService.saveResearcher(joResearchAccount);
-
-            Set<Researcher> coAuthor = new HashSet<>();
-            coAuthor.add(joOutput);
-
-            Research jojoResearch = new Research("Graphs : Advanced Search Algorithms", output, new Date(0),
-                    PaperType.Article, "test.pdf", null, "english",
-                    Access.OpenSource, "IT", "This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms",coAuthor);
-            Research restrictedResearch = new Research("just another Name", output, new Date(1111111111),
-                    PaperType.Article, "restricted", null, "english",
-                    Access.Restricted, "Restricted", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms", new HashSet<>());
-
-            Research privateResearch = new Research("the great Potato War", output, new Date(),
-                    PaperType.Article, "private", null, "english",
-                    Access.Private, "private", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms",null);
-
-
-            researchesService.saveResearch(restrictedResearch);
-            researchesService.saveResearch(privateResearch);
-            researchesService.saveResearch(jojoResearch);
-
-<<<<<<< HEAD
-=======
-
-        //Schedule part
-
-        Lesson lesson_0_progra1 = new Lesson(progra1, "Mon Apr 22 2024 08:15", "Mon Apr 22 2024 10:15","rgb(0,50,100)","A0B2","Course");
-        Lesson lesson_0_chemistry1 = new Lesson(chemistry1, "Wed Mar 27 2024 08:15", "Wed Mar 27 2024 09:15","rgb(100,50,0)","A0B2","TP");
-        Lesson lesson_0_psycho1 = new Lesson(psycho1, "Sun Mar 24 2024 10:30 ","Sun Mar 24 2024 12:30 ","rgb(100,50,100)", "A0B2","TD");
-        Lesson lesson_1_progra1 = new Lesson(progra1, "Mon Apr 02 2024 13:30", "Mon Apr 02 2024 15:30","rgb(0,50,100)","A0B2","TP");
-        Lesson lesson_0_commun = new Lesson(commun, "Mon Apr 01 2024 10:30", "Mon Apr 01 2024 12:30","rgb(0,50,100)","A0B2","Course");
-
-        LessonChangesRequest request1 = new LessonChangesRequest(joke,RequestState.Pending,null,null,null,null,2,null,1);
-        LessonChangesRequest request2 = new LessonChangesRequest(joke,RequestState.Pending,"Fri Apr 19 2024 10:30 ","Fri Apr 19 2024 12:30 ",null,null,1,null,2);
-        LessonChangesRequest request3 = new LessonChangesRequest(joke,RequestState.Pending,"Fri Apr 19 2024 13:30 ","Fri Apr 19 2024 15:30 ","Course",progra1,0,"rgb(27,49,100)",4);
-
-
-        Schedule infoBab1Schedule = new Schedule(infoBab1);
-        Schedule chemistryBab1Schedule = new Schedule(chemistryBab1);
-        Schedule psychoBab1Schedule = new Schedule(psychologyBab1);
-
-
-        scheduleService.save(infoBab1Schedule);
-        scheduleService.save(chemistryBab1Schedule);
-        scheduleService.save(psychoBab1Schedule);
-
-        lessonService.save(lesson_0_progra1);
-        lessonService.save(lesson_0_chemistry1);
-        lessonService.save(lesson_0_commun);
-        lessonService.save(lesson_0_psycho1);
-        lessonService.save(lesson_1_progra1);
-
-        scheduleLessonService.save(new ScheduleLesson(infoBab1Schedule,lesson_0_progra1));
-        scheduleLessonService.save(new ScheduleLesson(infoBab1Schedule,lesson_1_progra1));
-        scheduleLessonService.save(new ScheduleLesson(infoBab1Schedule,lesson_0_commun));
-
-        scheduleLessonService.save(new ScheduleLesson(chemistryBab1Schedule,lesson_0_chemistry1));
-        scheduleLessonService.save(new ScheduleLesson(chemistryBab1Schedule,lesson_0_commun));
-
-        scheduleLessonService.save(new ScheduleLesson(psychoBab1Schedule,lesson_0_psycho1));
-        scheduleLessonService.save(new ScheduleLesson(psychoBab1Schedule,lesson_0_commun));
-
-
-        lessonRequestService.save(request1);
-        lessonRequestService.save(request2);
-        lessonRequestService.save(request3);
-
-        UnregisterRequest unregisterRequest = new UnregisterRequest(RequestState.Pending, "je veux partir", new Date(), joe.getRegNo(), joe.getFirstName(), joe.getLastName(), joe.getEmail(), null);
-        uninscriptionRequestRepository.save(unregisterRequest);
-
-        externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, null);
-        externalCurriculumRepository.save(externalCurriculum);
->>>>>>> origin/master
-    }
-}
-
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java.orig b/backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java.orig
deleted file mode 100644
index e1db7b3..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java.orig
+++ /dev/null
@@ -1,193 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Tables.RegNoGenerator;
-import ovh.herisson.Clyde.Repositories.UserRepository;
-import ovh.herisson.Clyde.Tables.Notification;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-import java.util.*;
-
-@Service
-public class UserService {
-    private final UserRepository userRepo;
-    private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-
-    public UserService(UserRepository userRepo){
-        this.userRepo = userRepo;
-    }
-
-
-    /** return the user identified by th identifier
-     *
-     * @param identifier can be an email or the RegNo
-     * @return the identified user
-     */
-    public User getUser(String identifier){
-        if (identifier == null)
-            return null;
-
-        try {
-            int id = Integer.parseInt(identifier);
-            return userRepo.findById(id);
-        }
-        catch (NumberFormatException nfe){
-            return userRepo.findByEmail(identifier);
-        }
-    }
-
-    /** modify the target data
-     * verify the permission of modifying from the poster
-     *
-     * @param poster the user wanting to modify target's data
-     * @param updates the changes to be made
-     * @param targetId the id of the user to update
-     * @return if the changes were done or not
-     */
-    public User modifyData(long targetId, Map<String ,Object> updates, User poster){
-
-        User target = userRepo.findById(targetId);
-        if (target == null)
-            return null;
-
-        if (!target.getRegNo().equals(poster.getRegNo()) && !(poster.getRole() == Role.Secretary) &&
-            !(poster.getRole() == Role.Admin))
-            return null;
-
-<<<<<<< HEAD
-        for (Map.Entry<String, Object> entry : updates.entrySet()){
-            System.out.println(entry.getValue());
-            switch (entry.getKey()){
-                case "firstName":
-                    target.setFirstName((String) entry.getValue());
-                    break;
-                case "lastName":
-                    target.setLastName((String) entry.getValue());
-                    break;
-                case "email":
-                    target.setEmail((String) entry.getValue());
-                    break;
-                case "address":
-                    target.setAddress((String) entry.getValue());
-                    break;
-                case "country":
-                    target.setCountry((String) entry.getValue());
-                    break;
-                case "birthDate":
-                    target.setBirthDate((Date) entry.getValue());
-                    break;
-                case "profilePictureUrl":
-                    target.setProfilePictureUrl((String) entry.getValue());
-                    break;
-                case "password":
-                    target.setPassword((String) entry.getValue());
-                    break;
-                case "role":
-                    //a user can't change his own role
-                    if (poster.getRole()==Role.Secretary || poster.getRole() == Role.Admin){
-                        Role wanted = Role.valueOf((String) entry.getValue());
-                        if (wanted == Role.Admin && poster.getRole() != Role.Admin)
-                            return null;
-                        target.setRole(wanted);
-                    }
-=======
-                switch (entry.getKey()){
-                    case "firstName":
-                        target.setFirstName((String) entry.getValue());
-                        break;
-                    case "lastName":
-                        target.setLastName((String) entry.getValue());
-                        break;
-                    case "email":
-                        target.setEmail((String) entry.getValue());
-                        break;
-                    case "address":
-                        target.setAddress((String) entry.getValue());
-                        break;
-                    case "country":
-                        target.setCountry((String) entry.getValue());
-                        break;
-                    case "birthDate":
-                        target.setBirthDate((Date) entry.getValue());
-                        break;
-                    case "profilePictureUrl":
-                        target.setProfilePictureUrl((String) entry.getValue());
-                        break;
-                    case "password":
-                        target.setPassword((String) entry.getValue());
-                        break;
-                }
-            }
-            userRepo.save(target);
-            return true;
-        }
-        // the secretary can change roles (for example if a student becomes a teacher)
-        else if (poster.getRole() == Role.Secretary)
-        {
-            for (Map.Entry<String, Object> entry : updates.entrySet()){
-
-                if ( entry.getKey().equals("role")) {
-
-                    if (entry.getValue() == Role.Admin) {return false;}
-
-                    target.setRole((Role) entry.getValue());
-                    userRepo.save(target);
-                    return true;
-                }
->>>>>>> origin/master
-            }
-        }
-        userRepo.save(target);
-        return target;
-    }
-
-
-    public boolean checkPassword(User user, String tryingPassword){
-        return passwordEncoder.matches(tryingPassword,  user.getPassword());
-    }
-
-<<<<<<< HEAD
-    public User save(User user){
-        user.setPassword(passwordEncoder.encode(user.getPassword()));
-=======
-    public User save(User  user){
-        RegNoGenerator.resetCount();
->>>>>>> origin/master
-        return userRepo.save(user);
-    }
-
-    public void saveAll(ArrayList<User> list){
-        //S'assure que le compteur est bien a 0
-        RegNoGenerator.resetCount();
-        userRepo.saveAll(list);
-    }
-
-    public Iterable<User> getAll(){
-        return userRepo.findAll();
-    }
-
-    public Iterable<User> getAllExceptAdmins(){
-        return userRepo.findAllExceptAdmins();
-    }
-
-
-    public Iterable<User> getAllTeachers (){return userRepo.findAllTeachers();}
-
-    public Iterable<User> getAllStudents(){return userRepo.findAllStudents();}
-
-
-    public User getUserById(long id) {
-        return userRepo.findById(id);
-    }
-
-    public void delete(User user) {
-        userRepo.delete(user);
-    }
-
-	public void Notify(User u, Notification n){
-		n.setUser(u);
-		u.getNotifications().add(n);
-		userRepo.save(u);
-	}
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java.orig b/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java.orig
deleted file mode 100644
index 1876f00..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java.orig
+++ /dev/null
@@ -1,40 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-public enum Applications {
-    // without any token
-    Login,
-    Schedule,
-
-    // with any token
-    Profile,
-
-    // Students and higher authorization
-    Msg,
-    Forum,
-    Rdv,
-    // teachers authorization
-
-    ManageOwnedLessons,
-
-    // teachers and Secretary authorization
-    ManageCourses,
-    UsersList,
-    
-    //Secretary authorization
-    ManageSchedules,
-    LessonRequests,
-
-    // InscriptionService authorization
-    Requests,
-<<<<<<< HEAD
-    // profile of a researcher
-    ResearcherProfile,
-    ManageResearcherProfile,
-
-    //the list of all researches (filterable)
-    ListResearches, CreateUser, StudentsList
-=======
-    StudentsList,
-    Payments
->>>>>>> origin/master
-}
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java.orig b/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java.orig
deleted file mode 100644
index f827bc0..0000000
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java.orig
+++ /dev/null
@@ -1,15 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-public enum FileType {
-    ProfilePicture,
-    EducationCertificate,
-<<<<<<< HEAD
-    Research,
-
-    ResearchBibTex,
-    JustificationDocument
-=======
-    JustificationDocument,
-    IdentityCard,
->>>>>>> origin/master
-}
diff --git a/frontend/public/i18n/EN.txt.orig b/frontend/public/i18n/EN.txt.orig
deleted file mode 100644
index 724d8b3..0000000
--- a/frontend/public/i18n/EN.txt.orig
+++ /dev/null
@@ -1,295 +0,0 @@
-login.guest.signin=Sign in
-login.guest.register=Register
-login.guest.alregister=Already Registered
-login.guest.welcome=WELCOME TO THE UNIVERSITY
-login.guest.email=E-MAIL 
-login.guest.firstname=FIRSTNAME
-login.guest.surname=SURNAME
-login.guest.country=COUNTRY
-login.guest.address=ADDRESS
-login.guest.password=PASSWORD
-login.guest.nextpage=Next Page
-login.guest.lastpage=Last Page
-login.guest.submit=Submit
-login.guest.birthday=BIRTHDAY
-login.guest.confirm=CONFIRM
-login.guest.browse=Browse...
-login.guest.disclaimer=If you are already registered please connect to your account and use the change cursus/reregister function if not continue here.
-login.guest.identityCard=Identity Card :
-login.guest.attestationdisclaimer=This curriculum requires an entrance exam attestation
-login.guest.formationdisclaimer=Please add your old formations with the associated degree/attestation,your case will be check by a member of the inscription service.
-login.guest.managecareer=Manage your external formations
-login.guest.sendRegReq=Send register request
-login.cPassword=Confirm Password
-login.password=Password
-app.home=Home
-app.login=Login
-app.notifications=Notifications
-app.settings=Settings
-app.messages=Messages
-app.forum=Forum
-app.schedules=Schedules
-app.manageSchedules=Manage Schedules
-app.inscription.requests=Inscription Requests
-app.manage.courses=Manage Courses
-app.language=Language
-app.manage.profile=Manage profile
-app.studentList=Students List
-app.users=Users
-<<<<<<< HEAD
-app.manage.researcherProfile=Manage researcher profile
-app.list.researches=List researches
-app.Create.User=Create User
-=======
-app.manageOwnLessons=Manage Owned Courses Schedule
-app.lessonRequests=Schedule Requests
-app.payments=Payments
->>>>>>> origin/master
-request.moreInfos=More Infos
-request.accept=Accept
-request.refuse=Refuse
-Pending=Pending
-Delete=Delete
-Modify=Modify
-Create=Créer
-requestType=Request Type
-day=Day
-start=Start
-end=End
-monday=Monday
-tuesday=Tuesday
-wednesday=Wednesday
-thursday=Thursday
-friday=Friday
-saturday=Saturday
-sunday=Sunday
-january=January
-february=February
-march=March
-april=April
-may=May
-june=June
-july=July
-august=August
-september=September
-october=October
-november=November
-december=December
-Grid=Grid
-Week=Week
-Month=Month
-List=List
-Type=Type
-Teacher=Teacher
-Course=Course
-TP=TP
-TD=TD
-Exam=Exam
-OwnSchedule=Own Schedule
-SwitchToJSON=Switch to JSON FILE
-schedule.previous=Previous
-schedule.next=Next
-schedule.current=Current
-schedule.settings=Settings
-schedule.courses=Courses
-schedule.teachers=Teacher(s)
-schedule.askChanges=Ask Changes
-schedule.askCreate=Ask to create course
-schedule.askDeletion=Ask Deletion
-schedule.createSchedule=Create Schedule
-schedule.createLesson=Create course
-schedule.deleteMod=Unable deletion
-schedule.noDeleteMod=Disable deletion
-schedule=Schedule
-old_day=Precedent day
-old_start=Precedent start
-old_end=Precedent end
-old_type=Precedent type
-courses.createCourse=Create course
-courses.deleteCourse=Delete course
-courses.modify=Modify
-courses.toDelete=Course to Delete
-courses.confirm=Confirm
-courses.back=Back
-courses.AddToCurriculum=Add to a new Curriculum
-profile.modify.data=Modify personnal data
-profile.reRegister=Re-register
-profile.unRegister=Unregister
-profile.course.list=Courses list
-profile.address=Address
-profile.picture=Profile picture
-profile.change.curriculum=Change curriculum
-name=Name
-Teacher=Teacher
-Student=Student
-Secretary=Secretary
-Curriculum=curriculum
-Credits=Credits
-InscriptionService=I.S.
-faculty=Faculty
-<<<<<<< HEAD
-Year=Year
-Access=Access
-Access.Restricted=Restricted
-Access.OpenSource=OpenSource
-Access.Private=Private
-Language=Language
-Month=Month
-Month.01=january
-Month.02=february
-Month.03=march
-Month.04=april
-Month.05=may
-Month.06=june
-Month.07=july
-Month.08=august
-Month.09=september
-Month.10=october
-Month.11=november
-Month.12=december
-Domain=Domain
-PaperType=PaperType
-Submit=Submit
-Search.Researches=Search For Researches
-Search.Researchers=Search For Researchers
-Filters=Filters
-Toggle.Researcher=Toggle Researcher Search
-Untoggle.Researcher=Toggle Research Search
-MoreInfo=More Info
-Modify.Research=Modify Research
-To.Change.In.Options=To change in regular account options
-Modify.Data=Modify Data
-Confirm.Changes=Confirm Changes
-Cancel.Changes=Cancel Changes
-Post.Research=Post a new Research
-Summary=Summary
-Title=Title
-Views=Number of Views
-See.Research=See Research
-SeeBibTex=See BibTex
-Author=Author
-CoAuthors=Co-Authors
-ReleaseDate=ReleaseDate
-Article.Id=Article Id
-Delete.Research=Delete Research
-Here=Here
-Stat.Type=Stat Type
-Researches=Researches
-Please.Select.Option=Please Select an Option
-Class.By=Class By
-PaperType.Article=Article
-PaperType.Book=Book
-PaperType.Book.Chapter=Book Chapter
-PaperType.Paper=Paper
-Research.Pdf=Research Pdf
-BibTex.Pdf=BibTex Pdf
-CoAuthors.List=Co-Author List
-Confirm.Publish=Confirm Publishing
-Cancel.Publish=Cancel Publishing
-Years=Years
-Months=Months
-By=By
-RegNo=RegNo
-Address=Address
-Country=Country
-BirthDate=Birth Date
-Researcher.Delete=Delete Researcher Profile
-Researcher.Add=Create Researcher Profile
-Confirm=Confirm
-Cancel=Cancel
-LastName=Last Name
-FirstName=First Name
-Profile.Picture=Profile Picture
-Role=Role
-Password=Password
-Create.User=Create User
-=======
-msg.notification.new=You have a new message
-forum.create=Create forum
-forum.create.name=New forum's name
-forum.post.create.name=New post's title 
-firstname/name=Firstname/Name
-regNo=regNo
-From=From
-To=To
-WantedCursus=Wanted Cursus
-seeprofile=See profile
-acceptequiv=Accept equivalence
-refuseequiv=Refuse equivalence
-course=course
-state=state
-dljustifdoc=Download justification document
-backtoreq=Back to request
-dlidentitycard=Download identity card
-dladmissiondoc=Download admission document
-seeextcur=See external curriculums
-dltaxdoc=Download tax justification document
-dlresidency=Download residency justification document
-enteramount=Please enter the amount to provide :
-oldcursus=Old curriculums
-newcursus=New curriculums
-year=Year
-reason=Reason :
-selectedcursus=Selected curriculum :
-askexemp=Ask exemption
-exemp=Exempted
-uploadjustifdoc=Please upload the justification document
-subexemreq=Submit exemption request
-addextcurr=Add external curriculum
-dldoc=Download document
-edit=Edit
-delete=Delete
-school=School
-checkifnotcompleted=Check the box if you didn't complete the formation
-wichyearstop=In which year did you stop (ex: 3rd year) ?
-startyear=Start year
-endyear=End year
-giveextcurdoc=Please upload a document that proves this formation
-uploadcurr=Upload curriculum
-editcurr=Edit curriculum
-reqtype=Request type :
-inscription=register
-scholarship=scholarship
-exemption=exemption
-unregister=unregister
-curriculumch=curriculum change
-filter=Filter :
-approval=Approval :
-teacherapproval=Teacher approval :
-surreq=Are you sure that you want to accept this request ?
-validate=Validate
-amount=Amount
-role=Role
-manageextcur=Manage external curriculum
-managecourse=Manage courses
-manageminerval=Manage school fees
-enterreason=Please enter the reason you leave
-onlycursus=I only want to unregister from a specific cursus
-plsselectcurs=Please select that cursus
-sureunreg=Are you sure that you want to unregister ?
-no=No
-yes=Yes
-reqsend=Your request has been send !
-payment=Payment
-lefttopay=left to pay
-paydeposit=Pay deposit
-payrest=Pay all the rest
-alreadypaid=Payment : School fees have already been paid this year
-askscholarship=Ask scholarship
-uploaddocs=Please upload the required documents
-taxjustdoc=Tax justification document :
-residencydoc=Residency justification document :
-reqsent=Your request has been sent to the inscription service.
-backprofile=Go back to profile
-procpayment=Proceed to payment of
-procpaybutton=Process payment
-rereg=Reregister in the next year of one of my cursus
-reregsup=Register in a supplementary cursus
-chcur=Change from a cursus to another
-iwouldlike=I would like to :
-newcurr=New curriculum
-cursusprereq=The cursus you selected has some prerequisites ensure that your external curriculum data is updated in your profile
-imposecurriculum=Impose a curriculum
-impose=Impose
-gotimposed=The selected curriculum has been imposed
->>>>>>> origin/master
diff --git a/frontend/public/i18n/FR.txt.orig b/frontend/public/i18n/FR.txt.orig
deleted file mode 100644
index 01b9b8d..0000000
--- a/frontend/public/i18n/FR.txt.orig
+++ /dev/null
@@ -1,293 +0,0 @@
-login.guest.signin=SE CONNECTER
-login.guest.register=S'enregistrer
-login.guest.alregister=Déjà Enregistré
-login.guest.welcome=BIENVENUE A L'UNIVERSITE
-login.guest.email=E-MAIL 
-login.guest.firstname=PRENOM
-login.guest.surname=NOM
-login.guest.country=PAYS
-login.guest.address=ADRESSE
-login.guest.password=MOT DE PASSE
-login.guest.nextpage=Prochaine Page
-login.guest.lastpage=Derniere Page
-login.guest.submit=Envoyer
-login.guest.birthday=DATE DE NAISSANCE
-login.guest.confirm=CONFIRMER
-login.guest.browse=Parcourir...
-login.guest.disclaimer=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.
-login.guest.identityCard=Carte d'identité :
-login.guest.attestationdisclaimer=Ce cursus requiert une attestation de réussite d'un examen d'entrée
-login.guest.formationdisclaimer=Veuillez ajouter vos formations antérieures en y joignant les attestations/diplomes, votre dossier sera vérifié par un membre du service d'inscription.
-login.guest.managecareer=Gèrer mon parcours extérieur
-login.guest.sendRegReq=Envoyer la demande d'inscription
-login.cPassword=Confirmer mot de passe
-login.password=Mot de passe
-app.home=Home
-app.login=Se connecter
-app.notifications=Notifications
-app.settings=Options
-app.messages=Messages
-app.forum=Forum
-app.schedules=Horaires
-app.manageSchedules=Gérer les horaires
-app.inscription.requests=Demandes d'Inscription
-app.manage.courses=Gérer les cours
-app.language=Langue
-app.manage.profile=Gérer le profil
-app.studentList=Liste des étudiants
-app.users=Utilisateurs
-<<<<<<< HEAD
-app.manage.researcherProfile= gérer son profil de chercheur
-app.list.researches=Lister les recherches
-app.Create.User=créer un utilisateur
-=======
-app.manageOwnLessons=Gérer ses horaires de cours
-app.lessonRequests=Requêtes d'horaire
-app.payments=Payements
->>>>>>> origin/master
-request.moreInfos=Plus d'Infos
-request.accept=Accepter
-request.refuse=Refuser
-Pending=En attente
-Delete=Supprimer
-Modify=Modifier
-Create=Créer
-requestType=Type de Requête
-day=Jour
-start=Début
-end=Fin
-monday=Lundi
-tuesday=Mardi
-wednesday=Mercredi
-thursday=Jeudi
-friday=Vendredi
-saturday=Samedi
-sunday=Dimanche
-january=Janvier
-february=Février
-march=Mars
-april=Avril
-may=Mai
-june=Juin
-july=Juillet
-august=Août
-september=Septembre
-october=Octobre
-november=Novembre
-december=Decembre
-Grid=Grille
-Week=Semaine
-Month=Mois
-List=Liste
-Type=Type
-Teacher=Professeur
-Course=Cours
-TP=TP
-TD=TD
-Exam=Exam
-OwnSchedule=Mon Horaire
-SwitchToJSON=Afficher le JSON
-schedule.previous=Précédent
-schedule.next=Prochain
-schedule.current=Actuel
-schedule.settings=Options
-schedule.courses=Cours
-schedule.teachers=Professeurs(s)
-schedule.askChanges=Demander Changement
-schedule.askCreate=Demander de créer un cours
-schedule.askDeletion=Demander suppression
-schedule.createSchedule=Créer Horaire
-schedule.createLesson=Créer cours
-schedule.deleteMod=Activer suppression
-schedule.noDeleteMod=Désactiver suppression
-schedule=Horaire
-old_day=Ancien Jour
-old_start=Ancien Début
-old_end=Ancienne Fin
-old_type=Ancien Type
-courses.createCourse=Créer un cours
-courses.deleteCourse=Supprimer un cours
-courses.modify=Modifier
-courses.toDelete=Cours à supprimer
-courses.confirm=Confirmer
-courses.back=Retour
-courses.AddToCurriculum=Ajouter à un cursus
-profile.modify.data=Modifier données personnelles
-profile.reRegister=Réinsciption
-profile.unRegister=Désinscription
-profile.course.list=Liste des cours
-profile.address=Adresse
-profile.picture=Photo de profil
-profile.change.curriculum=Changer cursus
-name=Nom
-Teacher=Enseignant
-Student=Etudiant
-Secretary=Secrétaire
-Curriculum=Cursus
-Credits=Credits
-InscriptionService=S.I.
-faculty=Faculté
-<<<<<<< HEAD
-Year=Année
-Access=Accès
-Access.Restricted=Restreint
-Access.OpenSource=Libre
-Access.Private=Privé
-Language=Langue
-Month=Mois
-Month.01=janvier
-Month.02=fevrier
-Month.03=mars
-Month.04=avril
-Month.05=mai
-Month.06=juin
-Month.07=juillet
-Month.08=août
-Month.09=septembre
-Month.10=octobre
-Month.11=novembre
-Month.12=decembre
-Domain=Domaine
-PaperType=Type de recherche
-Submit=Envoyer
-Search.Researches=Chercher Par Recherche
-Search.Researchers=Chercher Par Chercheur
-Filters=Filtres
-Toggle.Researcher=Activer la recherche par chercheur
-Untoggle.Researcher=Désactiver la recherche par chercheur
-MoreInfo=Plus d'info
-Modify.Research=Modifer l'article
-To.Change.In.Options=À changer dans les options
-Modify.Data=Modifier
-Confirm.Changes=Confirmer les Changements
-Cancel.Changes=Abandonner les Changements
-Post.Research=Poster un nouvel article
-Summary=Résumé
-Title=Titre
-Views=Nombre de Vues
-See.Research=Ouvrir l'article
-SeeBibTex=Ouvrir le BibTex
-Author=Autheur
-CoAuthors=Co-Autheurs
-ReleaseDate=Date de Parution
-Article.Id=Id de l'article
-Delete.Research=Supprimer l'article
-Here=Ici
-Stat.Type=Type de Stat
-Researches=Recherches
-Please.Select.Option=Selectionnez des Options
-Class.By=Classifer Par
-PaperType.Article=Article
-PaperType.Book=Livre
-PaperType.Book.Chapter=Chapitre de Livre
-PaperType.Paper=Papier
-Research.Pdf=Pdf de la Recherche
-BibTex.Pdf=BibTex de la Recherche
-CoAuthors.List=Liste des Co-Autheurs
-Confirm.Publish=Confirmer la Publication
-Cancel.Publish=Annuler la Publication
-Years=Années
-Months=Mois
-By=par
-RegNo=Matricule
-Address=Adresse
-Country=Pays
-BirthDate=Date de Naissance
-Confirm=Confirmer
-Cancel=Annuler
-LastName=Nom de Famille
-FirstName=Prénom
-Profile.Picture=Photo de Profil
-Role=Role
-Password=Mot de Passe
-Create.User=Créer l'utilisateur
-=======
-msg.notification.new=Vous avez un nouveau message!
-forum.create=Créer un forum
-forum.create.name=Nom du forum
-forum.post.create.name=Titre du post
-firstname/name=Prénom/Nom
-regNo=Matricule
-From=De
-To=A
-WantedCursus=Cursus voulu
-seeprofile=Voir le profil
-acceptequiv=Accepter l'équivalence
-refuseequiv=Refuser l'équivalence
-course=cours
-state=état
-dljustifdoc=Télécharger le justificatif
-backtoreq=Retour a la requête
-dlidentitycard=Télécharger la carte d'identité
-dladmissiondoc=Télécharger le certificat d'admission
-seeextcur=Voir le parcours extérieur
-dltaxdoc=Télécharger le justificatif d'impot
-dlresidency=Télécharger le justificatif de résidence
-enteramount=Veuillez entrer le montant alloué :
-oldcursus=Anciens cursus
-newcursus=Nouveaux cursus
-year=Année
-reason=Raison :
-selectedcursus=Cursus selectionné :
-askexemp=Demander une dispense
-exemp=Dispensé
-uploadjustifdoc=Veuillez soumettre le justificatif
-subexemreq=Envoyer la demande de dispense
-addextcurr=Ajouter une formation
-dldoc=Télécharger le document
-edit=Modifier
-delete=Supprimer
-school=Ecole
-checkifnotcompleted=Cochez la case si vous n'avez terminé cette formation
-wichyearstop=En quelle année de la formation vous êtes vous arrété (exemple: 3ème) ?
-startyear=Année de début
-endyear=Année de fin
-giveextcurdoc=Veuillez soumettre un document attestant de ce parcours
-uploadcurr=Ajouter la formation
-editcurr=Modifier la formation
-reqtype=Type de requête :
-inscription=inscription
-scholarship=bourse
-exemption=dispense
-unregister=désinscription
-curriculumch=changement de cursus
-filer=Filtre :
-approval=Approbation :
-teacherapproval=Approbation d'un prof :
-surreq=Etes vous sur de vouloir accepter cette demande ?
-validate=Valider
-amount=Montant
-role=Role
-manageextcur=Gérer les formations
-managecourse=Gérer les cours
-manageminerval=Gérer le minerval
-enterreason=Veuillez entrer la raison de votre départ
-onlycursus=Je veux uniquement me désinscrire d'un seul cursus
-plsselectcurs=Veuillez sélectionner ce cursus
-sureunreg=Etes-vous sur de vouloir vous désinscrire ?
-no=Non
-yes=Oui
-reqsend=Votre requête a été envoyée !
-payment=Payement
-lefttopay=restants a payer
-paydeposit=Payer l'acompte
-payrest=Payer le reste
-alreadypaid=Payement : les frais ont déja été payés cette année
-askscholarship=Demander une bourse
-uploaddocs=Veuillez soumettre les documents requis
-taxjustdoc=Justificatif d'impôts :
-residencydoc=Justificatif de résidence :
-reqsent=Votre requête a été envoyée au service d'inscription.
-backprofile=Retour au profil
-procpayment=Procéder au payement de
-procpaybutton=Procéder au payement
-rereg=Me réinscrire dans l'année supérieure
-reregsup=M'inscrire dans un cursus supplémentaire
-chcur=Changer d'un cursus vers un autre
-iwouldlike=Je voudrais :
-newcurr=Nouveau cursus
-cursusprereq=Le cursus que vous avez selectionné a des prérequis assurez vous que votre dossier de parcours est a jour dans votre profil
-imposecurriculum=Imposer un cursusgotimposed
-impose=Imposer
-gotimposed=Le cursus selectionné a été imposé
->>>>>>> origin/master
diff --git a/frontend/src/rest/apps.js b/frontend/src/rest/apps.js
index f0b11ed..f02da12 100644
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@@ -31,10 +31,9 @@ const apps = {
 		'/users-list' : Users,
 		'/students-list' : Students,
 		'/manage-researcher-profile' : ManageResearcherProfile,
-		'/msg' : Msg,
 		'/researches' : ListResearches,
 		'/researcher-profile': ResearcherProfile,
-		'/create-user': CreateUser
+		'/create-user': CreateUser,
 		'/manage-owned-lessons': ManageOwnedLessons,
 		'/manage-schedule-requests' : LessonRequests,
 		'/msg' : Msg,
@@ -53,7 +52,7 @@ const appsList = {
 		'StudentsList':{ path: '#/students-list',icon: 'fa-users',text: i18n("app.studentList")},
 		'UsersList':{ path: '#/users-list',icon: 'fa-users',text: i18n("app.users")},
 		'ManageResearcherProfile':{path:'#/manage-researcher-profile',icon:'fa-book-bookmark',text:i18n("app.manage.researcherProfile")},
-		'CreateUser':{path:'#/create-user',icon:'fa-plus', text:i18n("app.Create.User")}
+		'CreateUser':{path:'#/create-user',icon:'fa-plus', text:i18n("app.Create.User")},
 		'ManageOwnedLessons':{path: '#/manage-owned-lessons',icon:'fa-calendar-days',text: i18n("app.manageOwnLessons")},
 		'LessonRequests':{path: '#/manage-schedule-requests', icon:'fa-book', text: i18n("app.lessonRequests")},
 		'Requests': { path: '#/requests', icon: 'fa-users', text: "Requests" },
diff --git a/frontend/src/rest/apps.js.orig b/frontend/src/rest/apps.js.orig
deleted file mode 100644
index af6744c..0000000
--- a/frontend/src/rest/apps.js.orig
+++ /dev/null
@@ -1,103 +0,0 @@
-import { restGet } from './restConsumer.js' 
-import { ref, computed } from 'vue'
-import i18n from '@/i18n.js'
-
-// Liste des apps
-import LoginPage from '@/Apps/Login.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 Schedule from "@/Apps/Schedule.vue"
-import ManageSchedule from "@/Apps/ManageSchedule.vue"
-import ManageOwnedLessons from "@/Apps/ManageOwnLessons.vue";
-import LessonRequests from "@/Apps/LessonRequests.vue";
-import Msg from "@/Apps/Msg.vue"
-import Forums from '@/Apps/Forums.vue'
-import Payments from "@/Apps/Inscription/PaymentInfo.vue";
-import ManageRequests from "@/Apps/Inscription/ManageRequests.vue";
-import ManageResearcherProfile from "@/Apps/ScientificPublications/ManageResearcherProfile.vue";
-import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
-import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";
-import CreateUser from "@/Apps/CreateUser.vue";
-
-const apps = {
-		'/schedule': Schedule,
-		'/manage-schedule': ManageSchedule,
-		'/login': LoginPage,
-		'/requests': ManageRequests,
-		'/profil': Profil,
-		'/manage-courses' : Courses,
-		'/users-list' : Users,
-		'/students-list' : Students,
-<<<<<<< HEAD
-		'/manage-researcher-profile' : ManageResearcherProfile,
-		'/msg' : Msg,
-		'/researches' : ListResearches,
-		'/researcher-profile': ResearcherProfile,
-		'/create-user': CreateUser
-=======
-		'/manage-owned-lessons': ManageOwnedLessons,
-		'/manage-schedule-requests' : LessonRequests,
-		'/msg' : Msg,
-		'/forums': Forums,
-		'/payments': Payments
->>>>>>> origin/master
-}
-
-const appsList = {
-		'ListResearches': {path:'#/researches', icon:'fa-book-bookmark',text:i18n("app.list.researches")},
-		'Msg': { path: '#/msg', icon: 'fa-comment', text: i18n("app.messages") },
-		'Notification': { path: '#/notifs', icon: 'fa-bell', text: i18n("app.notifications") },
-		'Forum': { path: '#/forums', icon: 'fa-envelope', text: i18n("app.forum") },
-		'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },
-		'ManageSchedules': { path: '#/manage-schedule', icon: 'fa-calendar-days', text: i18n("app.manageSchedules")},
-		'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")},
-<<<<<<< HEAD
-		'ManageResearcherProfile':{path:'#/manage-researcher-profile',icon:'fa-book-bookmark',text:i18n("app.manage.researcherProfile")},
-		'CreateUser':{path:'#/create-user',icon:'fa-plus', text:i18n("app.Create.User")}
-
-=======
-		'ManageOwnedLessons':{path: '#/manage-owned-lessons',icon:'fa-calendar-days',text: i18n("app.manageOwnLessons")},
-		'LessonRequests':{path: '#/manage-schedule-requests', icon:'fa-book', text: i18n("app.lessonRequests")},
-		'Requests': { path: '#/requests', icon: 'fa-users', text: "Requests" },
-		'Payments':{path: '#/payments', icon:'fa-users', text:i18n("app.payments")}
->>>>>>> origin/master
-}
-
-const currentPath = ref(window.location.hash)
-
-export const currentView = computed(() => {
-		return apps[currentPath.value.split("?")[0].slice(1) || '/']
-})
-
-/**
- * Return the list of app accesible by a logged (or not)
- * user.
- */
-export async function appList(){
-		let ret = [];
-		let userAppList = await restGet("/apps");
-		for (let userapp in userAppList) {
-				if(appsList[userAppList[userapp]] != null){
-						ret.push(appsList[userAppList[userapp]])
-				}
-		}
-		return ret;
-}
-
-/**
- * Check if the specified page is authorized for the
- * user
- */
-export async function checkPage(page){
-		return restGet("/apps/" + page)
-}
-
-window.addEventListener('hashchange', () => {
-		currentPath.value = window.location.hash
-})
-
-// vim:set noet sts=0 sw=4 ts=2 tw=2:
diff --git a/frontend/src/rest/courses.js.orig b/frontend/src/rest/courses.js.orig
deleted file mode 100644
index 5826f42..0000000
--- a/frontend/src/rest/courses.js.orig
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Courses API
- */
-
-import { restGet, restPost, restDelete, restPatch } from './restConsumer.js'
-
-/**
- * Create a new course
- */
-<<<<<<< HEAD
-export async function createCourse(name, credits, owner){
-
-	return restPost("/course", {title: name, credits: credits, owner} )
-=======
-export async function createCourse(id,name, credits, owner){
-	return restPost("/course/curriculum/" + id, {title: name, credits: credits, owner} )
->>>>>>> origin/master
-}
-
-/**
- * Delete the specified course
- */
-export async function deleteCourse(id){
-	return restDelete("/course/" + id);
-}
-
-/**
- * Get information on a particular course
- *
- * @param id identification of the course
- *
- * @return all atribute of the specified course
- *  - name
- *  - credits
- *  - faculty
- *  - teacher
- *  - assistants : list
- */
-export async function getCourse(id){
-	return restGet("/course/" + id);
-}
-
-/**
- * Get the list of courses to display on secretary's option
- *
- * @return list of courses of the form
- * - id
- * - name
- * - credits
- * - facutly
- * - teacher
- * - Assistants
- */
-export async function getCourses(role){
-  if(role==="Teacher"){
-  return restGet("/courses/owned")
-  }
-	return restGet("/courses")
-}
-
-
-/**
- * Change the options of a course
- *
- * @param id the id of the course
- * @param changes Object with value to changes
- *
- * The changes object can contain:
- *  - name
- *  - credits
- *  - faculty
- *  - teacher
- *  - assistants: should be a list and will replace all assistants
- */
-export async function alterCourse(id, changes){
-	return restPatch("/course/" + id, changes);
-}
-
-/**
- * Return a list containing all the actual courses of a user
- */
-
-export async function getUserActualCourses(){
-	return restGet("/usercourses")
-}

From 22665f0565f37a2d86c5ad54ad1d77af028b6df5 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 21 Apr 2024 23:57:29 +0200
Subject: [PATCH 66/66] oupsi

---
 backend/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index 9b1bde6..794631f 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	//developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")