Compare commits
5
Commits
af31766134
...
prod/v1.5
| Author | SHA1 | Date | |
|---|---|---|---|
 ucef
|
d7b62ddf15 | ||
|
ucef
|
a577e91e94 | ||
|
ucef
|
8ca20c9a4f | ||
|
ucef
|
92c9e80bc3 | ||
|
ucef
|
c94f89997f |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>as-talange-parent</artifactId>
|
||||
<groupId>com.astalange</groupId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
<version>1.5</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>as-talange-parent</artifactId>
|
||||
<groupId>com.astalange</groupId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
<version>1.5</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -123,6 +123,26 @@ public class CategorieService {
|
||||
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;
|
||||
for (Dotation d : currentDotations) {
|
||||
if (ce.getEquipement().getId().equals(d.getEquipement().getId())) {
|
||||
@@ -130,6 +150,9 @@ public class CategorieService {
|
||||
if (Boolean.TRUE.equals(ce.getObligatoire()) && !Boolean.TRUE.equals(d.getChoisi())) {
|
||||
d.setChoisi(true);
|
||||
}
|
||||
if ((d.getTaille() == null || d.getTaille().trim().isEmpty()) && !matchedTaille.isEmpty()) {
|
||||
d.setTaille(matchedTaille);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -146,7 +169,7 @@ public class CategorieService {
|
||||
}
|
||||
newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelle)); // Checked if obligatoire or if it's a new registration
|
||||
newDotation.setFourni(false);
|
||||
newDotation.setTaille("");
|
||||
newDotation.setTaille(matchedTaille);
|
||||
newDotation.setNumero("");
|
||||
if (licence.getAdherent() != null) {
|
||||
String defaultFlocage = "";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>as-talange-parent</artifactId>
|
||||
<groupId>com.astalange</groupId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
<version>1.5</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
+46
-2
@@ -33,34 +33,78 @@ public class EquipementController {
|
||||
|
||||
@GetMapping("/new")
|
||||
public String showCreateForm(Model model) {
|
||||
if (!model.containsAttribute("equipement")) {
|
||||
model.addAttribute("equipement", new Equipement());
|
||||
}
|
||||
return "parametrage/equipements_form";
|
||||
}
|
||||
|
||||
@GetMapping("/{id}/edit")
|
||||
public String showEditForm(@PathVariable Long id, Model model) {
|
||||
if (!model.containsAttribute("equipement")) {
|
||||
Equipement equipement = equipementRepository.findById(id)
|
||||
.orElseThrow(() -> new IllegalArgumentException("Invalid equipment ID: " + id));
|
||||
model.addAttribute("equipement", equipement);
|
||||
}
|
||||
return "parametrage/equipements_form";
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public String saveEquipement(@ModelAttribute("equipement") Equipement equipement) {
|
||||
public String saveEquipement(@ModelAttribute("equipement") Equipement equipement,
|
||||
org.springframework.web.servlet.mvc.support.RedirectAttributes redirectAttributes) {
|
||||
|
||||
Saison activeSaison;
|
||||
if (equipement.getId() == null) {
|
||||
Saison activeSaison = saisonRepository.findByEstActiveTrue()
|
||||
activeSaison = saisonRepository.findByEstActiveTrue()
|
||||
.orElseThrow(() -> new IllegalStateException("Aucune saison active trouvée"));
|
||||
equipement.setSaison(activeSaison);
|
||||
} else {
|
||||
Equipement existing = equipementRepository.findById(equipement.getId())
|
||||
.orElseThrow(() -> new IllegalArgumentException("Invalid equipment ID: " + equipement.getId()));
|
||||
equipement.setSaison(existing.getSaison());
|
||||
activeSaison = existing.getSaison();
|
||||
}
|
||||
|
||||
if (activeSaison != null) {
|
||||
for (Equipement e : equipementRepository.findBySaison(activeSaison)) {
|
||||
if (e.getNom().equalsIgnoreCase(equipement.getNom()) && (equipement.getId() == null || !e.getId().equals(equipement.getId()))) {
|
||||
redirectAttributes.addFlashAttribute("errorMessage", "Erreur : L'équipement '" + equipement.getNom() + "' existe déjà pour cette saison.");
|
||||
redirectAttributes.addFlashAttribute("equipement", equipement);
|
||||
return equipement.getId() == null ? "redirect:/equipements/new" : "redirect:/equipements/" + equipement.getId() + "/edit";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
equipementRepository.save(equipement);
|
||||
return "redirect:/equipements";
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/duplicate")
|
||||
public String duplicateEquipement(@PathVariable Long id) {
|
||||
Equipement existing = equipementRepository.findById(id)
|
||||
.orElseThrow(() -> new IllegalArgumentException("Invalid equipment ID: " + id));
|
||||
|
||||
Equipement duplicated = new Equipement();
|
||||
String newNom = existing.getNom() + " (dupliqué)";
|
||||
if (newNom.length() > 100) {
|
||||
newNom = newNom.substring(0, 100);
|
||||
}
|
||||
duplicated.setNom(newNom);
|
||||
duplicated.setReference(existing.getReference());
|
||||
duplicated.setDescription(existing.getDescription());
|
||||
duplicated.setGestionSexe(existing.isGestionSexe());
|
||||
duplicated.setTypePublic(existing.getTypePublic());
|
||||
duplicated.setTaillesDisponibles(existing.getTaillesDisponibles());
|
||||
duplicated.setCouleursDisponibles(existing.getCouleursDisponibles());
|
||||
duplicated.setHasFlocagePrenom(existing.isHasFlocagePrenom());
|
||||
duplicated.setHasFlocageInitiales(existing.isHasFlocageInitiales());
|
||||
duplicated.setHasFlocageNumero(existing.isHasFlocageNumero());
|
||||
duplicated.setSaison(existing.getSaison());
|
||||
|
||||
equipementRepository.save(duplicated);
|
||||
return "redirect:/equipements";
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/delete")
|
||||
public String deleteEquipement(@PathVariable Long id) {
|
||||
Equipement equipement = equipementRepository.findById(id)
|
||||
|
||||
+3
-4
@@ -110,10 +110,9 @@ public class PublicInscriptionController {
|
||||
"5/6ANS (Taille 116cm)", "7/8ANS (Taille 128cm)", "9/10ANS (Taille 140cm)",
|
||||
"11/12ANS (Taille 152cm)", "13/14ANS (Taille 164cm)", "XS", "S", "M", "L", "XL", "XXL"
|
||||
));
|
||||
Set<String> pointures = new java.util.LinkedHashSet<>();
|
||||
for (int i = 25; i <= 50; i++) {
|
||||
pointures.add(String.valueOf(i));
|
||||
}
|
||||
Set<String> pointures = new java.util.LinkedHashSet<>(java.util.Arrays.asList(
|
||||
"27/30 (Taille 0)", "31/34 (Taille 1)", "35/38 (Taille 2)", "39/42 (Taille 3)", "43/46 (Taille 4)"
|
||||
));
|
||||
model.addAttribute("taillesDisponibles", tailles);
|
||||
model.addAttribute("pointuresDisponibles", pointures);
|
||||
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
hx-target="#paiements-table-container"
|
||||
hx-select="#paiements-table-container"
|
||||
hx-include="#filter-form"
|
||||
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>
|
||||
@@ -157,7 +157,7 @@
|
||||
hx-target="#paiements-table-container"
|
||||
hx-select="#paiements-table-container"
|
||||
hx-include="#filter-form"
|
||||
th:attr="hx-vals=|{'page': ${pageNum}}|"
|
||||
th:attr="hx-vals=|{"page": ${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'}">
|
||||
@@ -172,7 +172,7 @@
|
||||
hx-target="#paiements-table-container"
|
||||
hx-select="#paiements-table-container"
|
||||
hx-include="#filter-form"
|
||||
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">
|
||||
Suivant
|
||||
</button>
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
|
||||
<div class="flex-1 overflow-auto p-6">
|
||||
<div class="max-w-xl mx-auto bg-white rounded-xl shadow-sm border border-gray-100 p-8">
|
||||
<div th:if="${errorMessage}" class="bg-red-50 border-l-4 border-red-500 p-4 mb-6">
|
||||
<p class="text-sm text-red-700" th:text="${errorMessage}"></p>
|
||||
</div>
|
||||
<form th:action="@{/equipements}" th:object="${equipement}" method="post" class="space-y-6">
|
||||
<input type="hidden" th:field="*{id}" />
|
||||
|
||||
|
||||
@@ -44,6 +44,9 @@
|
||||
<td class="py-4 px-6 text-gray-600" th:text="${equip.description != null ? equip.description : '-'}">Maillot de match officiel</td>
|
||||
<td class="py-4 px-6 text-right flex justify-end space-x-3 items-center">
|
||||
<a th:href="@{/equipements/{id}/edit(id=${equip.id})}" class="text-indigo-600 hover:text-indigo-900 font-medium bg-indigo-50 px-3 py-1 rounded-lg">Modifier</a>
|
||||
<form th:action="@{/equipements/{id}/duplicate(id=${equip.id})}" method="post">
|
||||
<button type="submit" class="text-green-600 hover:text-green-800 font-medium bg-green-50 px-3 py-1 rounded-lg">Dupliquer</button>
|
||||
</form>
|
||||
<form th:action="@{/equipements/{id}/delete(id=${equip.id})}" method="post" onsubmit="return confirm('Supprimer cet équipement ? Cela supprimera également les dotations associées de toutes les licences.');">
|
||||
<button type="submit" class="text-red-600 hover:text-red-800 font-medium">Supprimer</button>
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user