Merge origin/master

Conflicts:
	nbproject/project.properties
	src/java/bean/Pompier.java
	src/java/servlet/PompierServlet.java
	src/java/util/TrmtDate.java
	web/WEB-INF/jspf/formulairePompier.jspf
	web/WEB-INF/jspf/header.jspf
	web/WEB-INF/web.xml

web/WEB-INF/feuilleGardes.jsp

@@ -0,0 +1,54 @@
+<%-- 
+    Document   : feuilleGardes
+    Created on : 6 déc. 2021, 15:07:45
+    Author     : funcha.ahamadi
+--%>
+
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<legend>
+    Feuille de gardes
+</legend>
+<form action="gardes" method="POST">
+    <table class="table">
+        <thead>
+            <tr>
+                <th rowspan="2">N° de BIP</th>
+                <th rowspan="2">Nom Prenom</th>
+        <c:forEach items='${sessionScope.lesDatesEnString}' var="uneDate" varStatus="status">
+            <th colspan="2" class="text-center"> ${uneDate}</th>
+        </c:forEach>
+
+        </tr>
+        <tr>
+        <c:forEach var="i" begin="0" end="4" step="1">
+            <c:forEach items='${sessionScope.lesPeriodes}' var="unePeriode" varStatus="status">
+                <td class="text-center">${unePeriode}</td>
+            </c:forEach>
+        </c:forEach>
+        </tr>
+        </thead>
+        <tbody>
+        <c:set var="oldId" value="-1" scope="page"/>
+        <tr>                
+        <c:forEach items='${sessionScope.lesVentilInit}' var="uneVentil" varStatus="status">
+            <c:set var="newId" value='${uneVentil.getPompier().getId()}' scope="page"/> 
+            <c:if test='${oldId != newId}' var="test" scope="page">
+            </tr><tr>
+            <td>${uneVentil.getPompier().getId()}</td>
+            <td>${uneVentil.getPompier().getNom()} ${uneVentil.getPompier().getPrenom()}</td>
+
+        <c:set var="oldId" value='${newId}' scope="page"/>
+    </c:if>
+    <c:set var="activite" value='${uneVentil.getActivite()}' scope="page"/>
+    <td>
+        <input readonly type="text" value='${activite}' name="lesActivites"class="ztVentil ${sessionScope.lesCouleurs[activite]}"/>
+    </td>
+</c:forEach>
+</tr>
+
+</tbody>
+
+</table>
+
+
+</form><!-- comment -->

web/WEB-INF/jspf/header.jspf

@@ -109,4 +109,4 @@
             </nav>
         </div> <!-- fin id=identie -->
     </div> <!-- fin class=container -->
-</header>
+</header>

web/WEB-INF/web.xml

@@ -17,8 +17,8 @@
         <servlet-class>servlet.PompierServlet</servlet-class>
     </servlet>
     <servlet>
-        <servlet-name>DispoServlet</servlet-name>
-        <servlet-class>servlet.DispoServlet</servlet-class>
+        <servlet-name>feuilleGardes</servlet-name>
+        <servlet-class>servlet.GardesServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>AuthentifServlet</servlet-name>
@@ -29,8 +29,8 @@
         <url-pattern>/pompier</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>DispoServlet</servlet-name>
-        <url-pattern>/DispoServlet</url-pattern>
+        <servlet-name>feuilleGardes</servlet-name>
+        <url-pattern>/gardes</url-pattern>
     </servlet-mapping>
     <session-config>
         <session-timeout>