From a615cc85d319a7b058cbd809dac435570b716e7a Mon Sep 17 00:00:00 2001 From: Cherif Date: Wed, 25 Feb 2026 21:24:25 +0100 Subject: [PATCH] 25/02/26 - 19h30 --- src/components/Apprenant.js | 46 +++++----- src/components/Partner.js | 4 +- src/components/Partner_Commande.js | 136 +++++++++++++++++++++++++++-- src/components/Partner_Facture.js | 56 ++++++++---- 4 files changed, 196 insertions(+), 46 deletions(-) diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 7cdfb1a..b9f862b 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -5018,6 +5018,8 @@ const Apprenant = (props) => { function Add_Inscription_Apprenant() { var form = new FormData(); + var liste_apprenant = GetSelectedRowsSession(); + const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("_id", selected_apprenant_id); @@ -5026,7 +5028,7 @@ const Apprenant = (props) => { form.append("modefinancement", p_dialog_financement); form.append("client_rattachement_id", p_dialog_client_rattachement_id); - + form.append("list_apprenant_id", liste_apprenant); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Apprenant_Inscrire_Session/"; @@ -7787,9 +7789,7 @@ const Apprenant = (props) => {
- {selectionModel.length <= 1 && } - - {selectionModel.length > 1 && } +
@@ -8377,7 +8377,8 @@ const Apprenant = (props) => { {String(props.check_user_acces_right("stagiaire", "write")) === "1" && selectionModel && selectionModel.length >= 1 && - actionmass_ftion_val && String(actionmass_ftion_val).length > 2 &&
@@ -8453,7 +8440,26 @@ const Apprenant = (props) => { } + {String(props.check_user_acces_right("stagiaire", "write")) === "1" && selectionModel && selectionModel.length >= 1 && + actionmass_ftion_val && String(actionmass_ftion_val).length > 2 && !['supprimer', 'create_ent', 'disable_ent'].includes(actionmass_ftion_val) && + + } +
} + +
diff --git a/src/components/Partner.js b/src/components/Partner.js index 2ceff37..4707422 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -2335,8 +2335,8 @@ const Partner = (props) => { } style={{ overflow: 'hidden' }}> - {String(menu) !== "mes_cmd" && }> DEVIS & COMMANDES} - {String(menu) === "mes_cmd" && }>DEVIS & COMMANDES } + {String(menu) !== "mes_cmd" && }> DEVIS} + {String(menu) === "mes_cmd" && }>DEVIS } {String(menu) !== "factures_client" && }> FACTURES & AVOIRS } {String(menu) === "factures_client" && }> FACTURES & AVOIRS } diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js index aa6d64a..7bcdb06 100644 --- a/src/components/Partner_Commande.js +++ b/src/components/Partner_Commande.js @@ -1199,7 +1199,7 @@ const Partner_Commande = (props) => { const [history_securite_read, sethistory_securite_read] = useState(""); - + useEffect(() => { @@ -3382,18 +3382,29 @@ const Partner_Commande = (props) => { form.append("order_line_session_id", ""); - var tab_inscrit_id = [] + /* var tab_inscrit_id = [] for (var i = 0; i < inscrit_session.length; i++) { tab_inscrit_id.push(inscrit_session[i]._id) + }*/ + + var tab_inscrit_id = [] + for (var i = 0; i < NewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result.length; i++) { + if (NewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result[i]._id.length > 5) + tab_inscrit_id.push(NewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result[i]._id) } + if (tab_inscrit_id && String(tab_inscrit_id).length > 0) + form.append("tab_inscription_ids_from_front", tab_inscrit_id); + else + form.append("tab_inscription_ids_from_front", ""); - var tab_inscrit_id_json_str = JSON.stringify(inscrit_session); + + /*var tab_inscrit_id_json_str = JSON.stringify(inscrit_session); if (tab_inscrit_id && String(tab_inscrit_id).length > 0) form.append("order_line_tab_inscrit_id", tab_inscrit_id_json_str); else - form.append("order_line_tab_inscrit_id", ""); + form.append("order_line_tab_inscrit_id", "");*/ @@ -5492,6 +5503,115 @@ const Partner_Commande = (props) => { }; + const [NewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result, setNewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result] = useState([{ + "_id": "", + "id": "", + "label": "", + "email": "", + "nom": "", + "prenom": "", + "apprenant_id": "", + }]); + + // Important, ici on ne va recuperer que la liste des inscrit a une session / promo pour qui il reste de choses a facturer + const [Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_api, setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_api] = useState(); + const [Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_message, setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_message] = useState(); + const [Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result, setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result] = useState([]); + function Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment(local_session_id, local_client_rattachement_id) { + + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("session_id", local_session_id); + + if (local_client_rattachement_id && local_client_rattachement_id.length > 5) + form.append("client_rattachement_id", local_client_rattachement_id) + + + //console.log(" ### Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment form = ", form) + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Insription_From_Session_id_Reduice_Fields_With_Filter_With_To_Paie/"; + + + setLoading(true); + axios.post(myurl, form).then(res => { + + setLoading(false); + if (String(res.data.status) === String("true")) { + setLoading(false); + //console.log(" In Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment res.data.status = " + res.data.status); + console.log(" In Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment res.data.message r_class = " + res.data.message); + setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_api("true"); + setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_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 email = JSON.parse(x).email; + var nom = JSON.parse(x).nom; + var prenom = JSON.parse(x).prenom; + var apprenant_id = JSON.parse(x).apprenant_id; + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": prenom + " " + nom + " " + email, + "email": email, + "nom": nom, + "prenom": prenom, + "apprenant_id": apprenant_id, + }; + new_data2.push(node); + + // return {"_id": " + str(local_id) + ", "label": " + local_courrier_template_ref_interne + '" , "courrier_template_ref_interne": "' + local_courrier_template_ref_interne + '", "nom_champ_technique": "' + local_nom_champ_technique + '", "nom_champ_fonctionel": "' + local_nom_champ_fonctionel + '","valide": "1" }; + + }); + + //--- + var node = { + "_id": "", + "id": "", + "label": "", + "email": "", + "nom": "", + "prenom": "", + "apprenant_id": "", + }; + new_data2.push(node); + + if (new_data2.length > 0) + setNewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result(new_data2); + + + } + else { + setLoading(false); + setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_api("false"); + setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_message(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } + + }).catch((error) => { + setLoading(false); + + console.warn('Not good man :( Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment = ', error); + setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_api("false"); + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer la liste des inscrits"); + setalert_type("error"); + + }) + } + + + return (
@@ -6281,13 +6401,15 @@ const Partner_Commande = (props) => { if (value && value._id) { setp_add_line_session_id(value._id); setp_add_line_session_code(value.code_session); - Get_List_Inscrit_To_Session(value._id); + // Get_List_Inscrit_To_Session(value._id); + Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment(value._id, p_detail_header_client_nom_id); + } else { setp_add_line_session_id(""); setp_add_line_session_code(""); - setNew_Get_List_Inscrit_To_Session_result([]); - setGet_List_Inscrit_To_Session_result([]); + setNewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result([]); + setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result([]); } }} diff --git a/src/components/Partner_Facture.js b/src/components/Partner_Facture.js index 9cd5b76..b66cbac 100644 --- a/src/components/Partner_Facture.js +++ b/src/components/Partner_Facture.js @@ -923,7 +923,7 @@ const Partner_Facture = (props) => { if (String(res.data.status) === "true") { //console.log(" In Get_Given_Line_Of_Partner_Invoice_Line_Data res.data.status = " + res.data.status); - console.log(" In Get_Given_Line_Of_Partner_Invoice_Line_Data res.data.message r_class = " + res.data.message); + console.log(" In Get_Given_Line_Of_Partner_Invoice_Line_Data res.data.message r_class = " + res.data.message); setGet_Given_Line_Of_Partner_Invoice_Line_Data_api("true"); setGet_Given_Line_Of_Partner_Invoice_Line_Data_result(res.data.message); @@ -4477,6 +4477,7 @@ const Partner_Facture = (props) => { "date_naissance": "", }]); + const [Get_List_Inscrit_To_Session_api, setGet_List_Inscrit_To_Session_api] = useState(); const [Get_List_Inscrit_To_Session_message, setGet_List_Inscrit_To_Session_message] = useState(); const [Get_List_Inscrit_To_Session_result, setGet_List_Inscrit_To_Session_result] = useState(); @@ -4665,8 +4666,6 @@ const Partner_Facture = (props) => { form.append("order_line_type_valeur", p_add_line_item_reduction_value); form.append("order_line_montant_reduction", String(total_reduction)); - - form.append("order_line_montant_hors_taxes", String(total_base1)); form.append("order_line_taux_taxe", partner_taux_tva); @@ -4680,6 +4679,23 @@ const Partner_Facture = (props) => { else form.append("order_line_session_id", ""); + var tab_inscrit_id = [] + for (var i = 0; i < NewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result.length; i++) { + if (NewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result[i]._id.length > 5) + tab_inscrit_id.push(NewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result[i]._id) + } + + //console.log(" ### tab_inscrit_id = ", tab_inscrit_id); + + + + if (tab_inscrit_id && String(tab_inscrit_id).length > 0) + form.append("tab_inscription_ids_from_front", tab_inscrit_id); + else + form.append("tab_inscription_ids_from_front", ""); + + form.append("tab_inscription_ids", ""); + /* var tab_inscrit_id = [] for (var i = 0; i < inscrit_session.length; i++) { @@ -4907,7 +4923,7 @@ const Partner_Facture = (props) => { "apprenant_id": "", }]); setNewGetall_TrainingParticipant_List_Invoices_result([]); - + } const [invoice_inscrit_selected_session_id, setinvoice_inscrit_selected_session_id] = useState(""); @@ -4935,7 +4951,7 @@ const Partner_Facture = (props) => { const [Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_api, setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_api] = useState(); const [Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_message, setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_message] = useState(); const [Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result, setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result] = useState([]); - function Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment(local_session_id) { + function Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment(local_session_id, local_client_rattachement_id) { var form = new FormData(); @@ -4943,6 +4959,10 @@ const Partner_Facture = (props) => { form.append("token", stored_cookie); form.append("session_id", local_session_id); + if( local_client_rattachement_id && local_client_rattachement_id.length > 5 ) + form.append("client_rattachement_id", local_client_rattachement_id) + + //console.log(" ### Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment form = ", form) var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Insription_From_Session_id_Reduice_Fields_With_Filter_With_To_Paie/"; @@ -5050,7 +5070,7 @@ const Partner_Facture = (props) => { if (String(res.data.status) === String("true")) { setLoading(false); //console.log(" In Get_Nb_Invoiced_Inscrit_Of_Session res.data.status = " + res.data.status); - // console.log(" In Get_Nb_Invoiced_Inscrit_Of_Session res.data.message r_class = " + res.data.message); + // console.log(" In Get_Nb_Invoiced_Inscrit_Of_Session res.data.message r_class = " + res.data.message); setGet_Nb_Invoiced_Inscrit_Of_Session_api("true"); setGet_Nb_Invoiced_Inscrit_Of_Session_result(res.data.message); @@ -5240,7 +5260,7 @@ const Partner_Facture = (props) => { if (value && value._id) { setinvoice_inscrit_selected_session_id(value._id); - Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment(value._id); + Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment(value._id, ""); Get_Nb_Invoiced_Inscrit_Of_Session(value._id); } else { @@ -5256,7 +5276,7 @@ const Partner_Facture = (props) => { "apprenant_id": "", }]]); - + } @@ -5288,14 +5308,14 @@ const Partner_Facture = (props) => { if (value && value._id) { setinvoice_inscrit_selected_inscrit_id(value._id); Getall_TrainingParticipant_List_Invoices(value._id); - + } else { setinvoice_inscrit_selected_inscrit_id(""); setNewGetall_TrainingParticipant_List_Invoices_result([]); - setGetall_TrainingParticipant_List_Invoices_result([]); - setNb_Invoiced_Inscrit_Of_Session("") - - + setGetall_TrainingParticipant_List_Invoices_result([]); + setNb_Invoiced_Inscrit_Of_Session("") + + } }} @@ -5323,7 +5343,7 @@ const Partner_Facture = (props) => {
- Liste des factures - {invoice_inscrit_selected_total_facture} € + Liste des factures : {invoice_inscrit_selected_total_facture} €
@@ -5847,13 +5867,13 @@ const Partner_Facture = (props) => { if (value && value._id) { setp_add_line_session_id(value._id); setp_add_line_session_code(value.code_session); - Get_List_Inscrit_To_Session(value._id); + Getall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment(value._id, p_detail_header_client_nom_id); } else { setp_add_line_session_id(""); setp_add_line_session_code(""); - setNew_Get_List_Inscrit_To_Session_result([]); - setGet_List_Inscrit_To_Session_result([]); + setNewGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result([]); + setGetall_TrainingParticipant_Reduce_Fields_With_Remaining_Paiment_result([]); } }} @@ -8277,6 +8297,7 @@ const Partner_Facture = (props) => {