ucef/as-talange
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(licence): corriger l'évaluation SpEL Thymeleaf et finaliser la réduction éducateur
AS Talange CI/CD Pipeline / Build & Run Unit Tests (push) Successful in 5m8s
Details
AS Talange CI/CD Pipeline / Deploy to Test Environment (push) Successful in 6m47s
Details

Browse Source
This commit is contained in:
ucef
2026-08-07 12:11:06 +02:00
parent 5875a66c3d
commit 14730e667f
6 changed files with 242 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
as-talange-web/src/main/java/com/astalange/web/controller/LicenceController.java
+13 -3
View File
@@ -50,7 +50,9 @@ public class LicenceController {
@RequestParam(required = false) String typeDemande,
@RequestParam(required = false) String typeLicence,
@RequestParam(required = false) String commentaire,
@RequestParam(required = false) Long equipeId) {
@RequestParam(required = false) Long equipeId,
@RequestParam(required = false, defaultValue = "false") Boolean reductionEducateur,
@RequestParam(required = false, defaultValue = "100") Integer pourcentageReductionEducateur) {
Adherent adherent = adherentRepository.findById(id)
.orElseThrow(() -> new IllegalArgumentException("Invalid Adherent ID"));
@@ -75,6 +77,8 @@ public class LicenceController {
licence.setTypeDemande(typeDemande);
licence.setTypeLicence(typeLicence);
licence.setCommentaire(commentaire);
licence.setReductionEducateur(Boolean.TRUE.equals(reductionEducateur));
licence.setPourcentageReductionEducateur(pourcentageReductionEducateur != null ? pourcentageReductionEducateur : 100);
if (equipeId != null) {
Equipe equipe = equipeRepository.findById(equipeId)
@@ -100,7 +104,9 @@ public class LicenceController {
@RequestParam(required = false) String typeDemande,
@RequestParam(required = false) String typeLicence,
@RequestParam(required = false) String commentaire,
@RequestParam(required = false) Long equipeId) {
@RequestParam(required = false) Long equipeId,
@RequestParam(required = false, defaultValue = "false") Boolean reductionEducateur,
@RequestParam(required = false, defaultValue = "100") Integer pourcentageReductionEducateur) {
Licence licence = licenceRepository.findById(licenceId)
.orElseThrow(() -> new IllegalArgumentException("Invalid Licence ID"));
@@ -114,6 +120,8 @@ public class LicenceController {
licence.setTypeDemande(typeDemande);
licence.setTypeLicence(typeLicence);
licence.setCommentaire(commentaire);
licence.setReductionEducateur(Boolean.TRUE.equals(reductionEducateur));
licence.setPourcentageReductionEducateur(pourcentageReductionEducateur != null ? pourcentageReductionEducateur : 100);
if (equipeId != null) {
Equipe equipe = equipeRepository.findById(equipeId)
@@ -189,7 +197,7 @@ public class LicenceController {
StringBuilder sb = new StringBuilder();
sb.append('\ufeff');
sb.append("Nom;Prénom;Catégorie;N° Licence;Email;Type de Demande;Saison;Etat\n");
sb.append("Nom;Prénom;Catégorie;N° Licence;Email;Type de Demande;Réduction Éducateur;Saison;Etat\n");
for (Licence l : licences) {
String n = l.getAdherent() != null && l.getAdherent().getNom() != null ? l.getAdherent().getNom() : "";
@@ -198,6 +206,7 @@ public class LicenceController {
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 red = Boolean.TRUE.equals(l.getReductionEducateur()) ? ("-" + l.getPourcentageReductionEducateur() + "%") : "Non";
String s = l.getSaison() != null ? l.getSaison().getNom() : "";
String etat = l.getEtat() != null ? l.getEtat() : "";
@@ -207,6 +216,7 @@ public class LicenceController {
.append(escapeCsv(num)).append(";")
.append(escapeCsv(e)).append(";")
.append(escapeCsv(td)).append(";")
.append(escapeCsv(red)).append(";")
.append(escapeCsv(s)).append(";")
.append(escapeCsv(etat)).append("\n");
}