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

Compare commits

base: Thibaut:e86fe42b3dd1a42220e56df1793368e663451fb5
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1
..
compare: Thibaut:587173c79fa2e49dc0ee593b24a7f6b4172d0523
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1

No commits in common. "e86fe42b3dd1a42220e56df1793368e663451fb5" and "587173c79fa2e49dc0ee593b24a7f6b4172d0523" have entirely different histories.
e86fe42b3d ... 587173c79f

3 changed files with 3 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/fr/titionfire/ffsaf/data/model/LogModel.java
View File

@ -30,10 +30,8 @@ public class LogModel {
Long target_id; Long target_id;
@Column(columnDefinition = "TEXT")
String target_name; String target_name;
@Column(columnDefinition = "TEXT")
String message; String message;
public enum ActionType { public enum ActionType {

4
src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java
View File

@ -29,7 +29,6 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.eclipse.microprofile.openapi.annotations.tags.Tag;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -70,8 +69,7 @@ public class ClubEndpoints {
@APIResponse(responseCode = "500", description = "Erreur interne du serveur") @APIResponse(responseCode = "500", description = "Erreur interne du serveur")
}) })
public Uni<List<SimpleClubModel>> getAll() { public Uni<List<SimpleClubModel>> getAll() {
return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).sorted( return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).toList());
Comparator.comparing(SimpleClubModel::getName)).toList());
} }
@GET @GET

6
src/main/webapp/src/pages/admin/club/ClubPage.jsx
View File

@ -172,7 +172,6 @@ function InformationForm({data}) {
export function BureauCard({clubData}) { export function BureauCard({clubData}) {
const setLoading = useLoadingSwitcher() const setLoading = useLoadingSwitcher()
const {data, error} = useFetch(`/club/desk/${clubData.id}`, setLoading, 1) const {data, error} = useFetch(`/club/desk/${clubData.id}`, setLoading, 1)
const navigate = useNavigate();
return <> return <>
<div className="card mb-4"> <div className="card mb-4">
@ -180,8 +179,7 @@ export function BureauCard({clubData}) {
<div className="card-body"> <div className="card-body">
<ul className="list-group"> <ul className="list-group">
{data && data.map((d, index) => { {data && data.map((d, index) => {
return <div key={index} className="list-group-item d-flex justify-content-between align-items-start list-group-item-action" return <div key={index} className="list-group-item d-flex justify-content-between align-items-start">
onClick={__ => navigate(`/admin/member/${d.id}`)}>
<div className="me-auto"><small>{d.role}</small><br/>{d.lname} {d.fname}</div> <div className="me-auto"><small>{d.role}</small><br/>{d.lname} {d.fname}</div>
</div> </div>
})} })}
@ -190,4 +188,4 @@ export function BureauCard({clubData}) {
</div> </div>
{error && <AxiosError error={error}/>} {error && <AxiosError error={error}/>}
</> </>
} }