Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java

.gitignore

@@ -1,2 +1,3 @@
 /nbproject/private/
 /build/
+/dist/

src/java/bdd/ClientMysql.java

@@ -1,22 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package bdd;
-
-import java.sql.Connection;
-
-/**
- *
- * @author thomas.millot
- */
-public class ClientMysql {
-    
-    private Connection theConnection;
-    
-    public ClientMysql()
-    {
-        theConnection = Connexion.getConnect("localhost", "sdis29", "admin", "minda");
-    }
-}

src/java/bdd/Connexion.java

@@ -1,4 +1,5 @@
 package bdd;
+
 /*
 Connexion.java
 Classe permettant d'établir une connexion avec une base de données mySQL
@@ -7,10 +8,12 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 
 public class Connexion {
+
     private static Connection connect;      // Variable de connexion
 
     /**
      * Constructeur
+     *
      * @param serveur nom du serveur, localhost si local
      * @param bdd nom de la base de données
      * @param nomUtil nom utilisateur
@@ -44,7 +47,9 @@ public class Connexion {
     }
 
     /**
-     * Retourne la connection établie (Création d'une connection si elle n'existe pas)
+     * Retourne la connection établie (Création d'une connection si elle
+     * n'existe pas)
+     *
      * @param serveur nom du serveur, localhost si local
      * @param bdd nom de la base de données
      * @param nomUtil nom utilisateur

src/java/bdd/PompierMysql.java

@@ -0,0 +1,186 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package bdd;
+
+import com.mysql.cj.xdevapi.Client;
+import com.test.beans.Pompier;
+import com.test.forms.MD5;
+import jakarta.servlet.http.HttpServletRequest;
+import java.net.http.HttpRequest;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author thomas.millot
+ */
+public class PompierMysql {
+
+    private Connection theConnection;
+    private Pompier unPompier;
+
+    public 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;
+        String userSaisi = request.getParameter("ztPseudo");
+        String mdpSaisi = request.getParameter("ztMDP");
+        String mdpChiffre = MD5.encode(mdpSaisi);
+        System.out.println("userSaisi : "+ userSaisi);
+        System.out.println("mdpSaisi : "+ mdpChiffre);
+        try {
+            System.out.println("Select * FROM pompier WHERE login = '"+userSaisi+"' AND mdp = '"+mdpChiffre+"';");
+            stmt = theConnection.createStatement();
+            ResultSet resultQ = null;
+            resultQ = stmt.executeQuery("Select * FROM pompier WHERE login = '"+userSaisi+"' AND mdp = '"+mdpChiffre+"';");
+            reponse = resultQ.next();                
+        } catch (SQLException ex) {
+            Logger.getLogger(PompierMysql.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+        return reponse;
+
+    }
+
+}

src/java/com/test/beans/Pompier.java

@@ -0,0 +1,306 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.test.beans;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author thomas.millot
+ */
+public class Pompier {
+
+    private int id;
+    private int idCaserne;
+    private String nom;
+    private String prenom;
+    private String Statut;
+    private String typePers;
+    private String mail;
+    private String login;
+    private String mdp;
+    private String adresse;
+    private int cp;
+    private String ville;
+    private int bip;
+    private int nbGardes;
+    private int grade;
+    private String commentaire;
+    private String dateEnreg;
+    private String dateModif;
+
+    public Pompier(int id, int idCaserne, String nom, String prenom, String Statut, String typePers, String mail, String login, String mdp, String adresse, int cp, String ville, int bip, int nbGardes, int grade, String commentaire, String dateEnreg, String dateModif) {
+        this.id = id;
+        this.idCaserne = idCaserne;
+        this.nom = nom;
+        this.prenom = prenom;
+        this.Statut = Statut;
+        this.typePers = typePers;
+        this.mail = mail;
+        this.login = login;
+        this.mdp = mdp;
+        this.adresse = adresse;
+        this.cp = cp;
+        this.ville = ville;
+        this.bip = bip;
+        this.nbGardes = nbGardes;
+        this.grade = grade;
+        this.commentaire = commentaire;
+        this.dateEnreg = dateEnreg;
+        this.dateModif = dateModif;
+    }
+
+    public Pompier(int aInt, String string, String string0, String string1, String string2, int aInt0, String string3, String string4, String string5, String string6, String string7, String string8) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    public Pompier(int aInt, String string, String string0, String string1, String string2, String string3, String string4, String string5, String string6, int aInt0, String string7, int aInt1, int aInt2, int aInt3, String string8, String string9, String string10) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getIdCaserne() {
+        return idCaserne;
+    }
+
+    public void setIdCaserne(int idCaserne) {
+        this.idCaserne = idCaserne;
+    }
+
+    public String getNom() {
+        return nom;
+    }
+
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+
+    public String getPrenom() {
+        return prenom;
+    }
+
+    public void setPrenom(String prenom) {
+        this.prenom = prenom;
+    }
+
+    public String getStatut() {
+        return Statut;
+    }
+
+    public void setStatut(String Statut) {
+        this.Statut = Statut;
+    }
+
+    public String getTypePers() {
+        return typePers;
+    }
+
+    public void setTypePers(String typePers) {
+        this.typePers = typePers;
+    }
+
+    public String getMail() {
+        return mail;
+    }
+
+    public void setMail(String mail) {
+        this.mail = mail;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getMdp() {
+        return mdp;
+    }
+
+    public void setMdp(String mdp) {
+        this.mdp = mdp;
+    }
+
+    public String getAdresse() {
+        return adresse;
+    }
+
+    public void setAdresse(String adresse) {
+        this.adresse = adresse;
+    }
+
+    public int getCp() {
+        return cp;
+    }
+
+    public void setCp(int cp) {
+        this.cp = cp;
+    }
+
+    public String getVille() {
+        return ville;
+    }
+
+    public void setVille(String ville) {
+        this.ville = ville;
+    }
+
+    public int getBip() {
+        return bip;
+    }
+
+    public void setBip(int bip) {
+        this.bip = bip;
+    }
+
+    public int getNbGardes() {
+        return nbGardes;
+    }
+
+    public void setNbGardes(int nbGardes) {
+        this.nbGardes = nbGardes;
+    }
+
+    public int getGrade() {
+        return grade;
+    }
+
+    public void setGrade(int grade) {
+        this.grade = grade;
+    }
+
+    public String getCommentaire() {
+        return commentaire;
+    }
+
+    public void setCommentaire(String commentaire) {
+        this.commentaire = commentaire;
+    }
+
+    public String getDateEnreg() {
+        return dateEnreg;
+    }
+
+    public void setDateEnreg(String dateEnreg) {
+        this.dateEnreg = dateEnreg;
+    }
+
+    public String getDateModif() {
+        return dateModif;
+    }
+
+    public void setDateModif(String dateModif) {
+        this.dateModif = dateModif;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 89 * hash + this.id;
+        hash = 89 * hash + this.idCaserne;
+        hash = 89 * hash + Objects.hashCode(this.nom);
+        hash = 89 * hash + Objects.hashCode(this.prenom);
+        hash = 89 * hash + Objects.hashCode(this.Statut);
+        hash = 89 * hash + Objects.hashCode(this.typePers);
+        hash = 89 * hash + Objects.hashCode(this.mail);
+        hash = 89 * hash + Objects.hashCode(this.login);
+        hash = 89 * hash + Objects.hashCode(this.mdp);
+        hash = 89 * hash + Objects.hashCode(this.adresse);
+        hash = 89 * hash + this.cp;
+        hash = 89 * hash + Objects.hashCode(this.ville);
+        hash = 89 * hash + this.bip;
+        hash = 89 * hash + this.nbGardes;
+        hash = 89 * hash + this.grade;
+        hash = 89 * hash + Objects.hashCode(this.commentaire);
+        hash = 89 * hash + Objects.hashCode(this.dateEnreg);
+        hash = 89 * hash + Objects.hashCode(this.dateModif);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Pompier other = (Pompier) obj;
+        if (this.id != other.id) {
+            return false;
+        }
+        if (this.idCaserne != other.idCaserne) {
+            return false;
+        }
+        if (this.cp != other.cp) {
+            return false;
+        }
+        if (this.bip != other.bip) {
+            return false;
+        }
+        if (this.nbGardes != other.nbGardes) {
+            return false;
+        }
+        if (this.grade != other.grade) {
+            return false;
+        }
+        if (!Objects.equals(this.nom, other.nom)) {
+            return false;
+        }
+        if (!Objects.equals(this.prenom, other.prenom)) {
+            return false;
+        }
+        if (!Objects.equals(this.Statut, other.Statut)) {
+            return false;
+        }
+        if (!Objects.equals(this.typePers, other.typePers)) {
+            return false;
+        }
+        if (!Objects.equals(this.mail, other.mail)) {
+            return false;
+        }
+        if (!Objects.equals(this.login, other.login)) {
+            return false;
+        }
+        if (!Objects.equals(this.mdp, other.mdp)) {
+            return false;
+        }
+        if (!Objects.equals(this.adresse, other.adresse)) {
+            return false;
+        }
+        if (!Objects.equals(this.ville, other.ville)) {
+            return false;
+        }
+        if (!Objects.equals(this.commentaire, other.commentaire)) {
+            return false;
+        }
+        if (!Objects.equals(this.dateEnreg, other.dateEnreg)) {
+            return false;
+        }
+        if (!Objects.equals(this.dateModif, other.dateModif)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "Pompier{" + "id=" + id + ", idCaserne=" + idCaserne + ", nom=" + nom + ", prenom=" + prenom + ", Statut=" + Statut + ", typePers=" + typePers + ", mail=" + mail + ", login=" + login + ", mdp=" + mdp + ", adresse=" + adresse + ", cp=" + cp + ", ville=" + ville + ", bip=" + bip + ", nbGardes=" + nbGardes + ", grade=" + grade + ", commentaire=" + commentaire + ", dateEnreg=" + dateEnreg + ", dateModif=" + dateModif + '}';
+    }
+
+}

src/java/com/test/beans/User.java

@@ -6,11 +6,13 @@
 package com.test.beans;
 
 import java.util.Objects;
+
 /**
  *
  * @author thomas.millot
  */
 public class User {
+
     private String pseudo;
     private String mdp;
 

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

@@ -0,0 +1,37 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.test.forms;
+
+import bdd.PompierMysql;
+import com.test.beans.User;
+import jakarta.servlet.http.HttpServletRequest;
+
+/**
+ *
+ * @author thomas.millot
+ */
+public class AuthentifForm {
+
+    private String resultat;
+
+    public String getResultat() {
+        return resultat;
+    }
+
+    public void setResultat(String resultat) {
+        this.resultat = resultat;
+    }
+
+    public boolean authentifPompier(HttpServletRequest request) 
+    {
+        PompierMysql pms = new PompierMysql();
+        boolean reponse = pms.readPompier(request);
+        resultat = reponse ?"": "login ou mot de passe incorrect";
+        request.setAttribute("message", resultat);
+        return reponse;
+    }
+
+}

src/java/com/test/forms/MD5.java

@@ -0,0 +1,36 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.test.forms;
+
+/**
+ *
+ * @author sio
+ */
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public abstract class  MD5 {
+    
+    public static String encode(String uneChaine){
+        MessageDigest md = null;        
+        try {
+            md = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException ex) {
+            throw new IllegalArgumentException(ex);
+        }
+        md.update(uneChaine.getBytes());
+        byte[] digest = md.digest();
+        //myHash = DatatypeConverter.printHexBinary(digest).toLowerCase();
+        StringBuilder sb = new StringBuilder();
+        for (byte b : digest) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
+    }
+}

src/java/com/test/servlets/AuthentifServlet.java

@@ -5,6 +5,7 @@
  */
 package com.test.servlets;
 
+import com.test.forms.AuthentifForm;
 import java.io.IOException;
 import java.io.PrintWriter;
 import jakarta.servlet.ServletException;
@@ -71,7 +72,19 @@ public class AuthentifServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        processRequest(request, response);
+        // Création de l'objet leControle de type AuthentifForm
+        AuthentifForm leControle = new AuthentifForm();
+        // Appel de la méthode authentifPompier
+        if(leControle.authentifPompier(request))
+        {
+          getServletContext().getRequestDispatcher("/WEB-INF/ProfilJSP.jsp")
+                 .forward(request, response);   
+        }
+        else
+        {
+            getServletContext().getRequestDispatcher("/WEB-INF/AuthentificationJSP.jsp")
+                 .forward(request, response); 
+        }        
     }
 
     /**

src/java/com/test/servlets/ProfilServlet.java

@@ -30,15 +30,15 @@ public class ProfilServlet extends HttpServlet {
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         response.setContentType("text/html;charset=UTF-8");
-        try ( PrintWriter out = response.getWriter()) {
-            /* TODO output your page here. You may use following sample code. */
+        try ( PrintWriter out = response.getWriter()) 
+        {
             out.println("<!DOCTYPE html>");
             out.println("<html>");
             out.println("<head>");
-            out.println("<title>Servlet ProfilServlet</title>");            
+            out.println("<title>Servlet ProfilServlets</title>");
             out.println("</head>");
             out.println("<body>");
-            out.println("<h1>Servlet ProfilServlet at " + request.getContextPath() + "</h1>");
+            out.println("<h1>Servlet ProfilServlets at " + request.getContextPath() + "</h1>");
             out.println("</body>");
             out.println("</html>");
         }
@@ -71,7 +71,8 @@ public class ProfilServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        processRequest(request, response);
+        getServletContext().getRequestDispatcher("/WEB-INF/ProfilJSP.jsp")
+                 .forward(request, response);
     }
 
     /**

web/WEB-INF/AuthentificationJSP.jsp

@@ -1,26 +1,31 @@
 <%-- 
     Document   : authentificationJSP
     Created on : 18 oct. 2021, 11:09:26
-    Author     : Chelloug.Eliass
+    Author     : Millot.Thomas
 --%>
 <%@include file="jspf/enteteJSPF.jspf" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
+<%@page import="com.test.forms.AuthentifForm" %>
+
+<!-- Affichage du formulaire si l'utilisateur ne s'est pas encore authentifi<66> -->
 <div id="contenu">
+    <form name="frmIdentification" method="POST" action="Authentif">
     <h2>Merci de vous identifier pour acceder aux dossiers</h2>  
-	<form name="frmIdentification" method="POST" action="index.php?choixTraitement=connexion&action=valideConnexion">    
                 <fieldset><legend>Identification utilisateur</legend>
                     <br /><br />
                     <label for="nom">Nom du compte</label>
-               <input id="login" 	type="text" 	name="login"  size="30" maxlength="45" 	placeholder="Entrez votre nom d'Utilisateur">
+                    <input type="text" 	name="ztPseudo"  size="30" maxlength="45" 	placeholder="Entrez votre nom d'Utilisateur">
                     </p>
                     <p>
                         <label for="mdp">Mot de passe</label>
-                <input id="mdp" 	type="password"  name="mdp" size="30" 	maxlength="45" 	placeholder="Entrez votre Mot de Passe">
+                        <input type="password"  name="ztMDP" size="30" 	maxlength="45" 	placeholder="Entrez votre Mot de Passe">
                     </p><br /><br />
                     <input type="submit" 	name="valider"		value="Valider">
                     <input type="reset" 	name="annuler" 		value="Annuler">
                     </p>
+                    <p>${message}</p>
                 </fieldset>
     </form>
     <br/><br/>
 </div>
-
+</html>

web/WEB-INF/ModifProfilJSP.jsp

@@ -1,17 +1,36 @@
 <%-- 
     Document   : ModifProfilJSP
     Created on : 18 oct. 2021, 11:10:01
-    Author     : Chelloug.Eliass
+    Author     : Millot.thomas
 --%>
-
+<%@include file="jspf/enteteJSPF.jspf" %>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>JSP Page</title>
-    </head>
-    <body>
-        <h1>Hello World!</h1>
-    </body>
+    <form name="Profil" method="POST" action="ProfilJSP.jsp">
+<table style='border: 0px solid white;'>
+    <tr>
+        <td style='border :0px;'>
+            <fieldset><legend>Coordonnées Pompier</legend>
+                <table>
+                    <tr><th>Nom : </th><td><input type="text" name="ztNom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Prénom : </th><td><input type="text" name="ztPrenom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse : </th><td><input type="text" name="ztAdr"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Ville : </th><td><input type="text"name="ztVille"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Code postal : </th><td><input type="text" name="ztCp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Téléphone : </th><td><input type="text" name="ztTel"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail : </th><td><input type="text" name="ztMail"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Statut : </th><td><input readonly type="text" name="ztStatut"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Grade : </th><td><input readonly type="text" name="ztGrade"  size="20" maxlength="30"></td></tr>
+                </table>
+            </fieldset>
+            <fieldset><legend>Coordonnées Employeur</legend>
+                <table>
+                    <tr><th>Nom employeur : </th><td><input type="text" name="ztNomEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Téléphone employeur : </th><td><input type="text" name="ztTelEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse employeur : </th><td><input type="text" name="ztadrEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp"  size="20" maxlength="30"></td></tr>
+                </table>
+            </fieldset>
+             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">           
 </html>

web/WEB-INF/ProfilJSP.jsp

@@ -1,150 +1,31 @@
-<div id="contenu">
-<%
-$type = '';
- if ($_REQUEST['action']=="supprimer") 
-		{ 	echo '<h2>SUPPRESSION DU POMPIER '.$lesInfosPompier['nom'].' '.$lesInfosPompier['prenom'].'</h2>';
-		 	echo '<form name="frmA" 	action="index.php?choixTraitement=pompiers&action=validerSupprimer&type='.$type.'&agent='.$lesInfosPompier['id'].'" method="post">';} 
- 	if ($_REQUEST['action']=="modifier") 
-		{ 	echo '<h2>MODIFICATION DU POMPIER '.$lesInfosPompier['nom'].' '.$lesInfosPompier['prenom'].'</h2>'; 	
-			echo '<form name="frmA" 	action="index.php?choixTraitement=pompiers&action=validerModifier&type='.$type.'&agent='.$lesInfosPompier['id'].'&cis='.$lesInfosPompier['pCis'].'" method="post">';}
- 	if ($_REQUEST['action']=="ajouter") 
-		{ 	echo "<h2>AJOUT D'UN NOUVEAU POMPIER</h2>";
-			echo '
-			<form name="frmA" 	action="index.php?choixTraitement=pompiers&action=validerAjouter&type='.$type.'" method="post" onsubmit="return valider(this)">';}
-	echo ("	
+<%@include file="jspf/enteteJSPF.jspf" %>
+<br /><br />
+   <form name="frmModifProfil" method="POST" action="ModifProfilJSP.jsp">
 <table style='border: 0px solid white;'>
     <tr>
         <td style='border :0px;'>
-	<fieldset><legend>Coordonn&eacute;es</legend>
-		<table>");
-	
-$titre="Pr&eacute;nom";
- if ($_REQUEST['action']=="supprimer")  //-------------------------------------------------------- cas suppression
- {	echo ("
-			<tr><th style='width:130px;'>Nom</th>	<td style='width:130px;'>".$lesInfosPompier['nom']."</td></tr>
-			<tr><th>".$titre."</th>					<td>".$lesInfosPompier['prenom']."</td></tr>
-			<tr><th>Adresse</th>					<td>".$lesInfosPompier['pAdresse']."</td></tr>
-			<tr><th>Code postal</th>				<td>".$lesInfosPompier['pCp']."</td></tr>
-			<tr><th>Ville</th>						<td>".$lesInfosPompier['pVille']."</td></tr>
-			<tr><th>T&eacute;l&eacute;phone</th>	<td>".$lesInfosPompier['pBip']."</td></tr>					
-			<tr><th>Adresse &eacute;lectronique</th><td>".$lesInfosPompier['pMail']."</td></tr>
-			<tr><th>T&eacute;l&eacute;phone</th>	<td>".$lesInfosPompier['pTel']."</td></tr>
-			<tr><th>Nom de compte</th>				<td>".$lesInfosPompier['pLogin']."</td></tr>
-			<tr><th>Grade</th>						<td>".$lesInfosPompier['wGrade']."</td></tr>
-			<tr><th>Statut</th>						<td>".$lesInfosPompier['wStatut']."</td></tr>
-        </table>
-    </fieldset>");	
-	}
- else	//------------------------------------------------------------------------------------ cas ajout ou modification
-	{
-	$checked = '';
-	$display = 'none';
-	$mdp = '';
-	
-	echo ("
-			<tr><th style='width:130px;'>Nom</th>			<td style='width:130px;'><INPUT type = 'text' name = 'ztNom'value=".$lesInfosPompier['nom']."></td></tr>
-			<tr><th>".$titre."</th>							<td><INPUT type = 'text' name = 'ztPrenom' value=".$lesInfosPompier['prenom']."></td></tr>
-			<tr><th>Adresse</th>							<td><INPUT type = 'text' name = 'ztAdresse' value=".$lesInfosPompier['pAdresse']."></td></tr>
-			<tr><th>Code postal</th>						<td><INPUT type = 'text' name = 'ztCP' value=".$lesInfosPompier['pCp']."></td></tr>
-			<tr><th>Ville</th>								<td><INPUT type = 'text' name = 'ztVille' value=".$lesInfosPompier['pVille']."></td></tr>				
-			<tr><th>Adresse &eacute;lectronique</th>		<td><INPUT type = 'text' name = 'ztMail' value=".$lesInfosPompier['pMail']."></p></td></tr>
-			<tr><th>Bipper</th>								<td><INPUT type = 'text' name = 'ztTel' value=".$lesInfosPompier['pBip']."></p></td></tr>
-			<tr><th>Nom de compte</th>						<td><INPUT type = 'text' name = 'ztLogin' value=".$lesInfosPompier['pLogin']."></p></tr>
-			<tr><th>Nouveau mot de passe ?</th>				<td>oui<INPUT type= 'radio' id='motdepasse' name= 'oui'".$checked." onchange='afficherBloc(\"code\")'>
-															non<INPUT type= 'radio' id='motdepasse' name= 'oui'".$checked." onchange='afficherBloc(\"code\")' checked><span id='code' style='display:".$display.";'>
-															<INPUT type = 'text' name = 'ztMdp' value=".$mdp."></p></td></tr></span>
-        </table>								
-    </fieldset>");
-	
-	echo ("		
-				<td style='border :0px;'>
-				<fieldset><legend>Centre d'Incendie et de Secours</legend> 
+            <fieldset><legend>Coordonn<EFBFBD>es Pompier</legend>
                 <table>
-						<tr><th style='width:130px;'>Code</th>		<td>".$lesInfosPompier['pCis']."</td> </tr>
-						<tr><th>Nom</th>							<td>".$lesInfosPompier['cNom']."</td> </tr>
-						<tr><th>Adresse</th>						<td>".$lesInfosPompier['cAdresse']."</td> </tr>
-						<tr><th>T&eacute;l&eacute;phone</th>		<td>".$lesInfosPompier['cTel']."</td> </tr>
-						<tr><th>Groupement</th>						<td>".$lesInfosPompier['cGroupement']."</td> </tr>
+                    <tr><th>Nom : </th><td><input type="text" name="ztNom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Pr<50>nom : </th><td><input type="text" name="ztPrenom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse : </th><td><input type="text" name="ztAdr"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Ville : </th><td><input type="text"name="ztVille"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Code postal : </th><td><input type="text" name="ztCp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>T<>l<EFBFBD>phone : </th><td><input type="text" name="ztTel"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail : </th><td><input type="text" name="ztMail"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Statut : </th><td><input readonly type="text" name="ztStatut"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Grade : </th><td><input readonly type="text" name="ztGrade"  size="20" maxlength="30"></td></tr>
                 </table>
             </fieldset>
-				<fieldset><legend>Fonction</legend> 
+            <fieldset><legend>Coordonn<EFBFBD>es Employeur</legend>
                 <table>
-						<tr><th>Type</th>							<td>
-						<select name='lstTypes' id='type-select' "); if($_SESSION['statut']!=2){echo("disabled=true ");} echo(">");
-	            if (!isset($_REQUEST['lstTypes'])) {$choix = 'premier';} else {$choix =$_REQUEST['lstTypes'];}
-
-	            foreach ($lesTypes as $unType)
-				{	
-					if($unType['pIndice'] == $choix or $choix == 'premier')
-						{echo "<option selected value=\"".$unType['pIndice']."\">".$unType['pLibelle']."</option>\n	";
-						$choix = $unType['pIndice'];
-						}
-					else
-						{echo "<option value=\"".$unType['pIndice']."\">".$unType['pLibelle']."</option>\n";}
-				}
-	echo ("  
-	        </select></td> </tr>
-						<tr><th>Grade</th>							<td>
-						<select name='lstGrades' id='grade-select' "); if($_SESSION['statut']!=2){echo("disabled=true ");} echo(">"); 
-	            if (!isset($_REQUEST['lstGrades'])) {$choix = 'premier';} else {$choix =$_REQUEST['lstGrades'];}
-
-	            foreach ($lesGrades as $unGrade)
-				{	
-					if($unGrade['pIndice'] == $choix or $choix == 'premier')
-						{echo "<option selected value=\"".$unGrade['pIndice']."\">".$unGrade['pLibelle']."</option>\n	";
-						$choix = $unGrade['pIndice'];
-						}
-					else
-						{echo "<option value=\"".$unGrade['pIndice']."\">".$unGrade['pLibelle']."</option>\n";}
-				}
-	echo ("  
-	        </select></td> </tr>
-						<tr><th>Statut</th>							<td>
-						<select name='lstStatut' id='statut-select' "); if($_SESSION['statut']!=2){echo("disabled=true ");} echo(">"); 
-	            if (!isset($_REQUEST['lstStatut'])) {$choix = 'premier';} else {$choix =$_REQUEST['lstStatut'];}
-
-	            foreach ($lesStatuts as $unStatut)
-				{	
-					if($unStatut['pIndice'] == $choix or $choix == 'premier')
-						{echo "<option selected value=\"".$unStatut['pIndice']."\">".$unStatut['pLibelle']."</option>\n	";
-						$choix = $unStatut['pIndice'];
-						}
-					else
-						{echo "<option value=\"".$unStatut['pIndice']."\">".$unStatut['pLibelle']."</option>\n		";}
-				}
-	echo ("   
-	        </select></td> </tr>
-					
-					</table>
-				</fieldset></td>
-			</tr>
-			</table>
-			
-			<fieldset><legend>Observations</legend>
-			<table style='border: 0px solid white;'>
-				<tr> 
-					 <td><textarea name='ztObs' cols='70' rows='1'>".$lesInfosPompier['pCommentaire']."</textarea></td>
-				</tr>
+                    <tr><th>Nom employeur : </th><td><input type="text" name="ztNomEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>T<>l<EFBFBD>phone employeur : </th><td><input type="text" name="ztTelEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse employeur : </th><td><input type="text" name="ztadrEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp"  size="20" maxlength="30"></td></tr>
                 </table>
             </fieldset>
-		</div>");
-			}
-			
-echo ("	
-	</td>
-	</tr>
-	</fieldset>
-	</table>");
-%>         
-            <table style='border: 0px solid white; '>
-            	<tr>
-                
-                <td style='border: 0px solid white; witdh:130px; text-align:right;'>
-                	<input type="hidden" 	name="zTypeAdm"		value="<?php if ($type=="adm") {echo ("true");} else {echo ("false");} ?>"> 
-                	<input type="hidden" 	name="zOk"			value="OK"> 
-					<input type="image" 	name="btValider" 	alt="Valider" 	src="images/valider.jpg" value="OK" >
-					<input type="image"		name="btAnnuler" 	alt="Annuler" 	src="images/annuler.jpg" value="nonOK" 	onclick="annuler('frmA');">
-
+             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Modif'" value="Modification du profil">
         </td>
     </tr>
 </table>

web/WEB-INF/jspf/enteteJSPF.jspf

@@ -1,10 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
   <head>
+      <<link rel="stylesheet" href="css/newcss.css"/>
     <title>SDIS29</title>
   </head>
     <div id="page">
 		<div id="entete">
-                    <img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" align='left' style="width: 200px; height: 180px" />	
+                    <img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" align='left' style="width: 200px; height: 180px";
+}/>	
 <!-- fin de l'ent<6E>te -->

web/css/newcss.css

@@ -0,0 +1,59 @@
+/*
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+*/
+/* 
+    Created on : 21 oct. 2021, 16:37:16
+    Author     : elliass.chelloug
+*/
+body
+{
+    background-color: #596b6e;
+    background-repeat: repeat-x;
+    margin:0% 0%;
+    padding : 0.9em;
+    font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
+    font-size: 0.9em;
+}
+#contenu
+{
+    border: none;
+    padding: 2.1em;
+    background-color: white;
+    border-left :  groove 0.8em #980101;
+    margin-top : 1.1em;
+    margin-left: 82px;
+    min-height:27em;
+    height:27em;
+}
+piedForm 
+{
+    border-bottom-width : 0.1em;
+    border-left-width : 0.1em;
+    border-right-width : 0.1em;
+    border-top-width : 0em;
+    border-style : solid;
+    border-color : #000;
+    text-align:right ;
+    width : 95%;
+    margin-top:0em;
+}
+form 
+{
+    margin-bottom:1em;  
+}
+corpsForm legend 
+{
+    font-weight:bold;
+    font-size:1.2em;
+}
+corpsForm label
+{
+    float: left;
+    text-align:right;
+    width:33%;
+    margin: 0;
+    padding: 0 .5em 0 0;
+    line-height: 1.8;	
+}