Merge origin/master

Conflicts: web/WEB-INF/AuthentificationJSP.jsp
Merge origin/master
2021-10-18 16:22:57 +02:00 · 2021-10-18 15:38:38 +02:00 · 2021-10-18 15:38:25 +02:00
5 changed files with 366 additions and 151 deletions
--- a/src/java/com/test/beans/Pompier.java
+++ b/src/java/com/test/beans/Pompier.java
@ -0,0 +1,298 @@
+/*
+ * 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 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 + '}';
+    }
+    
+    
+}
--- a/src/java/com/test/forms/AuthentifForm.java
+++ b/src/java/com/test/forms/AuthentifForm.java
@ -0,0 +1,43 @@
+/*
+ * 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 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 controlerAdmin(HttpServletRequest request){
+        /*  Comparaison entre l'utilisateur admin et un utilisateur créé
+            avec le pseudo et le mdp saisi */
+        User admin = new User("Lovelace", "Ada");
+        User userSaisi = new User(  request.getParameter("ztPseudo"),
+                                    request.getParameter("ztMDP"));
+        boolean isAdmin = userSaisi.equals(admin);
+        
+        // Mise à jour de l'attribut resultat
+        setResultat(isAdmin ? "Vous êtes administrateur" : "Vous n'êtes pas administrateur");
+
+        return isAdmin;
+        
+    }
+    
+    
+}
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@ -6,7 +6,7 @@
 <%@include file="jspf/enteteJSPF.jspf" %>
 <div id="contenu">
      <h2>Merci de vous identifier pour acceder aux dossiers</h2>
-	<form name="frmIdentification" method="POST" action="index.php?choixTraitement=connexion&action=valideConnexion">    
+	<form name="frmIdentification" method="POST" action="">    
        <fieldset><legend>Identification utilisateur</legend>
            <br /><br />
               <label for="nom">Nom du compte</label>
--- a/web/WEB-INF/ProfilJSP.jsp
+++ b/web/WEB-INF/ProfilJSP.jsp
@ -1,151 +1,25 @@
+<%-- 
+    Document   : authentificationJSP
+    Created on : 18 oct. 2021, 11:09:26
+    Author     : Chelloug.Eliass
+--%>
+<%@include file="jspf/enteteJSPF.jspf" %>
 <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 ("	
-    <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> 
-					<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>
-					</table>
-				</fieldset>
-				<fieldset><legend>Fonction</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>
-			</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');">
-
-                </td>
-                </tr>
-            </table>         
-    </form>
+      <h2>Merci de vous identifier pour acceder aux dossiers</h2>
+	<form name="frmIdentification" method="POST" action="Profil">    
+        <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">
+            </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">
+            </p><br /><br />
+                <input type="submit" 	name="valider"		value="Valider">
+                <input type="reset" 	name="annuler" 		value="Annuler">
+            </p>
+        </fieldset>
+	</form>
+    <br /><br />
+</div>
--- a/web/WEB-INF/images/LogoSDIS29.jpg
+++ b/web/WEB-INF/images/LogoSDIS29.jpg
Author	SHA1	Message	Date
thomas.millot	bf5a567b33	Merge origin/master Conflicts: web/WEB-INF/AuthentificationJSP.jsp	2021-10-18 16:22:57 +02:00
thomas.millot	4294fa0494	Merge origin/master	2021-10-18 15:38:38 +02:00
thomas.millot	8ca0bc8a7d	Merge origin/master Conflicts: web/WEB-INF/AuthentificationJSP.jsp	2021-10-18 15:38:25 +02:00