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

Merge pull request 'dev' (#44) from dev into master

Browse Source 
Reviewed-on: #44
This commit is contained in:
Thibaut Valentin 2025-07-07 13:33:41 +00:00
commit a138af013e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java
View File

@ -143,6 +143,7 @@ public class LicenceService {
model.setValidate(valid); model.setValidate(valid);
return Panache.withTransaction(() -> repository.persist(model)); return Panache.withTransaction(() -> repository.persist(model));
} }
})); }))
.map(__ -> "OK");
} }
} }

2
src/main/webapp/src/pages/MemberList.jsx
View File

@ -369,7 +369,7 @@ function MakeRow({member, showLicenceState, navigate, source}) {
if (showLicenceState && member.licence != null) { if (showLicenceState && member.licence != null) {
return <div return <div
className={"list-group-item d-flex justify-content-between align-items-start list-group-item-action list-group-item-" className={"list-group-item d-flex justify-content-between align-items-start list-group-item-action list-group-item-"
+ (member.licence.validate ? "success" : (member.licence.certificate ? "warning" : "danger"))} + (member.licence.validate ? "success" : (member.licence.certificate.length > 1 ? "warning" : "danger"))}
onClick={() => navigate("" + member.id)}>{rowContent}</div> onClick={() => navigate("" + member.id)}>{rowContent}</div>
} else { } else {
return <div className="list-group-item d-flex justify-content-between align-items-start list-group-item-action" return <div className="list-group-item d-flex justify-content-between align-items-start list-group-item-action"

4
src/main/webapp/src/pages/admin/member/LicenceCard.jsx
View File

@ -65,7 +65,7 @@ export function LicenceCard({userData}) {
{licences.map((licence, index) => { {licences.map((licence, index) => {
return <div key={index} return <div key={index}
className={"list-group-item d-flex justify-content-between align-items-start list-group-item-" + className={"list-group-item d-flex justify-content-between align-items-start list-group-item-" +
(licence.validate ? "success" : (licence.certificate?.length > 0 ? "warning" : "danger"))}> (licence.validate ? "success" : (licence.certificate?.length > 1 ? "warning" : "danger"))}>
<div className="me-auto">{licence?.saison}-{licence?.saison + 1}</div> <div className="me-auto">{licence?.saison}-{licence?.saison + 1}</div>
<button className="badge btn btn-primary rounded-pill" data-bs-toggle="modal" <button className="badge btn btn-primary rounded-pill" data-bs-toggle="modal"
data-bs-target="#LicenceModal" onClick={_ => setModal(licence)}> data-bs-target="#LicenceModal" onClick={_ => setModal(licence)}>
@ -220,4 +220,4 @@ function RadioGroupeOnOff({value, onChange, name, text}) {
value="true" checked={value === true} onChange={onChange}/> value="true" checked={value === true} onChange={onChange}/>
<label className="btn btn-outline-primary" htmlFor={"btnradio2" + name}>Oui</label> <label className="btn btn-outline-primary" htmlFor={"btnradio2" + name}>Oui</label>
</div>; </div>;
} }

4
src/main/webapp/src/pages/club/member/LicenceCard.jsx
View File

@ -63,7 +63,7 @@ export function LicenceCard({userData}) {
{licences.map((licence, index) => { {licences.map((licence, index) => {
return <div key={index} return <div key={index}
className={"list-group-item d-flex justify-content-between align-items-start list-group-item-" + className={"list-group-item d-flex justify-content-between align-items-start list-group-item-" +
(licence.validate ? "success" : (licence.certificate?.length > 0 ? "warning" : "danger"))}> (licence.validate ? "success" : (licence.certificate?.length > 1 ? "warning" : "danger"))}>
<div className="me-auto">{licence?.saison}-{licence?.saison + 1}</div> <div className="me-auto">{licence?.saison}-{licence?.saison + 1}</div>
<button className="badge btn btn-primary rounded-pill" data-bs-toggle="modal" <button className="badge btn btn-primary rounded-pill" data-bs-toggle="modal"
data-bs-target="#LicenceModal" onClick={_ => setModal(licence)}> data-bs-target="#LicenceModal" onClick={_ => setModal(licence)}>
@ -187,7 +187,7 @@ function ModalContent({licence, dispatch}) {
{currentSaison && !licence.validate && {currentSaison && !licence.validate &&
<button type="submit" className="btn btn-primary" data-bs-dismiss="modal">Enregistrer</button>} <button type="submit" className="btn btn-primary" data-bs-dismiss="modal">Enregistrer</button>}
<button type="button" className="btn btn-secondary" data-bs-dismiss="modal">Fermer</button> <button type="button" className="btn btn-secondary" data-bs-dismiss="modal">Fermer</button>
{currentSaison && !licence.validate && {currentSaison && !licence.validate && licence.id !== -1 &&
<button type="button" className="btn btn-danger" data-bs-dismiss="modal" <button type="button" className="btn btn-danger" data-bs-dismiss="modal"
onClick={() => removeLicence(licence.id, dispatch)}>Annuler</button>} onClick={() => removeLicence(licence.id, dispatch)}>Annuler</button>}
</div> </div>