diff --git a/src/java/bdd/GardeMySQL.java b/src/java/bdd/GardeMySQL.java index f580530..43afbbc 100644 --- a/src/java/bdd/GardeMySQL.java +++ b/src/java/bdd/GardeMySQL.java @@ -113,7 +113,7 @@ public class GardeMySQL { public int delete(Gardes g) { int nbMaj = -1; String sql = "DELETE * FROM gardes " - + "WHERE idPompiere=?" + + "WHERE idPompier=?" + "AND periode=?" + "AND jourGarde= ?;"; try { @@ -139,8 +139,8 @@ public class GardeMySQL { public int create(Gardes g) { int idCree = -1; String sql = "INSERT into gardes " - + "(jourGarde, periode, idPompier, disponibilite) " - + "VALUES (?, ?, ?,?)"; + + "(jourGarde, periode, idPompier, disponibilite, deGarde) " + + "VALUES (?, ?, ?,?,?)"; try { PreparedStatement prepStmt = null; @@ -179,11 +179,13 @@ public class GardeMySQL { public int update(Gardes g) { int nbMAJ = -1; - String sql = "UPDATE garde " + String sql = "UPDATE gardes " + "SET disponibilite = ? " + "WHERE idPompier = ? " + "AND jourGarde = ? " - + "AND periode = ?"; + + "AND periode = ?" + + "AND deGarde = ?" + ; try { PreparedStatement prepStmt = theConnection.prepareStatement(sql); prepStmt.setInt(1, g.getDisponibilite()); diff --git a/src/java/form/DispoForm.java b/src/java/form/DispoForm.java index fc7022b..cd68265 100644 --- a/src/java/form/DispoForm.java +++ b/src/java/form/DispoForm.java @@ -26,7 +26,7 @@ public class DispoForm { GardeMySQL vm = new GardeMySQL(); Map map = request.getParameterMap(); - String[] lesNvVentil = map.get("lesAct"); + String[] lesNvVentil = map.get("lesActivites"); int i = 0; for(Gardes uneGarde : lesG){ int oldAct = uneGarde.getDisponibilite(); diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index f0e3831..3821ac3 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -24,10 +24,7 @@ GPServlet servlet.GPServlet - - GardesServlet - servlet.GardesServlet - + AuthentifServlet /authentification @@ -44,10 +41,7 @@ GPServlet /PompierGarde - - GardesServlet - /gardes - + 30