UserList and Student List part1

Reviewed-on: #135
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>

backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java

@@ -48,9 +48,9 @@ public class UserController {
     }
 
     @GetMapping("/users")
-    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){
+    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("authorization") String authorization){
-
+        System.out.println(authorization);
-        if (authServ.isNotSecretaryOrAdmin(authorization))
+        if (authServ.IsNotIn(new Role[]{Role.Admin,Role.Secretary},authorization))
             return new UnauthorizedResponse<>(null);
 
         Iterable<User> users = userService.getAll();
@@ -90,6 +90,24 @@ public class UserController {
     }
 
 
+    @GetMapping("/students")
+    public ResponseEntity<Iterable<HashMap<String,Object>>> getAllStudent(@RequestHeader("Authorization") String token){
+        if (authServ.getUserFromToken(token) == null)
+            return new UnauthorizedResponse<>(null);
+
+        Iterable<User> teachers = userService.getAllStudents();
+        ArrayList<HashMap<String, Object>> withoutPassword = new ArrayList<>();
+
+        for (User t: teachers){
+            withoutPassword.add(userWithoutPassword(t));
+        }
+
+        return new ResponseEntity<>(withoutPassword, HttpStatus.OK);
+    }
+
+
+
+
 
         /** return user's data except password
          * @param user the user to return

backend/src/main/java/ovh/herisson/Clyde/Repositories/UserRepository.java

@@ -19,4 +19,7 @@ public interface UserRepository extends CrudRepository<User, Long> {
     @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Teacher")
     Iterable<User> findAllTeachers();
 
+
+    @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Student")
+    Iterable<User> findAllStudents();
 }

backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java

@@ -107,4 +107,6 @@ public class UserService {
 
 
     public Iterable<User> getAllTeachers (){return userRepo.findAllTeachers();}
+
+    public Iterable<User> getAllStudents(){return userRepo.findAllStudents();}
 }

frontend/public/i18n/EN.txt

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

frontend/public/i18n/FR.txt

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

frontend/src/Apps/StudentsList.vue

@@ -1,72 +1,17 @@
 <script setup>
   import i18n from "@/i18n.js"
   import { reactive  } from 'vue'
+  import { getStudents } from '../rest/Users.js'
 
-const users =[{
+  const users = await getStudents();
-  status: "Inscrit",
+  console.log(users)
-  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",
-  }]
-
 </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>

frontend/src/Apps/UsersList.vue

@@ -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>

frontend/src/rest/Users.js

@@ -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