diff --git a/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx b/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx index 98fd7f7..9fc789e 100644 --- a/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx +++ b/src/components/ENT_Student_header_automatic_files/ENT_Student_Header.jsx @@ -433,7 +433,7 @@ const ENT_Student_Header = () => { } {stored_tuteur_id && stored_tuteur_id.length > 5 && - Tuteur Compte {stored_tuteur_id} + Tuteur Compte } diff --git a/src/components/header_automatic_files/Header_ENT_Student.jsx b/src/components/header_automatic_files/Header_ENT_Student.jsx index 6dc1e50..40673b0 100644 --- a/src/components/header_automatic_files/Header_ENT_Student.jsx +++ b/src/components/header_automatic_files/Header_ENT_Student.jsx @@ -90,7 +90,7 @@ const Header_ENT_Student = () => { const stored_part = getCookie('tokenmysypart'); const stored_apprenant_id = getCookie('tokenmysychapprenant'); const stored_tuteur_id = getCookie('tokenmysytuteurrhid'); - + const stored_tokenmysytypeconnexion = getCookie('tokenmysytypeconnexion'); const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych'], { path: '/' }); const [partcookie, setpartCookie, removepartCookie] = useCookies(['tokenmysypart'], { path: '/' }); @@ -252,37 +252,37 @@ const Header_ENT_Student = () => { setDialog_1_open(false); }; - const [Server_Logout_api, setServer_Logout_api] = useState(); - const [Server_Logout_message, setServer_Logout_message] = useState(); - const [Server_Logout_result, setServer_Logout_result] = useState([]); - function Server_Logout(local_token) { + const [Server_Logout_api, setServer_Logout_api] = useState(); + const [Server_Logout_message, setServer_Logout_message] = useState(); + const [Server_Logout_result, setServer_Logout_result] = useState([]); + function Server_Logout(local_token) { - var form = new FormData(); + var form = new FormData(); - form.append("token", local_token); - - var myurl = process.env.REACT_APP_API_URL + "myclass/api/partner_logout/"; + form.append("token", local_token); - axios.post(myurl, form).then(res => { - if (String(res.data.status) === String("true")) { - //console.log(" In Server_Logout res.data.status = " + res.data.status); - // console.log(" In Server_Logout res.data.message r_class = " + res.data.message); - setServer_Logout_api("true"); - setServer_Logout_result(res.data.message); - } - else { - setServer_Logout_api("false"); - setServer_Logout_message(res.data.message); - - } + var myurl = process.env.REACT_APP_API_URL + "myclass/api/partner_logout/"; - }).catch((error) => { - console.warn('Not good man :( Server_Logout = ', error); - setServer_Logout_api("false"); - //alert("Impossible de récuperer la liste des emails"); - //setmyApimyApiMessage("") - }) - } + axios.post(myurl, form).then(res => { + if (String(res.data.status) === String("true")) { + //console.log(" In Server_Logout res.data.status = " + res.data.status); + // console.log(" In Server_Logout res.data.message r_class = " + res.data.message); + setServer_Logout_api("true"); + setServer_Logout_result(res.data.message); + } + else { + setServer_Logout_api("false"); + setServer_Logout_message(res.data.message); + + } + + }).catch((error) => { + console.warn('Not good man :( Server_Logout = ', error); + setServer_Logout_api("false"); + //alert("Impossible de récuperer la liste des emails"); + //setmyApimyApiMessage("") + }) + } function part_logout_confirmation() { @@ -292,13 +292,13 @@ const Header_ENT_Student = () => { const stored_cookie = getCookie('tokenmysypart'); var acces_right_token_name = stored_cookie + "_uar"; - Server_Logout(stored_cookie); + Server_Logout(stored_cookie); removeCookie(acces_right_token_name,); removeCookie("tokenmysychapprenant"); - // removeCookie("tokenmysych"); + // removeCookie("tokenmysych"); removeCookie("tokenmysychconnecteduserid"); removeCookie("tokenmysytypeconnexion"); @@ -314,7 +314,7 @@ const Header_ENT_Student = () => { } setsomeoneconnected("0"); setDialog_1_open(false); - + history.push("/recherche-formation"); } @@ -328,7 +328,7 @@ const Header_ENT_Student = () => { removeCookie("tokenmysychapprenant"); removeCookie("tokenmysych"); - // removeCookie("tokenmysypart"); + // removeCookie("tokenmysypart"); removeCookie("tokenmysytuteurrhid",); removeCookie("tokenmysychconnecteduserid"); removeCookie("tokenmysytypeconnexion"); @@ -459,10 +459,14 @@ const Header_ENT_Student = () => {
- {String(someoneconnected) === String("1") && + {(!stored_tuteur_id || stored_tuteur_id.length < 5) && String(someoneconnected) === String("1") && Mon compte } + {stored_tuteur_id && stored_tuteur_id.length > 5 && + Tuteur Compte + } +
{String(someoneconnected) !== String("1") &&