diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin index fef1b0ec9952c97f229a7f48dd675e92d9007400..e318b8e34ea8588aee38e4e93e2e525153282b77 100644 Binary files a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin and b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin differ diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock index 7a366603627bbe5c7d12599a521a65235e7ff999..69b5e1c6d112329c8febee13878f6253d3ebedbb 100644 Binary files a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock and b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock differ diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin index c9761e7bd6a805a39535702acf22249e062da7e5..7936a7c2b2b59f368084dcde11cbf5c82ca9f80c 100644 Binary files a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin and b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin differ diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock index c93855b0d4423664a89d054a4029e3eecf1482b5..401e27a99dd2e17a9120401f134746b3bd6e8150 100644 Binary files a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock and b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock differ diff --git a/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin index 872d10a5283c52631f3bd7ac95828e121a30e4dd..42f46a717f11d2b36cb8a5820d4e9e000781bf94 100644 Binary files a/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin and b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin differ diff --git a/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ffda5eed1297d254b23d8f3039abde48b1e67b49..49a38ee889f0ba6c4c8b7003b54df2aec4baa7a4 100644 Binary files a/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/bin/default/.gradle/file-system.probe b/bin/default/.gradle/file-system.probe index 9575bc58d52e7594d3a92664a1bd2ddeae68d395..0844cde17e882bf26d052e9dfa5c8293b460fbdb 100644 Binary files a/bin/default/.gradle/file-system.probe and b/bin/default/.gradle/file-system.probe differ diff --git a/bin/default/build/resources/main/views/eleves.ftl b/bin/default/build/resources/main/views/eleves.ftl index 6dbd5ead640e26125341418d6ae99a45a5a6c8a8..b4ee37e9aac1527141f0a733a4812efff54683da 100644 --- a/bin/default/build/resources/main/views/eleves.ftl +++ b/bin/default/build/resources/main/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -20,16 +21,16 @@ <form action="/eleves/ajout" method="post"> <label for="firstName">Prenom</label> - <input name="firstName" type="text"> + <input name="firstName" type="text" required> <label for="lastName">Nom</label> <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> - <input name="nomClasse" type="text"> + <input name="nomClasse" type="text" required> <button type="submit">Creer</button> </form> @@ -46,19 +47,19 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text"> - <button type="submit">Creer</button> + <button type="submit">Modifier</button> </form> <label for="id_selection">Selectionner l'identifiant</label> <select name="id_selection" form="update_form"> <#list eleves as eleve> - <option value="id">${eleve.id}</option + <option value="${eleve.id}">${eleve.id}</option> </#list> </select> diff --git a/bin/default/build/resources/main/views/gommettes.ftl b/bin/default/build/resources/main/views/gommettes.ftl index adf8969da70c93820b5929590019a39b0391ae8d..ad9863490821252d6379501f15fac09fe825bc45 100644 --- a/bin/default/build/resources/main/views/gommettes.ftl +++ b/bin/default/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/bin/default/build/tmp/compileJava/previous-compilation-data.bin b/bin/default/build/tmp/compileJava/previous-compilation-data.bin index ef41e9fabd46fdf4fb18451c2e73aa69e8a8ff6c..67cb0b933018ab1daf383f456b348f29478b70a1 100644 Binary files a/bin/default/build/tmp/compileJava/previous-compilation-data.bin and b/bin/default/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/bin/default/src/com/uca/StartServer.class b/bin/default/src/com/uca/StartServer.class index 716c19ed24ee67dd7fcca0cdd1724ea6eb6c77df..6acfa03f4a40d6d8265ef1a09ff3ebf71d7d32c9 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/EleveCore.class b/bin/default/src/com/uca/core/EleveCore.class index 73b839d472647b624573d8195577f0e3d49cd101..882efcc1f08174c25217400ce40160a886e9e8c3 100644 Binary files a/bin/default/src/com/uca/core/EleveCore.class and b/bin/default/src/com/uca/core/EleveCore.class differ diff --git a/bin/default/src/com/uca/dao/EleveDAO.class b/bin/default/src/com/uca/dao/EleveDAO.class index dcf3369a90882006136c6b3c98bf2866154fd21f..b98a538a01cfcd4c73873c9a1a3d890122915455 100644 Binary files a/bin/default/src/com/uca/dao/EleveDAO.class and b/bin/default/src/com/uca/dao/EleveDAO.class differ diff --git a/bin/default/src/com/uca/dao/_Initializer.class b/bin/default/src/com/uca/dao/_Initializer.class index 1a39a2eeb03d691341f9997b4b5f331bd5e0a833..228eb436b277fd8c73d24876ae61174c99f7a0c0 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/bin/default/src/com/uca/entity/EleveEntity.class b/bin/default/src/com/uca/entity/EleveEntity.class index 2920c2f27c2040a31d504dab68fd7f54b242e43f..34095e93a220a6bc1dc32112191a02f07dfc435f 100644 Binary files a/bin/default/src/com/uca/entity/EleveEntity.class and b/bin/default/src/com/uca/entity/EleveEntity.class differ diff --git a/bin/default/src/main/resources/views/eleves.ftl b/bin/default/src/main/resources/views/eleves.ftl index ab066ce5374d0333fc448ac6cea667a45c510b5b..b4ee37e9aac1527141f0a733a4812efff54683da 100644 --- a/bin/default/src/main/resources/views/eleves.ftl +++ b/bin/default/src/main/resources/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -26,7 +27,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text" required> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text" required> @@ -46,19 +47,19 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text"> - <button type="submit">Creer</button> + <button type="submit">Modifier</button> </form> <label for="id_selection">Selectionner l'identifiant</label> <select name="id_selection" form="update_form"> <#list eleves as eleve> - <option value="id">${eleve.id}</option + <option value="${eleve.id}">${eleve.id}</option> </#list> </select> diff --git a/bin/default/src/main/resources/views/gommettes.ftl b/bin/default/src/main/resources/views/gommettes.ftl index adf8969da70c93820b5929590019a39b0391ae8d..ad9863490821252d6379501f15fac09fe825bc45 100644 --- a/bin/default/src/main/resources/views/gommettes.ftl +++ b/bin/default/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> diff --git a/build/classes/java/main/com/uca/StartServer.class b/build/classes/java/main/com/uca/StartServer.class index b9a288435f46c505f2f1a3a5031b26f849c300a8..9ab652f229c781d434ebae86d80d88ed444e0503 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 258fca1f7748c3a2cfa7e68e4a91cd30db03bfb9..eebb6f03f5bae7303fba4a772ad2699edc507776 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/dao/EleveDAO.class b/build/classes/java/main/com/uca/dao/EleveDAO.class index 75aa4d8fcc45b09ef569c0e406dd857bc55885ca..5b045e9c840e44eda14d4ee53963d03e2b9557d2 100644 Binary files a/build/classes/java/main/com/uca/dao/EleveDAO.class and b/build/classes/java/main/com/uca/dao/EleveDAO.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 34421e65dc7f3e338c8c3d30fb5d3095fed33ceb..8f87537cad96b2fbf81804c1b17fbb78103dce76 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/EleveEntity.class b/build/classes/java/main/com/uca/entity/EleveEntity.class index 6b25116a596729d4f45d16a83009d441aaea2639..52e5c7f94b8312d30b03c73c0d96842f94585750 100644 Binary files a/build/classes/java/main/com/uca/entity/EleveEntity.class and b/build/classes/java/main/com/uca/entity/EleveEntity.class differ diff --git a/build/resources/main/views/eleves.ftl b/build/resources/main/views/eleves.ftl index d4b20536706288516d8797108a994ce6e5d86ba5..b4ee37e9aac1527141f0a733a4812efff54683da 100644 --- a/build/resources/main/views/eleves.ftl +++ b/build/resources/main/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -26,7 +27,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text" required> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text" required> @@ -46,7 +47,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text"> diff --git a/build/resources/main/views/gommettes.ftl b/build/resources/main/views/gommettes.ftl index 3eb26004e3de70d95bf2945974a8485381663efa..ad9863490821252d6379501f15fac09fe825bc45 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.strCouleur} - ${gommette.nom} : ${gommette.description} </li> + <li>${gommette.id} - ${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li> </#list> </ul> diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index ddeef7e307271564160bfa1d047b5e8f0e6fb6b4..62c2ad6b2a74eb60bf0bc8bbcc0235e887de8985 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 dc1f23fc7b078f792366b35a01c30ba705c77858..9b0e30e32baad7cc2e36e8a2f0ffbc0aea2cc0ec 100644 --- a/src/com/uca/StartServer.java +++ b/src/com/uca/StartServer.java @@ -4,10 +4,10 @@ import com.uca.dao._Initializer; import com.uca.gui.*; import com.uca.core.*; import com.uca.entity.*; -import java.sql.*; +import java.sql.Date; import java.util.*; import static spark.Spark.*; - +import java.text.*; public class StartServer { //.\gradlew run @@ -118,11 +118,20 @@ public class StartServer { String firstName = req.queryParams("firstName"); String lastName = req.queryParams("lastName"); String dateNaissance = req.queryParams("dateNaissance"); + + + + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + java.util.Date d = format.parse(dateNaissance); + + java.sql.Date date = new java.sql.Date(d.getTime()); + + String nomClasse = req.queryParams("nomClasse"); - System.out.println(firstName + " " + lastName + " " + dateNaissance + " " + nomClasse); + System.out.println(firstName + " " + lastName + " " + date.toString() + " " + nomClasse); - Core.Eleve.create(firstName,lastName,dateNaissance,nomClasse); + Core.Eleve.create(firstName,lastName,date,nomClasse); res.redirect("/eleves"); return null; @@ -140,14 +149,24 @@ public class StartServer { String firstName = req.queryParams("firstName"); String lastName = req.queryParams("lastName"); String dateNaissance = req.queryParams("dateNaissance"); + + String[] tokens = dateNaissance.split("-"); + + DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + java.util.Date d = format.parse(dateNaissance); + + java.sql.Date date = new java.sql.Date(d.getTime()); + + String nomClasse = req.queryParams("nomClasse"); String id = req.queryParams("id_selection"); - Core.Eleve.update(Integer.parseInt(id),firstName,lastName,dateNaissance,nomClasse); + Core.Eleve.update(Integer.parseInt(id),firstName,lastName,date,nomClasse); res.redirect("/eleves"); return null; }); + get("/gommettes", (req,res) ->{ if (authentified) { return GommetteGUI.getAllGommettes(); @@ -194,5 +213,8 @@ public class StartServer { res.redirect("/gommettes"); return null; }); + + + } } \ No newline at end of file diff --git a/src/com/uca/core/EleveCore.java b/src/com/uca/core/EleveCore.java index a2761a1faee344090f1ad56020e51995060c5f93..c3f2cdec33d0c3bb421d69685f9ef0e77ebd8e26 100644 --- a/src/com/uca/core/EleveCore.java +++ b/src/com/uca/core/EleveCore.java @@ -4,6 +4,7 @@ import com.uca.core.*; import com.uca.dao.*; import com.uca.entity.*; import java.util.*; +import java.sql.Date; public class EleveCore extends _DefaultCore<EleveEntity> { @@ -13,7 +14,7 @@ public class EleveCore extends _DefaultCore<EleveEntity> { super(new EleveDAO()); } - public EleveEntity create(String firstName, String lastName, String dateNaissance, String nomDeClasse) { + public EleveEntity create(String firstName, String lastName, java.sql.Date dateNaissance, String nomDeClasse) { EleveEntity entity = new EleveEntity(); entity.setFirstName(firstName); entity.setLastName (lastName); @@ -22,7 +23,7 @@ public class EleveCore extends _DefaultCore<EleveEntity> { return dao.create(entity); } - public void update(int id,String firstName, String lastName, String dateNaissance, String nomDeClasse) + public void update(int id,String firstName, String lastName, java.sql.Date dateNaissance, String nomDeClasse) { EleveEntity entity = new EleveEntity(); @@ -45,7 +46,7 @@ public class EleveCore extends _DefaultCore<EleveEntity> { entity.setLastName(previous.getLastName()); } - if (dateNaissance.length() > 0) + if (dateNaissance != null) { entity.setDateNaissance(dateNaissance); diff --git a/src/com/uca/dao/EleveDAO.java b/src/com/uca/dao/EleveDAO.java index 8a5d3fa3e1cc59522502609e0271536d89a7cefd..bb9fc6e339e6aa062f5d4bcb40dda5ad97254e5c 100644 --- a/src/com/uca/dao/EleveDAO.java +++ b/src/com/uca/dao/EleveDAO.java @@ -18,7 +18,8 @@ public class EleveDAO extends _DefaultDAO<EleveEntity> { stmt.setString(idx++, obj.getFirstName()); stmt.setString(idx++, obj.getLastName()); stmt.setString(idx++, obj.getNomClasse()); - stmt.setString(idx++, obj.getDateNaissance()); + System.out.println(""+obj.getDateNaissance()); + stmt.setDate(idx++, obj.getDateNaissance()); stmt.setInt (idx++, obj.getId()); stmt.executeUpdate(); } @@ -30,7 +31,7 @@ public class EleveDAO extends _DefaultDAO<EleveEntity> { entity.setId(resultSet.getInt("id")); entity.setFirstName(resultSet.getString("firstname")); entity.setLastName (resultSet.getString("lastname")); - entity.setDateNaissance(resultSet.getString("dateNaissance")); + entity.setDateNaissance(resultSet.getDate("dateNaissance")); entity.setNomClasse(resultSet.getString("nomClasse")); return entity; diff --git a/src/com/uca/dao/_Initializer.java b/src/com/uca/dao/_Initializer.java index 59e248ce8743b1f2317b0cf144d5f2a6bee1a646..cb967083ff50f72353fb1d9a2d77f9085a57f001 100644 --- a/src/com/uca/dao/_Initializer.java +++ b/src/com/uca/dao/_Initializer.java @@ -37,7 +37,7 @@ public class _Initializer { DropTable("gommettes"); 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 eleves (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), nomClasse varchar(100), dateNaissance DATE);"); 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));"); @@ -56,7 +56,7 @@ public class _Initializer { Core.Prof.create("Boris", "OUYA", "DaWarudo","KonoDioDa!"); Core.Prof.create("Thomas", "TAMAGNAUD", "CéMoiLul","BlockusMaster"); - Core.Eleve.create("Bibi","Johnson","23/10/2018","Zarbi"); + //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/EleveEntity.java b/src/com/uca/entity/EleveEntity.java index 26529d916ee7fef81b71d14e164db8fcfba25e53..12cb1d0c8a2963c8aebc253d8bbd7f3430bf2e81 100644 --- a/src/com/uca/entity/EleveEntity.java +++ b/src/com/uca/entity/EleveEntity.java @@ -1,12 +1,14 @@ package com.uca.entity; import java.sql.Timestamp; import com.uca.entity.*; +import java.sql.Date; public class EleveEntity extends UserEntity { - private String dateNaissance; - public String getDateNaissance() { return dateNaissance; } - public void setDateNaissance(String value) { dateNaissance = value; } + private java.sql.Date dateNaissance; + + public java.sql.Date getDateNaissance() { return dateNaissance; } + public void setDateNaissance(java.sql.Date value) { dateNaissance = value; } private String nomClasse; public String getNomClasse() { return nomClasse; } diff --git a/src/main/resources/views/eleves.ftl b/src/main/resources/views/eleves.ftl index d4b20536706288516d8797108a994ce6e5d86ba5..b4ee37e9aac1527141f0a733a4812efff54683da 100644 --- a/src/main/resources/views/eleves.ftl +++ b/src/main/resources/views/eleves.ftl @@ -5,7 +5,8 @@ <ul> <h1> Liste des élèves: </h1> <#list eleves as eleve> - <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li> + <#assign naiss = eleve.dateNaissance?date> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${naiss}) </li> <form action="eleves/delete" method="post"> <input type="hidden" name="id" value="${eleve.id}"> <button type="submit" name="id">Supprimer</button> @@ -26,7 +27,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text" required> + <input name="dateNaissance" type="date" required> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text" required> @@ -46,7 +47,7 @@ <input name="lastName" type="text"> <label for="dateNaissance">Date de Naissance</label> - <input name="dateNaissance" type="text"> + <input name="dateNaissance" type="date"> <label for="nomClasse">Nom de classe</label> <input name="nomClasse" type="text">