diff --git a/src/components/ButtonHilight.js b/src/components/ButtonHilight.js index c88f652..1d537c6 100644 --- a/src/components/ButtonHilight.js +++ b/src/components/ButtonHilight.js @@ -189,8 +189,8 @@ const ButtonHilight = () => { function part_logout_confirmation() { /* si c'est une connexion partner qui est active */ - alert(" deccc"); - console.log(" ### AVANNN deconnexion iciiii"); + //alert(" deccc"); + //console.log(" ### AVANNN deconnexion iciiii"); if (typeof (stored_part) != "undefined") { console.log(" ### deconnexion iciiii"); setpartCookie("tokenmysypart", "", { path: '/' }); diff --git a/src/components/DisplayDetailClass_new_v2.js b/src/components/DisplayDetailClass_new_v2.js index 6d9203f..d7cae4d 100644 --- a/src/components/DisplayDetailClass_new_v2.js +++ b/src/components/DisplayDetailClass_new_v2.js @@ -887,7 +887,7 @@ const DisplayDetailClass_new_v2 = (props) => { //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status); //console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); - if (String(res.data.status) === "true") { + if (String(res.data.status) === String("true") ) { //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status); //console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); setGetCurrentClass_api("true"); diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index a6d157f..20fc020 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -798,7 +798,7 @@ function GestionAdministrative(props) { axios.post(myurl, form).then(res => { - if (res.data.status === String("true")) { + if (String(res.data.status) === String("true")) { //console.log(" In GetCurrentClass res.data.status = " + res.data.status); //console.log(" In GetCurrentClass res.data.message r_class = " + res.data.message); setGetCurrentClass_api("true"); @@ -849,6 +849,19 @@ function GestionAdministrative(props) { form.append("session_id", localsessionid); form.append("status", "0"); + /* + + /!\ : Cette fonction a besoin d'un token actif + */ + + if (String(stored_cookie) === String("")) { + alert(" La session n'est plus valide"); + history.push("/Connexion"); + return; + } + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllClassStagiaire/"; fetch(myurl, @@ -1042,6 +1055,17 @@ function GestionAdministrative(props) { form.append("session_id", localsessionid); form.append("status", "1"); + /* + +/!\ : Cette fonction a besoin d'un token actif +*/ + + if (String(stored_cookie) === String("")) { + alert(" La session n'est plus valide "); + history.push("/Connexion"); + return; + } + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllClassStagiaire/"; fetch(myurl, @@ -1054,16 +1078,16 @@ function GestionAdministrative(props) { //console.log(' GetListeInscrit : Success:', data['message'], "data['status'] = ", data['status']); setGetListePreinscrit_insc_result(data['message']); setRows_insc(data['message']); - if (String(data['status']) === String("false")) { + if (String(data['status']) === String("true")) { //console.log("erreur rrrr:" + data['status']) - setGetListePreinscrit_insc_api("false"); + setGetListePreinscrit_insc_api("true"); } else if (String(data['status']) === String("Err_Connexion")) { alert('Erreur: ' + data['message']); history.push("/Connexion"); } else { - setGetListePreinscrit_insc_api("true"); + setGetListePreinscrit_insc_api("false"); } @@ -1089,6 +1113,17 @@ function GestionAdministrative(props) { form.append("class_internal_url", internal_url); form.append("session_id", localsessionid); + /* + + /!\ : Cette fonction a besoin d'un token actif + */ + + if (String(stored_cookie) === String("")) { + alert(" La session n'est plus valide "); + history.push("/Connexion"); + return; + } + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetTableauEmargement/"; fetch(myurl, @@ -1136,6 +1171,17 @@ function GestionAdministrative(props) { form.append("token", stored_cookie); form.append("session_id", localsessionid); + + /* + /!\ : Cette fonction a besoin d'un token actif + */ + + if (String(stored_cookie) === String("")) { + alert(" La session n'est plus valide "); + history.push("/Connexion"); + return; + } + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetListEvaluation_Session/"; fetch(myurl, @@ -1187,6 +1233,21 @@ function GestionAdministrative(props) { const [selectedsession_date_du, setselectedsession_date_du] = useState(new Date()); const [selectedsession_date_au, setselectedsession_date_au] = useState(new Date()); function handleChangeSession(event) { + + /* + + /!\ : Cette fonction a besoin d'un token actif + */ + + //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); + const stored_cookie = getCookie('tokenmysypart'); + if (String(stored_cookie) === String("")) { + alert(" La session n'est plus valide "); + history.push("/Connexion"); + return; + } + + setreduction_session("0"); setsessionChanged(false); clearSessionFields(); diff --git a/src/components/PaymentMethode.js b/src/components/PaymentMethode.js index 2ad38ba..ef3502f 100644 --- a/src/components/PaymentMethode.js +++ b/src/components/PaymentMethode.js @@ -285,7 +285,7 @@ function PaymentMethode(props) {