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 14:48:46 +02:00
parent 6f28642e3d
commit 0f1e30e12e
4 changed files with 20 additions and 25 deletions

View File

@@ -43,18 +43,18 @@
<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>
<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>
</body>
</html>