diff --git a/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java b/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java index d4dcf09..7048e4f 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java @@ -29,6 +29,7 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import java.net.URISyntaxException; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.function.Consumer; @@ -69,7 +70,8 @@ public class ClubEndpoints { @APIResponse(responseCode = "500", description = "Erreur interne du serveur") }) public Uni> getAll() { - return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).toList()); + return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).sorted( + Comparator.comparing(SimpleClubModel::getName)).toList()); } @GET diff --git a/src/main/webapp/src/pages/admin/club/ClubPage.jsx b/src/main/webapp/src/pages/admin/club/ClubPage.jsx index 0e4b4dd..5a6768a 100644 --- a/src/main/webapp/src/pages/admin/club/ClubPage.jsx +++ b/src/main/webapp/src/pages/admin/club/ClubPage.jsx @@ -172,6 +172,7 @@ function InformationForm({data}) { export function BureauCard({clubData}) { const setLoading = useLoadingSwitcher() const {data, error} = useFetch(`/club/desk/${clubData.id}`, setLoading, 1) + const navigate = useNavigate(); return <>
@@ -179,7 +180,8 @@ export function BureauCard({clubData}) {
    {data && data.map((d, index) => { - return
    + return
    navigate(`/admin/member/${d.id}`)}>
    {d.role}
    {d.lname} {d.fname}
    })} @@ -188,4 +190,4 @@ export function BureauCard({clubData}) {
    {error && } -} \ No newline at end of file +}