feat: add active user session tracking and visualization in admin dashboard

as-talange-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>as-talange-parent</artifactId>
         <groupId>com.astalange</groupId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</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.4</version>
+        <version>1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -18,7 +18,7 @@ public class Dotation {
     @JoinColumn(name = "equipement_id", nullable = false)
     private Equipement equipement;
 
-    @Column(length = 10)
+    @Column(length = 50)
     private String taille;
 
     @Column(length = 50)
@@ -30,7 +30,7 @@ public class Dotation {
     @Column(nullable = false)
     private Boolean fourni = false;
 
-    @Column(length = 10)
+    @Column(length = 50)
     private String numero;
 
     @Column(nullable = false)

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

@@ -18,6 +18,9 @@ public class PreInscription {
     @Column(nullable = false, length = 100)
     private String prenom;
 
+    @Column(nullable = false, length = 10)
+    private String sexe;
+
     @Column(name = "date_naissance", nullable = false)
     private LocalDate dateNaissance;
 
@@ -71,6 +74,9 @@ public class PreInscription {
     public String getPrenom() { return prenom; }
     public void setPrenom(String prenom) { this.prenom = prenom; }
 
+    public String getSexe() { return sexe; }
+    public void setSexe(String sexe) { this.sexe = sexe; }
+
     public LocalDate getDateNaissance() { return dateNaissance; }
     public void setDateNaissance(LocalDate dateNaissance) { this.dateNaissance = dateNaissance; }
 

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

@@ -138,14 +138,13 @@ public class CategorieService {
                 newDotation.setLicence(licence);
                 newDotation.setEquipement(ce.getEquipement());
                 boolean isMaillot = "Maillot".equalsIgnoreCase(ce.getEquipement().getNom());
-                boolean isNouvelleAndU11 = false;
+                boolean isNouvelle = false;
                 if (licence.getTypeDemande() != null && 
                     (licence.getTypeDemande().equalsIgnoreCase("Nouvelle demande") || licence.getTypeDemande().equalsIgnoreCase("NOUVELLE")) && 
-                    licence.getCategorie() != null && 
-                    licence.getCategorie().isU11OrBelow()) {
-                    isNouvelleAndU11 = true;
+                    licence.getCategorie() != null) {
+                    isNouvelle = true;
                 }
-                newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelleAndU11)); // Checked if obligatoire or if it's a new registration for U11 or below
+                newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelle)); // Checked if obligatoire or if it's a new registration
                 newDotation.setFourni(false);
                 newDotation.setTaille("");
                 newDotation.setNumero("");

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

@@ -47,8 +47,8 @@ public class PreInscriptionService {
         adherent.setTypeDemande(pre.getTypeDemande());
         adherent.setAncienClub(pre.getAncienClub());
         adherent.setAncienneCategorie(pre.getAncienneCategorie());
+        adherent.setSexe(pre.getSexe());
         // Par défaut
-        adherent.setSexe("MASCULIN");
         adherent.setTypeMaillot("JOUEUR");
         adherent.setResidentTalange(false);
         

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

@@ -0,0 +1 @@
+ALTER TABLE pre_inscription ADD COLUMN sexe VARCHAR(10) DEFAULT 'MASCULIN' NOT NULL;

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

@@ -0,0 +1,2 @@
+ALTER TABLE dotation ALTER COLUMN taille TYPE VARCHAR(50);
+ALTER TABLE dotation ALTER COLUMN numero TYPE VARCHAR(50);

as-talange-web/pom.xml

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

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

@@ -10,6 +10,9 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.session.SessionRegistryImpl;
+import org.springframework.security.web.session.HttpSessionEventPublisher;
 
 @Configuration
 @EnableWebSecurity
@@ -41,6 +44,10 @@ public class SecurityConfig {
             .logout(logout -> logout
                 .logoutSuccessUrl("/login?logout")
                 .permitAll()
+            )
+            .sessionManagement(session -> session
+                .maximumSessions(100)
+                .sessionRegistry(sessionRegistry())
             );
         return http.build();
     }
@@ -57,4 +64,14 @@ public class SecurityConfig {
         authProvider.setPasswordEncoder(passwordEncoder());
         return authProvider;
     }
+
+    @Bean
+    public SessionRegistry sessionRegistry() {
+        return new SessionRegistryImpl();
+    }
+
+    @Bean
+    public HttpSessionEventPublisher httpSessionEventPublisher() {
+        return new HttpSessionEventPublisher();
+    }
 }

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

@@ -133,9 +133,9 @@ public class PublicInscriptionController {
                 if (!categories.isEmpty()) {
                     Categorie cat = categories.get(0);
                     if (cat.getTarifBase() != null) {
-                        BigDecimal prixMaillot = BigDecimal.ZERO;
-                        if (cat.isU11OrBelow()) {
-                            prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                        BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                        if (prixMaillot == null) {
+                            prixMaillot = BigDecimal.ZERO;
                         }
                         BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
                         tarifStr = tarifTotal.intValue() + " €";
@@ -175,9 +175,9 @@ public class PublicInscriptionController {
 
             Categorie cat = categories.get(0);
             if (cat.getTarifBase() != null) {
-                BigDecimal prixMaillot = BigDecimal.ZERO;
-                if (cat.isU11OrBelow()) {
-                    prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                if (prixMaillot == null) {
+                    prixMaillot = BigDecimal.ZERO;
                 }
                 BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
                 return tarifTotal.intValue() + " €";

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

@@ -0,0 +1,37 @@
+package com.astalange.web.controller;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.core.userdetails.UserDetails;
+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 java.util.List;
+import java.util.stream.Collectors;
+
+@Controller
+@RequestMapping("/admin/sessions")
+public class SessionController {
+
+    private final SessionRegistry sessionRegistry;
+
+    public SessionController(SessionRegistry sessionRegistry) {
+        this.sessionRegistry = sessionRegistry;
+    }
+
+    @GetMapping
+    @PreAuthorize("hasRole('ADMIN')")
+    public String viewSessions(Model model) {
+        List<Object> principals = sessionRegistry.getAllPrincipals();
+        List<String> activeUsers = principals.stream()
+                .filter(principal -> principal instanceof UserDetails)
+                .map(principal -> ((UserDetails) principal).getUsername())
+                .collect(Collectors.toList());
+        
+        model.addAttribute("activeUsers", activeUsers);
+        model.addAttribute("activeCount", activeUsers.size());
+        return "admin/sessions";
+    }
+}

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

@@ -358,7 +358,7 @@
                                                 
                                                 <div>
                                                     <div class="flex justify-between items-start mb-1 gap-1">
-                                                        <span class="font-semibold text-xs text-gray-800 truncate" th:text="${dot.equipement.nom}">Maillot</span>
+                                                        <span class="font-semibold text-xs text-gray-800 truncate" th:title="${dot.equipement.nom}" th:text="${dot.equipement.nom}">Maillot</span>
                                                         <span class="text-[9px] px-1.5 py-0.5 rounded-full font-bold flex-shrink-0" 
                                                               th:classappend="${dot.licence.categorie.isEquipementObligatoire(dot.equipement.id) ? 'bg-red-50 text-red-700 border border-red-100' : 'bg-gray-50 text-gray-600 border border-gray-100'}"
                                                               th:text="${dot.licence.categorie.isEquipementObligatoire(dot.equipement.id) ? 'Obligatoire' : 'Facultatif'}">Obligatoire</span>

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

@@ -175,7 +175,7 @@
                                 hx-target="#adherents-table-container"
                                 hx-select="#adherents-table-container"
                                 hx-include="#filter-row input, #filter-row select, input[name='query']"
-                                th:attr="hx-vals=|{'page': ${currentPage - 1}}|"
+                                th:attr="hx-vals=|{"page": ${currentPage - 1}}|"
                                 class="px-3 py-1 border border-gray-300 rounded hover:bg-gray-100 transition-colors">
                             Précédent
                         </button>
@@ -190,7 +190,7 @@
                                     hx-target="#adherents-table-container"
                                     hx-select="#adherents-table-container"
                                     hx-include="#filter-row input, #filter-row select, input[name='query']"
-                                    th:attr="hx-vals=|{'page': ${pageNum}}|"
+                                    th:attr="hx-vals=|{&quot;page&quot;: ${pageNum}}|"
                                     th:text="${pageNum + 1}"
                                     class="px-3 py-1 rounded transition-colors"
                                     th:classappend="${currentPage == pageNum ? 'bg-blue-600 text-white' : 'border border-gray-300 hover:bg-gray-100'}">
@@ -205,7 +205,7 @@
                                 hx-target="#adherents-table-container"
                                 hx-select="#adherents-table-container"
                                 hx-include="#filter-row input, #filter-row select, input[name='query']"
-                                th:attr="hx-vals=|{'page': ${currentPage + 1}}|"
+                                th:attr="hx-vals=|{&quot;page&quot;: ${currentPage + 1}}|"
                                 class="px-3 py-1 border border-gray-300 rounded hover:bg-gray-100 transition-colors">
                             Suivant
                         </button>

as-talange-web/src/main/resources/templates/admin/sessions.html

@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Utilisateurs Connectés - 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">
+
+    <!-- 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 justify-between px-6">
+            <h2 class="text-lg font-semibold text-gray-800">Utilisateurs Connectés</h2>
+        </header>
+
+        <!-- Main section -->
+        <div class="flex-1 overflow-auto p-6">
+            <div class="mb-6 flex justify-between items-center">
+                <h3 class="text-xl font-bold text-gray-900">
+                    Sessions Actives (<span th:text="${activeCount}">0</span>)
+                </h3>
+                <button hx-get="/admin/sessions" hx-target="body" hx-swap="outerHTML" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700 transition-colors">
+                    Rafraîchir
+                </button>
+            </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">
+                            <th class="py-3 px-6 font-medium text-left">Nom d'utilisateur</th>
+                            <th class="py-3 px-6 font-medium text-left">Statut</th>
+                        </tr>
+                    </thead>
+                    <tbody class="divide-y divide-gray-200 text-sm">
+                        <tr th:if="${#lists.isEmpty(activeUsers)}">
+                            <td colspan="2" class="py-8 text-center text-gray-500">Aucun utilisateur connecté pour le moment.</td>
+                        </tr>
+                        <tr th:each="username : ${activeUsers}" class="hover:bg-gray-50 transition-colors">
+                            <td class="py-4 px-6 font-medium text-gray-900 flex items-center">
+                                <div class="w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center font-bold mr-3">
+                                    <span th:text="${#strings.substring(username, 0, 1).toUpperCase()}">U</span>
+                                </div>
+                                <span th:text="${username}">username</span>
+                            </td>
+                            <td class="py-4 px-6">
+                                <span class="px-2 py-1 bg-green-100 text-green-800 text-xs font-semibold rounded-full">En ligne</span>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </main>
+</body>
+</html>

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

@@ -44,6 +44,7 @@
                 <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>
+                <a href="/admin/sessions" th:classappend="${requestURI != null and requestURI.startsWith('/admin/sessions') ? '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 Connectés</a>
             </th:block>
         </nav>
         <div class="p-4 border-t border-gray-200">

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

@@ -20,10 +20,13 @@
         <div class="flex-1 overflow-auto p-6">
             <div class="flex justify-between items-center mb-6">
                 <h3 class="text-xl font-bold text-gray-900">Liste des Catégories</h3>
+                <div class="flex items-center space-x-4">
+                    <input type="text" id="searchInput" placeholder="Rechercher une catégorie..." class="border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none w-64">
                     <a th:href="@{/categories/new}" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700">
                         + Nouvelle Catégorie
                     </a>
                 </div>
+            </div>
 
             <div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
                 <div class="overflow-x-auto">
@@ -64,5 +67,15 @@
             </div>
         </div>
     </main>
+    <script>
+        document.getElementById('searchInput').addEventListener('keyup', function() {
+            let filter = this.value.toLowerCase();
+            let rows = document.querySelectorAll('tbody tr.hover\\:bg-gray-50');
+            rows.forEach(row => {
+                let text = row.textContent.toLowerCase();
+                row.style.display = text.includes(filter) ? '' : 'none';
+            });
+        });
+    </script>
 </body>
 </html>

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

@@ -20,10 +20,13 @@
         <div class="flex-1 overflow-auto p-6">
             <div class="flex justify-between items-center mb-6">
                 <h3 class="text-xl font-bold text-gray-900">Liste des Équipements</h3>
+                <div class="flex items-center space-x-4">
+                    <input type="text" id="searchInput" placeholder="Rechercher un équipement..." class="border border-gray-300 rounded-lg px-4 py-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none w-64">
                     <a th:href="@{/equipements/new}" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700">
                         + Nouvel Équipement
                     </a>
                 </div>
+            </div>
                 <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">
@@ -51,5 +54,15 @@
             </div>
         </div>
     </main>
+    <script>
+        document.getElementById('searchInput').addEventListener('keyup', function() {
+            let filter = this.value.toLowerCase();
+            let rows = document.querySelectorAll('tbody tr.hover\\:bg-gray-50');
+            rows.forEach(row => {
+                let text = row.textContent.toLowerCase();
+                row.style.display = text.includes(filter) ? '' : 'none';
+            });
+        });
+    </script>
 </body>
 </html>

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

@@ -99,6 +99,20 @@
                 </div>
             </div>
 
+            <div class="space-y-3">
+                <label class="block text-sm font-medium text-gray-700">Sexe <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="*{sexe}" value="MASCULIN" 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">Masculin</span>
+                    </label>
+                    <label class="flex items-center">
+                        <input type="radio" th:field="*{sexe}" value="FEMININ" 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">Féminin</span>
+                    </label>
+                </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>

pom.xml

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