From cac0c6423fc8edcd3449e44ae8ce58ae0beaa289 Mon Sep 17 00:00:00 2001
From: "clementine.desrucques" <clementine.desrucques@sio211-11.sio.lan>
Date: Tue, 14 Dec 2021 09:31:59 +0100
Subject: [PATCH] Merge origin/master
Conflicts:
web/WEB-INF/feuilleGardes.jsp
web/css/mycss.css
---
src/java/servlet/GardesServlet.java | 2 +-
web/WEB-INF/feuilleGardes.jsp | 3 +++
web/WEB-INF/web.xml | 8 ++++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/java/servlet/GardesServlet.java b/src/java/servlet/GardesServlet.java
index 68a1e4d..366b3d8 100644
--- a/src/java/servlet/GardesServlet.java
+++ b/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);
}
diff --git a/web/WEB-INF/feuilleGardes.jsp b/web/WEB-INF/feuilleGardes.jsp
index 1fba489..1ce51d3 100644
--- a/web/WEB-INF/feuilleGardes.jsp
+++ b/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>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index dc3c550..f0e3831 100644
--- a/web/WEB-INF/web.xml
+++ b/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