diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 4f9a683..6e7ade4 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -9122,7 +9122,8 @@ const DisplayPartnerSession = (props) => { - {String(selected_convention_type) === "email" &&
Type Document
+ {String(selected_convention_type) === "email" && +
Type Document
{ setselected_session_id(props.related_collection_recid); Getall_Editable_Document_By_Partner_By_Collection(); + Get_related_collection_Data(); window.scrollTo({ top: 0, behavior: "smooth", @@ -239,7 +240,7 @@ const Module_Editique = (props) => { setDialog_convention_open(false); setselected_convention_id(); - setselected_convention_type(); + setselected_convention_type(""); setselected_convention_email_destinataire_prod(); setselected_convention_email_test(); @@ -251,6 +252,8 @@ const Module_Editique = (props) => { setaction_server_type_doc(""); setaction_server_nom_doc(""); setaction_server_ref_interne_doc(""); + setaction_server_type_doc_ref_interne(""); + }; @@ -258,7 +261,7 @@ const Module_Editique = (props) => { const [selected_internal_url, setselected_internal_url] = useState(); - const [selected_convention_id, setselected_convention_id] = useState(); + const [selected_convention_id, setselected_convention_id] = useState(""); const [selected_convention_type, setselected_convention_type] = useState(""); const [selected_convention_email_destinataire_prod, setselected_convention_email_destinataire_prod] = useState(""); const [selected_convention_email_test, setselected_convention_email_test] = useState(""); @@ -291,7 +294,8 @@ const Module_Editique = (props) => { if (String(res.data) === String("false")) { alert("Impossible de télécharger la convention (2) "); } else { - fileDownload(res.data, nom_fichier_cmd) + fileDownload(res.data, nom_fichier_cmd); + Getall_Editable_Document_By_Partner_By_Collection(); } }).catch((error) => { @@ -308,14 +312,14 @@ const Module_Editique = (props) => { const [Get_List_Stagiaire_Conventions_api, setGet_List_Stagiaire_Conventions_api] = useState(); const [Get_List_Stagiaire_Conventions_message, setGet_List_Stagiaire_Conventions_message] = useState(); const [Get_List_Stagiaire_Conventions_result, setGet_List_Stagiaire_Conventions_result] = useState(); - function Get_List_Stagiaire_Conventions(ref_interne, nom, type_doc) { + function Get_List_Stagiaire_Conventions(ref_interne, nom, type_doc, courrier_template_type_document_ref_interne) { var form = new FormData(); - const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("type_doc", type_doc); + form.append("courrier_template_type_document_ref_interne", courrier_template_type_document_ref_interne); @@ -437,6 +441,12 @@ const Module_Editique = (props) => { var form = new FormData(); + + if (String(selected_convention_id).trim() === "") { + alert(" Vous devez choisir un document"); + return; + } + form.append("class_internal_url", selected_internal_url); const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); @@ -500,6 +510,78 @@ const Module_Editique = (props) => { }) } + + + /* + Recuperation des autres données nécessaires à partir du : related_collection, related_collection_recid + */ + function Get_related_collection_Data() { + if (props.related_collection === "session_formation") { + // Recuperation des données de la session + GetCurrentSession(props.related_collection_recid); + + } + } + + + const [GetCurrentSession_api, setGetCurrentSession_api] = useState(); + const [GetCurrentSession_message, setGetCurrentSession_message] = useState(); + const [GetCurrentSession_result, setGetCurrentSession_result] = useState(); + function GetCurrentSession(local_session_id) { + + + var form = new FormData(); + //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("session_id", local_session_id); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Given_SessionFormation_From_Id/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + + if (String(res.data.status) === "true") { + //console.log(" In GetCurrentSession res.data.status = " + res.data.status); + //console.log(" In GetCurrentSession res.data.message r_class = " + res.data.message); + //console.log(" In GetCurrentSession res.data.message len = " + String(res.data.message).length); + + setLoading(false); + setGetCurrentSession_api("true"); + if (String(res.data.message).length > 0) { + setGetCurrentSession_result(res.data.message); + var mylocaltraining = JSON.parse(res.data.message); + + if (mylocaltraining.class_internal_url) { + setselected_internal_url(mylocaltraining.class_internal_url); + } + + } + + } else if (String(res.data.status) === String("Err_Connexion")) { + setLoading(false); + alert('Erreur: ' + res.data.message); + history.push("/Connexion"); + } + + else { + setLoading(false); + setGetCurrentSession_api("false"); + setGetCurrentSession_message(res.data.message); + alert(res.data.message); + } + + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( GetCurrentSession = ', error); + setGetCurrentSession_api("false"); + alert(" Impossible de récuperer les données de la session "); + + + }) + } + + const [Get_Convention_List_Of_All_PJ_result, setGet_Convention_List_Of_All_PJ_result] = useState([]); function Delete_Convention_Attached_Doc(event) { @@ -531,6 +613,11 @@ const Module_Editique = (props) => { var form = new FormData(); + if (String(selected_convention_id).trim() === "") { + alert(" Vous devez choisir un document"); + return; + } + form.append("class_internal_url", selected_internal_url); const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); @@ -540,6 +627,7 @@ const Module_Editique = (props) => { form.append("email_production", selected_convention_email_destinataire_prod); + console.log("form === ", form); // pièce jointe form.append("file_business_object", ""); var list_files = new FormData(); @@ -568,7 +656,7 @@ const Module_Editique = (props) => { if (String(res.data.status) === String("true")) { setSend_Stagiaire_Conventions_By_Email_api("true"); setSend_Stagiaire_Conventions_By_Email_result(res.data.message); - + Getall_Editable_Document_By_Partner_By_Collection(); alert(res.data.message); Dialog_convention_handleClose_buton() @@ -592,6 +680,7 @@ const Module_Editique = (props) => { const [action_server_type_doc, setaction_server_type_doc] = useState(""); const [action_server_nom_doc, setaction_server_nom_doc] = useState(""); const [action_server_ref_interne_doc, setaction_server_ref_interne_doc] = useState(""); + const [action_server_type_doc_ref_interne, setaction_server_type_doc_ref_interne] = useState(""); const [Dialog_EMARGEMENT_FORMATION_open, setDialog_EMARGEMENT_FORMATION_open] = React.useState(false); const Dialog_EMARGEMENT_FORMATION_handleClose = () => { @@ -763,7 +852,33 @@ const Module_Editique = (props) => { {Dialog_1_message} - {action_server_type_doc} -
Choisir une convention +
Type Document
+ { + setselected_convention_type(e.target.value); + Get_List_Stagiaire_Conventions(action_server_ref_interne_doc, action_server_nom_doc, + String(e.target.value), Dialog_1_message); + + } + } + > + + Email   + PDF   + + +
+ + {(String(selected_convention_type) === "email" || String(selected_convention_type) === "pdf") &&
Choisir une convention { } /> -
+
} {String(selected_convention_type) === "email" &&
Type Document
@@ -1041,10 +1156,11 @@ const Module_Editique = (props) => {
{ setaction_server_to_run(String(JSON.parse(document).server_action_name)) - setaction_server_type_doc(String(JSON.parse(document).courrier_template_type_doc)) + //setaction_server_type_doc(String(JSON.parse(document).courrier_template_type_doc)) setaction_server_nom_doc(String(JSON.parse(document).courrier_template_nom)) setaction_server_ref_interne_doc(String(JSON.parse(document).courrier_template_ref_interne)) Action_Server(String(JSON.parse(document).server_action_name)); + setaction_server_type_doc_ref_interne(JSON.parse(document).courrier_template_ref_interne); setDialog_1_message(String(JSON.parse(document).courrier_template_ref_interne)) Get_List_Stagiaire_Conventions(String(JSON.parse(document).courrier_template_ref_interne), String(JSON.parse(document).courrier_template_nom), String(JSON.parse(document).courrier_template_type_doc) ); @@ -1062,7 +1178,7 @@ const Module_Editique = (props) => { } }}> - {(JSON.parse(document).courrier_template_ref_interne)} - {(JSON.parse(document).courrier_template_type_doc)} + {(JSON.parse(document).courrier_template_ref_interne)}
{String(JSON.parse(document).has_history_event) === "1" && @@ -1079,6 +1195,16 @@ const Module_Editique = (props) => {
} + {JSON.parse(document).list_document_history_event && + JSON.parse(document).list_document_history_event.map((history_doc) => ( + + ))} + + +