diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index a28ecb2..e3c20ee 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -1812,7 +1812,7 @@ const AddParnerClient = (props) => { // Données de contact du client du partner var contact_email = "" if (document.getElementsByName("contact_email")) { - contact_email = String(document.getElementsByName("contact_email")[0].value).trim(); + contact_email = String(document.getElementsByName("contact_email")[0].value).trim(); } // Pour activier la fontion de "include com", le contact foit avoir une adresse email @@ -2235,7 +2235,9 @@ const AddParnerClient = (props) => { }} > - + +   + {Get_List_Client_Type_result && Get_List_Client_Type_result.map((myclass) => ( @@ -2244,6 +2246,7 @@ const AddParnerClient = (props) => { ))} + diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index db4a9bc..e592542 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -7717,6 +7717,8 @@ const DisplayPartnerSession = (props) => { const [selected_convention_email_test, setselected_convention_email_test] = useState(""); + const [New_Get_List_Stagiaire_Conventions_result, setNew_Get_List_Stagiaire_Conventions_result] = useState([]); + 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(); @@ -7738,6 +7740,68 @@ const DisplayPartnerSession = (props) => { //console.log(" In Get_List_Stagiaire_Conventions res.data.message r_class = " + res.data.message); setGet_List_Stagiaire_Conventions_api("true"); setGet_List_Stagiaire_Conventions_result(res.data.message); + + var new_data2 = []; + var node = { + "_id": "default_pdf", + "id": "default_pdf", + "label": "PDF par default", + "ref_interne": "", + "nom": "", + "sujet": "", + "type_doc": "", + "cible": "", + "joint_pdf": "", + + }; + new_data2.push(node); + + var node2 = { + "_id": "default_mail", + "id": "default_mail", + "label": "Email par default", + "ref_interne": "", + "nom": "", + "sujet": "", + "type_doc": "", + "cible": "", + "joint_pdf": "", + + }; + new_data2.push(node2); + const new_data = res.data.message.map((x) => { + + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_ref_interne = JSON.parse(x).ref_interne; + var local_nom = JSON.parse(x).nom; + var local_sujet = JSON.parse(x).sujet; + var local_type_doc = JSON.parse(x).type_doc; + var local_cible = JSON.parse(x).cible; + var local_joint_pdf = JSON.parse(x).joint_pdf; + + + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": local_nom, + "ref_interne": local_ref_interne, + "nom": local_nom, + "sujet": local_sujet, + "type_doc": local_type_doc, + "cible": local_cible, + "joint_pdf": local_joint_pdf, + + }; + new_data2.push(node); + }); + + if (new_data2.length > 0) + setNew_Get_List_Stagiaire_Conventions_result(new_data2); + } else { setGet_List_Stagiaire_Conventions_api("false"); @@ -8507,13 +8571,13 @@ const DisplayPartnerSession = (props) => { MySy Information - + -
Choisir une convention + {/*
Choisir une convention { +
*/} + + +
Choisir une convention + { + if (value && value._id) { + + setselected_convention_id(value._id); + console.log(" €€ value = ", value); + console.log(" €€ value._id = ", value._id); + + if (String(value._id) === "default_mail") { + setselected_convention_type("email"); + } + else if (String(value._id) === "default_pdf") { + setselected_convention_type("pdf"); + } else { + var result2 = Get_List_Stagiaire_Conventions_result.filter((local_mymanager) => JSON.parse(local_mymanager)._id === String(value._id)) + setselected_convention_type(JSON.parse(result2).type_doc); + + console.log(" ### JSON.parse(result2).type_doc = ", JSON.parse(result2).type_doc); + } + settab_convention_pieces_jointes_result([]); + } + + }} + + + renderInput={(params) => + } + /> +
+ {String(selected_convention_type) === "email" &&
Type Document
{
- +
 
@@ -11438,6 +11543,10 @@ const DisplayPartnerSession = (props) => { } > + +    + {Get_List_Partner_Clients_result && Get_List_Partner_Clients_result.map((myclient) => ( { ))} - -    -
@@ -11988,6 +12093,10 @@ const DisplayPartnerSession = (props) => { } > + +    + {Get_List_Partner_Clients_result && Get_List_Partner_Clients_result.map((myclient) => ( { ))} - -    -
diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index 396648c..657f9e3 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -6069,14 +6069,14 @@ const DisplayPartnerStagiaires = (props) => {
@@ -6099,17 +6099,17 @@ const DisplayPartnerStagiaires = (props) => {
 
{((selected_id && String(selected_id).length > 2) || (String(addOneParticipant) === "1")) &&
- +
} - + {String(addOneParticipant) === "1" &&
- + {/*
Formation
{ } > + +    + {Get_List_Partner_Clients_result && Get_List_Partner_Clients_result.map((myclient) => ( { ))} - -    -
diff --git a/src/components/Employes.js b/src/components/Employes.js index 3286f48..04bde6c 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -4424,6 +4424,11 @@ const Employes = (props) => { } } > + +   + + {Get_Partner_Purchase_Prices_result && Get_Partner_Purchase_Prices_result.map((myclient) => ( { ))} - - Autre - - +
diff --git a/src/components/Partner_Client.js b/src/components/Partner_Client.js index 05ce6b8..3e923ca 100644 --- a/src/components/Partner_Client.js +++ b/src/components/Partner_Client.js @@ -281,6 +281,11 @@ const Partner_Client = (props) => { setgridline_id(""); setEdite_Client("0"); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + } diff --git a/src/styles/components/_displaypartnersession.scss b/src/styles/components/_displaypartnersession.scss index 413fe49..302e33f 100644 --- a/src/styles/components/_displaypartnersession.scss +++ b/src/styles/components/_displaypartnersession.scss @@ -1,5 +1,9 @@ .displaypartnersession { + .css-1bp1ao6{ + height: 3.5rem !important; + } + .loader-container { width: 100%; height: 100vh;