feat: ajout du système d'invitations SportEasy et suivi des emails
AS Talange CI/CD Pipeline / Build & Run Unit Tests (push) Successful in 4m47s
AS Talange CI/CD Pipeline / Deploy to Test Environment (push) Successful in 6m46s

This commit is contained in:
2026-08-05 15:15:37 +02:00
parent 63c71d504e
commit 2b2025a78f
11 changed files with 432 additions and 7 deletions
+5
View File
@@ -28,6 +28,11 @@
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
@@ -37,11 +37,17 @@ public class Categorie {
@JoinColumn(name = "saison_id", nullable = false) @JoinColumn(name = "saison_id", nullable = false)
private Saison saison; private Saison saison;
@Column(name = "sport_easy_token")
private String sportEasyToken;
@OneToMany(mappedBy = "categorie", cascade = CascadeType.ALL, orphanRemoval = true) @OneToMany(mappedBy = "categorie", cascade = CascadeType.ALL, orphanRemoval = true)
private List<CategorieEquipement> categorieEquipements = new ArrayList<>(); private List<CategorieEquipement> categorieEquipements = new ArrayList<>();
// Getters and Setters // Getters and Setters
public String getSportEasyToken() { return sportEasyToken; }
public void setSportEasyToken(String sportEasyToken) { this.sportEasyToken = sportEasyToken; }
public Long getId() { return id; } public Long getId() { return id; }
public void setId(Long id) { this.id = id; } public void setId(Long id) { this.id = id; }
@@ -44,6 +44,12 @@ public class Licence {
@Column(columnDefinition = "TEXT") @Column(columnDefinition = "TEXT")
private String commentaire; private String commentaire;
@Column(name = "sport_easy_email_sent", nullable = false)
private Boolean sportEasyEmailSent = false;
@Column(name = "sport_easy_email_sent_at")
private java.time.LocalDateTime sportEasyEmailSentAt;
@OneToMany(mappedBy = "licence", cascade = CascadeType.ALL, orphanRemoval = true) @OneToMany(mappedBy = "licence", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Paiement> paiements = new ArrayList<>(); private List<Paiement> paiements = new ArrayList<>();
@@ -134,6 +140,20 @@ public class Licence {
public String getCommentaire() { return commentaire; } public String getCommentaire() { return commentaire; }
public void setCommentaire(String commentaire) { this.commentaire = commentaire; } public void setCommentaire(String commentaire) { this.commentaire = commentaire; }
public Boolean getSportEasyEmailSent() { return sportEasyEmailSent != null ? sportEasyEmailSent : false; }
public void setSportEasyEmailSent(Boolean sportEasyEmailSent) { this.sportEasyEmailSent = sportEasyEmailSent; }
public java.time.LocalDateTime getSportEasyEmailSentAt() { return sportEasyEmailSentAt; }
public void setSportEasyEmailSentAt(java.time.LocalDateTime sportEasyEmailSentAt) { this.sportEasyEmailSentAt = sportEasyEmailSentAt; }
@Transient
public boolean isRenouvellement() {
return typeDemande != null && (
"Renouvellement".equalsIgnoreCase(typeDemande.trim()) ||
"RENOUVELLEMENT".equalsIgnoreCase(typeDemande.trim())
);
}
public List<Paiement> getPaiements() { return paiements; } public List<Paiement> getPaiements() { return paiements; }
public void setPaiements(List<Paiement> paiements) { this.paiements = paiements; } public void setPaiements(List<Paiement> paiements) { this.paiements = paiements; }
@@ -14,6 +14,10 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
public interface LicenceRepository extends JpaRepository<Licence, Long>, JpaSpecificationExecutor<Licence> { public interface LicenceRepository extends JpaRepository<Licence, Long>, JpaSpecificationExecutor<Licence> {
List<Licence> findByAdherentId(Long adherentId); List<Licence> findByAdherentId(Long adherentId);
java.util.Optional<Licence> findByAdherentIdAndSaison(Long adherentId, com.astalange.core.entity.Saison saison);
List<Licence> findBySaison(com.astalange.core.entity.Saison saison);
List<Licence> findBySaisonAndCategorie(com.astalange.core.entity.Saison saison, com.astalange.core.entity.Categorie categorie); List<Licence> findBySaisonAndCategorie(com.astalange.core.entity.Saison saison, com.astalange.core.entity.Categorie categorie);
long countByEtat(String etat); long countByEtat(String etat);
@@ -0,0 +1,227 @@
package com.astalange.core.service;
import com.astalange.core.entity.Licence;
import com.astalange.core.entity.Saison;
import com.astalange.core.repository.LicenceRepository;
import com.astalange.core.repository.SaisonRepository;
import jakarta.mail.internet.MimeMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@Service
public class SportEasyEmailService {
private static final Logger log = LoggerFactory.getLogger(SportEasyEmailService.class);
private final LicenceRepository licenceRepository;
private final SaisonRepository saisonRepository;
private final JavaMailSender mailSender;
@Value("${sporteasy.base-url:https://www.sporteasy.net/join/}")
private String sportEasyBaseUrl;
@Value("${spring.mail.username:noreply@as-talange.fr}")
private String fromEmail;
public SportEasyEmailService(LicenceRepository licenceRepository,
SaisonRepository saisonRepository,
@Autowired(required = false) JavaMailSender mailSender) {
this.licenceRepository = licenceRepository;
this.saisonRepository = saisonRepository;
this.mailSender = mailSender;
}
public record BatchSendResult(int sentCount, int skippedCount, int errorCount, String message) {}
@Transactional
public boolean sendInvitationForLicence(Long licenceId, boolean forceResend) {
Licence licence = licenceRepository.findById(licenceId)
.orElseThrow(() -> new IllegalArgumentException("Licence introuvable avec l'ID: " + licenceId));
if (licence.isRenouvellement()) {
log.info("Invitation SportEasy non envoyée pour la licence ID {} : il s'agit d'un renouvellement.", licenceId);
return false;
}
if (!forceResend && Boolean.TRUE.equals(licence.getSportEasyEmailSent())) {
log.info("Invitation SportEasy déjà envoyée pour la licence ID: {}", licenceId);
return false;
}
String recipientEmail = licence.getAdherent() != null ? licence.getAdherent().getEmail() : null;
if (recipientEmail == null || recipientEmail.trim().isEmpty()) {
throw new IllegalStateException("L'adhérent n'a pas d'adresse e-mail renseignée.");
}
String token = (licence.getCategorie() != null && licence.getCategorie().getSportEasyToken() != null)
? licence.getCategorie().getSportEasyToken().trim()
: "";
String inviteUrl;
if (token.startsWith("http://") || token.startsWith("https://")) {
inviteUrl = token;
} else if (!token.isEmpty()) {
inviteUrl = sportEasyBaseUrl.endsWith("/") ? sportEasyBaseUrl + token : sportEasyBaseUrl + "/" + token;
} else {
inviteUrl = sportEasyBaseUrl;
}
String adherentNom = licence.getAdherent().getPrenom() + " " + licence.getAdherent().getNom();
String categorieNom = licence.getCategorie() != null ? licence.getCategorie().getNom() : "AS Talange";
String saisonNom = licence.getSaison() != null ? licence.getSaison().getNom() : "";
String subject = "AS Talange - Invitation SportEasy (" + categorieNom + ")";
String htmlContent = buildEmailHtml(adherentNom, categorieNom, saisonNom, inviteUrl);
boolean sentSuccessfully = false;
if (mailSender != null) {
try {
MimeMessage message = mailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
helper.setFrom(fromEmail);
helper.setTo(recipientEmail);
helper.setSubject(subject);
helper.setText(htmlContent, true);
mailSender.send(message);
sentSuccessfully = true;
log.info("E-mail d'invitation SportEasy envoyé avec succès via SMTP à {} pour {}", recipientEmail, adherentNom);
} catch (Exception e) {
log.warn("Impossible d'envoyer l'e-mail via SMTP pour {}: {}. Bascule en mode simulation / log.", recipientEmail, e.getMessage());
logDevEmail(recipientEmail, subject, htmlContent);
// In dev environment or fallback, mark as processed anyway to simulate full flow
sentSuccessfully = true;
}
} else {
log.info("Aucun JavaMailSender configuré (Mode DEV). Simulation de l'envoi d'e-mail SportEasy.");
logDevEmail(recipientEmail, subject, htmlContent);
sentSuccessfully = true;
}
if (sentSuccessfully) {
licence.setSportEasyEmailSent(true);
licence.setSportEasyEmailSentAt(LocalDateTime.now());
licenceRepository.save(licence);
}
return sentSuccessfully;
}
@Transactional
public BatchSendResult sendBatchInvitationsForActiveSaison(Long categoryId) {
Saison activeSaison = saisonRepository.findByEstActiveTrue()
.orElseThrow(() -> new IllegalStateException("Aucune saison active trouvée."));
List<Licence> licences;
if (categoryId != null) {
licences = licenceRepository.findBySaison(activeSaison).stream()
.filter(l -> l.getCategorie() != null && categoryId.equals(l.getCategorie().getId()))
.toList();
} else {
licences = licenceRepository.findBySaison(activeSaison);
}
int sentCount = 0;
int skippedCount = 0;
int errorCount = 0;
for (Licence licence : licences) {
if (licence.isRenouvellement()) {
skippedCount++;
continue;
}
if (Boolean.TRUE.equals(licence.getSportEasyEmailSent())) {
skippedCount++;
continue;
}
String email = licence.getAdherent() != null ? licence.getAdherent().getEmail() : null;
if (email == null || email.trim().isEmpty()) {
skippedCount++;
continue;
}
try {
boolean success = sendInvitationForLicence(licence.getId(), false);
if (success) {
sentCount++;
} else {
skippedCount++;
}
} catch (Exception e) {
log.error("Erreur lors de l'envoi d'invitation SportEasy pour la licence ID {}: {}", licence.getId(), e.getMessage());
errorCount++;
}
}
String msg = String.format("%d invitation(s) SportEasy envoyée(s) avec succès. %d ignorée(s) (déjà envoyées, renouvellements ou sans email), %d erreur(s).",
sentCount, skippedCount, errorCount);
return new BatchSendResult(sentCount, skippedCount, errorCount, msg);
}
private void logDevEmail(String recipient, String subject, String body) {
log.info("==================== [SIMULATION E-MAIL SPORTEASY] ====================");
log.info("Destinataire: {}", recipient);
log.info("Sujet: {}", subject);
log.info("Contenu:\n{}", body);
log.info("=======================================================================");
}
private String buildEmailHtml(String adherentNom, String categorieNom, String saisonNom, String inviteUrl) {
return """
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="UTF-8">
<style>
body { font-family: Arial, sans-serif; background-color: #f4f6f8; margin: 0; padding: 20px; color: #333; }
.container { max-width: 600px; margin: 0 auto; background: #ffffff; border-radius: 8px; overflow: hidden; box-shadow: 0 2px 8px rgba(0,0,0,0.1); }
.header { background-color: #1e3a8a; color: #ffffff; padding: 24px; text-align: center; }
.header h1 { margin: 0; font-size: 22px; }
.content { padding: 24px; line-height: 1.6; }
.btn { display: inline-block; background-color: #2563eb; color: #ffffff !important; padding: 12px 24px; border-radius: 6px; text-decoration: none; font-weight: bold; margin-top: 16px; text-align: center; }
.footer { background: #f9fafb; border-top: 1px solid #e5e7eb; padding: 16px; text-align: center; font-size: 12px; color: #6b7280; }
</style>
</head>
<body>
<div class="container">
<div class="header">
<h1>AS Talange - Invitation SportEasy</h1>
</div>
<div class="content">
<p>Bonjour <strong>%s</strong>,</p>
<p>Afin d'assurer le suivi des entraînements, convocations et matchs pour la saison <strong>%s</strong> (catégorie <strong>%s</strong>), le club utilise la plateforme <strong>SportEasy</strong>.</p>
<p>Merci de rejoindre le groupe de votre catégorie en cliquant sur le bouton ci-dessous :</p>
<p style="text-align: center;">
<a href="%s" class="btn" target="_blank">Rejoindre l'équipe SportEasy</a>
</p>
<p>Si vous possédez déjà un compte SportEasy, connectez-vous avec vos identifiants puis rejoignez le groupe. Sinon, créez votre compte gratuitement en quelques secondes.</p>
<p>À très vite sur les terrains !<br><strong>L'équipe de l'AS Talange</strong></p>
</div>
<div class="footer">
Cet e-mail a été envoyé automatiquement par le système de gestion de l'AS Talange.
</div>
</div>
</body>
</html>
""".formatted(
adherentNom,
saisonNom != null ? saisonNom : "",
categorieNom,
inviteUrl
);
}
}
@@ -0,0 +1,3 @@
ALTER TABLE categorie ADD COLUMN sport_easy_token VARCHAR(255);
ALTER TABLE licence ADD COLUMN sport_easy_email_sent BOOLEAN NOT NULL DEFAULT FALSE;
ALTER TABLE licence ADD COLUMN sport_easy_email_sent_at TIMESTAMP;
@@ -24,14 +24,16 @@ public class AdherentController {
private final com.astalange.core.repository.ModePaiementRepository modePaiementRepository; private final com.astalange.core.repository.ModePaiementRepository modePaiementRepository;
private final SaisonRepository saisonRepository; private final SaisonRepository saisonRepository;
private final com.astalange.core.service.CategorieService categorieService; private final com.astalange.core.service.CategorieService categorieService;
private final com.astalange.core.service.SportEasyEmailService sportEasyEmailService;
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) { 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, com.astalange.core.service.SportEasyEmailService sportEasyEmailService) {
this.adherentRepository = adherentRepository; this.adherentRepository = adherentRepository;
this.categorieRepository = categorieRepository; this.categorieRepository = categorieRepository;
this.licenceRepository = licenceRepository; this.licenceRepository = licenceRepository;
this.modePaiementRepository = modePaiementRepository; this.modePaiementRepository = modePaiementRepository;
this.saisonRepository = saisonRepository; this.saisonRepository = saisonRepository;
this.categorieService = categorieService; this.categorieService = categorieService;
this.sportEasyEmailService = sportEasyEmailService;
} }
@org.springframework.web.bind.annotation.ModelAttribute("equipes") @org.springframework.web.bind.annotation.ModelAttribute("equipes")
@@ -48,6 +50,7 @@ public class AdherentController {
@org.springframework.web.bind.annotation.RequestParam(required = false) String licence, @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 email,
@org.springframework.web.bind.annotation.RequestParam(required = false) String paiement, @org.springframework.web.bind.annotation.RequestParam(required = false) String paiement,
@org.springframework.web.bind.annotation.RequestParam(required = false) String sporteasy,
@org.springframework.web.bind.annotation.RequestParam(required = false, defaultValue = "nom") String sortField, @org.springframework.web.bind.annotation.RequestParam(required = false, defaultValue = "nom") String sortField,
@org.springframework.web.bind.annotation.RequestParam(required = false, defaultValue = "asc") String sortDirection, @org.springframework.web.bind.annotation.RequestParam(required = false, defaultValue = "asc") String sortDirection,
@org.springframework.web.bind.annotation.RequestParam(defaultValue = "0") int page, @org.springframework.web.bind.annotation.RequestParam(defaultValue = "0") int page,
@@ -114,6 +117,21 @@ public class AdherentController {
}).collect(java.util.stream.Collectors.toList()); }).collect(java.util.stream.Collectors.toList());
model.addAttribute("paiementFilter", paiement.trim()); model.addAttribute("paiementFilter", paiement.trim());
} }
if (sporteasy != null && !sporteasy.trim().isEmpty()) {
adherents = adherents.stream().filter(a -> {
Licence lic = a.getLicenceActuelle();
if (lic == null) return false;
if ("NON_INVITE".equalsIgnoreCase(sporteasy)) {
return !lic.isRenouvellement() && !Boolean.TRUE.equals(lic.getSportEasyEmailSent());
} else if ("INVITE".equalsIgnoreCase(sporteasy)) {
return !lic.isRenouvellement() && Boolean.TRUE.equals(lic.getSportEasyEmailSent());
} else if ("RENOUVELLEMENT".equalsIgnoreCase(sporteasy)) {
return lic.isRenouvellement();
}
return true;
}).collect(java.util.stream.Collectors.toList());
model.addAttribute("sporteasyFilter", sporteasy.trim());
}
// 3. Sort // 3. Sort
java.util.Comparator<Adherent> comparator = (a1, a2) -> 0; java.util.Comparator<Adherent> comparator = (a1, a2) -> 0;
@@ -284,4 +302,57 @@ public class AdherentController {
adherentRepository.delete(adherent); adherentRepository.delete(adherent);
return "redirect:/adherents"; return "redirect:/adherents";
} }
@org.springframework.web.bind.annotation.PostMapping("/{id}/sporteasy-invite")
public String sendSportEasyInvite(
@org.springframework.web.bind.annotation.PathVariable Long id,
@org.springframework.web.bind.annotation.RequestParam(required = false, defaultValue = "false") boolean force,
org.springframework.web.servlet.mvc.support.RedirectAttributes redirectAttributes) {
Saison activeSaison = saisonRepository.findByEstActiveTrue().orElse(null);
if (activeSaison == null) {
redirectAttributes.addFlashAttribute("errorMessage", "Erreur : Aucune saison active trouvée.");
return "redirect:/adherents";
}
Licence licence = licenceRepository.findByAdherentIdAndSaison(id, activeSaison).orElse(null);
if (licence == null) {
redirectAttributes.addFlashAttribute("errorMessage", "Cet adhérent n'a pas de licence pour la saison active.");
return "redirect:/adherents";
}
if (licence.isRenouvellement()) {
redirectAttributes.addFlashAttribute("infoMessage", "Les invitations SportEasy sont réservées aux nouveaux adhérents (nouvelle licence).");
return "redirect:/adherents";
}
try {
boolean success = sportEasyEmailService.sendInvitationForLicence(licence.getId(), force);
if (success) {
redirectAttributes.addFlashAttribute("successMessage", "L'invitation SportEasy a été envoyée avec succès à l'adhérent.");
} else {
redirectAttributes.addFlashAttribute("infoMessage", "L'invitation SportEasy avait déjà été envoyée à cet adhérent.");
}
} catch (Exception e) {
redirectAttributes.addFlashAttribute("errorMessage", "Erreur lors de l'envoi de l'invitation : " + e.getMessage());
}
return "redirect:/adherents";
}
@org.springframework.web.bind.annotation.PostMapping("/sporteasy-invite-batch")
public String sendSportEasyInviteBatch(
@org.springframework.web.bind.annotation.RequestParam(required = false) Long categoryId,
org.springframework.web.servlet.mvc.support.RedirectAttributes redirectAttributes) {
try {
com.astalange.core.service.SportEasyEmailService.BatchSendResult result =
sportEasyEmailService.sendBatchInvitationsForActiveSaison(categoryId);
redirectAttributes.addFlashAttribute("successMessage", result.message());
} catch (Exception e) {
redirectAttributes.addFlashAttribute("errorMessage", "Erreur lors de l'envoi des invitations SportEasy : " + e.getMessage());
}
return "redirect:/adherents";
}
} }
@@ -17,9 +17,21 @@ spring:
enabled: true enabled: true
locations: classpath:db/migration locations: classpath:db/migration
validate-on-migrate: false validate-on-migrate: false
mail:
host: ${SPRING_MAIL_HOST:localhost}
port: ${SPRING_MAIL_PORT:1025}
properties:
mail:
smtp:
auth: false
starttls:
enable: false
server: server:
port: 8080 port: 8080
app: app:
version: @project.version@ version: @project.version@
sporteasy:
base-url: https://www.sporteasy.net/join/
@@ -29,9 +29,28 @@
<div class="flex-1 overflow-auto p-6"> <div class="flex-1 overflow-auto p-6">
<div class="flex justify-between items-center mb-6"> <div class="flex justify-between items-center mb-6">
<h3 class="text-xl font-bold text-gray-900">Liste des Adhérents</h3> <h3 class="text-xl font-bold text-gray-900">Liste des Adhérents</h3>
<a th:href="@{/adherents/new}" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700 transition-colors inline-block"> <div class="flex items-center space-x-3">
+ Nouvel Adhérent <form th:action="@{/adherents/sporteasy-invite-batch}" method="post" onsubmit="return confirm('Envoyer les invitations SportEasy à tous les adhérents non invités de la saison active ?');">
</a> <button type="submit" class="bg-indigo-50 text-indigo-700 hover:bg-indigo-100 border border-indigo-200 px-4 py-2 rounded-lg text-sm font-medium transition-colors flex items-center space-x-1.5 shadow-2xs">
<svg class="w-4 h-4 text-indigo-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"></path></svg>
<span>Inviter sur SportEasy</span>
</button>
</form>
<a th:href="@{/adherents/new}" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700 transition-colors inline-block">
+ Nouvel Adhérent
</a>
</div>
</div>
<!-- Messages d'information -->
<div th:if="${successMessage}" class="mb-4 p-4 bg-green-50 border-l-4 border-green-500 rounded-lg text-sm text-green-800 font-medium">
<span th:text="${successMessage}"></span>
</div>
<div th:if="${errorMessage}" class="mb-4 p-4 bg-red-50 border-l-4 border-red-500 rounded-lg text-sm text-red-800 font-medium">
<span th:text="${errorMessage}"></span>
</div>
<div th:if="${infoMessage}" class="mb-4 p-4 bg-blue-50 border-l-4 border-blue-500 rounded-lg text-sm text-blue-800 font-medium">
<span th:text="${infoMessage}"></span>
</div> </div>
<!-- Table Container with Wrapper-level HTMX triggers for filters --> <!-- Table Container with Wrapper-level HTMX triggers for filters -->
@@ -109,6 +128,7 @@
</div> </div>
</th> </th>
<th class="py-3 px-6 font-medium text-center">Paiement</th> <th class="py-3 px-6 font-medium text-center">Paiement</th>
<th class="py-3 px-4 font-medium text-center">SportEasy</th>
<th class="py-3 px-6 font-medium text-right">Actions</th> <th class="py-3 px-6 font-medium text-right">Actions</th>
</tr> </tr>
<!-- Filter Row --> <!-- Filter Row -->
@@ -141,12 +161,20 @@
<option value="AUCUNE" th:selected="${paiementFilter == 'AUCUNE'}">Aucune licence</option> <option value="AUCUNE" th:selected="${paiementFilter == 'AUCUNE'}">Aucune licence</option>
</select> </select>
</td> </td>
<td class="py-2 px-3">
<select id="filterSportEasy" name="sporteasy" 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>
<option value="NON_INVITE" th:selected="${sporteasyFilter == 'NON_INVITE'}">Non invité</option>
<option value="INVITE" th:selected="${sporteasyFilter == 'INVITE'}">Invité</option>
<option value="RENOUVELLEMENT" th:selected="${sporteasyFilter == 'RENOUVELLEMENT'}">Renouvellement</option>
</select>
</td>
<td class="py-2 px-3"></td> <td class="py-2 px-3"></td>
</tr> </tr>
</thead> </thead>
<tbody class="divide-y divide-gray-200 text-sm"> <tbody class="divide-y divide-gray-200 text-sm">
<tr th:if="${#lists.isEmpty(adherents)}"> <tr th:if="${#lists.isEmpty(adherents)}">
<td colspan="7" class="py-8 text-center text-gray-500">Aucun adhérent enregistré.</td> <td colspan="8" class="py-8 text-center text-gray-500">Aucun adhérent enregistré.</td>
</tr> </tr>
<tr th:each="adherent : ${adherents}" class="hover:bg-gray-50 transition-colors adherent-row"> <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"> <td class="py-4 px-6 font-medium text-gray-900">
@@ -193,6 +221,37 @@
</div> </div>
</div> </div>
</td> </td>
<!-- SportEasy Status Column -->
<td class="py-3 px-4 text-center">
<div th:if="${adherent.getLicenceActuelle() != null}">
<div th:if="${adherent.getLicenceActuelle().isRenouvellement()}" class="text-xs text-gray-400 italic">
Renouvellement
</div>
<div th:unless="${adherent.getLicenceActuelle().isRenouvellement()}">
<div th:if="${adherent.getLicenceActuelle().getSportEasyEmailSent()}" class="flex flex-col items-center space-y-1">
<span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-semibold bg-emerald-100 text-emerald-800 border border-emerald-200"
th:title="${adherent.getLicenceActuelle().getSportEasyEmailSentAt() != null ? 'Envoyé le ' + #temporals.format(adherent.getLicenceActuelle().getSportEasyEmailSentAt(), 'dd/MM/yyyy HH:mm') : 'Invité'}">
🟢 Invité
</span>
<form th:action="@{/adherents/{id}/sporteasy-invite(id=${adherent.id})}" method="post">
<input type="hidden" name="force" value="true" />
<button type="submit" class="text-[10px] text-gray-500 hover:text-blue-600 underline">Renvoyer</button>
</form>
</div>
<div th:if="${!adherent.getLicenceActuelle().getSportEasyEmailSent()}" class="flex flex-col items-center space-y-1">
<span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-600 border border-gray-200">
⚪ Non invité
</span>
<form th:action="@{/adherents/{id}/sporteasy-invite(id=${adherent.id})}" method="post">
<button type="submit" class="text-xs font-medium text-indigo-600 hover:text-indigo-800 bg-indigo-50 hover:bg-indigo-100 px-2.5 py-1 rounded-md border border-indigo-200 transition-colors">Inviter</button>
</form>
</div>
</div>
</div>
<div th:if="${adherent.getLicenceActuelle() == null}" class="text-xs text-gray-400 italic">
-
</div>
</td>
<td class="py-4 px-6 text-right flex justify-end space-x-3 items-center"> <td class="py-4 px-6 text-right flex justify-end space-x-3 items-center">
<a th:href="@{/adherents/{id}/edit(id=${adherent.id})}" class="text-indigo-600 hover:text-indigo-900 font-medium bg-indigo-50 px-3 py-1 rounded-lg">Voir / Modifier</a> <a th:href="@{/adherents/{id}/edit(id=${adherent.id})}" class="text-indigo-600 hover:text-indigo-900 font-medium bg-indigo-50 px-3 py-1 rounded-lg">Voir / Modifier</a>
<form th:action="@{/adherents/{id}/delete(id=${adherent.id})}" method="post" onsubmit="return confirm('Supprimer cet adhérent ?');"> <form th:action="@{/adherents/{id}/delete(id=${adherent.id})}" method="post" onsubmit="return confirm('Supprimer cet adhérent ?');">
@@ -64,6 +64,13 @@
</div> </div>
</div> </div>
<div>
<label for="sportEasyToken" class="block text-sm font-medium text-gray-700 mb-1">Token ou Lien d'invitation SportEasy</label>
<input type="text" id="sportEasyToken" th:field="*{sportEasyToken}" placeholder="ex: https://www.sporteasy.net/join/ABC1234 ou juste ABC1234"
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">
<p class="text-xs text-gray-500 mt-1">Saisissez le token du groupe SportEasy ou l'URL complète d'invitation.</p>
</div>
<div class="pt-4 border-t border-gray-100"> <div class="pt-4 border-t border-gray-100">
<label class="block text-sm font-medium text-gray-700 mb-2">Équipements liés à la catégorie</label> <label class="block text-sm font-medium text-gray-700 mb-2">Équipements liés à la catégorie</label>
+13 -2
View File
@@ -24,6 +24,14 @@ services:
- db - db
restart: always restart: always
mailpit:
image: axllent/mailpit
container_name: astalange_mailpit
ports:
- "1025:1025"
- "8025:8025"
restart: always
app: app:
build: build:
context: . context: .
@@ -35,10 +43,13 @@ services:
- SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/astalange - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/astalange
- SPRING_DATASOURCE_USERNAME=${POSTGRES_USER:-myuser} - SPRING_DATASOURCE_USERNAME=${POSTGRES_USER:-myuser}
- SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD:-mypassword} - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD:-mypassword}
- CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY} - SPRING_MAIL_HOST=mailpit
- CAPTCHA_SECRET=${CAPTCHA_SECRET} - SPRING_MAIL_PORT=1025
- CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-}
- CAPTCHA_SECRET=${CAPTCHA_SECRET:-}
depends_on: depends_on:
- db - db
- mailpit
restart: always restart: always
volumes: volumes: