Merge pull request 'dev' (#124) from dev into master

Reviewed-on: #124

src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java

@@ -122,7 +122,9 @@ public class LicenceService {
                                         .call(genLicenceNumberAndAccountIfNeed())
                                         : Uni.createFrom().nullItem()
                                 ))
-                        .call(licenceModel -> ls.logA(LogModel.ActionType.ADD, membreModel.getObjectName(),
+                        .call(licenceModel -> ls.logA(LogModel.ActionType.ADD,
+                                "%s (valid=%b, pay=%b, %s)" .formatted(membreModel.getObjectName(), model.isValidate(),
+                                        model.isPay(), model.getCertificate()),
                                 licenceModel));
             });
         } else {

src/main/java/fr/titionfire/ffsaf/domain/service/MembreService.java

@@ -184,11 +184,17 @@ public class MembreService {
 
         String finalSearch = search;
         return getLicenceListe(licenceRequest, payState)
-                .map(l -> l.stream().map(l2 -> l2.getMembre().getId()).toList())
+                .chain(l -> {
-                .chain(ids -> {
                     PanacheQuery<MembreModel> query;
-                    query = repository.find(queryStr, sort, finalSearch, ids, club).page(Page.ofSize(limit));
+                    query = repository.find(queryStr, sort, finalSearch,
-                    return getPageResult(query, limit, page);
+                            l.stream().map(l2 -> l2.getMembre().getId()).toList(), club).page(Page.ofSize(limit));
+                    return getPageResult(query, limit, page)
+                            .call(r -> (r.getResult().isEmpty() || !l.isEmpty() ?
+                                    Uni.createFrom().item(l) :
+                                    licenceRepository.list("saison = ?1 AND membre.id IN ?2", Utils.getSaison(),
+                                            r.getResult().stream().map(SimpleMembre::getId).toList()))
+                                    .invoke(l2 -> r.setAdditionalData(l2.stream().map(SimpleLicence::fromModel)))
+                            );
                 });
     }
 
@@ -210,7 +216,7 @@ public class MembreService {
     public Uni<List<SimpleMembreInOutData>> getAllExport(String subject) {
         return repository.find("userId = ?1", subject).firstResult()
                 .chain(membreModel -> repository.list("club = ?1", membreModel.getClub()))
-                .chain(membres -> licenceRepository.list("saison = ?1 AND membre IN ?2", Utils.getSaison(), membres)
+                .chain(membres -> licenceRepository.list("membre IN ?1", membres)
                         .map(l -> membres.stream().map(m -> SimpleMembreInOutData.fromModel(m, l)).toList()));
     }
 

src/main/java/fr/titionfire/ffsaf/domain/service/ResultService.java

@@ -58,6 +58,7 @@ public class ResultService {
     @Inject
     @CacheName("club-classement")
     Cache cacheClubClassement;
+    private static final HashMap<String, Long> cacheClubClassementExp = new HashMap<>();
 
     private static final HashMap<Long, String> combTempIds = new HashMap<>();
 
@@ -754,14 +755,10 @@ public class ResultService {
     public Uni<List<ClubClassement>> getAllClubArray(String uuid, boolean cache) {
         List<CardModel> cards = new java.util.ArrayList<>();
 
-        //noinspection unchecked
+        return (!cache || cacheClubClassementExp.getOrDefault(uuid, 0L) < System.currentTimeMillis() ?
-        cacheClubClassement.invalidateIf(
+                cacheClubClassement.invalidate(uuid).invoke(() -> cacheClubClassementExp.remove(uuid)) :
-                (p) -> ((Pair<Long, List<ClubClassement>>) p).getKey() > System.currentTimeMillis());
+                Uni.createFrom().voidItem()
-
+        ).chain(o -> cacheClubClassement.getAsync(uuid, k -> cardRepository.list("competition.uuid = ?1", uuid)
-        if (!cache)
-            cacheClubClassement.invalidate(uuid);
-
-        return cacheClubClassement.getAsync(uuid, k -> cardRepository.list("competition.uuid = ?1", uuid)
                 .invoke(__ -> System.out.println("Cache miss for club classement with uuid " + uuid))
                 .invoke(cards::addAll)
                 .chain(__ -> matchRepository.list("category.compet.uuid = ?1", uuid))
@@ -778,7 +775,8 @@ public class ResultService {
                             .map(entry -> {
                                 ResultCategoryData tmp = new ResultCategoryData();
 
-                                getArray2(entry.getValue().stream().map(m -> new MatchModelExtend(m, cards)).toList(),
+                                getArray2(entry.getValue().stream().map(m -> new MatchModelExtend(m, cards))
+                                                .toList(),
                                         null, tmp);
                                 getClassementArray(entry.getKey(), null, cards, tmp);
 
@@ -789,41 +787,36 @@ public class ResultService {
                 .map(categoryData -> {
                     HashMap<String, ClubClassement> clubMap = new HashMap<>();
 
-                    categoryData.forEach(c -> c.getClassement().stream().map(ResultCategoryData.ClassementData::comb)
+                    categoryData.forEach(
-                            .filter(Objects::nonNull)
+                            c -> c.getClassement().stream().map(ResultCategoryData.ClassementData::comb)
-                            .distinct()
+                                    .filter(Objects::nonNull)
-                            .map(comb -> {
+                                    .distinct()
-                                if (comb instanceof MembreModel membreModel2) {
+                                    .map(comb -> {
-                                    return (membreModel2.getClub() != null) ? membreModel2.getClub().getName() : "";
+                                        if (comb instanceof MembreModel membreModel2) {
-                                } else if (comb instanceof CompetitionGuestModel guestModel) {
+                                            return (membreModel2.getClub() != null) ? membreModel2.getClub()
-                                    return guestModel.getClub();
+                                                    .getName() : "";
-                                }
+                                        } else if (comb instanceof CompetitionGuestModel guestModel) {
-                                return "";
+                                            return guestModel.getClub();
-                            })
+                                        }
-                            .filter(s -> s != null && !s.isBlank() && !s.equals("Team"))
+                                        return "";
-                            .distinct()
+                                    })
-                            .forEach(clubName -> clubMap.putIfAbsent(clubName, new ClubClassement(clubName))));
+                                    .filter(s -> s != null && !s.isBlank() && !s.equals("Team"))
-
+                                    .distinct()
-                    System.out.println(clubMap.keySet());
+                                    .forEach(clubName -> clubMap.putIfAbsent(clubName,
+                                            new ClubClassement(clubName))));
 
                     categoryData.forEach(c -> c.getClassement().forEach(classementData -> {
-                        System.out.println("Classement data for " + c.getName() + ": " + classementData.name() + " - " +
-                                classementData.comb() + " - " + classementData.rank());
                         if (classementData.rank() > 3)
                             return;
 
-                        System.out.println(
-                                "Processing classement data for " + c.getName() + ": " + classementData.name());
-
                         if (classementData.comb() != null) {
                             String clubName = "";
                             if (classementData.comb() instanceof MembreModel membreModel2) {
-                                clubName = (membreModel2.getClub() != null) ? membreModel2.getClub().getName() : "";
+                                clubName = (membreModel2.getClub() != null) ? membreModel2.getClub()
+                                        .getName() : "";
                             } else if (classementData.comb() instanceof CompetitionGuestModel guestModel) {
                                 clubName = guestModel.getClub();
                             }
-                            System.out.println("-> " + clubName + "- " + (clubName != null && !clubName.isBlank()
-                                    && !clubName.equals("Team") && clubMap.containsKey(clubName)));
 
                             if (clubName != null && !clubName.isBlank()
                                     && !clubName.equals("Team") && clubMap.containsKey(clubName)) {
@@ -841,8 +834,8 @@ public class ResultService {
                                     .thenComparingInt(c -> c.score[2]).reversed())
                             .toList();
                 })
-                .map(l -> new Pair<>(System.currentTimeMillis() + 60 * 1000L, l))
+                .invoke(__ -> cacheClubClassementExp.put(uuid, System.currentTimeMillis() + 60 * 1000L))
-        ).map(Pair::getValue);
+        ));
     }
 
     @Data

src/main/java/fr/titionfire/ffsaf/rest/data/SimpleMembreInOutData.java

@@ -2,10 +2,14 @@ package fr.titionfire.ffsaf.rest.data;
 
 import fr.titionfire.ffsaf.data.model.LicenceModel;
 import fr.titionfire.ffsaf.data.model.MembreModel;
+import fr.titionfire.ffsaf.utils.Utils;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
@@ -24,7 +28,27 @@ public class SimpleMembreInOutData {
 
     public static SimpleMembreInOutData fromModel(MembreModel membreModel, List<LicenceModel> lc) {
         LicenceModel currentLicence = lc.stream().filter(l -> l.getMembre().getId().equals(membreModel.getId()))
-                .findFirst().orElse(null);
+                .max(Comparator.comparingInt(LicenceModel::getSaison)).orElse(null);
+
+        String certif = null;
+        if (currentLicence != null && currentLicence.getCertificate() != null) {
+            String[] strings = currentLicence.getCertificate().split("¤");
+            if (currentLicence.getSaison() == Utils.getSaison()) {
+                certif = currentLicence.getCertificate();
+            } else if (strings.length > 1) {
+                try {
+                    Date date = new SimpleDateFormat("yyyy-MM-dd").parse(strings[1]);
+                    Calendar max = Utils.getFirstDateOfSaison();
+                    max.add(Calendar.YEAR, -2);
+
+                    if (max.getTime().compareTo(date) < 0) {
+                        certif = currentLicence.getCertificate();
+                    }
+                } catch (Exception ignored) {
+                }
+            }
+
+        }
 
         return new SimpleMembreInOutData(
                 membreModel.getLicence(),
@@ -33,8 +57,8 @@ public class SimpleMembreInOutData {
                 membreModel.getEmail(),
                 membreModel.getGenre().str,
                 membreModel.getBirth_date(),
-                currentLicence != null,
+                currentLicence != null && currentLicence.getSaison() == Utils.getSaison(),
-                currentLicence == null ? null : currentLicence.getCertificate()
+                certif
         );
     }
 }

src/main/java/fr/titionfire/ffsaf/utils/PageResult.java

@@ -10,13 +10,14 @@ import java.util.List;
 @Data
 @RegisterForReflection
 public class PageResult<T> {
-    @Schema(description = "Le numéro de la page courante.", example = "1")
+    @Schema(description = "Le numéro de la page courante.", examples = "1")
     private int page;
-    @Schema(description = "Le nombre d'éléments par page.", example = "10")
+    @Schema(description = "Le nombre d'éléments par page.", examples = "10")
     private int page_size;
-    @Schema(description = "Le nombre total de pages.", example = "5")
+    @Schema(description = "Le nombre total de pages.", examples = "5")
     private int page_count;
-    @Schema(description = "Le nombre total d'éléments.", example = "47")
+    @Schema(description = "Le nombre total d'éléments.", examples = "47")
     private long result_count;
     private List<T> result = new ArrayList<>();
+    private Object additionalData;
 }

src/main/java/fr/titionfire/ffsaf/utils/Utils.java

@@ -119,6 +119,15 @@ public class Utils {
         }
     }
 
+    public static Calendar getFirstDateOfSaison() {
+        Calendar calendar = Calendar.getInstance();
+
+        calendar.set(getSaison(), Calendar.SEPTEMBER, 1, 0, 0, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        return calendar;
+    }
+
     public static Calendar toCalendar(Date date) {
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);

src/main/webapp/package.json

@@ -13,42 +13,42 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
-    "@fortawesome/fontawesome-svg-core": "^7.2.0",
+    "@fortawesome/fontawesome-svg-core": "^7.3.1",
-    "@fortawesome/free-brands-svg-icons": "^7.2.0",
+    "@fortawesome/free-brands-svg-icons": "^7.3.1",
-    "@fortawesome/free-regular-svg-icons": "^7.2.0",
+    "@fortawesome/free-regular-svg-icons": "^7.3.1",
-    "@fortawesome/free-solid-svg-icons": "^7.2.0",
+    "@fortawesome/free-solid-svg-icons": "^7.3.1",
-    "@fortawesome/react-fontawesome": "^3.2.0",
+    "@fortawesome/react-fontawesome": "^3.5.0",
-    "axios": "^1.13.6",
+    "axios": "1.18.0",
     "browser-image-compression": "^2.0.2",
-    "i18next": "^25.8.15",
+    "i18next": "^26.3.6",
     "i18next-browser-languagedetector": "^8.2.1",
-    "i18next-http-backend": "^3.0.2",
+    "i18next-http-backend": "^4.0.1",
-    "jspdf": "^4.2.0",
+    "jspdf": "4.2.1",
-    "jspdf-autotable": "^5.0.7",
+    "jspdf-autotable": "^5.0.8",
     "jszip": "^3.10.1",
     "leaflet": "^1.9.4",
-    "obs-websocket-js": "^5.0.7",
+    "obs-websocket-js": "^5.0.8",
-    "proj4": "^2.20.4",
+    "proj4": "^2.21.0",
-    "react": "^19.2.4",
+    "react": "^19.2.8",
-    "react-dom": "^19.2.4",
+    "react-dom": "^19.2.8",
-    "react-i18next": "^16.5.6",
+    "react-i18next": "^17.0.11",
-    "react-is": "^19.2.4",
+    "react-is": "^19.2.8",
     "react-leaflet": "^5.0.0",
     "react-loader-spinner": "^8.0.2",
-    "react-router-dom": "^7.13.1",
+    "react-router-dom": "^7.18.2",
-    "react-toastify": "^11.0.5",
+    "react-toastify": "^11.1.0",
-    "recharts": "^3.8.0",
+    "recharts": "^3.10.1",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
     "xlsx-js-style": "^1.2.0"
   },
   "devDependencies": {
-    "@types/react": "^19.2.14",
+    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.3",
+    "@types/react-dom": "^19.2.4",
-    "@vitejs/plugin-react": "^5.1.4",
+    "@vitejs/plugin-react": "^6.0.5",
-    "eslint": "^9.7.0",
+    "eslint": "^9.39.5",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
-    "eslint-plugin-react-refresh": "^0.5.2",
+    "eslint-plugin-react-refresh": "^0.5.3",
-    "vite": "^7.3.1"
+    "vite": "8.0.16"
   }
 }

src/main/webapp/src/pages/MemberList.jsx

@@ -23,8 +23,6 @@ export function MemberList({source}) {
     const {t} = useTranslation();
 
     const [memberData, setMemberData] = useState([]);
-    const [licenceData, setLicenceData] = useState([]);
-    const [showLicenceState, setShowLicenceState] = useState((sessionStorage.getItem("showLicenceState") || "false") === "true");
 
     const setFilter = (filter) => {
         navigate("#" + encodeURI(JSON.stringify(filter)))
@@ -37,7 +35,7 @@ export function MemberList({source}) {
         payment: 2,
         order: "",
         categorie: "",
-        archived: false,
+        archived: sessionStorage.getItem("showMembreArchived") || true,
         ...JSON.parse(decodeURI(hash.substring(1)) || "{}"),
     }
 
@@ -72,23 +70,11 @@ export function MemberList({source}) {
                 club: e.club,
                 categorie: e.categorie,
                 licence_number: e.licence,
-                licence: showLicenceState ? licenceData.find(licence => licence.membre === e.id) : null
+                licence: data.additionalData?.find(licence => licence.membre === e.id)
             })
         }
         setMemberData(data2);
-    }, [data, licenceData]);
+    }, [data]);
-
-    useEffect(() => {
-        sessionStorage.setItem("showLicenceState", showLicenceState);
-        if (!showLicenceState)
-            return;
-
-        toast.promise(
-            apiAxios.get(`/licence/current/${source}`), getToastMessage("membre.toast.licences.load"))
-            .then(data => {
-                setLicenceData(data.data);
-            });
-    }, [showLicenceState]);
 
     const search = (search) => {
         if (search === filter.search)
@@ -102,8 +88,8 @@ export function MemberList({source}) {
                 <div className="col-lg-9">
                     <SearchBar search={search} defaultValue={filter.search}/>
                     {data
-                        ? <MakeCentralPanel data={data} visibleMember={memberData} navigate={navigate} showLicenceState={showLicenceState}
+                        ? <MakeCentralPanel data={data} visibleMember={memberData} navigate={navigate} page={filter.page}
-                                            page={filter.page} setPage={e => setFilter({...filter, page: e})} source={source}/>
+                                            setPage={e => setFilter({...filter, page: e})} source={source}/>
                         : error
                             ? <AxiosError error={error}/>
                             : <Def/>
@@ -130,10 +116,11 @@ export function MemberList({source}) {
                     <div className="card mb-4">
                         <div className="card-header">{t('filtre')}</div>
                         <div className="card-body">
-                            <FiltreBar showLicenceState={showLicenceState}
+                            <FiltreBar showArchived={filter.archived}
-                                       setShowLicenceState={setShowLicenceState}
+                                       setShowArchived={e => {
-                                       showArchived={filter.archived}
+                                           setFilter({...filter, archived: e})
-                                       setShowArchived={e => setFilter({...filter, archived: e})}
+                                           sessionStorage.setItem("showMembreArchived", e);
+                                       }}
                                        clubFilter={filter.club}
                                        setClubFilter={e => setFilter({...filter, club: e})}
                                        source={source}
@@ -163,6 +150,7 @@ export function MemberList({source}) {
 
 function FileOutput() {
     const {t} = useTranslation();
+
     function formatColumnDate(worksheet, col) {
         const range = XLSX.utils.decode_range(worksheet['!ref'])
         // note: range.s.r + 1 skips the header row
@@ -181,6 +169,7 @@ function FileOutput() {
         toast.promise(
             apiAxios.get(`/member/club/export`), getToastMessage("membre.toast.licences.export"))
             .then(data => {
+                console.log(data)
                 const dataOut = []
                 for (const e of data.data) {
                     const tmp = {
@@ -354,7 +343,7 @@ function FileInput() {
     );
 }
 
-function MakeCentralPanel({data, visibleMember, navigate, showLicenceState, page, setPage, source}) {
+function MakeCentralPanel({data, visibleMember, navigate, page, setPage, source}) {
     const {t} = useTranslation();
 
     const pages = []
@@ -374,7 +363,7 @@ function MakeCentralPanel({data, visibleMember, navigate, showLicenceState, page
             })}</small>
             <div className="list-group">
                 {visibleMember.map(member => (
-                    <MakeRow key={member.id} member={member} navigate={navigate} showLicenceState={showLicenceState} source={source}/>))}
+                    <MakeRow key={member.id} member={member} navigate={navigate} source={source}/>))}
             </div>
         </div>
         <div className="mb-4">
@@ -391,11 +380,11 @@ function MakeCentralPanel({data, visibleMember, navigate, showLicenceState, page
     </>
 }
 
-function MakeRow({member, showLicenceState, navigate, source}) {
+function MakeRow({member, navigate, source}) {
     const rowContent = <>
         <div className="row" style={{padding: "0.6em 0"}}>
             <span className="col-auto">{(member.licence_number ? String(member.licence_number).padStart(5, '0') : "-------") + "   "}
-                {(showLicenceState && member.licence != null && member.licence.pay) ? <FontAwesomeIcon icon={faEuroSign}/> : <>&nbsp;&nbsp;</>}</span>
+                {(member.licence != null && member.licence.pay) ? <FontAwesomeIcon icon={faEuroSign}/> : <>&nbsp;&nbsp;</>}</span>
             <div className="ms-2 col-auto">
                 <div className="fw-bold">{member.fname} {member.lname}</div>
             </div>
@@ -411,7 +400,7 @@ function MakeRow({member, showLicenceState, navigate, source}) {
 
     </>
 
-    if (showLicenceState && member.licence != null) {
+    if (member.licence != null) {
         return <a className={"list-group-item d-flex justify-content-between align-items-start list-group-item-action list-group-item-"
             + (member.licence.validate ? "success" : (member.licence.certificate.length > 1 ? "warning" : "danger"))}
                   style={{padding: "0 1em"}}
@@ -509,8 +498,6 @@ function OrderBar({onOrderChange, defaultValues = "", source}) {
 }
 
 function FiltreBar({
-                       showLicenceState,
-                       setShowLicenceState,
                        showArchived,
                        setShowArchived,
                        clubFilter,
@@ -526,9 +513,6 @@ function FiltreBar({
     const {t} = useTranslation();
 
     return <div>
-        <div className="mb-3">
-            <Checkbox value={showLicenceState} onChange={setShowLicenceState} label={t('membre.filtre.licence')}/>
-        </div>
         <div className="mb-3">
             <Checkbox value={showArchived} onChange={setShowArchived} name="checkbox2" label={t('membre.filtre.inactif')}/>
         </div>

src/main/webapp/src/pages/admin/member/LicenceCard.jsx

@@ -4,7 +4,7 @@ import {useEffect, useReducer, useState} from "react";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {faEuroSign, faPen} from "@fortawesome/free-solid-svg-icons";
 import {AxiosError} from "../../../components/AxiosError.jsx";
-import {apiAxios, getSaison, getToastMessage} from "../../../utils/Tools.js";
+import {apiAxios, getFirstDateOfSaison, getSaison, getToastMessage} from "../../../utils/Tools.js";
 import {toast} from "react-toastify";
 import {useTranslation} from "react-i18next";
 
@@ -51,13 +51,34 @@ export function LicenceCard({userData}) {
         dispatch({type: 'SORT'})
     }, [data]);
 
+    const handleAsk = () => {
+        const currentLicence = licences[0];
+
+        let certif = undefined;
+        if (currentLicence != null && currentLicence.certificate != null) {
+            const strings = currentLicence.certificate.split('¤');
+            if (currentLicence.saison === getSaison()) {
+                certif = currentLicence.certificate;
+            } else if (strings.length > 1) {
+                const date = new Date(strings[1]);
+                const max = getFirstDateOfSaison();
+                max.setFullYear(max.getFullYear() - 2);
+
+                if (max < date) {
+                    certif = currentLicence.certificate;
+                }
+            }
+        }
+        setModal({id: -1, membre: userData.id, certificate: certif});
+    }
+
     return <div className="card mb-4 mb-md-0">
         <div className="card-header container-fluid">
             <div className="row">
                 <div className="col">{t('licence')}</div>
                 <div className="col" style={{textAlign: 'right'}}>
                     <button className="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#LicenceModal"
-                            onClick={_ => setModal({id: -1, membre: userData.id})}>{t('button.ajouter')}
+                            onClick={handleAsk}>{t('button.ajouter')}
                     </button>
                 </div>
             </div>
@@ -141,13 +162,6 @@ function ModalContent({licence, dispatch}) {
         if (licence.id !== -1) {
             setNew(false)
             setSaison(licence.saison)
-            if (licence.certificate === null) {
-                setCertificateBy("")
-                setCertificateDate("")
-            } else {
-                setCertificateBy(licence.certificate.split('¤')[0])
-                setCertificateDate(licence.certificate.split('¤')[1])
-            }
             setValidate(licence.validate)
             setPay(licence.pay);
         } else {
@@ -158,6 +172,13 @@ function ModalContent({licence, dispatch}) {
             setValidate(false)
             setPay(false);
         }
+        if (licence.certificate) {
+            setCertificateBy(licence.certificate.split('¤')[0])
+            setCertificateDate(licence.certificate.split('¤')[1])
+        } else {
+            setCertificateBy("")
+            setCertificateDate("")
+        }
     }, [licence]);
 
     return <form onSubmit={e => sendLicence(e, dispatch)}>

src/main/webapp/src/pages/club/member/LicenceCard.jsx

@@ -4,7 +4,7 @@ import {useEffect, useReducer, useState} from "react";
 import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {faInfo, faPen} from "@fortawesome/free-solid-svg-icons";
 import {AxiosError} from "../../../components/AxiosError.jsx";
-import {apiAxios, getSaison, getToastMessage} from "../../../utils/Tools.js";
+import {apiAxios, getFirstDateOfSaison, getSaison, getToastMessage} from "../../../utils/Tools.js";
 import {toast} from "react-toastify";
 import {ColoredText} from "../../../components/ColoredCircle.jsx";
 import {useTranslation} from "react-i18next";
@@ -32,7 +32,7 @@ function licenceReducer(licences, action) {
 }
 
 export function LicenceCard({userData}) {
-    const defaultLicence = {id: -1, membre: userData.id, validate: false, saison: getSaison(), certificate: false}
+    const defaultLicence = {id: -1, membre: userData.id, validate: false, saison: getSaison(), certificate: null}
     const {t} = useTranslation();
 
     const setLoading = useLoadingSwitcher()
@@ -48,13 +48,33 @@ export function LicenceCard({userData}) {
         dispatch({type: 'SORT'})
     }, [data]);
 
+    const handleAsk = () => {
+        const currentLicence = licences[0];
+
+        let certif = undefined;
+        if (currentLicence != null && currentLicence.certificate != null) {
+            const strings = currentLicence.certificate.split('¤');
+            if (currentLicence.saison === getSaison()) {
+                certif = currentLicence.certificate;
+            } else if (strings.length > 1) {
+                const date = new Date(strings[1]);
+                const max = getFirstDateOfSaison();
+                max.setFullYear(max.getFullYear() - 2);
+
+                if (max < date)
+                    certif = currentLicence.certificate;
+            }
+        }
+        setModal({...defaultLicence, certificate: certif});
+    }
+
     return <div className="card mb-4 mb-md-0">
         <div className="card-header container-fluid">
             <div className="row">
                 <div className="col">{t('licence')}</div>
                 <div className="col" style={{textAlign: 'right'}}>
                     <button className="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#LicenceModal"
-                            onClick={() => setModal(defaultLicence)}
+                            onClick={handleAsk}
                             disabled={licences.some(licence => licence.saison === getSaison())}>{t('demander')}
                     </button>
                 </div>
@@ -127,15 +147,14 @@ function ModalContent({licence, dispatch}) {
     useEffect(() => {
         if (licence.id !== -1) {
             setNew(false)
-            if (licence.certificate === null) {
+
-                setCertificateBy("")
-                setCertificateDate("")
-            } else {
-                setCertificateBy(licence.certificate.split('¤')[0])
-                setCertificateDate(licence.certificate.split('¤')[1])
-            }
         } else {
             setNew(true)
+        }
+        if (licence.certificate) {
+            setCertificateBy(licence.certificate.split('¤')[0])
+            setCertificateDate(licence.certificate.split('¤')[1])
+        } else {
             setCertificateBy("")
             setCertificateDate("")
         }

src/main/webapp/src/utils/Tools.js

@@ -117,6 +117,14 @@ export function getSaison(currentDate = new Date()) {
     }
 }
 
+export function getFirstDateOfSaison() {
+    const year = getSaison();
+    const firstDate = new Date(year, 8, 1); // 8 = septembre, 1 = premier jour
+    firstDate.setHours(0, 0, 0, 0); // Heure, minutes, secondes, millisecondes à 0
+
+    return firstDate;
+}
+
 export function getCatName(cat) {
     switch (cat) {
         case "SUPER_MINI":