adding to readme

Reviewed-on: PGL/Clyde#188

.gitea/workflows/deploy.yaml

@@ -14,26 +14,26 @@ on:
   workflow_dispatch:
 
 jobs:
-  deploy-frontend:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      working-directory: ./frontend
-    - run: npm ci 
-      name: clean install
-      working-directory: ./frontend
-    - name: building 
-      working-directory: ./frontend
-      run: npm run build
-    - name: pushing to the server
-      working-directory: ./frontend
-      run: |
-        echo "${{ secrets.SSH_KEY }}" > key
-        chmod 0600 key
-        scp -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key -r dist/ ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:
-    - run: echo "The website has been deployed. visit https://clyde.herisson.ovh/"
+  # deploy-frontend:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: Use Node.js ${{ matrix.node-version }}
+  #     uses: actions/setup-node@v3
+  #     working-directory: ./frontend
+  #   - run: npm ci 
+  #     name: clean install
+  #     working-directory: ./frontend
+  #   - name: building 
+  #     working-directory: ./frontend
+  #     run: npm run build
+  #   - name: pushing to the server
+  #     working-directory: ./frontend
+  #     run: |
+  #       echo "${{ secrets.SSH_KEY }}" > key
+  #       chmod 0600 key
+  #       scp -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key -r dist/ ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:
+  #   - run: echo "The website has been deployed. visit https://clyde.herisson.ovh/"
 
   deploy-backend:
     runs-on: ubuntu-latest
@@ -46,5 +46,5 @@ jobs:
         scp -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key -r * ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:api/
     - name: restarting the backend 
       run: |
-        ssh -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} 'cd api/ && sed -i compose.yaml -e "s/8080:8080/4001:8080/" -e "s/8000:8080/4000:8080/" && docker-compose up --force-recreate --build -d'
+        ssh -o "StrictHostKeyChecking=no" -o "LogLevel=ERROR" -i key ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} 'cd api/ && sed -i compose.yaml -e "s/8080:8080/4001:8080/" -e "s/8000:8080/4000:8080/" && sed -e "8d" -i frontend/Dockerfile && docker-compose up --force-recreate --build -d'
     - run: echo "The backend has been deployed. running at https://clyde.herisson.ovh/api"

README.md

@@ -1,5 +1,7 @@
 # Clyde project
 
+Système de gestion d'universitée (dévelopé dans le cadre du cours de projet de génie logiciel de l'Umons 2024)
+
 ## Signature
 
 Projet du groupe 01:
@@ -11,21 +13,28 @@ Projet du groupe 01:
 
 ## Running
 
+**Attention**: Vous devez avoir installé docker-compose pour lancer ce projet.
+
 Le projet peut être lancé grace à docker compose.
 
 ```sh
 $ docker compose up 
 ```
 
-Dans le cas ou vous modifiers des fichiers, pour éviter que les images de docker soient recrées avec les changement
+Dans le cas ou vous modifiez des fichiers, pour éviter que les images de docker ne soient réutilisés sans les
+changements.
 
 ```sh
 $ docker compose up --force-recreate --build
 ```
+Vous pouvez alors accéder au frontend à l'adresse [http://localhost:5173](http://localhost:5173)
+
+Une version finie du site construite automatiquement à l'aide de gitea actions tourne à l'adresse
+[https://clyde.herisson.ovh/](https://clyde.herisson.ovh/)
 
 ## Dévelopement
 
-Dans le cas ou vous êtes dans une phase de développement, il est plus simple d'utiliser gradle pour lancer le backend et frontend dans un mode de développement.
+Dans le cas ou vous êtes dans une phase de développement, il est plus simple d'utiliser gradle pour lancer le backend et frontend.
 **Attention**: Ce mode n'est pas fait pour être utilisé en production!
 
 ```sh
@@ -38,4 +47,3 @@ Ceci requière également docker pour lancer une instance de postgresql pris en
 Il est possible de se passer entièrement de docker en supprimant la dépendance dans le fichier `backend/build.gradle.kts`: ~~`developmentOnly("org.springframework.boot:spring-boot-docker-compose")`~~
 Il est alors nécéssaire d'avoir une instance de postgresql tournant sur `localhost:5432` avec une table `clyde`, utilisateur: `devel` et password: `devel`
 (cette configuration peut également être changée dans le fichier resources/application.properties de spring)
-

backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java.orig

@@ -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;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BACKUP_12704.java

@@ -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;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_BASE_12704.java

@@ -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;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_LOCAL_12704.java

@@ -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;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController_REMOTE_12704.java

@@ -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;
-    }
-}

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.Minerval;
-import ovh.herisson.Clyde.Tables.Inscription.ScholarshipRequest;
-import ovh.herisson.Clyde.Tables.Inscription.UnregisterRequest;
+import ovh.herisson.Clyde.Tables.Inscription.*;
 
 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/LessonRequestsController.java

@@ -12,14 +12,8 @@ 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.LessonRequestService;
-import ovh.herisson.Clyde.Services.LessonService;
-import ovh.herisson.Clyde.Services.ProtectionService;
-import ovh.herisson.Clyde.Tables.LessonChangesRequest;
-import ovh.herisson.Clyde.Tables.RequestState;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
+import ovh.herisson.Clyde.Services.*;
+import ovh.herisson.Clyde.Tables.*;
 
 import java.util.Map;
 
@@ -28,11 +22,13 @@ import java.util.Map;
 public class LessonRequestsController {
     private final LessonRequestService lessonRequestServ;
     private final AuthenticatorService authServ;
+    private final UserService userServ;
 
     private final LessonService lessonServ;
-    public LessonRequestsController(LessonRequestService lessonRequestServer, AuthenticatorService authServ, LessonService lessonServ) {
+    public LessonRequestsController(LessonRequestService lessonRequestServer, AuthenticatorService authServ, UserService userServ, LessonService lessonServ) {
         this.lessonRequestServ = lessonRequestServer;
         this.authServ = authServ;
+        this.userServ = userServ;
         this.lessonServ = lessonServ;
     }
     /**
@@ -113,6 +109,7 @@ public class LessonRequestsController {
         if(lessonRequest.getRequestType() == 0 ) {
             if (!lessonRequestServ.modifyCreateRequestState(lessonRequest, state, local))
                 return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            userServ.Notify(lessonRequest.getUser(), new Notification("Request took in charge","Request"+ state + ":" + lessonRequest.getCourse().getTitle(), "#/manage-owned-lessons"));
         }
 
         else if(lessonRequest.getRequestType() == 1){
@@ -122,12 +119,14 @@ public class LessonRequestsController {
             if(!lessonRequestServ.modifyChangeRequestState(infos,lessonRequest.getLessonId(),state))
                 return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
             lessonRequest.setState(state);
+            userServ.Notify(lessonRequest.getUser(), new Notification("Request took in charge","Request"+ state + ":" + lessonServ.findById(lessonRequest.getLessonId()).getCourse().getTitle(), "#/manage-owned-lessons"));
+
         }
 
         else{
+            userServ.Notify(lessonRequest.getUser(), new Notification("Request took in charge","Request"+ state + ":" + lessonServ.findById(lessonRequest.getLessonId()).getCourse().getTitle(), "#/manage-owned-lessons"));
             lessonRequestServ.modifyDeleteRequest(lessonRequest, state);
             lessonRequest.setState(state);
-              
         }
         lessonRequestServ.save(lessonRequest);
         return new ResponseEntity<>(HttpStatus.OK);

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,10 +79,10 @@ 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("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,"student");
+        User joe = new User("Piplo","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");
@@ -151,8 +152,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
@@ -170,13 +169,13 @@ public class MockController {
             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 restrictedResearch = new Research("the great Constantinople war", output, new Date(1111111111),
+                    PaperType.Article, "restricted", null, "Portuguese",
+                    Access.Restricted, "history", "this is a summary", 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);
+                    Access.Private, "agriculture", "my life is potato",null);
 
 
             researchesService.saveResearch(restrictedResearch);
@@ -186,11 +185,11 @@ public class MockController {
 
         //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");
+        Lesson lesson_0_progra1 = new Lesson(progra1, "Mon Apr 22 2024 08:15", "Mon Apr 22 2024 10:15","rgb(255,36,175)","A0B2","Course");
+        Lesson lesson_0_chemistry1 = new Lesson(chemistry1, "Wed Mar 27 2024 08:15", "Wed Mar 27 2024 09:15","rgb(36,175,255)","A0B2","TP");
+        Lesson lesson_0_psycho1 = new Lesson(psycho1, "Sun Mar 24 2024 10:30 ","Sun Mar 24 2024 12:30 ","rgb(255,36,175)", "A0B2","TD");
+        Lesson lesson_1_progra1 = new Lesson(progra1, "Mon Apr 02 2024 13:30", "Mon Apr 02 2024 15:30","rgb(36,175,255)","A0B2","TP");
+        Lesson lesson_0_commun = new Lesson(commun, "Mon Apr 01 2024 10:30", "Mon Apr 01 2024 12:30","rgb(255,36,175)","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);
@@ -232,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/EndPoints/MockController.java.orig

@@ -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
-    }
-}
-

backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java

@@ -44,7 +44,7 @@ public class UserController {
     @GetMapping("/user/{id}")
     public ResponseEntity<HashMap<String ,Object>> getUserById(@RequestHeader("Authorization") String token, @PathVariable Long id){
 
-        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService},token))
+        if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary,Role.InscriptionService, Role.Teacher},token))
             return new UnauthorizedResponse<>(null);
 
         return new ResponseEntity<>(ProtectionService.userWithoutPassword(userService.getUserById(id)), HttpStatus.OK);

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/ScheduleLessonRepository.java

@@ -22,6 +22,9 @@ public interface ScheduleLessonRepository extends CrudRepository<ScheduleLesson,
     @Query("select distinct sl.schedule from ScheduleLesson sl where sl.schedule.curriculum = ?1")
     Schedule findScheduleByCurriculum(Curriculum curriculum);
 
+    @Query("select distinct sl from ScheduleLesson sl where sl.lesson = ?1")
+    ScheduleLesson findByLesson(Lesson lesson);
+
     @Modifying
     @Transactional
     @Query("delete from ScheduleLesson sl where sl.lesson =?1")

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')")
-    Iterable<Map<String ,Integer>> viewsByMonths();
+    @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(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")
-    Iterable<Map<String ,Integer>> viewsByTopics();
+    @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(long researcherId);
 
 
-    @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(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(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')")
-    Iterable<Map<String ,Integer>> languageByYears();
+    @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(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')")
-    Iterable<Map<String ,Integer>> languageByMonths();
+    @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(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')")
-    Iterable<Map<String ,Integer>> researchesByYears();
+    @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(long researcherId);
 
-    @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(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(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')")
-    Iterable<Map<String ,Integer>> researchesByMonth();
+    @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(long researcherId);
 
 }

backend/src/main/java/ovh/herisson/Clyde/Repositories/UserCurriculumRepository.java

@@ -13,9 +13,11 @@ public interface UserCurriculumRepository extends CrudRepository<UserCurriculum,
     @Query("select uc.curriculum from UserCurriculum uc where uc.user = ?1")
     Curriculum findByUser(User student);
 
+    @Query("select distinct uc.user from UserCurriculum uc where uc.curriculum = ?1")
+   Iterable<User> findUsersByCurriculum(Curriculum curriculum);
+
     ArrayList<UserCurriculum> findByUserOrderByCurriculum(User student);
     UserCurriculum findByUserAndCurriculumAndActual(User user, Curriculum curriculum, boolean actual);
 
     ArrayList<UserCurriculum> findByUserAndActual(User user, boolean actual);
-
 }

backend/src/main/java/ovh/herisson/Clyde/Services/LessonService.java

@@ -7,10 +7,7 @@ package ovh.herisson.Clyde.Services;
  * @scope Extension Horaire
  ******************************************************/
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CourseRepository;
-import ovh.herisson.Clyde.Repositories.CurriculumCourseRepository;
-import ovh.herisson.Clyde.Repositories.LessonRepository;
-import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
+import ovh.herisson.Clyde.Repositories.*;
 import ovh.herisson.Clyde.Tables.*;
 
 import java.util.ArrayList;
@@ -19,12 +16,17 @@ import java.util.Map;
 @Service
 public class LessonService {
     private final LessonRepository lessonRepo;
+
+    private final ScheduleLessonRepository scheduleLessonRepo;
     private final UserCurriculumRepository userCurriculumRepo;
+    private final UserService userServ;
     private final CourseRepository courseRepo;
     private final CurriculumCourseRepository curriculumCourseRepo;
-    public LessonService(LessonRepository lessonRepo, UserCurriculumRepository userCurriculumRepo, CourseRepository courseRepo, CurriculumCourseRepository curriculumCourseRepo){
+    public LessonService(LessonRepository lessonRepo, ScheduleLessonRepository scheduleLessonRepo, UserCurriculumRepository userCurriculumRepo, UserService userServ, CourseRepository courseRepo, CurriculumCourseRepository curriculumCourseRepo){
         this.lessonRepo = lessonRepo;
+        this.scheduleLessonRepo = scheduleLessonRepo;
         this.userCurriculumRepo = userCurriculumRepo;
+        this.userServ = userServ;
         this.courseRepo = courseRepo;
         this.curriculumCourseRepo = curriculumCourseRepo;
     }
@@ -136,7 +138,12 @@ public class LessonService {
                     break;
             }
         }
-        lessonRepo.save(target);
+        Lesson lesson = lessonRepo.save(target);
+        ScheduleLesson scheduleLesson = scheduleLessonRepo.findByLesson(lesson);
+        Iterable<User> users = userCurriculumRepo.findUsersByCurriculum(scheduleLesson.getSchedule().getCurriculum());
+        for(User user: users){
+            userServ.Notify(user, new Notification("Course modified in the schedule", "Course Modified " + lesson.getCourse().getTitle() , "/#/schedule"));
+        }
         return true;
     }
     /**

backend/src/main/java/ovh/herisson/Clyde/Services/Msg/ForumService.java

@@ -6,7 +6,9 @@ import lombok.AllArgsConstructor;
 import ovh.herisson.Clyde.Repositories.CourseRepository;
 import ovh.herisson.Clyde.Repositories.Msg.ForumRepository;
 import ovh.herisson.Clyde.Repositories.Msg.TopicRepository;
+import ovh.herisson.Clyde.Services.UserService;
 import ovh.herisson.Clyde.Tables.Course;
+import ovh.herisson.Clyde.Tables.Notification;
 import ovh.herisson.Clyde.Tables.User;
 import ovh.herisson.Clyde.Tables.Msg.Answer;
 import ovh.herisson.Clyde.Tables.Msg.Forum;
@@ -16,17 +18,24 @@ import ovh.herisson.Clyde.Tables.Msg.Topic;
 @AllArgsConstructor
 public class ForumService {
 
+	private UserService userServ;
 	private CourseRepository courseRepo;
 	private ForumRepository forumRepo;
 	private TopicRepository topicRepo;
 
 	public void createForum(Course c, Forum f){
 		c.addForum(f);
+		for (User u: f.getRegister()) {
+			userServ.Notify(u, new Notification("forum.notification.forum.new", f.getName(), "/#/Forum"));
+		}
 		courseRepo.save(c);
 	}
 
     public void createTopic(Forum f, Topic data) {
 		f.addTopic(data);
+		for (User u: f.getRegister()) {
+			userServ.Notify(u, new Notification("forum.notification.topic.new", data.getSubject(), "/#/Forum"));
+		}
 		forumRepo.save(f);
     }
 

backend/src/main/java/ovh/herisson/Clyde/Services/ScheduleLessonService.java

@@ -9,22 +9,26 @@ import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.LessonRepository;
 import ovh.herisson.Clyde.Repositories.ScheduleLessonRepository;
 import ovh.herisson.Clyde.Repositories.ScheduleRepository;
+import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Tables.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 @Service
 public class ScheduleLessonService {
 
     private final ScheduleLessonRepository scheduleLessonRepo;
 
+    private final UserCurriculumRepository userCurriculumRepo;
+    private final UserService userServ;
     private final LessonRepository lessonRepo;
     private final ScheduleRepository scheduleRepo;
-    public ScheduleLessonService(ScheduleLessonRepository scheduleLessonRepo, LessonRepository lessonRepo, ScheduleRepository scheduleRepo) {
+    public ScheduleLessonService(ScheduleLessonRepository scheduleLessonRepo, UserCurriculumRepository userCurriculumRepo, UserService userServ, LessonRepository lessonRepo, ScheduleRepository scheduleRepo) {
         this.scheduleLessonRepo = scheduleLessonRepo;
+        this.userCurriculumRepo = userCurriculumRepo;
+        this.userServ = userServ;
         this.lessonRepo = lessonRepo;
         this.scheduleRepo = scheduleRepo;
     }
@@ -32,19 +36,22 @@ public class ScheduleLessonService {
         if(scheduleLesson == null)
           return false;
         scheduleLessonRepo.save(scheduleLesson);
+        Iterable<User> users = userCurriculumRepo.findUsersByCurriculum(scheduleLesson.getSchedule().getCurriculum());
+        for(User user: users){
+            userServ.Notify(user, new Notification("New course in the schedule", "Course added " + scheduleLesson.getLesson().getCourse().getTitle(), "/#/schedule"));
+        }
         return true;
     }
     /**
      * Save a lesson to all the schedule it is linked
      */
-    public boolean saveToAllSchedule(Lesson lesson){
+    public void saveToAllSchedule(Lesson lesson){
         Iterable<Schedule> schedules = scheduleRepo.findAllLessonSchedule(lesson.getCourse());
         if(schedules == null)
-            return false;
+            return;
         for (Schedule schedule : schedules){
             save(new ScheduleLesson(schedule, lesson));
         }
-        return true;
     }
     /**
      * Delete a scheduleLesson via its lesson
@@ -52,6 +59,11 @@ public class ScheduleLessonService {
     public boolean delete(long lessonId){
         if(lessonId == 0)
             return false;
+        ScheduleLesson scheduleLesson = scheduleLessonRepo.findByLesson(lessonRepo.findById(lessonId));
+        Iterable<User> users = userCurriculumRepo.findUsersByCurriculum(scheduleLesson.getSchedule().getCurriculum());
+        for(User user: users){
+            userServ.Notify(user, new Notification("Course deleted in the schedule","Course deleted " +  scheduleLesson.getLesson().getCourse().getTitle(), "/#/schedule"));
+        }
         scheduleLessonRepo.delete(lessonRepo.findById(lessonId));
         return true;
     }

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.viewsByMonths());
-        toReturn.add(statsRepo.viewsByTopics());
+        toReturn.add(statsRepo.viewsByYears(researcher.getId()));
+        toReturn.add(statsRepo.viewsByMonths(researcher.getId()));
+        toReturn.add(statsRepo.viewsByTopics(researcher.getId()));
 
-        toReturn.add(statsRepo.researchesByYears());
-        toReturn.add(statsRepo.researchesByMonth());
-        toReturn.add(statsRepo.researchesByTopics());
+        toReturn.add(statsRepo.researchesByYears(researcher.getId()));
+        toReturn.add(statsRepo.researchesByMonth(researcher.getId()));
+        toReturn.add(statsRepo.researchesByTopics(researcher.getId()));
 
-        toReturn.add(statsRepo.languageByYears());
-        toReturn.add(statsRepo.languageByMonths());
-        toReturn.add(statsRepo.languageByTopics());
+        toReturn.add(statsRepo.languageByYears(researcher.getId()));
+        toReturn.add(statsRepo.languageByMonths(researcher.getId()));
+        toReturn.add(statsRepo.languageByTopics(researcher.getId()));
         return toReturn;
     }
 }

backend/src/main/java/ovh/herisson/Clyde/Services/TokenService.java

@@ -51,8 +51,8 @@ public class TokenService {
         ArrayList<Token> tokenList = tokenRepo.getByUserOrderByExpirationDate(token.getUser());
 
         while(tokenList.size() >= 5){
-            tokenRepo.delete(tokenList.getFirst());
-            tokenList.remove(tokenList.getFirst());
+            tokenRepo.delete(tokenList.get(0));
+            tokenList.remove(tokenList.get(0));
         }
         tokenRepo.save(token);
     }

backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java.orig

@@ -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);
-	}
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java.orig

@@ -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
-}

backend/src/main/java/ovh/herisson/Clyde/Tables/FileType.java.orig

@@ -1,15 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-public enum FileType {
-    ProfilePicture,
-    EducationCertificate,
-<<<<<<< HEAD
-    Research,
-
-    ResearchBibTex,
-    JustificationDocument
-=======
-    JustificationDocument,
-    IdentityCard,
->>>>>>> origin/master
-}

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;
 

backend/src/main/java/ovh/herisson/Clyde/Tables/User.java

@@ -12,6 +12,7 @@ import ovh.herisson.Clyde.Tables.Msg.Discussion;
 import ovh.herisson.Clyde.Tables.Msg.Message;
 import ovh.herisson.Clyde.Tables.Notification.Status;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -41,7 +42,7 @@ public class User {
 
 	@JsonIgnore
 	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
-	private List<Notification> notifications; 
+	private List<Notification> notifications = new ArrayList<>();
 
 	////// Extension Messagerie /////
 	@JsonIgnore

backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java

@@ -23,6 +23,7 @@ import ovh.herisson.Clyde.Repositories.TokenRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.TokenService;
+import ovh.herisson.Clyde.Services.UserService;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.Token;
 import ovh.herisson.Clyde.Tables.User;
@@ -46,7 +47,8 @@ public class UserControllerTest {
 
     @Autowired
     private TokenService tokenService;
-
+    @Autowired
+    private UserService userService;
     @Autowired
     private UserRepository userRepository;
     @Autowired
@@ -72,6 +74,7 @@ public class UserControllerTest {
     @BeforeEach
     void setup(){
         RestAssured.baseURI = "http://localhost:" + port;
+        userRepository.deleteAll();
     }
 
     @AfterEach
@@ -84,7 +87,7 @@ public class UserControllerTest {
     public void userPostTest(){
         User god = new User("god","god","admin@admin.com","everywhere","every",new Date(0), null, Role.Admin,"goddoesntneedpassword");
         Token godToken = new Token(god, tokenService.generateNewToken(), new Date());
-        userRepository.save(god);
+        userService.save(god);
         tokenService.saveToken(godToken);
 
         //Can god post herobrine himself ?

backend/src/test/java/ovh/herisson/Clyde/Services/TokenServiceTest.java

@@ -70,7 +70,7 @@ class TokenServiceTest {
         ArrayList<Token> tokenList = new ArrayList<>();
         GregorianCalendar gc = new GregorianCalendar();
 
-        User malveillant = new User("Cargo", "John", "CargoJ@mail.com", "secret", "secret", null, null, null, "secret");
+        User malveillant = new User("Cargo", "John", "CargoJ@mail.com", "secret", "secret", new Date(), null, "secret", null);
         userRepository.save(malveillant);
 
         for (int i = 0; i < 20; i++){

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
@@ -203,6 +204,8 @@ 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 
+forum.notification.topic.new=New topic created
+forum.notification.forum.new=New Forum created
 firstname/name=Firstname/Name
 regNo=regNo
 From=From
@@ -282,8 +285,9 @@ 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
+newcurr=Actual curriculums
 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
+DifferentLanguage=Different Languages

frontend/public/i18n/EN.txt.orig

@@ -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

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
@@ -201,6 +202,8 @@ 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
+forum.notification.topic.new=Nouveau Topic crée
+forum.notification.forum.new=Nouveau forum crée
 firstname/name=Prénom/Nom
 regNo=Matricule
 From=De
@@ -280,8 +283,9 @@ 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
+newcurr=Cursus actuels
 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é
+DifferentLanguage=Langues différentes

frontend/public/i18n/FR.txt.orig

@@ -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

frontend/src/App.vue

@@ -1,22 +1,23 @@
 <script setup>
-  import { toast } from 'vue3-toastify';
   import { ref } from 'vue'
   import i18n, { setLang } from './i18n.js'
-  import { isLogged } from '@/rest/Users.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;
 }
 const Logged = ref(isLogged());
+const user = ref();
 
 if(Logged.value){
 	fetchNotifications();
+	getSelf().then(e => user.value = e);
 }
 
 window.addEventListener('hashchange', () => {
@@ -40,7 +41,7 @@ window.addEventListener('hashchange', () => {
     <div class="topBar">
       <ul class="horizontal">
         <li title=home>
-            <a class="icon" href="#home">
+            <a  class="icon" href="#home">
                 <img class="clyde" src="/Clyde.png" style="width: 40px; height: auto; margin-top:4px">
             </a></li>
         <li title=home>
@@ -49,7 +50,7 @@ window.addEventListener('hashchange', () => {
             </a></li>
         <li style="float: right;" title=login>
             <a class="icon" href="#/login">
-                <div class="fa-solid fa-user" :style="Logged ? 'color: red' : ''" style="margin-top: 7px; margin-bottom: 3px; "></div>
+								<div class="fa-solid fa-user" :style="Logged ? 'color: red' : ''" style="margin-top: 7px; margin-bottom: 3px; "></div>
             </a></li>
         <li style="float: right;" title=notifications @click="notification = !notification">
             <a class="icon">
@@ -75,6 +76,7 @@ window.addEventListener('hashchange', () => {
                     {{i18n("app.manage.profile")}}
                   </a>
                   </div>
+									<span v-if=Logged>RegNo - {{ user.regNo }}</span>
                 </div>
             </a></li>
       </ul>
@@ -133,10 +135,12 @@ window.addEventListener('hashchange', () => {
 
 
 .dropdown {
+  color:black;
   margin-top:55px;
   width:160px;
   display: inline-block;
-  height:110px;
+  /* height:110px; */
+	text-align: center;
   font-size: 13px;
   position: absolute;
   z-index: 1;
@@ -162,12 +166,12 @@ window.addEventListener('hashchange', () => {
 		margin-top: var(--header-size);
     top:0;
     left:0;
-		padding: 25px 0 0;
+		padding: 25px 0;
 		width: 70px ;
 		background-color: rgb(53, 53, 53);
 		border-right:5px;
 		border-color:black;
-		height: 100%;
+		height: calc( 95% - var(--header-size) ) ;
 		position: fixed;
 		overflow: scroll;
 		transition-duration: .3s;
@@ -237,8 +241,7 @@ window.addEventListener('hashchange', () => {
 	  .text {
 		right: 0%;
 		width: 0%;
-		visibility: collapse;
-		opacity: 0;
+		display:none;
 		color: white;
 		font-size: 1.2em;
 		font-weight: 600;
@@ -247,7 +250,7 @@ window.addEventListener('hashchange', () => {
 
 	  ul.vertical:hover .text {
 		opacity:1;
-		visibility:visible;
+		display: inline;
 		width: 60%;
 		transition-duration: .3s;
 		padding-left: 15px;

frontend/src/Apps/AboutUser.vue

@@ -32,6 +32,7 @@ async function createResearcher(){
   toCreate.user = user.value
   await postResearcher(toCreate)
   creating.value = false
+  allResearcher.value = await fetchAllResearchers()
   for (let i = 0; i < allResearcher.value.length; i++) {
     if (user.value.regNo === allResearcher.value[i].user.regNo){
       researcher.value = allResearcher.value[i]
@@ -147,8 +148,7 @@ async function modify(){
   column-gap:2.7%;
   row-gap:45px;
   grid-template-areas:
-  "profilPic globalInfos"
-  "minfos minfos";
+  "profilPic globalInfos";
 }
 
 .profilPic{
@@ -167,7 +167,8 @@ async function modify(){
   display:flex;
   align-items:center;
   justify-content:center;
-  margin-top:5%;
+  margin-right: auto;
+  margin-left: auto;
 }
 
 .subContainer{

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/Inscription/AboutStudent.vue

@@ -32,6 +32,9 @@
           <div>
             {{ i18n("firstname/name") }} : {{user.firstName}} {{user.lastName}}
           </div>
+          <div>
+            {{ i18n("regNo") }} :  {{user.regNo}}
+          </div>
           <div>
             {{ i18n("login.guest.email") }}: {{user.email}}
           </div>

frontend/src/Apps/Inscription/CourseList.vue

@@ -80,7 +80,7 @@ function isExempted(course){
     </div>
   </div>
   <div v-if="list === false">
-    <button @click="list=!list;submitted=!submitted">{{ i18n("courses.back") }}</button>
+    <button @click="list=!list;submitted=false">{{ i18n("courses.back") }}</button>
   </div>
 </template>
 

frontend/src/Apps/Inscription/ManageRequests.vue

@@ -115,7 +115,7 @@
           <div class="studentfirstname">{{item.user.firstName}}</div>
           <div class="studentlastname">{{item.user.lastName}}</div>
           <div class="reqState">{{ i18n("approval")}}{{item.state}}</div>
-          <div class="teacherApproval">{{ i18n("teacherapproval") }} : {{item.teacherApprovalState}}</div>
+          <div class="teacherApproval">{{ i18n("teacherapproval") }} {{item.teacherApprovalState}}</div>
           <div class="infos"><button @click="windowsState=5;targetId=item.id">{{ i18n("request.moreInfos") }}</button></div>
         </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;">
-        <button   @click="editElementID = item.title; editAddCourse = ''; setModify(item); ">
-        {{i18n("courses.modify")}}
-        </button>
-        <button v-if="self.role !== 'Teacher'"@click="editAddCourse = item.title; editElementID ='';setAddToCurriculum(item)">Add to a new Curriculum</button>
+      <div  v-if="editElementID !== item.title && editAddCourse !== item.title" style="display:flex;">
+        <button   @click="editElementID = item.title; editAddCourse = ''; setModify(item);">{{i18n("courses.modify")}}</button>
+        <button v-if="self.role !== 'Teacher'"@click="editAddCourse = item.title; editElementID ='';setAddToCurriculum(item)">{{i18n("courses.AddToCurriculum")}}</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

@@ -93,12 +93,14 @@
   
   async function ChangeInfos(){
     for (let element in toModify){
+      console.log(element)
+      console.log(toModify[element])
          if (element ==="email" && (toModify[element] !== null)){
           await  alterSelf(user.value.regNo,{email : toModify[element]});
         }      
 
-        if (element ==="profilPictureUrl" && (toModify[element] !== null)){
-          await  alterSelf(user.value.regNo,{ profilPictureUrl : toModify[element]});
+        if (element ==="profilePictureUrl" && (toModify[element] !== null)){
+          await  alterSelf(user.value.regNo,{ profilePictureUrl : toModify[element]});
         }
         else if(element === "address" && (toModify[element] !== null)){
           await  alterSelf(user.value.regNo,{address : toModify[element]});
@@ -116,7 +118,7 @@
      toModify.address = item.address;
      toModify.profilPictureUrl = item.profilPictureUrl;
      toModify.email= item.email;
-     toModify.password= item.password;
+     toModify.password= item.password
   }
 
   function getPP(){
@@ -176,6 +178,13 @@
     }
   }
 
+
+  async function getProfilePic(data){
+    const pp= await uploadProfilePicture(data)
+    toModify.profilePictureUrl = pp.url
+  }
+
+
 </script>
 
 <template>
@@ -192,10 +201,10 @@
           <div>
             {{ i18n("login.guest.email") }}: {{user.email}}
           </div>
-          <div v-if="user.role==='Student'">
+          <div>
             {{ i18n("regNo") }} :  {{user.regNo}}
           </div>
-          <div v-else>
+          <div>
             {{ i18n("role") }}:  {{i18n((user.role))}}
           </div>
           <div>
@@ -253,7 +262,7 @@
             {{ i18n("alreadypaid") }}
           </div>
           <div>
-            <button @click="windowState=7" v-if="minerv.value.toPay <= 0">{{ i18n("askscholarship") }}</button>
+            <button @click="windowState=7" v-if="minerv.value.toPay >= 0">{{ i18n("askscholarship") }}</button>
           </div>
         </div>
         <div v-if="windowState === 5">
@@ -306,7 +315,7 @@
         <div v-else-if="windowState === 1" class="infosContainer">
           <div>
             {{i18n("profile.picture")}}:
-            <input type="file" @change="user.profilPicture = uploadProfilePicture($event.target.files);" accept="image/*">
+            <input type="file" @change="getProfilePic($event.target.files)" accept="image/*">
           </div>
           <div>
             {{ i18n("login.guest.email")}}
@@ -343,19 +352,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>
@@ -369,7 +378,7 @@
           </div>
         </div>
       </div>
-      <div v-if="windowState === 0" class="moreInfos">
+      <div v-if="windowState === 0 && user.role==='Student'" class="moreInfos">
         <div class = "oldcursus">
             <div class="listTitle">
               {{ i18n("oldcursus") }}

frontend/src/Apps/Schedule.vue

@@ -8,7 +8,7 @@
 
 <script setup>
   import { ref } from 'vue'
-  import {getDifferenceTime,lastDateOfMonth,formatDate,getFirstDay,sortByDate,weekFromList,sundayToTheEnd,getMarginTop,getHoursMinutes, monthFromList, durationCourse} from '../scheduleFunctions.js'
+  import {getDifferenceTime,lastDateOfMonth,formatDate,getFirstDay,sortByDate,weekFromList,sundayToTheEnd,getMarginTop,getHoursMinutes, monthFromList} from '../scheduleFunctions.js'
   import {getAllSchedule} from "@/rest/scheduleRest.js";
   import {getOnesLessons, getOwnedLessons } from "@/rest/lessonSchedule.js"
   import {isLogged, getSelf,getTeachers} from "@/rest/Users.js"
@@ -76,8 +76,6 @@
   }
   const days = ["monday","tuesday","wednesday","thursday","friday","saturday","sunday"];
   const months = ["january","february","march","april",'may',"june","july","august","september","october","november","december"]
-  const firstDayOfMonth = ref(getFirstDay(new Date()))
-  const monthDone = ref(false);
   function getMonday(d) {
     d = new Date(d);
     d.setHours(0,0,0);
@@ -534,7 +532,7 @@
         <option v-for="item in allSchedules" :value='item'>{{item.curriculum.option}}-{{item.curriculum.year}}</option>
       </select>
       <button v-if="display=='Week'" @click="display='Month'">{{i18n("Week")}}</button>
-      <button v-if="display=='Month'" @click="display='Week'; value=1;">{{i18("Month")}}</button>
+      <button v-if="display=='Month'" @click="display='Week'; value=1;">{{i18n("Month")}}</button>
       <button v-if="format == 'Grid'" @click="format ='List'">{{i18n("Grid")}}</button>
       <button v-if="format == 'List'" @click ="format = 'Grid'">{{i18n("List")}}</button>
       <button v-if="verifUser()" @click="jsonMod=false ;displayOwnSchedule();">{{i18n("OwnSchedule")}}</button>
@@ -577,6 +575,7 @@
         </div>
         <div class="body"  style="background-color:rgb(50,50,50);">{{i18n("schedule.courses")}}</div>
        <div class="body" style="background-color:#484848;"v-for="lesson in focusLessons">
+          {{formatDate(lesson.lessonStart)}}
           {{ getHoursMinutes(lesson.lessonStart)}}-{{getHoursMinutes(lesson.lessonEnd)}}
           {{ lesson.local}}
           {{i18n(lesson.lessonType.toString())}}

frontend/src/Apps/ScientificPublications/ListResearches.vue

@@ -35,6 +35,14 @@ watch(
     }
 );
 
+async function modified(){
+  if (typeof props.researchList === 'undefined'){
+    researchList.value = await fetchAllResearches()
+  }
+  else {
+    emit('modified')
+  }
+}
 
 const openFilter = () => {
   isFilterOpened.value = true;
@@ -112,7 +120,7 @@ const emit = defineEmits(["modified"]);
 <template>
 <div id="researches">
   <FilterComponent :isOpen="isFilterOpened" :allArticles="researchList" @modal-close="closeFilter" @submit="submitFilters"></FilterComponent>
-  <ArticleComponent :allResearcher="allResearcher" :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="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"/>
@@ -136,6 +144,7 @@ const emit = defineEmits(["modified"]);
 <style scoped>
 
 #researches{
+  padding-top: 15px;
   width: 100%;
   height: 100%;
   overflow: scroll;

frontend/src/Apps/ScientificPublications/ManageResearcherProfile.vue

@@ -50,8 +50,8 @@ function getPP(){
 
 <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=getPP() />
+    <div id="profilePicture" >
+      <img :src=getPP() style="border-radius: 20%"/>
     </div>
     <div id="researcherInfos">
       <div class="surrounded" v-if="!changing">{{researcher.user.lastName}} {{researcher.user.firstName}}</div>

frontend/src/Apps/ScientificPublications/ResearchComponent.vue

@@ -99,11 +99,11 @@ async function articleClicked(){
           <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>
+          <li>{{i18n("Access")}} : {{i18n("Access."+article.access)}}</li>
         </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

@@ -11,8 +11,8 @@ import {fetchResearcher, fetchResearches, fetchStats} from "@/rest/ScientificPub
 import ListResearches from "@/Apps/ScientificPublications/ListResearches.vue";
 import i18n from "../../i18n.js";
 const input = ref("");
-const statsOf = ref("");
-const statsBy = ref("");
+const statsOf = ref();
+const statsBy = ref();
 let chart;
 
 const researcherId = window.location.href.split("=")[1]
@@ -63,23 +63,26 @@ const options = reactive({
 function update(){
   options.title = {
     fontColor: "white",
-    text: statsOf.value + " By "+ statsBy.value,
   }
- let index = (statsOf.value === "views"?0:(statsOf.value === "researches"?3:6)) + (statsBy.value ==="years"?0:(statsBy.value==="months"?1:2))
 
-  if (statsOf.value !== "" && statsBy.value !== "")
+  let index = (statsOf.value === "Views"?0:(statsOf.value === "Researches"?3:6)) + (statsBy.value ==="Years"?0:(statsBy.value==="Months"?1:2))
+  if (typeof statsBy.value !== 'undefined' && typeof statsOf.value !== 'undefined'){
     options.data[0].dataPoints = stats.value[index]
+    options.title.text = i18n(statsOf.value) +" "+ i18n("By") +" " + i18n(statsBy.value);
+    chart.render();
+  }
 
-
-  options.title.text = i18n(statsOf.value) +" "+ i18n("By") +" " + i18n(statsBy.value);
-  chart.render();
 }
+async function modifiedResearch(){
+  researchList.value = await fetchResearches(researcher.value.id)
+}
+
 </script>
 
 <template>
   <div id="main">
     <div id="profilePicture">
-      <img :src=getPP() />
+      <img :src=getPP() style="border-radius: 20%"/>
     </div>
     <div id="researcherInfos">
       <div class="surrounded">{{researcher.user.lastName}} {{researcher.user.firstName}}</div>
@@ -97,7 +100,7 @@ function update(){
         <select @change="update()" id="stats-select" v-model="statsOf">
           <option value="Views">{{i18n("Views")}}</option>
           <option value="Researches">{{i18n("Researches")}}</option>
-          <option value="Languages">{{i18n("Language")}}</option>
+          <option value="DifferentLanguage">{{i18n("DifferentLanguage")}}</option>
         </select>
       </div>
       <div class="surrounded">
@@ -105,14 +108,14 @@ function update(){
         <select @change="update()" id="classed-select" v-model="statsBy">
           <option value="Years">{{i18n("Years")}}</option>
           <option value="Months">{{i18n("Months")}}</option>
-          <option value="Topics">{{i18n("Domain")}}</option>
+          <option value="Domain">{{i18n("Domain")}}</option>
         </select>
       </div>
       <div id="statsPie">
 		  <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" @modified="modifiedResearch"></list-researches></div>
   </div>
 </template>
 

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" },

frontend/src/rest/apps.js.orig

@@ -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:

frontend/src/rest/courses.js.orig

@@ -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")
-}

frontend/src/rest/notifications.js

@@ -2,9 +2,14 @@ import { ref } from 'vue'
 import { restGet, restPost } from '@/rest/restConsumer.js'
 
 export const notifications = ref([]);
+let timerSet = false
 
 export function fetchNotifications(){
 	restGet("/notifications").then( e => notifications.value = e );
+	if(!timerSet){
+		timerSet = true;
+		setTimeout(() => {timerSet = false; fetchNotifications()}, 5000);
+	}
 }
 
 export function archiveNotification(id){

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
  *