Fixing stuffs

Reviewed-on: #180

backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java

@@ -13,10 +13,7 @@ import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.TokenService;
 import ovh.herisson.Clyde.Services.UserService;
 import ovh.herisson.Clyde.Tables.*;
-import ovh.herisson.Clyde.Tables.Inscription.ExemptionsRequest;
+import ovh.herisson.Clyde.Tables.Inscription.*;
-import ovh.herisson.Clyde.Tables.Inscription.Minerval;
-import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
-import ovh.herisson.Clyde.Tables.Inscription.UnregisterRequest;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -328,7 +325,7 @@ public class RequestsController {
             return new ResponseEntity<>(HttpStatus.OK);
         }
 
-        toEdit.setState(newteacherstate);
+        toEdit.setTeacherApprovalState(newteacherstate);
         changeCurriculumRequestRepository.save(toEdit);
 
         if (newteacherstate == RequestState.Accepted && toEdit.getState() == RequestState.Accepted){

backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ChangeCurriculumRequestRepository.java

@@ -1,7 +1,7 @@
 package ovh.herisson.Clyde.Repositories.Inscription;
 
 import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.ChangeCurriculumRequest;
+import ovh.herisson.Clyde.Tables.Inscription.ChangeCurriculumRequest;
 
 public interface ChangeCurriculumRequestRepository extends CrudRepository<ChangeCurriculumRequest, Long> {
     ChangeCurriculumRequest findById(long id);

backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java

@@ -15,33 +15,33 @@ 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')")
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate, 'month')")
-    Iterable<Map<String ,Integer>> viewsByMonths();
+    Iterable<Map<String ,Integer>> viewsByMonths(long researcherId);
 
     @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();
+    Iterable<Map<String ,Integer>> viewsByYears(long researcherId);
 
 
-    @Query("select new map(r.domain as label, sum(r.views) as y) from Research r group by r.domain")
+    @Query("select new map(r.domain as label, sum(r.views) as y) from Research r where r.author.id = ?1 group by r.domain")
-    Iterable<Map<String ,Integer>> viewsByTopics();
+    Iterable<Map<String ,Integer>> viewsByTopics(long researcherId);
 
 
-    @Query("select new map(r.domain as label, count(distinct 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 where r.author.id = ?1 group by r.domain")
-    Iterable<Map<String ,Integer>> languageByTopics();
+    Iterable<Map<String ,Integer>> languageByTopics(long researcherId);
 
-    @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')")
+    @Query("select new map(to_char(r.releaseDate,'YYYY') as label,  count(distinct r.language) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate,'YYYY')")
-    Iterable<Map<String ,Integer>> languageByYears();
+    Iterable<Map<String ,Integer>> languageByYears(long researcherId);
 
-    @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')")
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r.language) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate, 'month')")
-    Iterable<Map<String ,Integer>> languageByMonths();
+    Iterable<Map<String ,Integer>> languageByMonths(long researcherId);
 
-    @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')")
+    @Query("select new map(to_char(r.releaseDate,'YYYY') as label, count(distinct r) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate,'YYYY')")
-    Iterable<Map<String ,Integer>> researchesByYears();
+    Iterable<Map<String ,Integer>> researchesByYears(long researcherId);
 
-    @Query("select new map(r.domain as label, count(distinct 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 where r.author.id = ?1 group by r.domain")
-    Iterable<Map<String ,Integer>> researchesByTopics();
+    Iterable<Map<String ,Integer>> researchesByTopics(long researcherId);
 
-    @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')")
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(distinct r) as y) from Research r where r.author.id = ?1 group by to_char(r.releaseDate, 'month')")
-    Iterable<Map<String ,Integer>> researchesByMonth();
+    Iterable<Map<String ,Integer>> researchesByMonth(long researcherId);
 
 }

backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java

@@ -34,17 +34,17 @@ public class StatisticsService {
 
         ArrayList<Iterable<Map<String,Integer>>> toReturn = new ArrayList<>();
 
-        toReturn.add(statsRepo.viewsByYears());
+        toReturn.add(statsRepo.viewsByYears(researcher.getId()));
-        toReturn.add(statsRepo.viewsByMonths());
+        toReturn.add(statsRepo.viewsByMonths(researcher.getId()));
-        toReturn.add(statsRepo.viewsByTopics());
+        toReturn.add(statsRepo.viewsByTopics(researcher.getId()));
 
-        toReturn.add(statsRepo.researchesByYears());
+        toReturn.add(statsRepo.researchesByYears(researcher.getId()));
-        toReturn.add(statsRepo.researchesByMonth());
+        toReturn.add(statsRepo.researchesByMonth(researcher.getId()));
-        toReturn.add(statsRepo.researchesByTopics());
+        toReturn.add(statsRepo.researchesByTopics(researcher.getId()));
 
-        toReturn.add(statsRepo.languageByYears());
+        toReturn.add(statsRepo.languageByYears(researcher.getId()));
-        toReturn.add(statsRepo.languageByMonths());
+        toReturn.add(statsRepo.languageByMonths(researcher.getId()));
-        toReturn.add(statsRepo.languageByTopics());
+        toReturn.add(statsRepo.languageByTopics(researcher.getId()));
         return toReturn;
     }
 }

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ChangeCurriculumRequest.java

@@ -1,6 +1,9 @@
-package ovh.herisson.Clyde.Tables;
+package ovh.herisson.Clyde.Tables.Inscription;
 
 import jakarta.persistence.*;
+import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.RequestState;
+import ovh.herisson.Clyde.Tables.User;
 
 import java.util.Date;
 

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ExemptionsRequest.java

@@ -2,8 +2,6 @@ package ovh.herisson.Clyde.Tables.Inscription;
 
 
 import jakarta.persistence.*;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
 import ovh.herisson.Clyde.Tables.Course;
 import ovh.herisson.Clyde.Tables.RequestState;
 import ovh.herisson.Clyde.Tables.User;

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ScholarshipRequest.java

@@ -7,7 +7,6 @@ import ovh.herisson.Clyde.Tables.RequestState;
 import ovh.herisson.Clyde.Tables.User;
 
 import java.util.Date;
-import java.util.Map;
 
 @Entity
 public class ScholarshipRequest {

backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/UnregisterRequest.java

@@ -3,7 +3,6 @@ package ovh.herisson.Clyde.Tables.Inscription;
 import jakarta.persistence.*;
 import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.User;
 
 import java.util.Date;
 

frontend/src/Apps/Inscription/AboutChangeCurriculum.vue

@@ -51,12 +51,12 @@ async function editChangeCurrReqTeacherApproval(state){
           <div>
             <button @click="localwindowstate++"> {{ i18n("seeprofile") }} </button>
           </div>
-          <div>
+          <div v-if="user.role === 'InscriptionService' || user.role==='Admin'">
             <button v-if="req.state === 'Pending'" @click="req.state='Accepted';uploadandrefreshChangeRequest('Accepted')">{{ i18n("request.accept") }}</button>
             <button v-if="req.state === 'Pending'" @click="req.state='Refused';uploadandrefreshChangeRequest('Refused')" style="margin-left: 2%;">{{i18n("request.refuse")}}</button>
           </div>
           <div v-if="user.role === 'Teacher' || user.role === 'Admin'">
-            <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Accepted';editChangeCurrReqTeacherApproval('Accepted')">{{i18n("acceptequiv")}}</button>
+            <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Accepted';editChangeCurrReqTeacherApproval('Accepted')" style="margin-right: 2%">{{i18n("acceptequiv")}}</button>
             <button v-if="req.teacherApprovalState === 'Pending'" @click="req.teacherApprovalState='Refused';editChangeCurrReqTeacherApproval('Refused')">{{i18n("refuseequiv")}}</button>
           </div>
         </div>

frontend/src/Apps/Profil.vue

@@ -343,19 +343,19 @@
             <select v-model="changecurrdata.actualcursus" style="margin-right: 3%">
               <option v-for="item in getActualCurriculumList()" style="font-size:20px;" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option>
             </select>
-            {{ i18n("newcurr") }} :
+            {{ i18n("newcursus") }} :
             <select v-model="changecurrdata.newcursus">
               <option v-for="item in curricula"  :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option>
             </select>
           </div>
           <div style="height:40px;" v-if="reRegState === 2">
-            {{ i18n("newcurr") }} :
+            {{ i18n("newcursus") }} :
             <select v-model="changecurrdata.newcursus">
               <option v-for="item in curricula"  :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option>
             </select>
           </div>
           <div style="height:40px;" v-if="reRegState === 1">
-            {{ i18n("newcurr") }} :
+            {{ i18n("newcursus") }} :
             <select v-model="changecurrdata.newcursus" @change="getActualCurr(changecurrdata.newcursus);">
               <option v-for="item in getCurriculumsNextYear()" :value="item.curriculumId">Bac {{item.year}} {{item.option}}</option>
             </select>

frontend/src/Apps/ScientificPublications/ListResearches.vue

@@ -136,8 +136,10 @@ const emit = defineEmits(["modified"]);
 <style scoped>
 
 #researches{
+  padding-top: 15px;
   width: 100%;
   height: 100%;
+  overflow: scroll;
 }
 #search{
   width: 100%;

frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue

@@ -82,7 +82,7 @@ function getPP(){
 
 
     </div>
-    <ListResearches :allResearcher="allResearcher" :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches>
+    <div> <ListResearches :allResearcher="allResearcher" :research-list="researchList" :manage="true" @modified="modifiedResearch"></ListResearches> </div>
   </div>
 </div>
 </template>

frontend/src/Apps/ScientificPublications/ResearchComponent.vue

@@ -103,7 +103,7 @@ async function articleClicked(){
         </ul>
           <div id="downloads" v-if="article.pdfLocation !== null && !manage">
             <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>
+            <a v-if="article.bibTexLocation !== null" :href=downloadBibTex() @click.stop="emit('modal-close')"  target="_blank">{{i18n("SeeBibTex")}}</a> </div>
         </div>
         <div v-if="manage" id="manage">
           <div>

frontend/src/Apps/ScientificPublications/ResearcherProfile.vue

@@ -111,7 +111,7 @@ function update(){
 		  <CanvasJSChart :options="options" id=chart @chart-ref="c => chart = c "/>
       </div>
     </div>
-    <div id="researches"><list-researches :researchList="researchList"></list-researches></div>
+    <div id="researches" style="margin-top: -15px"><list-researches :researchList="researchList"></list-researches></div>
   </div>
 </template>