Merge origin/master

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

web/WEB-INF/feuilleGardes.jsp

@@ -36,6 +36,26 @@
                                 </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"/>
+                        <td>
+                            <input readonly type="text" value='${activite}' name="lesActivites"class="ztVentil ${sessionScope.lesCouleurs[activite]}"/>
+                        </td>
+                    </c:forEach>
+                </tr>
+
+            </tbody>
                     </table>
                     <div id="legendCouleur">
 
@@ -50,6 +70,22 @@
         </section>
     </div>
 </body>
+<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>
 
 
 

web/css/mycss.css

@@ -18,7 +18,7 @@ body {
 }
 fieldset {
     border-radius: 5px;
-    padding: 2px;
+    padding: 3px;
     border: 1px solid #DB0005;
     width: 100%;
 }
@@ -103,8 +103,8 @@ select[readonly] {
 }
 
 .ztVentil {
-    width : 40%;
-    border: 3px solid;   
+    width : 15px;
+      border-color: black;
 
 }