diff --git a/src/components/Employes.js b/src/components/Employes.js index 1fd9036..9fa914a 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -1093,6 +1093,7 @@ const Employes = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("archive", "0"); + form.append("is_ftion_initiale", "2"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_partner_class_Without_Scope_Action/"; diff --git a/src/components/Intranet_Commande_Devis.js b/src/components/Intranet_Commande_Devis.js index e9d424a..d6a2789 100644 --- a/src/components/Intranet_Commande_Devis.js +++ b/src/components/Intranet_Commande_Devis.js @@ -730,6 +730,7 @@ const Intranet_Commande_Devis = (props) => { const stored_cookie = getCookie('tokenmysych'); form.append("token", stored_cookie); form.append("archive", "0"); + form.append("is_ftion_initiale", "2"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_partner_class/"; diff --git a/src/components/Intranet_Mes_Stagiaires.js b/src/components/Intranet_Mes_Stagiaires.js index bca0dac..38395fb 100644 --- a/src/components/Intranet_Mes_Stagiaires.js +++ b/src/components/Intranet_Mes_Stagiaires.js @@ -4170,6 +4170,7 @@ registerLocale('fr', fr); const stored_cookie = getCookie('tokenmysych'); form.append("token", stored_cookie); form.append("archive", "0"); + form.append("is_ftion_initiale", "2"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_partner_class/"; setLoading(true); diff --git a/src/components/Module_Ent_Mes_Formations.js b/src/components/Module_Ent_Mes_Formations.js index a22cf8f..36e784d 100644 --- a/src/components/Module_Ent_Mes_Formations.js +++ b/src/components/Module_Ent_Mes_Formations.js @@ -115,7 +115,7 @@ const useStyles = makeStyles((theme) => ({ color: 'gray', }, })); - + const Module_Ent_Mes_Formations = (props) => { registerLocale('fr', fr); const classes = useStyles(); @@ -419,88 +419,93 @@ const Module_Ent_Mes_Formations = (props) => { const [Get_List_Ent_Formation_api, setGet_List_Ent_Formation_api] = useState(); const [Get_List_Ent_Formation_message, setGet_List_Ent_Formation_message] = useState(); const [Get_List_Ent_Formation_result, setGet_List_Ent_Formation_result] = useState(); - function Get_List_Ent_Formation(local_apprenant_id) { - - var form = new FormData(); - const stored_cookie = getCookie('tokenmysych'); - - form.append("token", stored_cookie); - form.append("apprenant_id", local_apprenant_id); - var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Ent_Student_List_Class/"; + async function Get_List_Ent_Formation(local_apprenant_id) { + try { + var form = new FormData(); + const stored_cookie = getCookie("tokenmysych"); - setLoading(true); - axios.post(myurl, form).then(res => { - //console.log(" In Get_List_Ent_Formation res.data.status = " + res.data.status); - //console.log(" In Get_List_Ent_Formation res.data.message r_class = " + res.data.message); + form.append("token", stored_cookie); + form.append("apprenant_id", local_apprenant_id); + + var myurl = + process.env.REACT_APP_API_URL + "myclass/api/Get_Ent_Student_List_Class/"; + + setLoading(true); + + const response = await fetch(myurl, { + method: "POST", + body: form, + }); + + const res = await response.json(); setLoading(false); - if (String(res.data.status) === String("true")) { + // console.log(" In Get_List_Ent_Formation res.status = " + res.status); + // console.log(" In Get_List_Ent_Formation res.message = " + res.message); + + if (String(res.status) === "true") { setGet_List_Ent_Formation_api("true"); - setGet_List_Ent_Formation_result(res.data.message); + setGet_List_Ent_Formation_result(res.message); var new_data2 = []; - const new_data = res.data.message.map((x) => { - //--- - var localid = JSON.parse(x).id; - var local_id = JSON.parse(x)._id; - var external_code = JSON.parse(x).external_code; - var title = JSON.parse(x).title; - var objectif = JSON.parse(x).objectif; - var programme = JSON.parse(x).programme; - var prerequis = JSON.parse(x).prerequis; - var description = JSON.parse(x).description; - var associated_session_id = JSON.parse(x).session_id; - var associated_inscription_id = JSON.parse(x).inscription_id; + res.message.map((x) => { + const parsed = typeof x === "string" ? JSON.parse(x) : x; - var session_code_session = JSON.parse(x).session_code_session; - var session_date_debut = JSON.parse(x).session_date_debut; - var session_date_fin = JSON.parse(x).session_date_fin; + var localid = parsed.id; + var local_id = parsed._id; + var external_code = parsed.external_code; + var title = parsed.title; + var objectif = parsed.objectif; + var programme = parsed.programme; + var prerequis = parsed.prerequis; + var description = parsed.description; + var associated_session_id = parsed.session_id; + var associated_inscription_id = parsed.inscription_id; + var session_code_session = parsed.session_code_session; + var session_date_debut = parsed.session_date_debut; + var session_date_fin = parsed.session_date_fin; - - //--- var node = { - "_id": local_id, - "id": localid, - "label": external_code, - "external_code": external_code, - "title": title, - "objectif": objectif, - "programme": programme, - "prerequis": prerequis, - "description": description, - "associated_session_id": associated_session_id, - "associated_inscription_id": associated_inscription_id, - "session_code_session": session_code_session, - "session_date_debut": session_date_debut, - "session_date_fin": session_date_fin, - + _id: local_id, + id: localid, + label: external_code, + external_code: external_code, + title: title, + objectif: objectif, + programme: programme, + prerequis: prerequis, + description: description, + associated_session_id: associated_session_id, + associated_inscription_id: associated_inscription_id, + session_code_session: session_code_session, + session_date_debut: session_date_debut, + session_date_fin: session_date_fin, }; + new_data2.push(node); }); - if (new_data2.length > 0) + if (new_data2.length > 0) { setNew_Get_List_Ent_Formation_result(new_data2); - } - else if (String(res.data.status) === String("Err_Connexion")) { - alert('Erreur: ' + res.data.message); + } + } else if (String(res.status) === "Err_Connexion") { + alert("Erreur: " + res.message); history.push("/ent_student"); - } - else { + } else { setGet_List_Ent_Formation_api("false"); - setGet_List_Ent_Formation_message(res.data.message); - alert('Erreur: ' + res.data.message); + setGet_List_Ent_Formation_message(res.message); + alert("Erreur: " + res.message); } - - }).catch((error) => { + } catch (error) { setLoading(false); - console.warn('Not good man :( Get_List_Ent_Formation = ', error); + console.warn("Not good man :( Get_List_Ent_Formation = ", error); setGet_List_Ent_Formation_api("false"); - alert('Erreur: Impossible de recuperer la liste des formation'); - }) + alert("Erreur: Impossible de recuperer la liste des formation"); + } } const [Getall_Sequence_Of_Session_result_planning_view, setGetall_Sequence_Of_Session_result_planning_view] = useState([]); @@ -2830,7 +2835,7 @@ const Module_Ent_Mes_Formations = (props) => { {String(submenu) === "absences" && Get_Given_Class_Data_result && Get_Given_Class_Data_result.length > 0 &&