diff --git a/bin/default/src/com/uca/StartServer.class b/bin/default/src/com/uca/StartServer.class
index 21d599d5804c9dc8b3b0bd657f787f52bc143448..716c19ed24ee67dd7fcca0cdd1724ea6eb6c77df 100644
Binary files a/bin/default/src/com/uca/StartServer.class and b/bin/default/src/com/uca/StartServer.class differ
diff --git a/bin/default/src/com/uca/core/GommetteCore.class b/bin/default/src/com/uca/core/GommetteCore.class
index cbdcfdac0ed87af26ef581abe0fdf55a019246d4..c82974e471f0ab02daf5991affb29f0f71a18523 100644
Binary files a/bin/default/src/com/uca/core/GommetteCore.class and b/bin/default/src/com/uca/core/GommetteCore.class differ
diff --git a/bin/default/src/com/uca/dao/GommetteDAO.class b/bin/default/src/com/uca/dao/GommetteDAO.class
index 31ab96b2134257c59dd96742c89b6ab3413ef024..311fc87ba9fccffb5ba0645a83634f5c591e44ef 100644
Binary files a/bin/default/src/com/uca/dao/GommetteDAO.class and b/bin/default/src/com/uca/dao/GommetteDAO.class differ
diff --git a/bin/default/src/com/uca/dao/_Initializer.class b/bin/default/src/com/uca/dao/_Initializer.class
index 676fe4e035dc36552b64ca1223c932ea38f07c52..1a39a2eeb03d691341f9997b4b5f331bd5e0a833 100644
Binary files a/bin/default/src/com/uca/dao/_Initializer.class and b/bin/default/src/com/uca/dao/_Initializer.class differ
diff --git a/build/classes/java/main/com/uca/StartServer.class b/build/classes/java/main/com/uca/StartServer.class
index 8878afbb40590f136d850ab2c8a9a48c7b332c68..b9a288435f46c505f2f1a3a5031b26f849c300a8 100644
Binary files a/build/classes/java/main/com/uca/StartServer.class and b/build/classes/java/main/com/uca/StartServer.class differ
diff --git a/build/classes/java/main/com/uca/core/EleveCore.class b/build/classes/java/main/com/uca/core/EleveCore.class
index 7b4cd18578057b5aa8a890c8a5986c4cd2509c67..258fca1f7748c3a2cfa7e68e4a91cd30db03bfb9 100644
Binary files a/build/classes/java/main/com/uca/core/EleveCore.class and b/build/classes/java/main/com/uca/core/EleveCore.class differ
diff --git a/build/classes/java/main/com/uca/core/GommetteCore.class b/build/classes/java/main/com/uca/core/GommetteCore.class
index 1a15aa11dc156a8e7304f53314aff391d9f3f036..14d82a51932195af8be0bb6c5f99e19d76b09b3c 100644
Binary files a/build/classes/java/main/com/uca/core/GommetteCore.class and b/build/classes/java/main/com/uca/core/GommetteCore.class differ
diff --git a/build/classes/java/main/com/uca/dao/GommetteDAO.class b/build/classes/java/main/com/uca/dao/GommetteDAO.class
index 609b5df8ae4b1ca6d4d4f1f9ad4161f4f5437fde..40f95733066dfd1c814d7d489be55702c85d3573 100644
Binary files a/build/classes/java/main/com/uca/dao/GommetteDAO.class and b/build/classes/java/main/com/uca/dao/GommetteDAO.class differ
diff --git a/build/classes/java/main/com/uca/dao/_Initializer.class b/build/classes/java/main/com/uca/dao/_Initializer.class
index e6c47231ee0add74f5e1a47f5fe29cbbd7ee5c0c..34421e65dc7f3e338c8c3d30fb5d3095fed33ceb 100644
Binary files a/build/classes/java/main/com/uca/dao/_Initializer.class and b/build/classes/java/main/com/uca/dao/_Initializer.class differ
diff --git a/build/classes/java/main/com/uca/entity/Couleur.class b/build/classes/java/main/com/uca/entity/Couleur.class
index a1018f3a40fa07dcd47e0defd077bfc86207aa8a..838af1444e4d0106e2e798b9ee12f5fa749b4939 100644
Binary files a/build/classes/java/main/com/uca/entity/Couleur.class and b/build/classes/java/main/com/uca/entity/Couleur.class differ
diff --git a/build/resources/main/views/gommettes.ftl b/build/resources/main/views/gommettes.ftl
index adf8969da70c93820b5929590019a39b0391ae8d..3eb26004e3de70d95bf2945974a8485381663efa 100644
--- a/build/resources/main/views/gommettes.ftl
+++ b/build/resources/main/views/gommettes.ftl
@@ -4,7 +4,7 @@
<ul>
<#list gommettes as gommette>
- <li>${gommette.id} - ${gommette.nom} : ${gommette.description} </li>
+ <li>${gommette.id} -${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li>
</#list>
</ul>
@@ -41,6 +41,45 @@
</form>
+
+<h1>Modifier une gommette</h1>
+
+<form action="/gommettes/update" method="post" id="update_form">
+
+ <label for="nom">Nom</label>
+ <input type="text" name="nom">
+
+
+ <input type="radio" id="choixArcEnCiel" name="couleur" value="arcEnCiel">
+ <label for="choixArcEnCiel">Arc en ciel</label>
+
+ <input type="radio" id="choixRouge" name="couleur" value="rouge">
+ <label for="choixRouge">Rouge</label>
+
+ <input type="radio" id="choixVert" name="couleur" value="vert">
+ <label for="choixVert">Vert</label>
+
+ <input type="radio" id="choixBleu" name="couleur" value="blue">
+ <label for="choixBleu">Bleu</label>
+
+ <input type="radio" id="choixBlanc" name="couleur" value="blanc">
+ <label for="choixBlanc">Blanc</label>
+
+ <br>
+ <label for="description">Description</label>
+ <input type="text" name="description">
+
+ <br>
+ <button type="submit">Modifier</button>
+</form>
+
+<label for="id_selection">Selectionner l'identifiant</label>
+<select name="id_selection" form="update_form">
+ <#list gommettes as gommette>
+ <option value="${gommette.id}">${gommette.id}</option>
+ </#list>
+</select>
+
</body>
</html>
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index f2501bad7540451399cf5ae00781c1c415aca5a1..ddeef7e307271564160bfa1d047b5e8f0e6fb6b4 100644
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/src/com/uca/StartServer.java b/src/com/uca/StartServer.java
index f72f495b7119fa627a1541a62a2a3e435adce3f1..dc1f23fc7b078f792366b35a01c30ba705c77858 100644
--- a/src/com/uca/StartServer.java
+++ b/src/com/uca/StartServer.java
@@ -160,7 +160,6 @@ public class StartServer {
post("/gommettes/ajout", (req,res) ->{
String couleur = req.queryParams("couleur");
- System.out.println(couleur);
if (couleur != null)
{
@@ -170,7 +169,6 @@ public class StartServer {
{
String description = req.queryParams("description");
String nom = req.queryParams("nom");
- System.out.println(description);
Core.Gommette.create(nom,c, description);
}
@@ -178,5 +176,23 @@ public class StartServer {
res.redirect("/gommettes");
return null;
});
+
+ post("/gommettes/update", (req,res)->{
+
+
+ String couleur = req.queryParams("couleur");
+
+ Couleur c = Couleur.retrieve(couleur);
+
+ String description = req.queryParams("description");
+ String nom = req.queryParams("nom");
+ String id = req.queryParams("id_selection");
+
+
+ Core.Gommette.update(Integer.parseInt(id),nom,c, description);
+
+ res.redirect("/gommettes");
+ return null;
+ });
}
}
\ No newline at end of file
diff --git a/src/com/uca/core/GommetteCore.java b/src/com/uca/core/GommetteCore.java
index bc4fabc7395b7e67234e69948e8491089146b90e..b6ec50ea4018f1b38314ef4dbe3ebeae2f83cde6 100644
--- a/src/com/uca/core/GommetteCore.java
+++ b/src/com/uca/core/GommetteCore.java
@@ -20,4 +20,50 @@ public class GommetteCore extends _DefaultCore<GommetteEntity> {
entity.setDescription(description);
return dao.create(entity);
}
+
+ public void update(int id, String nom, Couleur couleur, String description) {
+
+ GommetteEntity entity = new GommetteEntity();
+ GommetteEntity previous = dao.getById(id);
+
+ System.out.println(previous.getNom());
+
+ if (nom.length() > 0)
+ {
+ entity.setNom(nom);
+ }
+ else
+ {
+ entity.setNom(previous.getNom());
+ }
+
+
+ if (couleur != null)
+ {
+ entity.setCouleur(couleur);
+ }
+ else
+ {
+ Couleur prev_couleur = previous.getCouleur();
+ System.out.println(prev_couleur);
+ entity.setCouleur(previous.getCouleur());
+
+ }
+
+
+ if (description.length() > 0)
+ {
+ entity.setDescription(description);
+ }
+ else
+ {
+ entity.setDescription(previous.getDescription());
+ }
+
+
+
+ entity.setId(id);
+ dao.push(entity);
+
+ }
}
diff --git a/src/com/uca/dao/GommetteDAO.java b/src/com/uca/dao/GommetteDAO.java
index 52b9d27e2ecb059e206209e501d1ef5fe5de1810..3f2099b576b9f7e1803016fb5717ef32755a17d0 100644
--- a/src/com/uca/dao/GommetteDAO.java
+++ b/src/com/uca/dao/GommetteDAO.java
@@ -13,10 +13,11 @@ public class GommetteDAO extends _DefaultDAO<GommetteEntity> {
@Override
public void pushUnsafe(GommetteEntity obj) throws Exception
{
- PreparedStatement stmt = this.connect.prepareStatement("update " + getDefaultTableName() + " set nom=?, description=? where id=?;");
+ PreparedStatement stmt = this.connect.prepareStatement("update " + getDefaultTableName() + " set nom=?, description=?, couleur = ? where id=?;");
int idx = 1;
stmt.setString(idx++, obj.getNom());
stmt.setString(idx++, obj.getDescription());
+ stmt.setString(idx++, obj.getCouleur().getString());
stmt.setInt (idx++, obj.getId());
stmt.executeUpdate() ;
}
@@ -26,7 +27,7 @@ public class GommetteDAO extends _DefaultDAO<GommetteEntity> {
{
GommetteEntity entity = new GommetteEntity();
entity.setId(resultSet.getInt("id"));
- // entity.setCouleur TODO
+ entity.setCouleur(Couleur.retrieve(resultSet.getString("couleur")));
entity.setNom(resultSet.getString("nom"));
entity.setDescription(resultSet.getString("description"));
return entity;
diff --git a/src/com/uca/dao/_Initializer.java b/src/com/uca/dao/_Initializer.java
index f6470041eff12d1ad6c1efc7ed899151bc989c9e..59e248ce8743b1f2317b0cf144d5f2a6bee1a646 100644
--- a/src/com/uca/dao/_Initializer.java
+++ b/src/com/uca/dao/_Initializer.java
@@ -38,7 +38,7 @@ public class _Initializer {
CreateTable("CREATE TABLE IF NOT EXISTS users (id int primary key auto_increment, firstname varchar(100), lastname varchar(100));");
CreateTable("CREATE TABLE IF NOT EXISTS profs (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), username varchar(100), password varchar(100));");
CreateTable("CREATE TABLE IF NOT EXISTS eleves (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), nomClasse varchar(100), dateNaissance varchar(100));");
- CreateTable("CREATE TABLE IF NOT EXISTS gommettes (id int primary key auto_increment, nom varchar(100), description varchar(100));");
+ CreateTable("CREATE TABLE IF NOT EXISTS gommettes (id int primary key auto_increment, nom varchar(100), description varchar(100), couleur varchar(100));");
CreateTable("CREATE TABLE IF NOT EXISTS gommetteAttribs (id int primary key auto_increment, idEleve int, idProf int, raison varchar(500));");
@@ -54,8 +54,10 @@ public class _Initializer {
Core.User.create("Judas", "Nanas");
Core.Prof.create("Boris", "OUYA", "DaWarudo","KonoDioDa!");
- Core.Prof.create("Thomas", "TAMAGNAUD", "CéMoiLul","FaisMoiMal");
+ Core.Prof.create("Thomas", "TAMAGNAUD", "CéMoiLul","BlockusMaster");
Core.Eleve.create("Bibi","Johnson","23/10/2018","Zarbi");
+
+ Core.Gommette.create("Brave Petit",Couleur.Vert,"S'est montré obéissant devant le prêtre");
}
}
diff --git a/src/com/uca/entity/Couleur.java b/src/com/uca/entity/Couleur.java
index 96daa9f62ddbedd90b4ae671df39ca00f7005c78..53fe3c96b3e8d6f19e4af7213dc38b70886dd933 100644
--- a/src/com/uca/entity/Couleur.java
+++ b/src/com/uca/entity/Couleur.java
@@ -19,27 +19,32 @@ public enum Couleur
public static Couleur retrieve(String value)
{
- if (value.compareTo("rouge") == 0)
+ if (value != null)
{
- return Rouge;
- }
- else if (value.compareTo("blanc") == 0)
- { return Blanc; }
- else if (value == "bleu")
- {
- return Bleu;
- }
- else if (value.compareTo("vert") == 0)
- {
- return Vert;
- }
- else if (value.compareTo("arcEnCiel") == 0)
- {
- return ArcEnCiel;
- }
- else {
- return null;
+ if (value.compareTo("rouge") == 0)
+ {
+ return Rouge;
+ }
+ else if (value.compareTo("blanc") == 0)
+ { return Blanc; }
+ else if (value == "bleu")
+ {
+ return Bleu;
+ }
+ else if (value.compareTo("vert") == 0)
+ {
+ return Vert;
+ }
+ else if (value.compareTo("arcEnCiel") == 0)
+ {
+ return ArcEnCiel;
+ }
+ else {
+ return null;
+ }
}
+ return null;
+
}
}
diff --git a/src/com/uca/entity/GommetteEntity.java b/src/com/uca/entity/GommetteEntity.java
index 82f00535945f5571768256c8f5da0630aa7c2220..f8b522bf7fa0b7bee67fda1ecf21d4c0a155b604 100644
--- a/src/com/uca/entity/GommetteEntity.java
+++ b/src/com/uca/entity/GommetteEntity.java
@@ -11,7 +11,7 @@ public class GommetteEntity extends Entity
private String strCouleur;
public Couleur getCouleur() { return couleur; }
- public void setCouleur(Couleur value) {
+ public void setCouleur(Couleur value) {
couleur = value;
strCouleur = value.getString();
}
diff --git a/src/main/resources/views/gommettes.ftl b/src/main/resources/views/gommettes.ftl
index adf8969da70c93820b5929590019a39b0391ae8d..ad9863490821252d6379501f15fac09fe825bc45 100644
--- a/src/main/resources/views/gommettes.ftl
+++ b/src/main/resources/views/gommettes.ftl
@@ -4,7 +4,7 @@
<ul>
<#list gommettes as gommette>
- <li>${gommette.id} - ${gommette.nom} : ${gommette.description} </li>
+ <li>${gommette.id} - ${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li>
</#list>
</ul>
@@ -41,6 +41,45 @@
</form>
+
+<h1>Modifier une gommette</h1>
+
+<form action="/gommettes/update" method="post" id="update_form">
+
+ <label for="nom">Nom</label>
+ <input type="text" name="nom">
+
+
+ <input type="radio" id="choixArcEnCiel" name="couleur" value="arcEnCiel">
+ <label for="choixArcEnCiel">Arc en ciel</label>
+
+ <input type="radio" id="choixRouge" name="couleur" value="rouge">
+ <label for="choixRouge">Rouge</label>
+
+ <input type="radio" id="choixVert" name="couleur" value="vert">
+ <label for="choixVert">Vert</label>
+
+ <input type="radio" id="choixBleu" name="couleur" value="blue">
+ <label for="choixBleu">Bleu</label>
+
+ <input type="radio" id="choixBlanc" name="couleur" value="blanc">
+ <label for="choixBlanc">Blanc</label>
+
+ <br>
+ <label for="description">Description</label>
+ <input type="text" name="description">
+
+ <br>
+ <button type="submit">Modifier</button>
+</form>
+
+<label for="id_selection">Selectionner l'identifiant</label>
+<select name="id_selection" form="update_form">
+ <#list gommettes as gommette>
+ <option value="${gommette.id}">${gommette.id}</option>
+ </#list>
+</select>
+
</body>
</html>