Compare commits
No commits in common. "81b953fb05a02251caaace1371434eebe668c910" and "e6cc4cbc96d21a1312cd7c679dab5a497a0a1dad" have entirely different histories.
81b953fb05
...
e6cc4cbc96
@ -76,7 +76,6 @@ jobs:
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
script: |
|
||||
cd ${{ secrets.TARGET_DIR }}
|
||||
docker logs ffsaf > "log/ffsaf_logs_$(date +"%Y-%m-%d_%H-%M-%S").log" 2>&1
|
||||
docker stop ffsaf
|
||||
docker rm ffsaf
|
||||
docker compose up --build -d ffsaf
|
||||
|
||||
@ -30,10 +30,8 @@ public class LogModel {
|
||||
|
||||
Long target_id;
|
||||
|
||||
@Column(columnDefinition = "TEXT")
|
||||
String target_name;
|
||||
|
||||
@Column(columnDefinition = "TEXT")
|
||||
String message;
|
||||
|
||||
public enum ActionType {
|
||||
|
||||
@ -29,7 +29,6 @@ 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;
|
||||
@ -70,8 +69,7 @@ public class ClubEndpoints {
|
||||
@APIResponse(responseCode = "500", description = "Erreur interne du serveur")
|
||||
})
|
||||
public Uni<List<SimpleClubModel>> getAll() {
|
||||
return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).sorted(
|
||||
Comparator.comparing(SimpleClubModel::getName)).toList());
|
||||
return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).toList());
|
||||
}
|
||||
|
||||
@GET
|
||||
|
||||
@ -172,7 +172,6 @@ function InformationForm({data}) {
|
||||
export function BureauCard({clubData}) {
|
||||
const setLoading = useLoadingSwitcher()
|
||||
const {data, error} = useFetch(`/club/desk/${clubData.id}`, setLoading, 1)
|
||||
const navigate = useNavigate();
|
||||
|
||||
return <>
|
||||
<div className="card mb-4">
|
||||
@ -180,8 +179,7 @@ export function BureauCard({clubData}) {
|
||||
<div className="card-body">
|
||||
<ul className="list-group">
|
||||
{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"
|
||||
onClick={__ => navigate(`/admin/member/${d.id}`)}>
|
||||
return <div key={index} className="list-group-item d-flex justify-content-between align-items-start">
|
||||
<div className="me-auto"><small>{d.role}</small><br/>{d.lname} {d.fname}</div>
|
||||
</div>
|
||||
})}
|
||||
@ -190,4 +188,4 @@ export function BureauCard({clubData}) {
|
||||
</div>
|
||||
{error && <AxiosError error={error}/>}
|
||||
</>
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user