From 80aa3ed6eac6f827d71d3fb9da45bf9c286ab44e Mon Sep 17 00:00:00 2001 From: "clementine.desrucques" Date: Mon, 13 Dec 2021 15:42:14 +0100 Subject: [PATCH] Merge origin/master Conflicts: src/java/bdd/gardeMySQL.java src/java/servlet/PompierServlet.java web/WEB-INF/feuilleGardes.jsp --- web/WEB-INF/feuilleGardes.jsp | 53 +++++++------------------ web/WEB-INF/jspf/formulairePompier.jspf | 51 ------------------------ web/css/mycss.css | 4 +- 3 files changed, 16 insertions(+), 92 deletions(-) diff --git a/web/WEB-INF/feuilleGardes.jsp b/web/WEB-INF/feuilleGardes.jsp index d5ab9ed..f7d291f 100644 --- a/web/WEB-INF/feuilleGardes.jsp +++ b/web/WEB-INF/feuilleGardes.jsp @@ -6,46 +6,10 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@include file= "jspf/debutJSP.jspf" %> + <%@include file= "jspf/header.jspf" %> +
+
- - - - - ${unePeriode} - - - - - - - - - - - - ${uneVentil.getPompier().getId()} - ${uneVentil.getPompier().getNom()} ${uneVentil.getPompier().getPrenom()} - - - - - - - - - - - -
- - Dispo - Indispo - Au travail - De garde : X - -
- -
@@ -73,8 +37,19 @@ +
+ + Dispo + Indispo + Au travail + De garde : X + +
+
+
+ diff --git a/web/WEB-INF/jspf/formulairePompier.jspf b/web/WEB-INF/jspf/formulairePompier.jspf index 70c1d7a..bd1d2b3 100644 --- a/web/WEB-INF/jspf/formulairePompier.jspf +++ b/web/WEB-INF/jspf/formulairePompier.jspf @@ -128,57 +128,6 @@
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${uneDate}
${uneP}
-
- - Dispo - Indispo - Au travail - De garde : X - -
-
- - - -
${message}
diff --git a/web/css/mycss.css b/web/css/mycss.css index 30f1ce5..301579b 100644 --- a/web/css/mycss.css +++ b/web/css/mycss.css @@ -18,7 +18,7 @@ body { } fieldset { border-radius: 5px; - padding: 5px; + padding: 2px; border: 1px solid #DB0005; width: 100%; } @@ -105,7 +105,7 @@ select[readonly] { .ztVentil { width : 40%; border: 3px solid; - + } .ztVentil:hover {