diff --git a/src/App.js b/src/App.js index 3ada2bb..7ddb71f 100644 --- a/src/App.js +++ b/src/App.js @@ -29,7 +29,7 @@ import ContactezNous from "./pages/contactez_nous"; import CoupDeCoeur from "./pages/coupdecoeur"; import AccountUserActivated from "./pages/accountuseractivated"; import ProduitsService from "./pages/produitservice"; -import ScrollToTop from "react-scroll-to-top"; +import scrollToTop from "react-scroll-to-top"; import Recherche_new from "./pages/recherche_new"; import Recherche_old from "./pages/recherche"; import UserSignFirst from "./pages/usersigninfirst"; @@ -56,7 +56,7 @@ function App() { */}
- + diff --git a/src/components/Abonnement.js b/src/components/Abonnement.js index 0f445c8..0d2e551 100644 --- a/src/components/Abonnement.js +++ b/src/components/Abonnement.js @@ -540,7 +540,10 @@ function Abonnement(props) { setgotocheckout("1"); setselectedpacks(packs); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); return; } @@ -577,14 +580,20 @@ function Abonnement(props) { setgotocheckout("1"); setselectedpacks(packs); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } } function confirmAbonnement(packs) { - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); if (Client_end_date_abonnement && String(Client_end_date_abonnement).length > 3) { @@ -634,7 +643,10 @@ function Abonnement(props) { setgotocheckout("1"); setselectedpacks(packs); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); return; } @@ -671,7 +683,10 @@ function Abonnement(props) { setgotocheckout("1"); setselectedpacks(packs); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } } } diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index bdcb134..464c771 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -304,7 +304,10 @@ const AddClassManual = (props) => { } setdatamodification("0"); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, [props.mytrainingclass['ref'],]); @@ -1097,7 +1100,10 @@ const AddClassManual = (props) => { } setdatamodification("0"); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } diff --git a/src/components/CheckOut.js b/src/components/CheckOut.js index 397b88f..b473d04 100644 --- a/src/components/CheckOut.js +++ b/src/components/CheckOut.js @@ -449,7 +449,10 @@ function CheckOut(props) { - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, []); diff --git a/src/components/DisplayDetailClass_new.js b/src/components/DisplayDetailClass_new.js index b7ada79..d4e716f 100644 --- a/src/components/DisplayDetailClass_new.js +++ b/src/components/DisplayDetailClass_new.js @@ -445,12 +445,18 @@ const DisplayDetailClass = (props) => { } else { setinscritpion("1"); } - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } function Contact_bton(event) { setinscritpion("2"); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } diff --git a/src/components/DisplayDetailClass_new_Action.js b/src/components/DisplayDetailClass_new_Action.js index 262ddbd..740182d 100644 --- a/src/components/DisplayDetailClass_new_Action.js +++ b/src/components/DisplayDetailClass_new_Action.js @@ -164,7 +164,10 @@ const DisplayDetailClassAction = (props) => { GetCurrentClass_trainingsession(); funclocaltoken(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); document.getElementsByName('mytitle')[0].focus(); }, []); diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index 08bccb9..6d9203f 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -179,7 +179,10 @@ const DisplayDetailClass_new_v2 = (props) => { funclocaltoken(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, []); @@ -776,7 +779,10 @@ const DisplayDetailClass_new_v2 = (props) => { var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 900; document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } else if (window.screen.width >= 992 && window.screen.width <= 1199) { @@ -786,7 +792,10 @@ const DisplayDetailClass_new_v2 = (props) => { var new_displaydetailclass_new_v2_hei = parseInt(displaydetailclass_new_v2_hei) + 500; document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } else if (window.screen.width >= 1200) { var meme_orga_top = document.getElementById('block_crossell_meme_orga').style.top; @@ -796,7 +805,10 @@ const DisplayDetailClass_new_v2 = (props) => { document.getElementById('block_crossell_meme_orga').style.top = new_meme_orga_top + "px"; document.getElementById('desktop').style.height = new_displaydetailclass_new_v2_hei + "px"; - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } @@ -852,7 +864,10 @@ const DisplayDetailClass_new_v2 = (props) => { } else { - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } } @@ -1014,7 +1029,10 @@ const DisplayDetailClass_new_v2 = (props) => { } - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } @@ -1067,7 +1085,10 @@ const DisplayDetailClass_new_v2 = (props) => { } - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 7006d8e..876e979 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -574,7 +574,10 @@ const DistplayPartnerTraningsPage = (props) => { useEffect(() => { //GetAllClass(); GetAllClass_new(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, []); function Clearselectedfilt1() { diff --git a/src/components/DisplayUserGoals.js b/src/components/DisplayUserGoals.js index 3d82327..a52f7c5 100644 --- a/src/components/DisplayUserGoals.js +++ b/src/components/DisplayUserGoals.js @@ -100,7 +100,10 @@ function DisplayUserGoals(props) { useEffect(() => { Getlistgoals(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, []); function closeUpdateUserGoals() { diff --git a/src/components/Facture.js b/src/components/Facture.js index 60d25b5..65efa00 100644 --- a/src/components/Facture.js +++ b/src/components/Facture.js @@ -463,7 +463,10 @@ function Facture(props) { function confirmAbonnement(packs) { - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); if (String(packs).toLowerCase() === String("decouverte")) { @@ -493,7 +496,10 @@ function Facture(props) { setgotocheckout("1"); setselectedpacks(packs); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); return; } @@ -530,7 +536,10 @@ function Facture(props) { setgotocheckout("1"); setselectedpacks(packs); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } } diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index df88102..38f8af3 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -1147,7 +1147,10 @@ function GestionAdministrative(props) { GetCurrentClass_trainingsession(); GetAttestation_Certif(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, []); @@ -1430,6 +1433,7 @@ function GestionAdministrative(props) { else { setCreateSessionFormation_api("false"); setCreateSessionFormation_message(res.data.message); + alert(res.data.message) } }).catch((error) => { @@ -1621,6 +1625,7 @@ function GestionAdministrative(props) { else { setone_CreateSessionFormation_api("false"); setone_CreateSessionFormation_message(res.data.message); + alert(res.data.message) } }).catch((error) => { @@ -1651,8 +1656,8 @@ function GestionAdministrative(props) { if (String(res.data.status) === "true") { //console.log(" In GetCurrentSession res.data.status = " + res.data.status); - //console.log(" In GetCurrentSession res.data.message r_class = " + res.data.message); - //console.log(" In GetCurrentSession res.data.message len = " + String(res.data.message).length); + console.log(" In GetCurrentSession res.data.message r_class = " + res.data.message); + console.log(" In GetCurrentSession res.data.message len = " + String(res.data.message).length); setGetCurrentSession_api("true"); if (String(res.data.message).length > 0) { @@ -1753,10 +1758,12 @@ function GestionAdministrative(props) { setsessionStatus(false); } + } else { setGetCurrentSession_api("false"); setGetCurrentSession_message(res.data.message); + alert("Erreur : " + res.data.message); } }).catch((error) => { @@ -3749,6 +3756,47 @@ function GestionAdministrative(props) { />
+ +
Date Debut des inscriptions * + { + setone_SessionstartDateInscription(date); + setsessionChanged(true); + } + + } + showTimeSelect={false} + //filterTime={filterPassedTime_start} + dateFormat="dd/MM/yyyy" + className="disabled_style enable_style" + locale='fr-FR' + + /> +
+ + +
Date Fin des inscriptions * + { + setone_SessionendDateInscription(date); + setsessionChanged(true); + } + } + showTimeSelect={false} + //filterTime={filterPassedTime_end} + dateFormat="dd/MM/yyyy" + className="disabled_style enable_style" + /> +
+
Présentiel* (0 = Non, 1 = Oui)
-
-
Date Debut des inscriptions * - { - setone_SessionstartDateInscription(date); - setsessionChanged(true); - } - - } - showTimeSelect={false} - //filterTime={filterPassedTime_start} - dateFormat="dd/MM/yyyy" - className="disabled_style enable_style" - locale='fr-FR' - - /> -
- - -
Date Fin des inscriptions * - { - setone_SessionendDateInscription(date); - setsessionChanged(true); - } - } - showTimeSelect={false} - //filterTime={filterPassedTime_end} - dateFormat="dd/MM/yyyy" - className="disabled_style enable_style" - /> -
-
- +
Choisir un modèle d'attestation : @@ -4008,8 +4015,8 @@ function GestionAdministrative(props) { {String(addOneSession) !== "1" &&
-
- +
+ Choisir une session
+ {/* @@ -3278,14 +3320,13 @@ const Recherche_new_v2 = () => { Tous les métiers
-
-
+
{mymetier && String(mymetier) === "management" && } @@ -3465,7 +3506,7 @@ const Recherche_new_v2 = () => {
-
+
} {/*
diff --git a/src/components/SignUp.js b/src/components/SignUp.js index 6e6439a..3f49c83 100644 --- a/src/components/SignUp.js +++ b/src/components/SignUp.js @@ -107,7 +107,10 @@ function SignUp() { const onSubmit = async (data) => { - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); var mymail = document.getElementsByName("email")[0].value; //var mypwd = document.getElementsByName("pwd")[0].value; @@ -268,7 +271,10 @@ function SignUp() { alert(String(result['message'])); setisconnected("true"); setmyApimyApiMessage(result['message']); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); if (String(menucompte) === String("user")) { history.push("/Connexion-utilisateur-0"); @@ -308,7 +314,10 @@ function SignUp() { }; document.addEventListener("keydown", listener); //menu_user_account(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); if (String(menucompte) === String("user")) { menu_user_account() diff --git a/src/components/UpdatePartnerInfo.js b/src/components/UpdatePartnerInfo.js index 099dcd5..ed01c2d 100644 --- a/src/components/UpdatePartnerInfo.js +++ b/src/components/UpdatePartnerInfo.js @@ -611,7 +611,10 @@ function UpdateParnterInfo() { document.getElementsByName("website")[0].style.backgroundColor = "#FFFFFF"; setfields1desabled(false); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); } @@ -790,10 +793,16 @@ function UpdateParnterInfo() { .catch((error) => { console.error('Error:', error); setmyApiResponse("false"); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }; diff --git a/src/components/UpdateUserGoals.js b/src/components/UpdateUserGoals.js index 792310d..52cf637 100644 --- a/src/components/UpdateUserGoals.js +++ b/src/components/UpdateUserGoals.js @@ -32,7 +32,10 @@ function UpdateUserGoals(props) { useEffect(() => { getGolData(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, [props.name_obj]); function cleanField() { diff --git a/src/components/UpdateUserProfil.js b/src/components/UpdateUserProfil.js index 031610d..fb66748 100644 --- a/src/components/UpdateUserProfil.js +++ b/src/components/UpdateUserProfil.js @@ -115,7 +115,10 @@ function UpdateUserProfil(props) { useEffect(() => { GetUserProfilData(); - window.scrollTo(0, 0); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); }, []); diff --git a/src/components/UpgradeToPro.js b/src/components/UpgradeToPro.js index 9e60ddc..65fabf3 100644 --- a/src/components/UpgradeToPro.js +++ b/src/components/UpgradeToPro.js @@ -37,7 +37,7 @@ function UpgradeToPro() { useEffect(() => { - //window.scrollTo(0, 0); + }, [gotocheckout]) // recuperation et gestion du token utilisateur @@ -199,7 +199,10 @@ function UpgradeToPro() { buttons: [ { label: 'Oui', - onClick: () => { UpgradeToPro(packs); window.scrollTo(0, 0); } + onClick: () => { UpgradeToPro(packs); window.scrollTo({ + top: 0, + behavior: "smooth", + }); } }, { label: 'Non', diff --git a/src/styles/components/_gestionadministrative.scss b/src/styles/components/_gestionadministrative.scss index d998a1c..a53eaac 100644 --- a/src/styles/components/_gestionadministrative.scss +++ b/src/styles/components/_gestionadministrative.scss @@ -161,9 +161,10 @@ font-size: small !important; color: black; width: 97% !important; - border: none !important; + //border: none !important; margin: 5px !important; height: 3.5rem !important; + background: white; } .training_caract { @@ -443,8 +444,9 @@ width: 90% !important; height: 3.5rem !important; margin: 5px !important; - border: none !important; + //border: none !important; border-radius: 5px; + background: white; } .training_caract { @@ -716,8 +718,9 @@ width: 90% !important; height: 3.5rem !important; margin: 5px !important; - border: none !important; + //border: none !important; border-radius: 5px; + background: white; } .training_caract { @@ -991,8 +994,9 @@ width: 90% !important; height: 3.5rem !important; margin: 5px !important; - border: none !important; + //border: none !important; border-radius: 5px; + background: white; } .training_caract { @@ -1235,15 +1239,15 @@ overflow: visible; text-align: center; height: 5px; -} + } -.mysy_hr_text:after { + .mysy_hr_text:after { background: #fff; - content: 'Détail'; + content: 'Détails'; padding: 0 4px; position: relative; top: -13px; -} + } } @@ -1301,4 +1305,15 @@ .select_option_css { border-radius: 0px !important; +} + +.css-9ddj71-MuiInputBase-root-MuiOutlinedInput-root{ + height: 3.5rem !important; +} + + + + +.react-datepicker__input-container{ + width: 110%; } \ No newline at end of file