chore: release version 1.3

- Ajout de la génération de CSV des équipements choisis et non fournis pour la saison active.
- Création du DotationService et ajout de la route /admin/equipements/export-commande.
- Ajout du bouton d'export sur le tableau de bord principal (index.html).

.gitea/workflows/ci-prod.yml

@@ -0,0 +1,77 @@
+name: AS Talange CI/CD Pipeline - Production
+
+on:
+  push:
+    branches:
+      - 'prod/*'
+
+jobs:
+  test:
+    name: Build & Run Unit Tests
+    runs-on: [self-hosted, prod]
+    container:
+      image: maven:3.9.6-eclipse-temurin-21
+    steps:
+      - name: Clone repository
+        run: |
+          if ! command -v git &> /dev/null; then
+            apt-get update && apt-get install -y git
+          fi
+          SERVER_URL="${{ github.server_url }}"
+          SERVER_NO_PROTO="${SERVER_URL#http://}"
+          SERVER_NO_PROTO="${SERVER_NO_PROTO#https://}"
+          git clone "https://oauth2:${{ secrets.GITHUB_TOKEN }}@${SERVER_NO_PROTO}/${{ github.repository }}.git" .
+          git checkout ${{ github.sha }}
+
+      - name: Run Maven Tests
+        run: mvn clean test
+
+
+
+  deploy_prod:
+    name: Deploy to Prod Environment
+    needs: test
+    if: startsWith(github.ref, 'refs/heads/prod/')
+    runs-on: [self-hosted, prod]
+    container:
+      image: docker:latest
+    steps:
+      - name: Clone repository
+        run: |
+          apk add --no-cache git
+          SERVER_URL="${{ github.server_url }}"
+          SERVER_NO_PROTO="${SERVER_URL#http://}"
+          SERVER_NO_PROTO="${SERVER_NO_PROTO#https://}"
+          git clone "https://oauth2:${{ secrets.GITHUB_TOKEN }}@${SERVER_NO_PROTO}/${{ github.repository }}.git" .
+          git checkout ${{ github.sha }}
+
+      - name: Deploy with Docker Compose
+        env:
+          PROD_DB_USER: ${{ secrets.PROD_DB_USER }}
+          PROD_DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
+          CAPTCHA_SECRET: ${{ secrets.CAPTCHA_SECRET }}
+          CAPTCHA_SITEKEY: ${{ secrets.CAPTCHA_SITEKEY }}
+        run: |
+          echo "POSTGRES_USER=${PROD_DB_USER:-myuser}" > .env
+          echo "POSTGRES_PASSWORD=${PROD_DB_PASSWORD:-mypassword}" >> .env
+          echo "CAPTCHA_SECRET=${CAPTCHA_SECRET:-1x0000000000000000000000000000000AA}" >> .env
+          echo "CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-1x00000000000000000000AA}" >> .env
+          docker compose down app || true
+          docker compose up -d --build app
+
+      - name: Verify application startup
+        run: |
+          echo "Waiting for application to start..."
+          COUNT=0
+          while [ $COUNT -lt 30 ]; do
+            if docker exec astalange_app wget -qO- http://localhost:8080/login | grep -q "Connexion"; then
+              echo "Application is up and login page is accessible!"
+              exit 0
+            fi
+            echo "Waiting... ($COUNT/30)"
+            sleep 5
+            COUNT=$((COUNT+1))
+          done
+          echo "Application failed to start or login page is not accessible."
+          docker logs astalange_app
+          exit 1

.gitea/workflows/ci-test.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   test:
     name: Build & Run Unit Tests
-    runs-on: self-hosted
+    runs-on: [self-hosted, ubuntu-latest]
     container:
       image: maven:3.9.6-eclipse-temurin-21
     steps:
@@ -20,16 +20,17 @@ jobs:
           SERVER_URL="${{ github.server_url }}"
           SERVER_NO_PROTO="${SERVER_URL#http://}"
           SERVER_NO_PROTO="${SERVER_NO_PROTO#https://}"
-          git clone --depth 1 "https://oauth2:${{ secrets.GITHUB_TOKEN }}@${SERVER_NO_PROTO}/${{ github.repository }}.git" .
+          git clone "https://oauth2:${{ secrets.GITHUB_TOKEN }}@${SERVER_NO_PROTO}/${{ github.repository }}.git" .
           git checkout ${{ github.sha }}
 
       - name: Run Maven Tests
         run: mvn clean test
 
-  deploy:
+  deploy_test:
-    name: Build & Run in Docker Container
+    name: Deploy to Test Environment
     needs: test
-    runs-on: self-hosted
+    if: github.ref == 'refs/heads/main'
+    runs-on: [self-hosted, ubuntu-latest]
     container:
       image: docker:latest
     steps:
@@ -39,7 +40,7 @@ jobs:
           SERVER_URL="${{ github.server_url }}"
           SERVER_NO_PROTO="${SERVER_URL#http://}"
           SERVER_NO_PROTO="${SERVER_NO_PROTO#https://}"
-          git clone --depth 1 "https://oauth2:${{ secrets.GITHUB_TOKEN }}@${SERVER_NO_PROTO}/${{ github.repository }}.git" .
+          git clone "https://oauth2:${{ secrets.GITHUB_TOKEN }}@${SERVER_NO_PROTO}/${{ github.repository }}.git" .
           git checkout ${{ github.sha }}
 
       - name: Deploy with Docker Compose
@@ -49,5 +50,24 @@ jobs:
         run: |
           echo "POSTGRES_USER=${DB_USER:-myuser}" > .env
           echo "POSTGRES_PASSWORD=${DB_PASSWORD:-mypassword}" >> .env
+          echo "CAPTCHA_SECRET=1x0000000000000000000000000000000AA" >> .env
+          echo "CAPTCHA_SITEKEY=1x00000000000000000000AA" >> .env
           docker compose down app || true
           docker compose up -d --build app
+
+      - name: Verify application startup
+        run: |
+          echo "Waiting for application to start..."
+          COUNT=0
+          while [ $COUNT -lt 30 ]; do
+            if docker exec astalange_app wget -qO- http://localhost:8080/login | grep -q "Connexion"; then
+              echo "Application is up and login page is accessible!"
+              exit 0
+            fi
+            echo "Waiting... ($COUNT/30)"
+            sleep 5
+            COUNT=$((COUNT+1))
+          done
+          echo "Application failed to start or login page is not accessible."
+          docker logs astalange_app
+          exit 1

as-talange-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>as-talange-parent</artifactId>
         <groupId>com.astalange</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

as-talange-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>as-talange-parent</artifactId>
         <groupId>com.astalange</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

as-talange-core/src/main/java/com/astalange/core/entity/Adherent.java

@@ -23,18 +23,30 @@ public class Adherent {
     @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
     private LocalDate dateNaissance;
 
+    @Column(name = "lieu_naissance_ville", nullable = false, length = 100)
+    private String lieuNaissanceVille;
+
+    @Column(name = "lieu_naissance_pays", nullable = false, length = 100)
+    private String lieuNaissancePays;
+
+    @Column(nullable = false, length = 100)
+    private String nationalite;
+
+    @Column(nullable = false, length = 100)
+    private String email;
+
     @Column(length = 20)
     private String telephone;
 
-    @Column(length = 100)
-    private String email;
-
-    @Column(columnDefinition = "TEXT")
-    private String adresse;
-
     @Column(name = "representant_legal", length = 150)
     private String representantLegal;
 
+    @Column(name = "type_demande", length = 50)
+    private String typeDemande;
+
+    @Column(name = "ancien_club", length = 150)
+    private String ancienClub;
+
     private boolean residentTalange = true;
 
     @Column(nullable = false, length = 10)
@@ -63,18 +75,30 @@ public class Adherent {
     public LocalDate getDateNaissance() { return dateNaissance; }
     public void setDateNaissance(LocalDate dateNaissance) { this.dateNaissance = dateNaissance; }
 
-    public String getTelephone() { return telephone; }
+    public String getLieuNaissanceVille() { return lieuNaissanceVille; }
-    public void setTelephone(String telephone) { this.telephone = telephone; }
+    public void setLieuNaissanceVille(String lieuNaissanceVille) { this.lieuNaissanceVille = lieuNaissanceVille; }
+
+    public String getLieuNaissancePays() { return lieuNaissancePays; }
+    public void setLieuNaissancePays(String lieuNaissancePays) { this.lieuNaissancePays = lieuNaissancePays; }
+
+    public String getNationalite() { return nationalite; }
+    public void setNationalite(String nationalite) { this.nationalite = nationalite; }
 
     public String getEmail() { return email; }
     public void setEmail(String email) { this.email = email; }
 
-    public String getAdresse() { return adresse; }
+    public String getTelephone() { return telephone; }
-    public void setAdresse(String adresse) { this.adresse = adresse; }
+    public void setTelephone(String telephone) { this.telephone = telephone; }
 
     public String getRepresentantLegal() { return representantLegal; }
     public void setRepresentantLegal(String representantLegal) { this.representantLegal = representantLegal; }
 
+    public String getTypeDemande() { return typeDemande; }
+    public void setTypeDemande(String typeDemande) { this.typeDemande = typeDemande; }
+
+    public String getAncienClub() { return ancienClub; }
+    public void setAncienClub(String ancienClub) { this.ancienClub = ancienClub; }
+
     public boolean isResidentTalange() { return residentTalange; }
     public void setResidentTalange(boolean residentTalange) { this.residentTalange = residentTalange; }
 

as-talange-core/src/main/java/com/astalange/core/entity/AuditLogPaiement.java

@@ -0,0 +1,104 @@
+package com.astalange.core.entity;
+
+import jakarta.persistence.*;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+@Entity
+@Table(name = "audit_log_paiement")
+public class AuditLogPaiement {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String action; // CREATE, UPDATE, DELETE
+
+    @Column(nullable = false)
+    private LocalDateTime dateAction;
+
+    @Column(nullable = false)
+    private String utilisateur; // Username or 'Système'
+
+    @Column(nullable = true)
+    private Long paiementId; // Can be null if the payment is completely deleted or we just want to keep track
+
+    @Column(nullable = false, length = 1000)
+    private String details;
+
+    @Column(nullable = true)
+    private BigDecimal montant;
+
+    @Column(nullable = true)
+    private String adherentNomComplet;
+
+    @PrePersist
+    protected void onCreate() {
+        this.dateAction = LocalDateTime.now();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public LocalDateTime getDateAction() {
+        return dateAction;
+    }
+
+    public void setDateAction(LocalDateTime dateAction) {
+        this.dateAction = dateAction;
+    }
+
+    public String getUtilisateur() {
+        return utilisateur;
+    }
+
+    public void setUtilisateur(String utilisateur) {
+        this.utilisateur = utilisateur;
+    }
+
+    public Long getPaiementId() {
+        return paiementId;
+    }
+
+    public void setPaiementId(Long paiementId) {
+        this.paiementId = paiementId;
+    }
+
+    public String getDetails() {
+        return details;
+    }
+
+    public void setDetails(String details) {
+        this.details = details;
+    }
+
+    public BigDecimal getMontant() {
+        return montant;
+    }
+
+    public void setMontant(BigDecimal montant) {
+        this.montant = montant;
+    }
+
+    public String getAdherentNomComplet() {
+        return adherentNomComplet;
+    }
+
+    public void setAdherentNomComplet(String adherentNomComplet) {
+        this.adherentNomComplet = adherentNomComplet;
+    }
+}

as-talange-core/src/main/java/com/astalange/core/entity/Categorie.java

@@ -6,14 +6,16 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Entity
-@Table(name = "categorie")
+@Table(name = "categorie", uniqueConstraints = {
+    @UniqueConstraint(columnNames = {"nom", "saison_id"})
+})
 public class Categorie {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(nullable = false, unique = true, length = 20)
+    @Column(nullable = false, length = 20)
     private String nom;
 
     @Column(name = "annee_min")
@@ -82,4 +84,33 @@ public class Categorie {
                 .map(CategorieEquipement::getPrix)
                 .orElse(BigDecimal.ZERO);
     }
+
+    @Transient
+    public BigDecimal getEquipementPrixByNom(String nom) {
+        if (categorieEquipements == null || nom == null) return BigDecimal.ZERO;
+        return categorieEquipements.stream()
+                .filter(ce -> ce.getEquipement() != null && nom.equalsIgnoreCase(ce.getEquipement().getNom()))
+                .findFirst()
+                .map(CategorieEquipement::getPrix)
+                .map(p -> p == null ? BigDecimal.ZERO : p)
+                .orElse(BigDecimal.ZERO);
+    }
+
+    @Transient
+    public boolean isU11OrBelow() {
+        if (nom == null) return false;
+        String nomCat = nom.trim().toUpperCase();
+        if (nomCat.startsWith("U")) {
+            java.util.regex.Matcher m = java.util.regex.Pattern.compile("^U(\\d+)").matcher(nomCat);
+            if (m.find()) {
+                try {
+                    int age = Integer.parseInt(m.group(1));
+                    return age <= 11;
+                } catch (NumberFormatException e) {
+                    return false;
+                }
+            }
+        }
+        return false;
+    }
 }

as-talange-core/src/main/java/com/astalange/core/entity/Equipement.java

@@ -14,6 +14,9 @@ public class Equipement {
     @Column(nullable = false, length = 100)
     private String nom;
 
+    @Column(length = 100)
+    private String reference;
+
     @Column(columnDefinition = "TEXT")
     private String description;
 
@@ -30,6 +33,9 @@ public class Equipement {
     public String getNom() { return nom; }
     public void setNom(String nom) { this.nom = nom; }
 
+    public String getReference() { return reference; }
+    public void setReference(String reference) { this.reference = reference; }
+
     public String getDescription() { return description; }
     public void setDescription(String description) { this.description = description; }
 

as-talange-core/src/main/java/com/astalange/core/entity/Licence.java

@@ -35,6 +35,12 @@ public class Licence {
     @Column(name = "numero_licence", length = 50)
     private String numeroLicence;
 
+    @Column(name = "type_demande", length = 50)
+    private String typeDemande;
+
+    @Column(name = "type_licence", length = 50)
+    private String typeLicence;
+
     @OneToMany(mappedBy = "licence", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Paiement> paiements = new ArrayList<>();
 
@@ -113,15 +119,21 @@ public class Licence {
     public String getEtat() { return etat; }
     public void setEtat(String etat) { this.etat = etat; }
 
+    public String getNumeroLicence() { return numeroLicence; }
+    public void setNumeroLicence(String numeroLicence) { this.numeroLicence = numeroLicence; }
+
+    public String getTypeDemande() { return typeDemande; }
+    public void setTypeDemande(String typeDemande) { this.typeDemande = typeDemande; }
+
+    public String getTypeLicence() { return typeLicence; }
+    public void setTypeLicence(String typeLicence) { this.typeLicence = typeLicence; }
+
     public List<Paiement> getPaiements() { return paiements; }
     public void setPaiements(List<Paiement> paiements) { this.paiements = paiements; }
 
     public List<Dotation> getDotations() { return dotations; }
     public void setDotations(List<Dotation> dotations) { this.dotations = dotations; }
 
-    public String getNumeroLicence() { return numeroLicence; }
-    public void setNumeroLicence(String numeroLicence) { this.numeroLicence = numeroLicence; }
-
     public void addPaiement(Paiement paiement) {
         paiements.add(paiement);
         paiement.setLicence(this);

as-talange-core/src/main/java/com/astalange/core/entity/Paiement.java

@@ -26,6 +26,9 @@ public class Paiement {
     @JoinColumn(name = "mode_paiement_id", nullable = false)
     private ModePaiement modePaiement;
 
+    @Column(name = "gestionnaire")
+    private String gestionnaire;
+
     // Getters and Setters
 
     public Long getId() { return id; }
@@ -42,4 +45,7 @@ public class Paiement {
 
     public ModePaiement getModePaiement() { return modePaiement; }
     public void setModePaiement(ModePaiement modePaiement) { this.modePaiement = modePaiement; }
+
+    public String getGestionnaire() { return gestionnaire; }
+    public void setGestionnaire(String gestionnaire) { this.gestionnaire = gestionnaire; }
 }

as-talange-core/src/main/java/com/astalange/core/entity/PreInscription.java

@@ -21,14 +21,20 @@ public class PreInscription {
     @Column(name = "date_naissance", nullable = false)
     private LocalDate dateNaissance;
 
-    @Column(length = 20)
+    @Column(name = "lieu_naissance_ville", nullable = false, length = 100)
-    private String telephone;
+    private String lieuNaissanceVille;
 
-    @Column(length = 150)
+    @Column(name = "lieu_naissance_pays", nullable = false, length = 100)
+    private String lieuNaissancePays;
+
+    @Column(nullable = false, length = 100)
+    private String nationalite;
+
+    @Column(nullable = false, length = 150)
     private String email;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(length = 20)
-    private String adresse;
+    private String telephone;
 
     @Column(name = "representant_legal", length = 150)
     private String representantLegal;
@@ -43,6 +49,15 @@ public class PreInscription {
     @JoinColumn(name = "saison_id", nullable = false)
     private Saison saison;
 
+    @Column(name = "consentement_rgpd", nullable = false)
+    private Boolean consentementRgpd = false;
+
+    @Column(name = "type_demande", nullable = false, length = 50)
+    private String typeDemande = "NOUVELLE";
+
+    @Column(name = "ancien_club", length = 150)
+    private String ancienClub;
+
     // Getters and Setters
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
@@ -56,14 +71,20 @@ public class PreInscription {
     public LocalDate getDateNaissance() { return dateNaissance; }
     public void setDateNaissance(LocalDate dateNaissance) { this.dateNaissance = dateNaissance; }
 
-    public String getTelephone() { return telephone; }
+    public String getLieuNaissanceVille() { return lieuNaissanceVille; }
-    public void setTelephone(String telephone) { this.telephone = telephone; }
+    public void setLieuNaissanceVille(String lieuNaissanceVille) { this.lieuNaissanceVille = lieuNaissanceVille; }
+
+    public String getLieuNaissancePays() { return lieuNaissancePays; }
+    public void setLieuNaissancePays(String lieuNaissancePays) { this.lieuNaissancePays = lieuNaissancePays; }
+
+    public String getNationalite() { return nationalite; }
+    public void setNationalite(String nationalite) { this.nationalite = nationalite; }
 
     public String getEmail() { return email; }
     public void setEmail(String email) { this.email = email; }
 
-    public String getAdresse() { return adresse; }
+    public String getTelephone() { return telephone; }
-    public void setAdresse(String adresse) { this.adresse = adresse; }
+    public void setTelephone(String telephone) { this.telephone = telephone; }
 
     public String getRepresentantLegal() { return representantLegal; }
     public void setRepresentantLegal(String representantLegal) { this.representantLegal = representantLegal; }
@@ -76,4 +97,13 @@ public class PreInscription {
 
     public Saison getSaison() { return saison; }
     public void setSaison(Saison saison) { this.saison = saison; }
+
+    public Boolean getConsentementRgpd() { return consentementRgpd; }
+    public void setConsentementRgpd(Boolean consentementRgpd) { this.consentementRgpd = consentementRgpd; }
+
+    public String getTypeDemande() { return typeDemande; }
+    public void setTypeDemande(String typeDemande) { this.typeDemande = typeDemande; }
+
+    public String getAncienClub() { return ancienClub; }
+    public void setAncienClub(String ancienClub) { this.ancienClub = ancienClub; }
 }

as-talange-core/src/main/java/com/astalange/core/repository/AuditLogPaiementRepository.java

@@ -0,0 +1,26 @@
+package com.astalange.core.repository;
+
+import com.astalange.core.entity.AuditLogPaiement;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+@Repository
+public interface AuditLogPaiementRepository extends JpaRepository<AuditLogPaiement, Long> {
+    List<AuditLogPaiement> findAllByOrderByDateActionDesc();
+
+    @Query("SELECT a FROM AuditLogPaiement a WHERE " +
+           "(:action IS NULL OR :action = '' OR a.action = :action) AND " +
+           "(:utilisateur IS NULL OR :utilisateur = '' OR LOWER(a.utilisateur) LIKE LOWER(CONCAT('%', :utilisateur, '%'))) AND " +
+           "(:adherent IS NULL OR :adherent = '' OR LOWER(a.adherentNomComplet) LIKE LOWER(CONCAT('%', :adherent, '%'))) " +
+           "ORDER BY a.dateAction DESC")
+    List<AuditLogPaiement> findByFilters(
+            @Param("action") String action,
+            @Param("utilisateur") String utilisateur,
+            @Param("adherent") String adherent
+    );
+}

as-talange-core/src/main/java/com/astalange/core/repository/CategorieRepository.java

@@ -7,7 +7,13 @@ import org.springframework.stereotype.Repository;
 import com.astalange.core.entity.Saison;
 import java.util.List;
 
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.jpa.repository.Query;
+
 @Repository
 public interface CategorieRepository extends JpaRepository<Categorie, Long> {
     List<Categorie> findBySaison(Saison saison);
+
+    @Query("SELECT c FROM Categorie c WHERE c.saison = :saison AND :annee BETWEEN c.anneeMin AND c.anneeMax")
+    List<Categorie> findBySaisonAndAnnee(@Param("saison") Saison saison, @Param("annee") Integer annee);
 }

as-talange-core/src/main/java/com/astalange/core/repository/DotationRepository.java

@@ -1,9 +1,14 @@
 package com.astalange.core.repository;
 
 import com.astalange.core.entity.Dotation;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import com.astalange.core.entity.Saison;
+
 @Repository
-public interface DotationRepository extends JpaRepository<Dotation, Long> {
+public interface DotationRepository extends JpaRepository<Dotation, Long>, JpaSpecificationExecutor<Dotation> {
+    List<Dotation> findByLicence_SaisonAndChoisiTrueAndFourniFalse(Saison saison);
 }

as-talange-core/src/main/java/com/astalange/core/repository/LicenceRepository.java

@@ -8,8 +8,10 @@ import org.springframework.stereotype.Repository;
 import java.math.BigDecimal;
 import java.util.List;
 
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
 @Repository
-public interface LicenceRepository extends JpaRepository<Licence, Long> {
+public interface LicenceRepository extends JpaRepository<Licence, Long>, JpaSpecificationExecutor<Licence> {
     List<Licence> findByAdherentId(Long adherentId);
     
     List<Licence> findBySaisonAndCategorie(com.astalange.core.entity.Saison saison, com.astalange.core.entity.Categorie categorie);

as-talange-core/src/main/java/com/astalange/core/service/CategorieService.java

@@ -76,7 +76,13 @@ public class CategorieService {
         }
     }
 
-    private void updateDotationsForLicence(Licence licence, List<CategorieEquipement> categorieEquipements) {
+    public void syncDotationsForLicence(Licence licence) {
+        if (licence.getCategorie() != null) {
+            updateDotationsForLicence(licence, licence.getCategorie().getCategorieEquipements());
+        }
+    }
+
+    public void updateDotationsForLicence(Licence licence, List<CategorieEquipement> categorieEquipements) {
         List<Dotation> currentDotations = licence.getDotations();
         List<Dotation> toRemove = new ArrayList<>();
 
@@ -111,8 +117,21 @@ public class CategorieService {
                 Dotation newDotation = new Dotation();
                 newDotation.setLicence(licence);
                 newDotation.setEquipement(ce.getEquipement());
-                newDotation.setChoisi(ce.getObligatoire()); // By default checked if obligatoire
+                boolean isMaillot = "Maillot".equalsIgnoreCase(ce.getEquipement().getNom());
+                boolean isNouvelleAndU11 = false;
+                if (licence.getTypeDemande() != null && 
+                    (licence.getTypeDemande().equalsIgnoreCase("Nouvelle demande") || licence.getTypeDemande().equalsIgnoreCase("NOUVELLE")) && 
+                    licence.getCategorie() != null && 
+                    licence.getCategorie().isU11OrBelow()) {
+                    isNouvelleAndU11 = true;
+                }
+                newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelleAndU11)); // Checked if obligatoire or if it's a new registration for U11 or below
                 newDotation.setFourni(false);
+                newDotation.setTaille("");
+                newDotation.setNumero("");
+                if (licence.getAdherent() != null) {
+                    newDotation.setFlocage(licence.getAdherent().getNom().toUpperCase() + " " + licence.getAdherent().getPrenom());
+                }
                 currentDotations.add(newDotation);
             }
         }

as-talange-core/src/main/java/com/astalange/core/service/DotationService.java

@@ -0,0 +1,108 @@
+package com.astalange.core.service;
+
+import com.astalange.core.entity.Dotation;
+import com.astalange.core.entity.Saison;
+import com.astalange.core.repository.DotationRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DotationService {
+
+    private final DotationRepository dotationRepository;
+
+    public DotationService(DotationRepository dotationRepository) {
+        this.dotationRepository = dotationRepository;
+    }
+
+    public String genererCsvCommandeEquipement(Saison saisonActive) {
+        List<Dotation> dotations = dotationRepository.findByLicence_SaisonAndChoisiTrueAndFourniFalse(saisonActive);
+
+        StringBuilder sb = new StringBuilder();
+        // BOM for Excel to open UTF-8 correctly
+        sb.append('\ufeff');
+        
+        // Header
+        sb.append("Catégorie;Nom;Prénom;Poste;Sexe;Équipement;Référence;Taille;Flocage;Numéro\n");
+
+        for (Dotation d : dotations) {
+            String categorie = d.getLicence().getCategorie() != null ? d.getLicence().getCategorie().getNom() : "";
+            String nom = d.getLicence().getAdherent().getNom();
+            String prenom = d.getLicence().getAdherent().getPrenom();
+            String poste = d.getLicence().getAdherent().getTypeMaillot() != null ? d.getLicence().getAdherent().getTypeMaillot() : "";
+            String sexe = d.getLicence().getAdherent().getSexe() != null ? d.getLicence().getAdherent().getSexe() : "";
+            String equipement = d.getEquipement() != null ? d.getEquipement().getNom() : "";
+            String reference = d.getEquipement() != null && d.getEquipement().getReference() != null ? d.getEquipement().getReference() : "";
+            String taille = d.getTaille() != null ? d.getTaille() : "";
+            String flocage = d.getFlocage() != null ? d.getFlocage() : "";
+            String numero = d.getNumero() != null ? d.getNumero() : "";
+
+            sb.append(escapeCsv(categorie)).append(";")
+              .append(escapeCsv(nom)).append(";")
+              .append(escapeCsv(prenom)).append(";")
+              .append(escapeCsv(poste)).append(";")
+              .append(escapeCsv(sexe)).append(";")
+              .append(escapeCsv(equipement)).append(";")
+              .append(escapeCsv(reference)).append(";")
+              .append(escapeCsv(taille)).append(";")
+              .append(escapeCsv(flocage)).append(";")
+              .append(escapeCsv(numero)).append("\n");
+        }
+
+        return sb.toString();
+    }
+
+    public String genererCsvSearchEquipement(List<Dotation> dotations) {
+        StringBuilder sb = new StringBuilder();
+        // BOM for Excel to open UTF-8 correctly
+        sb.append('\ufeff');
+        
+        // Header
+        sb.append("Saison;Catégorie;Nom;Prénom;Poste;Sexe;Équipement;Référence;Taille;Flocage;Numéro;Fourni\n");
+
+        for (Dotation d : dotations) {
+            String saison = d.getLicence().getSaison() != null ? d.getLicence().getSaison().getNom() : "";
+            String categorie = d.getLicence().getCategorie() != null ? d.getLicence().getCategorie().getNom() : "";
+            String nom = d.getLicence().getAdherent().getNom();
+            String prenom = d.getLicence().getAdherent().getPrenom();
+            String poste = d.getLicence().getAdherent().getTypeMaillot() != null ? d.getLicence().getAdherent().getTypeMaillot() : "";
+            String sexe = d.getLicence().getAdherent().getSexe() != null ? d.getLicence().getAdherent().getSexe() : "";
+            String equipement = d.getEquipement() != null ? d.getEquipement().getNom() : "";
+            String reference = d.getEquipement() != null && d.getEquipement().getReference() != null ? d.getEquipement().getReference() : "";
+            String taille = d.getTaille() != null ? d.getTaille() : "";
+            String flocage = d.getFlocage() != null ? d.getFlocage() : "";
+            String numero = d.getNumero() != null ? d.getNumero() : "";
+            String fourni = Boolean.TRUE.equals(d.getFourni()) ? "Oui" : "Non";
+
+            sb.append(escapeCsv(saison)).append(";")
+              .append(escapeCsv(categorie)).append(";")
+              .append(escapeCsv(nom)).append(";")
+              .append(escapeCsv(prenom)).append(";")
+              .append(escapeCsv(poste)).append(";")
+              .append(escapeCsv(sexe)).append(";")
+              .append(escapeCsv(equipement)).append(";")
+              .append(escapeCsv(reference)).append(";")
+              .append(escapeCsv(taille)).append(";")
+              .append(escapeCsv(flocage)).append(";")
+              .append(escapeCsv(numero)).append(";")
+              .append(escapeCsv(fourni)).append("\n");
+        }
+
+        return sb.toString();
+    }
+
+    private String escapeCsv(String value) {
+        if (value == null) {
+            return "";
+        }
+        String result = value;
+        if (result.contains("\"")) {
+            result = result.replace("\"", "\"\"");
+        }
+        if (result.contains(";") || result.contains("\n") || result.contains("\"")) {
+            return "\"" + result + "\"";
+        }
+        return result;
+    }
+}

as-talange-core/src/main/java/com/astalange/core/service/PreInscriptionService.java

@@ -38,10 +38,14 @@ public class PreInscriptionService {
         adherent.setNom(pre.getNom().toUpperCase());
         adherent.setPrenom(pre.getPrenom());
         adherent.setDateNaissance(pre.getDateNaissance());
-        adherent.setTelephone(pre.getTelephone());
+        adherent.setLieuNaissanceVille(pre.getLieuNaissanceVille());
+        adherent.setLieuNaissancePays(pre.getLieuNaissancePays());
+        adherent.setNationalite(pre.getNationalite());
         adherent.setEmail(pre.getEmail());
-        adherent.setAdresse(pre.getAdresse());
+        adherent.setTelephone(pre.getTelephone());
         adherent.setRepresentantLegal(pre.getRepresentantLegal());
+        adherent.setTypeDemande(pre.getTypeDemande());
+        adherent.setAncienClub(pre.getAncienClub());
         // Par défaut
         adherent.setSexe("MASCULIN");
         adherent.setTypeMaillot("JOUEUR");

as-talange-core/src/main/resources/db/migration/V18__fix_categorie_unique_constraint.sql

@@ -0,0 +1,5 @@
+-- Drop the global unique constraint on 'nom'
+ALTER TABLE categorie DROP CONSTRAINT IF EXISTS categorie_nom_key;
+
+-- Add a composite unique constraint for 'nom' and 'saison_id'
+ALTER TABLE categorie ADD CONSTRAINT categorie_nom_saison_id_key UNIQUE (nom, saison_id);

as-talange-core/src/main/resources/db/migration/V19__add_lieu_naissance_et_nationalite.sql

@@ -0,0 +1,11 @@
+-- adherent modifications
+ALTER TABLE adherent DROP COLUMN IF EXISTS adresse;
+ALTER TABLE adherent ADD COLUMN lieu_naissance_ville VARCHAR(100);
+ALTER TABLE adherent ADD COLUMN lieu_naissance_pays VARCHAR(100);
+ALTER TABLE adherent ADD COLUMN nationalite VARCHAR(100);
+
+-- pre_inscription modifications
+ALTER TABLE pre_inscription DROP COLUMN IF EXISTS adresse;
+ALTER TABLE pre_inscription ADD COLUMN lieu_naissance_ville VARCHAR(100);
+ALTER TABLE pre_inscription ADD COLUMN lieu_naissance_pays VARCHAR(100);
+ALTER TABLE pre_inscription ADD COLUMN nationalite VARCHAR(100);

as-talange-core/src/main/resources/db/migration/V20__add_licence_types.sql

@@ -0,0 +1,2 @@
+ALTER TABLE licence ADD COLUMN type_demande VARCHAR(50);
+ALTER TABLE licence ADD COLUMN type_licence VARCHAR(50);

as-talange-core/src/main/resources/db/migration/V21__make_naissance_fields_required.sql

@@ -0,0 +1,18 @@
+-- Default values for existing records in adherent
+UPDATE adherent SET lieu_naissance_ville = 'Non renseigné' WHERE lieu_naissance_ville IS NULL;
+UPDATE adherent SET lieu_naissance_pays = 'France' WHERE lieu_naissance_pays IS NULL;
+UPDATE adherent SET nationalite = 'Française' WHERE nationalite IS NULL;
+
+-- Default values for existing records in pre_inscription
+UPDATE pre_inscription SET lieu_naissance_ville = 'Non renseigné' WHERE lieu_naissance_ville IS NULL;
+UPDATE pre_inscription SET lieu_naissance_pays = 'France' WHERE lieu_naissance_pays IS NULL;
+UPDATE pre_inscription SET nationalite = 'Française' WHERE nationalite IS NULL;
+
+-- Now make them NOT NULL
+ALTER TABLE adherent ALTER COLUMN lieu_naissance_ville SET NOT NULL;
+ALTER TABLE adherent ALTER COLUMN lieu_naissance_pays SET NOT NULL;
+ALTER TABLE adherent ALTER COLUMN nationalite SET NOT NULL;
+
+ALTER TABLE pre_inscription ALTER COLUMN lieu_naissance_ville SET NOT NULL;
+ALTER TABLE pre_inscription ALTER COLUMN lieu_naissance_pays SET NOT NULL;
+ALTER TABLE pre_inscription ALTER COLUMN nationalite SET NOT NULL;

as-talange-core/src/main/resources/db/migration/V22__remove_telephone_require_email.sql

@@ -0,0 +1,11 @@
+-- Provide fallback email if null
+UPDATE adherent SET email = 'nonrenseigne@example.com' WHERE email IS NULL OR email = '';
+UPDATE pre_inscription SET email = 'nonrenseigne@example.com' WHERE email IS NULL OR email = '';
+
+-- Make email NOT NULL
+ALTER TABLE adherent ALTER COLUMN email SET NOT NULL;
+ALTER TABLE pre_inscription ALTER COLUMN email SET NOT NULL;
+
+-- Remove telephone
+ALTER TABLE adherent DROP COLUMN IF EXISTS telephone;
+ALTER TABLE pre_inscription DROP COLUMN IF EXISTS telephone;

as-talange-core/src/main/resources/db/migration/V23__add_gestionnaire_to_paiement.sql

@@ -0,0 +1 @@
+ALTER TABLE paiement ADD COLUMN gestionnaire VARCHAR(255);

as-talange-core/src/main/resources/db/migration/V24__add_consentement_rgpd_to_pre_inscription.sql

@@ -0,0 +1 @@
+ALTER TABLE pre_inscription ADD COLUMN consentement_rgpd BOOLEAN NOT NULL DEFAULT FALSE;

as-talange-core/src/main/resources/db/migration/V25__create_audit_log_paiement.sql

@@ -0,0 +1,10 @@
+CREATE TABLE audit_log_paiement (
+    id BIGSERIAL PRIMARY KEY,
+    action VARCHAR(50) NOT NULL,
+    date_action TIMESTAMP NOT NULL,
+    utilisateur VARCHAR(255) NOT NULL,
+    paiement_id BIGINT,
+    details VARCHAR(1000) NOT NULL,
+    montant DECIMAL(10, 2),
+    adherent_nom_complet VARCHAR(255)
+);

as-talange-core/src/main/resources/db/migration/V26__add_telephone.sql

@@ -0,0 +1,2 @@
+ALTER TABLE adherent ADD COLUMN telephone VARCHAR(20);
+ALTER TABLE pre_inscription ADD COLUMN telephone VARCHAR(20);

as-talange-core/src/main/resources/db/migration/V27__add_reference_to_equipement.sql

@@ -0,0 +1 @@
+ALTER TABLE equipement ADD COLUMN reference VARCHAR(100);

as-talange-core/src/main/resources/db/migration/V28__add_type_demande.sql

@@ -0,0 +1,3 @@
+ALTER TABLE pre_inscription 
+ADD COLUMN type_demande VARCHAR(50) DEFAULT 'NOUVELLE' NOT NULL,
+ADD COLUMN ancien_club VARCHAR(150);

as-talange-core/src/main/resources/db/migration/V29__add_demande_to_adherent.sql

@@ -0,0 +1,3 @@
+ALTER TABLE adherent
+ADD COLUMN type_demande VARCHAR(50),
+ADD COLUMN ancien_club VARCHAR(150);

as-talange-web/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>as-talange-parent</artifactId>
         <groupId>com.astalange</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

as-talange-web/src/main/java/com/astalange/web/config/SecurityConfig.java

@@ -27,8 +27,8 @@ public class SecurityConfig {
             .authorizeHttpRequests(auth -> auth
                 .requestMatchers("/css/**", "/js/**", "/images/**", "/inscription-public/**").permitAll()
                 .requestMatchers("/change-password").authenticated()
-                .requestMatchers("/utilisateurs/**", "/saisons/**", "/categories/**", "/equipes/**", "/modespaiement/**", "/equipements/**").hasRole("ADMIN")
+                .requestMatchers("/utilisateurs/**", "/saisons/**", "/categories/**", "/equipes/**", "/modespaiement/**", "/equipements/**", "/admin/logs/**").hasRole("ADMIN")
-                .requestMatchers("/paiements/**", "/paiement/**").hasAnyRole("ADMIN", "TRESORERIE")
+                .requestMatchers("/paiements/**", "/paiement/**").hasAnyRole("ADMIN", "TRESORERIE", "AGENT_SAISIE")
                 .requestMatchers("/planning/**").hasAnyRole("ADMIN", "AGENT_SAISIE")
                 .requestMatchers("/adherents/**", "/dotations/**").hasAnyRole("ADMIN", "TRESORERIE", "AGENT_SAISIE")
                 .anyRequest().authenticated()

as-talange-web/src/main/java/com/astalange/web/controller/AdherentController.java

@@ -23,13 +23,15 @@ public class AdherentController {
     private final com.astalange.core.repository.LicenceRepository licenceRepository;
     private final com.astalange.core.repository.ModePaiementRepository modePaiementRepository;
     private final SaisonRepository saisonRepository;
+    private final com.astalange.core.service.CategorieService categorieService;
 
-    public AdherentController(AdherentRepository adherentRepository, CategorieRepository categorieRepository, com.astalange.core.repository.LicenceRepository licenceRepository, com.astalange.core.repository.ModePaiementRepository modePaiementRepository, SaisonRepository saisonRepository) {
+    public AdherentController(AdherentRepository adherentRepository, CategorieRepository categorieRepository, com.astalange.core.repository.LicenceRepository licenceRepository, com.astalange.core.repository.ModePaiementRepository modePaiementRepository, SaisonRepository saisonRepository, com.astalange.core.service.CategorieService categorieService) {
         this.adherentRepository = adherentRepository;
         this.categorieRepository = categorieRepository;
         this.licenceRepository = licenceRepository;
         this.modePaiementRepository = modePaiementRepository;
         this.saisonRepository = saisonRepository;
+        this.categorieService = categorieService;
     }
 
     @org.springframework.web.bind.annotation.ModelAttribute("equipes")
@@ -45,7 +47,6 @@ public class AdherentController {
             @org.springframework.web.bind.annotation.RequestParam(required = false) String categorie,
             @org.springframework.web.bind.annotation.RequestParam(required = false) String licence,
             @org.springframework.web.bind.annotation.RequestParam(required = false) String email,
-            @org.springframework.web.bind.annotation.RequestParam(required = false) String telephone,
             @org.springframework.web.bind.annotation.RequestParam(required = false) String paiement,
             @org.springframework.web.bind.annotation.RequestParam(defaultValue = "0") int page,
             @org.springframework.web.bind.annotation.RequestParam(defaultValue = "20") int size,
@@ -97,11 +98,6 @@ public class AdherentController {
             adherents = adherents.stream().filter(a -> a.getEmail() != null && a.getEmail().toLowerCase().contains(e)).collect(java.util.stream.Collectors.toList());
             model.addAttribute("emailFilter", email.trim());
         }
-        if (telephone != null && !telephone.trim().isEmpty()) {
-            String t = telephone.trim().toLowerCase();
-            adherents = adherents.stream().filter(a -> a.getTelephone() != null && a.getTelephone().toLowerCase().contains(t)).collect(java.util.stream.Collectors.toList());
-            model.addAttribute("telephoneFilter", telephone.trim());
-        }
         if (paiement != null && !paiement.trim().isEmpty()) {
             adherents = adherents.stream().filter(a -> {
                 String statut = a.getStatutPaiement();
@@ -193,7 +189,8 @@ public class AdherentController {
                                 .orElse(null);
                         if (newCat != null) {
                             licence.setCategorie(newCat);
-                            licenceRepository.save(licence);
+                            licence = licenceRepository.save(licence);
+                            categorieService.syncDotationsForLicence(licence);
                         }
                     }
                 }
@@ -201,9 +198,10 @@ public class AdherentController {
                 existing.setNom(adherent.getNom());
                 existing.setPrenom(adherent.getPrenom());
                 existing.setDateNaissance(adherent.getDateNaissance());
-                existing.setTelephone(adherent.getTelephone());
+                existing.setLieuNaissanceVille(adherent.getLieuNaissanceVille());
+                existing.setLieuNaissancePays(adherent.getLieuNaissancePays());
+                existing.setNationalite(adherent.getNationalite());
                 existing.setEmail(adherent.getEmail());
-                existing.setAdresse(adherent.getAdresse());
                 existing.setRepresentantLegal(adherent.getRepresentantLegal());
                 existing.setResidentTalange(adherent.isResidentTalange());
                 existing.setSexe(adherent.getSexe());

as-talange-web/src/main/java/com/astalange/web/controller/AuditLogPaiementController.java

@@ -0,0 +1,34 @@
+package com.astalange.web.controller;
+
+import com.astalange.core.repository.AuditLogPaiementRepository;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Controller
+@RequestMapping("/admin/logs/paiements")
+public class AuditLogPaiementController {
+
+    private final AuditLogPaiementRepository auditLogPaiementRepository;
+
+    public AuditLogPaiementController(AuditLogPaiementRepository auditLogPaiementRepository) {
+        this.auditLogPaiementRepository = auditLogPaiementRepository;
+    }
+
+    @GetMapping
+    public String listLogs(
+            @RequestParam(required = false) String action,
+            @RequestParam(required = false) String utilisateur,
+            @RequestParam(required = false) String adherent,
+            Model model) {
+        
+        model.addAttribute("logs", auditLogPaiementRepository.findByFilters(action, utilisateur, adherent));
+        model.addAttribute("paramAction", action);
+        model.addAttribute("paramUtilisateur", utilisateur);
+        model.addAttribute("paramAdherent", adherent);
+        
+        return "audit/paiements_logs";
+    }
+}

as-talange-web/src/main/java/com/astalange/web/controller/CategorieController.java

@@ -47,8 +47,13 @@ public class CategorieController {
         Categorie categorie = categorieRepository.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid category ID: " + id));
         model.addAttribute("categorie", categorie);
-        Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
+        
-        model.addAttribute("allEquipements", activeSaison != null ? equipementRepository.findBySaison(activeSaison) : List.of());
+        Saison saison = categorie.getSaison();
+        if (saison == null) {
+            saison = saisonRepository.findByEstActiveTrue().orElse(null);
+        }
+        
+        model.addAttribute("allEquipements", saison != null ? equipementRepository.findBySaison(saison) : List.of());
         return "parametrage/categories_form";
     }
 

as-talange-web/src/main/java/com/astalange/web/controller/DotationController.java

@@ -11,13 +11,120 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import jakarta.servlet.http.HttpServletRequest;
 
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import java.time.LocalDate;
+
+import com.astalange.core.service.DotationService;
+import com.astalange.core.repository.SaisonRepository;
+import com.astalange.core.entity.Saison;
+
+import com.astalange.core.repository.EquipementRepository;
+import com.astalange.core.repository.CategorieRepository;
+import org.springframework.ui.Model;
+import org.springframework.data.jpa.domain.Specification;
+import jakarta.persistence.criteria.Predicate;
+import java.util.ArrayList;
+
 @Controller
 public class DotationController {
 
     private final DotationRepository dotationRepository;
+    private final DotationService dotationService;
+    private final SaisonRepository saisonRepository;
+    private final EquipementRepository equipementRepository;
+    private final CategorieRepository categorieRepository;
 
-    public DotationController(DotationRepository dotationRepository) {
+    public DotationController(DotationRepository dotationRepository, DotationService dotationService, SaisonRepository saisonRepository, EquipementRepository equipementRepository, CategorieRepository categorieRepository) {
         this.dotationRepository = dotationRepository;
+        this.dotationService = dotationService;
+        this.saisonRepository = saisonRepository;
+        this.equipementRepository = equipementRepository;
+        this.categorieRepository = categorieRepository;
+    }
+
+    private Specification<Dotation> buildSpecification(Long equipementId, Long categorieId, Boolean fourni, Saison saisonActive) {
+        return (root, query, cb) -> {
+            if (Long.class != query.getResultType() && long.class != query.getResultType()) {
+                root.fetch("equipement", jakarta.persistence.criteria.JoinType.LEFT);
+                jakarta.persistence.criteria.Fetch<Object, Object> licenceFetch = root.fetch("licence", jakarta.persistence.criteria.JoinType.LEFT);
+                licenceFetch.fetch("adherent", jakarta.persistence.criteria.JoinType.LEFT);
+                licenceFetch.fetch("categorie", jakarta.persistence.criteria.JoinType.LEFT);
+            }
+
+            List<Predicate> predicates = new ArrayList<>();
+            if (saisonActive != null) {
+                predicates.add(cb.equal(root.get("licence").get("saison"), saisonActive));
+            }
+            if (equipementId != null) {
+                predicates.add(cb.equal(root.get("equipement").get("id"), equipementId));
+            }
+            if (categorieId != null) {
+                predicates.add(cb.equal(root.get("licence").get("categorie").get("id"), categorieId));
+            }
+            if (fourni != null) {
+                predicates.add(cb.equal(root.get("fourni"), fourni));
+            }
+            return cb.and(predicates.toArray(new Predicate[0]));
+        };
+    }
+
+    @GetMapping("/admin/equipements/recherche")
+    public String rechercheEquipements(
+            @RequestParam(required = false) Long equipementId,
+            @RequestParam(required = false) Long categorieId,
+            @RequestParam(required = false) Boolean fourni,
+            Model model) {
+
+        Saison saisonActive = saisonRepository.findByEstActiveTrue().orElse(null);
+        Specification<Dotation> spec = buildSpecification(equipementId, categorieId, fourni, saisonActive);
+        List<Dotation> dotations = dotationRepository.findAll(spec);
+
+        model.addAttribute("dotations", dotations);
+        model.addAttribute("equipements", equipementRepository.findAll());
+        model.addAttribute("categories", categorieRepository.findAll());
+        model.addAttribute("equipementId", equipementId);
+        model.addAttribute("categorieId", categorieId);
+        model.addAttribute("fourni", fourni);
+
+        return "parametrage/equipements_recherche";
+    }
+
+    @GetMapping("/admin/equipements/recherche/export")
+    public ResponseEntity<byte[]> exportRechercheEquipements(
+            @RequestParam(required = false) Long equipementId,
+            @RequestParam(required = false) Long categorieId,
+            @RequestParam(required = false) Boolean fourni) {
+
+        Saison saisonActive = saisonRepository.findByEstActiveTrue().orElse(null);
+        Specification<Dotation> spec = buildSpecification(equipementId, categorieId, fourni, saisonActive);
+        List<Dotation> dotations = dotationRepository.findAll(spec);
+
+        String csvContent = dotationService.genererCsvSearchEquipement(dotations);
+        byte[] csvBytes = csvContent.getBytes(java.nio.charset.StandardCharsets.UTF_8);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentDispositionFormData("attachment", "recherche_equipements_" + LocalDate.now() + ".csv");
+        headers.setContentType(MediaType.parseMediaType("text/csv; charset=UTF-8"));
+
+        return new ResponseEntity<>(csvBytes, headers, org.springframework.http.HttpStatus.OK);
+    }
+
+    @GetMapping("/admin/equipements/export-commande")
+    public ResponseEntity<byte[]> exportCommande() {
+        Saison saisonActive = saisonRepository.findByEstActiveTrue()
+                .orElseThrow(() -> new IllegalStateException("Aucune saison active"));
+        
+        String csvContent = dotationService.genererCsvCommandeEquipement(saisonActive);
+        byte[] csvBytes = csvContent.getBytes(java.nio.charset.StandardCharsets.UTF_8);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentDispositionFormData("attachment", "commande_equipements_" + LocalDate.now() + ".csv");
+        headers.setContentType(MediaType.parseMediaType("text/csv; charset=UTF-8"));
+
+        return new ResponseEntity<>(csvBytes, headers, org.springframework.http.HttpStatus.OK);
     }
 
     @PostMapping("/dotations/{id}")

as-talange-web/src/main/java/com/astalange/web/controller/EquipementController.java

@@ -22,7 +22,12 @@ public class EquipementController {
 
     @GetMapping
     public String listEquipements(Model model) {
-        model.addAttribute("equipements", equipementRepository.findAll());
+        Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
+        if (activeSaison != null) {
+            model.addAttribute("equipements", equipementRepository.findBySaison(activeSaison));
+        } else {
+            model.addAttribute("equipements", java.util.List.of());
+        }
         return "parametrage/equipements_list";
     }
 

as-talange-web/src/main/java/com/astalange/web/controller/GlobalControllerAdvice.java

@@ -1,14 +1,23 @@
 package com.astalange.web.controller;
 
 import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
 @ControllerAdvice
 public class GlobalControllerAdvice {
 
+    @Value("${app.version}")
+    private String appVersion;
+
     @ModelAttribute("requestURI")
     public String requestURI(final HttpServletRequest request) {
         return request.getRequestURI();
     }
+
+    @ModelAttribute("appVersion")
+    public String appVersion() {
+        return appVersion;
+    }
 }

as-talange-web/src/main/java/com/astalange/web/controller/LicenceController.java

@@ -21,6 +21,7 @@ public class LicenceController {
     private final DotationRepository dotationRepository;
     private final SaisonRepository saisonRepository;
     private final EquipeRepository equipeRepository;
+    private final com.astalange.core.service.CategorieService categorieService;
 
     public LicenceController(AdherentRepository adherentRepository, 
                              CategorieRepository categorieRepository, 
@@ -28,7 +29,8 @@ public class LicenceController {
                              EquipementRepository equipementRepository,
                              DotationRepository dotationRepository,
                              SaisonRepository saisonRepository,
-                             EquipeRepository equipeRepository) {
+                             EquipeRepository equipeRepository,
+                             com.astalange.core.service.CategorieService categorieService) {
         this.adherentRepository = adherentRepository;
         this.categorieRepository = categorieRepository;
         this.licenceRepository = licenceRepository;
@@ -36,6 +38,7 @@ public class LicenceController {
         this.dotationRepository = dotationRepository;
         this.saisonRepository = saisonRepository;
         this.equipeRepository = equipeRepository;
+        this.categorieService = categorieService;
     }
 
     @PostMapping("/adherents/{id}/licences")
@@ -44,6 +47,8 @@ public class LicenceController {
             @RequestParam Long categorieId,
             @RequestParam String etat,
             @RequestParam(required = false) String numeroLicence,
+            @RequestParam(required = false) String typeDemande,
+            @RequestParam(required = false) String typeLicence,
             @RequestParam(required = false) Long equipeId) {
 
         Adherent adherent = adherentRepository.findById(id)
@@ -66,6 +71,8 @@ public class LicenceController {
         licence.setSaison(saisonActive);
         licence.setEtat(etat);
         licence.setNumeroLicence(numeroLicence);
+        licence.setTypeDemande(typeDemande);
+        licence.setTypeLicence(typeLicence);
 
         if (equipeId != null) {
             Equipe equipe = equipeRepository.findById(equipeId)
@@ -75,21 +82,8 @@ public class LicenceController {
 
         licence = licenceRepository.save(licence);
 
-        // Auto-initialize dotations for all configured equipments of the category
+        // Auto-initialize dotations via CategorieService to ensure consistency
-        List<CategorieEquipement> catEquipements = categorie.getCategorieEquipements();
+        categorieService.syncDotationsForLicence(licence);
-        if (catEquipements != null) {
-            for (CategorieEquipement ce : catEquipements) {
-                Dotation dotation = new Dotation();
-                dotation.setLicence(licence);
-                dotation.setEquipement(ce.getEquipement());
-                dotation.setTaille("");
-                dotation.setFlocage(adherent.getNom().toUpperCase() + " " + adherent.getPrenom());
-                dotation.setNumero("");
-                dotation.setFourni(false);
-                dotation.setChoisi(Boolean.TRUE.equals(ce.getObligatoire()));
-                dotationRepository.save(dotation);
-            }
-        }
 
         return "redirect:/adherents/" + id + "/edit";
     }
@@ -101,6 +95,8 @@ public class LicenceController {
             @RequestParam Long categorieId,
             @RequestParam String etat,
             @RequestParam(required = false) String numeroLicence,
+            @RequestParam(required = false) String typeDemande,
+            @RequestParam(required = false) String typeLicence,
             @RequestParam(required = false) Long equipeId) {
 
         Licence licence = licenceRepository.findById(licenceId)
@@ -112,6 +108,8 @@ public class LicenceController {
         licence.setCategorie(categorie);
         licence.setEtat(etat);
         licence.setNumeroLicence(numeroLicence);
+        licence.setTypeDemande(typeDemande);
+        licence.setTypeLicence(typeLicence);
 
         if (equipeId != null) {
             Equipe equipe = equipeRepository.findById(equipeId)
@@ -121,8 +119,125 @@ public class LicenceController {
             licence.setEquipe(null);
         }
 
-        licenceRepository.save(licence);
+        licence = licenceRepository.save(licence);
+        
+        // Sync dotations when category changes
+        categorieService.syncDotationsForLicence(licence);
 
         return "redirect:/adherents/" + adherentId + "/edit";
     }
+
+    @org.springframework.web.bind.annotation.GetMapping("/admin/licences/recherche")
+    public String rechercheLicences(
+            @RequestParam(required = false) String nom,
+            @RequestParam(required = false) String prenom,
+            @RequestParam(required = false) Long categorieId,
+            @RequestParam(required = false) String numeroLicence,
+            @RequestParam(required = false) String email,
+            @RequestParam(required = false) String typeDemande,
+            org.springframework.ui.Model model) {
+
+        Saison saisonActive = saisonRepository.findByEstActiveTrue().orElse(null);
+        org.springframework.data.jpa.domain.Specification<Licence> spec = buildLicenceSpecification(nom, prenom, categorieId, numeroLicence, email, typeDemande, saisonActive);
+        
+        List<Licence> licences = licenceRepository.findAll(spec);
+
+        model.addAttribute("licences", licences);
+        model.addAttribute("categories", categorieRepository.findAll());
+        model.addAttribute("nomFilter", nom);
+        model.addAttribute("prenomFilter", prenom);
+        model.addAttribute("categorieId", categorieId);
+        model.addAttribute("numeroLicenceFilter", numeroLicence);
+        model.addAttribute("emailFilter", email);
+        model.addAttribute("typeDemandeFilter", typeDemande);
+
+        return "parametrage/licences_recherche";
+    }
+
+    @org.springframework.web.bind.annotation.GetMapping("/admin/licences/recherche/export")
+    public org.springframework.http.ResponseEntity<byte[]> exportRechercheLicences(
+            @RequestParam(required = false) String nom,
+            @RequestParam(required = false) String prenom,
+            @RequestParam(required = false) Long categorieId,
+            @RequestParam(required = false) String numeroLicence,
+            @RequestParam(required = false) String email,
+            @RequestParam(required = false) String typeDemande) {
+
+        Saison saisonActive = saisonRepository.findByEstActiveTrue().orElse(null);
+        org.springframework.data.jpa.domain.Specification<Licence> spec = buildLicenceSpecification(nom, prenom, categorieId, numeroLicence, email, typeDemande, saisonActive);
+        List<Licence> licences = licenceRepository.findAll(spec);
+
+        StringBuilder sb = new StringBuilder();
+        sb.append('\ufeff');
+        sb.append("Nom;Prénom;Catégorie;N° Licence;Email;Type de Demande;Saison;Etat\n");
+
+        for (Licence l : licences) {
+            String n = l.getAdherent() != null && l.getAdherent().getNom() != null ? l.getAdherent().getNom() : "";
+            String p = l.getAdherent() != null && l.getAdherent().getPrenom() != null ? l.getAdherent().getPrenom() : "";
+            String c = l.getCategorie() != null ? l.getCategorie().getNom() : "";
+            String num = l.getNumeroLicence() != null ? l.getNumeroLicence() : "";
+            String e = l.getAdherent() != null && l.getAdherent().getEmail() != null ? l.getAdherent().getEmail() : "";
+            String td = l.getTypeDemande() != null ? l.getTypeDemande() : "";
+            String s = l.getSaison() != null ? l.getSaison().getNom() : "";
+            String etat = l.getEtat() != null ? l.getEtat() : "";
+
+            sb.append(escapeCsv(n)).append(";")
+              .append(escapeCsv(p)).append(";")
+              .append(escapeCsv(c)).append(";")
+              .append(escapeCsv(num)).append(";")
+              .append(escapeCsv(e)).append(";")
+              .append(escapeCsv(td)).append(";")
+              .append(escapeCsv(s)).append(";")
+              .append(escapeCsv(etat)).append("\n");
+        }
+
+        byte[] csvBytes = sb.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+        org.springframework.http.HttpHeaders headers = new org.springframework.http.HttpHeaders();
+        headers.setContentDispositionFormData("attachment", "recherche_licences_" + java.time.LocalDate.now() + ".csv");
+        headers.setContentType(org.springframework.http.MediaType.parseMediaType("text/csv; charset=UTF-8"));
+
+        return new org.springframework.http.ResponseEntity<>(csvBytes, headers, org.springframework.http.HttpStatus.OK);
+    }
+
+    private String escapeCsv(String value) {
+        if (value == null) return "";
+        if (value.contains("\"")) value = value.replace("\"", "\"\"");
+        if (value.contains(";") || value.contains("\n") || value.contains("\"")) return "\"" + value + "\"";
+        return value;
+    }
+
+    private org.springframework.data.jpa.domain.Specification<Licence> buildLicenceSpecification(
+            String nom, String prenom, Long categorieId, String numeroLicence, String email, String typeDemande, Saison saisonActive) {
+        return (root, query, cb) -> {
+            List<jakarta.persistence.criteria.Predicate> predicates = new java.util.ArrayList<>();
+            
+            if (Long.class != query.getResultType() && long.class != query.getResultType()) {
+                root.fetch("adherent", jakarta.persistence.criteria.JoinType.LEFT);
+                root.fetch("categorie", jakarta.persistence.criteria.JoinType.LEFT);
+            }
+
+            if (saisonActive != null) {
+                predicates.add(cb.equal(root.get("saison"), saisonActive));
+            }
+            if (nom != null && !nom.trim().isEmpty()) {
+                predicates.add(cb.like(cb.lower(root.get("adherent").get("nom")), "%" + nom.trim().toLowerCase() + "%"));
+            }
+            if (prenom != null && !prenom.trim().isEmpty()) {
+                predicates.add(cb.like(cb.lower(root.get("adherent").get("prenom")), "%" + prenom.trim().toLowerCase() + "%"));
+            }
+            if (categorieId != null) {
+                predicates.add(cb.equal(root.get("categorie").get("id"), categorieId));
+            }
+            if (numeroLicence != null && !numeroLicence.trim().isEmpty()) {
+                predicates.add(cb.like(cb.lower(root.get("numeroLicence")), "%" + numeroLicence.trim().toLowerCase() + "%"));
+            }
+            if (email != null && !email.trim().isEmpty()) {
+                predicates.add(cb.like(cb.lower(root.get("adherent").get("email")), "%" + email.trim().toLowerCase() + "%"));
+            }
+            if (typeDemande != null && !typeDemande.trim().isEmpty()) {
+                predicates.add(cb.equal(root.get("typeDemande"), typeDemande.trim()));
+            }
+            return cb.and(predicates.toArray(new jakarta.persistence.criteria.Predicate[0]));
+        };
+    }
 }

as-talange-web/src/main/java/com/astalange/web/controller/PaiementController.java

@@ -3,6 +3,8 @@ package com.astalange.web.controller;
 import com.astalange.core.entity.Licence;
 import com.astalange.core.entity.ModePaiement;
 import com.astalange.core.entity.Paiement;
+import com.astalange.core.entity.AuditLogPaiement;
+import com.astalange.core.repository.AuditLogPaiementRepository;
 import com.astalange.core.repository.LicenceRepository;
 import com.astalange.core.repository.ModePaiementRepository;
 import com.astalange.core.repository.PaiementRepository;
@@ -11,6 +13,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import java.security.Principal;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -21,11 +24,13 @@ public class PaiementController {
     private final LicenceRepository licenceRepository;
     private final ModePaiementRepository modePaiementRepository;
     private final PaiementRepository paiementRepository;
+    private final AuditLogPaiementRepository auditLogPaiementRepository;
 
-    public PaiementController(LicenceRepository licenceRepository, ModePaiementRepository modePaiementRepository, PaiementRepository paiementRepository) {
+    public PaiementController(LicenceRepository licenceRepository, ModePaiementRepository modePaiementRepository, PaiementRepository paiementRepository, AuditLogPaiementRepository auditLogPaiementRepository) {
         this.licenceRepository = licenceRepository;
         this.modePaiementRepository = modePaiementRepository;
         this.paiementRepository = paiementRepository;
+        this.auditLogPaiementRepository = auditLogPaiementRepository;
     }
 
     @PostMapping("/licences/{id}/paiements")
@@ -34,7 +39,8 @@ public class PaiementController {
             @RequestParam Long adherentId,
             @RequestParam BigDecimal montant,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate datePaiement,
-            @RequestParam Long modePaiementId) {
+            @RequestParam Long modePaiementId,
+            Principal principal) {
 
         Licence licence = licenceRepository.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid Licence ID"));
@@ -52,7 +58,19 @@ public class PaiementController {
             paiement.setModePaiement(mode);
             paiement.setMontant(montant);
             paiement.setDatePaiement(datePaiement);
+            if (principal != null) {
+                paiement.setGestionnaire(principal.getName());
+            }
             paiementRepository.save(paiement);
+            
+            AuditLogPaiement log = new AuditLogPaiement();
+            log.setAction("CREATE");
+            log.setUtilisateur(principal != null ? principal.getName() : "Système");
+            log.setPaiementId(paiement.getId());
+            log.setMontant(montant);
+            log.setAdherentNomComplet(licence.getAdherent().getNom() + " " + licence.getAdherent().getPrenom());
+            log.setDetails("Création d'un paiement de " + montant + "€ via " + mode.getNom() + " pour la licence " + (licence.getNumeroLicence() != null ? licence.getNumeroLicence() : "sans numéro"));
+            auditLogPaiementRepository.save(log);
         }
 
         return "redirect:/adherents/" + adherentId + "/edit";
@@ -64,7 +82,8 @@ public class PaiementController {
             @RequestParam BigDecimal montant,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate datePaiement,
             @RequestParam Long modePaiementId,
-            @RequestParam(required = false) String redirect) {
+            @RequestParam(required = false) String redirect,
+            Principal principal) {
 
         Paiement paiement = paiementRepository.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid Paiement ID"));
@@ -72,6 +91,9 @@ public class PaiementController {
         ModePaiement mode = modePaiementRepository.findById(modePaiementId)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid ModePaiement ID"));
 
+        BigDecimal ancienMontant = paiement.getMontant();
+        String ancienMode = paiement.getModePaiement().getNom();
+
         Licence licence = paiement.getLicence();
         
         // Validation basique pour ne pas dépasser le montant total de la licence
@@ -84,7 +106,19 @@ public class PaiementController {
             paiement.setModePaiement(mode);
             paiement.setMontant(montant);
             paiement.setDatePaiement(datePaiement);
+            if (principal != null) {
+                paiement.setGestionnaire(principal.getName());
+            }
             paiementRepository.save(paiement);
+
+            AuditLogPaiement log = new AuditLogPaiement();
+            log.setAction("UPDATE");
+            log.setUtilisateur(principal != null ? principal.getName() : "Système");
+            log.setPaiementId(paiement.getId());
+            log.setMontant(montant);
+            log.setAdherentNomComplet(licence.getAdherent().getNom() + " " + licence.getAdherent().getPrenom());
+            log.setDetails("Modification du paiement: montant " + ancienMontant + "€ -> " + montant + "€, mode " + ancienMode + " -> " + mode.getNom());
+            auditLogPaiementRepository.save(log);
         }
 
         if (redirect != null && !redirect.isEmpty()) {
@@ -96,12 +130,23 @@ public class PaiementController {
     @PostMapping("/paiements/{id}/delete")
     public String deletePaiement(
             @PathVariable Long id,
-            @RequestParam(required = false) String redirect) {
+            @RequestParam(required = false) String redirect,
+            Principal principal) {
 
         Paiement paiement = paiementRepository.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid Paiement ID"));
 
         Long adherentId = paiement.getLicence().getAdherent().getId();
+
+        AuditLogPaiement log = new AuditLogPaiement();
+        log.setAction("DELETE");
+        log.setUtilisateur(principal != null ? principal.getName() : "Système");
+        log.setPaiementId(paiement.getId());
+        log.setMontant(paiement.getMontant());
+        log.setAdherentNomComplet(paiement.getLicence().getAdherent().getNom() + " " + paiement.getLicence().getAdherent().getPrenom());
+        log.setDetails("Suppression du paiement de " + paiement.getMontant() + "€ via " + paiement.getModePaiement().getNom());
+        auditLogPaiementRepository.save(log);
+
         paiementRepository.delete(paiement);
 
         if (redirect != null && !redirect.isEmpty()) {

as-talange-web/src/main/java/com/astalange/web/controller/PublicInscriptionController.java

@@ -6,14 +6,20 @@ import com.astalange.core.entity.Saison;
 import com.astalange.core.repository.PreInscriptionRepository;
 import com.astalange.core.repository.TokenPreInscriptionRepository;
 import com.astalange.core.repository.SaisonRepository;
+import com.astalange.core.repository.CategorieRepository;
+import com.astalange.core.entity.Categorie;
 import com.astalange.core.service.CaptchaValidationService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.UUID;
+import java.util.List;
+import java.math.BigDecimal;
 
 @Controller
 @RequestMapping("/inscription-public")
@@ -23,19 +29,26 @@ public class PublicInscriptionController {
     private final TokenPreInscriptionRepository tokenRepository;
     private final PreInscriptionRepository preInscriptionRepository;
     private final SaisonRepository saisonRepository;
+    private final CategorieRepository categorieRepository;
 
     public PublicInscriptionController(CaptchaValidationService captchaValidationService,
             TokenPreInscriptionRepository tokenRepository,
             PreInscriptionRepository preInscriptionRepository,
-                                       SaisonRepository saisonRepository) {
+            SaisonRepository saisonRepository,
+            CategorieRepository categorieRepository) {
         this.captchaValidationService = captchaValidationService;
         this.tokenRepository = tokenRepository;
         this.preInscriptionRepository = preInscriptionRepository;
         this.saisonRepository = saisonRepository;
+        this.categorieRepository = categorieRepository;
     }
 
+    @Value("${captcha.sitekey:1x00000000000000000000AA}")
+    private String captchaSiteKey;
+
     @GetMapping("/demarrer")
     public String showDemarrer(Model model) {
+        model.addAttribute("captchaSiteKey", captchaSiteKey);
         Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
         if (activeSaison == null || !activeSaison.getInscriptionsOuvertes()) {
             model.addAttribute("inscriptionsFermees", true);
@@ -44,13 +57,16 @@ public class PublicInscriptionController {
     }
 
     @PostMapping("/demarrer")
-    public String processDemarrer(@RequestParam("cf-turnstile-response") String captchaResponse, RedirectAttributes redirectAttributes) {
+    public String processDemarrer(@RequestParam("cf-turnstile-response") String captchaResponse,
+            RedirectAttributes redirectAttributes) {
         Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
         if (activeSaison == null || !activeSaison.getInscriptionsOuvertes()) {
-            redirectAttributes.addFlashAttribute("error", "Les inscriptions ne sont pas ouvertes pour le moment, veuillez contacter un responsable du club.");
+            redirectAttributes.addFlashAttribute("error",
+                    "Les inscriptions ne sont pas ouvertes pour le moment, veuillez contacter un responsable du club.");
             return "redirect:/inscription-public/demarrer";
         }
-        // En vrai, captchaResponse dépend du fournisseur. Cloudflare Turnstile = cf-turnstile-response
+        // En vrai, captchaResponse dépend du fournisseur. Cloudflare Turnstile =
+        // cf-turnstile-response
         if (!captchaValidationService.validateCaptcha(captchaResponse)) {
             redirectAttributes.addFlashAttribute("error", "Validation CAPTCHA échouée. Veuillez réessayer.");
             return "redirect:/inscription-public/demarrer";
@@ -58,17 +74,19 @@ public class PublicInscriptionController {
 
         TokenPreInscription token = new TokenPreInscription();
         token.setValeurUuid(UUID.randomUUID().toString());
-        token.setDateExpiration(LocalDateTime.now().plusMinutes(5));
+        token.setDateExpiration(LocalDateTime.now().plusMinutes(15));
         tokenRepository.save(token);
 
         return "redirect:/inscription-public/formulaire?token=" + token.getValeurUuid();
     }
 
     @GetMapping("/formulaire")
-    public String showFormulaire(@RequestParam("token") String tokenUuid, Model model, RedirectAttributes redirectAttributes) {
+    public String showFormulaire(@RequestParam("token") String tokenUuid, Model model,
+            RedirectAttributes redirectAttributes) {
         Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
         if (activeSaison == null || !activeSaison.getInscriptionsOuvertes()) {
-            redirectAttributes.addFlashAttribute("error", "Les inscriptions ne sont pas ouvertes pour le moment, veuillez contacter un responsable du club.");
+            redirectAttributes.addFlashAttribute("error",
+                    "Les inscriptions ne sont pas ouvertes pour le moment, veuillez contacter un responsable du club.");
             return "redirect:/inscription-public/demarrer";
         }
 
@@ -93,7 +111,8 @@ public class PublicInscriptionController {
 
         Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
         if (activeSaison == null || !activeSaison.getInscriptionsOuvertes()) {
-            redirectAttributes.addFlashAttribute("error", "Les inscriptions ne sont pas ouvertes pour le moment, veuillez contacter un responsable du club.");
+            redirectAttributes.addFlashAttribute("error",
+                    "Les inscriptions ne sont pas ouvertes pour le moment, veuillez contacter un responsable du club.");
             return "redirect:/inscription-public/demarrer";
         }
 
@@ -106,9 +125,69 @@ public class PublicInscriptionController {
         token.setEstUtilise(true);
         tokenRepository.save(token);
 
+        if ("NOUVELLE".equals(preInscription.getTypeDemande())) {
+            String tarifStr = "210 €"; // Default
+            if (preInscription.getDateNaissance() != null) {
+                int annee = preInscription.getDateNaissance().getYear();
+                List<Categorie> categories = categorieRepository.findBySaisonAndAnnee(activeSaison, annee);
+                if (!categories.isEmpty()) {
+                    Categorie cat = categories.get(0);
+                    if (cat.getTarifBase() != null) {
+                        BigDecimal prixMaillot = BigDecimal.ZERO;
+                        if (cat.isU11OrBelow()) {
+                            prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                        }
+                        BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
+                        tarifStr = tarifTotal.intValue() + " €";
+                    }
+                }
+            }
+
+            redirectAttributes.addFlashAttribute("prenom", preInscription.getPrenom());
+            redirectAttributes.addFlashAttribute("tarif", tarifStr);
+            redirectAttributes.addFlashAttribute("documents", java.util.Arrays.asList(
+                "Photo d’identité",
+                "Carte d’identité ou passeport de l'adhérent",
+                "Livret de famille (si pas de pièce d’identité)",
+                "Adresse e-mail de l'adhérent (représentant légal en cas de mineur)",
+                "Pour les adhérents nés à l'étranger : Passeport + justificatif de domicile (du représentant légal en cas de mineur)"
+            ));
+            redirectAttributes.addFlashAttribute("isNouvelle", true);
+        }
+
         return "redirect:/inscription-public/succes";
     }
 
+    @GetMapping("/api/tarif")
+    @ResponseBody
+    public String getTarif(@RequestParam(value = "dateNaissance", required = false) String dateNaissanceStr) {
+        if (dateNaissanceStr == null || dateNaissanceStr.isEmpty()) {
+            return "210 €";
+        }
+        try {
+            LocalDate dateNaissance = LocalDate.parse(dateNaissanceStr);
+            int annee = dateNaissance.getYear();
+            Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
+            if (activeSaison == null) return "210 €";
+
+            List<Categorie> categories = categorieRepository.findBySaisonAndAnnee(activeSaison, annee);
+            if (categories.isEmpty()) return "210 €";
+
+            Categorie cat = categories.get(0);
+            if (cat.getTarifBase() != null) {
+                BigDecimal prixMaillot = BigDecimal.ZERO;
+                if (cat.isU11OrBelow()) {
+                    prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                }
+                BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
+                return tarifTotal.intValue() + " €";
+            }
+        } catch (Exception e) {
+            // Return default on error
+        }
+        return "210 €";
+    }
+
     @GetMapping("/succes")
     public String showSucces() {
         return "public/succes";

as-talange-web/src/main/resources/application.yml

@@ -20,3 +20,6 @@ spring:
 
 server:
   port: 8080
+
+app:
+  version: @project.version@

as-talange-web/src/main/resources/templates/adherents/form.html

@@ -25,7 +25,7 @@
 
         <!-- Main section -->
         <div class="flex-1 overflow-auto p-6">
-            <div class="max-w-3xl mx-auto bg-white rounded-xl shadow-sm border border-gray-100 p-8">
+            <div class="max-w-6xl mx-auto bg-white rounded-xl shadow-sm border border-gray-100 p-8">
                 
                 <form th:action="@{/adherents}" th:object="${adherent}" method="post" class="space-y-6">
                     <input type="hidden" th:field="*{id}" />
@@ -64,16 +64,38 @@
                             <p th:if="${#fields.hasErrors('dateNaissance')}" th:errors="*{dateNaissance}" class="mt-1 text-xs text-red-600"></p>
                         </div>
                         
-                        <!-- Téléphone -->
+                        <!-- Lieu de naissance (Ville) -->
                         <div>
-                            <label for="telephone" class="block text-sm font-medium text-gray-700 mb-1">Téléphone</label>
+                            <label for="lieuNaissanceVille" class="block text-sm font-medium text-gray-700 mb-1">Ville de naissance <span class="text-red-500">*</span></label>
-                            <input type="tel" id="telephone" th:field="*{telephone}"
+                            <input type="text" id="lieuNaissanceVille" th:field="*{lieuNaissanceVille}" required
                                 class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-colors"
-                                th:classappend="${#fields.hasErrors('telephone')} ? 'border-red-500' : ''">
+                                th:classappend="${#fields.hasErrors('lieuNaissanceVille')} ? 'border-red-500' : ''">
-                            <p th:if="${#fields.hasErrors('telephone')}" th:errors="*{telephone}" class="mt-1 text-xs text-red-600"></p>
+                            <p th:if="${#fields.hasErrors('lieuNaissanceVille')}" th:errors="*{lieuNaissanceVille}" class="mt-1 text-xs text-red-600"></p>
                         </div>
                     </div>
 
+                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                        <!-- Lieu de naissance (Pays) -->
+                        <div>
+                            <label for="lieuNaissancePays" class="block text-sm font-medium text-gray-700 mb-1">Pays de naissance <span class="text-red-500">*</span></label>
+                            <input type="text" id="lieuNaissancePays" th:field="*{lieuNaissancePays}" required
+                                class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-colors"
+                                th:classappend="${#fields.hasErrors('lieuNaissancePays')} ? 'border-red-500' : ''">
+                            <p th:if="${#fields.hasErrors('lieuNaissancePays')}" th:errors="*{lieuNaissancePays}" class="mt-1 text-xs text-red-600"></p>
+                        </div>
+
+                        <!-- Nationalité -->
+                        <div>
+                            <label for="nationalite" class="block text-sm font-medium text-gray-700 mb-1">Nationalité <span class="text-red-500">*</span></label>
+                            <input type="text" id="nationalite" th:field="*{nationalite}" required
+                                class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-colors"
+                                th:classappend="${#fields.hasErrors('nationalite')} ? 'border-red-500' : ''">
+                            <p th:if="${#fields.hasErrors('nationalite')}" th:errors="*{nationalite}" class="mt-1 text-xs text-red-600"></p>
+                        </div>
+                    </div>
+
+                    <!-- Removed telephone -->
+
                     <!-- Représentant Légal (Dynamique) -->
                     <div id="representantBlock" class="hidden-block bg-blue-50 p-4 rounded-lg border border-blue-100">
                         <label for="representantLegal" class="block text-sm font-medium text-blue-800 mb-1">
@@ -89,19 +111,20 @@
                     <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
                         <!-- Email -->
                         <div>
-                            <label for="email" class="block text-sm font-medium text-gray-700 mb-1">Email</label>
+                            <label for="email" class="block text-sm font-medium text-gray-700 mb-1">Email <span class="text-red-500">*</span></label>
-                            <input type="email" id="email" th:field="*{email}"
+                            <input type="email" id="email" th:field="*{email}" required
                                 class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-colors"
                                 th:classappend="${#fields.hasErrors('email')} ? 'border-red-500' : ''">
                             <p th:if="${#fields.hasErrors('email')}" th:errors="*{email}" class="mt-1 text-xs text-red-600"></p>
                         </div>
 
-                        <!-- Résident Talange -->
+                        <!-- Téléphone -->
-                        <div class="flex items-center space-x-3 mt-7">
+                        <div>
-                            <input type="checkbox" id="residentTalange" th:field="*{residentTalange}" class="w-5 h-5 text-blue-600 border-gray-300 rounded focus:ring-blue-500">
+                            <label for="telephone" class="block text-sm font-medium text-gray-700 mb-1">Téléphone</label>
-                            <label for="residentTalange" class="text-sm font-medium text-gray-700">
+                            <input type="tel" id="telephone" th:field="*{telephone}"
-                                Résident de la commune de Talange
+                                class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-colors"
-                            </label>
+                                th:classappend="${#fields.hasErrors('telephone')} ? 'border-red-500' : ''">
+                            <p th:if="${#fields.hasErrors('telephone')}" th:errors="*{telephone}" class="mt-1 text-xs text-red-600"></p>
                         </div>
                     </div>
 
@@ -125,15 +148,26 @@
                         </div>
                     </div>
 
-                    <!-- Adresse -->
+                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6 mt-6">
+                        <!-- Type de demande (Read-only) -->
                         <div>
-                        <label for="adresse" class="block text-sm font-medium text-gray-700 mb-1">Adresse postale</label>
+                            <label for="typeDemande" class="block text-sm font-medium text-gray-700 mb-1">Type de demande (Pré-inscription)</label>
-                        <textarea id="adresse" th:field="*{adresse}" rows="3"
+                            <input type="text" id="typeDemande" th:field="*{typeDemande}" readonly
-                            class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-colors"
+                                class="w-full border border-gray-200 bg-gray-50 rounded-lg px-4 py-2 text-sm text-gray-500 outline-none cursor-not-allowed">
-                            th:classappend="${#fields.hasErrors('adresse')} ? 'border-red-500' : ''"></textarea>
-                        <p th:if="${#fields.hasErrors('adresse')}" th:errors="*{adresse}" class="mt-1 text-xs text-red-600"></p>
                         </div>
                         
+                        <!-- Ancien club -->
+                        <div>
+                            <label for="ancienClub" class="block text-sm font-medium text-gray-700 mb-1">Ancien club</label>
+                            <input type="text" id="ancienClub" th:field="*{ancienClub}"
+                                class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-colors"
+                                th:classappend="${#fields.hasErrors('ancienClub')} ? 'border-red-500' : ''">
+                            <p th:if="${#fields.hasErrors('ancienClub')}" th:errors="*{ancienClub}" class="mt-1 text-xs text-red-600"></p>
+                        </div>
+                    </div>
+
+                    <!-- Removed Adresse -->
+
                     <div class="pt-4 flex justify-end space-x-3 border-t border-gray-100">
                         <a th:href="@{/adherents}" class="px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 transition-colors">Annuler</a>
                         <button type="submit" class="px-4 py-2 text-sm font-medium text-white bg-blue-600 rounded-lg hover:bg-blue-700 transition-colors">Enregistrer</button>
@@ -142,7 +176,7 @@
             </div>
 
             <!-- Licences Section (Only visible for existing adherents) -->
-            <div th:if="${adherent.id != null}" class="max-w-3xl mx-auto bg-white rounded-xl shadow-sm border border-gray-100 p-8 mt-6">
+            <div th:if="${adherent.id != null}" class="max-w-6xl mx-auto bg-white rounded-xl shadow-sm border border-gray-100 p-8 mt-6">
                 <div class="flex justify-between items-center mb-6">
                     <h3 class="text-xl font-bold text-gray-900">Licences de l'adhérent</h3>
                     <button th:if="${#lists.isEmpty(licences)}" onclick="openLicenceModal()" class="bg-green-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-green-700 transition-colors">
@@ -150,11 +184,13 @@
                     </button>
                 </div>
 
-                <table class="w-full text-left border-collapse">
+                <div class="overflow-x-auto">
+                    <table class="w-full text-left border-collapse min-w-[800px]">
                     <thead>
                         <tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">
                             <th class="py-3 px-4 font-medium">Saison</th>
                             <th class="py-3 px-4 font-medium">Catégorie</th>
+                            <th class="py-3 px-4 font-medium">Demande / Type</th>
                             <th class="py-3 px-4 font-medium">N° Licence</th>
                             <th class="py-3 px-4 font-medium">État</th>
                             <th class="py-3 px-4 font-medium">Tarif Global</th>
@@ -164,7 +200,7 @@
                     </thead>
                     <tbody class="divide-y divide-gray-200 text-sm">
                         <tr th:if="${#lists.isEmpty(licences)}">
-                            <td colspan="7" class="py-4 px-4 text-center text-gray-500">Aucune licence enregistrée.</td>
+                            <td colspan="8" class="py-4 px-4 text-center text-gray-500">Aucune licence enregistrée.</td>
                         </tr>
                         <th:block th:each="lic : ${licences}">
                             <tr class="hover:bg-gray-50 border-b border-gray-100 licence-row"
@@ -177,6 +213,10 @@
                                     <span th:text="${lic.categorie.nom + (lic.equipe != null ? ' (' + lic.equipe.nom + ')' : '')}">U15</span>
                                     <span class="text-[10px] text-gray-400 block cell-tarif-categorie" th:text="${(lic.adherent != null && lic.adherent.residentTalange ? lic.categorie.tarifBase : lic.categorie.tarifExterieur) + ' € (Catégorie)'}">100.00 € (Catégorie)</span>
                                 </td>
+                                <td class="py-4 px-4 text-gray-600 text-xs">
+                                    <div th:text="${lic.typeDemande != null ? lic.typeDemande : '-'}">Nouvelle</div>
+                                    <div class="text-[10px] text-gray-500" th:text="${lic.typeLicence != null ? lic.typeLicence : '-'}">Libre</div>
+                                </td>
                                 <td class="py-4 px-4 text-gray-600 font-mono text-xs" th:text="${lic.numeroLicence != null and !lic.numeroLicence.isEmpty() ? lic.numeroLicence : '-'}">-</td>
                                 <td class="py-4 px-4">
                                     <span class="px-2 py-1 text-xs font-semibold rounded-full" 
@@ -193,8 +233,10 @@
                                         th:data-categorie-id="${lic.categorie.id}"
                                         th:data-numero-licence="${lic.numeroLicence}"
                                         th:data-etat="${lic.etat}"
+                                        th:data-type-demande="${lic.typeDemande}"
+                                        th:data-type-licence="${lic.typeLicence}"
                                         th:data-equipe-id="${lic.equipe != null ? lic.equipe.id : ''}"
-                                        onclick="openLicenceModal(this.getAttribute('data-licence-id'), this.getAttribute('data-categorie-id'), this.getAttribute('data-numero-licence'), this.getAttribute('data-etat'), this.getAttribute('data-equipe-id'))"
+                                        onclick="openLicenceModal(this.getAttribute('data-licence-id'), this.getAttribute('data-categorie-id'), this.getAttribute('data-numero-licence'), this.getAttribute('data-etat'), this.getAttribute('data-type-demande'), this.getAttribute('data-type-licence'), this.getAttribute('data-equipe-id'))"
                                         class="text-blue-600 hover:text-blue-800 font-medium bg-blue-50 px-3 py-1 rounded-lg">Modifier</button>
                                     <button th:if="${lic.getResteAPayer() > 0}" 
                                         type="button"
@@ -205,7 +247,7 @@
                                 </td>
                             </tr>
                             <tr th:if="${!#lists.isEmpty(lic.paiements)}" class="bg-gray-50/50">
-                                <td colspan="7" class="py-3 px-6">
+                                <td colspan="8" class="py-3 px-6">
                                     <div class="text-xs font-semibold text-gray-500 uppercase tracking-wider mb-2">Historique des paiements</div>
                                     <div class="overflow-x-auto">
                                         <table class="min-w-full divide-y divide-gray-200 bg-white rounded-lg border border-gray-200 shadow-sm text-xs">
@@ -213,6 +255,7 @@
                                                 <tr class="bg-gray-50 text-gray-500 uppercase font-medium">
                                                     <th class="py-2 px-3 text-left">Date</th>
                                                     <th class="py-2 px-3 text-left">Mode</th>
+                                                    <th class="py-2 px-3 text-left">Géré par</th>
                                                     <th class="py-2 px-3 text-right font-medium">Montant</th>
                                                     <th class="py-2 px-3 text-right font-medium pr-4">Actions</th>
                                                 </tr>
@@ -223,6 +266,7 @@
                                                     <td class="py-2 px-3 text-gray-600">
                                                         <span class="px-2 py-0.5 rounded bg-gray-100 text-gray-700 font-mono text-[10px]" th:text="${paiement.modePaiement.nom}">Chèque</span>
                                                     </td>
+                                                    <td class="py-2 px-3 text-gray-500 text-xs italic" th:text="${paiement.gestionnaire != null ? paiement.gestionnaire : '-'}">-</td>
                                                     <td class="py-2 px-3 text-right font-semibold text-green-600" th:text="${paiement.montant + ' €'}">50.00 €</td>
                                                     <td class="py-2 px-3 text-right pr-4">
                                                         <div class="flex justify-end items-center space-x-2">
@@ -382,6 +426,27 @@
                         <label class="block text-sm font-medium text-gray-700 mb-1">Numéro de licence</label>
                         <input id="numeroLicenceInput" type="text" name="numeroLicence" placeholder="Ex: FFF-123456" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
                     </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Type de demande</label>
+                        <select id="typeDemandeSelect" name="typeDemande" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                            <option value="">Sélectionnez...</option>
+                            <option value="Renouvellement">Renouvellement</option>
+                            <option value="Nouvelle demande">Nouvelle demande</option>
+                        </select>
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Type de licence</label>
+                        <select id="typeLicenceSelect" name="typeLicence" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                            <option value="">Sélectionnez...</option>
+                            <option value="Animateur">Animateur</option>
+                            <option value="Arbitre">Arbitre</option>
+                            <option value="Dirigeant">Dirigeant</option>
+                            <option value="Educateur Fédéral">Educateur Fédéral</option>
+                            <option value="Foot loisir">Foot loisir</option>
+                            <option value="Libre">Libre</option>
+                            <option value="Technique">Technique</option>
+                        </select>
+                    </div>
                     <div>
                         <label class="block text-sm font-medium text-gray-700 mb-1">Saison</label>
                         <input id="saisonInput" type="text" name="saison" value="Saison Actuelle" readonly class="w-full border border-gray-200 bg-gray-50 rounded-lg px-4 py-2 text-sm text-gray-500 outline-none cursor-not-allowed">
@@ -468,7 +533,7 @@
     </div>
 
     <script th:inline="javascript">
-        function openLicenceModal(licenceId = null, categorieId = '', numeroLicence = '', etat = 'Brouillon', equipeId = '') {
+        function openLicenceModal(licenceId = null, categorieId = '', numeroLicence = '', etat = 'Brouillon', typeDemande = '', typeLicence = '', equipeId = '') {
             document.getElementById('licenceModal').classList.remove('hidden');
             const form = document.getElementById('licenceForm');
             const title = document.getElementById('licenceModalTitle');
@@ -485,6 +550,8 @@
                 catSelect.value = categorieId;
                 document.getElementById('numeroLicenceInput').value = numeroLicence;
                 document.getElementById('etatSelect').value = etat;
+                document.getElementById('typeDemandeSelect').value = typeDemande;
+                document.getElementById('typeLicenceSelect').value = typeLicence;
                 
                 // Fetch and populate teams
                 if (categorieId) {
@@ -501,6 +568,19 @@
                 document.getElementById('numeroLicenceInput').value = '';
                 document.getElementById('etatSelect').value = 'Brouillon';
                 
+                // Pré-remplissage du type de demande
+                const adherentTypeDemande = document.getElementById('typeDemande') ? document.getElementById('typeDemande').value : '';
+                const typeDemandeSelect = document.getElementById('typeDemandeSelect');
+                if (adherentTypeDemande === 'NOUVELLE') {
+                    typeDemandeSelect.value = 'Nouvelle demande';
+                } else if (adherentTypeDemande === 'RENOUVELLEMENT') {
+                    typeDemandeSelect.value = 'Renouvellement';
+                } else {
+                    typeDemandeSelect.value = '';
+                }
+                
+                document.getElementById('typeLicenceSelect').value = '';
+                
                 // Pré-sélection de la catégorie selon l'année de naissance
                 const dateNaissanceStr = document.getElementById('dateNaissance').value;
                 let foundCat = false;

as-talange-web/src/main/resources/templates/adherents/list.html

@@ -54,7 +54,8 @@
                     </form>
                 </div>
                 
-                <table class="w-full text-left border-collapse">
+                <div class="overflow-x-auto">
+                    <table class="w-full text-left border-collapse min-w-[1000px]">
                     <thead>
                         <tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">
                             <th class="py-3 px-6 font-medium text-left">Nom</th>
@@ -62,7 +63,6 @@
                             <th class="py-3 px-6 font-medium text-left">Catégorie</th>
                             <th class="py-3 px-6 font-medium text-center">N° Licence</th>
                             <th class="py-3 px-6 font-medium text-left">Email</th>
-                            <th class="py-3 px-6 font-medium text-left">Téléphone</th>
                             <th class="py-3 px-6 font-medium text-center">Paiement</th>
                             <th class="py-3 px-6 font-medium text-right">Actions</th>
                         </tr>
@@ -86,9 +86,6 @@
                             <td class="py-2 px-3">
                                 <input type="text" id="filterEmail" name="email" th:value="${emailFilter}" placeholder="Filtrer Email..." class="w-full border border-gray-300 rounded px-2 py-1 text-xs focus:ring-1 focus:ring-blue-500 focus:outline-none">
                             </td>
-                            <td class="py-2 px-3">
-                                <input type="text" id="filterTelephone" name="telephone" th:value="${telephoneFilter}" placeholder="Filtrer Tél..." class="w-full border border-gray-300 rounded px-2 py-1 text-xs focus:ring-1 focus:ring-blue-500 focus:outline-none">
-                            </td>
                             <td class="py-2 px-3">
                                 <select id="filterPaiement" name="paiement" class="w-full border border-gray-300 rounded px-2 py-1 text-xs focus:ring-1 focus:ring-blue-500 focus:outline-none">
                                     <option value="">Tous</option>
@@ -102,7 +99,7 @@
                     </thead>
                     <tbody class="divide-y divide-gray-200 text-sm">
                         <tr th:if="${#lists.isEmpty(adherents)}">
-                            <td colspan="8" class="py-8 text-center text-gray-500">Aucun adhérent enregistré.</td>
+                            <td colspan="7" class="py-8 text-center text-gray-500">Aucun adhérent enregistré.</td>
                         </tr>
                         <tr th:each="adherent : ${adherents}" class="hover:bg-gray-50 transition-colors adherent-row">
                             <td class="py-4 px-6 font-medium text-gray-900">
@@ -119,7 +116,6 @@
                             <td class="py-4 px-6 text-center text-gray-600 font-mono text-xs" 
                                 th:text="${adherent.getLicenceActuelle() != null and adherent.getLicenceActuelle().numeroLicence != null and !adherent.getLicenceActuelle().numeroLicence.isEmpty() ? adherent.getLicenceActuelle().numeroLicence : '-'}">-</td>
                             <td class="py-4 px-6 text-gray-600" th:text="${adherent.email}">jean@example.com</td>
-                            <td class="py-4 px-6 text-gray-600" th:text="${adherent.telephone}">0600000000</td>
                             <td class="py-3 px-4">
                                 <!-- Aucune licence -->
                                 <div th:if="${adherent.getLicenceActuelle() == null}" class="text-center text-gray-400 text-xs italic">
@@ -159,6 +155,7 @@
                         </tr>
                     </tbody>
                     </table>
+                </div>
 
                 <!-- Pagination Footer -->
                 <div class="px-6 py-4 border-t border-gray-200 flex items-center justify-between bg-gray-50 text-sm text-gray-700">

as-talange-web/src/main/resources/templates/audit/paiements_logs.html

@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Logs Paiements - AS Talange</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <style>
+        body { font-family: 'Inter', sans-serif; }
+    </style>
+</head>
+<body class="bg-gray-50 text-gray-900 flex h-screen overflow-hidden">
+
+    <!-- Sidebar -->
+    <div th:replace="~{fragments/sidebar :: sidebar}"></div>
+
+    <!-- Main Content -->
+    <main class="flex-1 flex flex-col h-screen overflow-hidden">
+        <!-- Header -->
+        <header class="h-16 bg-white border-b border-gray-200 flex items-center px-6">
+            <h2 class="text-lg font-semibold text-gray-800">Audit Logs des Paiements</h2>
+        </header>
+
+        <!-- Main section -->
+        <div class="flex-1 overflow-auto p-6">
+
+            <!-- Filtres -->
+            <div class="bg-white rounded-xl shadow-sm border border-gray-100 p-5 mb-6">
+                <form th:action="@{/admin/logs/paiements}" method="get" class="grid grid-cols-1 md:grid-cols-4 gap-4 items-end">
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Action</label>
+                        <select name="action" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                            <option value="">Toutes</option>
+                            <option value="CREATE" th:selected="${paramAction == 'CREATE'}">Création</option>
+                            <option value="UPDATE" th:selected="${paramAction == 'UPDATE'}">Modification</option>
+                            <option value="DELETE" th:selected="${paramAction == 'DELETE'}">Suppression</option>
+                        </select>
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Agent / Utilisateur</label>
+                        <input type="text" name="utilisateur" th:value="${paramUtilisateur}" placeholder="Ex: admin" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Adhérent concerné</label>
+                        <input type="text" name="adherent" th:value="${paramAdherent}" placeholder="Nom ou prénom" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                    </div>
+                    <div class="flex space-x-2">
+                        <button type="submit" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700 transition-colors w-full">
+                            Filtrer
+                        </button>
+                        <a href="/admin/logs/paiements" class="bg-gray-100 text-gray-700 px-4 py-2 rounded-lg text-sm font-medium hover:bg-gray-200 transition-colors flex items-center justify-center px-3">
+                            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path></svg>
+                        </a>
+                    </div>
+                </form>
+            </div>
+
+            <div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
+                <div class="overflow-x-auto">
+                    <table class="w-full text-left border-collapse min-w-[800px]">
+                        <thead>
+                            <tr class="bg-gray-50 text-gray-500 text-xs uppercase tracking-wider border-b border-gray-200">
+                                <th class="py-3 px-6 font-medium">Date</th>
+                                <th class="py-3 px-6 font-medium">Action</th>
+                                <th class="py-3 px-6 font-medium">Utilisateur</th>
+                                <th class="py-3 px-6 font-medium">Adhérent</th>
+                                <th class="py-3 px-6 font-medium">Détails</th>
+                            </tr>
+                        </thead>
+                        <tbody class="divide-y divide-gray-100 text-sm">
+                            <tr th:if="${#lists.isEmpty(logs)}">
+                                <td colspan="5" class="py-4 px-6 text-center text-gray-500">Aucun log enregistré.</td>
+                            </tr>
+                            <tr th:each="log : ${logs}" class="hover:bg-gray-50 transition-colors">
+                                <td class="py-3 px-6 text-gray-600 whitespace-nowrap" th:text="${#temporals.format(log.dateAction, 'dd/MM/yyyy HH:mm:ss')}">01/01/2026 10:00:00</td>
+                                <td class="py-3 px-6">
+                                    <span class="px-2 py-1 text-xs font-semibold rounded-full"
+                                          th:classappend="${log.action == 'CREATE' ? 'bg-green-100 text-green-800' : (log.action == 'UPDATE' ? 'bg-blue-100 text-blue-800' : 'bg-red-100 text-red-800')}"
+                                          th:text="${log.action}">CREATE</span>
+                                </td>
+                                <td class="py-3 px-6 font-medium text-gray-900" th:text="${log.utilisateur}">Jean Dupont</td>
+                                <td class="py-3 px-6 text-gray-600" th:text="${log.adherentNomComplet}">John Doe</td>
+                                <td class="py-3 px-6 text-gray-500 text-xs" th:text="${log.details}">Détails du changement</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </main>
+
+</body>
+</html>

as-talange-web/src/main/resources/templates/change-password.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Changement de mot de passe - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/fragments/sidebar.html

@@ -1,46 +1,57 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
 </head>
 <body>
     <aside th:fragment="sidebar" class="w-64 bg-white border-r border-gray-200 flex flex-col hidden md:flex">
         <div class="h-16 flex items-center px-6 border-b border-gray-200">
+            <img src="/images/logo.png" alt="Logo AS Talange" class="h-8 w-8 mr-3 object-contain">
             <h1 class="text-xl font-bold text-blue-600">AS Talange</h1>
         </div>
         <nav class="flex-1 overflow-y-auto py-4 px-3 space-y-1">
+            <!-- Menu Principal -->
+            <div class="pb-2 px-3 text-xs font-semibold text-gray-400 uppercase tracking-wider">Gestion</div>
             <a href="/" th:classappend="${requestURI == '/' ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Tableau de bord</a>
             <a href="/adherents" th:classappend="${requestURI != null and requestURI.startsWith('/adherents') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Adhérents</a>
-            
+            <a sec:authorize="hasAnyRole('ROLE_ADMIN', 'ROLE_AGENT_SAISIE')" href="/admin/pre-inscriptions" th:classappend="${requestURI != null and requestURI.startsWith('/admin/pre-inscriptions') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="flex items-center justify-between px-3 py-2 rounded-lg transition-colors">
-            <a sec:authorize="hasAnyRole('ROLE_ADMIN', 'ROLE_AGENT_SAISIE')" href="/admin/pre-inscriptions" th:classappend="${requestURI != null and requestURI.startsWith('/admin/pre-inscriptions') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="flex items-center px-3 py-2 rounded-lg transition-colors">
                 <span>Pré-inscriptions</span>
                 <span hx-get="/admin/pre-inscriptions/count" hx-trigger="load, every 30s, refreshBadge from:body" hx-swap="outerHTML"></span>
             </a>
             <a sec:authorize="hasAnyRole('ROLE_ADMIN', 'ROLE_TRESORERIE')" href="/paiements" th:classappend="${requestURI != null and requestURI.startsWith('/paiements') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Paiements</a>
             
             <th:block sec:authorize="hasAnyRole('ROLE_ADMIN', 'ROLE_AGENT_SAISIE')">
-                <div class="pt-4 pb-2 px-3 text-xs font-semibold text-gray-400 uppercase tracking-wider">Planning</div>
+                <a href="/planning" th:classappend="${requestURI != null and requestURI.startsWith('/planning') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Planning</a>
-                <a href="/planning" th:classappend="${requestURI != null and requestURI.startsWith('/planning') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Entraînements</a>
             </th:block>
 
             <th:block sec:authorize="hasRole('ROLE_ADMIN')">
+                <!-- Recherches & Exports -->
+                <div class="pt-4 pb-2 px-3 text-xs font-semibold text-gray-400 uppercase tracking-wider">Recherches & Exports</div>
+                <a href="/admin/licences/recherche" th:classappend="${requestURI != null and requestURI.startsWith('/admin/licences/recherche') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Recherche Licences</a>
+                <a href="/admin/equipements/recherche" th:classappend="${requestURI != null and requestURI.startsWith('/admin/equipements/recherche') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Recherche Équipements</a>
+
+                <!-- Paramétrage -->
                 <div class="pt-4 pb-2 px-3 text-xs font-semibold text-gray-400 uppercase tracking-wider">Paramétrage</div>
                 <a href="/saisons" th:classappend="${requestURI != null and requestURI.startsWith('/saisons') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Saisons</a>
                 <a href="/categories" th:classappend="${requestURI != null and requestURI.startsWith('/categories') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Catégories</a>
                 <a href="/equipes" th:classappend="${requestURI != null and requestURI.startsWith('/equipes') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Équipes</a>
                 <a href="/educateurs" th:classappend="${requestURI != null and requestURI.startsWith('/educateurs') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Éducateurs</a>
+                <a href="/equipements" th:classappend="${requestURI != null and requestURI.equals('/equipements') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Équipements</a>
                 <a href="/modespaiement" th:classappend="${requestURI != null and requestURI.startsWith('/modespaiement') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Modes de Paiement</a>
-                <a href="/equipements" th:classappend="${requestURI != null and requestURI.startsWith('/equipements') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Équipements</a>
                 
+                <!-- Administration -->
                 <div class="pt-4 pb-2 px-3 text-xs font-semibold text-gray-400 uppercase tracking-wider">Administration</div>
                 <a href="/utilisateurs" th:classappend="${requestURI != null and requestURI.startsWith('/utilisateurs') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Utilisateurs</a>
+                <a href="/admin/logs/paiements" th:classappend="${requestURI != null and requestURI.startsWith('/admin/logs/paiements') ? 'bg-blue-50 text-blue-700 font-medium' : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900'}" class="block px-3 py-2 rounded-lg transition-colors">Logs Paiements</a>
             </th:block>
         </nav>
         <div class="p-4 border-t border-gray-200">
-            <div class="text-sm font-medium text-gray-900 mb-1" th:text="${username != null ? username : 'Admin'}">Admin</div>
+            <div class="text-sm font-medium text-gray-900 mb-1" sec:authentication="name">Admin</div>
             <form th:action="@{/logout}" method="post">
                 <button type="submit" class="text-sm text-red-600 hover:text-red-700 font-medium">Déconnexion</button>
             </form>
+            <div class="mt-2 text-[10px] text-gray-400">v<span th:text="${appVersion}">1.0-SNAPSHOT</span></div>
         </div>
     </aside>
 </body>

as-talange-web/src/main/resources/templates/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
 <head>
     <meta charset="UTF-8">
     <title>Tableau de bord - AS Talange</title>
@@ -18,13 +18,23 @@
     <!-- Main Content -->
     <main class="flex-1 flex flex-col h-screen overflow-hidden">
         <!-- Header -->
-        <header class="h-16 bg-white border-b border-gray-200 flex items-center px-6">
+        <header class="h-16 bg-white border-b border-gray-200 flex items-center justify-between px-6">
             <h2 class="text-lg font-semibold text-gray-800">Tableau de bord</h2>
+
         </header>
 
         <!-- Main section -->
         <div class="flex-1 overflow-auto p-6 bg-gray-50/50">
             
+            <!-- Message de bienvenue -->
+            <div class="flex items-center bg-white rounded-xl shadow-sm border border-gray-100 p-6 mb-8">
+                <img src="/images/logo.png" alt="Logo AS Talange" class="h-20 w-auto mr-6 object-contain drop-shadow-sm">
+                <div>
+                    <h2 class="text-2xl font-bold text-gray-900">Bienvenue sur votre espace AS Talange</h2>
+                    <p class="text-gray-500 mt-1">Retrouvez ci-dessous le résumé de l'activité du club.</p>
+                </div>
+            </div>
+            
             <!-- KPIs -->
             <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">
                 <!-- Total Adhérents -->
@@ -51,7 +61,7 @@
                 </div>
 
                 <!-- Total Encaissé -->
-                <div class="bg-white rounded-xl shadow-sm border border-gray-100 p-6 flex items-center space-x-4">
+                <div sec:authorize="!hasRole('ROLE_AGENT_SAISIE')" class="bg-white rounded-xl shadow-sm border border-gray-100 p-6 flex items-center space-x-4">
                     <div class="p-3 bg-purple-50 text-purple-600 rounded-lg">
                         <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
                     </div>
@@ -62,7 +72,7 @@
                 </div>
 
                 <!-- Reste à Recouvrer -->
-                <div class="bg-white rounded-xl shadow-sm border border-gray-100 p-6 flex items-center space-x-4">
+                <div sec:authorize="!hasRole('ROLE_AGENT_SAISIE')" class="bg-white rounded-xl shadow-sm border border-gray-100 p-6 flex items-center space-x-4">
                     <div class="p-3 bg-red-50 text-red-600 rounded-lg">
                         <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 17h8m0 0V9m0 8l-8-8-4 4-6-6"></path></svg>
                     </div>
@@ -79,18 +89,18 @@
                     <h3 class="text-lg font-semibold text-gray-900">Derniers adhérents inscrits</h3>
                     <a href="/adherents" class="text-sm font-medium text-blue-600 hover:text-blue-800">Voir tout &rarr;</a>
                 </div>
-                <table class="w-full text-left border-collapse">
+                <div class="overflow-x-auto">
+                    <table class="w-full text-left border-collapse min-w-[600px]">
                     <thead>
                         <tr class="bg-gray-50/50 text-gray-500 text-xs uppercase tracking-wider border-b border-gray-100">
                             <th class="py-3 px-6 font-medium">Nom & Prénom</th>
                             <th class="py-3 px-6 font-medium">Date de naissance</th>
-                            <th class="py-3 px-6 font-medium">Téléphone</th>
                             <th class="py-3 px-6 font-medium text-right">Action</th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-gray-100 text-sm">
                         <tr th:if="${#lists.isEmpty(derniersInscrits)}">
-                            <td colspan="4" class="py-4 px-6 text-center text-gray-500">Aucun adhérent récent.</td>
+                            <td colspan="3" class="py-4 px-6 text-center text-gray-500">Aucun adhérent récent.</td>
                         </tr>
                         <tr th:each="adh : ${derniersInscrits}" class="hover:bg-gray-50 transition-colors">
                             <td class="py-4 px-6">
@@ -98,7 +108,6 @@
                                 <div class="text-xs text-gray-500" th:text="${adh.email}">jean@example.com</div>
                             </td>
                             <td class="py-4 px-6 text-gray-600" th:text="${#temporals.format(adh.dateNaissance, 'dd/MM/yyyy')}">01/01/2000</td>
-                            <td class="py-4 px-6 text-gray-600" th:text="${adh.telephone}">0600000000</td>
                             <td class="py-4 px-6 text-right">
                                 <a th:href="@{/adherents/{id}/edit(id=${adh.id})}" class="text-blue-600 hover:text-blue-800 font-medium">Voir profil</a>
                             </td>
@@ -106,6 +115,7 @@
                     </tbody>
                     </table>
                 </div>
+            </div>
             
         </div>
     </main>

as-talange-web/src/main/resources/templates/login.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Connexion - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>
@@ -13,6 +14,7 @@
 
 <div class="bg-white p-8 rounded-2xl shadow-xl w-full max-w-md border border-gray-100">
     <div class="text-center mb-8">
+        <img src="/images/logo.png" alt="Logo AS Talange" class="h-24 w-auto mx-auto mb-4 object-contain drop-shadow-sm">
         <h1 class="text-3xl font-bold text-gray-900 mb-2">AS Talange</h1>
         <p class="text-gray-500">Outil de gestion administrative</p>
     </div>

as-talange-web/src/main/resources/templates/paiements/list.html

@@ -34,8 +34,8 @@
 
                 <form id="filter-form" hx-get="/paiements" hx-target="#paiements-table-container" hx-select="#paiements-table-container" hx-trigger="change, keyup changed delay:300ms" hx-sync="this:replace" hx-on::config-request="if (event.detail.trigger.tagName !== 'BUTTON') { event.detail.parameters['page'] = 0; }" class="m-0">
                     <input type="hidden" name="query" th:value="${searchQuery}">
-                    
+                    <div class="overflow-x-auto">
-                    <table class="w-full text-left border-collapse">
+                        <table class="w-full text-left border-collapse min-w-[1000px]">
                         <thead>
                             <tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">
                                 <th class="py-3 px-6 font-medium text-left">Date</th>
@@ -121,6 +121,7 @@
                             </tr>
                         </tbody>
                         </table>
+                    </div>
                 </form>
 
                 <!-- Pagination Footer -->

as-talange-web/src/main/resources/templates/parametrage/categories_form.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Catégorie - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/parametrage/categories_list.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Paramétrage - Catégories</title>
     <script src="https://cdn.tailwindcss.com"></script>
@@ -25,7 +26,8 @@
             </div>
 
             <div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
-                <table class="w-full text-left border-collapse">
+                <div class="overflow-x-auto">
+                    <table class="w-full text-left border-collapse min-w-[800px]">
                     <thead>
                         <tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">
                             <th class="py-3 px-6 font-medium text-left">Nom de la catégorie</th>
@@ -57,6 +59,7 @@
                     </table>
                 </div>
             </div>
+        </div>
     </main>
 </body>
 </html>

as-talange-web/src/main/resources/templates/parametrage/educateurs_form.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Éducateur - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/parametrage/educateurs_list.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Paramétrage - Éducateurs</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/parametrage/equipements_form.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Équipement - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>
@@ -26,6 +27,11 @@
                         <input type="text" th:field="*{nom}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
                     </div>
 
+                    <div>
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Référence</label>
+                        <input type="text" th:field="*{reference}" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                    </div>
+
                     <div>
                         <label class="block text-sm font-medium text-gray-700 mb-1">Description (ex: Maillot domicile officiel)</label>
                         <textarea th:field="*{description}" rows="3" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none"></textarea>

as-talange-web/src/main/resources/templates/parametrage/equipements_list.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Paramétrage - Équipements</title>
     <script src="https://cdn.tailwindcss.com"></script>
@@ -23,8 +24,6 @@
                     + Nouvel Équipement
                 </a>
             </div>
-
-            <div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
                 <table class="w-full text-left border-collapse">
                     <thead>
                         <tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">

as-talange-web/src/main/resources/templates/parametrage/equipements_recherche.html

@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
+    <meta charset="UTF-8">
+    <title>Paramétrage - Recherche Équipements</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <style> body { font-family: 'Inter', sans-serif; } </style>
+</head>
+<body class="bg-gray-50 text-gray-900 flex h-screen overflow-hidden">
+    <!-- Sidebar -->
+    <div th:replace="~{fragments/sidebar :: sidebar}"></div>
+
+    <main class="flex-1 flex flex-col h-screen overflow-hidden">
+        <header class="h-16 bg-white border-b border-gray-200 flex items-center px-6">
+            <h2 class="text-lg font-semibold text-gray-800">Recherche Équipements</h2>
+        </header>
+
+        <div class="flex-1 overflow-auto p-6">
+            
+            <div class="bg-white p-6 rounded-lg border border-gray-200 shadow-sm mb-6">
+                <form th:action="@{/admin/equipements/recherche}" method="get" class="space-y-4">
+                    <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                        <div>
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Équipement</label>
+                            <select name="equipementId" class="w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm px-3 py-2 border">
+                                <option value="">Tous les équipements</option>
+                                <option th:each="equip : ${equipements}" th:value="${equip.id}" th:text="${equip.nom}" th:selected="${equip.id == equipementId}"></option>
+                            </select>
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Catégorie</label>
+                            <select name="categorieId" class="w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm px-3 py-2 border">
+                                <option value="">Toutes les catégories</option>
+                                <option th:each="cat : ${categories}" th:value="${cat.id}" th:text="${cat.nom}" th:selected="${cat.id == categorieId}"></option>
+                            </select>
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium text-gray-700 mb-1">Fourni</label>
+                            <select name="fourni" class="w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm px-3 py-2 border">
+                                <option value="">Tous</option>
+                                <option value="true" th:selected="${fourni != null && fourni}">Oui</option>
+                                <option value="false" th:selected="${fourni != null && !fourni}">Non</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="flex justify-end space-x-3">
+                        <button type="submit" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700">Rechercher</button>
+                        <a th:href="@{/admin/equipements/recherche/export(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni})}" class="bg-green-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-green-700">Exporter</a>
+                    </div>
+                </form>
+            </div>
+
+            <div class="bg-white rounded-lg border border-gray-200 overflow-hidden">
+                <table class="w-full text-left border-collapse">
+                    <thead>
+                        <tr class="bg-gray-50 text-gray-500 text-xs uppercase tracking-wider border-b border-gray-200">
+                            <th class="py-3 px-4 font-medium text-left">Licencié</th>
+                            <th class="py-3 px-4 font-medium text-left">Poste / Sexe</th>
+                            <th class="py-3 px-4 font-medium text-left">Catégorie</th>
+                            <th class="py-3 px-4 font-medium text-left">Équipement</th>
+                            <th class="py-3 px-4 font-medium text-left">Référence</th>
+                            <th class="py-3 px-4 font-medium text-left">Taille / Floc.</th>
+                            <th class="py-3 px-4 font-medium text-center">Fourni</th>
+                        </tr>
+                    </thead>
+                    <tbody class="divide-y divide-gray-200 text-sm">
+                        <tr th:if="${#lists.isEmpty(dotations)}">
+                            <td colspan="6" class="py-8 text-center text-gray-500">Aucun résultat trouvé pour cette recherche.</td>
+                        </tr>
+                        <tr th:each="dotation : ${dotations}" class="hover:bg-gray-50">
+                            <td class="py-3 px-4 font-medium text-gray-900">
+                                <span th:text="${dotation.licence.adherent.nom + ' ' + dotation.licence.adherent.prenom}">Nom Prénom</span>
+                            </td>
+                            <td class="py-3 px-4 text-gray-600 text-xs">
+                                <div th:text="${dotation.licence.adherent.typeMaillot}">Joueur</div>
+                                <div th:text="${dotation.licence.adherent.sexe}">Masculin</div>
+                            </td>
+                            <td class="py-3 px-4 text-gray-600" th:text="${dotation.licence.categorie != null ? dotation.licence.categorie.nom : '-'}">Catégorie</td>
+                            <td class="py-3 px-4 text-gray-900 font-medium" th:text="${dotation.equipement != null ? dotation.equipement.nom : '-'}">Maillot</td>
+                            <td class="py-3 px-4 text-gray-600 font-mono text-xs" th:text="${dotation.equipement != null && dotation.equipement.reference != null ? dotation.equipement.reference : '-'}">REF-01</td>
+                            <td class="py-3 px-4 text-gray-600">
+                                <div th:text="'T: ' + (${dotation.taille != null && !dotation.taille.isEmpty() ? dotation.taille : '-'})">Taille</div>
+                                <div th:if="${dotation.flocage != null && !dotation.flocage.isEmpty()}" th:text="'F: ' + ${dotation.flocage}">Flocage</div>
+                                <div th:if="${dotation.numero != null && !dotation.numero.isEmpty()}" th:text="'N: ' + ${dotation.numero}">N°</div>
+                            </td>
+                            <td class="py-3 px-4 text-center">
+                                <span th:if="${dotation.fourni}" class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800">Oui</span>
+                                <span th:unless="${dotation.fourni}" class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-red-100 text-red-800">Non</span>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+
+        </div>
+    </main>
+</body>
+</html>

as-talange-web/src/main/resources/templates/parametrage/equipes_list.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Paramétrage - Équipes</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/parametrage/licences_recherche.html

@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Recherche Licences - AS Talange</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <style> body { font-family: 'Inter', sans-serif; } </style>
+</head>
+<body class="bg-gray-50 text-gray-900 flex h-screen overflow-hidden">
+    <div th:replace="~{fragments/sidebar :: sidebar}"></div>
+
+    <main class="flex-1 flex flex-col h-screen overflow-hidden">
+        <header class="h-16 bg-white border-b border-gray-200 flex items-center px-6">
+            <h2 class="text-lg font-semibold text-gray-800">Recherche de Licences</h2>
+        </header>
+
+        <div class="flex-1 overflow-auto p-6">
+            <div class="bg-white rounded-xl shadow-sm border border-gray-100 p-6 mb-6">
+                <form th:action="@{/admin/licences/recherche}" method="get" class="flex flex-wrap items-end gap-4">
+                    <div class="w-48">
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Nom</label>
+                        <input type="text" name="nom" th:value="${nomFilter}" class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div class="w-48">
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Prénom</label>
+                        <input type="text" name="prenom" th:value="${prenomFilter}" class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div class="w-48">
+                        <label class="block text-sm font-medium text-gray-700 mb-1">N° Licence</label>
+                        <input type="text" name="numeroLicence" th:value="${numeroLicenceFilter}" class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div class="w-64">
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Email</label>
+                        <input type="text" name="email" th:value="${emailFilter}" class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-blue-500 focus:border-blue-500">
+                    </div>
+                    <div class="w-48">
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Catégorie</label>
+                        <select name="categorieId" class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-blue-500 focus:border-blue-500">
+                            <option value="">Toutes les catégories</option>
+                            <option th:each="cat : ${categories}" th:value="${cat.id}" th:text="${cat.nom}" th:selected="${cat.id == categorieId}"></option>
+                        </select>
+                    </div>
+                    <div class="w-48">
+                        <label class="block text-sm font-medium text-gray-700 mb-1">Type de Demande</label>
+                        <select name="typeDemande" class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-blue-500 focus:border-blue-500">
+                            <option value="">Tous les types</option>
+                            <option value="Nouvelle demande" th:selected="${typeDemandeFilter == 'Nouvelle demande'}">Nouvelle Demande</option>
+                            <option value="Renouvellement" th:selected="${typeDemandeFilter == 'Renouvellement'}">Renouvellement</option>
+                            <option value="Mutation" th:selected="${typeDemandeFilter == 'Mutation'}">Mutation</option>
+                        </select>
+                    </div>
+                    <div class="flex space-x-2">
+                        <button type="submit" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700">Rechercher</button>
+                        <a th:href="@{/admin/licences/recherche}" class="bg-gray-100 text-gray-700 px-4 py-2 rounded-lg text-sm font-medium hover:bg-gray-200">Réinitialiser</a>
+                        <a th:href="@{/admin/licences/recherche/export(nom=${nomFilter},prenom=${prenomFilter},categorieId=${categorieId},numeroLicence=${numeroLicenceFilter},email=${emailFilter},typeDemande=${typeDemandeFilter})}" 
+                           class="bg-indigo-50 text-indigo-700 px-4 py-2 rounded-lg text-sm font-medium hover:bg-indigo-100 flex items-center">
+                            Exporter CSV
+                        </a>
+                    </div>
+                </form>
+            </div>
+
+            <div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
+                <div class="overflow-x-auto">
+                    <table class="w-full text-left border-collapse min-w-[900px]">
+                    <thead>
+                        <tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">
+                            <th class="py-3 px-4 font-medium text-left">Nom Prénom</th>
+                            <th class="py-3 px-4 font-medium text-left">Catégorie</th>
+                            <th class="py-3 px-4 font-medium text-left">N° Licence</th>
+                            <th class="py-3 px-4 font-medium text-left">Type de Demande</th>
+                            <th class="py-3 px-4 font-medium text-left">Email</th>
+                            <th class="py-3 px-4 font-medium text-left">État</th>
+                            <th class="py-3 px-4 font-medium text-right">Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody class="divide-y divide-gray-200 text-sm">
+                        <tr th:if="${#lists.isEmpty(licences)}">
+                            <td colspan="7" class="py-8 text-center text-gray-500">Aucun résultat trouvé pour cette recherche.</td>
+                        </tr>
+                        <tr th:each="licence : ${licences}" class="hover:bg-gray-50">
+                            <td class="py-3 px-4 font-medium text-gray-900">
+                                <span th:text="${licence.adherent.nom + ' ' + licence.adherent.prenom}">Nom Prénom</span>
+                            </td>
+                            <td class="py-3 px-4 text-gray-600" th:text="${licence.categorie != null ? licence.categorie.nom : '-'}">Catégorie</td>
+                            <td class="py-3 px-4 text-gray-600 font-mono" th:text="${licence.numeroLicence != null ? licence.numeroLicence : '-'}">N°</td>
+                            <td class="py-3 px-4 text-gray-600" th:text="${licence.typeDemande != null ? licence.typeDemande : '-'}">Type</td>
+                            <td class="py-3 px-4 text-gray-600" th:text="${licence.adherent.email != null ? licence.adherent.email : '-'}">Email</td>
+                            <td class="py-3 px-4 text-gray-600" th:text="${licence.etat != null ? licence.etat : '-'}">Etat</td>
+                            <td class="py-3 px-4 text-right">
+                                <a th:href="@{/adherents/{id}/edit(id=${licence.adherent.id})}" class="text-indigo-600 hover:text-indigo-900 font-medium">Voir Profil</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </main>
+</body>
+</html>

as-talange-web/src/main/resources/templates/parametrage/modespaiement_form.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Mode de Paiement - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/parametrage/modespaiement_list.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Paramétrage - Modes de Paiement</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/parametrage/saison_form.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Nouvelle Saison - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/parametrage/saisons_list.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Paramétrage - Saisons</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/planning/form.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Créneau d'Entraînement - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/planning/planning.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Planning des Entraînements - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/preinscriptions/list.html

@@ -21,7 +21,8 @@
 
         <div class="flex-1 overflow-auto p-6">
             <div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
-                <table class="w-full text-left border-collapse">
+                <div class="overflow-x-auto">
+                    <table class="w-full text-left border-collapse min-w-[800px]">
                     <thead>
                         <tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">
                             <th class="py-3 px-6 font-medium">Date</th>
@@ -42,7 +43,6 @@
                                 <div th:if="${pre.representantLegal != null}" class="text-[10px] text-blue-600 font-semibold mt-1" th:text="'Parent : ' + ${pre.representantLegal}"></div>
                             </td>
                             <td class="py-4 px-6">
-                                <div class="text-gray-900" th:text="${pre.telephone}"></div>
                                 <div class="text-xs text-gray-500" th:text="${pre.email}"></div>
                             </td>
                             <td class="py-4 px-6 text-right space-x-2">
@@ -62,6 +62,7 @@
                     </table>
                 </div>
             </div>
+        </div>
     </main>
 
     <script>

as-talange-web/src/main/resources/templates/public/demarrer.html

@@ -2,6 +2,7 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>AS Talange - Pré-inscription</title>
     <script src="https://cdn.tailwindcss.com"></script>
@@ -19,20 +20,25 @@
         <img src="/images/logo.png" alt="AS Talange" class="h-32 w-auto mx-auto mb-6 object-contain drop-shadow-sm"
             onerror="this.style.display='none'">
         <h1 class="text-2xl font-bold text-gray-900 mb-2">Inscription au club</h1>
-        <p th:unless="${inscriptionsFermees}" class="text-gray-600 mb-8">Veuillez valider le captcha pour accéder au formulaire sécurisé.</p>
+        <p th:unless="${inscriptionsFermees}" class="text-gray-600 mb-8">Veuillez valider le captcha pour accéder au
+            formulaire sécurisé.</p>
 
-        <div th:if="${error != null and (inscriptionsFermees == null or !inscriptionsFermees)}" class="bg-red-50 text-red-600 p-3 rounded-lg mb-6 text-sm" th:text="${error}"></div>
+        <div th:if="${error != null and (inscriptionsFermees == null or !inscriptionsFermees)}"
+            class="bg-red-50 text-red-600 p-3 rounded-lg mb-6 text-sm" th:text="${error}"></div>
 
         <div th:if="${inscriptionsFermees}" class="bg-red-50 text-red-600 p-4 rounded-lg mb-6 text-sm font-medium">
             Les inscriptions ne sont pas ouvertes pour le moment, veuillez contacter un responsable du club.
         </div>
 
-        <form th:unless="${inscriptionsFermees}" th:action="@{/inscription-public/demarrer}" method="post" class="flex flex-col items-center">
+            <p th:unless="${inscriptionsFermees}" class="text-gray-600 mb-8 leading-relaxed">
-            <!-- Remplacer par la vraie clé de site Cloudflare Turnstile -->
+                Afin de sécuriser le processus et d'éviter les soumissions automatisées (robots),
-            <div class="cf-turnstile mb-6" data-sitekey="1x00000000000000000000AA"></div>
+                nous vous demandons de bien vouloir valider le test de sécurité ci-dessous avant de continuer.
+            </p>
 
-            <button type="submit"
+            <form th:unless="${inscriptionsFermees}" th:action="@{/inscription-public/demarrer}" method="post" class="flex flex-col items-center">
-                class="w-full bg-blue-600 hover:bg-blue-700 text-white font-medium py-3 px-4 rounded-lg transition-colors">
+                <div class="cf-turnstile mb-6" th:attr="data-sitekey=${captchaSiteKey}"></div>
+                
+                <button type="submit" class="bg-blue-600 hover:bg-blue-700 text-white font-semibold py-3 px-8 rounded-xl shadow-md hover:shadow-lg transition-all duration-200 transform hover:-translate-y-0.5">
                 Accéder au formulaire
             </button>
         </form>

as-talange-web/src/main/resources/templates/public/formulaire.html

@@ -1,11 +1,22 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>AS Talange - Formulaire d'inscription</title>
     <script src="https://cdn.tailwindcss.com"></script>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
-    <style> body { font-family: 'Inter', sans-serif; } </style>
+    <style> 
+        body { font-family: 'Inter', sans-serif; } 
+        .was-validated input:invalid, .was-validated select:invalid {
+            border-color: #ef4444 !important;
+            background-color: #fef2f2 !important;
+        }
+        .was-validated input[type="radio"]:invalid, .was-validated input[type="checkbox"]:invalid {
+            outline: 2px solid #ef4444;
+            outline-offset: 2px;
+        }
+    </style>
 </head>
 <body class="bg-gray-50 flex items-center justify-center min-h-screen py-12">
     <div class="max-w-xl w-full bg-white rounded-xl shadow-md p-8 border border-gray-100">
@@ -13,9 +24,50 @@
         <h2 class="text-2xl font-bold text-gray-900 mb-2 text-center">Formulaire de pré-inscription</h2>
         <p class="text-sm text-gray-500 mb-8 text-center">Veuillez remplir les informations concernant le futur licencié.</p>
         
-        <form th:action="@{/inscription-public/formulaire}" th:object="${preInscription}" method="post" class="space-y-6">
+        <div class="mb-6 p-4 bg-blue-50 border-l-4 border-blue-500 text-blue-700 text-sm rounded">
+            <h3 class="font-bold mb-1">Information sur le type de demande</h3>
+            <ul class="list-disc pl-5 space-y-1">
+                <li><strong>Nouvelle licence :</strong> Concerne les personnes qui n'étaient pas inscrites au club la saison précédente.</li>
+                <li><strong>Renouvellement :</strong> Réservé aux personnes déjà inscrites au club la saison précédente.</li>
+            </ul>
+        </div>
+        
+        <form th:action="@{/inscription-public/formulaire}" th:object="${preInscription}" method="post" class="space-y-6" novalidate>
             <input type="hidden" name="token" th:value="${tokenUuid}" />
 
+            <div class="space-y-3">
+                <label class="block text-sm font-medium text-gray-700">Type de demande <span class="text-red-500">*</span></label>
+                <div class="flex items-center space-x-6">
+                    <label class="flex items-center">
+                        <input type="radio" th:field="*{typeDemande}" value="NOUVELLE" required class="w-4 h-4 text-blue-600 border-gray-300 focus:ring-blue-500">
+                        <span class="ml-2 text-sm text-gray-700">Nouvelle licence</span>
+                    </label>
+                    <label class="flex items-center">
+                        <input type="radio" th:field="*{typeDemande}" value="RENOUVELLEMENT" required class="w-4 h-4 text-blue-600 border-gray-300 focus:ring-blue-500">
+                        <span class="ml-2 text-sm text-gray-700">Renouvellement</span>
+                    </label>
+                </div>
+            </div>
+
+            <div id="nouvelleLicenceBlock" class="hidden space-y-4">
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Ancien club</label>
+                    <input type="text" th:field="*{ancienClub}" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none" placeholder="Nom du club (laisser vide si aucun)">
+                </div>
+                
+                <div class="bg-yellow-50 border-l-4 border-yellow-400 p-4 rounded-lg">
+                    <h4 class="font-bold text-yellow-800 mb-2">Documents et informations à fournir</h4>
+                    <p class="text-sm text-yellow-700 mb-2">Veuillez préparer les éléments suivants pour finaliser la licence :</p>
+                    <ul class="list-disc pl-5 text-sm text-yellow-700 space-y-1">
+                        <li>Photo d’identité</li>
+                        <li>Carte d’identité ou passeport de l'adhérent</li>
+                        <li>Livret de famille (si pas de pièce d’identité)</li>
+                        <li>Adresse e-mail de l'adhérent (représentant légal en cas de mineur)</li>
+                        <li>Pour les adhérents nés à l'étranger : Passeport + justificatif de domicile (du représentant légal en cas de mineur)</li>
+                    </ul>
+                </div>
+            </div>
+
             <div class="grid grid-cols-2 gap-4">
                 <div>
                     <label class="block text-sm font-medium text-gray-700 mb-1">Nom <span class="text-red-500">*</span></label>
@@ -27,10 +79,27 @@
                 </div>
             </div>
 
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div>
                     <label class="block text-sm font-medium text-gray-700 mb-1">Date de naissance <span class="text-red-500">*</span></label>
                     <input type="date" id="dateNaissance" th:field="*{dateNaissance}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
                 </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Ville de naissance <span class="text-red-500">*</span></label>
+                    <input type="text" th:field="*{lieuNaissanceVille}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                </div>
+            </div>
+
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Pays de naissance <span class="text-red-500">*</span></label>
+                    <input type="text" th:field="*{lieuNaissancePays}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Nationalité <span class="text-red-500">*</span></label>
+                    <input type="text" th:field="*{nationalite}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                </div>
+            </div>
 
             <div id="representantBlock" class="hidden bg-blue-50 p-4 rounded-lg border border-blue-100">
                 <label class="block text-sm font-medium text-blue-800 mb-1">Représentant légal <span class="text-red-500">*</span></label>
@@ -38,29 +107,83 @@
                 <input type="text" id="representantLegal" th:field="*{representantLegal}" placeholder="Nom et Prénom du parent" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
             </div>
 
-            <div class="grid grid-cols-2 gap-4">
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Email <span class="text-red-500">*</span></label>
+                    <input type="email" th:field="*{email}" required class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
+                </div>
                 <div>
                     <label class="block text-sm font-medium text-gray-700 mb-1">Téléphone</label>
                     <input type="tel" th:field="*{telephone}" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
                 </div>
-                <div>
-                    <label class="block text-sm font-medium text-gray-700 mb-1">Email</label>
-                    <input type="email" th:field="*{email}" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none">
-                </div>
             </div>
 
-            <div>
+            <div class="flex items-start pt-2">
-                <label class="block text-sm font-medium text-gray-700 mb-1">Adresse postale</label>
+                <div class="flex items-center h-5">
-                <textarea th:field="*{adresse}" rows="3" class="w-full border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none"></textarea>
+                    <input id="consentementRgpd" name="consentementRgpd" type="checkbox" required class="w-4 h-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500">
+                </div>
+                <div class="ml-3 text-sm">
+                    <label for="consentementRgpd" class="font-medium text-gray-700">Consentement RGPD <span class="text-red-500">*</span></label>
+                    <p class="text-gray-500 text-xs mt-1">J'accepte que l'AS Talange recueille et traite ces données pour la gestion de mon inscription et la logistique de la saison.</p>
+                </div>
             </div>
 
             <button type="submit" class="w-full bg-blue-600 hover:bg-blue-700 text-white font-medium py-3 px-4 rounded-lg transition-colors mt-4">
                 Soumettre le dossier
             </button>
+            
+            <p class="text-[10px] text-gray-400 text-center mt-4 leading-tight">
+                Les données sont stockées de manière sécurisée, accessibles uniquement au bureau du club. Vous pouvez demander leur suppression à tout moment.
+            </p>
+            <p class="text-[10px] text-gray-400 text-center mt-2">
+                v<span th:text="${appVersion}">1.0-SNAPSHOT</span>
+            </p>
         </form>
     </div>
 
     <script>
+        const form = document.querySelector('form');
+        form.addEventListener('submit', function(event) {
+            if (!form.checkValidity()) {
+                event.preventDefault();
+                
+                let errorMsg = document.getElementById('form-error-msg');
+                if (!errorMsg) {
+                    errorMsg = document.createElement('div');
+                    errorMsg.id = 'form-error-msg';
+                    errorMsg.className = 'mb-6 p-4 bg-red-50 border-l-4 border-red-500 text-red-700 text-sm rounded transition-all duration-300';
+                    errorMsg.innerHTML = '<h3 class="font-bold">Erreur de validation</h3><p>Veuillez renseigner tous les champs obligatoires (encadrés en rouge).</p>';
+                    form.insertBefore(errorMsg, form.firstChild);
+                }
+            }
+            form.classList.add('was-validated');
+            
+            // Scroll to the first invalid element for better mobile UX
+            const firstInvalid = form.querySelector(':invalid');
+            if (firstInvalid) {
+                firstInvalid.scrollIntoView({ behavior: 'smooth', block: 'center' });
+            }
+        });
+
+        const typeDemandeRadios = document.querySelectorAll('input[name="typeDemande"]');
+        const nouvelleLicenceBlock = document.getElementById('nouvelleLicenceBlock');
+
+        typeDemandeRadios.forEach(radio => {
+            radio.addEventListener('change', function() {
+                if (this.value === 'NOUVELLE') {
+                    nouvelleLicenceBlock.classList.remove('hidden');
+                } else {
+                    nouvelleLicenceBlock.classList.add('hidden');
+                }
+            });
+        });
+
+        // Trigger on load if already checked (e.g. going back or validation error)
+        const checkedRadio = document.querySelector('input[name="typeDemande"]:checked');
+        if (checkedRadio && checkedRadio.value === 'NOUVELLE') {
+            nouvelleLicenceBlock.classList.remove('hidden');
+        }
+
         document.getElementById('dateNaissance').addEventListener('change', function() {
             const dateInput = this.value;
             const repBlock = document.getElementById('representantBlock');

as-talange-web/src/main/resources/templates/public/lien-expire.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Lien expiré</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/public/succes.html

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/1.4.1/html2canvas.min.js"></script>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Inscription réussie</title>
     <script src="https://cdn.tailwindcss.com"></script>
@@ -15,8 +17,56 @@
             </svg>
         </div>
         <h1 class="text-2xl font-bold text-gray-900 mb-2">Pré-inscription envoyée !</h1>
-        <p class="text-gray-600 mb-2">Votre dossier a bien été transmis au secrétariat de l'AS Talange.</p>
+        <p class="text-gray-600 mb-2" th:text="'Votre dossier pour ' + ${prenom != null ? prenom : 'le futur licencié'} + ' a bien été transmis au secrétariat de l\'AS Talange.'">Votre dossier a bien été transmis au secrétariat de l'AS Talange.</p>
         <p class="text-sm text-gray-500">Un responsable va traiter votre demande prochainement. Vous pouvez fermer cette page.</p>
+
+        <div th:if="${isNouvelle}" class="mt-8 text-left">
+            <div id="ticket-documents" class="bg-yellow-50 border-2 border-dashed border-yellow-300 p-6 rounded-lg relative overflow-hidden shadow-sm">
+                <!-- Decorative elements for ticket look -->
+                <div class="absolute -left-3 top-1/2 w-6 h-6 bg-white rounded-full border-r-2 border-yellow-300 transform -translate-y-1/2"></div>
+                <div class="absolute -right-3 top-1/2 w-6 h-6 bg-white rounded-full border-l-2 border-yellow-300 transform -translate-y-1/2"></div>
+                
+                <h2 class="text-lg font-bold text-yellow-800 mb-4 text-center border-b-2 border-yellow-200 pb-2 border-dashed uppercase tracking-wider">Mémo Inscription</h2>
+                
+                <div class="mb-4">
+                    <p class="text-sm font-semibold text-yellow-900">Tarif Licence : <span class="text-lg" th:text="${tarif}">210 €</span></p>
                 </div>
+                
+                <h3 class="font-semibold text-yellow-900 mb-2 text-sm uppercase tracking-wide">Documents à fournir :</h3>
+                <ul class="list-none space-y-2 mb-3">
+                    <li th:each="doc : ${documents}" class="flex items-start">
+                        <svg class="w-4 h-4 text-yellow-500 mr-2 mt-0.5 flex-shrink-0" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd"></path></svg>
+                        <span class="text-sm text-yellow-800" th:text="${doc}">Document</span>
+                    </li>
+                </ul>
+                <p class="text-xs text-yellow-800 italic text-center mb-2">Ces documents sont à fournir au secrétariat du club pour finaliser l'inscription.</p>
+                <div class="mt-4 pt-2 border-t-2 border-yellow-200 border-dashed text-center">
+                    <p class="text-xs text-yellow-600 font-medium">As Talange</p>
+                </div>
+            </div>
+            
+            <div class="mt-4 text-center">
+                <button type="button" onclick="captureTicket()" class="bg-gray-800 hover:bg-gray-700 text-white font-medium py-2 px-4 rounded-lg shadow transition-colors inline-flex items-center text-sm">
+                    <svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"/>
+                    </svg>
+                    Enregistrer cette liste (Image)
+                </button>
+            </div>
+        </div>
+    </div>
+    
+    <script th:if="${isNouvelle}">
+        function captureTicket() {
+            const ticket = document.getElementById('ticket-documents');
+            html2canvas(ticket, { scale: 2 }).then(canvas => {
+                const imgData = canvas.toDataURL('image/png');
+                const link = document.createElement('a');
+                link.download = 'ASTalange-Documents.png';
+                link.href = imgData;
+                link.click();
+            });
+        }
+    </script>
 </body>
 </html>

as-talange-web/src/main/resources/templates/utilisateurs/form.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Ajouter un Utilisateur - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

as-talange-web/src/main/resources/templates/utilisateurs/list.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
 <head>
+    <script src="https://unpkg.com/htmx.org@1.9.11"></script>
     <meta charset="UTF-8">
     <title>Gestion des Utilisateurs - AS Talange</title>
     <script src="https://cdn.tailwindcss.com"></script>

docker-compose.yml

@@ -1,4 +1,3 @@
-
 services:
   db:
     image: postgres:16
@@ -11,6 +10,7 @@ services:
       - "5433:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
+    restart: always
 
   pgadmin:
     image: dpage/pgadmin4
@@ -22,6 +22,7 @@ services:
       - "5050:80"
     depends_on:
       - db
+    restart: always
 
   app:
     build:
@@ -34,6 +35,8 @@ services:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/astalange
       - SPRING_DATASOURCE_USERNAME=${POSTGRES_USER:-myuser}
       - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD:-mypassword}
+      - CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY}
+      - CAPTCHA_SECRET=${CAPTCHA_SECRET}
     depends_on:
       - db
     restart: always

fix_htmx.py

@@ -0,0 +1,14 @@
+import os
+import glob
+
+template_dir = "/home/ucef/.gemini/antigravity/scratch/as-talange/as-talange-web/src/main/resources/templates"
+html_files = glob.glob(template_dir + "/**/*.html", recursive=True)
+
+for file in html_files:
+    with open(file, "r") as f:
+        content = f.read()
+    if "htmx.org" not in content and "<head>" in content:
+        content = content.replace("<head>", "<head>\n    <script src=\"https://unpkg.com/htmx.org@1.9.11\"></script>")
+        with open(file, "w") as f:
+            f.write(content)
+        print(f"Fixed {file}")

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.astalange</groupId>
     <artifactId>as-talange-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.3</version>
     <packaging>pom</packaging>
 
     <name>as-talange-parent</name>