diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index f5ce2d1..6972843 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -2331,7 +2331,7 @@ const AddParnerClient = (props) => { {String(props.new_customer) === "1" &&
- +
@@ -2699,7 +2699,7 @@ const AddParnerClient = (props) => { {String(props.new_customer) !== "1" &&
- + diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 1008ac3..8efa537 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -1375,6 +1375,87 @@ const DisplayPartnerSession = (props) => { }) } + + + const [New_Get_List_Partner_Financeurs_result, setNew_Get_List_Partner_Financeurs_result] = useState([]); + + const [Get_List_Partner_Financeurs_api, setGet_List_Partner_Financeurs_api] = useState(); + const [Get_List_Partner_Financeurs_message, setGet_List_Partner_Financeurs_message] = useState(); + const [Get_List_Partner_Financeurs_result, setGet_List_Partner_Financeurs_result] = useState(); + function Get_List_Partner_Financeurs(event) { + + var form = new FormData(); + const stored_cookie = getCookie('tokenmysypart'); + + form.append("token", stored_cookie); + form.append("is_financeur", "1"); + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Partner_List_Partner_Client_with_filter_Like/"; + setLoading(true); + + axios.post(myurl, form).then(res => { + //console.log(" In Get_List_Partner_Financeurs res.data.status = " + res.data.status); + //console.log(" In Get_List_Partner_Financeurs res.data.message r_class = " + res.data.message); + setLoading(false); + if (String(res.data.status) === String("true")) { + setGet_List_Partner_Financeurs_api("true"); + setGet_List_Partner_Financeurs_result(res.data.message); + + var new_data2 = []; + const new_data = res.data.message.map((x) => { + + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_nom = JSON.parse(x).nom; + var local_raison_sociale = JSON.parse(x).raison_sociale; + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": local_nom, + "nom": local_nom, + "raison_sociale": local_raison_sociale, + + }; + new_data2.push(node); + }); + + //--- + var node = { + "_id": "", + "id": "", + "label": "", + "nom": "", + "raison_sociale": "", + + }; + new_data2.push(node); + + if (new_data2.length > 0) + setNew_Get_List_Partner_Financeurs_result(new_data2); + } + else if (String(res.data.status) === String("Err_Connexion")) { + alert('Erreur: ' + res.data.message); + history.push("/Connexion"); + } + else { + setGet_List_Partner_Financeurs_api("false"); + setGet_List_Partner_Financeurs_message(res.data.message); + } + + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( Get_List_Partner_Financeurs = ', error); + setGet_List_Partner_Financeurs_api("false"); + //setmyApimyApiMessage("") + }) + } + + + const [New_Getall_Training_Employee_No_Filter_result, setNew_Getall_Training_Employee_No_Filter_result] = useState([]); const [Getall_Training_Employee_No_Filter_api, setGetall_Training_Employee_No_Filter_api] = useState(); @@ -1583,6 +1664,8 @@ const DisplayPartnerSession = (props) => { Getall_Training_Employee_No_Filter(); Getall_Training_Materiel_No_Filter(); + Get_List_Partner_Financeurs(); + Getall_Parter_OR_Default_Session_Steps(); GetCurrentPartnerClass(); @@ -2404,6 +2487,8 @@ const DisplayPartnerSession = (props) => { const [addOneParticipant, setaddOneParticipant] = useState(); function submenu_add_one_participant() { + + Get_List_Partner_Financeurs(); setaddOneParticipant("1"); var myelement; @@ -2701,6 +2786,12 @@ const DisplayPartnerSession = (props) => { 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 [p_one_detail_financeur_rattachement_id, setp_one_detail_financeur_rattachement_id] = useState(); + const [p_one_detail_financeur_rattachement_nom, setp_one_detail_financeur_rattachement_nom] = useState(); + + + const [p_one_detail_type_apprenant, setp_one_detail_type_apprenant] = useState(); @@ -2812,6 +2903,12 @@ const DisplayPartnerSession = (props) => { form.append("client_rattachement_id", ""); + if (p_one_detail_financeur_rattachement_id) + form.append("financeur_rattachement_id", p_one_detail_financeur_rattachement_id); + else + form.append("financeur_rattachement_id", ""); + + if (p_one_detail_type_apprenant) form.append("type_apprenant", p_one_detail_type_apprenant); else @@ -3374,6 +3471,11 @@ const DisplayPartnerSession = (props) => { else form.append("client_rattachement_id", ""); + if (p_detail_financeur_rattachement_id) + form.append("financeur_rattachement_id", p_detail_financeur_rattachement_id); + else + form.append("financeur_rattachement_id", ""); + /* Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenaire */ @@ -4065,6 +4167,10 @@ const DisplayPartnerSession = (props) => { document.getElementsByName("one_detail_client_rattachement")[0].value = ""; + if (document.getElementsByName("one_detail_financeur_rattachement") && document.getElementsByName("one_detail_financeur_rattachement")[0]) + document.getElementsByName("one_detail_financeur_rattachement")[0].value = ""; + + if (document.getElementsByName("one_civilite_part")[0]) document.getElementsByName("one_civilite_part")[0].value = ""; @@ -6679,6 +6785,10 @@ const DisplayPartnerSession = (props) => { 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(); + + const [p_detail_financeur_rattachement_id, setp_detail_financeur_rattachement_id] = useState(); + const [p_detail_financeur_rattachement_nom, setp_detail_financeur_rattachement_nom] = useState(); + const [p_detail_titre, setp_detail_titre] = useState(); const [p_detail_location_type, setp_detail_location_type] = useState(); @@ -13560,27 +13670,7 @@ const DisplayPartnerSession = (props) => { } /> - {/* - {status_inscription_add.map((option) => ( - - {option.label}  
-
- ))} -
*/}
@@ -13609,6 +13699,32 @@ const DisplayPartnerSession = (props) => { />
+ {New_Get_List_Partner_Financeurs_result && New_Get_List_Partner_Financeurs_result.length > 0 && +
Financeur
+ + { + if (value && value._id) { + setp_one_detail_financeur_rattachement_id(value._id); + setp_one_detail_financeur_rattachement_nom(value.nom); + + } + }} + + renderInput={(params) => + } + /> + +
} +
Type apprenant
{ @@ -14325,6 +14441,33 @@ const DisplayPartnerSession = (props) => { />
+ {New_Get_List_Partner_Financeurs_result && New_Get_List_Partner_Financeurs_result.length > 0 && +
Financeur
+ + { + if (value && value._id) { + setp_one_detail_financeur_rattachement_id(value._id); + setp_one_detail_financeur_rattachement_nom(value.nom); + + } + }} + + renderInput={(params) => + } + /> + +
} + +
Type apprenant
{ @@ -14764,6 +14907,79 @@ const DisplayPartnerSession = (props) => {
} + {New_Get_List_Partner_Financeurs_result && New_Get_List_Partner_Financeurs_result.length > 0 && + String(participant_data_edit_mode) === "1" &&
Financeur
+ + { + if (value && value._id) { + setp_detail_financeur_rattachement_id(value._id); + setp_detail_financeur_rattachement_nom(value.nom); + + + setparticipant_data_changed("1"); + Dialog_1_handle_change_participant_session(" Attention, vous allez modifier l'organisme financeur du participant"); + + + } + }} + value={p_detail_financeur_rattachement_nom} + + renderInput={(params) => + } + /> + +
} + + {String(participant_data_edit_mode) !== "1" &&
Financeur
+ + + + +
{ + + if (p_detail_financeur_rattachement_id && String(p_detail_financeur_rattachement_id).length > 2) { + window.open( + process.env.REACT_APP_FRONT_URL + "Partner/mes_clients/" + String(p_detail_financeur_rattachement_id), + '_blank' + ); + } + else { + alert(" Aucun financeur selectionné") + } + } + } + > +
+ + +
+
+
+ +
} + + {String(participant_data_edit_mode) !== "1" &&
Statut
{ if (document.getElementsByName("detail_client_rattachement") && document.getElementsByName("detail_client_rattachement")[0]) document.getElementsByName("detail_client_rattachement")[0].value = ""; + if (document.getElementsByName("detail_financeur_rattachement") && document.getElementsByName("detail_financeur_rattachement")[0]) + document.getElementsByName("detail_financeur_rattachement")[0].value = ""; + if (document.getElementsByName("detail_session_class") && document.getElementsByName("detail_session_class")[0]) document.getElementsByName("detail_session_class")[0].value = ""; @@ -1226,6 +1229,11 @@ const DisplayPartnerStagiaires = (props) => { if (document.getElementsByName("one_detail_client_rattachement") && document.getElementsByName("one_detail_client_rattachement")[0]) document.getElementsByName("one_detail_client_rattachement")[0].value = ""; + if (document.getElementsByName("one_detail_financeur_rattachement") && document.getElementsByName("one_detail_financeur_rattachement")[0]) + document.getElementsByName("one_detail_financeur_rattachement")[0].value = ""; + + + if (document.getElementsByName("one_status_part") && document.getElementsByName("one_status_part")[0]) document.getElementsByName("one_status_part")[0].value = ""; @@ -1536,6 +1544,11 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_client_rattachement")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("detail_financeur_rattachement")[0]) { + document.getElementsByName("detail_financeur_rattachement")[0].disabled = true; + document.getElementsByName("detail_financeur_rattachement")[0].style.backgroundColor = "#ECEFF1"; + } + if (document.getElementsByName("detail_civilite")[0]) { document.getElementsByName("detail_civilite")[0].disabled = true; @@ -1760,6 +1773,9 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_client_rattachement")[0].disabled = false; document.getElementsByName("detail_client_rattachement")[0].style.backgroundColor = "#FFFFFF"; + document.getElementsByName("detail_financeur_rattachement")[0].disabled = false; + document.getElementsByName("detail_financeur_rattachement")[0].style.backgroundColor = "#FFFFFF"; + document.getElementsByName("detail_nom")[0].disabled = false; document.getElementsByName("detail_nom")[0].style.backgroundColor = "#FFFFFF"; @@ -7865,7 +7881,7 @@ const DisplayPartnerStagiaires = (props) => { ); } else { - alert(" Aucun client selectionné") + alert(" Aucun financeur selectionné") } } } diff --git a/src/components/Partner.js b/src/components/Partner.js index 7f89a44..03e772d 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -1256,12 +1256,12 @@ const Partner = (props) => { -
Mes Clients
+
Mes partenaires

- {String(menu) !== "mes_clients" &&
   MES CLIENTS
} - {String(menu) === "mes_clients" &&
    MES CLIENTS
} + {String(menu) !== "mes_clients" &&
  CLIENTS / FINANCEURS
} + {String(menu) === "mes_clients" &&
   CLIENTS / FINANCEURS
}
diff --git a/src/components/Partner_Client.js b/src/components/Partner_Client.js index 7412d4f..bb236d7 100644 --- a/src/components/Partner_Client.js +++ b/src/components/Partner_Client.js @@ -669,7 +669,7 @@ const Partner_Client = (props) => {
-

Vos clients

+

Vos clients & Organismes Financeurs

Utilisez les filtres !
@@ -970,7 +970,7 @@ const Partner_Client = (props) => { @@ -998,7 +998,7 @@ const Partner_Client = (props) => { {String(Edite_Client) === "1" &&
-
Detail client : {Client_email}
+
Detail client / Financeur: {Client_email}
@@ -1007,7 +1007,7 @@ const Partner_Client = (props) => { {String(Edite_Client) === "2" &&
-
Detail client : {Client_email}
+
Detail client / Financeur : {Client_email}