diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin
index 1c2a061fe0cf27160708d97fc09284c3800b9585..fef1b0ec9952c97f229a7f48dd675e92d9007400 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 cd066d510f4420b0cea714d42ef912b62f1de66a..7a366603627bbe5c7d12599a521a65235e7ff999 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 c28706fd4cd98d04942534fcfde49136eb4561ad..c9761e7bd6a805a39535702acf22249e062da7e5 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 05d3f93b3b32433a08151032def88c45e5f307bc..c93855b0d4423664a89d054a4029e3eecf1482b5 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 b3db32a1a9287415e0dab5d5f39a38d330e02fd7..872d10a5283c52631f3bd7ac95828e121a30e4dd 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 0f5131080b0b4c673b6a11b44fee59f86ff839a7..ffda5eed1297d254b23d8f3039abde48b1e67b49 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 9660c49a31f7c14a8abbe20880fbf8cf922772b8..9575bc58d52e7594d3a92664a1bd2ddeae68d395 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 99dea52bda1ed022398d0251ba37990da834b098..6dbd5ead640e26125341418d6ae99a45a5a6c8a8 100644
--- a/bin/default/build/resources/main/views/eleves.ftl
+++ b/bin/default/build/resources/main/views/eleves.ftl
@@ -6,11 +6,12 @@
<h1> Liste des élèves: </h1>
<#list eleves as eleve>
<li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
- <form action="eleves/delete" method="post"">
+ <form action="eleves/delete" method="post">
<input type="hidden" name="id" value="${eleve.id}">
<button type="submit" name="id">Supprimer</button>
</form>
</#list>
+
</ul>
@@ -34,6 +35,35 @@
</form>
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
+ <label for="firstName">Prenom</label>
+ <input name="firstName" type="text">
+
+ <label for="lastName">Nom</label>
+ <input name="lastName" type="text">
+
+ <label for="dateNaissance">Date de Naissance</label>
+ <input name="dateNaissance" type="text">
+
+ <label for="nomClasse">Nom de classe</label>
+ <input name="nomClasse" type="text">
+
+ <button type="submit">Creer</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
+ </#list>
+</select>
+
+
+
</body>
</html>
diff --git a/bin/default/build/resources/main/views/gommettes.ftl b/bin/default/build/resources/main/views/gommettes.ftl
index 07c3774adb64fb7b9d78c1f4ad449b21664bcbfd..adf8969da70c93820b5929590019a39b0391ae8d 100644
--- a/bin/default/build/resources/main/views/gommettes.ftl
+++ b/bin/default/build/resources/main/views/gommettes.ftl
@@ -8,6 +8,39 @@
</#list>
</ul>
+
+
+<h2>Ajouter une gommette</h2>
+<form action="/gommettes/ajout" method="post">
+
+ <label for="nom">Nom</label>
+ <input type="text" name="nom" required>
+
+
+ <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" required>
+
+ <br>
+ <button type="submit">Creer</button>
+</form>
+
+
</body>
</html>
diff --git a/bin/default/build/resources/main/views/login.ftl b/bin/default/build/resources/main/views/login.ftl
index c5e9459e131696552161ad02db991e89b233a7fd..709c68dad7ec6feae5ee83abc4083f018da25671 100644
--- a/bin/default/build/resources/main/views/login.ftl
+++ b/bin/default/build/resources/main/views/login.ftl
@@ -7,9 +7,9 @@
<form method="post" action="/login">
<label for="userName">Nom d'utilisateur</label>
- <input name="userName">
+ <input name="userName" required>
<label for="password">Mot de passe</label>
- <input name="password" type="password">
+ <input name="password" type="password" required>
<button type="submit" placeholder="Supprimer...">Envoyer</button>
</form>
diff --git a/bin/default/build/resources/main/views/profsRoot.ftl b/bin/default/build/resources/main/views/profsRoot.ftl
index c4f1c138178b1bb49f181757150eb17833fa6bc7..e441c30f0820372022c50e761919a3d06b4ca1fa 100644
--- a/bin/default/build/resources/main/views/profsRoot.ftl
+++ b/bin/default/build/resources/main/views/profsRoot.ftl
@@ -13,7 +13,7 @@
<form method="post" action="profs/delete">
<label for="id">id</label>
- <input name="id">
+ <input name="id" required>
<button type="submit" placeholder="Supprimer...">Envoyer</button>
</form>
diff --git a/bin/default/build/resources/main/views/welcome.ftl b/bin/default/build/resources/main/views/welcome.ftl
index 79e250e41fd4ced7af9e395d4c77087ddc529418..a5c5fa92593c2889aa78f3ab7355265de95c9d95 100644
--- a/bin/default/build/resources/main/views/welcome.ftl
+++ b/bin/default/build/resources/main/views/welcome.ftl
@@ -9,6 +9,7 @@
<a href="/profs" >Consulter la liste des profs</a>
<a href="/eleves" >Consulter la liste des eleves</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
</body>
diff --git a/bin/default/build/tmp/compileJava/previous-compilation-data.bin b/bin/default/build/tmp/compileJava/previous-compilation-data.bin
index 84d385c04d352c732af0bfed66ad3da5a73a0a13..ef41e9fabd46fdf4fb18451c2e73aa69e8a8ff6c 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 244c61e67ac5713bf0b2bd31df5dec91172befd5..21d599d5804c9dc8b3b0bd657f787f52bc143448 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 83766c785cd3535c83e10ef8ae95eaa097aa5bb0..73b839d472647b624573d8195577f0e3d49cd101 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/main/resources/views/eleves.ftl b/bin/default/src/main/resources/views/eleves.ftl
index 99dea52bda1ed022398d0251ba37990da834b098..ab066ce5374d0333fc448ac6cea667a45c510b5b 100644
--- a/bin/default/src/main/resources/views/eleves.ftl
+++ b/bin/default/src/main/resources/views/eleves.ftl
@@ -6,11 +6,12 @@
<h1> Liste des élèves: </h1>
<#list eleves as eleve>
<li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
- <form action="eleves/delete" method="post"">
+ <form action="eleves/delete" method="post">
<input type="hidden" name="id" value="${eleve.id}">
<button type="submit" name="id">Supprimer</button>
</form>
</#list>
+
</ul>
@@ -18,6 +19,26 @@
<h2>Ajouter un élève</h2>
<form action="/eleves/ajout" method="post">
+ <label for="firstName">Prenom</label>
+ <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" required>
+
+ <label for="nomClasse">Nom de classe</label>
+ <input name="nomClasse" type="text" required>
+
+ <button type="submit">Creer</button>
+</form>
+
+
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
<label for="firstName">Prenom</label>
<input name="firstName" type="text">
@@ -33,6 +54,15 @@
<button type="submit">Creer</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
+ </#list>
+</select>
+
+
</body>
diff --git a/bin/default/src/main/resources/views/gommettes.ftl b/bin/default/src/main/resources/views/gommettes.ftl
index 07c3774adb64fb7b9d78c1f4ad449b21664bcbfd..adf8969da70c93820b5929590019a39b0391ae8d 100644
--- a/bin/default/src/main/resources/views/gommettes.ftl
+++ b/bin/default/src/main/resources/views/gommettes.ftl
@@ -8,6 +8,39 @@
</#list>
</ul>
+
+
+<h2>Ajouter une gommette</h2>
+<form action="/gommettes/ajout" method="post">
+
+ <label for="nom">Nom</label>
+ <input type="text" name="nom" required>
+
+
+ <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" required>
+
+ <br>
+ <button type="submit">Creer</button>
+</form>
+
+
</body>
</html>
diff --git a/bin/default/src/main/resources/views/login.ftl b/bin/default/src/main/resources/views/login.ftl
index c5e9459e131696552161ad02db991e89b233a7fd..709c68dad7ec6feae5ee83abc4083f018da25671 100644
--- a/bin/default/src/main/resources/views/login.ftl
+++ b/bin/default/src/main/resources/views/login.ftl
@@ -7,9 +7,9 @@
<form method="post" action="/login">
<label for="userName">Nom d'utilisateur</label>
- <input name="userName">
+ <input name="userName" required>
<label for="password">Mot de passe</label>
- <input name="password" type="password">
+ <input name="password" type="password" required>
<button type="submit" placeholder="Supprimer...">Envoyer</button>
</form>
diff --git a/bin/default/src/main/resources/views/profsRoot.ftl b/bin/default/src/main/resources/views/profsRoot.ftl
index c4f1c138178b1bb49f181757150eb17833fa6bc7..e441c30f0820372022c50e761919a3d06b4ca1fa 100644
--- a/bin/default/src/main/resources/views/profsRoot.ftl
+++ b/bin/default/src/main/resources/views/profsRoot.ftl
@@ -13,7 +13,7 @@
<form method="post" action="profs/delete">
<label for="id">id</label>
- <input name="id">
+ <input name="id" required>
<button type="submit" placeholder="Supprimer...">Envoyer</button>
</form>
diff --git a/bin/default/src/main/resources/views/welcome.ftl b/bin/default/src/main/resources/views/welcome.ftl
index 79e250e41fd4ced7af9e395d4c77087ddc529418..a5c5fa92593c2889aa78f3ab7355265de95c9d95 100644
--- a/bin/default/src/main/resources/views/welcome.ftl
+++ b/bin/default/src/main/resources/views/welcome.ftl
@@ -9,6 +9,7 @@
<a href="/profs" >Consulter la liste des profs</a>
<a href="/eleves" >Consulter la liste des eleves</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
</body>
diff --git a/build/classes/java/main/com/uca/StartServer.class b/build/classes/java/main/com/uca/StartServer.class
index a2ac372db94bd974e37e7bfc38452cf9496c024a..8878afbb40590f136d850ab2c8a9a48c7b332c68 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 0e1c4fff1b7065cc57fe06d016e5a137e2def599..7b4cd18578057b5aa8a890c8a5986c4cd2509c67 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/resources/main/views/eleves.ftl b/build/resources/main/views/eleves.ftl
index 99dea52bda1ed022398d0251ba37990da834b098..d4b20536706288516d8797108a994ce6e5d86ba5 100644
--- a/build/resources/main/views/eleves.ftl
+++ b/build/resources/main/views/eleves.ftl
@@ -6,11 +6,12 @@
<h1> Liste des élèves: </h1>
<#list eleves as eleve>
<li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
- <form action="eleves/delete" method="post"">
+ <form action="eleves/delete" method="post">
<input type="hidden" name="id" value="${eleve.id}">
<button type="submit" name="id">Supprimer</button>
</form>
</#list>
+
</ul>
@@ -18,6 +19,26 @@
<h2>Ajouter un élève</h2>
<form action="/eleves/ajout" method="post">
+ <label for="firstName">Prenom</label>
+ <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" required>
+
+ <label for="nomClasse">Nom de classe</label>
+ <input name="nomClasse" type="text" required>
+
+ <button type="submit">Creer</button>
+</form>
+
+
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
<label for="firstName">Prenom</label>
<input name="firstName" type="text">
@@ -30,9 +51,18 @@
<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="${eleve.id}">${eleve.id}</option>
+ </#list>
+</select>
+
+
</body>
diff --git a/build/resources/main/views/welcome.ftl b/build/resources/main/views/welcome.ftl
index 7fdb3ed884b93909cc41b256767640321e738eb2..a5c5fa92593c2889aa78f3ab7355265de95c9d95 100644
--- a/build/resources/main/views/welcome.ftl
+++ b/build/resources/main/views/welcome.ftl
@@ -9,7 +9,7 @@
<a href="/profs" >Consulter la liste des profs</a>
<a href="/eleves" >Consulter la liste des eleves</a>
-<a href="/gommettes"> Consulter la liste des gomettes</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
</body>
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index ef41e9fabd46fdf4fb18451c2e73aa69e8a8ff6c..f2501bad7540451399cf5ae00781c1c415aca5a1 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 ec5dd0c2a45b3b149890897568b27ef0825ede9b..f72f495b7119fa627a1541a62a2a3e435adce3f1 100644
--- a/src/com/uca/StartServer.java
+++ b/src/com/uca/StartServer.java
@@ -134,6 +134,20 @@ public class StartServer {
return null;
});
+
+ post("/eleves/update", (req,res) ->{
+
+ String firstName = req.queryParams("firstName");
+ String lastName = req.queryParams("lastName");
+ String dateNaissance = req.queryParams("dateNaissance");
+ String nomClasse = req.queryParams("nomClasse");
+ String id = req.queryParams("id_selection");
+
+ Core.Eleve.update(Integer.parseInt(id),firstName,lastName,dateNaissance,nomClasse);
+ res.redirect("/eleves");
+ return null;
+ });
+
get("/gommettes", (req,res) ->{
if (authentified) {
return GommetteGUI.getAllGommettes();
diff --git a/src/com/uca/core/EleveCore.java b/src/com/uca/core/EleveCore.java
index 224ce37881c29a1b09a94517deb698115a7c51f5..a2761a1faee344090f1ad56020e51995060c5f93 100644
--- a/src/com/uca/core/EleveCore.java
+++ b/src/com/uca/core/EleveCore.java
@@ -21,4 +21,53 @@ public class EleveCore extends _DefaultCore<EleveEntity> {
entity.setNomClasse(nomDeClasse);
return dao.create(entity);
}
+
+ public void update(int id,String firstName, String lastName, String dateNaissance, String nomDeClasse)
+ {
+ EleveEntity entity = new EleveEntity();
+
+ EleveEntity previous = dao.getById(id);
+
+ if (firstName.length() > 0)
+ {
+ entity.setFirstName(firstName);
+ }
+
+ else{
+ entity.setFirstName(previous.getFirstName());
+ }
+
+ if (lastName.length() > 0){
+ entity.setLastName (lastName);
+ }
+ else
+ {
+ entity.setLastName(previous.getLastName());
+ }
+
+ if (dateNaissance.length() > 0)
+ {
+ entity.setDateNaissance(dateNaissance);
+
+ }
+ else
+ {
+ entity.setDateNaissance(previous.getDateNaissance());
+ }
+
+
+ if (nomDeClasse.length() > 0)
+ {
+ entity.setNomClasse(nomDeClasse);
+ }
+ else
+ {
+ entity.setNomClasse(previous.getNomClasse());
+
+ }
+
+ entity.setId(id);
+
+ dao.push(entity);
+ }
}
\ No newline at end of file
diff --git a/src/main/resources/views/eleves.ftl b/src/main/resources/views/eleves.ftl
index 99dea52bda1ed022398d0251ba37990da834b098..d4b20536706288516d8797108a994ce6e5d86ba5 100644
--- a/src/main/resources/views/eleves.ftl
+++ b/src/main/resources/views/eleves.ftl
@@ -6,11 +6,12 @@
<h1> Liste des élèves: </h1>
<#list eleves as eleve>
<li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
- <form action="eleves/delete" method="post"">
+ <form action="eleves/delete" method="post">
<input type="hidden" name="id" value="${eleve.id}">
<button type="submit" name="id">Supprimer</button>
</form>
</#list>
+
</ul>
@@ -18,6 +19,26 @@
<h2>Ajouter un élève</h2>
<form action="/eleves/ajout" method="post">
+ <label for="firstName">Prenom</label>
+ <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" required>
+
+ <label for="nomClasse">Nom de classe</label>
+ <input name="nomClasse" type="text" required>
+
+ <button type="submit">Creer</button>
+</form>
+
+
+<h1>Modifier un élève</h1>
+
+<form action="/eleves/update" method="post" id="update_form">
+
<label for="firstName">Prenom</label>
<input name="firstName" type="text">
@@ -30,9 +51,18 @@
<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="${eleve.id}">${eleve.id}</option>
+ </#list>
+</select>
+
+
</body>
diff --git a/src/main/resources/views/welcome.ftl b/src/main/resources/views/welcome.ftl
index 7fdb3ed884b93909cc41b256767640321e738eb2..a5c5fa92593c2889aa78f3ab7355265de95c9d95 100644
--- a/src/main/resources/views/welcome.ftl
+++ b/src/main/resources/views/welcome.ftl
@@ -9,7 +9,7 @@
<a href="/profs" >Consulter la liste des profs</a>
<a href="/eleves" >Consulter la liste des eleves</a>
-<a href="/gommettes"> Consulter la liste des gomettes</a>
+<a href="/gommettes"> Consulter la liste des gommettes</a>
</body>