1 Commits
Author SHA1 Message Date
ucef a19e49392b chore: bump version to 1.6-SNAPSHOT
AS Talange CI/CD Pipeline / Deploy to Test Environment (push) Successful in 5m50s
AS Talange CI/CD Pipeline / Build & Run Unit Tests (push) Successful in 3m57s
2026-07-08 02:50:26 +02:00
6 changed files with 8 additions and 31 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>as-talange-parent</artifactId> <artifactId>as-talange-parent</artifactId>
<groupId>com.astalange</groupId> <groupId>com.astalange</groupId>
<version>1.5</version> <version>1.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>as-talange-parent</artifactId> <artifactId>as-talange-parent</artifactId>
<groupId>com.astalange</groupId> <groupId>com.astalange</groupId>
<version>1.5</version> <version>1.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -123,26 +123,6 @@ public class CategorieService {
continue; continue;
} }
String matchedTaille = "";
if (licence.getAdherent() != null) {
String taillesDispo = ce.getEquipement().getTaillesDisponibles();
if (taillesDispo != null && !taillesDispo.trim().isEmpty()) {
String[] dispos = taillesDispo.split(",");
String tv = licence.getAdherent().getTailleVetement();
String pt = licence.getAdherent().getPointure();
for (String t : dispos) {
String trimmed = t.trim();
if (tv != null && !tv.trim().isEmpty() && trimmed.equalsIgnoreCase(tv.trim())) {
matchedTaille = tv.trim();
break;
} else if (pt != null && !pt.trim().isEmpty() && trimmed.equalsIgnoreCase(pt.trim())) {
matchedTaille = pt.trim();
break;
}
}
}
}
boolean found = false; boolean found = false;
for (Dotation d : currentDotations) { for (Dotation d : currentDotations) {
if (ce.getEquipement().getId().equals(d.getEquipement().getId())) { if (ce.getEquipement().getId().equals(d.getEquipement().getId())) {
@@ -150,9 +130,6 @@ public class CategorieService {
if (Boolean.TRUE.equals(ce.getObligatoire()) && !Boolean.TRUE.equals(d.getChoisi())) { if (Boolean.TRUE.equals(ce.getObligatoire()) && !Boolean.TRUE.equals(d.getChoisi())) {
d.setChoisi(true); d.setChoisi(true);
} }
if ((d.getTaille() == null || d.getTaille().trim().isEmpty()) && !matchedTaille.isEmpty()) {
d.setTaille(matchedTaille);
}
break; break;
} }
} }
@@ -169,7 +146,7 @@ public class CategorieService {
} }
newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelle)); // Checked if obligatoire or if it's a new registration newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelle)); // Checked if obligatoire or if it's a new registration
newDotation.setFourni(false); newDotation.setFourni(false);
newDotation.setTaille(matchedTaille); newDotation.setTaille("");
newDotation.setNumero(""); newDotation.setNumero("");
if (licence.getAdherent() != null) { if (licence.getAdherent() != null) {
String defaultFlocage = ""; String defaultFlocage = "";
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>as-talange-parent</artifactId> <artifactId>as-talange-parent</artifactId>
<groupId>com.astalange</groupId> <groupId>com.astalange</groupId>
<version>1.5</version> <version>1.6-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -142,7 +142,7 @@
hx-target="#paiements-table-container" hx-target="#paiements-table-container"
hx-select="#paiements-table-container" hx-select="#paiements-table-container"
hx-include="#filter-form" hx-include="#filter-form"
th:attr="hx-vals=|{&quot;page&quot;: ${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"> class="px-3 py-1 border border-gray-300 rounded hover:bg-gray-100 transition-colors">
Précédent Précédent
</button> </button>
@@ -157,7 +157,7 @@
hx-target="#paiements-table-container" hx-target="#paiements-table-container"
hx-select="#paiements-table-container" hx-select="#paiements-table-container"
hx-include="#filter-form" hx-include="#filter-form"
th:attr="hx-vals=|{&quot;page&quot;: ${pageNum}}|" th:attr="hx-vals=|{'page': ${pageNum}}|"
th:text="${pageNum + 1}" th:text="${pageNum + 1}"
class="px-3 py-1 rounded transition-colors" 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'}"> th:classappend="${currentPage == pageNum ? 'bg-blue-600 text-white' : 'border border-gray-300 hover:bg-gray-100'}">
@@ -172,7 +172,7 @@
hx-target="#paiements-table-container" hx-target="#paiements-table-container"
hx-select="#paiements-table-container" hx-select="#paiements-table-container"
hx-include="#filter-form" hx-include="#filter-form"
th:attr="hx-vals=|{&quot;page&quot;: ${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"> class="px-3 py-1 border border-gray-300 rounded hover:bg-gray-100 transition-colors">
Suivant Suivant
</button> </button>
+1 -1
View File
@@ -13,7 +13,7 @@
<groupId>com.astalange</groupId> <groupId>com.astalange</groupId>
<artifactId>as-talange-parent</artifactId> <artifactId>as-talange-parent</artifactId>
<version>1.5</version> <version>1.6-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>as-talange-parent</name> <name>as-talange-parent</name>