Merge master into my branch

# Conflicts:
#	frontend/src/Apps/Inscription.vue
#	frontend/src/Apps/Login.vue
#	frontend/src/Apps/Profil.vue
#	frontend/src/Apps/StudentsList.vue

backend/build.gradle.kts

@@ -25,6 +25,7 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
+	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")

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

@@ -47,7 +47,6 @@ public class ApplicationsController {
 
         //if unAuthed
         authorizedApps.add(Applications.Login);
-        authorizedApps.add(Applications.Schedule);
 
 		User user = authServ.getUserFromToken(token);
 		if(user == null)

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

@@ -8,7 +8,9 @@ import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.User;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -22,11 +24,14 @@ public class CurriculumController {
     private final UserCurriculumService userCurriculumServ;
     private final CurriculumCourseService curriculumCourseServ;
 
-    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ){
+    private final UserService userServ;
+
+    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, UserCurriculumService userCurriculumServ, CurriculumCourseService curriculumCourseServ, UserService userServ){
         this.curriculumServ = curriculumServ;
         this.authServ = authServ;
         this.userCurriculumServ = userCurriculumServ;
         this.curriculumCourseServ = curriculumCourseServ;
+        this.userServ = userServ;
     }
 
     @GetMapping("/curriculum/{id}")
@@ -52,6 +57,22 @@ public class CurriculumController {
         return new ResponseEntity<>(curriculumCourseServ.getDepthCurriculum(curriculum),HttpStatus.OK);
     }
 
+
+    //Return the list of all curicullums of an user
+    @GetMapping("/onescurriculum/{userId}")
+    public ResponseEntity<Map<String ,Object>> findOnesCurriculum(@RequestHeader("Authorization") String token, @PathVariable String userId){
+        if (authServ.getUserFromToken(token) == null)
+            return new UnauthorizedResponse<>(null);
+
+        User u = userServ.getUserById(Long.parseLong(userId));
+        HashMap<String,Object> toReturn = userCurriculumServ.findAllCurriculumByStudent(u);
+
+        if (toReturn == null)
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        return new ResponseEntity<>(toReturn,HttpStatus.OK);
+    }
+
     @GetMapping("/curriculums")
     public ResponseEntity<Iterable<Map<String, Object>>> findAllIndDepth(){
         return new ResponseEntity<>(curriculumCourseServ.getAllDepthCurriculum(),HttpStatus.OK);
@@ -94,4 +115,20 @@ public class CurriculumController {
         curriculumServ.delete(toDelete);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @GetMapping("/externalcurriculum/{userId}")
+    public ResponseEntity<Map<String,Object>> getStudentsExternalCurriculum(@RequestHeader("Authorization") String token, @PathVariable String userId){
+        if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
+            return new UnauthorizedResponse<>(null);
+
+        User u = userServ.getUserById(Long.parseLong(userId));
+        HashMap<String,Object> toReturn = userCurriculumServ.findAllExternalCurriculumByStudent(u);
+
+        if (toReturn == null)
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+
+        return new ResponseEntity<>(toReturn,HttpStatus.OK);
+    }
+
+
 }

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

@@ -3,6 +3,7 @@ package ovh.herisson.Clyde.EndPoints;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
+import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Services.*;
 import ovh.herisson.Clyde.Tables.*;
@@ -26,8 +27,9 @@ public class MockController {
     public final InscriptionService inscriptionService;
     ArrayList<User> mockUsers;
 
+    public final UserCurriculumRepository ucr;
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService){
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService, InscriptionService inscriptionService, UserCurriculumRepository ucr){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
@@ -35,6 +37,7 @@ public class MockController {
         this.curriculumService = curriculumService;
         this.courseService = courseService;
         this.inscriptionService = inscriptionService;
+        this.ucr = ucr;
     }
 
     /** Saves an example of each user type by :
@@ -47,15 +50,14 @@ public class MockController {
     public void postMock(){
 
         // 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"));
-        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke,lena,jojo));
+        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);
 
@@ -64,11 +66,22 @@ public class MockController {
         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, 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);
@@ -92,10 +105,9 @@ public class MockController {
         CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
 
 
-        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
+        InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password", null, new Date());
 
         inscriptionService.save(inscriptionRequest);
-        
     }
 }
 

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

@@ -0,0 +1,11 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.ExternalCurriculum;
+import ovh.herisson.Clyde.Tables.User;
+
+import java.util.ArrayList;
+
+public interface ExternalCurriculumRepository extends CrudRepository<ExternalCurriculum, Long> {
+    ArrayList<ExternalCurriculum> getExternalCurriculumByUser(User user);
+}

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

@@ -6,8 +6,12 @@ import ovh.herisson.Clyde.Tables.Curriculum;
 import ovh.herisson.Clyde.Tables.User;
 import ovh.herisson.Clyde.Tables.UserCurriculum;
 
+import java.util.ArrayList;
+
 public interface UserCurriculumRepository extends CrudRepository<UserCurriculum, Long> {
 
     @Query("select uc.curriculum from UserCurriculum uc where uc.user = ?1")
     Curriculum findByUser(User student);
+
+    ArrayList<UserCurriculum> findByUserOrderByCurriculum(User student);
 }

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

@@ -18,7 +18,6 @@ public class CurriculumService {
     public Curriculum findById(long id){
         return curriculumRepo.findById(id);
     }
-
     public void delete(Curriculum curriculum) {
         curriculumRepo.delete(curriculum);
     }

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

@@ -81,7 +81,7 @@ public class InscriptionService {
             );
 
             userRepo.save(userFromRequest);
-            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId())));
+            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()),0));
         }
         inscrRequest.setState(requestState);
         save(inscrRequest);

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

@@ -87,7 +87,8 @@ public class ProtectionService {
         toReturn.put("curriculum", inscriptionRequest.getCurriculumId());
         toReturn.put("state", inscriptionRequest.getState());
         toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
-
+        toReturn.put("identityCard", inscriptionRequest.getIdentityCard());
+        toReturn.put("submissionDate", inscriptionRequest.getSubmissionDate());
         return toReturn;
     }
 

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

@@ -1,20 +1,79 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.Repositories.CurriculumRepository;
+import ovh.herisson.Clyde.Repositories.ExternalCurriculumRepository;
 import ovh.herisson.Clyde.Repositories.UserCurriculumRepository;
 import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.ExternalCurriculum;
 import ovh.herisson.Clyde.Tables.User;
+import ovh.herisson.Clyde.Tables.UserCurriculum;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 
 @Service
 public class UserCurriculumService {
 
     private final UserCurriculumRepository userCurriculumRepository;
+    private final CurriculumRepository curriculumRepo;
 
-    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository) {
+    private final ExternalCurriculumRepository externalCurriculumRepo;
+    public UserCurriculumService(UserCurriculumRepository userCurriculumRepository, CurriculumRepository curriculumRepo, ExternalCurriculumRepository externalCurriculumRepo) {
         this.userCurriculumRepository = userCurriculumRepository;
+        this.curriculumRepo = curriculumRepo;
+        this.externalCurriculumRepo = externalCurriculumRepo;
     }
 
     public Curriculum findByUser(User student){
         return userCurriculumRepository.findByUser(student);
     }
+
+    public HashMap<String,Object> findAllCurriculumByStudent(User student) {
+        ArrayList<UserCurriculum> list = userCurriculumRepository.findByUserOrderByCurriculum(student);
+
+        ArrayList<HashMap<String, Object>> curriculumlist = new ArrayList<HashMap<String, Object>>();
+
+        for (int i = 0; i < list.size(); i++) {
+            HashMap<String, Object> element = new HashMap<>();
+            Curriculum c = list.get(i).getCurriculum();
+
+
+            element.put("curriculumId", c.getCurriculumId());
+            element.put("year", c.getYear());
+            element.put("option", c.getOption());
+            element.put("dateyear", list.get(i).getYear());
+            curriculumlist.add(element);
+        }
+
+        HashMap<String, Object> toReturn = new HashMap<String, Object>();
+        toReturn.put("curriculumList", curriculumlist);
+        return toReturn;
+    }
+
+
+    public HashMap<String,Object> findAllExternalCurriculumByStudent(User student) {
+        ArrayList<ExternalCurriculum> list = externalCurriculumRepo.getExternalCurriculumByUser(student);
+
+        ArrayList<HashMap<String, Object>> externalCurriculumList = new ArrayList<HashMap<String, Object>>();
+
+        for (int i = 0; i < list.size(); i++) {
+            HashMap<String, Object> element = new HashMap<>();
+            element.put("id", list.get(0).getId());
+            element.put("user", list.get(0).getUser());
+            element.put("university", list.get(0).getUniversity());
+            element.put("formation", list.get(0).getFormation());
+            element.put("completion", list.get(0).getCompletion());
+            element.put("startYear", list.get(0).getStartYear());
+            element.put("endYear", list.get(0).getEndYear());
+            element.put("justifDocUrl", list.get(0).getJustifdocUrl());
+            element.put("state", list.get(0).getState());
+            externalCurriculumList.add(element);
+        }
+
+        HashMap<String, Object> toReturn = new HashMap<String, Object>();
+        toReturn.put("externalCurriculumList", externalCurriculumList);
+        return toReturn;
+    }
+
 }

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

@@ -3,7 +3,6 @@ package ovh.herisson.Clyde.Tables;
 public enum Applications {
     // without any token
     Login,
-    Schedule,
 
     // with any token
     Profile,

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

@@ -0,0 +1,66 @@
+package ovh.herisson.Clyde.Tables;
+
+
+import jakarta.persistence.*;
+
+@Entity
+public class ExemptionsRequest {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @ManyToOne
+    @JoinColumn(name = "Users")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "Course")
+    private Course course;
+    private String justifDocument;
+
+    private RequestState state;
+
+
+    public ExemptionsRequest(User user, Course course, String justifDocument, RequestState state){
+        this.user = user;
+        this.course = course;
+        this.justifDocument = justifDocument;
+        this.state = state;
+    }
+
+
+    public ExemptionsRequest(){}
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public Course getCourse() {
+        return course;
+    }
+
+    public void setCourse(Course course) {
+        this.course = course;
+    }
+
+    public String getJustifDocument() {
+        return justifDocument;
+    }
+
+    public void setJustifDocument(String justifDocument) {
+        this.justifDocument = justifDocument;
+    }
+
+
+    public RequestState getState() {
+        return state;
+    }
+
+    public void setState(RequestState state) {
+        this.state = state;
+    }
+}

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

@@ -0,0 +1,113 @@
+package ovh.herisson.Clyde.Tables;
+
+
+import jakarta.persistence.*;
+
+//This table stores a student's curriculum from another university
+@Entity
+public class ExternalCurriculum {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @ManyToOne
+    @JoinColumn(name="Users")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name="University")
+    private University university;
+
+    private String formation;
+
+    //This string denotes the completion of the external formation or the last year completed by the student in this formation
+    private String completion;
+
+    private int startYear;
+    private int endYear;
+    private String justifdocUrl;
+
+    //Accepted if the document justifies the claimed formation
+    private RequestState state;
+
+    public ExternalCurriculum(){}
+
+    public ExternalCurriculum(User user, University university, String formation, String completion, int startYear, int endYear, String justifdocUrl, RequestState state){
+        this.user = user;
+        this.university = university;
+        this.formation = formation;
+        this.completion = completion;
+        this.startYear = startYear;
+        this.endYear = endYear;
+        this.justifdocUrl = justifdocUrl;
+        this.state = state;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public University getUniversity() {
+        return university;
+    }
+
+    public void setUniversity(University university) {
+        this.university = university;
+    }
+
+    public String getFormation() {
+        return formation;
+    }
+
+    public void setFormation(String formation) {
+        this.formation = formation;
+    }
+
+    public String getCompletion(){
+        return completion;
+    }
+
+    public void setCompletion(String completion) {
+        this.completion = completion;
+    }
+
+    public int getStartYear() {
+        return startYear;
+    }
+
+    public void setStartYear(int startYear) {
+        this.startYear = startYear;
+    }
+
+    public int getEndYear() {
+        return endYear;
+    }
+
+    public void setEndYear(int endYear) {
+        this.endYear = endYear;
+    }
+
+    public void setJustifdocUrl(String justifdocUrl) {
+        this.justifdocUrl = justifdocUrl;
+    }
+
+    public String getJustifdocUrl() {
+        return justifdocUrl;
+    }
+
+    public RequestState getState() {
+        return state;
+    }
+
+    public void setState(RequestState state) {
+        this.state = state;
+    }
+}

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

@@ -19,10 +19,12 @@ public class InscriptionRequest {
     private Long curriculumId;
     private RequestState state;
     private String profilePicture;
-
     private String password;
+    private String identityCard;
+    private Date submissionDate;
     public InscriptionRequest(){}
-    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password){
+
+    public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password, String identityCard, Date submissionDate){
         this.lastName = lastName;
         this.firstName = firstName;
         this.address = address;
@@ -33,6 +35,8 @@ public class InscriptionRequest {
         this.state = state;
         this.profilePicture = profilePicture;
         this.password = password;
+        this.identityCard = identityCard;
+        this.submissionDate = submissionDate;
     }
 
     public int getId() {
@@ -118,4 +122,20 @@ public class InscriptionRequest {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getIdentityCard() {
+        return identityCard;
+    }
+
+    public void setIdentityCard(String identityCard) {
+        this.identityCard = identityCard;
+    }
+
+    public Date getSubmissionDate() {
+        return submissionDate;
+    }
+
+    public void setSubmissionDate(Date submissionDate) {
+        this.submissionDate = submissionDate;
+    }
 }

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

@@ -0,0 +1,59 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.*;
+
+@Entity
+public class ScholarshipRequest {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @ManyToOne
+    @JoinColumn(name = "Users")
+    private User user;
+    private RequestState state;
+    private String requestForm;
+    private int amount;
+
+
+    public ScholarshipRequest(User user, RequestState state, String requestForm, int amount){
+        this.user = user;
+        this.state = state;
+        this.requestForm = requestForm;
+        this.amount = amount;
+    }
+
+    public ScholarshipRequest(){}
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public RequestState getState() {
+        return state;
+    }
+
+    public void setState(RequestState state) {
+        this.state = state;
+    }
+
+    public String getRequestForm() {
+        return requestForm;
+    }
+
+    public void setRequestForm(String requestForm) {
+        this.requestForm = requestForm;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+}

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

@@ -0,0 +1,28 @@
+package ovh.herisson.Clyde.Tables;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
+public class UninscriptionRequest {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+    private RequestState state;
+
+    public UninscriptionRequest(RequestState state){
+        this.state = state;
+    }
+
+    public UninscriptionRequest(){}
+
+    public RequestState getState() {
+        return state;
+    }
+
+    public void setState(RequestState state) {
+        this.state = state;
+    }
+}

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

@@ -0,0 +1,27 @@
+package ovh.herisson.Clyde.Tables;
+
+
+import jakarta.persistence.*;
+
+@Entity
+public class University {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    private String name;
+
+    public University(){}
+
+    public University(String name){
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -21,9 +21,12 @@ public class UserCurriculum {
     @OnDelete(action = OnDeleteAction.CASCADE)
     private Curriculum curriculum;
 
-    public UserCurriculum(User user, Curriculum curriculum){
+    private int year;
+
+    public UserCurriculum(User user, Curriculum curriculum, int year){
         this.user = user;
         this.curriculum = curriculum;
+        this.year = year;
     }
 
     public UserCurriculum() {}
@@ -47,4 +50,12 @@ public class UserCurriculum {
     public void setCurriculum(Curriculum curriculum) {
         this.curriculum = curriculum;
     }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
 }

frontend/src/App.vue

@@ -25,6 +25,7 @@ window.addEventListener('hashchange', () => {
   const login=ref(i18n("app.login"))
   const active=ref(false)
 
+
 	const apps = ref([])
 	appList().then(e => apps.value = e)
 

frontend/src/Apps/AboutRequest.vue

@@ -0,0 +1,141 @@
+<script setup>
+import i18n from "@/i18n.js"
+import {getUser} from '../rest/Users.js'
+import {getcurriculum, getSomeonesCurriculumList} from "@/rest/curriculum.js";
+import {getRegisters} from "@/rest/ServiceInscription.js";
+
+const props = defineProps(['target']);
+let request = await getRegisters(props.target);
+const cursus = await getcurriculum(request.curriculum);
+
+function getPP(){
+  if(request.profilePictureUrl === null){
+    return "/Clyde.png"
+  }
+  return request.profilePictureUrl;
+}
+</script>
+
+<template>
+  <div class="body">
+    <div class="container">
+      <div class="profilPic">
+        <img class="subContainter" :src=getPP()>
+      </div>
+      <div class = "globalInfos">
+        <div class="infosContainer">
+          <div>
+            FirstName/Name : {{request.firstName}} {{request.lastName}}
+          </div>
+          <div>
+            E-mail: {{request.email}}
+          </div>
+          <div>
+            Adresse : {{request.address}}
+          </div>
+          <div>
+            Pays : {{request.country}}
+          </div>
+          <div>
+            Date de naissance : {{request.birthDate}}
+          </div>
+          <div>
+            Cursus voulu : BAB {{cursus.year}} {{cursus.option}}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+
+<style scoped>
+.container{
+  display:grid;
+  grid-template-columns:200px 900px;
+  grid-template-rows:200px auto;
+  column-gap:30px;
+  row-gap:45px;
+  grid-template-areas:
+  "profilPic globalInfos"
+  "minfos minfos";
+}
+
+.profilPic{
+  grid-area:profilPic;
+}
+
+.globalInfos {
+  grid-area:globalInfos;
+  align-self :center;
+
+}
+
+.body {
+  width:100%;
+  margin-bottom:10px;
+}
+
+.subContainter{
+  width:100%;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  border:4px solid black;
+}
+
+.infosContainer {
+  padding-bottom:50px;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+}
+
+.moreInfos {
+  display:grid;
+  grid-template-rows:200px auto;
+  column-gap:50px;
+  row-gap:45px;
+  grid-template-areas:
+  "minfos minfos";
+  grid-template-columns:600px 600px;
+}
+
+.listTitle{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width:250px;
+  margin-left:auto;
+  margin-right:auto;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;margin-bottom:10px;
+}
+
+.listElement{
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  margin-bottom:10px;
+}
+
+.containerElement{
+  justify-content:center;
+  display:grid;
+  grid-template-columns:100px 100px 300px;
+  grid-template-areas:
+    "year option dateyear";
+  column-gap:40px;
+  padding-left: 25px;
+}
+</style>

frontend/src/Apps/AboutStudent.vue

@@ -0,0 +1,174 @@
+<script setup>
+  import i18n from "@/i18n.js"
+  import {getUser} from '../rest/Users.js'
+  import {getSomeonesCurriculumList} from "@/rest/curriculum.js";
+
+  const props = defineProps(['target']);
+  let user = await getUser(props.target);
+  let UserCurriculum = await getSomeonesCurriculumList(props.target);
+
+  function getPP(){
+    if(user.profilePictureUrl === null){
+      return "/Clyde.png"
+    }
+    return user.profilePictureUrl
+  }
+
+  //Cette function renvoie l'année académique concernée si on est dans l'année 2023-2024 elle renvoie 2023
+  //car dans la db l'année scolaire 2023-2024 est representée juste par 2023 (le même système s'applique pour chaque années on prend la borne inférieure
+  function getYear(){
+    let date = new Date();
+    if (date.getMonth() <= 6){
+      return date.getFullYear()-1
+    }
+    return date.getFullYear()
+  }
+
+</script>
+
+<template>
+  <div class="body">
+    <div class="container">
+      <div class="profilPic">
+        <img class="subContainter" :src=getPP()>
+      </div>
+      <div class = "globalInfos">
+        <div class="infosContainer">
+          <div>
+            FirstName/Name : {{user.firstName}} {{user.lastName}}
+          </div>
+          <div>
+            E-mail: {{user.email}}
+          </div>
+          <div>
+            Adresse : {{user.address}}
+          </div>
+          <div>
+            Pays : {{user.country}}
+          </div>
+          <div>
+            Date de naissance : {{user.birthDate}}
+          </div>
+        </div>
+      </div>
+      <div class="moreInfos">
+        <div class = "oldcursus">
+          <div class="listTitle">
+            Anciens Cursus
+          </div>
+          <div  class="listElement">
+            <div class=" containerElement" v-for="item in UserCurriculum.curriculumList">
+              <div class="year" v-if="parseInt(item.dateyear) !== getYear()">Bac {{item.year}}</div>
+              <div class="option" v-if="parseInt(item.dateyear) !== getYear()">{{item.option}}</div>
+              <div class="dateyear" v-if="parseInt(item.dateyear) !== getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
+            </div>
+          </div>
+        </div>
+        <div class="newcursus"  >
+          <div class="listTitle">
+            Cursus Actuel
+          </div>
+          <div  class="listElement">
+            <div class=" containerElement" v-for="item in UserCurriculum.curriculumList" >
+                <div class="year" v-if="parseInt(item.dateyear) === getYear()">Bac {{item.year}}</div>
+                <div class="option" v-if="parseInt(item.dateyear) === getYear()">{{item.option}}</div>
+                <div class="dateyear" v-if="parseInt(item.dateyear) === getYear()">Année {{item.dateyear}}-{{item.dateyear+1}}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+
+<style scoped>
+.container{
+  display:grid;
+  grid-template-columns:200px 900px;
+  grid-template-rows:200px auto;
+  column-gap:30px;
+  row-gap:45px;
+  grid-template-areas:
+  "profilPic globalInfos"
+  "minfos minfos";
+}
+
+.profilPic{
+  grid-area:profilPic;
+}
+
+.globalInfos {
+  grid-area:globalInfos;
+  align-self :center;
+
+}
+
+.body {
+  width:100%;
+  margin-bottom:10px;
+}
+
+.subContainter{
+  width:100%;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  border:4px solid black;
+}
+
+.infosContainer {
+  padding-bottom:50px;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+}
+
+.moreInfos {
+  display:grid;
+  grid-template-rows:200px auto;
+  column-gap:50px;
+  row-gap:45px;
+  grid-template-areas:
+  "minfos minfos";
+  grid-template-columns:600px 600px;
+}
+
+.listTitle{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width:250px;
+  margin-left:auto;
+  margin-right:auto;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;margin-bottom:10px;
+}
+
+.listElement{
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+  margin-bottom:10px;
+}
+
+.containerElement{
+  justify-content:center;
+  display:grid;
+  grid-template-columns:100px 100px 300px;
+  grid-template-areas:
+    "year option dateyear";
+  column-gap:40px;
+  padding-left: 25px;
+}
+</style>

frontend/src/Apps/Inscription.vue

@@ -2,31 +2,46 @@
   import i18n from "@/i18n.js"
   import {ref} from 'vue'
   import {validateRegister, getAllRegisters } from '@/rest/ServiceInscription.js'
+  import AboutRequest from "@/Apps/AboutRequest.vue";
 
   const requests = ref(await getAllRegisters());
-  console.log(requests);
+  let targetId = "";
+
+  //0 = liste, 1 = détails, 2 = sure?
+  let windowsState = ref(0);
 
   async function upPage(id,review){
     await validateRegister(id,review);
     requests.value = await getAllRegisters();
-
   }
 </script>
 
 
 
 <template>
-  <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
-  <div class="bodu" v-if="item.state === 'Pending'">
-  <div class="container">
-    <div class="id"><a>{{item.id}}</a></div>
-    <div class="surname"><a>{{item.lastName}}</a></div>
-    <div class="firstname"><a>{{item.firstName}}</a></div>
-    <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}</button></div>
-    <div class="accept"><button @click="upPage(item.id,'Accepted')" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
-    <div class="refuse"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
+  <div v-if="windowsState === 1">
+    <AboutRequest :target="targetId"></AboutRequest>
+    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
   </div>
+  <div v-if="windowsState === 0">
+    <div  v-for="item of requests">
+    <div class="bodu">
+    <div class="container">
+      <div class="date">{{item.submissionDate.slice(0, 10)}}</div>
+      <div class="state">{{item.state}}</div>
+      <div class="surname">{{item.lastName}}</div>
+      <div class="firstname">{{item.firstName}}</div>
+      <div class="accept" v-if="item.state === 'Pending'"><button @click="windowsState=2;targetId=item.id;" style="background-color:rgb(0,105,50);">{{i18n("request.accept")}}</button></div>
+      <div class="refuse" v-if="item.state === 'Pending'"><button @click="upPage(item.id,'Refused')" style="background-color:rgb(105,0,0);">{{i18n("request.refuse")}}</button></div>
+      <div class="infos"><button style="background-color:rgb(105,05,105);" @click="targetId=item.id;windowsState=1;">{{i18n("request.moreInfos")}}</button></div>
+    </div>
+    </div>
+    </div>
   </div>
+  <div v-if="windowsState === 2">
+    <p>Etes vous sur de vouloir accepter cette demande ?</p>
+    <button style="background-color:rgb(105,05,105);" @click="upPage(targetId,'Accepted');windowsState=0;">Valider</button>
+    <button style="background-color:rgb(105,05,105);" @click="windowsState=0;">Retour</button>
   </div>
 </template>
 
@@ -36,10 +51,10 @@
     height:100px;
     font-size:20px;
     display:grid;
-    grid-template-columns:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
+    grid-template-columns:[firstCol-start]150px[firstCol-end secondCol-start]200px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol];
     grid-template-areas:
-    "id type surname firstname infos accept refuse"; 
-    
+    "date state surname firstname accept refuse infos";
+    column-gap:10px;
   }
   
   .infos {
@@ -61,8 +76,14 @@
     grid-area:titles;
     background-color:rgb(215,215,215);
   }
-  .id{
-    grid-area:id;
+  .date{
+    grid-area:date;
+    margin-left:40px;
+    align-self:center;
+  }
+
+  .state{
+    grid-area:state;
     margin-left:40px;
     align-self:center;
   }
@@ -97,9 +118,9 @@
 
   }
 
- .bodu {
-    margin-top:2%;
-    width:66%;
+  .bodu {
+    width:100%;
+    margin-bottom:10px;
     border:2px solid black;
     border-radius:9px;
     background-color:rgb(50,50,50);

frontend/src/Apps/Login.vue

@@ -26,7 +26,7 @@
   const passwordConfirm=ref("")
  
   const imageSaved = ref(false)
-  const ppData = ref(false)
+  let ppData = ""
 
   const curricula= await getAllCurriculums();
   
@@ -50,7 +50,20 @@
   disconnect();
   window.location.reload();}
 
+  async function uploadPP(arg){
+    const data = await uploadProfilePicture(arg);
+    ppData = data.url;
+    console.log(ppData);
+  }
 
+  //This functions makes the distinction between a master cursus (year 4 or more) and a bachelor cursus (year 3 or less)
+  function getCursusDisplay(cursus){
+    if (cursus.year <= 3){
+      return "BAB " + cursus.year + " " + cursus.option;
+    }else{
+      return "MA" + (parseInt(cursus.year)-3).toString() + " " + cursus.option;
+    }
+  }
 
 </script>
 
@@ -116,7 +129,7 @@
                 <a>{{i18n("login.guest.alregister")}}</a>
               </div>
             </div>
-            <div v-else>
+            <div v-if="page === 1">
               <div class="inputBox">
                 <p>{{i18n("login.guest.email")}}</p>
                 <input type="mail" v-model="outputs.email">
@@ -129,23 +142,30 @@
                 <p>{{i18n("login.guest.country")}}</p>
                 <input type="text" v-model="outputs.country">
               </div>
-              <form class="inputBox"novalidate enctype="multipart/form-data">
+              <form class="inputBox" novalidate enctype="multipart/form-data">
               	<p>{{i18n("profile.picture").toUpperCase()}}</p>
+              </form>
               <label class="browser">
                 Parcourir . . .
 				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
               </label>
+              <form novalidate enctype="multipart/form-data" class="inputBox">
+              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
+				        <input type="file" @change="uploadPP($event.target.files); imageSaved = true;" accept="image/*">
               </form>
               <div class="inputBox">
                 <p>{{i18n("Curriculum").toUpperCase()}}</p> 
                   <select v-model="outputs.curriculum">
-                    <option v-for="item in curricula">{{item.curriculumId}}</option>
-                    
+                    <option v-for="item in curricula">{{getCursusDisplay(item)}}</option>
                   </select>
               </div>
+              <p style="color:rgb(239,60,168);">
+                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.
+              </p>
               <div style="align-self:center;" class="inputBox">
-                <button style="margin-top:25px;" @click="register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData);">
-                  {{i18n("login.guest.submit")}}
+                <button style="margin-top:25px;" @click="page++; register(outputs.firstname, outputs.surname, outputs.birthday, outputs.password, outputs.email, outputs.address, outputs.country, outputs.curriculum, ppData, null, new Date());">
+                  {{i18n("login.guest.nextpage")}}
                 </button>
               </div>
               <div  class="switchpage">
@@ -155,6 +175,11 @@
                 <a>{{i18n("login.guest.alregister")}}</a>
               </div>
             </div>
+            <div v-if="page === 2">
+              <form novalidate enctype="multipart/form-data" class="inputBox">
+                Carte d'identité :
+              </form>
+            </div>
           </form>
          </div>
     </div>
@@ -172,8 +197,10 @@
   height:60%;
 }
 
+
 .loginBox {
   background-color: rgb(24,24,24);
+  width: 400px;
   display:flex;
   justify-content: center;
   border-radius: 5%;
@@ -208,7 +235,7 @@
   z-index: 100;
   font-family:sans-serif ; 
   color:rgb(239,60,168);
-  transition:0.5;
+  transition: 0.5;
 
 }
 
@@ -222,7 +249,7 @@
 
 .switchpage{
   width:100px;
-  background:rgb(255, 0 255);
+  background:rgb(255, 0,255);
   border: none;
   padding-right:0;
   padding-top:10px;
@@ -230,7 +257,7 @@
   outline:none;
   border-radius: 4px;
   font-size:0.8em;
-  align-self:right;
+  align-self: right;
 
 }
 

frontend/src/Apps/Schedule.vue

@@ -1,211 +0,0 @@
-<script setup>
-  import { ref } from 'vue'
- 
-  const schedule = [
-    {course:"Math Pour L'info",
-     start:"Wed Mar 27 2024 10:15 GMT+0100",
-     end:"Wed Mar 27 2024 12:15 GMT+0100"},
-    {
-      course:"Calculus",
-      start:"Wed Mar 27 2024 08:00 GMT+0100",
-      end:"Wed Mar 27 2024 10:00 GMT+0100"
-      
-  },
-  {
-      course:"Physique II",
-      start:"Tue Mar 26 2024 10:15 GMT+0100",
-      end:"Tue Mar 26 2024 12:15 GMT+0100"      
-  },
-    {
-      course:"Math Pour L'info",
-      start:"Thu Mar 28 2024 10:15 GMT+0100",
-      end:"Thu Mar 28 2024 12:15 GMT+0100"      
-  }]
-  function formatDate(date) {
-    var d = new Date(date),
-        month = '' + (d.getMonth() + 1),
-        day = '' + d.getDate(),
-        year = d.getFullYear();
-
-    if (month.length < 2) 
-        month = '0' + month;
-    if (day.length < 2) 
-        day = '0' + day;
-
-    return [day, month, year].join('-');
-  }
-  function getMonday(d) {
-    d = new Date(d);
-    var day = d.getDay(),
-    diff = d.getDate() - day + (day == 0 ? -6 : 1);
-    return new Date(d.setDate(diff));
-  }
-
-  function getAnyDays(d){
-
-    var day = new Date(mondayOfWeek.value);
-    day.setDate(day.getDate() + d );
-
-    return day;
-  }
-
-  const mondayOfWeek=ref(getMonday(new Date(schedule[1].start)))
-
-  function isNotCourse(element){
-    return element==null;
-  }
-
-  function durationCourse(element){
-    const hour = element.end.substring(3,5) -element.start.substring(3,5);
-    
-    
-    return (element.end - element.start)%2;
-  }
-  function sortByDate(a, b) {
-    const nameA = a.start; // ignore upper and lowercase
-    const nameB = b.start; // ignore upper and lowercase
-    
-    if (nameA < nameB) {
-      return -1;
-    }
-    if (nameA > nameB) {
-      return 1;
-    }
-    return 0; 
-      }
-
-  function transpose(a) {
-    const trans = [[],[],[],[],[],[]];
-    for(let i = 0; i < 6;i++){
-      for(let j=0; j< 7; j++){
-        if(a[j][i] !== null){
-          trans[i].push(a[j][i]);
-        }
-      }
-    }
-    return trans;
-}
-
-  function matrixFromList(list){
-    const matrix = [[],[],[],[],[],[],[]];
-    for(let key in list){
-      const temp = [];
-      const day = new Date(list[key].start);
-      matrix[day.getDay()].push(list[key]);
-      matrix[day.getDay()].sort((a,b) => sortByDate(a,b));
-    }
-      return matrix;
-  }
-
-  
-  const schedule2 = matrixFromList(schedule);
-  const scheduleByWeek = transpose(schedule2);
-  
-  console.log(scheduleByWeek)
-
-</script>
-<template>
-  <div class="grid">
-    <div class="options" >
-    </div>
-    <div class="schedule">
-      <table class="table">
-        <tr style="background-color:rgb(24,24,24)">
-          <th/>
-          <th class="header">Lundi {{formatDate(getAnyDays(0))}}</th>
-          <th class="header">Mardi {{formatDate(getAnyDays(1))}}</th>
-          <th class="header">Mercredi {{formatDate(getAnyDays(2))}}</th>
-          <th class="header">Jeudi {{formatDate(getAnyDays(3))}}</th>
-          <th class="header">Vendredi {{formatDate(getAnyDays(4))}}</th>
-          <th class="header">Samedi {{formatDate(getAnyDays(5))}}</th>
-          <th class="header">Dimanche {{formatDate(getAnyDays(6))}}</th>
-        </tr>
-        <tr v-for="(n,index) in 12">
-          <th class="hour">{{8 + index}}:00-{{9+index}}:00</th>
-            <td v-for="m in 7"></td>
-        </tr>
-      </table>
-      <div class="courseGrid">
-        <div v-for="i in 7">
-          Test
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<style scoped>
-  .grid{
-    display:grid;
-    margin-top:2%;
-    align-items:center;
-    justify-content:center;
-    grid-template-columns:15vw 70vw;
-    column-gap:2.5vw;
-
-    grid-template-areas:"options schedule";
-  }
-  .schedule{
-    position:relative;  
-    border-radius:20px;
-    grid-area:schedule;
-    width:100%;
-    height:85vh;
-    background-color:rgba(255,255,255,0.1);    
-  }
-  .options{
-    border-radius:20px;
-    grid-area:options;
-    background-color:rgba(255,255,255,0.1);
-    width:100%;
-    height:85vh;
-  }
-
-  .table{
-    width:100%;
-    height:100%;
-    border-spacing:0;
-    border-collapse:separate;
-    border-radius: 20px;
-    border: 2px solid black
-  }
-  
-  .hour{
-    background-color:rgb(72,72,72)
-
-  }
-  
-  .header{
-    align-items:center;
-    width:12.5%;
-    color:#FFFFFF;
-  }
-  table th:not(:last-child),
-  table td:not(:last-child) {
-  border-right: 1px solid black;
-  }
-  
-  table tr:not(:last-child)>td,
-  table tr:not(:last-child)>th
-  {
-    border-bottom:1px solid black;
-  }
-  
-  .courseGrid{
-    top:13.75%;   
-    left:12.5%;
-    position:absolute;
-    width:87.5%;
-    height:86.25%; 
-    display:grid;
-    grid-template-columns:repeat(7,1fr);
-      }
-  
-
-  .course{
-    width:100%;
-    height:100%;
-    background-color:rgb(100,0,100);
-  }
-
-  
-</style>

frontend/src/Apps/StudentsList.vue

@@ -1,19 +1,29 @@
 <script setup>
   import i18n from "@/i18n.js"
-  import { reactive  } from 'vue'
+  import {provide, reactive, ref} from 'vue'
   import { getStudents } from '../rest/Users.js'
-
+  import AboutStudent from "@/Apps/AboutStudent.vue";
   const users = await getStudents();
+
+  let targetRegNo = "";
+  let list = ref(true);
 </script>
+
 <template style="margin-top:5%;">
-  <div style="display:flex; justify-content:center; " v-for="item in users">
+  <div v-if="list === false">
+    <AboutStudent :target=targetRegNo />
+    <button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
+  </div>
+  <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true">
     <div class="bodu">
       <div class="container">
         <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
         <div class="option"><a>{{item.role}}</a></div>
         <div class="surname"><a>{{item.lastName}}</a></div>
         <div class="firstname"><a>{{item.firstName}}</a></div>
-        <div class="infos"><button style="background-color:rgb(105,05,105);" >{{i18n("request.moreInfos")}}   </button></div>
+        <div class="infos">
+          <button style="background-color:rgb(105,05,105);" @click="list = false; targetRegNo = item.regNo;">{{i18n("request.moreInfos")}} </button>
+        </div>
     </div>
     </div>
   </div>
@@ -28,7 +38,7 @@
     grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
     grid-template-areas:
     "status option surname firstname infos"; 
-    
+    column-gap:10px;
   }
   
   .infos {

frontend/src/rest/Users.js

@@ -26,7 +26,7 @@ export function disconnect(){
  * @param curriculum 
  * @param imageId	id of the image in database returned when uploaded
  */
-export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -36,7 +36,9 @@ export async function register(firstname, lastname, birthDate, password, email,
 		address: address,
 		country: country,
 		curriculumId: curriculumId,
-    profilePictureUrl: imageId,
+    	profilePicture: imageId,
+		identityCard : identityCardId,
+		submissionDate : submissionDate
 	});
 }
 
@@ -52,7 +54,7 @@ export async function register(firstname, lastname, birthDate, password, email,
  * @param country
  * @param imageId	id of the image in database returned when uploaded
  *
- * PS: the password is not is not required as it is generated by the backend and sent to the user
+ * PS: the password is not required as it is generated by the backend and sent to the user
  * by mail. it's up to the user to change it if he cares about security
  */
 export async function createUser(firstname, lastname, birthDate, email, address, country, role, imageId){

frontend/src/rest/apps.js

@@ -9,10 +9,9 @@ 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 AboutStudent from "@/Apps/AboutStudent.vue";
 
 const apps = {
-		'/schedule': Schedule,
 		'/login': LoginPage,
 		'/inscription': Inscription,
 		'/profil': Profil,

frontend/src/rest/curriculum.js

@@ -48,3 +48,7 @@ export async function altercurriculum(id, courses){
 export async function getSelfCurriculum(){
   return restGet("/curriculum");
 }
+
+export async function getSomeonesCurriculumList(user){
+	return restGet("/onescurriculum/"+user)
+}

frontend/src/rest/uploads.js

@@ -7,5 +7,17 @@ import { restPostFile } from '@/rest/restConsumer.js'
 export async function uploadProfilePicture(file){
 	const formData = new FormData();
 	formData.append("file", file[0]);
-	return restPostFile("/upload/ProfilePicture", formData)
+
+	return restPostFile("/upload/ProfilePicture", formData);
+}
+
+
+/**
+ * More generic version of the upload method
+ */
+
+export async function uploadFile(file, type){
+	const formData = new FormData();
+	formData.append("file", file[0]);
+	return restPostFile("/upload/"+type, formData)
 }