Compare commits
No commits in common. "c1b8fa7a276d929ec8b0e797e964e8ab39ce4f8a" and "40db789d0671b2bc2152748a31fe3c9b0732d0ac" have entirely different histories.
c1b8fa7a27
...
40db789d06
@ -36,7 +36,7 @@ j2ee.compile.on.save=true
|
||||
j2ee.copy.static.files.on.save=true
|
||||
j2ee.deploy.on.save=true
|
||||
j2ee.platform=1.7-web
|
||||
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.20.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.0-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
|
||||
j2ee.platform.classpath=${j2ee.server.domain}/lib/annotations-api.jar:${j2ee.server.domain}/lib/catalina-ant.jar:${j2ee.server.domain}/lib/catalina-ha.jar:${j2ee.server.domain}/lib/catalina-ssi.jar:${j2ee.server.domain}/lib/catalina-storeconfig.jar:${j2ee.server.domain}/lib/catalina-tribes.jar:${j2ee.server.domain}/lib/catalina.jar:${j2ee.server.domain}/lib/ecj-4.20.jar:${j2ee.server.domain}/lib/el-api.jar:${j2ee.server.domain}/lib/jakartaee-migration-1.0.0-shaded.jar:${j2ee.server.domain}/lib/jasper-el.jar:${j2ee.server.domain}/lib/jasper.jar:${j2ee.server.domain}/lib/jaspic-api.jar:${j2ee.server.domain}/lib/jsp-api.jar:${j2ee.server.domain}/lib/servlet-api.jar:${j2ee.server.domain}/lib/tomcat-api.jar:${j2ee.server.domain}/lib/tomcat-coyote.jar:${j2ee.server.domain}/lib/tomcat-dbcp.jar:${j2ee.server.domain}/lib/tomcat-i18n-cs.jar:${j2ee.server.domain}/lib/tomcat-i18n-de.jar:${j2ee.server.domain}/lib/tomcat-i18n-es.jar:${j2ee.server.domain}/lib/tomcat-i18n-fr.jar:${j2ee.server.domain}/lib/tomcat-i18n-ja.jar:${j2ee.server.domain}/lib/tomcat-i18n-ko.jar:${j2ee.server.domain}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.domain}/lib/tomcat-i18n-ru.jar:${j2ee.server.domain}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.domain}/lib/tomcat-jdbc.jar:${j2ee.server.domain}/lib/tomcat-jni.jar:${j2ee.server.domain}/lib/tomcat-util-scan.jar:${j2ee.server.domain}/lib/tomcat-util.jar:${j2ee.server.domain}/lib/tomcat-websocket.jar:${j2ee.server.domain}/lib/websocket-api.jar
|
||||
j2ee.server.type=Tomcat
|
||||
jar.compress=false
|
||||
javac.classpath=\
|
||||
|
||||
@ -10,6 +10,6 @@ Variables de session :
|
||||
Variables mises en session dans PompierServlet.java)
|
||||
lePompier : pompier à afficher dans pompierJSP
|
||||
|
||||
Attributs utilisés entre la serlvet PompierServlet.java et pompierJSP :
|
||||
Attributs utilisés entre la servet 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
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
*/
|
||||
package form;
|
||||
|
||||
import bdd.GardeMySQL;
|
||||
|
||||
import bdd.gardeMySQL;
|
||||
import bean.Gardes;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
@ -24,7 +23,7 @@ public class DispoForm {
|
||||
HttpSession maS = request.getSession();
|
||||
ArrayList <Gardes> lesG = (ArrayList<Gardes>) maS.getAttribute("lesVentilInit");
|
||||
|
||||
GardeMySQL vm = new GardeMySQL();
|
||||
gardeMySQL vm = new gardeMySQL();
|
||||
Map<String, String[]> map = request.getParameterMap();
|
||||
String[] lesNvVentil = map.get("lesAct");
|
||||
int i = 0;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
package servlet;
|
||||
|
||||
import bdd.GardeMySQL;
|
||||
|
||||
import bdd.gardeMySQL;
|
||||
import bean.Gardes;
|
||||
import bean.Pompier;
|
||||
import form.DispoForm;
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
<%@page contentType="text/html" pageEncoding="UTF-8"%>
|
||||
<%@include file= "jspf/debutJSP.jspf" %>
|
||||
<body>
|
||||
|
||||
<%@include file= "jspf/header.jspf" %>
|
||||
<div class="container">
|
||||
<section id="contenueAffiche" class="row">
|
||||
|
||||
<section id="contenuAffiche" class="row">
|
||||
|
||||
|
||||
<fieldset class="row mt-1 mb-10">
|
||||
@ -57,36 +57,10 @@
|
||||
|
||||
</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 : X</span>
|
||||
|
||||
</div>
|
||||
</form>
|
||||
</fieldset>
|
||||
</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>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -127,7 +127,55 @@
|
||||
</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">
|
||||
|
||||
@ -18,7 +18,7 @@ body {
|
||||
}
|
||||
fieldset {
|
||||
border-radius: 5px;
|
||||
padding: 3px;
|
||||
padding: 5px;
|
||||
border: 1px solid #DB0005;
|
||||
width: 100%;
|
||||
}
|
||||
@ -84,30 +84,10 @@ 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 {
|
||||
width : 15px;
|
||||
border-color: black;
|
||||
|
||||
}
|
||||
|
||||
.ztVentil:hover {
|
||||
border-color: grey;
|
||||
.ztVentil{
|
||||
width:20px;
|
||||
}
|
||||
td{
|
||||
margin-left:2px;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user