Merge origin/master

Conflicts:
	src/java/bdd/PompierMySql.java
	src/java/com/test/servlets/authentifServlet.java
	web/WEB-INF/CreaPompier.jsp

nbproject/project.properties

@@ -43,7 +43,7 @@ j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
-j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.20.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.0-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
+j2ee.platform.classpath=${j2ee.server.domain}/lib/annotations-api.jar:${j2ee.server.domain}/lib/catalina-ant.jar:${j2ee.server.domain}/lib/catalina-ha.jar:${j2ee.server.domain}/lib/catalina-ssi.jar:${j2ee.server.domain}/lib/catalina-storeconfig.jar:${j2ee.server.domain}/lib/catalina-tribes.jar:${j2ee.server.domain}/lib/catalina.jar:${j2ee.server.domain}/lib/ecj-4.20.jar:${j2ee.server.domain}/lib/el-api.jar:${j2ee.server.domain}/lib/jakartaee-migration-1.0.0-shaded.jar:${j2ee.server.domain}/lib/jasper-el.jar:${j2ee.server.domain}/lib/jasper.jar:${j2ee.server.domain}/lib/jaspic-api.jar:${j2ee.server.domain}/lib/jsp-api.jar:${j2ee.server.domain}/lib/servlet-api.jar:${j2ee.server.domain}/lib/tomcat-api.jar:${j2ee.server.domain}/lib/tomcat-coyote.jar:${j2ee.server.domain}/lib/tomcat-dbcp.jar:${j2ee.server.domain}/lib/tomcat-i18n-cs.jar:${j2ee.server.domain}/lib/tomcat-i18n-de.jar:${j2ee.server.domain}/lib/tomcat-i18n-es.jar:${j2ee.server.domain}/lib/tomcat-i18n-fr.jar:${j2ee.server.domain}/lib/tomcat-i18n-ja.jar:${j2ee.server.domain}/lib/tomcat-i18n-ko.jar:${j2ee.server.domain}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.domain}/lib/tomcat-i18n-ru.jar:${j2ee.server.domain}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.domain}/lib/tomcat-jdbc.jar:${j2ee.server.domain}/lib/tomcat-jni.jar:${j2ee.server.domain}/lib/tomcat-util-scan.jar:${j2ee.server.domain}/lib/tomcat-util.jar:${j2ee.server.domain}/lib/tomcat-websocket.jar:${j2ee.server.domain}/lib/websocket-api.jar
 j2ee.server.type=Tomcat
 jar.compress=false
 javac.classpath=\

src/java/bdd/PompierMySql.java

@@ -50,20 +50,23 @@ public class PompierMySql {
             ResultSet resultQ = null;
             resultQ = stmt.executeQuery("SELECT * FROM pompier");
             while (resultQ.next()) {
-                unPompier = new Pompier(resultQ.getInt("id"),
+                unPompier = new  Pompier (resultQ.getInt("id"),
                         resultQ.getInt("idCaserne"),
                         resultQ.getString("nom"),
                         resultQ.getString("prenom"),
                         resultQ.getInt("statut"),
+                        resultQ.getInt("typePers"),
                         resultQ.getString("mail"),
                         resultQ.getString("login"),
                         resultQ.getString("mdp"),
-                        resultQ.getInt("adrNo"),
+                        resultQ.getString("adresse"),
-                        resultQ.getString("adrRue"),
+                        resultQ.getString("cp"),
-                        resultQ.getString("adrCP"),
+                        resultQ.getString("ville"),
-                        resultQ.getString("adrVille"),
+                        resultQ.getString("bip"),
+                        resultQ.getInt("nbGardes"),
                         resultQ.getInt("grade"),
                         resultQ.getString("commentaire")
+                        resultQ.getInt("idEmployeur")
                                 );
                 lesPompiers.add(unPompier);
             }
@@ -79,47 +82,6 @@ public class PompierMySql {
         return lesPompiers;
     }
 
-    /**
-     * Creation du pompier passé en paramètre dans la table pompier Requête non
-     * préparée
-     *
-     * @param p objet de type Pompier (sans identifiant)
-     * @return int : id du Pompier créé
-     */
-    public int create(Pompier p) {
-        int id = -1;
-        try {
-            Statement stmt = theConnection.createStatement();
-            int status = stmt.executeUpdate(
-                    "INSERT INTO pompier (idCaserne, nom, prenom, statut, mail, login, mdp, adrNo, adrRue, adrCP, adrVille, grade) "
-                    + "VALUES ('" + p.getIdCaserne() + "', '"
-                    + p.getNom() + "', '"
-                    + p.getPrenom() + "', '"
-                    + p.getStatut() + "', "
-                    + p.getMail() + ", '"
-                    + p.getLogin() + ", '"
-                    + p.getMdp() + ", '"
-                    + p.getAdrNo() + ", '"
-                    + p.getAdrRue() + "', '"
-                    + p.getAdrCP() + "', '"
-                    + p.getAdrVille() + "', '"
-                    + p.getGrade() + "' );",
-                    Statement.RETURN_GENERATED_KEYS);
-
-            // Recherche de l'identifiant du pompier créé            
-            if (status > 0) {
-                ResultSet result = stmt.getGeneratedKeys();
-                if (result.first()) {
-                    id = result.getInt(1);
-                }
-            }
-        } catch (SQLException ex) {
-            System.out.println("SQLException : " + ex.getMessage());
-            System.out.println("SQLState : " + ex.getSQLState());
-            System.out.println("Code erreur : " + ex.getErrorCode());
-        }
-        return id;
-    }
 
     /**
      * Creation du pompier passé en paramètre dans la table pompier Requête
@@ -132,7 +94,7 @@ public class PompierMySql {
         int id = -1;
         try {
             PreparedStatement stmt = null;
-            String sql = "INSERT INTO pompier(idCaserne, nom, prenom, statut, mail, login, mdp, adrNo, adrRue, adrCP, adrVille, grade) "
+            String sql = "INSERT INTO pompier(idCaserne, nom, prenom, statut, typePers, mail, login, mdp, adresse, cp, ville, bip, nbGardes, grade, commentaire, idEmployeur) "
                     + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?);";
             stmt = theConnection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
             stmt.setInt(1, p.getIdCaserne());
@@ -182,7 +144,7 @@ public class PompierMySql {
             if (resultat) {
                 Pompier lePompier = new Pompier(
                         resultQ.getInt("id"),
-                        resultQ.getInt("idCAserne"),
+                        resultQ.getInt("idCaserne"),
                         resultQ.getString("nom"),
                         resultQ.getString("prenom"),
                         resultQ.getInt("statut"),
@@ -190,17 +152,21 @@ public class PompierMySql {
                         resultQ.getString("mail"),
                         resultQ.getString("login"),
                         resultQ.getString("mdp"),
-                        resultQ.getInt("adrNo"),
+                        resultQ.getString("adresse"),
-                        resultQ.getString("adrRue"),
                         resultQ.getString("cp"),
                         resultQ.getString("ville"),
+                        resultQ.getString("bip"),
+                        resultQ.getInt("nbGardes"),
                         resultQ.getInt("grade"),
-                        resultQ.getString("commentaire")
+                        resultQ.getString("commentaire"),
+                        resultQ.getInt("idEmployeur"),
+                        
                 );
                 
                 
                 HttpSession maSession = request.getSession();
-                maSession.setAttribute("lePompier", lePompier);
+                maSession.setAttribute("unPompier", lePompier);
+                System.out.println("lePompier :"+ lePompier);
             }
 
         } catch (SQLException ex) {

src/java/com/test/forms/AuthentifForm.java

@@ -49,7 +49,6 @@ public class AuthentifForm {
         return resul;
         // Mise à jour de l'attribut resultat
    
-    
     }
     
 }

src/java/com/test/servlets/ModifPompierServlet.java

@@ -5,6 +5,7 @@
  */
 package com.test.servlets;
 
+import bdd.PompierMySql;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
@@ -57,6 +58,15 @@ public class ModifPompierServlet extends HttpServlet {
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
+        PompierMySql PompierMs = new PompierMySql();
+        
+        
+        
+        
+        
+        
+        
+        
         processRequest(request, response);
     }
 

src/java/com/test/servlets/authentifServlet.java

@@ -87,7 +87,8 @@ public class authentifServlet extends HttpServlet {
          
          // Affichage de la JSP
          if(isAuthentified==true){
-              getServletContext().getRequestDispatcher("/WEB-INF/ChefCaserneJSP.jsp")
+             System.out.println("Ma session : "+maSession.getAttribute("unPompier"));
+              getServletContext().getRequestDispatcher("/WEB-INF/ModifPompier.jsp")
                  .forward(request, response); 
          }else{
              getServletContext().getRequestDispatcher("/WEB-INF/accueilJSP.jsp")

web/WEB-INF/CreaPompier.jsp

@@ -52,5 +52,6 @@
                 <input type="submit" value="Valider" />
             </form>
         </fieldset>
+        
     </body>
 </html>

web/WEB-INF/ModifPompier.jsp

@@ -5,6 +5,7 @@
 --%>
 <%@include file = "jspf/enteteJSPF.jspf" %>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <!DOCTYPE html>
 <html>
     <head>
@@ -13,6 +14,37 @@
     </head>
     <body>
         <h1>Modification des informations :</h1>
+          <fieldset>
+            <legend>Fiche Pompier</legend>
+            <form name="fPompier" method="POST" action="ModifPompier">
+                <label for="nIdCaserne">Id Caserne : </label>
+                <input type="number" name="nIdCaserne"  value="${sessionScope.unPompier.getIdCaserne()}"/><br /><br/>
+                <label for="ztNom">Nom : </label>
+                <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"  value="${unPompier.getPrenom()}"/><br /><br/>
+                <label for="nStatut">Numéro de statut : </label>
+                <input type="number" name="nStatut"  value="${unPompier.getStatut()}"/><br /><br/>
+                <label for="eMail">Mail : </label>
+                <input type="email" name="eMail" value="${unPompier.getAdrmail()}"/> <br /><br/>
+                <label for="ztLogin">Login : </label>
+                <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" 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" value="${unPompier.getAdrRue()}"/><br /><br/>
+                <label for="ztAdrCP">Code postal : </label>
+                <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"    value="${unPompier.getAdrVille()}"/><br /><br/>
+                <label for="nGrade">Numéro de grade : </label>
+                <input type="number" name="nGrade" value="${unPomier.getGrade()}"/><br /><br/>
+                <input type="submit" value="Valider" />
+            </form>
+          </fieldset>  
+                       
                   
     </body>
 </html>

web/WEB-INF/PompierJSP.jsp

@@ -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>