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,13 @@ 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");
+        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) {
@@ -53,8 +61,10 @@ public class GardeMySQL {
         /* b) Maj de la collection lesVentil        
          */
        readAll(lesDispo, lesDates[0], lesDates[indiceDateFin]);
-        //System.out.println("lesDispo : " + lesDispo);
+        System.out.println("lesDispo : " + lesDispo);
+        
         return lesDispo;
+        
     }
         public void readAll(ArrayList<Gardes> lesDispo, Calendar d1, Calendar d2) {
         Pompier lePompier;
@@ -99,21 +109,21 @@ public class GardeMySQL {
             /**
      * Suppression de la garde passé en paramètre
      *
-     * @param v ventilation à supprimer
+     * @param g ventilation à supprimer
      * @return nb ligne a supprimer
      */
     public int delete(Gardes g) {
         int nbMaj = -1;
-        String sql = "DELETE * FROM gardes "
-                + "WHERE idPompiere=?"
-                + "AND periode=?"
-                + "AND jourGarde= ?;";
+        String sql = "DELETE FROM gardes "
+                + "WHERE idPompier=?"
+                + " AND periode=?"
+                + " AND jourGarde= ?;";
         try {
             PreparedStatement prepStmt = theConnection.prepareStatement(sql);
             prepStmt.setInt(1, g.getPompier().getId());
             prepStmt.setInt(2, g.getPeriode());
-            prepStmt.setInt(3, g.getPeriode());
             prepStmt.setDate(3, TrmtDate.getSQLDate(g.getJourGarde()));
+            
             nbMaj = prepStmt.executeUpdate();
 
         } catch (SQLException ex) {
@@ -131,17 +141,19 @@ public class GardeMySQL {
     public int create(Gardes g) {
         int idCree = -1;
         String sql = "INSERT into gardes "
-                + "(jourGarde, periode, idPompier, disponibilite) "
-                + "VALUES (?, ?, ?,?)";
+                + "(jourGarde, periode, idPompier, disponibilite, deGarde) "
+                + "VALUES (?, ?, ?,?,?);";
 
         try {
-            PreparedStatement prepStmt = null;
-            prepStmt = theConnection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+//            PreparedStatement prepStmt = null;
+//            prepStmt = theConnection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+            PreparedStatement prepStmt = theConnection.prepareStatement(sql);
             prepStmt.setDate(1, TrmtDate.getSQLDate(g.getJourGarde()));
             prepStmt.setInt(2, g.getPeriode());
             prepStmt.setInt(3, g.getPompier().getId());
             prepStmt.setInt(4, g.getDisponibilite());
-
+            prepStmt.setBoolean(5, g.isDeGarde());
+            
             System.out.println(prepStmt);
             int nbLigne = prepStmt.executeUpdate();
 
@@ -171,17 +183,19 @@ public class GardeMySQL {
     public int update(Gardes g) {
 
         int nbMAJ = -1;
-        String sql = "UPDATE garde "
-                + "SET disponibilite = ? "
+        String sql = "UPDATE gardes "
+                + "SET disponibilite = ?, deGarde = ? "
                 + "WHERE idPompier = ? "
                 + "AND jourGarde = ? "
-                + "AND periode = ?";
+                + "AND periode = ?;";
         try {
             PreparedStatement prepStmt = theConnection.prepareStatement(sql);
             prepStmt.setInt(1, g.getDisponibilite());
-            prepStmt.setInt(2, g.getPompier().getId());
-            prepStmt.setDate(3, TrmtDate.getSQLDate(g.getJourGarde()));
-            prepStmt.setInt(4, g.getPeriode());
+            prepStmt.setBoolean(2, g.isDeGarde());
+            prepStmt.setInt(3, g.getPompier().getId());
+            prepStmt.setDate(4, TrmtDate.getSQLDate(g.getJourGarde()));
+            prepStmt.setInt(5, g.getPeriode());
+            
             System.out.println("update : " + prepStmt);
             nbMAJ = prepStmt.executeUpdate();
         } catch (SQLException ex) {

src/java/bean/Gardes.java

@@ -18,21 +18,33 @@ public class Gardes {
     Pompier pompier;
     int disponibilite;
     boolean isInBDD;
+    boolean deGarde;
 
-    public Gardes(Calendar jourGarde, int periode, Pompier pompier, int disponibilite, boolean isInBDD) {
+    public Gardes(Calendar jourGarde, int periode, Pompier pompier, int disponibilite, boolean isInBDD, boolean deGarde) {
         this.jourGarde = jourGarde;
         this.periode = periode;
         this.pompier = pompier;
         this.disponibilite = disponibilite;
         this.isInBDD = isInBDD;
+        this.deGarde = deGarde;
     }
 
+    public Gardes(Calendar jourGarde, int periode, Pompier pompier, boolean deGarde) {
+        this.jourGarde = jourGarde;
+        this.periode = periode;
+        this.pompier = pompier;
+        this.deGarde = deGarde;
+    }
+    
+
     public Gardes(Calendar jourGarde, int periode, Pompier pompier) {
         this.jourGarde = jourGarde;
         this.periode = periode;
         this.pompier = pompier;
     }
+    
 
+    
     public Calendar getJourGarde() {
         return jourGarde;
     }
@@ -73,14 +85,23 @@ public class Gardes {
         this.isInBDD = isInBDD;
     }
 
+    public boolean isDeGarde() {
+        return deGarde;
+    }
+
+    public void setDeGarde(boolean deGarde) {
+        this.deGarde = deGarde;
+    }
+
     @Override
     public int hashCode() {
-        int hash = 7;
-        hash = 43 * hash + Objects.hashCode(this.jourGarde);
-        hash = 43 * hash + this.periode;
-        hash = 43 * hash + Objects.hashCode(this.pompier);
-        hash = 43 * hash + this.disponibilite;
-        hash = 43 * hash + (this.isInBDD ? 1 : 0);
+        int hash = 5;
+        hash = 37 * hash + Objects.hashCode(this.jourGarde);
+        hash = 37 * hash + this.periode;
+        hash = 37 * hash + Objects.hashCode(this.pompier);
+        hash = 37 * hash + this.disponibilite;
+        hash = 37 * hash + (this.isInBDD ? 1 : 0);
+        hash = 37 * hash + (this.deGarde ? 1 : 0);
         return hash;
     }
 
@@ -105,6 +126,9 @@ public class Gardes {
         if (this.isInBDD != other.isInBDD) {
             return false;
         }
+        if (this.deGarde != other.deGarde) {
+            return false;
+        }
         if (!Objects.equals(this.jourGarde, other.jourGarde)) {
             return false;
         }
@@ -116,8 +140,9 @@ public class Gardes {
 
     @Override
     public String toString() {
-        return "Gardes{" + "jourGarde=" + jourGarde + ", periode=" + periode + ", pompier=" + pompier + ", disponibilite=" + disponibilite + ", isInBDD=" + isInBDD + '}';
+        return "\nGardes{" + "jourGarde=" + jourGarde.getTime() + ", periode=" + periode + ", pompier=" + pompier + ", disponibilite=" + disponibilite + ", isInBDD=" + isInBDD + ", deGarde=" + deGarde + '}';
     }
+
     
     
 }

src/java/doc/readMe

@@ -10,6 +10,6 @@ Variables de session :
     Variables mises en session dans PompierServlet.java)
         lePompier : pompier à afficher dans pompierJSP
 
-Attributs utilisés entre la servet PompierServlet.java et pompierJSP :   
+Attributs utilisés entre la serlvet PompierServlet.java et pompierJSP :   
     page :  2 --> affichage des données du pompier connecté
             3 --> affichage des données d'un pompier de la caserne pour le chef de centre

src/java/form/DispoForm.java

@@ -5,36 +5,48 @@
  */
 package form;
 
-import bdd.gardeMySQL;
+import bdd.GardeMySQL;
+
 import bean.Gardes;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.Map;
+import javax.swing.JCheckBox;
 
 /**
  *
  * @author clementine.desrucques
  */
 public class DispoForm {
+
     HttpServletRequest request;
-    
-    public void verifDispo(HttpServletRequest request){
+
+    public void verifDispo(HttpServletRequest request) {
         HttpSession maS = request.getSession();
-        ArrayList <Gardes> lesG = (ArrayList<Gardes>) maS.getAttribute("lesVentilInit");
-        
-        gardeMySQL vm = new gardeMySQL();
+        ArrayList<Gardes> lesG = (ArrayList<Gardes>) maS.getAttribute("lesVentilInit");
+
+        GardeMySQL vm = new GardeMySQL();
         Map<String, String[]> map = request.getParameterMap();
-        String[] lesNvVentil = map.get("lesAct");
+        String[] lesNvVentil = map.get("lesActivites");
+        String[] lesNvGardes = map.get("cbGarde");
+        ArrayList<Integer> lesNvGardesN = new ArrayList<>();
+        if(lesNvGardes != null){
+            for(String uneGarde : lesNvGardes){
+                lesNvGardesN.add(Integer.parseInt(uneGarde));      
+            }
+        }
         int i = 0;
-        for(Gardes uneGarde : lesG){
+        for (Gardes uneGarde : lesG) {
             int oldAct = uneGarde.getDisponibilite();
             int newAct = Integer.parseInt(lesNvVentil[i]);
-            if(oldAct != newAct){
-                if(uneGarde.isIsInBDD()){
-                    if(newAct == 0){
+            if (oldAct != newAct) {
+                if (uneGarde.isIsInBDD()) {
+
+                    if (newAct == 0) {
                         vm.delete(uneGarde);
                         uneGarde.setIsInBDD(false);
+                        uneGarde.setDisponibilite(newAct);
                     } else {
                         uneGarde.setDisponibilite(newAct);
                         vm.update(uneGarde);
@@ -44,6 +56,65 @@ public class DispoForm {
                     vm.create(uneGarde);
                     uneGarde.setIsInBDD(true);
                 }
+
+            }
+            boolean oldGarde = uneGarde.isDeGarde();
+            boolean newGarde = lesNvGardesN.contains(i)?true:false;
+            System.out.println("1: "+oldGarde +" "+ newGarde);
+            if(oldGarde!= newGarde){
+                uneGarde.setDeGarde(newGarde);
+                System.out.println("2: "+oldGarde +" "+ newGarde);
+                if (uneGarde.isIsInBDD()) {
+                    vm.update(uneGarde);
+                }else{
+                    vm.create(uneGarde);
+                    uneGarde.setIsInBDD(true);
+                    System.out.println("3: "+oldGarde +" "+ newGarde);
+                }
+            }
+            
+            
+            
+            
+            
+            
+            
+            
+            i++;
+        }
+    }
+
+    public void verifGarde(HttpServletRequest request) {
+        HttpSession maS = request.getSession();
+        ArrayList<Gardes> lesG = (ArrayList<Gardes>) maS.getAttribute("lesVentilInit");
+
+        GardeMySQL vm = new GardeMySQL();
+        Map<String, String[]> map = request.getParameterMap();
+        String[] lesNvVentil = map.get("cbGarde");
+//        JCheckBox garde = new JCheckBox();
+        int i = 0;
+        for (Gardes uneGarde : lesG) {
+            boolean oldAct = uneGarde.isDeGarde();
+            int newAct = Integer.parseInt(lesNvVentil[i]);
+            boolean newActO = (newAct==Integer.parseInt(lesNvVentil[i]));
+            
+            if (oldAct != newActO) {
+                if (uneGarde.isIsInBDD()) {
+
+                    if (newActO == false) {
+                        vm.delete(uneGarde);
+                        uneGarde.setIsInBDD(false);
+                        uneGarde.isDeGarde();
+                    } else {
+                        uneGarde.isDeGarde();
+                        vm.update(uneGarde);
+                    }
+                } else {
+                    uneGarde.isDeGarde();
+                    vm.create(uneGarde);
+                    uneGarde.setIsInBDD(true);
+                }
+
             }
             i++;
         }

src/java/servlet/AuthentifServlet.java

@@ -66,6 +66,7 @@ public class AuthentifServlet extends HttpServlet {
         maSession.removeAttribute("lePompierConnecte");
         maSession.removeAttribute("lesPompiers");
         maSession.removeAttribute("lePompier");
+        maSession.removeAttribute("lesVentilInit");
         getServletContext().getRequestDispatcher("/WEB-INF/authentifJSP.jsp").forward(request, response);
     }
 

src/java/servlet/GardesServlet.java

@@ -6,7 +6,7 @@
 package servlet;
 
 import bdd.GardeMySQL;
-import bdd.gardeMySQL;
+
 import bean.Gardes;
 import bean.Pompier;
 import form.DispoForm;
@@ -85,15 +85,19 @@ 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 */
         
             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);
             
+//            GardeMySQL dg = new GardeMySQL();
+//            ArrayList<Gardes> lesgardes = dg.();
+//            //System.out.println("lesVentilInit : " + lesVentilInit);
+//            maSession.setAttribute("lesVentilInit", lesVentilInit);
             
             /* Initialisation des couleurs */
             String[] lesCouleurs = {"blanc", "gris", "jaune"};
@@ -115,8 +119,9 @@ public class GardesServlet extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 //        processRequest(request, response);
-            DispoForm vf = new DispoForm();
+        DispoForm vf = new DispoForm();
         vf.verifDispo(request);
+        
         getServletContext().getRequestDispatcher("/WEB-INF/pompierJSP.jsp").forward(request, response);
     }
 

web/WEB-INF/feuilleGardes.jsp

@@ -6,12 +6,12 @@
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@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>
@@ -31,14 +31,91 @@
                             <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>
+
+                                        <td class="text-center">${unePeriode.getCode()}</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.getDisponibilite()}' scope="page"/>
+                                    <c:set var="check" value="" scope="page"/>
+                                    <c:if test="${uneVentil.isDeGarde() == true}" var="test" scope="page">
+                                        <c:set var="check" value="checked" scope="page"/>
+                                    </c:if>
+                                    
+                                    <c:choose>
+                                        <c:when test="${sessionScope.lePompierConnecte.getLeStatut().getCode() eq 2}">
+                                            <td>
+                                                <input  readonly type="text" value='${activite}' name="lesActivites" class="ztVentil ${sessionScope.lesCouleurs[activite]}"/>
+                                                <input type="checkbox" ${check} name="cbGarde" value="${status.count +1}">
+                                            </td>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <td>
+                                                <input readonly type="text" value='${activite}' name="lesActivites" class="ztVentil ${sessionScope.lesCouleurs[activite]}"/>
+                                                <input type="checkbox" ${check} name="cbGarde" value="${status.count +1}" onclick="return false">
+                                            </td>
+                                        </c:otherwise>
+                                    </c:choose>
+
+
+                                </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>
+                        <span>De garde : ☑</span>
+
+                    </div>
+                    <div class="text-center">
+                        <button type="submit" value="Valider" class="btn btn-danger"><i class="bi bi-check2"></i> Valider</button>                                    
+                    </div>
                 </form>
             </fieldset> 
+        </section>
+    </div>
+</body>
+<script>
+    var st = (document.getElementById("statut").textContent).trim();
+    if (st != "chef de centre") {
+
+
+        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>
 
 
 

web/WEB-INF/jspf/formulairePompier.jspf

@@ -127,55 +127,7 @@
                 </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">

web/WEB-INF/jspf/header.jspf

@@ -14,7 +14,10 @@
                     <c:otherwise>
                         <h4>Bienvenue   ${sessionScope.lePompierConnecte.getPrenom()} 
                             ${sessionScope.lePompierConnecte.getNom()} (
-                            ${sessionScope.lePompierConnecte.getLeStatut().getValeur()})
+                            <span id="statut">
+                                ${sessionScope.lePompierConnecte.getLeStatut().getValeur()}
+                            </span>
+                            )
                         </h4>
 
                         <button type="button" class="btn btn-warning fs-4" title="Déconnexion">

web/WEB-INF/web.xml

@@ -20,6 +20,11 @@
         <servlet-name>feuilleGardes</servlet-name>
         <servlet-class>servlet.GardesServlet</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>GPServlet</servlet-name>
+        <servlet-class>servlet.GPServlet</servlet-class>
+    </servlet>
+    
     <servlet-mapping>
         <servlet-name>AuthentifServlet</servlet-name>
         <url-pattern>/authentification</url-pattern>
@@ -32,6 +37,11 @@
         <servlet-name>feuilleGardes</servlet-name>
         <url-pattern>/gardes</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>GPServlet</servlet-name>
+        <url-pattern>/PompierGarde</url-pattern>
+    </servlet-mapping>
+    
     <session-config>
         <session-timeout>
             30

web/css/mycss.css

@@ -18,7 +18,7 @@ body {
 }
 fieldset {
     border-radius: 5px;
-    padding: 5px;
+    padding: 3px;
     border: 1px solid #DB0005;
     width: 100%;
 }
@@ -84,3 +84,31 @@ 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 {
+    height: 20px;
+    width : 18px;
+    border-color: black;
+
+}
+
+.ztVentil:hover {
+    border-color: grey;    
+}