2 Commits

Author SHA1 Message Date
ucef f641ccc519 feat: add search filters to categories and equipements lists
AS Talange CI/CD Pipeline - Production / Build & Run Unit Tests (push) Successful in 1m45s
AS Talange CI/CD Pipeline - Production / Deploy to Prod Environment (push) Successful in 2m42s
2026-06-30 15:11:16 +02:00
ucef 6ea00db0dc fix: apply maillot price and default selection for all new registrations
AS Talange CI/CD Pipeline - Production / Build & Run Unit Tests (push) Successful in 1m46s
AS Talange CI/CD Pipeline - Production / Deploy to Prod Environment (push) Successful in 2m38s
2026-06-30 14:42:59 +02:00
4 changed files with 42 additions and 17 deletions
@@ -138,14 +138,13 @@ public class CategorieService {
newDotation.setLicence(licence); newDotation.setLicence(licence);
newDotation.setEquipement(ce.getEquipement()); newDotation.setEquipement(ce.getEquipement());
boolean isMaillot = "Maillot".equalsIgnoreCase(ce.getEquipement().getNom()); boolean isMaillot = "Maillot".equalsIgnoreCase(ce.getEquipement().getNom());
boolean isNouvelleAndU11 = false; boolean isNouvelle = false;
if (licence.getTypeDemande() != null && if (licence.getTypeDemande() != null &&
(licence.getTypeDemande().equalsIgnoreCase("Nouvelle demande") || licence.getTypeDemande().equalsIgnoreCase("NOUVELLE")) && (licence.getTypeDemande().equalsIgnoreCase("Nouvelle demande") || licence.getTypeDemande().equalsIgnoreCase("NOUVELLE")) &&
licence.getCategorie() != null && licence.getCategorie() != null) {
licence.getCategorie().isU11OrBelow()) { isNouvelle = true;
isNouvelleAndU11 = 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.setFourni(false);
newDotation.setTaille(""); newDotation.setTaille("");
newDotation.setNumero(""); newDotation.setNumero("");
@@ -133,9 +133,9 @@ public class PublicInscriptionController {
if (!categories.isEmpty()) { if (!categories.isEmpty()) {
Categorie cat = categories.get(0); Categorie cat = categories.get(0);
if (cat.getTarifBase() != null) { if (cat.getTarifBase() != null) {
BigDecimal prixMaillot = BigDecimal.ZERO; BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
if (cat.isU11OrBelow()) { if (prixMaillot == null) {
prixMaillot = cat.getEquipementPrixByNom("Maillot"); prixMaillot = BigDecimal.ZERO;
} }
BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot); BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
tarifStr = tarifTotal.intValue() + ""; tarifStr = tarifTotal.intValue() + "";
@@ -175,9 +175,9 @@ public class PublicInscriptionController {
Categorie cat = categories.get(0); Categorie cat = categories.get(0);
if (cat.getTarifBase() != null) { if (cat.getTarifBase() != null) {
BigDecimal prixMaillot = BigDecimal.ZERO; BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
if (cat.isU11OrBelow()) { if (prixMaillot == null) {
prixMaillot = cat.getEquipementPrixByNom("Maillot"); prixMaillot = BigDecimal.ZERO;
} }
BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot); BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
return tarifTotal.intValue() + ""; return tarifTotal.intValue() + "";
@@ -20,9 +20,12 @@
<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 Catégories</h3> <h3 class="text-xl font-bold text-gray-900">Liste des Catégories</h3>
<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"> <div class="flex items-center space-x-4">
+ Nouvelle Catégorie <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> <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>
<div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden"> <div class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
@@ -64,5 +67,15 @@
</div> </div>
</div> </div>
</main> </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> </body>
</html> </html>
@@ -20,9 +20,12 @@
<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 Équipements</h3> <h3 class="text-xl font-bold text-gray-900">Liste des Équipements</h3>
<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"> <div class="flex items-center space-x-4">
+ Nouvel Équipement <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> <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> </div>
<table class="w-full text-left border-collapse"> <table class="w-full text-left border-collapse">
<thead> <thead>
@@ -51,5 +54,15 @@
</div> </div>
</div> </div>
</main> </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> </body>
</html> </html>