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/bean/Gardes.java
	src/java/servlet/GardesServlet.java
	web/WEB-INF/jspf/header.jspf
This commit is contained in:
funcha.ahamadi
2021-12-13 15:07:08 +01:00
parent 93022f82e3 03780acc84
commit 07aaf3248d
15 changed files with 1886 additions and 1760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,52 +3,44 @@
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>
<%@include file= "jspf/debutJSP.jspf" %>
<body>
<%@include file= "jspf/header.jspf" %>
<div class="container">
<section id="contenuAffiche" class="row">
<fieldset class="row mt-1 mb-10">
<legend>
Feuille de gardes
</legend>
<form action="gardes" method="POST">
<table class="table">
<thead>
<tr>
<th rowspan="2">No</th>
<th rowspan="2">Nom Prenom</th>
<c:forEach items='${sessionScope.lesDatesEnString}' var="uneDate" varStatus="status">
<th colspan="4" class="text-center"> ${uneDate}</th>
</c:forEach>
</tr>
<tr>
<c:forEach var="i" begin="0" end="6" step="1">
<c:forEach items='${sessionScope.lesPeriodes}' var="unePeriode" varStatus="status">
<td class="text-center">${unePeriode}</td>
</c:forEach>
</c:forEach>
</tr>
</thead>
</table>
</form>
</fieldset>
</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 -->

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

@@ -126,7 +126,56 @@
value="${lePompier.getCommentaire()}" />
</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>
</tr>
<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>
</c:forEach>
</c:forEach>
</tr>
</thead>
<tbody>
<c:set var="oldId" value="-1" scope="page"/>
<tr>
<c:forEach items="${sessionScope.lesVentilInit}" var="ventil" varStatus="status">
<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>
</tr>
</tbody>
</table>
<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>
</div>
</div>
<!-- fin tab disp -->
<div class="danger mt-3">${message} </div>
<div class="text-center mt-3">
@@ -134,10 +183,26 @@
<i class="bi bi-check2"></i> Valider
</button>
</div>
<p><em>* zone obligatoire</em></p>
</section>
<script>
var couleurs = ["blanc", "gris", "jaune"];
var lesAct = document.getElementsByClassName("ztVentil");
for (var uneAct of lesAct) {
uneAct.onclick = function () {
var act = this.value;
var newAct = (act + 1) % 3;
var coul = couleurs[newAct];
this.classList.remove(couleurs[act]);
this.classList.add(coul);
this.value = newAct;
}
}
</script>
</div> <!-- fin div contenant aside et section -->
</form>

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

@@ -90,18 +90,13 @@
</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>
</c:choose>
<a class="nav-link" href="gardes">Gardes</a>
</li>
</ul>
@@ -110,4 +105,4 @@
</nav>
</div> <!-- fin id=identie -->
</div> <!-- fin class=container -->
</header>
</header>