1
0
forked from PGL/Clyde

UserList and Student List part1

This commit is contained in:
Wawilski 2024-03-17 15:59:12 +01:00
parent 210fda0401
commit b2d0be014c
6 changed files with 22 additions and 76 deletions

View File

@ -48,9 +48,9 @@ public class UserController {
}
@GetMapping("/users")
public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){
if (authServ.isNotSecretaryOrAdmin(authorization))
public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("authorization") String authorization){
System.out.println(authorization);
if (authServ.IsNotIn(new Role[]{Role.Admin,Role.Secretary},authorization))
return new UnauthorizedResponse<>(null);
Iterable<User> users = userService.getAll();

View File

@ -45,9 +45,9 @@ profile.address=Address
profile.picture=Profile picture
profile.change.curriculum=Change curriculum
name=Name
teacher=Teacher
student=Student
secretary=Secretary
curriculum=curriculum
credits=Credits
Teacher=Teacher
Student=Student
Secretary=Secretary
Curriculum=curriculum
Credits=Credits
faculty=Faculty

View File

@ -45,9 +45,9 @@ profile.address=Adresse
profile.picture=Photo de profil
profile.change.curriculum=Changer cursus
name=Nom
teacher=Enseignant
student=Etudiant
secretary=Secrétaire
curriculum=Cursus
credits=Credits
Teacher=Enseignant
Student=Etudiant
Secretary=Secrétaire
Curriculum=Cursus
Credits=Credits
faculty=Faculté

View File

@ -1,72 +1,17 @@
<script setup>
import i18n from "@/i18n.js"
import { reactive } from 'vue'
import { getStudents } from '../rest/Users.js'
const users =[{
status: "Inscrit",
profilPicture:"/Clyde.png",
lastName:"Ghost",
firstName:"Clyde",
role:"student",
address: "Radiator Springs",
email:"ClydeGhost@gmail.com",
cursus:[
{
"id": 12,
"name": "Math pour l'info",
"credits": 11,
"faculty": "science",
"teacher": 42,
"Assistants": []},
{
"id": 42,
"name": "Fonctionnement des ordinateurs",
"credits": 11,
"faculty": "science",
"teacher": 42,
"Assistants": []},
],
option:"IT",
degree:"BAC1",
password:"CeciEstUnMotDePasse123",},
{
status: "En attente",
profilPicture:"/Clyde.png",
lastName:"Ghost",
firstName:"Clyde",
role:"student",
address: "Radiator Springs",
email:"ClydeGhost@gmail.com",
cursus:[
{
"id": 12,
"name": "Math pour l'info",
"credits": 11,
"faculty": "science",
"teacher": 42,
"Assistants": []},
{
"id": 42,
"name": "Fonctionnement des ordinateurs",
"credits": 11,
"faculty": "science",
"teacher": 42,
"Assistants": []},
],
option:"IT",
degree:"BAC1",
password:"CeciEstUnMotDePasse123",
}]
const users = await getStudents();
console.log(users)
</script>
<template>
<div v-for="item in users">
<div class="bodu">
<div class="container">
<div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
<div class="option"><a>{{item.option}}</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>

View File

@ -6,12 +6,13 @@
const users = await getAllUsers();
console.log(users);
</script>
<template>
<div v-for="item in users">
<div class="bodu">
<div class="container">
<div class="role"><a style="margin-left:30px">{{i18n(item.role).toUpperCase()}}</a></div>
<div class="role"><a style="margin-left:30px">{{i18n(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>

View File

@ -112,12 +112,12 @@ export async function getAllUsers(){
* - role
*/
export async function getTeachers(){
return restGet("/users/teacher")
return restGet("/teachers")
}
export async function getStudents(){
return restGet("/users/student")
return restGet("/students")
}
/**
* Get informations about yourself