From 158f3d0247caa8aca45d7c25a0efa7769eb57209 Mon Sep 17 00:00:00 2001 From: cherif Date: Thu, 1 Aug 2024 18:17:40 +0200 Subject: [PATCH] 01/08/2024 - 17h30 --- src/components/DisplayPartnerStagiaires.js | 16 ++++++++++++- src/components/Module_Email_Management.js | 28 ++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index 606a113..837c369 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -5480,18 +5480,27 @@ const DisplayPartnerStagiaires = (props) => { const [selectedtraining_emails, setselectedtraining_emails] = useState([]) const [selectedtraining_emails_liste, setselectedtraining_emails_liste] = useState("") + + const [selected_list_inscription_id, setselected_list_inscription_id] = useState("") + + function GetSelectedRows_Emails() { var tab_tmp = [] + var tab_tmp_inscription_id = [] for (var i = 0; i < selectionModel.length; i++) { var myid = parseInt(String(selectionModel[i])); var line = JSON.parse(rowss[myid]); tab_tmp.push(line.email); + tab_tmp_inscription_id.push(line._id); //console.log(rowss[myid]['external_code']); } setselectedtraining_emails(tab_tmp); setselectedtraining_emails_liste(tab_tmp.join()); + + setselected_list_inscription_id(tab_tmp_inscription_id.join()); + return tab_tmp; } @@ -5499,15 +5508,19 @@ const DisplayPartnerStagiaires = (props) => { function GetSelectedRows_Emails_filtered_on_alert() { var tab_tmp = [] + var tab_tmp_inscription_id = [] for (var i = 0; i < selectionModel.length; i++) { var myid = parseInt(String(selectionModel[i])); var line = JSON.parse(rowss.filter((data) => (JSON.parse(data)).warning_recyclage === "1")[myid]); tab_tmp.push(line.email); + tab_tmp_inscription_id.push(line._id); //console.log(rowss[myid]['external_code']); } setselectedtraining_emails(tab_tmp); setselectedtraining_emails_liste(tab_tmp.join()); + setselected_list_inscription_id(tab_tmp_inscription_id.join()); + return tab_tmp; } @@ -6575,11 +6588,12 @@ const DisplayPartnerStagiaires = (props) => { - + diff --git a/src/components/Module_Email_Management.js b/src/components/Module_Email_Management.js index 22e0e6d..8768689 100644 --- a/src/components/Module_Email_Management.js +++ b/src/components/Module_Email_Management.js @@ -105,6 +105,8 @@ const Module_Email_Management = (props) => { setemail_destinataire(""); setemail_cc(""); setemail_bcc(""); + setinclude_client(false); + setinclude_tuteur(false); settab_email_pieces_jointes_result([]); setDialog_1_open(false); @@ -443,6 +445,10 @@ const Module_Email_Management = (props) => { form.append("email_corps", field_programme); form.append("related_collection", props.related_collection); form.append("email_sujet", email_sujet); + + + + // pièce jointe @@ -452,10 +458,28 @@ const Module_Email_Management = (props) => { } - var myurl = process.env.REACT_APP_API_URL + "myclass/api/Prepare_and_Send_Email_From_Front/"; + var myurl = ""; - if (props.related_collection === "nointernalcontact") + if (props.related_collection === "nointernalcontact") { myurl = process.env.REACT_APP_API_URL + "myclass/api/Prepare_and_Send_Email_From_Front_For_Unknown_Contact/"; + } else { + + myurl = process.env.REACT_APP_API_URL + "myclass/api/Prepare_and_Send_Email_From_Front/"; + + form.append("list_inscription_id", props.list_inscription_id); + + if (include_client === true) { + form.append("include_client", "1"); + } else { + form.append("include_client", "0"); + } + + if (include_tuteur === true) { + form.append("include_tuteur", "1"); + } else { + form.append("include_tuteur", "0"); + } + } setLoading(true);