Merge origin/master

Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css

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) "
+                + "(jourGarde, periode, idPompier, disponibilite, deGarde) "
-                + "VALUES (?, ?, ?,?)";
+                + "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());

src/java/form/DispoForm.java

@@ -26,7 +26,7 @@ public class DispoForm {
         
         GardeMySQL vm = new GardeMySQL();
         Map<String, String[]> map = request.getParameterMap();
-        String[] lesNvVentil = map.get("lesAct");
+        String[] lesNvVentil = map.get("lesActivites");
         int i = 0;
         for(Gardes uneGarde : lesG){
             int oldAct = uneGarde.getDisponibilite();

web/WEB-INF/web.xml

@@ -24,10 +24,7 @@
         <servlet-name>GPServlet</servlet-name>
         <servlet-class>servlet.GPServlet</servlet-class>
     </servlet>
-    <servlet>
+    
-        <servlet-name>GardesServlet</servlet-name>
-        <servlet-class>servlet.GardesServlet</servlet-class>
-    </servlet>
     <servlet-mapping>
         <servlet-name>AuthentifServlet</servlet-name>
         <url-pattern>/authentification</url-pattern>
@@ -44,10 +41,7 @@
         <servlet-name>GPServlet</servlet-name>
         <url-pattern>/PompierGarde</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
+    
-        <servlet-name>GardesServlet</servlet-name>
-        <url-pattern>/gardes</url-pattern>
-    </servlet-mapping>
     <session-config>
         <session-timeout>
             30