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

Merge origin/master

Browse Source 
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
This commit is contained in:
clementine.desrucques 2021-12-13 14:42:07 +01:00
parent 03780acc84
commit fb1699b16f
5 changed files with 59 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/bdd/gardeMySQL.java
View File

@ -36,7 +36,7 @@ public class gardeMySQL {
int indiceDateFin = lesDates.length - 1;
Pompier lePompier;
PompierMySQL pm = new PompierMySQL();
ArrayList<Pompier> lesPompiers = pm.readLesPompiersCaserne(idCaserne);
ArrayList<Pompier> lesPompiers = pm.readLesPomprangeiersCaserne(idCaserne);
for (Pompier unPompier : lesPompiers) {
for (Calendar uneDate : lesDates) {
for (int unePeriode : lesPeriodes) {

2
src/java/servlet/GardesServlet.java
View File

@ -91,7 +91,7 @@ public class GardesServlet extends HttpServlet {
maSession.setAttribute("lesCouleurs", lesCouleurs);
/* Affichage de la page de ventilation */
getServletContext().getRequestDispatcher("/WEB-INF/feuilleGardesJSP.jsp").forward(request, response);
getServletContext().getRequestDispatcher("/WEB-INF/feuilleGardes.jsp").forward(request, response);
}
/**

8
web/WEB-INF/feuilleGardes.jsp
View File

@ -47,6 +47,14 @@
</tr>
</tbody>
<div id="legendCouleur">
<span style="background-color: white">Dispo</span>
<span style="background-color: gray">Indispo</span>
<span style="background-color: yellow">Au travail</span>
<span>De garde : X</span>
</div>
</table>

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

@ -127,12 +127,15 @@
</div><!-- fin ligne observation -->
</div> <!-- fin observation -->
<br/>
<!-- tab disp -->
<div>
<label for="tDisp">Disponibilitées</label>
<table border="1" cellspacing="3" cellpadding="1" class="table table-striped">
<thead>
<tr>
<c:forEach items="${sessionScope.lesDatesEnString}" var="uneDate" varStatus="status">
<th colspan="2" class="text-center">${uneDate}</th>
</c:forEach>
@ -140,7 +143,7 @@
<tr>
<c:forEach var="i" begin="0" end="4" step="1">
<c:forEach items="${sessionScope.lesPeriodes}" var="uneP" varStatus="status">
<td class="text-center">${uneP}</td>
<th class="text-center">${uneP}</th>
</c:forEach>
</c:forEach>
</tr>
@ -152,8 +155,8 @@
<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"/>
@ -168,7 +171,7 @@
<span style="background-color: white">Dispo</span>
<span style="background-color: gray">Indispo</span>
<span style="background-color: yellow">Au travail</span>
<span>De garde : X</span>
</div>
</div>

27
web/css/mycss.css
View File

@ -84,3 +84,30 @@ aside, #btAfficherPompier {
select[readonly] {
pointer-events: none;
}
.blanc {
background-color: white;
color: white;
border-color : white;
}
.gris {
background-color: gray;
color: gray;
border-color: gray;
}
.jaune {
background-color: yellow;
color: yellow;
border-color: yellow;
}
.ztVentil {
width : 40%;
border: 3px solid;
}
.ztVentil:hover {
border-color: grey;
}