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

Compare commits

base: Thibaut:172dcdaa6737829da4feee1df79273774b259910
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1
..
compare: Thibaut:952300d063a7902725ce762c0e385dd61772e1be
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1

No commits in common. "172dcdaa6737829da4feee1df79273774b259910" and "952300d063a7902725ce762c0e385dd61772e1be" have entirely different histories.
172dcdaa67 ... 952300d063

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

8
src/main/webapp/src/pages/PayAndValidateList.jsx
View File

@ -13,6 +13,7 @@ import {faCircleInfo, faEuroSign} from "@fortawesome/free-solid-svg-icons";
import "./PayAndValidateList.css"; import "./PayAndValidateList.css";
import * as Tools from "../utils/Tools.js"; import * as Tools from "../utils/Tools.js";
import {useTranslation} from "react-i18next"; import {useTranslation} from "react-i18next";
import {counter} from "@fortawesome/fontawesome-svg-core";
export function PayAndValidateList({source}) { export function PayAndValidateList({source}) {
const {t} = useTranslation(); const {t} = useTranslation();
@ -30,7 +31,8 @@ export function PayAndValidateList({source}) {
const [lastSearch, setLastSearch] = useState(""); const [lastSearch, setLastSearch] = useState("");
const [paymentFilter, setPaymentFilter] = useState((source === "club") ? 0 : 2); const [paymentFilter, setPaymentFilter] = useState((source === "club") ? 0 : 2);
const [selectedMembers, setSelectedMembers] = useState([]); const storedMembers = sessionStorage.getItem("selectedMembers");
const [selectedMembers, setSelectedMembers] = useState(storedMembers ? JSON.parse(storedMembers) : []);
const setLoading = useLoadingSwitcher() const setLoading = useLoadingSwitcher()
const { const {
@ -39,6 +41,10 @@ export function PayAndValidateList({source}) {
refresh refresh
} = useFetch(`/member/find/${source}?page=${page}&licenceRequest=${stateFilter}&payment=${paymentFilter}&categorie=${catFilter}`, setLoading, 1) } = useFetch(`/member/find/${source}?page=${page}&licenceRequest=${stateFilter}&payment=${paymentFilter}&categorie=${catFilter}`, setLoading, 1)
useEffect(() => {
sessionStorage.setItem("selectedMembers", JSON.stringify(selectedMembers));
}, [selectedMembers]);
useEffect(() => { useEffect(() => {
refresh(`/member/find/${source}?page=${page}&search=${lastSearch}&club=${clubFilter}&licenceRequest=${stateFilter}&payment=${paymentFilter}&categorie=${catFilter}`); refresh(`/member/find/${source}?page=${page}&search=${lastSearch}&club=${clubFilter}&licenceRequest=${stateFilter}&payment=${paymentFilter}&categorie=${catFilter}`);
}, [hash, clubFilter, stateFilter, lastSearch, paymentFilter, catFilter]); }, [hash, clubFilter, stateFilter, lastSearch, paymentFilter, catFilter]);

3
src/main/webapp/src/pages/competition/CompetitionEdit.jsx
View File

@ -457,7 +457,8 @@ function Content({data}) {
defaultValue={data.endRegister ? data.endRegister.substring(0, 16) : ''}/> defaultValue={data.endRegister ? data.endRegister.substring(0, 16) : ''}/>
</div> </div>
<div className="input-group mb-3" style={{display: "flex" }}> <div className="input-group mb-3"
style={{display: registerMode === "FREE" || registerMode === "CLUB_ADMIN" ? "flex" : "none"}}>
<span className="input-group-text" id="startRegister">{t('poidsDemandéPour')}</span> <span className="input-group-text" id="startRegister">{t('poidsDemandéPour')}</span>
{CatList.map((cat, index) => <div key={index} className="input-group-text"> {CatList.map((cat, index) => <div key={index} className="input-group-text">
<input className="form-check-input mt-0" type="checkbox" id={"catInput" + index} checked={isCatSelected(cat)} <input className="form-check-input mt-0" type="checkbox" id={"catInput" + index} checked={isCatSelected(cat)}