uap35-d/sdisM2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	src/java/bdd/gardeMySQL.java
	src/java/servlet/PompierServlet.java
	web/WEB-INF/feuilleGardes.jsp
This commit is contained in:
clementine.desrucques
2021-12-13 15:09:34 +01:00
parent e23f0e37e2 07aaf3248d
commit b4da29af06
7 changed files with 170 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/WEB-INF/jspf/formulairePompier.jspf
View File

@@ -175,6 +175,9 @@
</div>
</div>
<!-- fin tab disp -->
<div class="danger mt-3">${message} </div>

24
web/WEB-INF/jspf/header.jspf
View File

@@ -16,7 +16,7 @@
${sessionScope.lePompierConnecte.getNom()} (
${sessionScope.lePompierConnecte.getLeStatut().getValeur()})
</h4>
<button type="button" class="btn btn-warning fs-4" title="Déconnexion">
<a href="authentification">
<i class="bi bi-box-arrow-right heading" width="32" height="32" fill="currentColor"></i> Déconnexion
@@ -89,20 +89,16 @@
</c:choose>
</li>
<li class="nav-item">
<c:choose>
<c:when test="${page eq 5}">
<a class="nav-link active" href="pompier?pageDemandee=5">Gardes</a>
</c:when>
<c:when test="${sessionScope.lePompierConnecte.getLeStatut().getCode() eq 2}">
<a class="nav-link" href="pompier?pageDemandee=5">Gardes</a>
</c:when>
<c:otherwise>
</c:otherwise>
<li class="nav-item">
</c:choose>
</li>
<a class="nav-link" href="gardes">Gardes</a>
</li>
</ul>
</div>