diff --git a/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java b/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java
index 8bbccc4..64fb1ab 100644
--- a/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java
+++ b/src/main/java/fr/titionfire/ffsaf/domain/service/LicenceService.java
@@ -54,7 +54,7 @@ public class LicenceService {
LicenceModel model = new LicenceModel();
model.setMembre(membreModel);
model.setSaison(form.getSaison());
- model.setCertificate(form.isCertificate());
+ model.setCertificate(form.getCertificate());
model.setValidate(form.isValidate());
return Panache.withTransaction(() -> repository.persist(model)
.call(m -> (m.isValidate() && membreModel.getLicence() <= 0) ?
@@ -66,7 +66,7 @@ public class LicenceService {
});
} else {
return repository.findById(form.getId()).chain(model -> {
- model.setCertificate(form.isCertificate());
+ model.setCertificate(form.getCertificate());
model.setValidate(form.isValidate());
return Panache.withTransaction(() -> repository.persist(model)
.call(m -> m.isValidate() ? Mutiny.fetch(m.getMembre())
@@ -96,13 +96,13 @@ public class LicenceService {
LicenceModel model = new LicenceModel();
model.setMembre(combRepository);
model.setSaison(Utils.getSaison());
- model.setCertificate(form.isCertificate());
+ model.setCertificate(form.getCertificate());
model.setValidate(false);
return Panache.withTransaction(() -> repository.persist(model));
}));
} else {
return repository.findById(form.getId()).chain(model -> {
- model.setCertificate(form.isCertificate());
+ model.setCertificate(form.getCertificate());
return Panache.withTransaction(() -> repository.persist(model));
});
}
diff --git a/src/main/webapp/src/App.jsx b/src/main/webapp/src/App.jsx
index aeee804..85662c9 100644
--- a/src/main/webapp/src/App.jsx
+++ b/src/main/webapp/src/App.jsx
@@ -95,7 +95,7 @@ function Root() {
{
return
+ (licence.validate ? "success" : (licence.certificate?.length > 0 ? "warning" : "danger"))}>
{licence?.saison}-{licence?.saison + 1}
-
+
+ Médecin figurant sur le certificat médical
+
diff --git a/src/main/webapp/src/pages/club/member/LicenceCard.jsx b/src/main/webapp/src/pages/club/member/LicenceCard.jsx
index 017990e..ec3c913 100644
--- a/src/main/webapp/src/pages/club/member/LicenceCard.jsx
+++ b/src/main/webapp/src/pages/club/member/LicenceCard.jsx
@@ -7,6 +7,7 @@ import {AxiosError} from "../../../components/AxiosError.jsx";
import {apiAxios, errFormater, getSaison} from "../../../utils/Tools.js";
import {toast} from "react-toastify";
import {ColoredText} from "../../../components/ColoredCircle.jsx";
+import {TextField} from "../../../components/MemberCustomFiels.jsx";
function licenceReducer(licences, action) {
switch (action.type) {
@@ -63,11 +64,11 @@ export function LicenceCard({userData}) {
{licences.map((licence, index) => {
return
+ (licence.validate ? "success" : (licence.certificate?.length > 0 ? "warning" : "danger"))}>
{licence?.saison}-{licence?.saison + 1}
})}
@@ -126,11 +127,11 @@ function removeLicence(id, dispatch) {
}
function ModalContent({licence, dispatch}) {
- const [certificate, setCertificate] = useState(false)
+ const [certificate, setCertificate] = useState("")
const [isNew, setNew] = useState(true)
const handleCertificateChange = (event) => {
- setCertificate(event.target.value === 'true');
+ setCertificate(event.target.value);
}
useEffect(() => {
@@ -139,7 +140,7 @@ function ModalContent({licence, dispatch}) {
setCertificate(licence.certificate)
} else {
setNew(true)
- setCertificate(false)
+ setCertificate("")
}
}, [licence]);
@@ -156,27 +157,19 @@ function ModalContent({licence, dispatch}) {
aria-label="Close">
- {currentSaison &&
+ {currentSaison && !licence.validate &&
}
- {currentSaison && licence.validate === false &&
+ {currentSaison && !licence.validate &&
}