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

dev #94

Merged
Thibaut merged 4 commits from dev into master 2026-01-03 20:50:18 +00:00
Conversation 0 Commits 4 Files Changed 14 +11 -9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 959e356fb9 - Show all commits

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

@ -38,7 +38,7 @@ export function CompetitionRegisterAdmin({source}) {
}, [data, clubFilter, catFilter]); }, [data, clubFilter, catFilter]);
const sendRegister = (new_state) => { const sendRegister = (new_state) => {
toast.promise(apiAxios.post(`/competition/${id}/register/${source}`, new_state), { return toast.promise(apiAxios.post(`/competition/${id}/register/${source}`, new_state), {
pending: "Recherche en cours", success: "Combattant trouvé et ajouté/mis à jour", error: { pending: "Recherche en cours", success: "Combattant trouvé et ajouté/mis à jour", error: {
render({data}) { render({data}) {
return data.response.data || "Combattant non trouvé" return data.response.data || "Combattant non trouvé"
@ -153,9 +153,9 @@ function SearchMember({sendRegister}) {
} }
sendRegister({ sendRegister({
licence: member.licence.trim(), licence: member.licence,
fname: member.fname.trim(), fname: member.fname,
lname: member.lname.trim(), lname: member.lname,
weight: "", weight: "",
overCategory: 0, overCategory: 0,
lockEdit: false, lockEdit: false,
@ -169,7 +169,7 @@ function SearchMember({sendRegister}) {
const names = data.map(member => `${member.fname} ${member.lname}`.trim()); const names = data.map(member => `${member.fname} ${member.lname}`.trim());
names.sort((a, b) => a.localeCompare(b)); names.sort((a, b) => a.localeCompare(b));
setSuggestions(names); setSuggestions(names);
}, []); }, [data]);
return <> return <>
{data ? <div className="row mb-3" style={{marginTop: "0.5em"}}> {data ? <div className="row mb-3" style={{marginTop: "0.5em"}}>
@ -335,9 +335,9 @@ function Modal({sendRegister, modalState, setModalState, source}) {
<form onSubmit={e => { <form onSubmit={e => {
e.preventDefault() e.preventDefault()
const new_state = { const new_state = {
licence: licence, licence: Number.isInteger(licence) ? licence : licence.trim(),
fname: fname, fname: fname.trim(),
lname: lname, lname: lname.trim(),
weight: weight, weight: weight,
overCategory: cat, overCategory: cat,
lockEdit: lockEdit, lockEdit: lockEdit,
@ -350,8 +350,10 @@ function Modal({sendRegister, modalState, setModalState, source}) {
new_state.country = country_ new_state.country = country_
new_state.genre = genre new_state.genre = genre
} }
setModalState(new_state)
sendRegister(new_state) sendRegister(new_state)
.then(() => {
setModalState(new_state)
})
}}> }}>
<div className="modal-header"> <div className="modal-header">
<h1 className="modal-title fs-5" <h1 className="modal-title fs-5"