diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 92db5e4..028b75c 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -717,6 +717,10 @@ const AddClassManual = (props) => { useEffect(() => { + Get_List_Domaines(); + Get_List_Metiers(); + Get_List_Categorie(); + Get_Partner_Object_Specific_Fields("myclass"); Getall_Training_Employee_No_Filter(); Get_List_Niveau_Formation(); @@ -730,8 +734,7 @@ const AddClassManual = (props) => { setfield_datelieu(""); setfield_zone_diffusion(""); setmyApiResponse(); - Get_List_Domaines(); - Get_List_Metiers(); + fillfield(); @@ -1009,7 +1012,7 @@ const AddClassManual = (props) => { //console.log(" ### mylocaltraining.domaine = ", mylocaltraining.domaine); } else - setmytrainingdomaine("-"); + setmytrainingdomaine(""); if (mylocaltraining.metier) { @@ -1017,7 +1020,15 @@ const AddClassManual = (props) => { //console.log(" ### mylocaltraining.metier = ", mylocaltraining.metier); } else - setmytrainingmetier("-"); + setmytrainingmetier(""); + + + if (mylocaltraining.categorie) { + setmytrainingcategorie(mylocaltraining.categorie); + //console.log(" ### mylocaltraining.metier = ", mylocaltraining.metier); + } + else + setmytrainingcategorie(""); @@ -1061,14 +1072,23 @@ const AddClassManual = (props) => { } document.getElementsByName("lms_class_code")[0].value = ""; + if (mylocaltraining.lms_class_code) { //document.getElementsByName("lms_class_code")[0].value = mylocaltraining.lms_class_code; - setp_detail_lms_class_code(mylocaltraining.note); + setp_detail_lms_class_code(mylocaltraining.lms_class_code); } else { setp_detail_lms_class_code(""); } + if (mylocaltraining.version) { + //document.getElementsByName("lms_class_code")[0].value = mylocaltraining.lms_class_code; + setp_detail_version_catalogue(mylocaltraining.version); + } else { + setp_detail_version_catalogue(""); + } + + document.getElementsByName("class_inscription_url")[0].value = ""; if (mylocaltraining.class_inscription_url) { //document.getElementsByName("class_inscription_url")[0].value = mylocaltraining.class_inscription_url; @@ -1212,20 +1232,22 @@ const AddClassManual = (props) => { var presentiel = mypresence; var distentiel = mydistance; var domaine = mytrainingdomaine; - if (String(domaine).trim() === "-") { - domaine = "" - } + var mypublier = mypublished; var niveau_ftion = p_class_level; var price = document.getElementsByName("price")[0].value; var duree = document.getElementsByName("duree")[0].value; var url = document.getElementsByName("url")[0].value; - var lms_class_code = document.getElementsByName("lms_class_code")[0].value; + var lms_class_code = p_detail_lms_class_code; var class_inscription_url = document.getElementsByName("class_inscription_url")[0].value; + var mymetier = mytrainingmetier; - if (String(mymetier).trim() === "-") { - mymetier = "" - } + + + var mycategorie = mytrainingcategorie; + var version = p_detail_version_catalogue; + + var mynote = document.getElementsByName("note")[0].value; var localmycpf = mycpf; var mycertif = mycertif; @@ -1424,6 +1446,9 @@ const AddClassManual = (props) => { formData.append('internal_url', displayedinternalurl); formData.append('zone_diffusion', ""); formData.append('metier', mymetier); + formData.append('categorie', mycategorie); + formData.append('version', version); + formData.append('note', mynote); formData.append('published', mypublier); @@ -1521,8 +1546,99 @@ const AddClassManual = (props) => { } + const [mytrainingcategorie, setmytrainingcategorie] = useState(""); - const [mytrainingmetier, setmytrainingmetier] = useState("-"); + const [New_Get_List_Categorie_result, setNew_Get_List_Categorie_result] = useState([]); + + const [Get_List_Categorie_api, setGet_List_Categorie_api] = useState(); + const [Get_List_Categorie_message, setGet_List_Categorie_message] = useState(); + const [Get_List_Categorie_result, setGet_List_Categorie_result] = useState(); + function Get_List_Categorie() { + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Class_Categorie/"; + setLoading(true); + fetch(myurl, + { + method: 'POST', + body: form, + }) + .then((data) => data.json()) + .then((data) => { + setLoading(false); + // console.log(' IN Get_List_Categorie Success:', data['message'], "data['status'] = ", data['status']); + + if (String(data['status']) === String("true")) { + setGet_List_Categorie_api("true"); + setGet_List_Categorie_result(data['message']); + + var new_data2 = []; + const new_data = data['message'].map((x) => { + + + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_nom = JSON.parse(x).nom; + var local_code = JSON.parse(x).code; + var local_class_domaine_id = JSON.parse(x).class_domaine_id; + var local_class_domaine_nom = JSON.parse(x).class_domaine_nom; + + + //--- + var node = { + "id": localid, + "_id": local_id, + "label": local_nom, + "nom": local_nom, + "code": local_code, + "class_domaine_id": local_class_domaine_id, + "class_domaine_nom": local_class_domaine_nom, + + }; + new_data2.push(node); + }); + + //--- + var node = { + "id": "", + "_id": "", + "label": "", + "nom": "", + "code": "", + "class_domaine_id": "", + "class_domaine_nom": "", + + }; + new_data2.push(node); + + if (new_data2.length > 0) { + setNew_Get_List_Categorie_result(new_data2); + //console.log(" ### new_data2 ", new_data2); + //console.log(" ### setNew_Get_List_Categorie_result ", New_Get_List_Categorie_result); + } else { + setNew_Get_List_Categorie_result([]); + } + + + } + else { + setGet_List_Categorie_api("false"); + setGet_List_Categorie_message(data['message']); + } + + }).catch((error) => { + setLoading(false); + console.error('Error Get_List_Categorie :', error); + setGet_List_Categorie_api("false"); + }); + + } + + + const [mytrainingmetier, setmytrainingmetier] = useState(""); const [New_Get_List_Metiers_result, setNew_Get_List_Metiers_result] = useState([]); @@ -1531,7 +1647,10 @@ const AddClassManual = (props) => { const [Get_List_Metiers_result, setGet_List_Metiers_result] = useState(); function Get_List_Metiers() { var form = new FormData(); - var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_List_all_metier_formation/"; + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_class_metier/"; setLoading(true); fetch(myurl, { @@ -1554,25 +1673,45 @@ const AddClassManual = (props) => { //--- var localid = JSON.parse(x).id; var local_id = JSON.parse(x)._id; - var local_metier = JSON.parse(x).metier; - var local_domaine = JSON.parse(x).domaine; + var local_nom = JSON.parse(x).nom; + var local_code = JSON.parse(x).code; + var local_class_domaine_id = JSON.parse(x).class_domaine_id; + var local_class_domaine_nom = JSON.parse(x).class_domaine_nom; //--- var node = { "id": localid, - "label": local_metier, - "metier": local_metier, - "domaine": local_domaine, + "_id": local_id, + "label": local_nom, + "nom": local_nom, + "code": local_code, + "class_domaine_id": local_class_domaine_id, + "class_domaine_nom": local_class_domaine_nom, }; new_data2.push(node); }); + //--- + var node = { + "id": "", + "_id": "", + "label": "", + "nom": "", + "code": "", + "class_domaine_id": "", + "class_domaine_nom": "", + + }; + new_data2.push(node); + if (new_data2.length > 0) { setNew_Get_List_Metiers_result(new_data2); //console.log(" ### new_data2 ", new_data2); //console.log(" ### setNew_Get_List_Metiers_result ", New_Get_List_Metiers_result); + } else { + setNew_Get_List_Metiers_result([]); } @@ -1601,7 +1740,7 @@ const AddClassManual = (props) => { } - const [mytrainingdomaine, setmytrainingdomaine] = useState("-"); + const [mytrainingdomaine, setmytrainingdomaine] = useState(""); const [New_Get_List_Domaines_result, setNew_Get_List_Domaines_result] = useState([]); @@ -1610,7 +1749,11 @@ const AddClassManual = (props) => { const [Get_List_Domaines_result, setGet_List_Domaines_result] = useState(); function Get_List_Domaines() { var form = new FormData(); - var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_List_domaine_formation_JSON/"; + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Class_domaine/"; fetch(myurl, { @@ -1629,25 +1772,44 @@ const AddClassManual = (props) => { const new_data = data['message'].map((x) => { //--- - var localid = x.id; - var local_domaine = x.domaine; + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_code = JSON.parse(x).code; + var local_nom = JSON.parse(x).nom; //--- var node = { "id": localid, - "label": local_domaine, - "domaine": local_domaine, + "_id": local_id, + "nom": local_nom, + "code": local_code, + "label": local_nom, + }; new_data2.push(node); }); - if (new_data2.length > 0) + var node = { + "id": "", + "_id": "", + "nom": "", + "code": "", + "label": "", + + + }; + new_data2.push(node); + + if (new_data2.length > 0) { setNew_Get_List_Domaines_result(new_data2); - - + // console.log(" ## new_data2 = ", new_data2); + // console.log(" ## New_Get_List_Domaines_result = ", New_Get_List_Domaines_result); + } else { + setNew_Get_List_Domaines_result([]) + } } else { setGet_List_Domaines_api("false"); @@ -2631,6 +2793,10 @@ const AddClassManual = (props) => { const [p_detail_duree, setp_detail_duree] = useState(""); const [p_detail_url, setp_detail_url] = useState(""); const [p_detail_lms_class_code, setp_detail_lms_class_code] = useState(""); + + const [p_detail_version_catalogue, setp_detail_version_catalogue] = useState(""); + + const [p_detail_class_inscription_url, setp_detail_class_inscription_url] = useState(""); const [p_detail_class_banner_img_url, setp_detail_class_banner_img_url] = useState(""); const [p_detail_note, setp_detail_note] = useState(""); @@ -2745,6 +2911,29 @@ const AddClassManual = (props) => { return new Promise(resolve => setTimeout(resolve, milliseconds)) } + + const filter_New_Get_List_Metiers_result = () => { + + var local_tab = New_Get_List_Metiers_result.filter((data) => data.class_domaine_id === String(String(mytrainingdomaine).trim())) + console.log(" ### local_tab = ", local_tab); + + local_tab.push({ + "id": "", + "_id": "", + "label": "", + "nom": "", + "code": "", + "class_domaine_id": "", + "class_domaine_nom": "", + + }) + + console.log(" ### local_tab 2 = ", local_tab); + + return local_tab; + + }; + return (