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:
@@ -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>
|
||||
|
||||
|
@@ -18,42 +18,33 @@
|
||||
<legend>Fiche Pompier</legend>
|
||||
<form name="fPompier" method="POST" action="ModifPompier">
|
||||
<label for="nIdCaserne">Id Caserne : </label>
|
||||
<input type="number" name="nIdCaserne" <c:out value="${unPompier.getIdCaserne()}"/><br /><br/>
|
||||
<input type="number" name="nIdCaserne" value="${sessionScope.unPompier.getIdCaserne()}"/><br /><br/>
|
||||
<label for="ztNom">Nom : </label>
|
||||
<input type="text" name="ztNom" placeholder="Nom" <c:out value="${unPompier.getNom()}"/><br /><br/>
|
||||
<input type="text" name="ztNom" placeholder="Nom" value="${unPompier.getNom()}"/><br /><br/>
|
||||
<label for="ztPrenom">Prénom : </label>
|
||||
<input type="text" name="ztPrenom" placeholder="Prénom" <c:out value="${unPompier.getPrenom()}"/><br /><br/>
|
||||
<input type="text" name="ztPrenom" placeholder="Prénom" value="${unPompier.getPrenom()}"/><br /><br/>
|
||||
<label for="nStatut">Numéro de statut : </label>
|
||||
<input type="number" name="nStatut" <c:out value="${unPompier.getStatut()}"/><br /><br/>
|
||||
<input type="number" name="nStatut" value="${unPompier.getStatut()}"/><br /><br/>
|
||||
<label for="eMail">Mail : </label>
|
||||
<input type="email" name="eMail"<c:out value="${unPompier.getAdrmail()}"/> <br /><br/>
|
||||
<input type="email" name="eMail" value="${unPompier.getAdrmail()}"/> <br /><br/>
|
||||
<label for="ztLogin">Login : </label>
|
||||
<input type="text" name="ztLogin" placeholder="Login"<c:out value="${unPompier.getLogin()}"/><br /><br/>
|
||||
<input type="text" name="ztLogin" placeholder="Login" value="${unPompier.getLogin()}"/><br /><br/>
|
||||
<label for="ztMDP">Mot de passe : </label>
|
||||
<input type="password" name="ztMDP" placeholder="Mot de passe" <c:out value="${unPompier.getMdp()}"/><br /><br />
|
||||
<input type="password" name="ztMDP" placeholder="Mot de passe" value="${unPompier.getMdp()}"/><br /><br />
|
||||
<label for="nAdrNo">Numéro de rue : </label>
|
||||
<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" <c:out value="${unPompier.getAdrRue()}"/><br /><br/>
|
||||
<input type="text" name="ztAdrRue" placeholder="Rue" value="${unPompier.getAdrRue()}"/><br /><br/>
|
||||
<label for="ztAdrCP">Code postal : </label>
|
||||
<input type="text" name="ztAdrCP" placeholder="Code postal" <c:out value="${unPompier.getAdrCP()}"/><br /><br/>
|
||||
<input type="text" name="ztAdrCP" placeholder="Code postal" value="${unPompier.getAdrCP()}"/><br /><br/>
|
||||
<label for="ztAdrVille">Ville : </label>
|
||||
<input type="text" name="ztAdrVille" placeholder="Ville" <c:out value="${unPompier.getAdrVille()}"/><br /><br/>
|
||||
<input type="text" name="ztAdrVille" placeholder="Ville" value="${unPompier.getAdrVille()}"/><br /><br/>
|
||||
<label for="nGrade">Numéro de grade : </label>
|
||||
<input type="number" name="nGrade"<c:out value="${unPomier.getGrade()}"/></td><br /><br/>
|
||||
<input type="number" name="nGrade" value="${unPomier.getGrade()}"/><br /><br/>
|
||||
<input type="submit" value="Valider" />
|
||||
</form>
|
||||
</fieldset>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
@@ -12,7 +12,7 @@
|
||||
<title>Pompier</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Hello World!</h1>
|
||||
<h1>Bienvenue</h1>
|
||||
<a href="ModifPompier"><input type="button" name="btModifP" value="Modifier la fiche pompier"/></a>
|
||||
</body>
|
||||
</html>
|
||||
|
Reference in New Issue
Block a user