ajout de l'interface pour ajouter des groupes

sfeutrie
1 parent 14f89f89
Showing 4 changed files with 83 additions and 51 deletions Show diff stats
PFE06/src/main/java/com/PFE/ServerManager/MainController.java
PFE06/src/main/java/com/PFE/ServerManager/TeamRepository.java
PFE06/src/main/resources/templates/login.html
PFE06/src/main/resources/templates/registration.html
 package com.PFE.ServerManager;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -102,12 +103,16 @@ public class MainController {
     }
     @GetMapping(path="/registration")
-    public ModelAndView registration() {
+    public ModelAndView registration(@RequestParam(required=false) String message, @RequestParam(required=false) Integer succeed) {
         ModelAndView modelAndView = new ModelAndView();
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         Customer customer = customerRepository.findByEmail(auth.getName());
         modelAndView.addObject("customerName", customer.getEmail().split("@")[0]);
         modelAndView.addObject("customerRole", customer.getRole());
+        modelAndView.addObject("message", message);
+        modelAndView.addObject("succeed", succeed);
+        System.out.println("all teams : " + teamRepository.findAll());
+        modelAndView.addObject("allTeams", teamRepository.findAll());
         modelAndView.setViewName("registration");
         return modelAndView;
     }
@@ -117,40 +122,43 @@ public class MainController {
         return "denied";
     }
-    @PostMapping(path="/registration")
-    public ModelAndView addNewUser(@RequestParam String email, @RequestParam String password, @RequestParam String role) {
-        //Model map, ModelAndView ou l'utilisation direct comme dans la méthode précédente sont 3 méthodes qui permettent d'envoyer des informations et donc de changer l'apparence d'une page
-        ModelAndView modelAndView = new ModelAndView(); // il n'est peut être pas utile d'utiliser ModelAndView
-        Customer n = new Customer();
-        n.setEmail(email);
-        n.setPassword(bCryptPasswordEncoder.encode(password));
-        n.setCustomerId((int)(customerRepository.count() + 1));
-        n.setActive(1);
-        Customer temp = customerRepository.findByEmail(email);
-        Role userRole = roleRepository.findByRole(role);
-        n.addRole(userRole);
-
-        //utilisé uniquement pour continuer à afficher l'utilisateur connecté//
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        Customer customer = customerRepository.findByEmail(auth.getName());
-        modelAndView.addObject("customerName", customer.getEmail().split("@")[0]);
-        modelAndView.addObject("customerRole", customer.getRole());
-        modelAndView.setViewName("registration");
+    @PostMapping(path="/addTeam")
+    public String addNewTeam(@RequestParam String teamName){
-        List<Customer> list = customerRepository.findAll(); // attention : la méthode findAll() de JpaRepository retourne une liste alors que celle de CrudRepository retourne un itérable
-        modelAndView.addObject("list", list);
+        if(teamRepository.findByTeam(teamName) != null) {
+            return "redirect:/registration?message=Le groupe&succeed=-1";
+        }
+        else {
+            Team t = new Team();
+            t.setTeam(teamName);
+            t.setTeamId((int)(teamRepository.count()+1));
+            teamRepository.save(t);
+            return "redirect:/registration?message=Le groupe&succeed=1";
+        }
+    }
+
+    @PostMapping(path="/addUser")
+    public String addNewUser(@RequestParam String email, @RequestParam String password, @RequestParam String role, @RequestParam String team) {
-        if(temp != null) {
-            modelAndView.addObject("message", "L'utilisateur existe déjà !");
-            modelAndView.addObject("fail", true);
+        if(customerRepository.findByEmail(email) != null) {
+            return "redirect:/registration?message=L'utilisateur&succeed=-1";
         }
         else {
-            modelAndView.addObject("message", "L'utilisateur a bien été ajouté !");
-            modelAndView.addObject("ok", true);
+            Customer n = new Customer();
+            n.setEmail(email);
+            n.setPassword(bCryptPasswordEncoder.encode(password));
+            n.setCustomerId((int)(customerRepository.count() + 1));
+            n.setActive(1);
+            Role userRole = roleRepository.findByRole(role);
+            n.addRole(userRole);
             customerRepository.save(n);
+            System.out.println("team found : " + team);
+            Team temp = teamRepository.findByTeam(team);
+            temp.addCustomer(n);
+            teamRepository.save(temp);
+            return "redirect:/registration?message=L'utilisateur&succeed=1";
         }
-        modelAndView.setViewName("registration");
-        return modelAndView;
+
     }
     @RequestMapping(value = "/file", method = RequestMethod.POST)
@@ -9,6 +9,8 @@ import java.util.List;
 @Repository
 public interface TeamRepository extends JpaRepository<Team, Integer> {
+    Team findByTeam(String team);
+
     Team findByCustomersContaining(Customer customer);
     @Override
@@ -29,11 +29,11 @@
                 <form id="Login" th:action="@{/login}" method="POST">
                     <div class="form-team">
-                        <input type="email" class="form-control" id="inputEmail" placeholder="Email" name="email">
+                        <input type="email" class="form-control" id="inputEmail" placeholder="Email" name="email" minlength="6" required>
                     </div>
                     <br/>
                     <div class="form-team">
-                        <input type="password" class="form-control" id="inputPassword" placeholder="Mot de passe" name="password">
+                        <input type="password" class="form-control" id="inputPassword" placeholder="Mot de passe" name="password" minlength="6" required>
                     </div>
                     <br/>
                     <button @click.prevent="login" type="submit" class="btn btn-primary">Se connecter</button>
@@ -38,32 +38,19 @@
         </div>
     </nav>
+    <div class="container">
+        <h1 style="margin-bottom:50px; margin-top:50px; border-bottom:1px solid #CCC; padding-bottom:20px;">Formulaire d'ajout d'un utilisateur</h1>
+        <p>Merci d'entrer le login et le mot de passe du nouvel utilisateur</p>
+    </div>
     <div class="login-form">
         <div class="main-div">
-            <div class="panel">
-                <h2>Formulaire d'ajout</h2>
-                <p>Merci d'entrer le login et le mot de passe du nouvel utilisateur</p>
-            </div>
-
-            <div th:if="${ok}">
-                <div class="alert alert-success" role="alert">
-                    <span th:utext="${message}"></span>
-                </div>
-            </div>
-
-            <div th:if="${fail}">
-                <div class="alert alert-danger" role="alert">
-                    <span th:utext="${message}"></span>
-                </div>
-            </div>
-
-            <form id="Login" th:action="@{/registration}" method="POST">
+            <form id="Login" th:action="@{/addUser}" method="POST">
                 <div class="form-team">
-                    <input type="email" class="form-control" id="username" placeholder="Entrer l'email" name="email">
+                    <input type="email" class="form-control" id="username" placeholder="Entrer l'email" name="email" minlength="6" required>
                 </div>
                 <br/>
                 <div class="form-team">
-                    <input type="password" class="form-control" id="password" placeholder="Entrer le mot de passe" name="password">
+                    <input type="password" class="form-control" id="password" placeholder="Entrer le mot de passe (6 caractères min.)" name="password" minlength="6" required>
                 </div>
                 <br/>
                 <div class="form3">
@@ -74,10 +61,45 @@
                     <label for="role2">User</label>
                 </div>
                 <br/>
+                <div class="form-group">
+                    <label for="sel2">Selectionnez un groupe de travail</label>
+                    <select class="form-control" id="sel2" name="team" required>
+                        <option name="team" th:each="team : ${allTeams}" th:value="${team.getTeam()}" th:utext="${team.getTeam()}"/>
+                    </select>
+                </div>
                 <button @click.prevent="registration" type="submit" class="btn btn-primary">Ajouter</button>
             </form>
         </div>
     </div>
+    <div style="max-width:38%; margin:50px auto; padding:10px 70px 10px 71px">
+        <div th:if="${succeed == 1}">
+            <div class="alert alert-success" role="alert">
+                <span th:utext="${message + ' a été ajouté'}"></span>
+            </div>
+        </div>
+
+        <div th:if="${succeed == -1}">
+            <div class="alert alert-danger" role="alert">
+                <span th:utext="${message + ' existe déjà'}"></span>
+            </div>
+        </div>
+    </div>
+    <div class="container">
+        <h1 style="margin-bottom:50px; margin-top:50px; border-bottom:1px solid #CCC; padding-bottom:20px;">Formulaire d'ajout d'un groupe de travail</h1>
+        <p>Merci d'entrer le nom du nouveau groupe</p>
+    </div>
+    <div class="login-form">
+        <div class="main-div">
+                <form id="addTeam" th:action="@{/addTeam}" method="POST">
+                    <div class="form-team">
+                        <input type="text" class="form-control" id="teamName" placeholder="Entrer le nom du groupe" name="teamName" required>
+                    </div>
+                    <br/>
+                    <button @click.prevent="registration" type="submit" class="btn btn-primary">Ajouter</button>
+                </form>
+            </div>
+        </div>
+    </div>
 <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>