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

dev #108

Merged
Thibaut merged 9 commits from dev into master 2026-02-20 16:59:40 +00:00
Conversation 0 Commits 9 Files Changed 33 +15 -4
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8663aa61cf - Show all commits

10
src/main/webapp/src/pages/competition/editor/CMTMatchPanel.jsx
View File

@ -31,6 +31,12 @@ function CupImg() {
alt=""/> alt=""/>
} }
function CupImg2() {
return <img decoding="async" loading="lazy" width={"16"} height={"16"} className="wp-image-1635"
style={{width: "16px"}} src="/img/171892.png"
alt=""/>
}
export function CategorieSelect({catId, setCatId, menuActions}) { export function CategorieSelect({catId, setCatId, menuActions}) {
const setLoading = useLoadingSwitcher() const setLoading = useLoadingSwitcher()
const {data: cats, setData: setCats} = useRequestWS('getAllCategory', {}, setLoading); const {data: cats, setData: setCats} = useRequestWS('getAllCategory', {}, setLoading);
@ -443,14 +449,14 @@ function MatchList({matches, cat, menuActions, classement = false, currentMatch
{!classement && <td style={{textAlign: "center", paddingLeft: "0.2em", paddingRight: "0.2em"}}>{m.poule}</td>} {!classement && <td style={{textAlign: "center", paddingLeft: "0.2em", paddingRight: "0.2em"}}>{m.poule}</td>}
<th style={{textAlign: "center", paddingLeft: "0.2em", paddingRight: "0.2em"}}> <th style={{textAlign: "center", paddingLeft: "0.2em", paddingRight: "0.2em"}}>
{index >= firstIndex ? index + 1 - firstIndex : ""}</th> {index >= firstIndex ? index + 1 - firstIndex : ""}</th>
<td style={{textAlign: "right", paddingRight: "0"}}>{m.end && m.win > 0 && <CupImg/>}</td> <td style={{textAlign: "right", paddingRight: "0"}}>{m.end && ((m.win > 0 && <CupImg/>) || (m.win === 0 && <CupImg2/>))}</td>
<td style={{textAlign: "center", minWidth: "11em", paddingLeft: "0.2em"}}> <td style={{textAlign: "center", minWidth: "11em", paddingLeft: "0.2em"}}>
<small className="position-relative"><CombName combId={m.c1}/> <small className="position-relative"><CombName combId={m.c1}/>
<GetCard match={m} combId={m.c1} cat={cat}/></small></td> <GetCard match={m} combId={m.c1} cat={cat}/></small></td>
<td style={{textAlign: "center", minWidth: "11em", paddingRight: "0.2em"}}> <td style={{textAlign: "center", minWidth: "11em", paddingRight: "0.2em"}}>
<small className="position-relative"><CombName combId={m.c2}/> <small className="position-relative"><CombName combId={m.c2}/>
<GetCard match={m} combId={m.c2} cat={cat}/></small></td> <GetCard match={m} combId={m.c2} cat={cat}/></small></td>
<td style={{textAlign: "left", paddingLeft: "0"}}>{m.end && m.win < 0 && <CupImg/>}</td> <td style={{textAlign: "left", paddingLeft: "0"}}>{m.end && ((m.win < 0 && <CupImg/>) || (m.win === 0 && <CupImg2/>))}</td>
</tr> </tr>
))} ))}
</tbody> </tbody>

9
src/main/webapp/src/pages/competition/editor/CategoryAdminContent.jsx
View File

@ -30,6 +30,11 @@ function CupImg() {
style={{width: "16px"}} src="/img/171891.png" style={{width: "16px"}} src="/img/171891.png"
alt=""/> alt=""/>
} }
function CupImg2() {
return <img decoding="async" loading="lazy" width={"16"} height={"16"} className="wp-image-1635"
style={{width: "16px"}} src="/img/171892.png"
alt=""/>
}
export function CategoryContent({cat, catId, setCat, menuActions}) { export function CategoryContent({cat, catId, setCat, menuActions}) {
const setLoading = useLoadingSwitcher() const setLoading = useLoadingSwitcher()
@ -712,7 +717,7 @@ function MatchList({matches, cat, groups, reducer, classement = false}) {
<th style={{textAlign: "center", cursor: "auto"}} scope="row">{index + 1}</th> <th style={{textAlign: "center", cursor: "auto"}} scope="row">{index + 1}</th>
{!classement && <td style={{textAlign: "center", cursor: "auto"}}>{m.poule}</td>} {!classement && <td style={{textAlign: "center", cursor: "auto"}}>{m.poule}</td>}
{!classement && <td style={{textAlign: "center", cursor: "auto"}}>{liceName[index % liceName.length]}</td>} {!classement && <td style={{textAlign: "center", cursor: "auto"}}>{liceName[index % liceName.length]}</td>}
<td style={{textAlign: "right", cursor: "auto", paddingRight: "0"}}>{m.end && m.win > 0 && <CupImg/>}</td> <td style={{textAlign: "right", cursor: "auto", paddingRight: "0"}}>{m.end && ((m.win > 0 && <CupImg/>) || (m.win === 0 && <CupImg2/>))}</td>
<td style={{textAlign: "center", minWidth: "11em", paddingLeft: "0.2em"}} <td style={{textAlign: "center", minWidth: "11em", paddingLeft: "0.2em"}}
onClick={e => handleCombClick(e, m.id, m.c1)}> onClick={e => handleCombClick(e, m.id, m.c1)}>
<small className="position-relative"><CombName combId={m.c1}/> <small className="position-relative"><CombName combId={m.c1}/>
@ -721,7 +726,7 @@ function MatchList({matches, cat, groups, reducer, classement = false}) {
onClick={e => handleCombClick(e, m.id, m.c2)}> onClick={e => handleCombClick(e, m.id, m.c2)}>
<small className="position-relative"><CombName combId={m.c2}/> <small className="position-relative"><CombName combId={m.c2}/>
<GetCard match={m} combId={m.c2} cat={cat}/></small></td> <GetCard match={m} combId={m.c2} cat={cat}/></small></td>
<td style={{textAlign: "left", cursor: "auto", paddingLeft: "0"}}>{m.end && m.win < 0 && <CupImg/>}</td> <td style={{textAlign: "left", cursor: "auto", paddingLeft: "0"}}>{m.end && ((m.win < 0 && <CupImg/>) || (m.win === 0 && <CupImg2/>))}</td>
<td style={{textAlign: "center", cursor: "auto"}}>{scoreToString2(m, cards_v)}</td> <td style={{textAlign: "center", cursor: "auto"}}>{scoreToString2(m, cards_v)}</td>
<td style={{textAlign: "center", cursor: "pointer", color: "#1381ff"}} onClick={_ => handleEditMatch(m.id)}> <td style={{textAlign: "center", cursor: "pointer", color: "#1381ff"}} onClick={_ => handleEditMatch(m.id)}>
<FontAwesomeIcon icon={faPen}/></td> <FontAwesomeIcon icon={faPen}/></td>