Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feat: add inactif member filter

Browse Source
This commit is contained in:
Thibaut Valentin
2025-12-20 18:22:24 +01:00
parent 7e1356b621
commit dc5ab9c3c4
6 changed files with 63 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/src/components/MemberCustomFiels.jsx
View File

@@ -119,13 +119,13 @@ export function CheckField({name, text, value, row = false}) {
</>
}
export const Checkbox = ({label, value, onChange}) => {
export const Checkbox = ({label, value, onChange, name = "checkbox1"}) => {
const handleChange = () => {
onChange(!value);
};
return <div className="form-check">
<input className="form-check-input" type="checkbox" id="checkbox1" checked={value} onChange={handleChange}/>
<label className="form-check-label" htmlFor="checkbox1">{label}</label>
<input className="form-check-input" type="checkbox" id={name} checked={value} onChange={handleChange}/>
<label className="form-check-label" htmlFor={name}>{label}</label>
</div>
};

12
src/main/webapp/src/pages/MemberList.jsx
View File

@@ -35,6 +35,7 @@ export function MemberList({source}) {
payment: 2,
order: "",
categorie: "",
archived: false,
...JSON.parse(decodeURI(hash.substring(1)) || "{}"),
}
@@ -43,10 +44,10 @@ export function MemberList({source}) {
data,
error,
refresh
} = useFetch(`/member/find/${source}?page=${filter.page}&search=${filter.search}&club=${filter.club}&licenceRequest=${filter.licenceRequest}&payment=${filter.payment}&order=${filter.order}&categorie=${filter.categorie}`, setLoading, 1)
} = useFetch(`/member/find/${source}?page=${filter.page}&search=${filter.search}&club=${filter.club}&licenceRequest=${filter.licenceRequest}&payment=${filter.payment}&order=${filter.order}&categorie=${filter.categorie}&archive=${filter.archived}`, setLoading, 1)
useEffect(() => {
const tmp = `/member/find/${source}?page=${filter.page}&search=${filter.search}&club=${filter.club}&licenceRequest=${filter.licenceRequest}&payment=${filter.payment}&order=${filter.order}&categorie=${filter.categorie}`;
const tmp = `/member/find/${source}?page=${filter.page}&search=${filter.search}&club=${filter.club}&licenceRequest=${filter.licenceRequest}&payment=${filter.payment}&order=${filter.order}&categorie=${filter.categorie}&archive=${filter.archived}`;
if (tmp === lastRefresh)
return;
lastRefresh = tmp
@@ -137,6 +138,8 @@ export function MemberList({source}) {
<div className="card-body">
<FiltreBar showLicenceState={showLicenceState}
setShowLicenceState={setShowLicenceState}
showArchived={filter.archived}
setShowArchived={e => setFilter({...filter, archived: e})}
clubFilter={filter.club}
setClubFilter={e => setFilter({...filter, club: e})}
source={source}
@@ -523,6 +526,8 @@ function OrderBar({onOrderChange, defaultValues = "", source}) {
function FiltreBar({
showLicenceState,
setShowLicenceState,
showArchived,
setShowArchived,
clubFilter,
setClubFilter,
source,
@@ -538,6 +543,9 @@ function FiltreBar({
<div className="mb-3">
<Checkbox value={showLicenceState} onChange={setShowLicenceState} label="Afficher l'état des licences"/>
</div>
<div className="mb-3">
<Checkbox value={showArchived} onChange={setShowArchived} name="checkbox2" label="Afficher les combattants inactifs"/>
</div>
<div className="mb-3">
<select className="form-select" value={catFilter} onChange={event => setCatFilter(event.target.value)}>
<option value="">--- toute les catégories ---</option>

4
src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx
View File

@@ -147,15 +147,13 @@ function SearchMember({sendRegister}) {
const handleAdd = (name) => {
const member = data.find(m => `${m.fname} ${m.lname}`.trim() === name);
console.log("Quick add licence:", member)
if (!member) {
toast.error("Combattant non trouvé");
return;
}
sendRegister({
licence: member.licence, fname: member.fname, lname: member.lname, weight: "", overCategory: 0, lockEdit: false, id: null
licence: member.licence.trim(), fname: member.fname.trim(), lname: member.lname.trim(), weight: "", overCategory: 0, lockEdit: false, id: null
})
}