Merge pull request 'Fixing stuffs' (#183) from e into master

Reviewed-on: #183

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/EndPoints/MockController.java

@@ -42,6 +42,7 @@ public class MockController {
     public final LessonRequestService lessonRequestService;
     ArrayList<User> mockUsers;
 
+    public static boolean isMocked = false;
     public final ResearchesService researchesService;
     public final UserCurriculumRepository ucr;
     public final MinervalRepository minervalRepository;
@@ -78,7 +79,7 @@ public class MockController {
     @PostMapping("/mock")
     public void postMock() {
 
-
+        if(!isMocked){
         // user part
         User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,"admin");
         User joe = new User("Piplo","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,"student");
@@ -230,6 +231,9 @@ public class MockController {
 
         externalCurriculum = new ExternalCurriculum(inscriptionRequest, "HEH", "Bachelier en informatique", "Completed", 2015, 2018, null, null);
         externalCurriculumRepository.save(externalCurriculum);
+
+        isMocked = true;
+    }
     }
 }
 

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/public/i18n/EN.txt

@@ -50,6 +50,7 @@ Delete=Delete
 Modify=Modify
 Create=Créer
 requestType=Request Type
+lessonType=Course Type
 day=Day
 start=Start
 end=End

frontend/public/i18n/FR.txt

@@ -50,6 +50,7 @@ Delete=Supprimer
 Modify=Modifier
 Create=Créer
 requestType=Type de Requête
+lessonType=Type de cours
 day=Jour
 start=Début
 end=Fin

frontend/src/App.vue

@@ -1,14 +1,13 @@
 <script setup>
-  import { toast } from 'vue3-toastify';
   import { ref } from 'vue'
   import i18n, { setLang } from './i18n.js'
   import { isLogged, getSelf } from '@/rest/Users.js'
 	import { notifications, fetchNotifications, archiveNotification } from '@/rest/notifications.js'
-
+  import {postMock} from "@/rest/restConsumer.js";
   import { appList, currentView } from '@/rest/apps.js'
 		var prevURL;
 		var currentURL = window.location.hash;
-
+postMock()
 window.onhashchange = function() {
     prevURL = currentURL;
     currentURL = window.location.hash;

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/LessonRequests.vue

@@ -18,7 +18,7 @@ const AcceptMod = ref(false);
 const moreInfosMod = ref(false);
 const requestTypes = ["Create", "Modify", "Delete"]
 const editElementID = ref('');
-const chosenLocal = ref("");
+const chosenLocal = ref();
 const locals = ["A0B1","A1B1","A2B1","A0B2"];
 const moreInfos = ref({});
 
@@ -30,6 +30,7 @@ const moreInfos = ref({});
 async function upPage(id,review){
   await changeRequestState(id, review) ;
   requests.value = await getAllRequests();
+  chosenLocal.value = null;
 }
 
 /*

frontend/src/Apps/ManageCourses.vue

@@ -168,11 +168,9 @@
     </div>
 
     <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 && editAddCourse !== item.title" style ="padding:15px 15px 15px 15px;">
+      <div  v-if="editElementID !== item.title && editAddCourse !== item.title" style="display:flex;">
-        <button   @click="editElementID = item.title; editAddCourse = ''; setModify(item); ">
+        <button   @click="editElementID = item.title; editAddCourse = ''; setModify(item);">{{i18n("courses.modify")}}</button>
-        {{i18n("courses.modify")}}
+        <button v-if="self.role !== 'Teacher'"@click="editAddCourse = item.title; editElementID ='';setAddToCurriculum(item)">{{i18n("courses.AddToCurriculum")}}</button>
-        </button>
-        <button v-if="self.role !== 'Teacher'"@click="editAddCourse = item.title; editElementID ='';setAddToCurriculum(item)">Add to a new Curriculum</button>
       </div>
       <div v-if="editElementID == item.title">
         <button @click="editElementID= '';patchCourse(item)"> {{i18n("courses.confirm")}} </button>

frontend/src/Apps/ManageSchedule.vue

@@ -221,6 +221,8 @@ async function setCourses(){
     lessonBuffer.value = Object.assign({}, pattern);
     lessonFinder.value = null;
     lessonCreatorBuffer.value = Object.assign({},lessonCreator)
+    allSchedules.value = await getAllSchedule();
+    schedule.value = null; 
     trueSchedule.value = null;
 
   }

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>
 

frontend/src/rest/restConsumer.js

@@ -27,6 +27,9 @@ export function restPatch(endPoint, data) {
 	return _rest(endPoint, {method: "PATCH", credentials: 'include', body: JSON.stringify(data)});
 }
 
+export function postMock(){
+	return restPost("/mock")
+}
 /**
  * backbone for the request made by the frontend
  *