Browse Source

Ajout genre dans usager

Arthur Brandao 5 years ago
parent
commit
3827d42269

+ 1 - 0
sql/create.sql

@@ -33,6 +33,7 @@ CREATE TABLE Usager
      ID              BIGINT NOT NULL PRIMARY KEY GENERATED always AS IDENTITY, 
      ID              BIGINT NOT NULL PRIMARY KEY GENERATED always AS IDENTITY, 
      NOM             VARCHAR(250) NOT NULL, 
      NOM             VARCHAR(250) NOT NULL, 
      PRENOM          VARCHAR(250) NOT NULL, 
      PRENOM          VARCHAR(250) NOT NULL, 
+     GENRE           VARCHAR(100) NOT NULL,
      DATEDENAISSANCE DATE NOT NULL, 
      DATEDENAISSANCE DATE NOT NULL, 
      EMAIL           VARCHAR(250) NOT NULL, 
      EMAIL           VARCHAR(250) NOT NULL, 
      TELEPHONE       VARCHAR(12) NOT NULL, 
      TELEPHONE       VARCHAR(12) NOT NULL, 

+ 6 - 6
sql/insert.sql

@@ -15,12 +15,12 @@ Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('UTT', 1, 1);
 Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('Moulin de la housse', 2, 2);
 Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('Moulin de la housse', 2, 2);
 Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('Jean Perrin', 3, 1);
 Insert into Ecole(LIBELLE, VILLE, NIVEAU) Values('Jean Perrin', 3, 1);
 Insert into Ecole(LIBELLE, NIVEAU) Values('Nowhere', 1);
 Insert into Ecole(LIBELLE, NIVEAU) Values('Nowhere', 1);
-Insert into Usager(NOM, PRENOM, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Brandao', 'Arthur', '1996-10-21', 'ab@email.fr', '0605040302', 'Nop', 'LCOM', TRUE, 'Desc', 1, 4);
-Insert into Usager(NOM, PRENOM, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE) Values('Vipe', 'Wesh', '2015-08-12', 'vipe@wesh.fr', '0605040301', 'Nop', 'W4sH', FALSE, 'Desc', 2);
-Insert into Usager(NOM, PRENOM, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Shepard', 'Jane', '2154-04-11', 'shepard@normandy-sr2.fr', '0000000000', 'Nop', 'jsN7', TRUE, 'Desc', 3, 2);
-Insert into Usager(NOM, PRENOM, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE) Values('Tatsuya', 'Shiro', '1992-03-01', 'shiro.tetsuya@hotmail.fr', '0782751703', 'Nop', '1992', FALSE, 'Desc', 3);
-Insert into Usager(NOM, PRENOM, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Perrin', 'Jean', '1870-09-30', 'jean_perrin@univ-artois.fr', '0000000011', 'Nop', 'jPUa', TRUE, 'Desc', 3, 2);
-Insert into Usager(NOM, PRENOM, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Mikoto', 'Misaka', '2004-11-08', 'mmikoto@esper.co.jp', '1100000000', 'Nop', 'yolo', TRUE, 'Desc', 1, 2);
+Insert into Usager(NOM, PRENOM, GENRE, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Brandao', 'Arthur', 'Homme', '1996-10-21', 'ab@email.fr', '0605040302', 'Nop', 'LCOM', TRUE, 'Desc', 1, 4);
+Insert into Usager(NOM, PRENOM, GENRE, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE) Values('Vipe', 'Wesh', 'Autre', '2015-08-12', 'vipe@wesh.fr', '0605040301', 'Nop', 'W4sH', FALSE, 'Desc', 2);
+Insert into Usager(NOM, PRENOM, GENRE, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Shepard', 'Jane', 'Femme', '2154-04-11', 'shepard@normandy-sr2.fr', '0000000000', 'Nop', 'jsN7', TRUE, 'Desc', 3, 2);
+Insert into Usager(NOM, PRENOM, GENRE, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE) Values('Tatsuya', 'Shiro', 'Femme', '1992-03-01', 'shiro.tetsuya@hotmail.fr', '0782751703', 'Nop', '1992', FALSE, 'Desc', 3);
+Insert into Usager(NOM, PRENOM, GENRE, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Perrin', 'Jean', 'Homme', '1870-09-30', 'jean_perrin@univ-artois.fr', '0000000011', 'Nop', 'jPUa', TRUE, 'Desc', 3, 2);
+Insert into Usager(NOM, PRENOM, GENRE, DATEDENAISSANCE, EMAIL, TELEPHONE, CONTACTURGENCE, CODE, SCOLAIRE, DESCRIPTION, VILLE, ECOLE) Values('Mikoto', 'Misaka', 'Femme', '2004-11-08', 'mmikoto@esper.co.jp', '1100000000', 'Nop', 'yolo', TRUE, 'Desc', 1, 2);
 Insert into Frequentation(ESPACE, USAGER, DATE) Values(1, 1, '2019-12-18');
 Insert into Frequentation(ESPACE, USAGER, DATE) Values(1, 1, '2019-12-18');
 Insert into Frequentation(ESPACE, USAGER, DATE) Values(1, 1, '2019-12-17');
 Insert into Frequentation(ESPACE, USAGER, DATE) Values(1, 1, '2019-12-17');
 Insert into Frequentation(ESPACE, USAGER, DATE) Values(1, 1, '2019-12-11');
 Insert into Frequentation(ESPACE, USAGER, DATE) Values(1, 1, '2019-12-11');

+ 3 - 0
src/microfolie/persistance/entity/Usager.java

@@ -19,6 +19,9 @@ public class Usager implements Persistable {
 	@DbField("PRENOM")
 	@DbField("PRENOM")
 	public String prenom;
 	public String prenom;
 	
 	
+	@DbField("GENRE")
+	public String genre;
+	
 	@DbField("DATEDENAISSANCE")
 	@DbField("DATEDENAISSANCE")
 	public Date dateNaiss;
 	public Date dateNaiss;
 	
 	

+ 2 - 0
src/microfolie/service/transformer/UsagerTransformer.java

@@ -17,6 +17,7 @@ public class UsagerTransformer {
 		Usager usager = new Usager();
 		Usager usager = new Usager();
 		usager.prenom = dto.getPrenom();
 		usager.prenom = dto.getPrenom();
 		usager.nom = dto.getNom();
 		usager.nom = dto.getNom();
+		usager.genre = dto.getGenre();
 		usager.dateNaiss = dto.getDateNaissance();
 		usager.dateNaiss = dto.getDateNaissance();
 		usager.email = dto.getEmail();
 		usager.email = dto.getEmail();
 		usager.telephone = dto.getTelephone();
 		usager.telephone = dto.getTelephone();
@@ -41,6 +42,7 @@ public class UsagerTransformer {
 		UsagerDTO dto = new UsagerDTO();
 		UsagerDTO dto = new UsagerDTO();
 		dto.setPrenom(usager.prenom);
 		dto.setPrenom(usager.prenom);
 		dto.setNom(usager.nom);
 		dto.setNom(usager.nom);
+		dto.setGenre(usager.genre);
 		dto.setDateNaissance(usager.dateNaiss);
 		dto.setDateNaissance(usager.dateNaiss);
 		dto.setEmail(usager.email);
 		dto.setEmail(usager.email);
 		dto.setTelephone(usager.telephone);
 		dto.setTelephone(usager.telephone);