Merge origin/master

Conflicts: web/WEB-INF/feuilleGardes.jsp web/css/mycss.css
2021-12-15 10:39:48 +01:00
parent 3162d0eeb3
commit ad612c663c
4 changed files with 60 additions and 33 deletions
--- a/web/WEB-INF/feuilleGardes.jsp
+++ b/web/WEB-INF/feuilleGardes.jsp
@@ -55,6 +55,8 @@
                        <c:set var="activite" value='${uneVentil.getDisponibilite()}' scope="page"/>
                        <td>
                            <input readonly type="text" value='${activite}' name="lesActivites"class="ztVentil ${sessionScope.lesCouleurs[activite]}"/>
+                            <input type="checkbox" id="cbGarde"/>
+                           
                        </td>
                    </c:forEach>
                </tr>