Merge origin/master

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

src/java/servlet/GardesServlet.java

@@ -115,7 +115,7 @@ public class GardesServlet extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 //        processRequest(request, response);
-            DispoForm vf = new DispoForm();
+        DispoForm vf = new DispoForm();
         vf.verifDispo(request);
         getServletContext().getRequestDispatcher("/WEB-INF/pompierJSP.jsp").forward(request, response);
     }

web/WEB-INF/feuilleGardes.jsp

@@ -69,6 +69,9 @@
                         <span>De garde : X</span>
 
                     </div>
+                <div class="text-center">
+            <button type="submit" value="Valider" class="btn btn-danger"><i class="bi bi-check2"></i> Valider</button>                                    
+        </div>
                 </form>
             </fieldset> 
         </section>

web/WEB-INF/web.xml

@@ -24,6 +24,10 @@
         <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>
@@ -40,6 +44,10 @@
         <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