diff --git a/nbproject/project.properties b/nbproject/project.properties
index 6a9ba31..e748218 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -12,7 +12,7 @@ build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
build.web.dir=${build.dir}/web
build.web.excludes=${build.classes.excludes}
-client.urlPart=
+client.urlPart=/Authentification
compile.jsps=false
conf.dir=${source.root}/conf
debug.classpath=${build.classes.dir}:${javac.classpath}
diff --git a/src/java/com/test/forms/NouveauPompForm.java b/src/java/com/test/forms/NouveauPompForm.java
index db4d698..9b57715 100644
--- a/src/java/com/test/forms/NouveauPompForm.java
+++ b/src/java/com/test/forms/NouveauPompForm.java
@@ -46,7 +46,7 @@ public class NouveauPompForm {
if (erreur > 0) return -1;
// Creation d'un objet de type Client avec les données transmises
-// String mdpChiffre = MD5.encode(request.getParameter("ztMDP"));
+ String mdpChiffre = MD5.encode(request.getParameter("ztMDP"));
Pompier unPompier = new Pompier(request.getParameter("id"),
request.getParameter("idCaserne"),
request.getParameter("ztNom"),
diff --git a/src/java/com/test/servlets/CreaPompierServlet.java b/src/java/com/test/servlets/CreaPompierServlet.java
new file mode 100644
index 0000000..43a32f2
--- /dev/null
+++ b/src/java/com/test/servlets/CreaPompierServlet.java
@@ -0,0 +1,106 @@
+/*
+ * 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.servlets;
+
+import com.test.forms.NouveauPompForm;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+
+
+/**
+ *
+ * @author clementine.desrucques
+ */
+public class CreaPompierServlet extends HttpServlet {
+
+ /**
+ * Processes requests for both HTTP GET and POST
+ * methods.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ 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. */
+ out.println("");
+ out.println("");
+ out.println("");
+ out.println("Servlet CreaPompierServlet");
+ out.println("");
+ out.println("");
+ out.println("Servlet CreaPompierServlet at " + request.getContextPath() + "
");
+ out.println("");
+ out.println("");
+ }
+ }
+
+ //
+ /**
+ * Handles the HTTP GET method.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+// processRequest(request, response);
+ getServletContext().getRequestDispatcher("/WEB-INF/CreaPompier.jsp").forward(request, response);
+ }
+
+ /**
+ * Handles the HTTP POST method.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ NouveauPompForm nvp = new NouveauPompForm();
+ int idPomp = nvp.verifNouveauPompier(request);
+ request.setAttribute("idPompier", idPomp);
+ request.setAttribute("message", nvp.getMessage());
+
+ if (idPomp != -1){
+ HttpSession maSession = request.getSession();
+ ArrayList lesNouveauxPompiers = (ArrayList) maSession.getAttribute("lesNvxPompiers");
+ if (lesNouveauxPompiers == null){
+ lesNouveauxPompiers = new ArrayList<>();
+ }
+ lesNouveauxPompiers.add(idPomp);
+ maSession.setAttribute("lesNvxPompiers", lesNouveauxPompiers);
+ }
+
+ getServletContext().getRequestDispatcher("/WEB-INF/CreaPompier.jsp").forward(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ *
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }//
+
+}
diff --git a/src/java/com/test/servlets/ModifPompierServlet.java b/src/java/com/test/servlets/ModifPompierServlet.java
new file mode 100644
index 0000000..42d34d8
--- /dev/null
+++ b/src/java/com/test/servlets/ModifPompierServlet.java
@@ -0,0 +1,87 @@
+/*
+ * 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.servlets;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+
+/**
+ *
+ * @author clementine.desrucques
+ */
+public class ModifPompierServlet extends HttpServlet {
+
+ /**
+ * Processes requests for both HTTP GET and POST
+ * methods.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ 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. */
+ out.println("");
+ out.println("");
+ out.println("");
+ out.println("Servlet ModifPompierServlet");
+ out.println("");
+ out.println("");
+ out.println("Servlet ModifPompierServlet at " + request.getContextPath() + "
");
+ out.println("");
+ out.println("");
+ }
+ }
+
+ //
+ /**
+ * Handles the HTTP GET method.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Handles the HTTP POST method.
+ *
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ *
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }//
+
+}
diff --git a/src/java/com/test/servlets/authentifServlet.java b/src/java/com/test/servlets/authentifServlet.java
index 8cfc568..3203091 100644
--- a/src/java/com/test/servlets/authentifServlet.java
+++ b/src/java/com/test/servlets/authentifServlet.java
@@ -77,9 +77,9 @@ public class authentifServlet extends HttpServlet {
throws ServletException, IOException {
// Création de l'objet leControle de type AuthentifForm
AuthentifForm leControle = new AuthentifForm();
- // Appel de la méthode controlerAdmin
+ // Appel de la méthode controlerRole
boolean isChef = leControle.controlerRole(request);
- // Création de 2 attributs de requête (isAdmin et leControle)
+ // Création de 2 attributs de requête (isChef et leControle)
request.setAttribute("isChef", isChef);
request.setAttribute("controlForm", leControle);
HttpSession maSession = request.getSession();
diff --git a/src/java/util/MD5.java b/src/java/util/MD5.java
new file mode 100644
index 0000000..cccd368
--- /dev/null
+++ b/src/java/util/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 util;
+
+/**
+ *
+ * @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();
+ }
+}
diff --git a/web/WEB-INF/ChefCaserneJSP.jsp b/web/WEB-INF/ChefCaserneJSP.jsp
index 40e5b3e..9ec9a4f 100644
--- a/web/WEB-INF/ChefCaserneJSP.jsp
+++ b/web/WEB-INF/ChefCaserneJSP.jsp
@@ -12,6 +12,49 @@
Chef de caserne
- chef caserne
+ Les pompiers :
+
+
+
+ | Id |
+ IdCaserne |
+ Nom |
+ Prénom |
+ Numéro de statut |
+ Mail |
+ Login |
+ Mot de passe |
+ No rue |
+ Nom rue |
+ Code postal |
+ Ville |
+ Numéro de grade |
+ Commentaire |
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+