Merge master into my branch
This commit is contained in:
parent
47e4fb2f8c
commit
bce53305b3
@ -117,7 +117,7 @@ public class CurriculumController {
|
||||
}
|
||||
|
||||
@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))
|
||||
return new UnauthorizedResponse<>(null);
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
const passwordConfirm=ref("")
|
||||
|
||||
const imageSaved = ref(false)
|
||||
const ppData = ref(false)
|
||||
let ppData = ""
|
||||
|
||||
const curricula= await getAllCurriculums();
|
||||
|
||||
@ -142,8 +142,9 @@
|
||||
<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/*">
|
||||
@ -234,7 +235,7 @@
|
||||
z-index: 100;
|
||||
font-family:sans-serif ;
|
||||
color:rgb(239,60,168);
|
||||
transition:0.5;
|
||||
transition: 0.5;
|
||||
|
||||
}
|
||||
|
||||
@ -256,7 +257,7 @@
|
||||
outline:none;
|
||||
border-radius: 4px;
|
||||
font-size:0.8em;
|
||||
align-self:right;
|
||||
align-self: right;
|
||||
|
||||
}
|
||||
|
||||
|
@ -14,8 +14,7 @@
|
||||
<AboutStudent :target=targetRegNo />
|
||||
<button style="background-color:rgb(105,05,105);" @click="list = true;">Back</button>
|
||||
</div>
|
||||
<div v-for="item in users" v-if="list === true">
|
||||
<div style="display:flex; justify-content:center; " v-for="item in users">
|
||||
<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>
|
||||
|
Loading…
Reference in New Issue
Block a user