From 03780acc84717864434cac190bbe2cb914110e97 Mon Sep 17 00:00:00 2001
From: "clementine.desrucques" <clementine.desrucques@sio211-11.sio.lan>
Date: Mon, 13 Dec 2021 11:33:05 +0100
Subject: [PATCH] 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/jspf/formulairePompier.jspf | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/web/WEB-INF/jspf/formulairePompier.jspf b/web/WEB-INF/jspf/formulairePompier.jspf
index 4b9b4e4..fd9530b 100644
--- a/web/WEB-INF/jspf/formulairePompier.jspf
+++ b/web/WEB-INF/jspf/formulairePompier.jspf
@@ -146,9 +146,17 @@
</tr>
</thead>
<tbody>
+ <c:set var="oldId" value="-1" scope="page"/>
<tr>
<c:forEach items="${sessionScope.lesVentilInit}" var="ventil" varStatus="status">
- <c:set var="act" value="${ventil.getActivite()}" scope="page"/>
+ <c:set var="newId" value="${gardes.getPompier().getId()}" scope="page"/>
+ <c:if test="${oldId != newId}" var="test" scope="page">
+ </tr> <tr>
+ <td>${ventil.getSalarie().getId()}</td>
+ <td>${ventil.getSalarie().getNom()} ${ventil.getSalarie().getPrenom()}</td>
+ <c:set var="oldId" value="${newId}" scope="page"/>
+ </c:if>
+ <c:set var="act" value="${gardes.getDisponibilite()}" scope="page"/>
<td><input type="text" value="${act}" name="lesAct" class="ztVentil ${sessionScope.lesCouleurs[act]}" readonly/></td>
</c:forEach>