Merge origin/master

Conflicts:
	web/WEB-INF/ChefCaserneJSP.jsp
	web/WEB-INF/ModifPompier.jsp
	web/WEB-INF/jspf/enteteJSPF.jspf
This commit is contained in:
funcha.ahamadi
2021-10-20 10:58:58 +02:00
10 changed files with 339 additions and 8 deletions

View File

@@ -12,6 +12,49 @@
<title>Chef de caserne</title>
</head>
<body>
<h1>chef caserne</h1>
<h1>Les pompiers :</h1>
<table border="1" cellspacing="3" cellpadding="1">
<thead>
<tr>
<th>Id</th>
<th>IdCaserne</th>
<th>Nom</th>
<th>Prénom</th>
<th>Numéro de statut</th>
<th>Mail</th>
<th>Login</th>
<th>Mot de passe</th>
<th>No rue</th>
<th>Nom rue</th>
<th>Code postal</th>
<th>Ville</th>
<th>Numéro de grade</th>
<th>Commentaire</th>
</tr>
</thead>
<tbody>
<c:forEach items="${lesPompiers}" var="unPompier">
<tr>
<td><c:out value="${unPompier.getId()}"/></td>
<td><c:out value="${unPompier.getIdCaserne()}"/></td>
<td><c:out value="${unPompier.getNom()}"/></td>
<td><c:out value="${unPompier.getPrenom()}"/></td>
<td><c:out value="${unPompier.getStatut()}"/></td>
<td><c:out value="${unPompier.getMail()}"/></td>
<td><c:out value="${unPompier.getLogin()}"/></td>
<td><c:out value="${unPompier.getMdp()}"/></td>
<td><c:out value="${unPompier.getAdrNo()}"/></td>
<td><c:out value="${unPompier.getAdrRue()}"/></td>
<td><c:out value="${unPompier.getAdrCP()}"/></td>
<td><c:out value="${unPompier.getAdrVille()}"/></td>
<td><c:out value="${unPompier.getGrade()}"/></td>
</tr>
</c:forEach>
</tbody>
</table>
<br />
<a href="ModifPompier"><input type="button" name="btModifP" value="Modifier la fiche pompier"/></a>
<a href="CreaPompier" ><input type="button" name="btNouvP" value="Créer nouveau pompier"/></a>
</body>
</html>

View File

@@ -9,9 +9,52 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSP Page</title>
<title>Modification</title>
</head>
<body>
<h1>ModifPompier</h1>
<h1>Modification des informations :</h1>
<fieldset>
<legend>Fiche Pompier</legend>
<form name="fPompier" method="POST" action="ModifPompier">
<label for="nIdCaserne">Id Caserne : </label>
<input type="number" name="nIdCaserne"/><br /><br/>
<label for="ztNom">Nom : </label>
<input type="text" name="ztNom" placeholder="Nom" /><br /><br/>
<label for="ztPrenom">Prénom : </label>
<input type="text" name="ztPrenom" placeholder="Prénom"/><br /><br/>
<label for="nStatut">Numéro de statut : </label>
<input type="number" name="nStatut"/><br /><br/>
<label for="eMail">Mail : </label>
<input type="email" name="eMail"/><br /><br/>
<label for="ztLogin">Login : </label>
<input type="text" name="ztLogin" placeholder="Login"/><br /><br/>
<label for="ztMDP">Mot de passe : </label>
<input type="password" name="ztMDP" placeholder="Mot de passe" /><br /><br />
<label for="nAdrNo">Numéro de rue : </label>
<input type="number" name="nAdrNo"/><br /><br/>
<label for="ztAdrRue">Nom de la rue : </label>
<input type="text" name="ztAdrRue" placeholder="Rue" /><br /><br/>
<label for="ztAdrCP">Code postal : </label>
<input type="text" name="ztAdrCP" placeholder="Code postal" /><br /><br/>
<label for="ztAdrVille">Ville : </label>
<input type="text" name="ztAdrVille" placeholder="Ville" /><br /><br/>
<label for="nGrade">Numéro de grade : </label>
<input type="number" name="nGrade"/><br /><br/>
<input type="submit" value="Valider" />
</form>
</fieldset>
<c:out value="${unClient.getId()}"/></td>
<c:out value="${unClient.getCivilite()}"/>
<c:out value="${unClient.getNom()}"/>
<c:out value="${unClient.getPrenom()}"/>
<c:out value="${unClient.getMdp()}"/>
<c:out value="${unClient.getAdrNo()}"/>
<c:out value="${unClient.getAdrRue()}"/>
<c:out value="${unClient.getAdrVille()}"/>
<c:out value="${unClient.getAdrCP()}"/>
<c:out value="${unClient.getAdrmail()}"/>
<c:out value="${unClient.getTel()}"/>
<c:out value="${unClient.getDateNais()}"/></td>
</body>
</html>

View File

@@ -1,4 +1,4 @@
<%-- any content can be specified here e.g.: --%>
<%@ page pageEncoding="UTF-8" %>
<h2></h2>
<img src="image/SDIS-29.png" alt="alt"/>
<p align="center"><img src="image/SDIS-29.png" alt="SDIS 29" /></p>

View File

@@ -12,6 +12,14 @@
<servlet-name>authentifServlet</servlet-name>
<servlet-class>com.test.servlets.authentifServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>ModifPompierServlet</servlet-name>
<servlet-class>com.test.servlets.ModifPompierServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>CreaPompierServlet</servlet-name>
<servlet-class>com.test.servlets.CreaPompierServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>PompierServlet</servlet-name>
<url-pattern>/Pompier</url-pattern>
@@ -24,6 +32,14 @@
<servlet-name>authentifServlet</servlet-name>
<url-pattern>/Authentification</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>ModifPompierServlet</servlet-name>
<url-pattern>/ModifPompier</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>CreaPompierServlet</servlet-name>
<url-pattern>/CreaPompier</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>
30