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

Merge origin/master

Browse Source 
Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css
This commit is contained in:
clementine.desrucques 2021-12-14 09:07:12 +01:00
parent f293ce8b0f
commit f74104e7ff
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/bdd/GardeMySQL.java
View File

@ -44,7 +44,11 @@ public class GardeMySQL {
PompierMySQL pm = new PompierMySQL();
HttpSession maSession = request.getSession();
ArrayList<Pompier> lesPompiers = (ArrayList<Pompier>) maSession.getAttribute("lesPompiers");
Pompier lePompierConnecte =(Pompier) maSession.getAttribute("lePompierConnecte");
if(lesPompiers==null){
lesPompiers = new ArrayList<>();
lesPompiers.add(lePompierConnecte);
}
for (Pompier unPompier : lesPompiers) {
for (Calendar uneDate : lesDates) {
for (int unePeriode : lesPeriodes) {

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

@ -90,7 +90,7 @@ public class GPServlet extends HttpServlet {
GardeMySQL vm = new GardeMySQL();
ArrayList<Gardes> lesVentilInit = vm.getLesDisponibilite(lesDates, lesPeriodes,request);
//System.out.println("lesVentilInit : " + lesVentilInit);
//System.out.println("lesVentilInit : " + lesVentilInit);
maSession.setAttribute("lesVentilInit", lesVentilInit);

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

@ -85,7 +85,7 @@ public class GardesServlet extends HttpServlet {
System.out.println(lesDatesEnString.toString());
/*Initialisation des periodes */
int[] lesPeriodes = {1,2,3,4};
maSession.setAttribute("lesPeriodes", lesPeriodes);
// maSession.setAttribute("lesPeriodes", lesPeriodes);
System.out.println(lesPeriodes.toString());
/* Recherche des ventilations */

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

@ -31,8 +31,8 @@
<tr>
<c:forEach var="i" begin="0" end="6" step="1">
<c:forEach items='${sessionScope.lesPeriodes}' var="unePeriode" varStatus="status">
<c:set var="periode" value="${unePeriode.getCode()}" scope="page"/>
<td class="text-center">${unePeriode}</td>
<td class="text-center">${unePeriode.getCode()}</td>
</c:forEach>
</c:forEach>
</tr>

4
web/WEB-INF/gardeJSP.jsp
View File

@ -32,8 +32,8 @@
<tr>
<c:forEach var="i" begin="0" end="6" step="1">
<c:forEach items='${sessionScope.lesPeriodes}' var="unePeriode" varStatus="status">
<c:set var="periode" value="${unePeriode.getCode()}" scope="page"/>
<td class="text-center">${unePeriode}</td>
<td class="text-center">${unePeriode.getCode()}</td>
</c:forEach>
</c:forEach>
</tr>