Skip to content
Snippets Groups Projects
Commit beeb3330 authored by Boris's avatar Boris
Browse files

Date en plus propre

parent 0394c39f
No related branches found
No related tags found
1 merge request!2Date en plus propre
No preview for this file type
No preview for this file type
......@@ -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">
......
No preview for this file type
......@@ -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
......@@ -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);
......
......@@ -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;
......
......@@ -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");
}
......
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; }
......
......@@ -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">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment