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
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);
}
/**