This commit is contained in:
clementine.desrucques
parent
cd2d0e634f
commit
92854fc1f9
@ -25,12 +25,12 @@ public class Pompier {
|
||||
private String cp;
|
||||
private String ville;
|
||||
private int bip;
|
||||
private int nbGrade;
|
||||
private int nbGardes;
|
||||
private int grade;
|
||||
private String commentaire;
|
||||
private int idEmployeur;
|
||||
|
||||
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 nbGrade, int grade, String commentaire, int idEmployeur) {
|
||||
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;
|
||||
this.idCaserne = idCaserne;
|
||||
this.nom = nom;
|
||||
@ -44,13 +44,13 @@ public class Pompier {
|
||||
this.cp = cp;
|
||||
this.ville = ville;
|
||||
this.bip = bip;
|
||||
this.nbGrade = nbGrade;
|
||||
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 nbGrade, int grade, String commentaire, int 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;
|
||||
@ -63,7 +63,7 @@ public class Pompier {
|
||||
this.cp = cp;
|
||||
this.ville = ville;
|
||||
this.bip = bip;
|
||||
this.nbGrade = nbGrade;
|
||||
this.nbGardes = nbGardes;
|
||||
this.grade = grade;
|
||||
this.commentaire = commentaire;
|
||||
this.idEmployeur = idEmployeur;
|
||||
@ -173,12 +173,12 @@ public class Pompier {
|
||||
this.bip = bip;
|
||||
}
|
||||
|
||||
public int getNbGrade() {
|
||||
return nbGrade;
|
||||
public int getNbGardes() {
|
||||
return nbGardes;
|
||||
}
|
||||
|
||||
public void setNbGrade(int nbGrade) {
|
||||
this.nbGrade = nbGrade;
|
||||
public void setNbGardes(int nbGardes) {
|
||||
this.nbGardes = nbGardes;
|
||||
}
|
||||
|
||||
public int getGrade() {
|
||||
@ -207,24 +207,24 @@ public class Pompier {
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int hash = 3;
|
||||
hash = 67 * hash + this.id;
|
||||
hash = 67 * hash + this.idCaserne;
|
||||
hash = 67 * hash + Objects.hashCode(this.nom);
|
||||
hash = 67 * hash + Objects.hashCode(this.prenom);
|
||||
hash = 67 * hash + this.statut;
|
||||
hash = 67 * hash + this.typePers;
|
||||
hash = 67 * hash + Objects.hashCode(this.mail);
|
||||
hash = 67 * hash + Objects.hashCode(this.login);
|
||||
hash = 67 * hash + Objects.hashCode(this.mdp);
|
||||
hash = 67 * hash + Objects.hashCode(this.adresse);
|
||||
hash = 67 * hash + Objects.hashCode(this.cp);
|
||||
hash = 67 * hash + Objects.hashCode(this.ville);
|
||||
hash = 67 * hash + this.bip;
|
||||
hash = 67 * hash + this.nbGrade;
|
||||
hash = 67 * hash + this.grade;
|
||||
hash = 67 * hash + Objects.hashCode(this.commentaire);
|
||||
hash = 67 * hash + this.idEmployeur;
|
||||
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;
|
||||
}
|
||||
|
||||
@ -255,7 +255,7 @@ public class Pompier {
|
||||
if (this.bip != other.bip) {
|
||||
return false;
|
||||
}
|
||||
if (this.nbGrade != other.nbGrade) {
|
||||
if (this.nbGardes != other.nbGardes) {
|
||||
return false;
|
||||
}
|
||||
if (this.grade != other.grade) {
|
||||
@ -296,8 +296,9 @@ public class Pompier {
|
||||
|
||||
@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 + ", nbGrade=" + nbGrade + ", grade=" + grade + ", commentaire=" + commentaire + ", idEmployeur=" + idEmployeur + '}';
|
||||
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 + '}';
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -24,24 +24,31 @@
|
||||
<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="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/>
|
||||
<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>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user