Merge branch 'main' of https://gitlab.isima.fr/boouya/applicationgommette

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
@@ -126,11 +126,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;
@@ -170,14 +179,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();
@@ -224,5 +243,8 @@ public class StartServer {
             res.redirect("/gommettes");
             return null;
         });
+
+
+
     }
 }
\ No newline at end of file

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);
             

src/com/uca/core/GommetteAttribCore.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 GommetteAttribCore extends _DefaultCore<GommetteAttribEntity> {
 
@@ -13,7 +14,7 @@ public class GommetteAttribCore extends _DefaultCore<GommetteAttribEntity> {
       super(new GommetteAttribDAO());
    }
 
-   public GommetteAttribEntity create(int idEleve, int idProf, int idGommette, String dateAttribution, String raison) {
+   public GommetteAttribEntity create(int idEleve, int idProf, int idGommette, java.sql.Date dateAttribution, String raison) {
       GommetteAttribEntity entity = new GommetteAttribEntity();
       entity.setIdEleve(idEleve);
       entity.setIdProf(idProf);

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;
 

src/com/uca/dao/GommetteAttribDAO.java

@@ -19,7 +19,7 @@ public class GommetteAttribDAO extends _DefaultDAO<GommetteAttribEntity> {
         stmt.setInt   (idx++, obj.getIdProf());
         stmt.setInt   (idx++, obj.getIdGommette());
         stmt.setString(idx++, obj.getRaisonAttribution());
-        stmt.setString(idx++, obj.getDateAttribution());
+        stmt.setDate(idx++, obj.getDateAttribution());
         stmt.setInt   (idx++, obj.getId());
         stmt.executeUpdate();
     }
@@ -33,7 +33,7 @@ public class GommetteAttribDAO extends _DefaultDAO<GommetteAttribEntity> {
         entity.setIdProf(resultSet.getInt("idProf"));
         entity.setIdGommette(resultSet.getInt("idGommette"));
         entity.setRaisonAttribution(resultSet.getString("raison"));
-        entity.setDateAttribution(resultSet.getString("dateAttribution"));
+        entity.setDateAttribution(resultSet.getDate("dateAttribution"));
         return entity;
     }
 }
\ No newline at end of file

src/com/uca/dao/_Initializer.java

@@ -44,9 +44,9 @@ public class _Initializer {
 
         CreateTable("users (id int primary key auto_increment, firstname varchar(100), lastname varchar(100));");
         CreateTable("profs (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), username  varchar(100), password varchar(100));");
-        CreateTable("eleves (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), nomClasse varchar(100), dateNaissance varchar(100));");
+        CreateTable("eleves (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), nomClasse varchar(100), dateNaissance DATE);");
         CreateTable("gommettes (id int primary key auto_increment, nom varchar(100), description varchar(100), couleur varchar(100));");
-        CreateTable("gommetteAttribs (id int primary key auto_increment, idEleve int, idProf int, idGommette int, dateAttribution varchar(10), raison varchar(500));");
+        CreateTable("gommetteAttribs (id int primary key auto_increment, idEleve int, idProf int, idGommette int, dateAttribution DATE, raison varchar(500));");
 
         UserEntity e = Core.User.create("Le père de toto", "pas toto");
         Core.User.create("Jean",  "Némar");
@@ -66,10 +66,10 @@ public class _Initializer {
         GommetteEntity uniCorn = Core.Gommette.create("Badge Unicorne", Couleur.ArcEnCiel, "C'est magique!");
 
 
-        EleveEntity bibi = Core.Eleve.create("Bibi","Johnson","23/10/2018","Zarbi");
+        EleveEntity bibi = Core.Eleve.create("Bibi","Johnson",new java.sql.Date(44938),"Zarbi");
 
-        Core.GommetteAttrib.create(bibi.getId(), DEBUG_BORIS_ADMIN.getId(), sagePetit.getId(), "1/1/2000", "Aucune raison");
-        Core.GommetteAttrib.create(bibi.getId(), toto.getId(), uniCorn.getId(), "1/1/2001", "Our Little Poney");
+        Core.GommetteAttrib.create(bibi.getId(), DEBUG_BORIS_ADMIN.getId(), sagePetit.getId(), new java.sql.Date(44938), "Aucune raison");
+        Core.GommetteAttrib.create(bibi.getId(), toto.getId(), uniCorn.getId(), new java.sql.Date(44938), "Our Little Poney");
 
         
     }

src/com/uca/entity/EleveEntity.java

 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; } 

src/com/uca/entity/GommetteAttribEntity.java

 package com.uca.entity;
 import java.sql.Timestamp;
-
+import java.sql.Date;
 import com.uca.entity.Entity;
 
 public class GommetteAttribEntity extends Entity {
@@ -16,9 +16,9 @@ public class GommetteAttribEntity extends Entity {
     public  int  getIdGommette() { return idGommette; }
     public  void setIdGommette(int nIdGommette) { idGommette = nIdGommette; }
 
-    private String dateAttribution;
-    public  String getDateAttribution() { return dateAttribution; }
-    public  void   setDateAttribution(String nDateAttribution) { dateAttribution = nDateAttribution; }
+    private java.sql.Date dateAttribution;
+    public  java.sql.Date getDateAttribution() { return dateAttribution; }
+    public  void   setDateAttribution(java.sql.Date nDateAttribution) { dateAttribution = nDateAttribution; }
 
     private String raisonAttribution;
     public  String getRaisonAttribution() { return raisonAttribution; }

src/main/resources/views/eleves.ftl

@@ -34,7 +34,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>
@@ -54,7 +54,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">