Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java
	src/java/com/test/servlets/AuthentifServlet.java
	web/WEB-INF/AuthentificationJSP.jsp
	web/WEB-INF/ProfilJSP.jsp
This commit is contained in:
elliass.chelloug
2021-10-20 11:50:22 +02:00
5 changed files with 162 additions and 23 deletions

View File

@@ -5,15 +5,15 @@
<td style='border :0px;'>
<fieldset><legend>Coordonn<6E>es Pompier</legend>
<table>
<tr><th>Nom :<input type="text" name="ztNom" size="20" maxlength="30"></th></tr>
<tr><th>Pr<50>nom :<input type="text" name="ztPrenom" size="20" maxlength="30"></th></tr>
<tr><th>Adresse :<input type="text" name="ztAdr" size="20" maxlength="30"></th></tr>
<tr><th>Ville :<input type="text"name="ztVille" size="20" maxlength="30"></th></tr>
<tr><th>Code postal :<input type="text" name="ztCp" size="20" maxlength="30"></th></tr>
<tr><th>T<>l<EFBFBD>phone :<input type="text" name="ztTel" size="20" maxlength="30"></th></tr>
<tr><th>Mail :<input type="text" name="ztMail" size="20" maxlength="30"></th></tr>
<tr><th>Statut :<input type="text" name="ztStatut" size="20" maxlength="30"></th></tr>
<tr><th>Grade :<input type="text" name="ztGrade" size="20" maxlength="30"></th></tr>
<tr><th>Nom : <input type="text" name="ztNom" size="20" maxlength="30"></th></tr>
<tr><th>Pr<50>nom : <input type="text" name="ztPrenom" size="20" maxlength="30"></th></tr>
<tr><th>Adresse : <input type="text" name="ztAdr" size="20" maxlength="30"></th></tr>
<tr><th>Ville : <input type="text"name="ztVille" size="20" maxlength="30"></th></tr>
<tr><th>Code postal : <input type="text" name="ztCp" size="20" maxlength="30"></th></tr>
<tr><th>T<>l<EFBFBD>phone : <input type="text" name="ztTel" size="20" maxlength="30"></th></tr>
<tr><th>Mail : <input type="text" name="ztMail" size="20" maxlength="30"></th></tr>
<tr><th>Statut : <input type="text" name="ztStatut" size="20" maxlength="30"></th></tr>
<tr><th>Grade : <input type="text" name="ztGrade" size="20" maxlength="30"></th></tr>
</table>
</fieldset>
<fieldset><legend>Coordonn<6E>es Employeur</legend>