Merge remote-tracking branch 'origin/master'

Unknown
2 parents 3e6ff772 d1d16f06
Showing 7 changed files with 81 additions and 15 deletions Show diff stats
PFE06/src/main/java/com/PFE/ServerManager/Customer.java
PFE06/src/main/java/com/PFE/ServerManager/MainController.java
PFE06/src/main/java/com/PFE/ServerManager/Maj.java
PFE06/src/main/java/com/PFE/ServerManager/MajRepository.java
PFE06/src/main/resources/templates/home.html
PFE06/src/main/resources/templates/registration.html
PFE06/src/main/resources/templates/test.html
@@ -29,9 +29,20 @@ public class Customer{
     @JoinTable(name = "customer_role", joinColumns = @JoinColumn(name = "customer_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
     private Set<Role> roles;
+    @ManyToMany(cascade = CascadeType.ALL)
+    @JoinTable(name = "customer_maj", joinColumns = @JoinColumn(name = "customer_id"), inverseJoinColumns = @JoinColumn(name = "maj_id"))
+    private Set<Maj> maj;
+
     public void setRoles(Set<Role> roles) { this.roles = roles; }
     public Set<Role> getRoles() { return roles; }
+    public void setMaj(Set<Maj> maj) {
+        this.maj = maj;
+    }
+    public Set<Maj> getMaj() {
+        return maj;
+    }
+
     public String getRole(){
         return roles.iterator().next().getRole();
     }
@@ -28,6 +28,9 @@ public class MainController {
     RoleRepository roleRepository;
     @Autowired
+    MajRepository majRepository;
+
+    @Autowired
     BCryptPasswordEncoder bCryptPasswordEncoder;
     @GetMapping(value="/")
@@ -190,9 +193,20 @@ public class MainController {
     }
     @PostMapping(path="/test")
-    public String test() {
-        //ModelAndView modelAndView = new ModelAndView();
-        //modelAndView.setViewName("test");
-        return "test";
+    public ModelAndView addNewUser(@RequestParam String maj, @RequestParam String date, @RequestParam String set1, @RequestParam String set2){
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("test");
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        Customer customer = customerRepository.findByEmail(auth.getName());
+        Maj maj_c = new Maj();
+        maj_c.setMaj(maj);
+        maj_c.setDate(date);
+        String nodes=set1+';'+set2;
+        maj_c.setNodes(nodes);
+        maj_c.setMaj_id((int)(majRepository.count() + 1));
+        majRepository.save(maj_c); // ajouter la mise a jour dans la table
+        customer.setMaj(new HashSet<Maj>(Arrays.asList(maj_c)));
+        customerRepository.save(customer); // permet de rendre effective la jointure entre customer et maj
+        return modelAndView;
     }
 }
 \ No newline at end of file
@@ -16,11 +16,16 @@ public class Maj {
     @Column(name = "date")
     private String date;
+    /*
     @Column(name = "nodes")
     private String nodes;
     @Column(name = "file")
     private String file;
+    */
+
+    @Column(name = "nodes")
+    private String nodes;
     public void setMaj_id(Integer maj_id) { this.maj_id = maj_id; }
     public Integer getMaj_id() { return maj_id; }
@@ -30,6 +35,17 @@ public class Maj {
     }
     public String getMaj() { return maj; }
+    public void setDate(String date) {
+        this.date = date;
+    }
+    public String getDate() {
+        return date;
+    }
-
+    public void setNodes(String nodes) {
+        this.nodes = nodes;
+    }
+    public String getNodes() {
+        return nodes;
+    }
 }
@@ -0,0 +1,11 @@
+package com.PFE.ServerManager;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MajRepository extends JpaRepository<Maj, Integer> {
+
+    //Customer findByEmail(String email);
+
+}
@@ -34,6 +34,7 @@
                                     <a class="dropdown-item" th:href="@{/registration}">Enregistrer des utilisateurs</a>
                                     <a class="dropdown-item" th:href="@{/all}">Listes des utilisateurs</a>
                                     <a class="dropdown-item" th:href="@{/session}">Paramétrer une mise à jour</a>
+                                    <a class="dropdown-item" th:href="@{/test}">test maj</a>
                                 </div>
                                 <div th:case="'USER'">
                                     <a class="dropdown-item" th:href="@{/session}">Paramétrer une mise à jour</a>
@@ -58,7 +58,7 @@
             <form id="Login" th:action="@{/registration}" method="POST">
                 <div class="form-group">
-                    <input type="text" v-model="user.login" class="form-control" id="username" placeholder="Entrer le pseudo" name="pseudo">
+                    <input type="text" v-model="user.login" class="form-control" id="username" placeholder="Entrer le pseudo" name="email">
                 </div>
                 <div class="form-group">
                     <input type="password" v-model="user.password" class="form-control" id="password" placeholder="Entrer le mot de passe" name="password">
 <!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Data from js test</title>
-</head>
-<body>
-    <div>
-
-    </div>
-</body>
+    <head>
+        <meta charset="UTF-8">
+        <title>Data from js test</title>
+    </head>
+    <body>
+        <form id="Login" th:action="@{/test}" method="POST">
+            <div class="form-group">
+                <input type="text" class="form-control" id="maj" placeholder="Entrer le nom de la maj" name="maj">
+            </div>
+            <div class="form-group">
+                <input type="text" class="form-control" id="date" placeholder="Entrer la date" name="date">
+            </div>
+            <div class="form-group">
+                <input type="text" class="form-control" id="set1" placeholder="set1" name="set1">
+            </div>
+            <div class="form-group">
+                <input type="text" class="form-control" id="set2" placeholder="set2" name="set2">
+            </div>
+            <button @click.prevent="registration" type="submit" class="btn btn-primary">Ajouter</button>
+        </form>
+    </body>
 </html>
 \ No newline at end of file