Merge remote-tracking branch 'origin/master' into forum

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, identityCardId, submissionDate, equivalence){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId, identityCardId, submissionDate, equivalence,admissionDocUrl){
 	return restPost("/register", {
 		firstName: firstname,
 		lastName: lastname,
@@ -39,7 +39,8 @@ export async function register(firstname, lastname, birthDate, password, email,
     	profilePicture: imageId,
 		identityCard : identityCardId,
 		submissionDate : submissionDate,
-		equivalenceState : equivalence
+		equivalenceState : equivalence,
+		admissionDocUrl: admissionDocUrl
 	});
 }
 

frontend/src/rest/courses.js

@@ -71,3 +71,11 @@ export async function getCourses(role){
 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(userId){
+	return restGet("/usercourses/"+userId)
+}

frontend/src/rest/requests.js

@@ -62,4 +62,20 @@ export async function getChangeCurrReqById(id){
 
 export async function editChangeCurrReq(id, newState){
     return restPatch("/changecurriculumreq/"+id+"/"+newState)
+}
+
+export async function editChangeCurrReqTeacherState(id, newState){
+    return restPatch("/changecurriculumreqteacher/"+id+"/"+newState)
+}
+
+export async function getExempReq(id){
+    return restGet("/exemptionsreq/"+id)
+}
+
+export async function editExempReqState(id, newstate){
+    return restPatch("/exemptionsreq/"+id+"/"+newstate)
+}
+
+export async function getExempByUser(userId){
+    return restGet("/exemptionreq/"+userId)
 }

frontend/src/rest/uploads.js

@@ -13,11 +13,11 @@ export async function uploadProfilePicture(file){
 
 
 /**
- * More generic version of the upload method
+ * More generic version of the uploadProfilePicture method
  */
 
 export async function uploadFile(file, type){
 	const formData = new FormData();
 	formData.append("file", file[0]);
 	return restPostFile("/upload/"+type, formData)
-}
+}