diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7b016a8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java b/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java index 43e3c5d..02f56ed 100644 --- a/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java +++ b/as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java @@ -18,6 +18,9 @@ public class Categorie { @Column(nullable = false, length = 20) private String nom; + @Column(nullable = false, length = 10) + private String sexe = "MASCULIN"; + @Column(name = "annee_min") private Integer anneeMin; @@ -45,6 +48,9 @@ public class Categorie { public String getNom() { return nom; } public void setNom(String nom) { this.nom = nom; } + public String getSexe() { return sexe; } + public void setSexe(String sexe) { this.sexe = sexe; } + public Integer getAnneeMin() { return anneeMin; } public void setAnneeMin(Integer anneeMin) { this.anneeMin = anneeMin; } diff --git a/as-talange-core/src/main/resources/db/migration/V30__add_ancienne_categorie_and_sexe.sql b/as-talange-core/src/main/resources/db/migration/V30__add_ancienne_categorie_and_sexe.sql new file mode 100644 index 0000000..a6ddf0e --- /dev/null +++ b/as-talange-core/src/main/resources/db/migration/V30__add_ancienne_categorie_and_sexe.sql @@ -0,0 +1,10 @@ +ALTER TABLE adherent ADD COLUMN ancienne_categorie VARCHAR(50); +ALTER TABLE pre_inscription ADD COLUMN ancienne_categorie VARCHAR(50) DEFAULT 'NA'; + +ALTER TABLE categorie ADD COLUMN sexe VARCHAR(10) DEFAULT 'MASCULIN' NOT NULL; + +UPDATE adherent SET telephone = '0000000000' WHERE telephone IS NULL; +ALTER TABLE adherent ALTER COLUMN telephone SET NOT NULL; + +UPDATE pre_inscription SET telephone = '0000000000' WHERE telephone IS NULL; +ALTER TABLE pre_inscription ALTER COLUMN telephone SET NOT NULL; diff --git a/as-talange-web/src/main/resources/templates/parametrage/categories_form.html b/as-talange-web/src/main/resources/templates/parametrage/categories_form.html index 6419461..a63ad2b 100644 --- a/as-talange-web/src/main/resources/templates/parametrage/categories_form.html +++ b/as-talange-web/src/main/resources/templates/parametrage/categories_form.html @@ -22,9 +22,18 @@
-
- - +
+
+ + +
+
+ + +
diff --git a/as-talange-web/src/main/resources/templates/parametrage/categories_list.html b/as-talange-web/src/main/resources/templates/parametrage/categories_list.html index 24755a2..ce7c7b5 100644 --- a/as-talange-web/src/main/resources/templates/parametrage/categories_list.html +++ b/as-talange-web/src/main/resources/templates/parametrage/categories_list.html @@ -43,7 +43,10 @@ Aucune catégorie n'est paramétrée. - U15 + +
U15
+
Masculine
+ 2010 2011 100.00 €