From 70227e493c0258ce9fe9b59205ea2e636bf2cdc1 Mon Sep 17 00:00:00 2001 From: cherif Date: Sat, 19 Aug 2023 20:38:16 +0200 Subject: [PATCH] 19/08/23 - 20h30 --- src/components/DisplayPartnerSession.js | 1 + src/components/DisplayPartnerStagiaires.js | 14 +- src/components/GestionAdministrative.js | 176 +++++++++++++++++++-- 3 files changed, 175 insertions(+), 16 deletions(-) diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 2a02866..d4e23d4 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -1016,6 +1016,7 @@ const DisplayPartnerSession = (props) => { .catch((error) => { console.error('Error:', error); setliste_sessions_file_change_api("false"); + alert(" Impossible d'importer les sessions"); }); } diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index 51db014..7472b5a 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -1216,7 +1216,7 @@ const DisplayPartnerStagiaires = (props) => { //console.log("token = " + stored_cookie); fetch( - process.env.REACT_APP_API_URL + "myclass/api/Add_Update_SessionFormation_mass_for_many_class/", + process.env.REACT_APP_API_URL + "myclass/api/AddStagiairetoClass_mass_for_many_session/", { method: 'POST', body: formData, @@ -1235,10 +1235,9 @@ const DisplayPartnerStagiaires = (props) => { //console.log('Success:', result['message']); setliste_sessions_file_change_result(result['message']); setliste_sessions_file_change_api("true"); - GetCurrentClass_trainingsession(); - //clearSessionFields(); - Getall_TrainingSession(); - alert(" Les sessions ont été correctement importées"); + + Getall_TrainingParticipant(); + alert(" Les stagiaires ont été correctement importés"); } @@ -1254,6 +1253,7 @@ const DisplayPartnerStagiaires = (props) => { .catch((error) => { console.error('Error:', error); setliste_sessions_file_change_api("false"); + alert(" Impossible d'importer les stagiaires "); }); } async function submenu_detail_stagaire() { @@ -2418,7 +2418,7 @@ const DisplayPartnerStagiaires = (props) => {
{session_file_name && } - {String(liste_sessions_file_change_api) === String("true") && } + {String(liste_sessions_file_change_api) === String("true") && } {String(liste_sessions_file_change_api) === String("false") && } { {String(addOneParticipant) === "1" &&
- +
Formation
- + } modal @@ -255,7 +255,7 @@ function GestionAdministrative(props) { handleClick_delete(event, cellValues); }} > - + } modal @@ -449,7 +449,7 @@ function GestionAdministrative(props) { } - const [DeleteStagiaireData_api, setDeleteStagiaireData_api] = useState(); + const [DeleteStagiaireData_api, setDeleteStagiaireData_api] = useState(); const [DeleteStagiaireData_message, setDeleteStagiaireData_message] = useState(); const [DeleteStagiaireData_result, setDeleteStagiaireData_result] = useState(); function DeleteStagiaireData(nom, prenom, email) { @@ -882,6 +882,10 @@ function GestionAdministrative(props) { form.append("comment", comment); form.append("_id", object_id); + form.append("_id", selected_id); + form.append("client_rattachement_id", p_detail_client_rattachement_nom); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/UpdateStagiairetoClass/"; axios.post(myurl, form).then(res => { @@ -902,6 +906,7 @@ function GestionAdministrative(props) { setUpdateStagiaireData_api("false"); setUpdateStagiaireData_message(res.data.message); setretval_ch("-1"); + alert(res.data.message); } @@ -910,6 +915,7 @@ function GestionAdministrative(props) { console.warn('UpdateStagiaireData : Not good man :( mysearchtext = ' + error); setUpdateStagiaireData_api("false"); setretval_ch("-1"); + alert(" Impossible d'ajouter le participant") }) } @@ -1357,7 +1363,7 @@ function GestionAdministrative(props) { GetCurrentClass(); GetCurrentClass_trainingsession(); GetAttestation_Certif(); - + Get_List_Partner_Clients(); window.scrollTo({ top: 0, behavior: "smooth", @@ -1365,6 +1371,49 @@ function GestionAdministrative(props) { }, []); + + const [Get_List_Partner_Clients_api, setGet_List_Partner_Clients_api] = useState(); + const [Get_List_Partner_Clients_message, setGet_List_Partner_Clients_message] = useState(); + const [Get_List_Partner_Clients_result, setGet_List_Partner_Clients_result] = useState(); + function Get_List_Partner_Clients(event) { + + 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_Partner_List_Partner_Client/"; + + axios.post(myurl, form).then(res => { + //console.log(" In Get_List_Partner_Clients res.data.status = " + res.data.status); + //console.log(" In Get_List_Partner_Clients res.data.message r_class = " + res.data.message); + + if (String(res.data.status) === String("true")) { + setGet_List_Partner_Clients_api("true"); + setGet_List_Partner_Clients_result(res.data.message); + } + else if (String(res.data.status) === String("Err_Connexion")) { + alert('Erreur: ' + res.data.message); + history.push("/Connexion"); + } + else { + setGet_List_Partner_Clients_api("false"); + setGet_List_Partner_Clients_message(res.data.message); + } + + }).catch((error) => { + console.warn('Not good man :( Get_List_Partner_Clients = ', error); + setGet_List_Partner_Clients_api("false"); + //setmyApimyApiMessage("") + }) + } + + + const [p_one_detail_client_rattachement_nom, setp_one_detail_client_rattachement_nom] = useState(); + const [p_one_detail_client_rattachement_id, setp_one_detail_client_rattachement_id] = useState(); + + const [mysession, setmysession] = useState(""); const [allmysession_info, setallmysession_info] = useState(""); const [selectedsession_date_du, setselectedsession_date_du] = useState(new Date()); @@ -2992,8 +3041,7 @@ function GestionAdministrative(props) { } - - + const [selected_id, setselected_id] = useState(""); const [display_detail_insc, setdisplay_detail_insc] = React.useState(); function Display_Detail_Inscription(event, cellValues) { @@ -3002,6 +3050,7 @@ function GestionAdministrative(props) { var montant = String(cellValues.row.amount); var nom = cellValues.row.nom; var email = cellValues.row.email; + setselected_id(cellValues.row._id); setselectedattendeeemail(email); var prenom = cellValues.row.prenom; GetAttendee_Data(email, mysession); @@ -3032,10 +3081,13 @@ function GestionAdministrative(props) { axios.post(myurl, form).then(res => { if (String(res.data.status) === "true") { - //console.log(" In GetAttendee res.data.status = " + res.data.status); - //console.log(" In GetAttendee res.data.message r_class = " + res.data.message); + console.log(" In GetAttendee res.data.status = " + res.data.status); + console.log(" In GetAttendee res.data.message r_class = " + res.data.message); setGetAttendee_api("true"); setGetAttendee_result(res.data.message); + + + var mylocalattendee = JSON.parse(res.data.message); @@ -3060,6 +3112,23 @@ function GestionAdministrative(props) { setattendee_lms_login(mylocalattendee.email); } + document.getElementsByName("detail_client_rattachement")[0].value = ""; + if (mylocalattendee.client_rattachement_id) { + setp_detail_client_rattachement_id(mylocalattendee.client_rattachement_id); + setp_detail_client_rattachement_nom(mylocalattendee.client_rattachement_nom); + + } + + document.getElementsByName("detail_status_inscript")[0].value = ""; + if (mylocalattendee.status) { + setp_detail_status_inscrit(mylocalattendee.status); + if (String(mylocalattendee.status) === "1") + setp_detail_status_inscrit_label("Inscrit"); + else if (String(mylocalattendee.status) === "0") + setp_detail_status_inscrit_label("Preinsc."); + else if (String(mylocalattendee.status) === "-1") + setp_detail_status_inscrit_label("Annulé"); + } document.getElementsByName("detail_tel")[0].value = ""; if (mylocalattendee.telephone) { @@ -3788,6 +3857,11 @@ function GestionAdministrative(props) { form.append("telephone", one_phone_part); form.append("status", myinscript_status); form.append("modefinancement", ""); + if (p_one_detail_client_rattachement_id) + form.append("client_rattachement_id", p_one_detail_client_rattachement_id); + else + form.append("client_rattachement_id", ""); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/AddStagiairetoClass/"; @@ -4052,6 +4126,26 @@ function GestionAdministrative(props) { }; + const [p_detail_nom, setp_detail_nom] = useState(); + const [p_detail_prenom, setp_detail_prenom] = useState(); + const [p_detail_mail, setp_detail_mail] = useState(); + const [p_detail_tel, setp_detail_tel] = useState(); + const [p_detail_adresse, setp_detail_adresse] = useState(); + const [p_detail_code_postal, setp_detail_code_postal] = useState(); + const [p_detail_ville, setp_detail_ville] = useState(); + const [p_detail_cout, setp_detail_cout] = useState(); + const [p_detail_mode_fin, setp_detail_mode_fin] = useState(); + const [p_detail_employeur, setp_detail_employeur] = useState(); + const [p_date_evaluation, setp_date_evaluation] = useState(); + const [p_note_eval, setp_note_eval] = useState(); + const [p_detail_session_class, setp_detail_session_class] = useState(); + const [p_detail_status_inscrit, setp_detail_status_inscrit] = useState(); + const [p_detail_status_inscrit_label, setp_detail_status_inscrit_label] = useState(); + const [p_detail_opco, setp_detail_opco] = useState(); + const [p_detail_client_rattachement_nom, setp_detail_client_rattachement_nom] = useState(); + const [p_detail_client_rattachement_id, setp_detail_client_rattachement_id] = useState(); + + return (
@@ -5586,7 +5680,37 @@ function GestionAdministrative(props) { ))}
+
Client
+ { + setp_one_detail_client_rattachement_id(e.target.value); + setp_one_detail_client_rattachement_nom(e.target.value); + } + } + + > + {Get_List_Partner_Clients_result && + Get_List_Partner_Clients_result.map((myclient) => ( + + {JSON.parse(myclient).nom}   + + + ))} + +
@@ -5628,7 +5752,7 @@ function GestionAdministrative(props) {
- +

@@ -5732,6 +5856,40 @@ function GestionAdministrative(props) { />
+
Client
+ + +
+ +
Statut
+ + +
+
Téléphone