01/08/2024 - 17h30

recette2
cherif 2024-08-01 18:17:40 +02:00
parent df04807dc6
commit 158f3d0247
2 changed files with 41 additions and 3 deletions

View File

@ -5480,18 +5480,27 @@ const DisplayPartnerStagiaires = (props) => {
const [selectedtraining_emails, setselectedtraining_emails] = useState([]) const [selectedtraining_emails, setselectedtraining_emails] = useState([])
const [selectedtraining_emails_liste, setselectedtraining_emails_liste] = useState("") const [selectedtraining_emails_liste, setselectedtraining_emails_liste] = useState("")
const [selected_list_inscription_id, setselected_list_inscription_id] = useState("")
function GetSelectedRows_Emails() { function GetSelectedRows_Emails() {
var tab_tmp = [] var tab_tmp = []
var tab_tmp_inscription_id = []
for (var i = 0; i < selectionModel.length; i++) { for (var i = 0; i < selectionModel.length; i++) {
var myid = parseInt(String(selectionModel[i])); var myid = parseInt(String(selectionModel[i]));
var line = JSON.parse(rowss[myid]); var line = JSON.parse(rowss[myid]);
tab_tmp.push(line.email); tab_tmp.push(line.email);
tab_tmp_inscription_id.push(line._id);
//console.log(rowss[myid]['external_code']); //console.log(rowss[myid]['external_code']);
} }
setselectedtraining_emails(tab_tmp); setselectedtraining_emails(tab_tmp);
setselectedtraining_emails_liste(tab_tmp.join()); setselectedtraining_emails_liste(tab_tmp.join());
setselected_list_inscription_id(tab_tmp_inscription_id.join());
return tab_tmp; return tab_tmp;
} }
@ -5499,15 +5508,19 @@ const DisplayPartnerStagiaires = (props) => {
function GetSelectedRows_Emails_filtered_on_alert() { function GetSelectedRows_Emails_filtered_on_alert() {
var tab_tmp = [] var tab_tmp = []
var tab_tmp_inscription_id = []
for (var i = 0; i < selectionModel.length; i++) { for (var i = 0; i < selectionModel.length; i++) {
var myid = parseInt(String(selectionModel[i])); var myid = parseInt(String(selectionModel[i]));
var line = JSON.parse(rowss.filter((data) => (JSON.parse(data)).warning_recyclage === "1")[myid]); var line = JSON.parse(rowss.filter((data) => (JSON.parse(data)).warning_recyclage === "1")[myid]);
tab_tmp.push(line.email); tab_tmp.push(line.email);
tab_tmp_inscription_id.push(line._id);
//console.log(rowss[myid]['external_code']); //console.log(rowss[myid]['external_code']);
} }
setselectedtraining_emails(tab_tmp); setselectedtraining_emails(tab_tmp);
setselectedtraining_emails_liste(tab_tmp.join()); setselectedtraining_emails_liste(tab_tmp.join());
setselected_list_inscription_id(tab_tmp_inscription_id.join());
return tab_tmp; return tab_tmp;
} }
@ -6580,6 +6593,7 @@ const DisplayPartnerStagiaires = (props) => {
<Module_Email_Management father_close_function={Dialog_SEND_EMAIL_handleClose} email_destinataire={selectedtraining_emails_liste} <Module_Email_Management father_close_function={Dialog_SEND_EMAIL_handleClose} email_destinataire={selectedtraining_emails_liste}
list_inscription_id={selected_list_inscription_id}
related_collection={"inscription"} Clean_Selected_Rows_For_Email={Clean_Selected_Rows_For_Email} /> related_collection={"inscription"} Clean_Selected_Rows_For_Email={Clean_Selected_Rows_For_Email} />
</DialogContent> </DialogContent>

View File

@ -105,6 +105,8 @@ const Module_Email_Management = (props) => {
setemail_destinataire(""); setemail_destinataire("");
setemail_cc(""); setemail_cc("");
setemail_bcc(""); setemail_bcc("");
setinclude_client(false);
setinclude_tuteur(false);
settab_email_pieces_jointes_result([]); settab_email_pieces_jointes_result([]);
setDialog_1_open(false); setDialog_1_open(false);
@ -444,6 +446,10 @@ const Module_Email_Management = (props) => {
form.append("related_collection", props.related_collection); form.append("related_collection", props.related_collection);
form.append("email_sujet", email_sujet); form.append("email_sujet", email_sujet);
// pièce jointe // 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/"; 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); setLoading(true);