diff --git a/src/main/webapp/src/components/MemberCustomFiels.jsx b/src/main/webapp/src/components/MemberCustomFiels.jsx
index 0fd9602..abe62ab 100644
--- a/src/main/webapp/src/components/MemberCustomFiels.jsx
+++ b/src/main/webapp/src/components/MemberCustomFiels.jsx
@@ -1,5 +1,5 @@
import {useEffect, useState} from "react";
-import {getCategoryFormBirthDate} from "../utils/Tools.js";
+import {getCategoryFormBirthDate, getCatName} from "../utils/Tools.js";
import {useCountries} from "../hooks/useCountries.jsx";
export function BirthDayField({inti_date, inti_category, required = true}) {
@@ -27,7 +27,7 @@ export function BirthDayField({inti_date, inti_category, required = true}) {
Catégorie
{canUpdate &&
}
diff --git a/src/main/webapp/src/pages/MemberList.jsx b/src/main/webapp/src/pages/MemberList.jsx
index 8b97c97..51b3093 100644
--- a/src/main/webapp/src/pages/MemberList.jsx
+++ b/src/main/webapp/src/pages/MemberList.jsx
@@ -6,7 +6,7 @@ import {useEffect, useState} from "react";
import {useLocation, useNavigate} from "react-router-dom";
import {Checkbox} from "../components/MemberCustomFiels.jsx";
import * as Tools from "../utils/Tools.js";
-import {apiAxios, errFormater} from "../utils/Tools.js";
+import {apiAxios, errFormater, getCatName} from "../utils/Tools.js";
import {toast} from "react-toastify";
import {SearchBar} from "../components/SearchBar.jsx";
import * as XLSX from "xlsx-js-style";
@@ -387,28 +387,45 @@ function MakeCentralPanel({data, visibleMember, navigate, showLicenceState, page
function MakeRow({member, showLicenceState, navigate, source}) {
const rowContent = <>
-
+
{(member.licence_number ? String(member.licence_number).padStart(5, '0') : "-------") + " "}
{(showLicenceState && member.licence != null && member.licence.pay) ? : <> >}
{member.fname} {member.lname}
- {source === "club" ?
-
{member.categorie}
- :
{member.club?.name || "Sans club"}}
+
+ {source === "club" ?
+
{getCatName(member.categorie)}
+ :
{member.club?.name || "Sans club"}
{getCatName(member.categorie)}
}
+
+
>
if (showLicenceState && member.licence != null) {
- return
1 ? "warning" : "danger"))}
- onClick={() => navigate("" + member.id)}>{rowContent}
- } else {
- return
+
+ } else {
+ return
{
+ e.preventDefault();
+ navigate("" + member.id)
+ }}
+ href={"member/" + member.id}>
+ {rowContent}
+
}
}
diff --git a/src/main/webapp/src/utils/Tools.js b/src/main/webapp/src/utils/Tools.js
index b7f2314..bd6d6c3 100644
--- a/src/main/webapp/src/utils/Tools.js
+++ b/src/main/webapp/src/utils/Tools.js
@@ -60,3 +60,32 @@ export function getSaison(currentDate = new Date()) {
return currentDate.getFullYear() - 1
}
}
+
+export function getCatName(cat) {
+ switch (cat) {
+ case "SUPER_MINI":
+ return "Super Mini";
+ case "MINI_POUSSIN":
+ return "Mini Poussin";
+ case "POUSSIN":
+ return "Poussin";
+ case "BENJAMIN":
+ return "Benjamin";
+ case "MINIME":
+ return "Minime";
+ case "CADET":
+ return "Cadet";
+ case "JUNIOR":
+ return "Junior";
+ case "SENIOR1":
+ return "Senior 1";
+ case "SENIOR2":
+ return "Senior 2";
+ case "VETERAN1":
+ return "Vétéran 1";
+ case "VETERAN2":
+ return "Vétéran 2";
+ default:
+ return cat;
+ }
+}