Merge origin/master

Conflicts:
	src/java/bdd/PompierMySql.java
	src/java/com/test/forms/AuthentifForm.java
	src/java/com/test/forms/NouveauPompForm.java
	src/java/com/test/servlets/authentifServlet.java
This commit is contained in:
funcha.ahamadi
2021-10-21 16:44:28 +02:00
8 changed files with 78 additions and 103 deletions

View File

@@ -28,7 +28,7 @@
<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>
<label for="ztMDP">Mot de passe : </label>resultQ.getInt("idEmployeur"),
<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/>
@@ -40,8 +40,7 @@
<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="="nStatut"/><br /><br/>
<label for="eMail">Mail :Valider" />
<input type="submit" value="Valider"/><br /><br/>resultQ.getInt("idEmployeur"),
</form>
</fieldset>