Merge pull request 'fix: eslint version' (#110) from dev into master

Reviewed-on: #110

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

@@ -122,9 +122,7 @@ public class LicenceService {
                                         .call(genLicenceNumberAndAccountIfNeed())
                                         : Uni.createFrom().nullItem()
                                 ))
-                        .call(licenceModel -> ls.logA(LogModel.ActionType.ADD,
+                        .call(licenceModel -> ls.logA(LogModel.ActionType.ADD, membreModel.getObjectName(),
-                                "%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,17 +184,11 @@ public class MembreService {
 
         String finalSearch = search;
         return getLicenceListe(licenceRequest, payState)
-                .chain(l -> {
+                .map(l -> l.stream().map(l2 -> l2.getMembre().getId()).toList())
+                .chain(ids -> {
                     PanacheQuery<MembreModel> query;
-                    query = repository.find(queryStr, sort, finalSearch,
+                    query = repository.find(queryStr, sort, finalSearch, ids, club).page(Page.ofSize(limit));
-                            l.stream().map(l2 -> l2.getMembre().getId()).toList(), club).page(Page.ofSize(limit));
+                    return getPageResult(query, limit, page);
-                    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)))
-                            );
                 });
     }
 
@@ -216,7 +210,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("membre IN ?1", membres)
+                .chain(membres -> licenceRepository.list("saison = ?1 AND membre IN ?2", Utils.getSaison(), membres)
                         .map(l -> membres.stream().map(m -> SimpleMembreInOutData.fromModel(m, l)).toList()));
     }
 

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

@@ -58,7 +58,6 @@ 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<>();
 
@@ -616,32 +615,21 @@ public class ResultService {
                                                     new ArrayList<>(), membreModel)
                                     )));
         } else {
-            return cardRepository.list("competition.uuid = ?1", uuid)
+            return clubRepository.findById(id).chain(clubModel ->
-                    .chain(cards -> clubRepository.findById(id).chain(clubModel ->
                     registerRepository.list("competition.uuid = ?1 AND membre.club = ?2", uuid, clubModel)
                             .chain(registers -> matchRepository.list(
                                             "SELECT DISTINCT m FROM MatchModel m LEFT JOIN m.c1_guest.comb c1g LEFT JOIN m.c2_guest.comb c2g " +
                                                     "WHERE m.category.compet.uuid = ?1 AND (m.c1_id IN ?2 OR m.c2_id IN ?2 OR c1g IN ?2 OR c2g IN ?2)",
                                             uuid, registers.stream().map(RegisterModel::getMembre).toList())
-                                            .map(matchModels -> matchModels.stream()
+                                    .chain(matchModels -> cardRepository.list("competition.uuid = ?1", uuid)
-                                                    .map(m -> new MatchModelExtend(m, cards)))
+                                            .map(cards ->
-                                            .chain(s -> competitionGuestRepository.list(
-                                                            "competition.uuid = ?1 AND club = ?2", uuid, clubModel.getName())
-                                                    .chain(guests -> matchRepository.list(
-                                                                    "SELECT DISTINCT m FROM MatchModel m LEFT JOIN m.c1_guest.guest c1g LEFT JOIN m.c2_guest.guest c2g " +
-                                                                            "WHERE m.category.compet.uuid = ?1 AND (m.c1_guest IN ?2 OR m.c2_guest IN ?2 OR c1g IN ?2 OR c2g IN ?2)",
-                                                                    uuid, guests)
-                                                            .map(mm -> new Pair<>(guests, Stream.concat(s, mm.stream()
-                                                                            .map(m -> new MatchModelExtend(m, cards)))
-                                                                    .distinct().toList()))
-                                                    ))
-                                            .map(p ->
                                                     getClubArray2(clubModel.getName(),
-                                                            Stream.concat(
+                                                            registers.stream().map(o -> (CombModel) o.getMembre())
-                                                                    registers.stream().map(RegisterModel::getMembre),
+                                                                    .toList(),
-                                                                    p.getKey().stream()
+                                                            matchModels.stream()
-                                                            ).toList(),
+                                                                    .map(m -> new MatchModelExtend(m, cards)).toList(),
-                                                            p.getValue(), registers, membreModel)
+                                                            registers, membreModel)
+
                                             ))));
         }
     }
@@ -755,10 +743,14 @@ public class ResultService {
     public Uni<List<ClubClassement>> getAllClubArray(String uuid, boolean cache) {
         List<CardModel> cards = new java.util.ArrayList<>();
 
-        return (!cache || cacheClubClassementExp.getOrDefault(uuid, 0L) < System.currentTimeMillis() ?
+        //noinspection unchecked
-                cacheClubClassement.invalidate(uuid).invoke(() -> cacheClubClassementExp.remove(uuid)) :
+        cacheClubClassement.invalidateIf(
-                Uni.createFrom().voidItem()
+                (p) -> ((Pair<Long, List<ClubClassement>>) p).getKey() > System.currentTimeMillis());
-        ).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))
@@ -775,8 +767,7 @@ public class ResultService {
                             .map(entry -> {
                                 ResultCategoryData tmp = new ResultCategoryData();
 
-                                getArray2(entry.getValue().stream().map(m -> new MatchModelExtend(m, cards))
+                                getArray2(entry.getValue().stream().map(m -> new MatchModelExtend(m, cards)).toList(),
-                                                .toList(),
                                         null, tmp);
                                 getClassementArray(entry.getKey(), null, cards, tmp);
 
@@ -785,42 +776,27 @@ public class ResultService {
                             .collect().asList();
                 })
                 .map(categoryData -> {
-                    HashMap<String, ClubClassement> clubMap = new HashMap<>();
+                    HashMap<Long, ClubClassement> clubMap = new HashMap<>();
-
-                    categoryData.forEach(
-                            c -> c.getClassement().stream().map(ResultCategoryData.ClassementData::comb)
-                                    .filter(Objects::nonNull)
-                                    .distinct()
-                                    .map(comb -> {
-                                        if (comb instanceof MembreModel membreModel2) {
-                                            return (membreModel2.getClub() != null) ? membreModel2.getClub()
-                                                    .getName() : "";
-                                        } else if (comb instanceof CompetitionGuestModel guestModel) {
-                                            return guestModel.getClub();
-                                        }
-                                        return "";
-                                    })
-                                    .filter(s -> s != null && !s.isBlank() && !s.equals("Team"))
-                                    .distinct()
-                                    .forEach(clubName -> clubMap.putIfAbsent(clubName,
-                                            new ClubClassement(clubName))));
 
                     categoryData.forEach(c -> c.getClassement().forEach(classementData -> {
                         if (classementData.rank() > 3)
                             return;
 
                         if (classementData.comb() != null) {
+                            long clubId = 0L;
                             String clubName = "";
                             if (classementData.comb() instanceof MembreModel membreModel2) {
-                                clubName = (membreModel2.getClub() != null) ? membreModel2.getClub()
+                                clubId = (membreModel2.getClub() != null) ? membreModel2.getClub().getId() : 0;
-                                        .getName() : "";
+                                clubName = (membreModel2.getClub() != null) ? membreModel2.getClub().getName() : "";
                             } else if (classementData.comb() instanceof CompetitionGuestModel guestModel) {
+                                if (guestModel.getClub() != null && !guestModel.getClub().isBlank())
+                                    clubId = getClubTempId(guestModel.getClub());
                                 clubName = guestModel.getClub();
                             }
 
-                            if (clubName != null && !clubName.isBlank()
+                            if (clubId != 0) {
-                                    && !clubName.equals("Team") && clubMap.containsKey(clubName)) {
+                                clubMap.putIfAbsent(clubId, new ClubClassement(clubName));
-                                ClubClassement entity = clubMap.get(clubName);
+                                ClubClassement entity = clubMap.get(clubId);
                                 entity.score[classementData.rank() - 1]++;
                                 entity.tt_score += 4 - classementData.rank();
                             }
@@ -834,8 +810,8 @@ public class ResultService {
                                     .thenComparingInt(c -> c.score[2]).reversed())
                             .toList();
                 })
-                .invoke(__ -> cacheClubClassementExp.put(uuid, System.currentTimeMillis() + 60 * 1000L))
+                .map(l -> new Pair<>(System.currentTimeMillis() + 60 * 1000L, l))
-        ));
+        ).map(Pair::getValue);
     }
 
     @Data

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

@@ -2,14 +2,10 @@ 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;
 
@@ -28,27 +24,7 @@ public class SimpleMembreInOutData {
 
     public static SimpleMembreInOutData fromModel(MembreModel membreModel, List<LicenceModel> lc) {
         LicenceModel currentLicence = lc.stream().filter(l -> l.getMembre().getId().equals(membreModel.getId()))
-                .max(Comparator.comparingInt(LicenceModel::getSaison)).orElse(null);
+                .findFirst().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(),
@@ -57,8 +33,8 @@ public class SimpleMembreInOutData {
                 membreModel.getEmail(),
                 membreModel.getGenre().str,
                 membreModel.getBirth_date(),
-                currentLicence != null && currentLicence.getSaison() == Utils.getSaison(),
+                currentLicence != null,
-                certif
+                currentLicence == null ? null : currentLicence.getCertificate()
         );
     }
 }

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

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

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

@@ -20,8 +20,6 @@ import java.io.*;
 import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.CompletableFuture;
@@ -119,15 +117,6 @@ 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);
@@ -255,16 +244,15 @@ public class Utils {
                     FilenameFilter filter = (directory, filename) -> filename.startsWith(id + ".");
                     File[] files = dirFile.listFiles(filter);
                     if (files != null) {
-                        for (File f2 : files) {
+                        for (File f : files) {
                             //noinspection ResultOfMethodCallIgnored
-                            f2.delete();
+                            f.delete();
                         }
                     }
 
-                    Path f = file.filePath();
+                    File f = file.filePath().toFile();
-                    System.out.println(f + " -> " + new File(dirFile, id + "." + detectedExtensions[0]));
+                    //noinspection ResultOfMethodCallIgnored
-                    Files.copy(f, new File(dirFile, id + "." + detectedExtensions[0]).toPath(),
+                    f.renameTo(new File(dirFile, id + "." + detectedExtensions[0]));
-                            StandardCopyOption.REPLACE_EXISTING);
                     return "ok";
                 })));
     }

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.3.1",
+    "@fortawesome/fontawesome-svg-core": "^7.2.0",
-    "@fortawesome/free-brands-svg-icons": "^7.3.1",
+    "@fortawesome/free-brands-svg-icons": "^7.2.0",
-    "@fortawesome/free-regular-svg-icons": "^7.3.1",
+    "@fortawesome/free-regular-svg-icons": "^7.2.0",
-    "@fortawesome/free-solid-svg-icons": "^7.3.1",
+    "@fortawesome/free-solid-svg-icons": "^7.2.0",
-    "@fortawesome/react-fontawesome": "^3.5.0",
+    "@fortawesome/react-fontawesome": "^3.2.0",
-    "axios": "1.18.0",
+    "axios": "^1.13.6",
     "browser-image-compression": "^2.0.2",
-    "i18next": "^26.3.6",
+    "i18next": "^25.8.15",
     "i18next-browser-languagedetector": "^8.2.1",
-    "i18next-http-backend": "^4.0.1",
+    "i18next-http-backend": "^3.0.2",
-    "jspdf": "4.2.1",
+    "jspdf": "^4.2.0",
-    "jspdf-autotable": "^5.0.8",
+    "jspdf-autotable": "^5.0.7",
     "jszip": "^3.10.1",
     "leaflet": "^1.9.4",
-    "obs-websocket-js": "^5.0.8",
+    "obs-websocket-js": "^5.0.7",
-    "proj4": "^2.21.0",
+    "proj4": "^2.20.4",
-    "react": "^19.2.8",
+    "react": "^19.2.4",
-    "react-dom": "^19.2.8",
+    "react-dom": "^19.2.4",
-    "react-i18next": "^17.0.11",
+    "react-i18next": "^16.5.6",
-    "react-is": "^19.2.8",
+    "react-is": "^19.2.4",
     "react-leaflet": "^5.0.0",
     "react-loader-spinner": "^8.0.2",
-    "react-router-dom": "^7.18.2",
+    "react-router-dom": "^7.13.1",
-    "react-toastify": "^11.1.0",
+    "react-toastify": "^11.0.5",
-    "recharts": "^3.10.1",
+    "recharts": "^3.8.0",
     "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.18",
+    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.2.4",
+    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^6.0.5",
+    "@vitejs/plugin-react": "^5.1.4",
-    "eslint": "^9.39.5",
+    "eslint": "^9.7.0",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^7.1.1",
+    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.5.3",
+    "eslint-plugin-react-refresh": "^0.5.2",
-    "vite": "8.0.16"
+    "vite": "^7.3.1"
   }
 }

src/main/webapp/public/locales/fr/result.json

@@ -15,7 +15,7 @@
   "chargement": "Chargement",
   "classement": "Classement",
   "classementClub": "Classement club",
-  "classementDesClub": "Classement des clubs",
+  "classementDesClub": "Classement des club",
   "classementFinal": "Classement final",
   "club": "Club",
   "combattant": "Combattant",

src/main/webapp/src/config/i18n.js

@@ -8,16 +8,6 @@ const vite_url = import.meta.env.VITE_URL;
 const options = {
     order: [ 'querystring', 'cookie', 'localStorage', 'sessionStorage', 'navigator', 'htmlTag'],
     caches: [],
-    convertDetectedLanguage: (lng) => {
-        const supportedLngs = ['en', 'fr'];
-        const languagePart = lng.split('-')[0];
-
-        if (supportedLngs.includes(languagePart)) {
-            return languagePart; // Manually return 'en' from 'en-US'
-        }
-
-        return lng;
-    },
 }
 
 i18n
@@ -32,12 +22,8 @@ i18n
     // init i18next
     // for all options read: https://www.i18next.com/overview/configuration-options
     .init({
-        fallbackLng: {
-            'fr-FR': ['fr'],
-            default: ['en']
-        },
         supportedLngs: ['fr', 'en'],
-        nonExplicitSupportedLngs: true,
+        fallbackLng: 'fr',
         debug: vite_url.startsWith('http://localhost'),
         interpolation: {
             escapeValue: false, // not needed for react as it escapes by default

src/main/webapp/src/hooks/useOBS.jsx

@@ -74,7 +74,7 @@ export function OBSProvider({children}) {
 }
 
 function getElementName(element) {
-    return `sub${sessionStorage.getItem("liceName") || 1}.${element}`
+    return `sub${sessionStorage.getItem("obs_prefix") || 1}.${element}`
 }
 
 export function useOBS() {

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

@@ -23,6 +23,8 @@ 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)))
@@ -35,7 +37,7 @@ export function MemberList({source}) {
         payment: 2,
         order: "",
         categorie: "",
-        archived: sessionStorage.getItem("showMembreArchived") || true,
+        archived: false,
         ...JSON.parse(decodeURI(hash.substring(1)) || "{}"),
     }
 
@@ -70,11 +72,23 @@ export function MemberList({source}) {
                 club: e.club,
                 categorie: e.categorie,
                 licence_number: e.licence,
-                licence: data.additionalData?.find(licence => licence.membre === e.id)
+                licence: showLicenceState ? licenceData.find(licence => licence.membre === e.id) : null
             })
         }
         setMemberData(data2);
-    }, [data]);
+    }, [data, licenceData]);
+
+    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)
@@ -88,8 +102,8 @@ export function MemberList({source}) {
                 <div className="col-lg-9">
                     <SearchBar search={search} defaultValue={filter.search}/>
                     {data
-                        ? <MakeCentralPanel data={data} visibleMember={memberData} navigate={navigate} page={filter.page}
+                        ? <MakeCentralPanel data={data} visibleMember={memberData} navigate={navigate} showLicenceState={showLicenceState}
-                                            setPage={e => setFilter({...filter, page: e})} source={source}/>
+                                            page={filter.page} setPage={e => setFilter({...filter, page: e})} source={source}/>
                         : error
                             ? <AxiosError error={error}/>
                             : <Def/>
@@ -116,11 +130,10 @@ export function MemberList({source}) {
                     <div className="card mb-4">
                         <div className="card-header">{t('filtre')}</div>
                         <div className="card-body">
-                            <FiltreBar showArchived={filter.archived}
+                            <FiltreBar showLicenceState={showLicenceState}
-                                       setShowArchived={e => {
+                                       setShowLicenceState={setShowLicenceState}
-                                           setFilter({...filter, archived: e})
+                                       showArchived={filter.archived}
-                                           sessionStorage.setItem("showMembreArchived", e);
+                                       setShowArchived={e => setFilter({...filter, archived: e})}
-                                       }}
                                        clubFilter={filter.club}
                                        setClubFilter={e => setFilter({...filter, club: e})}
                                        source={source}
@@ -150,7 +163,6 @@ 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
@@ -169,7 +181,6 @@ 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 = {
@@ -343,7 +354,7 @@ function FileInput() {
     );
 }
 
-function MakeCentralPanel({data, visibleMember, navigate, page, setPage, source}) {
+function MakeCentralPanel({data, visibleMember, navigate, showLicenceState, page, setPage, source}) {
     const {t} = useTranslation();
 
     const pages = []
@@ -363,7 +374,7 @@ function MakeCentralPanel({data, visibleMember, navigate, page, setPage, source}
             })}</small>
             <div className="list-group">
                 {visibleMember.map(member => (
-                    <MakeRow key={member.id} member={member} navigate={navigate} source={source}/>))}
+                    <MakeRow key={member.id} member={member} navigate={navigate} showLicenceState={showLicenceState} source={source}/>))}
             </div>
         </div>
         <div className="mb-4">
@@ -380,11 +391,11 @@ function MakeCentralPanel({data, visibleMember, navigate, page, setPage, source}
     </>
 }
 
-function MakeRow({member, navigate, source}) {
+function MakeRow({member, showLicenceState, 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') : "-------") + "   "}
-                {(member.licence != null && member.licence.pay) ? <FontAwesomeIcon icon={faEuroSign}/> : <>&nbsp;&nbsp;</>}</span>
+                {(showLicenceState && 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>
@@ -400,7 +411,7 @@ function MakeRow({member, navigate, source}) {
 
     </>
 
-    if (member.licence != null) {
+    if (showLicenceState && 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"}}
@@ -498,6 +509,8 @@ function OrderBar({onOrderChange, defaultValues = "", source}) {
 }
 
 function FiltreBar({
+                       showLicenceState,
+                       setShowLicenceState,
                        showArchived,
                        setShowArchived,
                        clubFilter,
@@ -513,6 +526,9 @@ 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, getFirstDateOfSaison, getSaison, getToastMessage} from "../../../utils/Tools.js";
+import {apiAxios, getSaison, getToastMessage} from "../../../utils/Tools.js";
 import {toast} from "react-toastify";
 import {useTranslation} from "react-i18next";
 
@@ -51,34 +51,13 @@ 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={handleAsk}>{t('button.ajouter')}
+                            onClick={_ => setModal({id: -1, membre: userData.id})}>{t('button.ajouter')}
                     </button>
                 </div>
             </div>
@@ -162,6 +141,13 @@ 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 {
@@ -172,13 +158,6 @@ 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, getFirstDateOfSaison, getSaison, getToastMessage} from "../../../utils/Tools.js";
+import {apiAxios, 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: null}
+    const defaultLicence = {id: -1, membre: userData.id, validate: false, saison: getSaison(), certificate: false}
     const {t} = useTranslation();
 
     const setLoading = useLoadingSwitcher()
@@ -48,33 +48,13 @@ 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={handleAsk}
+                            onClick={() => setModal(defaultLicence)}
                             disabled={licences.some(licence => licence.saison === getSaison())}>{t('demander')}
                     </button>
                 </div>
@@ -147,14 +127,15 @@ function ModalContent({licence, dispatch}) {
     useEffect(() => {
         if (licence.id !== -1) {
             setNew(false)
-
+            if (licence.certificate === null) {
+                setCertificateBy("")
+                setCertificateDate("")
             } else {
-            setNew(true)
-        }
-        if (licence.certificate) {
                 setCertificateBy(licence.certificate.split('¤')[0])
                 setCertificateDate(licence.certificate.split('¤')[1])
+            }
         } else {
+            setNew(true)
             setCertificateBy("")
             setCertificateDate("")
         }

src/main/webapp/src/pages/competition/editor/CMAdmin.jsx

@@ -331,8 +331,9 @@ function Menu({menuActions, compUuid}) {
                             <strong>{t('config.obs.warn1')}</strong>
                             <div className="input-group mb-3">
                                 <span className="input-group-text">{t('adresseDuServeur')}</span>
-                                <input type="text" className="form-control" placeholder="ws://127.0.0.1:4455/" aria-label=""
+                                <span className="input-group-text">{t('config.obs.ws')}</span>
-                                       defaultValue={"ws://127.0.0.1:4455/"}/>
+                                <input type="text" className="form-control" placeholder="127.0.0.1:4455" aria-label=""
+                                       defaultValue={"127.0.0.1:4455"}/>
                                 <span className="input-group-text">/</span>
                             </div>
                             <div className="input-group mb-3">

src/main/webapp/src/pages/competition/editor/CMTMatchPanel.jsx

@@ -41,7 +41,6 @@ export function CategorieSelect({catId, setCatId, menuActions}) {
     const setLoading = useLoadingSwitcher()
     const {data: cats, setData: setCats} = useRequestWS('getAllCategory', {}, setLoading);
     const {dispatch} = useWS();
-    const publicAffDispatch = usePubAffDispatch();
     const {connected, setText} = useOBS();
     const {t} = useTranslation("cm");
 
@@ -71,8 +70,6 @@ export function CategorieSelect({catId, setCatId, menuActions}) {
 
     useEffect(() => {
         setText("poule", cat ? cat.name : "");
-        if (!cat)
-            publicAffDispatch({type: 'SET_DATA', payload: {c1: undefined, c2: undefined, next: []}});
     }, [cat, connected]);
 
     return <>

src/main/webapp/src/pages/competition/editor/CMTPoint.jsx

@@ -48,7 +48,7 @@ export function PointPanel({menuActions}) {
 
         <div className="col row align-items-center">
             <button className="btn btn-danger" onClick={handleReset}>{t('réinitialiser')}</button>
-            { /*<button className="btn btn-success" onClick={handleSave}>{t('sauvegarder')}</button> */}
+            <button className="btn btn-success" onClick={handleSave}>{t('sauvegarder')}</button>
         </div>
         <SendScore scoreRouge={scoreRouge} scoreBleu={scoreBleu}/>
     </div>

src/main/webapp/src/pages/competition/editor/CMTable.jsx

@@ -160,7 +160,7 @@ function Menu({menuActions}) {
                         } else {
                             importOBSConfiguration()
                                 .then(config => {
-                                    connect(config.adresse, config.password, config.assets_dir);
+                                    connect("ws://" + config.adresse + "/", config.password, config.assets_dir);
                                 })
                                 .catch(() => {
                                     toast.error(t('aucuneConfigurationObs'));

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

@@ -117,14 +117,6 @@ 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":