From 573178b204bf535204e3ba34aafe22550bdf8245 Mon Sep 17 00:00:00 2001 From: cherif Date: Sat, 31 Aug 2024 14:14:29 +0200 Subject: [PATCH] 31082024 --- src/components/Apprenant.js | 4 + src/components/DisplayPartnerSession.js | 118 ++++++-- src/components/DisplayPartnerStagiaires.js | 298 +++++++++++---------- src/components/Mon_Tableau_De_Bord.js | 12 +- 4 files changed, 264 insertions(+), 168 deletions(-) diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 27d871a..99a7884 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -4417,6 +4417,10 @@ const Apprenant = (props) => { value: 'mixte_cpf_perso', label: 'CPF & Fonds Propres', }, + { + value: 'modefinancement', + label: 'modefinancement', + }, { value: 'autre', label: 'Autre', diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index fde0166..2b2078d 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -2896,6 +2896,8 @@ const DisplayPartnerSession = (props) => { const [p_one_detail_type_apprenant, setp_one_detail_type_apprenant] = useState(); + const [p_one_detail_modefinancement, setp_one_detail_modefinancement] = useState(); + const [One_Create_Participant_api, setOne_Create_Participant_api] = useState(); const [One_Create_Participant_message, setOne_Create_Participant_message] = useState(); @@ -3001,7 +3003,7 @@ const DisplayPartnerSession = (props) => { form.append("telephone", one_phone_part); form.append("status", myinscript_status); - form.append("modefinancement", ""); + form.append("modefinancement", p_one_detail_modefinancement); if (p_one_detail_client_rattachement_id) form.append("client_rattachement_id", p_one_detail_client_rattachement_id); @@ -11218,6 +11220,37 @@ const DisplayPartnerSession = (props) => { const [selected_row_data_json, setselected_row_data_json] = useState([]); + + const New_Financement = [ + { + value: 'cpf', + label: 'CPF', + }, + { + value: 'perso', + label: 'Fonds Propres', + }, + { + value: 'entreprise', + label: 'Votre entreprise', + }, + + { + value: 'mixte_cpf_perso', + label: 'CPF & Fonds Propres', + }, + { + value: 'modefinancement', + label: 'modefinancement', + }, + { + value: 'autre', + label: 'Autre', + }, + + ]; + + return (
@@ -17202,6 +17235,32 @@ const DisplayPartnerSession = (props) => { /> +
+ +
Mode Financement
+ { + if (value && value.value) { + setp_one_detail_modefinancement(value.value); + + } else { + setp_one_detail_modefinancement(""); + } + }} + + renderInput={(params) => + } + /> + +
{/* -- début champs specifiques **/} @@ -18002,33 +18061,40 @@ const DisplayPartnerSession = (props) => { /> - {/* { - setp_one_detail_type_apprenant(e.target.value); - } - } - - > - Autre   - Salariés   - Apprentis   - Particuliers   - Rech. Emploi   - - */} + +
Mode Financement
+ { + if (value && value.value) { + setp_one_detail_modefinancement(value.value); + + + } else { + setp_one_detail_modefinancement(""); + + } + }} + + renderInput={(params) => + } + /> + + + +
+ + + {/* -- début champs specifiques **/}

diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index be71b67..e605e67 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -1394,7 +1394,7 @@ const DisplayPartnerStagiaires = (props) => { setp_detail_ville(); setp_detail_pays(); setp_detail_cout(); - setp_detail_mode_fin(); + setp_detail_mode_fin(""); setp_detail_employeur(); setp_date_evaluation(); setp_note_eval(); @@ -1822,6 +1822,12 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_prenom")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("detail_mode_financement") && document.getElementsByName("detail_mode_financement")[0]) { + document.getElementsByName("detail_mode_financement")[0].disabled = true; + document.getElementsByName("detail_mode_financement")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("detail_mail")[0]) { document.getElementsByName("detail_mail")[0].disabled = true; @@ -1999,93 +2005,21 @@ const DisplayPartnerStagiaires = (props) => { setparticipant_data_edit_mode("1"); - document.getElementsByName("detail_session_class")[0].disabled = false; - document.getElementsByName("detail_session_class")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_client_rattachement")[0].disabled = false; - document.getElementsByName("detail_client_rattachement")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("detail_facture_client_rattachement")[0].disabled = false; - document.getElementsByName("detail_facture_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"; + const list_menu_header_names = ['detail_session_class', 'detail_client_rattachement', 'detail_facture_client_rattachement', 'detail_financeur_rattachement', 'detail_nom', 'detail_status_inscript', + 'detail_opco', 'detail_prenom', 'detail_mode_financement', 'detail_mail', 'detail_naissance', 'detail_tel', 'detail_adresse', 'detail_code_postal', + 'detail_ville', 'detail_pays', 'certif_date', 'detail_cout', 'detail_mode_fin', 'detail_employeur', 'date_evaluation', 'certif_date', + 'note_eval', 'detail_type_apprenant', 'date_evaluation', 'detail_incr_date'] - document.getElementsByName("detail_status_inscript")[0].disabled = false; - document.getElementsByName("detail_status_inscript")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_opco")[0].disabled = false; - document.getElementsByName("detail_opco")[0].style.backgroundColor = "#FFFFFF"; + for (let i = 0; i < list_menu_header_names.length; i++) { + if (document.getElementsByName(String(list_menu_header_names[i])) && document.getElementsByName(String(list_menu_header_names[i]))[0]) { + document.getElementsByName(String(list_menu_header_names[i]))[0].disabled = false; + document.getElementsByName(String(list_menu_header_names[i]))[0].style.backgroundColor = "#FFFFFF"; + } + } - document.getElementsByName("detail_prenom")[0].disabled = false; - document.getElementsByName("detail_prenom")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("detail_mail")[0].disabled = false; - document.getElementsByName("detail_mail")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("detail_naissance")[0].disabled = false; - document.getElementsByName("detail_naissance")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("detail_tel")[0].disabled = false; - document.getElementsByName("detail_tel")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("detail_adresse")[0].disabled = false; - document.getElementsByName("detail_adresse")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_code_postal")[0].disabled = false; - document.getElementsByName("detail_code_postal")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_ville")[0].disabled = false; - document.getElementsByName("detail_ville")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_pays")[0].disabled = false; - document.getElementsByName("detail_pays")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_cout")[0].disabled = false; - document.getElementsByName("detail_cout")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("detail_mode_fin")[0].disabled = false; - document.getElementsByName("detail_mode_fin")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_employeur")[0].disabled = false; - document.getElementsByName("detail_employeur")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("date_evaluation")[0].disabled = false; - document.getElementsByName("date_evaluation")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("certif_date")[0].disabled = false; - document.getElementsByName("certif_date")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("note_eval")[0].disabled = false; - document.getElementsByName("note_eval")[0].style.backgroundColor = "#FFFFFF"; - - document.getElementsByName("detail_type_apprenant")[0].disabled = false; - document.getElementsByName("detail_type_apprenant")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("date_evaluation")[0].disabled = false; - document.getElementsByName("date_evaluation")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("detail_incr_date")[0].disabled = false; - document.getElementsByName("detail_incr_date")[0].style.backgroundColor = "#FFFFFF"; - - - document.getElementsByName("certif_date")[0].disabled = false; - document.getElementsByName("certif_date")[0].style.backgroundColor = "#FFFFFF"; // Pour les champs spécifiques for (let i = 0; i < rows_champs_specifics.length; i++) { @@ -2135,6 +2069,9 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_opco")[0].disabled = false; document.getElementsByName("detail_opco")[0].style.backgroundColor = "#FFFFFF"; + document.getElementsByName("detail_mode_financement")[0].disabled = false; + document.getElementsByName("detail_mode_financement")[0].style.backgroundColor = "#FFFFFF"; + document.getElementsByName("detail_cout")[0].disabled = false; document.getElementsByName("detail_cout")[0].style.backgroundColor = "#FFFFFF"; @@ -3162,7 +3099,7 @@ const DisplayPartnerStagiaires = (props) => { const [p_detail_ville, setp_detail_ville] = useState(); const [p_detail_pays, setp_detail_pays] = useState(); const [p_detail_cout, setp_detail_cout] = useState(); - const [p_detail_mode_fin, setp_detail_mode_fin] = useState(); + const [p_detail_mode_fin, setp_detail_mode_fin] = useState(""); const [p_detail_employeur, setp_detail_employeur] = useState(); const [p_detail_type_apprenant, setp_detail_type_apprenant] = useState(); @@ -3233,6 +3170,9 @@ const DisplayPartnerStagiaires = (props) => { const [p_one_status_part, setp_one_status_part] = useState(); const [p_one_detail_type_apprenant, setp_one_detail_type_apprenant] = useState(); + const [p_one_detail_modefinancement, setp_one_detail_modefinancement] = useState(""); + + 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(); @@ -3291,14 +3231,15 @@ const DisplayPartnerStagiaires = (props) => { form.append("attendee_email", attendee_email); form.append("internal_url", internal_url); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAttendeeDetail_perSession/"; setLoading(true); axios.post(myurl, form).then(res => { setLoading(false); if (String(res.data.status) === "true") { - console.log(" In GetAttendee res.data.status = " + res.data.status); - //console.log(" In GetAttendee res.data.message r_class = " + res.data.message); + // console.log(" In GetAttendee res.data.status = " + res.data.status); + // console.log(" In GetAttendee res.data.message r_class = " + res.data.message); setGetAttendee_api("true"); setGetAttendee_result(res.data.message); @@ -3454,6 +3395,8 @@ const DisplayPartnerStagiaires = (props) => { if (mylocalattendee.modefinancement) { setp_detail_mode_fin(mylocalattendee.modefinancement); + } else { + setp_detail_mode_fin(""); } @@ -3889,7 +3832,7 @@ const DisplayPartnerStagiaires = (props) => { form.append("facture_client_rattachement_id", ""); - form.append("modefinancement", ""); + form.append("modefinancement", p_one_detail_modefinancement); /* @@ -6428,6 +6371,40 @@ const DisplayPartnerStagiaires = (props) => { { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. ] + + const New_Financement = [ + { + value: 'cpf', + label: 'CPF', + }, + { + value: 'perso', + label: 'Fonds Propres', + }, + { + value: 'entreprise', + label: 'Votre entreprise', + }, + + { + value: 'mixte_cpf_perso', + label: 'CPF & Fonds Propres', + }, + { + value: 'autre', + label: 'Autre', + }, + { + value: 'modefinancement', + label: 'modefinancement', + }, + { + value: '', + label: '', + }, + + ]; + const [p_detail_class_eu_id, setp_detail_class_eu_id] = React.useState(""); const icon = ; const checkedIcon = ; @@ -8890,6 +8867,8 @@ const DisplayPartnerStagiaires = (props) => { onChange={(event, value) => { if (value && value.value) { setp_one_status_part(value.value); + } else { + setp_one_status_part(""); } }} renderInput={(params) => { if (value && value._id) { setp_one_detail_facture_client_rattachement_id(value._id); + } else { + setp_one_detail_facture_client_rattachement_id(""); } }} @@ -9007,6 +8988,9 @@ const DisplayPartnerStagiaires = (props) => { setp_one_detail_financeur_rattachement_id(value._id); setp_one_detail_financeur_rattachement_nom(value.nom); + } else { + setp_one_detail_financeur_rattachement_id(""); + setp_one_detail_financeur_rattachement_nom(""); } }} @@ -9029,9 +9013,9 @@ const DisplayPartnerStagiaires = (props) => { options={New_type_apprenant} onChange={(event, value) => { if (value && value._id) { - setp_one_detail_type_apprenant(value._id); - + } else { + setp_one_detail_type_apprenant(""); } }} @@ -9043,31 +9027,35 @@ const DisplayPartnerStagiaires = (props) => { /> - {/* + +
Mode Financement
+ + { - setp_one_detail_type_apprenant(e.target.value); - } - } + options={New_Financement} + onChange={(event, value) => { + if (value && value.value) { + + setp_one_detail_modefinancement(value.value); + } else { + setp_one_detail_modefinancement(""); + } + }} + + renderInput={(params) => + } + /> + - > - Autre   - Salariés   - Apprentis   - Particuliers   - Rech. Emploi   - */}
{/* -- début champs specifiques **/} @@ -9303,6 +9291,8 @@ const DisplayPartnerStagiaires = (props) => { setp_detail_session_class_id(value._id); Dialog_1_handle_change_participant_session(" Attention, vous allez modifier la session d'affectation du participant"); + } else { + Dialog_1_handle_change_participant_session(" Attention, vous allez modifier la session d'affectation du participant"); } @@ -9421,6 +9411,8 @@ const DisplayPartnerStagiaires = (props) => { } else { setp_detail_facture_client_rattachement_id(""); + setparticipant_data_changed("1"); + Dialog_1_handle_change_participant_session(" Attention, vous allez modifier l'entité à facturer "); } }} @@ -9571,6 +9563,9 @@ const DisplayPartnerStagiaires = (props) => { if (value && value.id) { setp_detail_type_apprenant(value.id); setparticipant_data_changed("1"); + } else { + setp_detail_type_apprenant(""); + setparticipant_data_changed("1"); } }} @@ -9580,10 +9575,38 @@ const DisplayPartnerStagiaires = (props) => { /> } /> - -
} + {New_Financement && New_Financement.length > 0 && String(participant_data_edit_mode) === "1" &&
Mode Financement
+ + val.value === String(p_detail_mode_fin))[0].label} + onChange={(event, value) => { + + if (value && value.value) { + setp_detail_mode_fin(value.value); + setparticipant_data_changed("1"); + } else { + setp_detail_mode_fin(value.value); + setparticipant_data_changed("1"); + } + }} + + renderInput={(params) => + } + /> +
} + + + {String(participant_data_edit_mode) !== "1" &&
Type apprenant
{
} + {New_Financement && New_Financement.length > 0 && String(participant_data_edit_mode) !== "1" && +
Mode Financement
+ val.value === String(p_detail_mode_fin))[0].label} + /> + +
} + + {(String(participant_data_edit_mode) !== "1" || String(p_detail_apprenant_id).trim().length > 3) &&
Statut
{ setp_detail_status_inscrit(value.value); setparticipant_data_changed("1"); + } else { + setp_detail_status_inscrit(""); + setparticipant_data_changed("1"); } }} renderInput={(params) => { setp_detail_civilite(value.value); setparticipant_data_changed("1"); - console.log(" change civilite value.value = ", value.value) - + } else { + setp_detail_civilite(""); + setparticipant_data_changed("1"); } }} renderInput={(params) => { value={p_detail_opco} onChange={(e) => { setp_detail_opco(e.target.value); + setparticipant_data_changed("1"); }} /> @@ -9937,27 +9984,6 @@ const DisplayPartnerStagiaires = (props) => { -
Mode Financement
- { - setp_detail_mode_fin(e.target.value); - setparticipant_data_changed("1"); - }} - /> -
- -
Employeur
{ /********* GESTION BPF */ - const [Getall_Qry_BPF_PAVE_Data_result_JSON, setGetall_Qry_BPF_PAVE_Data_result_JSON] = useState(); + const [Getall_Qry_BPF_PAVE_Data_result_JSON, setGetall_Qry_BPF_PAVE_Data_result_JSON] = useState({}); const [Getall_Qry_BPF_PAVE_Data_api, setGetall_Qry_BPF_PAVE_Data_api] = useState(); const [Getall_Qry_BPF_PAVE_Data_message, setGetall_Qry_BPF_PAVE_Data_message] = useState(); const [Getall_Qry_BPF_PAVE_Data_result, setGetall_Qry_BPF_PAVE_Data_result] = useState([]); @@ -2137,7 +2137,7 @@ const Mon_Tableau_De_Bord = (props) => {
@@ -2145,7 +2145,7 @@ const Mon_Tableau_De_Bord = (props) => {
@@ -2204,7 +2204,7 @@ const Mon_Tableau_De_Bord = (props) => {
@@ -2212,7 +2212,7 @@ const Mon_Tableau_De_Bord = (props) => {
@@ -2242,7 +2242,7 @@ const Mon_Tableau_De_Bord = (props) => {