Merge origin/master
Conflicts: src/java/bdd/PompierMySql.java src/java/com/test/servlets/authentifServlet.java web/WEB-INF/CreaPompier.jsp
This commit is contained in:
funcha.ahamadi
commit
604d82a412
@ -134,7 +134,7 @@ public class PompierMySql {
|
||||
String login = request.getParameter("ztPseudo");
|
||||
String mdp = request.getParameter("ztMDP");
|
||||
String mdpChiffre = MD5.encode(request.getParameter("ztMDP"));
|
||||
String sql = "SELECT * FROM pompier WHERE login='" + login + "' AND mdp='" + mdpChiffre + "';";
|
||||
String sql = "SELECT * FROM pompier WHERE login='" + login + "' AND mdp='" + mdpChiffre + "' AND typePers='1';";
|
||||
System.out.println("sql:" + sql);
|
||||
try {
|
||||
Statement stmt = theConnection.createStatement();
|
||||
@ -162,6 +162,8 @@ public class PompierMySql {
|
||||
resultQ.getInt("idEmployeur"),
|
||||
|
||||
);
|
||||
|
||||
|
||||
HttpSession maSession = request.getSession();
|
||||
maSession.setAttribute("unPompier", lePompier);
|
||||
System.out.println("lePompier :"+ lePompier);
|
||||
@ -173,4 +175,8 @@ public class PompierMySql {
|
||||
return resultat;
|
||||
}
|
||||
|
||||
private void setResultat(String pompier) {
|
||||
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -17,35 +17,56 @@ public class Pompier {
|
||||
private String nom;
|
||||
private String prenom;
|
||||
private int statut;
|
||||
private int typePers;
|
||||
private String mail;
|
||||
private String login;
|
||||
private String mdp;
|
||||
private int adrNo;
|
||||
private String adrRue;
|
||||
private String adrCP;
|
||||
private String adrVille;
|
||||
private String adresse;
|
||||
private String cp;
|
||||
private String ville;
|
||||
private int bip;
|
||||
private int nbGardes;
|
||||
private int grade;
|
||||
private String commentaire;
|
||||
private int idEmployeur;
|
||||
|
||||
public Pompier(int id, int idCaserne, String nom, String prenom, int statut, String mail, String login, String mdp, int adrNo, String adrRue, String adrCP, String adrVille, int grade, String commentaire) {
|
||||
this(idCaserne, nom, prenom, statut, mail, login, mdp, adrNo, adrRue, adrCP, adrVille, grade, commentaire);
|
||||
public Pompier(int id, int idCaserne, String nom, String prenom, int statut, int typePers, String mail, String login, String mdp, String adresse, String cp, String ville, int bip, int nbGardes, int grade, String commentaire, int idEmployeur) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Pompier(int idCaserne, String nom, String prenom, int statut, String mail, String login, String mdp, int adrNo, String adrRue, String adrCP, String adrVille, int grade, String commentaire) {
|
||||
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.adrNo = adrNo;
|
||||
this.adrRue = adrRue;
|
||||
this.adrCP = adrCP;
|
||||
this.adrVille = adrVille;
|
||||
this.adresse = adresse;
|
||||
this.cp = cp;
|
||||
this.ville = ville;
|
||||
this.bip = bip;
|
||||
this.nbGardes = nbGardes;
|
||||
this.grade = grade;
|
||||
this.commentaire = commentaire;
|
||||
this.idEmployeur = idEmployeur;
|
||||
}
|
||||
|
||||
public Pompier(int idCaserne, String nom, String prenom, int statut, int typePers, String mail, String login, String mdp, String adresse, String cp, String ville, int bip, int nbGardes, int grade, String commentaire, int idEmployeur) {
|
||||
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.idEmployeur = idEmployeur;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
@ -88,6 +109,14 @@ public class Pompier {
|
||||
this.statut = statut;
|
||||
}
|
||||
|
||||
public int getTypePers() {
|
||||
return typePers;
|
||||
}
|
||||
|
||||
public void setTypePers(int typePers) {
|
||||
this.typePers = typePers;
|
||||
}
|
||||
|
||||
public String getMail() {
|
||||
return mail;
|
||||
}
|
||||
@ -112,36 +141,44 @@ public class Pompier {
|
||||
this.mdp = mdp;
|
||||
}
|
||||
|
||||
public int getAdrNo() {
|
||||
return adrNo;
|
||||
public String getAdresse() {
|
||||
return adresse;
|
||||
}
|
||||
|
||||
public void setAdrNo(int adrNo) {
|
||||
this.adrNo = adrNo;
|
||||
public void setAdresse(String adresse) {
|
||||
this.adresse = adresse;
|
||||
}
|
||||
|
||||
public String getAdrRue() {
|
||||
return adrRue;
|
||||
public String getCp() {
|
||||
return cp;
|
||||
}
|
||||
|
||||
public void setAdrRue(String adrRue) {
|
||||
this.adrRue = adrRue;
|
||||
public void setCp(String cp) {
|
||||
this.cp = cp;
|
||||
}
|
||||
|
||||
public String getAdrCP() {
|
||||
return adrCP;
|
||||
public String getVille() {
|
||||
return ville;
|
||||
}
|
||||
|
||||
public void setAdrCP(String adrCP) {
|
||||
this.adrCP = adrCP;
|
||||
public void setVille(String ville) {
|
||||
this.ville = ville;
|
||||
}
|
||||
|
||||
public String getAdrVille() {
|
||||
return adrVille;
|
||||
public int getBip() {
|
||||
return bip;
|
||||
}
|
||||
|
||||
public void setAdrVille(String adrVille) {
|
||||
this.adrVille = adrVille;
|
||||
public void setBip(int bip) {
|
||||
this.bip = bip;
|
||||
}
|
||||
|
||||
public int getNbGardes() {
|
||||
return nbGardes;
|
||||
}
|
||||
|
||||
public void setNbGardes(int nbGardes) {
|
||||
this.nbGardes = nbGardes;
|
||||
}
|
||||
|
||||
public int getGrade() {
|
||||
@ -160,23 +197,34 @@ public class Pompier {
|
||||
this.commentaire = commentaire;
|
||||
}
|
||||
|
||||
public int getIdEmployeur() {
|
||||
return idEmployeur;
|
||||
}
|
||||
|
||||
public void setIdEmployeur(int idEmployeur) {
|
||||
this.idEmployeur = idEmployeur;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int hash = 3;
|
||||
hash = 29 * hash + this.id;
|
||||
hash = 29 * hash + this.idCaserne;
|
||||
hash = 29 * hash + Objects.hashCode(this.nom);
|
||||
hash = 29 * hash + Objects.hashCode(this.prenom);
|
||||
hash = 29 * hash + this.statut;
|
||||
hash = 29 * hash + Objects.hashCode(this.mail);
|
||||
hash = 29 * hash + Objects.hashCode(this.login);
|
||||
hash = 29 * hash + Objects.hashCode(this.mdp);
|
||||
hash = 29 * hash + this.adrNo;
|
||||
hash = 29 * hash + Objects.hashCode(this.adrRue);
|
||||
hash = 29 * hash + Objects.hashCode(this.adrCP);
|
||||
hash = 29 * hash + Objects.hashCode(this.adrVille);
|
||||
hash = 29 * hash + this.grade;
|
||||
hash = 29 * hash + Objects.hashCode(this.commentaire);
|
||||
int hash = 7;
|
||||
hash = 47 * hash + this.id;
|
||||
hash = 47 * hash + this.idCaserne;
|
||||
hash = 47 * hash + Objects.hashCode(this.nom);
|
||||
hash = 47 * hash + Objects.hashCode(this.prenom);
|
||||
hash = 47 * hash + this.statut;
|
||||
hash = 47 * hash + this.typePers;
|
||||
hash = 47 * hash + Objects.hashCode(this.mail);
|
||||
hash = 47 * hash + Objects.hashCode(this.login);
|
||||
hash = 47 * hash + Objects.hashCode(this.mdp);
|
||||
hash = 47 * hash + Objects.hashCode(this.adresse);
|
||||
hash = 47 * hash + Objects.hashCode(this.cp);
|
||||
hash = 47 * hash + Objects.hashCode(this.ville);
|
||||
hash = 47 * hash + this.bip;
|
||||
hash = 47 * hash + this.nbGardes;
|
||||
hash = 47 * hash + this.grade;
|
||||
hash = 47 * hash + Objects.hashCode(this.commentaire);
|
||||
hash = 47 * hash + this.idEmployeur;
|
||||
return hash;
|
||||
}
|
||||
|
||||
@ -201,12 +249,21 @@ public class Pompier {
|
||||
if (this.statut != other.statut) {
|
||||
return false;
|
||||
}
|
||||
if (this.adrNo != other.adrNo) {
|
||||
if (this.typePers != other.typePers) {
|
||||
return false;
|
||||
}
|
||||
if (this.bip != other.bip) {
|
||||
return false;
|
||||
}
|
||||
if (this.nbGardes != other.nbGardes) {
|
||||
return false;
|
||||
}
|
||||
if (this.grade != other.grade) {
|
||||
return false;
|
||||
}
|
||||
if (this.idEmployeur != other.idEmployeur) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(this.nom, other.nom)) {
|
||||
return false;
|
||||
}
|
||||
@ -222,13 +279,13 @@ public class Pompier {
|
||||
if (!Objects.equals(this.mdp, other.mdp)) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(this.adrRue, other.adrRue)) {
|
||||
if (!Objects.equals(this.adresse, other.adresse)) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(this.adrCP, other.adrCP)) {
|
||||
if (!Objects.equals(this.cp, other.cp)) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(this.adrVille, other.adrVille)) {
|
||||
if (!Objects.equals(this.ville, other.ville)) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(this.commentaire, other.commentaire)) {
|
||||
@ -239,9 +296,9 @@ public class Pompier {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Pompier{" + "id=" + id + ", idCaserne=" + idCaserne + ", nom=" + nom + ", prenom=" + prenom + ", statut=" + statut + ", mail=" + mail + ", login=" + login + ", mdp=" + mdp + ", adrNo=" + adrNo + ", adrRue=" + adrRue + ", adrCP=" + adrCP + ", adrVille=" + adrVille + ", grade=" + grade + ", commentaire=" + commentaire + '}';
|
||||
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 + ", idEmployeur=" + idEmployeur + '}';
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -22,13 +22,13 @@ public class NouveauPompForm {
|
||||
public int verifNouveauPompier(HttpServletRequest request) {
|
||||
|
||||
// Contrôle du no de rue qui doit être numérique
|
||||
String noRueString = request.getParameter("nAdrNo");
|
||||
boolean isNumeric = StringUtils.isStrictlyNumeric(noRueString);
|
||||
if (!isNumeric) {
|
||||
message = "Le no de rue doit être numérique";
|
||||
return -1;
|
||||
}
|
||||
int noRue = Integer.parseInt(noRueString);
|
||||
// String noRueString = request.getParameter("nAdrNo");
|
||||
// boolean isNumeric = StringUtils.isStrictlyNumeric(noRueString);
|
||||
// if (!isNumeric) {
|
||||
// message = "Le no de rue doit être numérique";
|
||||
// return -1;
|
||||
// }
|
||||
// int noRue = Integer.parseInt(noRueString);
|
||||
|
||||
// Contrôle car "<" dans les zones de texte
|
||||
//String [] lesSaisies = request.getParameterValues(noRueString); // Valeurs saisies
|
||||
@ -45,22 +45,22 @@ public class NouveauPompForm {
|
||||
}
|
||||
if (erreur > 0) return -1;
|
||||
|
||||
// Creation d'un objet de type Client avec les données transmises
|
||||
// Creation d'un objet de type Pompier avec les données transmises
|
||||
|
||||
Pompier unPompier = new Pompier(
|
||||
request.getParameter("id"),
|
||||
request.getParameter("idCaserne"),
|
||||
request.getParameter("nom"),
|
||||
request.getParameter("prenom"),
|
||||
request.getParameter("statut"),
|
||||
request.getParameter("mail"),
|
||||
request.getParameter("login"),
|
||||
request.getParameter("mdp"),
|
||||
noRue,
|
||||
request.getParameter("adrRue"),
|
||||
request.getParameter("adrCP"),
|
||||
request.getParameter("adrVille"),
|
||||
request.getParameter("grade"),
|
||||
|
||||
Integer.parseInt(request.getParameter("nIdCaserne")),
|
||||
request.getParameter("ztNom"),
|
||||
request.getParameter("ztPrenom"),
|
||||
Integer.parseInt(request.getParameter("nStatut")),
|
||||
request.getParameter("eMail"),
|
||||
request.getParameter("ztPseudo"),
|
||||
request.getParameter("ztMDP"),
|
||||
Integer.parseInt(request.getParameter("nAdrNo")),
|
||||
request.getParameter("ztAdrRue"),
|
||||
request.getParameter("ztAdrCP"),
|
||||
request.getParameter("ztAdrVille"),
|
||||
Integer.parseInt(request.getParameter("nGrade")),
|
||||
request.getParameter("commentaire")
|
||||
);
|
||||
PompierMySql cm = new PompierMySql();
|
||||
|
||||
@ -24,23 +24,32 @@
|
||||
<input type="text" name="ztPrenom" placeholder="Prénom"/><br /><br/>
|
||||
<label for="nStatut">Numéro de statut : </label>
|
||||
<input type="number" name="nStatut"/><br /><br/>
|
||||
<label for="nTypePers">Type de personne : </label>
|
||||
<input type="number" name="nTypePers"/><br /><br/>
|
||||
<label for="eMail">Mail : </label>
|
||||
<input type="email" name="eMail"/><br /><br/>
|
||||
<label for="ztLogin">Login : </label>
|
||||
<input type="text" name="ztLogin" placeholder="Login"/><br /><br/>
|
||||
<label for="ztMDP">Mot de passe : </label>resultQ.getInt("idEmployeur"),
|
||||
<input type="text" name="ztPseudo" placeholder="Login"/><br /><br/>
|
||||
<label for="ztMDP">Mot de passe : </label>
|
||||
<input type="password" name="ztMDP" placeholder="Mot de passe" /><br /><br />
|
||||
<label for="nAdrNo">Numéro de rue : </label>
|
||||
<input type="number" name="nAdrNo"/><br /><br/>
|
||||
<label for="ztAdrRue">Nom de la rue : </label>
|
||||
<input type="text" name="ztAdrRue" placeholder="Rue" /><br /><br/>
|
||||
<label for="ztAdresse">Adresse : </label>
|
||||
<input type="text" name="ztAdresse"/><br /><br/>
|
||||
|
||||
<label for="ztAdrCP">Code postal : </label>
|
||||
<input type="text" name="ztAdrCP" placeholder="Code postal" /><br /><br/>
|
||||
<label for="ztAdrVille">Ville : </label>
|
||||
<input type="text" name="ztAdrVille" placeholder="Ville" /><br /><br/>
|
||||
<label for="nBip">Numéro de bip : </label>
|
||||
<input type="number" name="nBip"/><br /><br/>
|
||||
<label for="nbGardes">Nombre de gardes : </label>
|
||||
<input type="number" name="nbGardes"/><br /><br/>
|
||||
<label for="nGrade">Numéro de grade : </label>
|
||||
<input type="number" name="nGrade"/><br /><br/>
|
||||
<input type="submit" value="Valider"/><br /><br/>resultQ.getInt("idEmployeur"),
|
||||
<label for="commentaire">Commentaire : </label>
|
||||
<input type="text" name="commentaire" placeholder="Commentaire" /><br /><br/>
|
||||
<label for="nEmpl">Numéro d'employeur : </label>
|
||||
<input type="number" name="nEmpl"/><br /><br/>
|
||||
<input type="submit" value="Valider" />
|
||||
</form>
|
||||
</fieldset>
|
||||
|
||||
|
||||
@ -9,19 +9,17 @@
|
||||
<%@page contentType="text/html" pageEncoding="UTF-8"%>
|
||||
|
||||
|
||||
<fieldset>
|
||||
<legend>Authentification</legend>
|
||||
<form method="POST" action="Authentification">
|
||||
<input type="text" name="ztPseudo" placeholder="Pseudo" /><br /><!-- comment -->
|
||||
<input type="password" name="ztMDP" placeholder="Mot de passe" /><br /><br />
|
||||
<input type="submit" value="Valider" />
|
||||
</form>
|
||||
</fieldset>
|
||||
|
||||
<!-- Si l'utilisateur s'est authentifié,
|
||||
Affichage du message contenu dans l'objet controlForm de type AuthentifForm -->
|
||||
|
||||
<p>${controlForm.getResultat()}</p>
|
||||
|
||||
<fieldset>
|
||||
<legend>Authentification</legend>
|
||||
<form method="POST" action="Authentification">
|
||||
<input type="text" name="ztPseudo" placeholder="Pseudo" /><br /><!-- comment -->
|
||||
<input type="password" name="ztMDP" placeholder="Mot de passe" /><br /><br />
|
||||
<input type="submit" value="Valider" />
|
||||
</form>
|
||||
</fieldset>
|
||||
|
||||
<!-- Si l'utilisateur s'est authentifié,
|
||||
Affichage du message contenu dans l'objet controlForm de type AuthentifForm -->
|
||||
<p>${controlForm.getResultat()}</p>
|
||||
<br />
|
||||
|
||||
<br />
|
||||
Loading…
x
Reference in New Issue
Block a user