From 3ccf8800571804961f67bd5275a6378492b92f5f Mon Sep 17 00:00:00 2001
From: Thibaut Valentin <thibaut.valentin@epita.fr>
Date: Fri, 19 Jul 2024 15:24:58 +0200
Subject: [PATCH] feat: change certif type

---
 .../ffsaf/data/model/LicenceModel.java        |  2 +-
 .../ffsaf/domain/service/LicenceService.java  |  8 ++---
 .../ffsaf/rest/data/SimpleLicence.java        |  4 +--
 .../ffsaf/rest/from/LicenceForm.java          |  2 +-
 src/main/webapp/src/App.jsx                   |  2 +-
 .../src/pages/admin/member/LicenceCard.jsx    | 16 ++++++----
 .../src/pages/club/member/LicenceCard.jsx     | 29 +++++++------------
 7 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java
index ae5d0e7..4f3151c 100644
--- a/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java
+++ b/src/main/java/fr/titionfire/ffsaf/data/model/LicenceModel.java
@@ -24,7 +24,7 @@ public class LicenceModel {
 
     int saison;
 
-    boolean certificate;
+    String certificate;
 
     boolean validate;
 }
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/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java
index c9fedce..8714d1f 100644
--- a/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java
+++ b/src/main/java/fr/titionfire/ffsaf/rest/data/SimpleLicence.java
@@ -14,7 +14,7 @@ public class SimpleLicence {
     Long id;
     Long membre;
     int saison;
-    boolean certificate;
+    String certificate;
     boolean validate;
 
     public static SimpleLicence fromModel(LicenceModel model) {
@@ -25,7 +25,7 @@ public class SimpleLicence {
                 .id(model.getId())
                 .membre(model.getMembre().getId())
                 .saison(model.getSaison())
-                .certificate(model.isCertificate())
+                .certificate(model.getCertificate())
                 .validate(model.isValidate())
                 .build();
     }
diff --git a/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java b/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java
index 678acc7..d587e34 100644
--- a/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java
+++ b/src/main/java/fr/titionfire/ffsaf/rest/from/LicenceForm.java
@@ -17,7 +17,7 @@ public class LicenceForm {
     private int saison;
 
     @FormParam("certificate")
-    private boolean certificate;
+    private String certificate = null;
 
     @FormParam("validate")
     private boolean validate;
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() {
         <div className="container my-4">
             <Outlet/>
             <ToastContainer
-                position="top-center"
+                position="bottom-right"
                 autoClose={5000}
                 hideProgressBar={false}
                 newestOnTop={false}
diff --git a/src/main/webapp/src/pages/admin/member/LicenceCard.jsx b/src/main/webapp/src/pages/admin/member/LicenceCard.jsx
index 6106c6b..b662be5 100644
--- a/src/main/webapp/src/pages/admin/member/LicenceCard.jsx
+++ b/src/main/webapp/src/pages/admin/member/LicenceCard.jsx
@@ -67,7 +67,7 @@ export function LicenceCard({userData}) {
                 {licences.map((licence, index) => {
                     return <div key={index}
                                 className={"list-group-item d-flex justify-content-between align-items-start list-group-item-" +
-                                    (licence.validate ? "success" : (licence.certificate ? "warning" : "danger"))}>
+                                    (licence.validate ? "success" : (licence.certificate?.length > 0 ? "warning" : "danger"))}>
                         <div className="me-auto">{licence?.saison}-{licence?.saison + 1}</div>
                         <button className="badge btn btn-primary rounded-pill" data-bs-toggle="modal"
                                 data-bs-target="#LicenceModal" onClick={_ => setModal(licence)}>
@@ -93,6 +93,8 @@ function sendLicence(event, dispatch) {
     event.preventDefault();
 
     const formData = new FormData(event.target);
+    formData.set('licence', event.target.licence?.value?.length > 0 ? event.target.licence?.value : null)
+
     toast.promise(
         apiAxios.post(`/licence/${formData.get('membre')}`, formData),
         {
@@ -130,14 +132,14 @@ function removeLicence(id, dispatch) {
 
 function ModalContent({licence, dispatch}) {
     const [saison, setSaison] = useState(0)
-    const [certificate, setCertificate] = useState(false)
+    const [certificate, setCertificate] = useState("")
     const [validate, setValidate] = useState(false)
     const [isNew, setNew] = useState(true)
     const setSeason = (event) => {
         setSaison(Number(event.target.value))
     }
     const handleCertificateChange = (event) => {
-        setCertificate(event.target.value === 'true');
+        setCertificate(event.target.value);
     }
     const handleValidateChange = (event) => {
         setValidate(event.target.value === 'true');
@@ -152,7 +154,7 @@ function ModalContent({licence, dispatch}) {
         } else {
             setNew(true)
             setSaison(getSaison())
-            setCertificate(false)
+            setCertificate("")
             setValidate(false)
         }
     }, [licence]);
@@ -175,8 +177,10 @@ function ModalContent({licence, dispatch}) {
                 <span className="input-group-text" id="basic-addon2">-</span>
                 <span className="input-group-text" id="basic-addon2">{saison + 1}</span>
             </div>
-            <RadioGroupeOnOff name="certificate" text="Certificat médical valide" value={certificate}
-                              onChange={handleCertificateChange}/>
+
+            <span>Médecin figurant sur le certificat médical</span>
+            <TextField name="certificate" text="Nom" value={certificate}
+                       onChange={handleCertificateChange} required={false}/>
             <RadioGroupeOnOff name="validate" text="Validation de la licence" value={validate}
                               onChange={handleValidateChange}/>
         </div>
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 <div key={index}
                                 className={"list-group-item d-flex justify-content-between align-items-start list-group-item-" +
-                                    (licence.validate ? "success" : (licence.certificate ? "warning" : "danger"))}>
+                                    (licence.validate ? "success" : (licence.certificate?.length > 0 ? "warning" : "danger"))}>
                         <div className="me-auto">{licence?.saison}-{licence?.saison + 1}</div>
                         <button className="badge btn btn-primary rounded-pill" data-bs-toggle="modal"
                                 data-bs-target="#LicenceModal" onClick={_ => setModal(licence)}>
-                            {licence.saison === getSaison() ? <FontAwesomeIcon icon={faPen}/> :
+                            {licence.saison === getSaison() && !licence.validate ? <FontAwesomeIcon icon={faPen}/> :
                                 <FontAwesomeIcon icon={faInfo}/>}</button>
                     </div>
                 })}
@@ -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"></button>
         </div>
         <div className="modal-body">
-            <div className="btn-group input-group mb-3 justify-content-md-center" role="group"
-                 aria-label="Basic radio toggle button group">
-                <span className="input-group-text">Certificat médical</span>
-                <input type="radio" className="btn-check" id="btnradio1" autoComplete="off" value="false"
-                       checked={certificate === false} onChange={handleCertificateChange} disabled={!currentSaison}/>
-                <label className="btn btn-outline-primary" htmlFor="btnradio1">Non</label>
-                <input type="radio" className="btn-check" name="certificate" id="btnradio2" autoComplete="off"
-                       value="true" checked={certificate === true} onChange={handleCertificateChange}
-                       disabled={!currentSaison}/>
-                <label className="btn btn-outline-primary" htmlFor="btnradio2">Oui</label>
-            </div>
+            <span>Médecin figurant sur le certificat médical</span>
+            <TextField name="certificate" text="Nom" value={certificate}
+                       onChange={handleCertificateChange} required={false} disabled={!currentSaison || licence.validate}/>
 
             <div className="input-group mb-3 justify-content-md-center">
                 <div>Validation de la licence: <ColoredText boolean={licence.validate}/></div>
             </div>
         </div>
         <div className="modal-footer">
-            {currentSaison &&
+            {currentSaison && !licence.validate &&
                 <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>
-            {currentSaison && licence.validate === false &&
+            {currentSaison && !licence.validate &&
                 <button type="button" className="btn btn-danger" data-bs-dismiss="modal"
                         onClick={() => removeLicence(licence.id, dispatch)}>Annuler</button>}
         </div>