Compare commits
4 Commits
e6cc4cbc96
...
81b953fb05
| Author | SHA1 | Date | |
|---|---|---|---|
| 81b953fb05 | |||
| c6659f8d85 | |||
| e86fe42b3d | |||
| ef528aa524 |
@ -76,6 +76,7 @@ jobs:
|
|||||||
key: ${{ secrets.SSH_KEY }}
|
key: ${{ secrets.SSH_KEY }}
|
||||||
script: |
|
script: |
|
||||||
cd ${{ secrets.TARGET_DIR }}
|
cd ${{ secrets.TARGET_DIR }}
|
||||||
|
docker logs ffsaf > "log/ffsaf_logs_$(date +"%Y-%m-%d_%H-%M-%S").log" 2>&1
|
||||||
docker stop ffsaf
|
docker stop ffsaf
|
||||||
docker rm ffsaf
|
docker rm ffsaf
|
||||||
docker compose up --build -d ffsaf
|
docker compose up --build -d ffsaf
|
||||||
|
|||||||
@ -30,8 +30,10 @@ 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 {
|
||||||
|
|||||||
@ -29,6 +29,7 @@ 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;
|
||||||
@ -69,7 +70,8 @@ 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).toList());
|
return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).sorted(
|
||||||
|
Comparator.comparing(SimpleClubModel::getName)).toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@GET
|
@GET
|
||||||
|
|||||||
@ -172,6 +172,7 @@ 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">
|
||||||
@ -179,7 +180,8 @@ 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">
|
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}`)}>
|
||||||
<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>
|
||||||
})}
|
})}
|
||||||
@ -188,4 +190,4 @@ export function BureauCard({clubData}) {
|
|||||||
</div>
|
</div>
|
||||||
{error && <AxiosError error={error}/>}
|
{error && <AxiosError error={error}/>}
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user