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 +9 -8
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0a368454c4 - Show all commits

8
src/main/webapp/src/components/cm/AutoCatModalContent.jsx
View File

@ -663,8 +663,8 @@ export function AutoNewCatModalContent() {
</>} </>}
<div className="mb-3"> <div className="mb-3">
<label htmlFor="liceInput1" className="form-label"><Trans i18nKey="nomDesZonesDeCombat" ns="cm">t <small>(séparée par des ';')</small></Trans></label> <label htmlFor="liceInput2" className="form-label"><Trans i18nKey="nomDesZonesDeCombat" ns="cm">t <small>(séparée par des ';')</small></Trans></label>
<input type="text" className="form-control" id="liceInput1" placeholder="1;2" name="zone de combat" value={lice} <input type="text" className="form-control" id="liceInput2" placeholder="1;2" name="zone de combat" value={lice}
onChange={e => setLice(e.target.value)}/> onChange={e => setLice(e.target.value)}/>
</div> </div>
@ -774,8 +774,8 @@ export function AutoNewCatSModalContent() {
</div> </div>
<div className="mb-3"> <div className="mb-3">
<label htmlFor="liceInput1" className="form-label"><Trans i18nKey="nomDesZonesDeCombat" ns="cm">t <small>(séparée par des ';')</small></Trans></label> <label htmlFor="liceInput3" className="form-label"><Trans i18nKey="nomDesZonesDeCombat" ns="cm">t <small>(séparée par des ';')</small></Trans></label>
<input type="text" className="form-control" id="liceInput1" placeholder="1;2" name="zone de combat" value={lice} <input type="text" className="form-control" id="liceInput3" placeholder="1;2" name="zone de combat" value={lice}
onChange={e => setLice(e.target.value)}/> onChange={e => setLice(e.target.value)}/>
</div> </div>

8
src/main/webapp/src/pages/competition/editor/CMAdmin.jsx
View File

@ -1,4 +1,4 @@
import React, {useEffect, useRef, useState} from "react"; import React, {useEffect, useId, useRef, useState} from "react";
import {useRequestWS, useWS} from "../../../hooks/useWS.jsx"; import {useRequestWS, useWS} from "../../../hooks/useWS.jsx";
import {LoadingProvider, useLoadingSwitcher} from "../../../hooks/useLoading.jsx"; import {LoadingProvider, useLoadingSwitcher} from "../../../hooks/useLoading.jsx";
import {toast} from "react-toastify"; import {toast} from "react-toastify";
@ -726,6 +726,7 @@ function CategoryHeader({
} }
function ModalContent({state, setCatId, setConfirm, confirmRef}) { function ModalContent({state, setCatId, setConfirm, confirmRef}) {
const id = useId()
const [name, setName] = useState("") const [name, setName] = useState("")
const [lice, setLice] = useState("1") const [lice, setLice] = useState("1")
const [poule, setPoule] = useState(true) const [poule, setPoule] = useState(true)
@ -908,8 +909,9 @@ function ModalContent({state, setCatId, setConfirm, confirmRef}) {
<ListPresetSelect value={preset} onChange={setPreset}/> <ListPresetSelect value={preset} onChange={setPreset}/>
<div className="mb-3"> <div className="mb-3">
<label htmlFor="liceInput1" className="form-label"><Trans i18nKey="nomDesZonesDeCombat" ns="cm">t <small>(séparée par des ';')</small></Trans></label> <label htmlFor={id + "liceInput1"} className="form-label"><Trans i18nKey="nomDesZonesDeCombat" ns="cm">t <small>(séparée par des
<input type="text" className="form-control" id="liceInput1" placeholder="1;2" name="zone de combat" value={lice} ';')</small></Trans></label>
<input type="text" className="form-control" id={id + "liceInput1"} placeholder="1;2" name="zone de combat" value={lice}
onChange={e => setLice(e.target.value)}/> onChange={e => setLice(e.target.value)}/>
</div> </div>

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

@ -22,7 +22,6 @@ import {hasEffectCard, useCards, useCardsDispatch} from "../../../hooks/useCard.
import {ScorePanel} from "./ScoreAndCardPanel.jsx"; import {ScorePanel} from "./ScoreAndCardPanel.jsx";
import {ConfirmDialog} from "../../../components/ConfirmDialog.jsx"; import {ConfirmDialog} from "../../../components/ConfirmDialog.jsx";
import {AutoCatModalContent} from "../../../components/cm/AutoCatModalContent.jsx"; import {AutoCatModalContent} from "../../../components/cm/AutoCatModalContent.jsx";
import {makePDF} from "../../../utils/cmPdf.jsx";
const vite_url = import.meta.env.VITE_URL; const vite_url = import.meta.env.VITE_URL;