Commit 7c02143e4e5bde5725ad3b3b9739dfc2b70c1dea

Authored by Geoffrey PREUD'HOMME
1 parent 4ceffe1e

Correction /consommation tris

src/main/java/etunicorn/Application.java
@@ -51,6 +51,11 @@ public class Application { @@ -51,6 +51,11 @@ public class Application {
51 permissionRepository.save(new Permission("CONSO_GET")); 51 permissionRepository.save(new Permission("CONSO_GET"));
52 permissionRepository.save(new Permission("CONSO_LIST")); 52 permissionRepository.save(new Permission("CONSO_LIST"));
53 permissionRepository.save(new Permission("CONSO_REMOVE")); 53 permissionRepository.save(new Permission("CONSO_REMOVE"));
  54 + permissionRepository.save(new Permission("EVNMT_ADD"));
  55 + permissionRepository.save(new Permission("EVNMT_EDIT"));
  56 + permissionRepository.save(new Permission("EVNMT_GET"));
  57 + permissionRepository.save(new Permission("EVNMT_LIST"));
  58 + permissionRepository.save(new Permission("EVNMT_REMOVE"));
54 // ... 59 // ...
55 60
56 //roleRepository.save(new Role("admin", (List<Permission>) permissionRepository.findAll())); 61 //roleRepository.save(new Role("admin", (List<Permission>) permissionRepository.findAll()));
src/main/java/etunicorn/controller/PersonneController.java
@@ -44,7 +44,7 @@ public class PersonneController extends BaseController implements etunicorn.gene @@ -44,7 +44,7 @@ public class PersonneController extends BaseController implements etunicorn.gene
44 44
45 private ResponseEntity<?> mergePersonne(Personne personne, UpdatePersonneRequest updatePersonneRequest) { 45 private ResponseEntity<?> mergePersonne(Personne personne, UpdatePersonneRequest updatePersonneRequest) {
46 if (updatePersonneRequest.getNaissance() != null) { 46 if (updatePersonneRequest.getNaissance() != null) {
47 - SimpleDateFormat format = new SimpleDateFormat("y-M-d"); 47 + SimpleDateFormat format = new SimpleDateFormat("Y-M-d");
48 try { 48 try {
49 personne.setNaissance(format.parse(updatePersonneRequest.getNaissance())); 49 personne.setNaissance(format.parse(updatePersonneRequest.getNaissance()));
50 } catch (ParseException e) { 50 } catch (ParseException e) {
src/main/java/etunicorn/entity/Evenement.java
@@ -28,8 +28,8 @@ public class Evenement { @@ -28,8 +28,8 @@ public class Evenement {
28 @ManyToMany(mappedBy = "participations") 28 @ManyToMany(mappedBy = "participations")
29 private List<Personne> participants; 29 private List<Personne> participants;
30 30
31 - public Evenement(String nom) {  
32 - this.nom = nom; 31 + public Evenement() {
  32 +
33 } 33 }
34 34
35 public int getId() { 35 public int getId() {