From 1a26976d0aa3766b3634e64183d423720d7404f2 Mon Sep 17 00:00:00 2001
From: "thomas.millot" <thomas.millot@sio211-07.sio.lan>
Date: Wed, 20 Oct 2021 11:49:53 +0200
Subject: [PATCH] Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
---
 src/java/bdd/PompierMysql.java | 130 ---------------------------------
 web/WEB-INF/ProfilJSP.jsp      |  26 +++----
 2 files changed, 13 insertions(+), 143 deletions(-)

diff --git a/src/java/bdd/PompierMysql.java b/src/java/bdd/PompierMysql.java
index 906813a..441bf99 100644
--- a/src/java/bdd/PompierMysql.java
+++ b/src/java/bdd/PompierMysql.java
@@ -32,135 +32,6 @@ public class PompierMysql {
         theConnection = Connexion.getConnect("localhost", "sdis29", "admin", "minda");
     }
 
-    public ArrayList<Pompier> readAll() {
-        ArrayList<Pompier> lesPompiers = new ArrayList<>();
-
-        try {
-            Statement stmt = theConnection.createStatement();
-            ResultSet resultQ = null;
-            resultQ = stmt.executeQuery("SELECT * FROM pompier");
-            while (resultQ.next()) {
-                unPompier = new Pompier(resultQ.getInt("id"),
-                        resultQ.getString("nom"),
-                        resultQ.getString("prenom"),
-                        resultQ.getString("statut"),
-                        resultQ.getString("typePers"),
-                        resultQ.getString("mail"),
-                        resultQ.getString("login"),
-                        resultQ.getString("mdp"),
-                        resultQ.getString("adresse"),
-                        resultQ.getInt("cp"),
-                        resultQ.getString("ville"),
-                        resultQ.getInt("bip"),
-                        resultQ.getInt("nbGardes"),
-                        resultQ.getInt("grade"),
-                        resultQ.getString("commentaire"),
-                        resultQ.getString("dateEnreg"),
-                        resultQ.getString("dateModif"));
-                lesPompiers.add(unPompier);
-            }
-            resultQ.close();
-            stmt.close();
-            //theConnection.close();
-        } catch (SQLException ex) {
-            System.out.println("SQLException : " + ex.getMessage());
-            System.out.println("SQLState : " + ex.getSQLState());
-            System.out.println("Code erreur : " + ex.getErrorCode());
-        }
-
-        return lesPompiers;
-    }
-
-    /**
-     * Creation du client passé en paramètre dans la table client Requête non
-     * préparée
-     *
-     * @param c objet de type Client (sans identifiant)
-     * @return int : id du client créé
-     */
-    public int create(Pompier p) {
-        int id = -1;
-        try {
-            Statement stmt = theConnection.createStatement();
-            int status = stmt.executeUpdate(
-                    "INSERT INTO pompier (nom, prenom, statut, mail, login, mdp, adresse, cp, ville, bip, nbGardes, grade, commentaire, dateEnreg, dateModif) "
-                    + "VALUES ('" + p.getNom() + "', '"
-                    + p.getPrenom() + "', '"
-                    + p.getStatut() + "', "
-                    + p.getMail() + ", '"
-                    + p.getLogin() + "', '"
-                    + p.getMdp() + "', '"
-                    + p.getAdresse() + "', '"
-                    + p.getVille() + "', '"
-                    + p.getBip() + "', '"
-                    + p.getNbGardes() + "', '"
-                    + p.getGrade() + "', '"
-                    + p.getCommentaire() + "', '"
-                    + p.getDateEnreg() + "', '"
-                    + p.getDateModif() + "');",
-                    Statement.RETURN_GENERATED_KEYS);
-
-            // Recherche de l'identifiant du client 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 client passé en paramètre dans la table client Requête
-     * préparée
-     *
-     * @param c objet de type Client (sans identifiant)
-     * @return int : id du client créé
-     */
-    public int createRP(Pompier p) {
-        int id = -1;
-        try {
-            PreparedStatement stmt = null;
-            String sql = "INSERT INTO pompier (nom, prenom, statut, mail, login, mdp, adresse, cp, ville, bip, nbGardes, grade, commentaire, dateEnreg, dateModif) "
-                    + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
-            stmt = theConnection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
-            stmt.setString(1, p.getNom());
-            stmt.setString(2, p.getPrenom());
-            stmt.setString(3, p.getStatut());
-            stmt.setString(4, p.getMail());
-            stmt.setString(5, p.getLogin());
-            stmt.setString(6, p.getMdp());
-            stmt.setString(7, p.getAdresse());
-            stmt.setString(8, p.getVille());
-            stmt.setInt(9, p.getBip());
-            stmt.setInt(10, p.getNbGardes());
-            stmt.setInt(11, p.getGrade());
-            stmt.setString(12, p.getCommentaire());
-            stmt.setString(13, p.getDateEnreg());
-            stmt.setString(14, p.getDateModif());
-            System.out.println("Requête : " + stmt.toString());
-            int status = stmt.executeUpdate();
-
-            // Recherche de l'identifiant du client 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;
-    }
-
     public boolean readPompier(HttpServletRequest request) {
         boolean reponse = false;
         Statement stmt;
@@ -180,7 +51,6 @@ public class PompierMysql {
         }
 
         return reponse;
-
     }
 
 }
diff --git a/web/WEB-INF/ProfilJSP.jsp b/web/WEB-INF/ProfilJSP.jsp
index 240b561..7b2da3f 100644
--- a/web/WEB-INF/ProfilJSP.jsp
+++ b/web/WEB-INF/ProfilJSP.jsp
@@ -5,23 +5,23 @@
         <td style='border :0px;'>
             <fieldset><legend>Coordonnées Pompier</legend>
                 <table>
-                    <tr><th>Nom : <input type="text" name="ztNom"  size="20" maxlength="30"></th></tr>
-                    <tr><th>Pré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é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 readonly type="text" name="ztNom"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Prénom : <input readonly type="text" name="ztPrenom"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Adresse : <input readonly type="text" name="ztAdr"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Ville : <input readonly type="text"name="ztVille"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Code postal : <input readonly type="text" 	name="ztCp"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Téléphone : <input readonly type="text" 	name="ztTel"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Mail : <input readonly type="text" 	name="ztMail"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Statut : <input readonly type="text" 	name="ztStatut"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Grade : <input readonly type="text" 	name="ztGrade"  size="20" maxlength="30"></th></tr>
                 </table>
             </fieldset>
             <fieldset><legend>Coordonnées Employeur</legend>
                 <table>
-                    <tr><th>Nom employeur : <input type="text" name="ztNomEmp"  size="20" maxlength="30"></th></tr>
-                    <tr><th>Téléphone employeur : <input type="text" name="ztTelEmp"  size="20" maxlength="30"></th></tr>
-                    <tr><th>Adresse employeur : <input type="text" name="ztadrEmp"  size="20" maxlength="30"></th></tr>
-                    <tr><th>Mail employeur : <input type="text" name="ztMailEmp"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Nom employeur : <input readonly type="text" name="ztNomEmp"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Téléphone employeur : <input readonly type="text" name="ztTelEmp"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Adresse employeur : <input readonly type="text" name="ztadrEmp"  size="20" maxlength="30"></th></tr>
+                    <tr><th>Mail employeur : <input readonly type="text" name="ztMailEmp"  size="20" maxlength="30"></th></tr>
                 </table>
             </fieldset>
         </td>