Merge origin/master

Conflicts:
	src/java/com/test/forms/AuthentifForm.java
	web/WEB-INF/PompierJSP.jsp
This commit is contained in:
funcha.ahamadi
2021-10-21 15:16:16 +02:00
parent 0f1e30e12e
commit d4d16b1360
9 changed files with 191 additions and 100 deletions

View File

@@ -5,6 +5,7 @@
--%>
<%@include file = "jspf/enteteJSPF.jspf" %>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html>
<html>
<head>
@@ -17,44 +18,42 @@
<legend>Fiche Pompier</legend>
<form name="fPompier" method="POST" action="ModifPompier">
<label for="nIdCaserne">Id Caserne : </label>
<input type="number" name="nIdCaserne"/><br /><br/>
<input type="number" name="nIdCaserne" <c:out value="${unPompier.getIdCaserne()}"/><br /><br/>
<label for="ztNom">Nom : </label>
<input type="text" name="ztNom" placeholder="Nom" /><br /><br/>
<input type="text" name="ztNom" placeholder="Nom" <c:out value="${unPompier.getNom()}"/><br /><br/>
<label for="ztPrenom">Prénom : </label>
<input type="text" name="ztPrenom" placeholder="Prénom"/><br /><br/>
<input type="text" name="ztPrenom" placeholder="Prénom" <c:out value="${unPompier.getPrenom()}"/><br /><br/>
<label for="nStatut">Numéro de statut : </label>
<input type="number" name="nStatut"/><br /><br/>
<input type="number" name="nStatut" <c:out value="${unPompier.getStatut()}"/><br /><br/>
<label for="eMail">Mail : </label>
<input type="email" name="eMail"/><br /><br/>
<input type="email" name="eMail"<c:out value="${unPompier.getAdrmail()}"/> <br /><br/>
<label for="ztLogin">Login : </label>
<input type="text" name="ztLogin" placeholder="Login"/><br /><br/>
<input type="text" name="ztLogin" placeholder="Login"<c:out value="${unPompier.getLogin()}"/><br /><br/>
<label for="ztMDP">Mot de passe : </label>
<input type="password" name="ztMDP" placeholder="Mot de passe" /><br /><br />
<input type="password" name="ztMDP" placeholder="Mot de passe" <c:out value="${unPompier.getMdp()}"/><br /><br />
<label for="nAdrNo">Numéro de rue : </label>
<input type="number" name="nAdrNo"/><br /><br/>
<input type="number" name="nAdrNo"<br <c:out value="${unPompier.getAdrNo()}"/> <br/>
<label for="ztAdrRue">Nom de la rue : </label>
<input type="text" name="ztAdrRue" placeholder="Rue" /><br /><br/>
<input type="text" name="ztAdrRue" placeholder="Rue" <c:out value="${unPompier.getAdrRue()}"/><br /><br/>
<label for="ztAdrCP">Code postal : </label>
<input type="text" name="ztAdrCP" placeholder="Code postal" /><br /><br/>
<input type="text" name="ztAdrCP" placeholder="Code postal" <c:out value="${unPompier.getAdrCP()}"/><br /><br/>
<label for="ztAdrVille">Ville : </label>
<input type="text" name="ztAdrVille" placeholder="Ville" /><br /><br/>
<input type="text" name="ztAdrVille" placeholder="Ville" <c:out value="${unPompier.getAdrVille()}"/><br /><br/>
<label for="nGrade">Numéro de grade : </label>
<input type="number" name="nGrade"/><br /><br/>
<input type="number" name="nGrade"<c:out value="${unPomier.getGrade()}"/></td><br /><br/>
<input type="submit" value="Valider" />
</form>
</fieldset>
<c:out value="${unPompier.getIdCaserne()}"/></td>
<c:out value="${unPompier.getNom()}"/>
<c:out value="${unPompier.getPrenom()}"/>
<c:out value="${unPompier.getStatut()}"/>
<c:out value="${unPompier.getAdrmail()}"/>
<c:out value="${unPompier.getLogin()}"/>
<c:out value="${unPompier.getMdp()}"/>
<c:out value="${unPompier.getAdrNo()}"/>
<c:out value="${unPompier.getAdrRue()}"/>
<c:out value="${unPompier.getAdrCP()}"/>
<c:out value="${unPompier.getAdrVille()}"/>
<c:out value="${unPomier.getGrade()}"/></td>
</fieldset>
</body>
</html>