diff --git a/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx b/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx index cf202c6..74f515a 100644 --- a/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx +++ b/src/main/webapp/src/pages/competition/CompetitionRegisterAdmin.jsx @@ -21,12 +21,19 @@ export function CompetitionRegisterAdmin() { const setLoading = useLoadingSwitcher() const {data, error} = useFetch(`/competition/${id}/register`, setLoading, 1) + const sortName = (a, b) => { + if (a.data.fname === b.data.fname) + return a.data.lname.localeCompare(b.data.lname); + return a.data.fname.localeCompare(b.data.fname); + } + useEffect(() => { if (!data) return; data.forEach((d, index) => { dispatch({type: 'UPDATE_OR_ADD', payload: {id: index, data: d}}) }) + dispatch({type: 'SORT', payload: sortName}) }, [data, clubFilter, catFilter]); const sendRegister = (event, new_state) => { @@ -57,6 +64,7 @@ export function CompetitionRegisterAdmin() { }) } dispatch({type: 'UPDATE_OR_ADD', payload: {id: maxId + 1, data: response.data}}) + dispatch({type: 'SORT', payload: sortName}) document.getElementById("closeModal").click(); }) } @@ -188,7 +196,7 @@ function Modal({sendRegister, modalState, setModalState}) {