Merge origin/master

Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css

src/java/bdd/GardeMySQL.java

@@ -8,6 +8,8 @@ package bdd;
 import bean.Caserne;
 import bean.Gardes;
 import bean.Pompier;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,7 +31,8 @@ public class GardeMySQL {
             "sdis29",
             "adminBDsdis",
             "mdpBDsdis");
-      public ArrayList<Gardes> getLesDisponibilite(Calendar[] lesDates, int[] lesPeriodes) {
+      public ArrayList<Gardes> getLesDisponibilite(Calendar[] lesDates, int[] lesPeriodes,HttpServletRequest request) {
+          
         ArrayList<Gardes> lesDispo = new ArrayList<>();
         Gardes uneDispo;
 
@@ -39,8 +42,9 @@ public class GardeMySQL {
         int indiceDateFin = lesDates.length - 1;
         Pompier lePompier;
         PompierMySQL pm = new PompierMySQL();
-        
-        ArrayList<Pompier> lesPompiers = new ArrayList<>();
+        HttpSession maSession = request.getSession();
+        ArrayList<Pompier> lesPompiers = (ArrayList<Pompier>) maSession.getAttribute("lesPompiers");
+       
         for (Pompier unPompier : lesPompiers) {
             for (Calendar uneDate : lesDates) {
                 for (int unePeriode : lesPeriodes) {

src/java/servlet/GardesServlet.java

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