diff --git a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java b/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java index 65cbe4d..ae22329 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/EndPoints/Inscription/RequestsController.java +++ b/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){ diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ChangeCurriculumRequestRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ChangeCurriculumRequestRepository.java index 0248e43..3aa815c 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/Inscription/ChangeCurriculumRequestRepository.java +++ b/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 findById(long id); diff --git a/backend/src/main/java/ovh/herisson/Clyde/Tables/ChangeCurriculumRequest.java b/backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ChangeCurriculumRequest.java similarity index 92% rename from backend/src/main/java/ovh/herisson/Clyde/Tables/ChangeCurriculumRequest.java rename to backend/src/main/java/ovh/herisson/Clyde/Tables/Inscription/ChangeCurriculumRequest.java index a309023..b4a2436 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ChangeCurriculumRequest.java +++ b/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; diff --git a/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue b/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue index 588221c..e10854f 100644 --- a/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue +++ b/frontend/src/Apps/Inscription/AboutChangeCurriculum.vue @@ -51,12 +51,12 @@ async function editChangeCurrReqTeacherApproval(state){
-
+
- +
diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue index e4e942b..5e05ff2 100644 --- a/frontend/src/Apps/Profil.vue +++ b/frontend/src/Apps/Profil.vue @@ -343,19 +343,19 @@ - {{ i18n("newcurr") }} : + {{ i18n("newcursus") }} :
- {{ i18n("newcurr") }} : + {{ i18n("newcursus") }} :
- {{ i18n("newcurr") }} : + {{ i18n("newcursus") }} :