Merge origin/master

Conflicts: src/java/com/test/forms/AuthentifForm.java web/WEB-INF/PompierJSP.jsp
2021-10-20 11:00:53 +02:00
parent 99b4e221cc 75c661ec0c
commit 6f28642e3d
5 changed files with 24 additions and 15 deletions
--- a/web/WEB-INF/ChefCaserneJSP.jsp
+++ b/web/WEB-INF/ChefCaserneJSP.jsp
@@ -48,6 +48,7 @@
                        <td><c:out value="${unPompier.getAdrCP()}"/></td>
                        <td><c:out value="${unPompier.getAdrVille()}"/></td>
                        <td><c:out value="${unPompier.getGrade()}"/></td>
+                        <td><c:out value="${unPompier.getCom()}"/></td>
                    </tr>                              
                </c:forEach>
                
--- a/web/WEB-INF/PompierJSP.jsp
+++ b/web/WEB-INF/PompierJSP.jsp
@@ -9,9 +9,10 @@
 <html>
    <head>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>JSP Page</title>
+        <title>Pompier</title>
    </head>
    <body>
-        <h1>PompierJSP</h1>
+        <h1>Hello World!</h1>
+        <a href="ModifPompier"><input type="button" name="btModifP" value="Modifier la fiche pompier"/></a>
    </body>
 </html>