diff --git a/PFE06/src/main/java/com/PFE/ServerManager/Customer.java b/PFE06/src/main/java/com/PFE/ServerManager/Customer.java index a04b014..c920161 100644 --- a/PFE06/src/main/java/com/PFE/ServerManager/Customer.java +++ b/PFE06/src/main/java/com/PFE/ServerManager/Customer.java @@ -29,9 +29,20 @@ public class Customer{ @JoinTable(name = "customer_role", joinColumns = @JoinColumn(name = "customer_id"), inverseJoinColumns = @JoinColumn(name = "role_id")) private Set roles; + @ManyToMany(cascade = CascadeType.ALL) + @JoinTable(name = "customer_maj", joinColumns = @JoinColumn(name = "customer_id"), inverseJoinColumns = @JoinColumn(name = "maj_id")) + private Set maj; + public void setRoles(Set roles) { this.roles = roles; } public Set getRoles() { return roles; } + public void setMaj(Set maj) { + this.maj = maj; + } + public Set getMaj() { + return maj; + } + public String getRole(){ return roles.iterator().next().getRole(); } diff --git a/PFE06/src/main/java/com/PFE/ServerManager/MainController.java b/PFE06/src/main/java/com/PFE/ServerManager/MainController.java index 59981db..39a0f71 100644 --- a/PFE06/src/main/java/com/PFE/ServerManager/MainController.java +++ b/PFE06/src/main/java/com/PFE/ServerManager/MainController.java @@ -28,6 +28,9 @@ public class MainController { RoleRepository roleRepository; @Autowired + MajRepository majRepository; + + @Autowired BCryptPasswordEncoder bCryptPasswordEncoder; @GetMapping(value="/") @@ -193,9 +196,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(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 diff --git a/PFE06/src/main/java/com/PFE/ServerManager/Maj.java b/PFE06/src/main/java/com/PFE/ServerManager/Maj.java index c3b4b51..a77242f 100644 --- a/PFE06/src/main/java/com/PFE/ServerManager/Maj.java +++ b/PFE06/src/main/java/com/PFE/ServerManager/Maj.java @@ -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; + } } diff --git a/PFE06/src/main/java/com/PFE/ServerManager/MajRepository.java b/PFE06/src/main/java/com/PFE/ServerManager/MajRepository.java new file mode 100644 index 0000000..2c13586 --- /dev/null +++ b/PFE06/src/main/java/com/PFE/ServerManager/MajRepository.java @@ -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 { + + //Customer findByEmail(String email); + +} diff --git a/PFE06/src/main/resources/templates/home.html b/PFE06/src/main/resources/templates/home.html index 24c607d..e66a578 100644 --- a/PFE06/src/main/resources/templates/home.html +++ b/PFE06/src/main/resources/templates/home.html @@ -34,6 +34,7 @@ Enregistrer des utilisateurs Listes des utilisateurs Paramétrer une mise à jour + test maj
Paramétrer une mise à jour diff --git a/PFE06/src/main/resources/templates/registration.html b/PFE06/src/main/resources/templates/registration.html index 6b2a95f..0e6bd7c 100644 --- a/PFE06/src/main/resources/templates/registration.html +++ b/PFE06/src/main/resources/templates/registration.html @@ -58,7 +58,7 @@
- +
diff --git a/PFE06/src/main/resources/templates/test.html b/PFE06/src/main/resources/templates/test.html index 2c839d2..5f989bf 100644 --- a/PFE06/src/main/resources/templates/test.html +++ b/PFE06/src/main/resources/templates/test.html @@ -1,12 +1,25 @@ + - - - Data from js test - - -
- -
- + + + Data from js test + + + +
+ +
+
+ +
+
+ +
+
+ +
+ + + \ No newline at end of file -- libgit2 0.21.2