Compare commits
3 Commits
prod/v1.4
...
d1f38f11f0
| Author | SHA1 | Date | |
|---|---|---|---|
 ucef
|
d1f38f11f0 | ||
|
ucef
|
acf9d6d301 | ||
|
ucef
|
3066ff0e86 |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>as-talange-parent</artifactId>
|
||||
<groupId>com.astalange</groupId>
|
||||
<version>1.4</version>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>as-talange-parent</artifactId>
|
||||
<groupId>com.astalange</groupId>
|
||||
<version>1.4</version>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -138,14 +138,13 @@ public class CategorieService {
|
||||
newDotation.setLicence(licence);
|
||||
newDotation.setEquipement(ce.getEquipement());
|
||||
boolean isMaillot = "Maillot".equalsIgnoreCase(ce.getEquipement().getNom());
|
||||
boolean isNouvelleAndU11 = false;
|
||||
boolean isNouvelle = false;
|
||||
if (licence.getTypeDemande() != null &&
|
||||
(licence.getTypeDemande().equalsIgnoreCase("Nouvelle demande") || licence.getTypeDemande().equalsIgnoreCase("NOUVELLE")) &&
|
||||
licence.getCategorie() != null &&
|
||||
licence.getCategorie().isU11OrBelow()) {
|
||||
isNouvelleAndU11 = true;
|
||||
licence.getCategorie() != null) {
|
||||
isNouvelle = 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.setTaille("");
|
||||
newDotation.setNumero("");
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>as-talange-parent</artifactId>
|
||||
<groupId>com.astalange</groupId>
|
||||
<version>1.4</version>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
+6
-6
@@ -133,9 +133,9 @@ public class PublicInscriptionController {
|
||||
if (!categories.isEmpty()) {
|
||||
Categorie cat = categories.get(0);
|
||||
if (cat.getTarifBase() != null) {
|
||||
BigDecimal prixMaillot = BigDecimal.ZERO;
|
||||
if (cat.isU11OrBelow()) {
|
||||
prixMaillot = cat.getEquipementPrixByNom("Maillot");
|
||||
BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
|
||||
if (prixMaillot == null) {
|
||||
prixMaillot = BigDecimal.ZERO;
|
||||
}
|
||||
BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
|
||||
tarifStr = tarifTotal.intValue() + " €";
|
||||
@@ -175,9 +175,9 @@ public class PublicInscriptionController {
|
||||
|
||||
Categorie cat = categories.get(0);
|
||||
if (cat.getTarifBase() != null) {
|
||||
BigDecimal prixMaillot = BigDecimal.ZERO;
|
||||
if (cat.isU11OrBelow()) {
|
||||
prixMaillot = cat.getEquipementPrixByNom("Maillot");
|
||||
BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
|
||||
if (prixMaillot == null) {
|
||||
prixMaillot = BigDecimal.ZERO;
|
||||
}
|
||||
BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
|
||||
return tarifTotal.intValue() + " €";
|
||||
|
||||
@@ -20,10 +20,13 @@
|
||||
<div class="flex-1 overflow-auto p-6">
|
||||
<div class="flex justify-between items-center mb-6">
|
||||
<h3 class="text-xl font-bold text-gray-900">Liste des Catégories</h3>
|
||||
<div class="flex items-center space-x-4">
|
||||
<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 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 class="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
|
||||
<div class="overflow-x-auto">
|
||||
@@ -64,5 +67,15 @@
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
</html>
|
||||
|
||||
@@ -20,10 +20,13 @@
|
||||
<div class="flex-1 overflow-auto p-6">
|
||||
<div class="flex justify-between items-center mb-6">
|
||||
<h3 class="text-xl font-bold text-gray-900">Liste des Équipements</h3>
|
||||
<div class="flex items-center space-x-4">
|
||||
<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 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>
|
||||
<table class="w-full text-left border-collapse">
|
||||
<thead>
|
||||
<tr class="bg-gray-50 text-gray-500 text-sm uppercase tracking-wider border-b border-gray-200">
|
||||
@@ -51,5 +54,15 @@
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user