PGL/Clyde
3
2
Fork 3
Code Issues 13 Pull Requests Actions Projects 3 Releases 2 Wiki Activity

Merge master into my branch

Browse Source
This commit is contained in:
LeoMoulin
2024-04-01 10:40:36 +02:00
parent 47e4fb2f8c
commit bce53305b3
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java
View File

@ -117,7 +117,7 @@ public class CurriculumController {
} }
@GetMapping("/externalcurriculum/{userId}") @GetMapping("/externalcurriculum/{userId}")
public ResponseEntity<Map<String,Object>> getStudentsExternalCursus(@RequestHeader("Authorization") String token, @PathVariable String 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)) if (authServ.isNotIn(new Role[]{Role.Secretary,Role.Admin, Role.Teacher},token))
return new UnauthorizedResponse<>(null); return new UnauthorizedResponse<>(null);

9
frontend/src/Apps/Login.vue
View File

@ -26,7 +26,7 @@
const passwordConfirm=ref("") const passwordConfirm=ref("")
const imageSaved = ref(false) const imageSaved = ref(false)
const ppData = ref(false) let ppData = ""
const curricula= await getAllCurriculums(); const curricula= await getAllCurriculums();
@ -142,8 +142,9 @@
<p>{{i18n("login.guest.country")}}</p> <p>{{i18n("login.guest.country")}}</p>
<input type="text" v-model="outputs.country"> <input type="text" v-model="outputs.country">
</div> </div>
<form class="inputBox"novalidate enctype="multipart/form-data"> <form class="inputBox" novalidate enctype="multipart/form-data">
<p>{{i18n("profile.picture").toUpperCase()}}</p> <p>{{i18n("profile.picture").toUpperCase()}}</p>
</form>
<label class="browser"> <label class="browser">
Parcourir . . . Parcourir . . .
<input type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*"> <input type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
@ -234,7 +235,7 @@
z-index: 100; z-index: 100;
font-family:sans-serif ; font-family:sans-serif ;
color:rgb(239,60,168); color:rgb(239,60,168);
transition:0.5; transition: 0.5;
} }
@ -256,7 +257,7 @@
outline:none; outline:none;
border-radius: 4px; border-radius: 4px;
font-size:0.8em; font-size:0.8em;
align-self:right; align-self: right;
} }

3
frontend/src/Apps/StudentsList.vue
View File

@ -14,8 +14,7 @@
<AboutStudent :target=targetRegNo /> <AboutStudent :target=targetRegNo />
<button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button> <button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
</div> </div>
<div v-for="item in users" v-if="list === true"> <div style="display:flex; justify-content:center; " v-for="item in users" v-if="list === true">
<div style="display:flex; justify-content:center; " v-for="item in users">
<div class="bodu"> <div class="bodu">
<div class="container"> <div class="container">
<div class="status"><a style="margin-left:30px">{{item.status}}</a></div> <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>