diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 65ae00e..a970a51 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -313,7 +313,7 @@ const Apprenant = (props) => { { field: 'class_title', headerName: 'Titre Formation', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'class_internal_url', headerName: 'class_internal_url', hide: true, Width: 1, disableExport: true, }, { - field: 'status', headerName: 'Statut', hide: false, flex: 1, minWidth: 50, maxWidth: 70, + field: 'status', headerName: 'Statut', hide: false, flex: 1, minWidth: 70, maxWidth: 100, valueFormatter: (params) => { if (String(params.value) === "0") return "Pré."; @@ -328,20 +328,20 @@ const Apprenant = (props) => { } }, - { field: 'client_rattachement_id', headerName: 'client__id', hide: true, Width: 1, disableExport: true, }, + { field: 'client_rattachement_id', headerName: 'client_id', hide: true, Width: 1, disableExport: true, }, { field: 'client_rattachement_nom', headerName: 'Client', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, - { field: 'date_debut', headerName: 'Début', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, - { field: 'date_fin', headerName: 'Fin', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, + { field: 'date_debut', headerName: 'Début', hide: false, maxWidth: 200, flex: 1, renderCell: (params) => , }, + { field: 'date_fin', headerName: 'Fin', hide: false, maxWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'presentiel', headerName: 'Présentiel', hide: false, flex: 1, minWidth: 50, maxWidth: 70, hide: true, Width: 1, disableExport: true, }, { field: 'distanciel', headerName: 'Distantiel', hide: false, flex: 1, minWidth: 50, maxWidth: 70, hide: true, Width: 1, disableExport: true, }, - { field: 'class_recyclage_delai', headerName: 'Recycl. Delai', hide: false, flex: 1, minWidth: 100, }, - { field: 'class_recyclage_periodicite', headerName: 'Recycl. Perio', hide: false, flex: 1, minWidth: 100, }, - { field: 'nb_jour_avant_recyclage', headerName: 'Jrs avant Recycl.', hide: false, flex: 1, minWidth: 100, }, + { field: 'class_recyclage_delai', headerName: 'Recycl. Delai', hide: true, flex: 1, minWidth: 100, }, + { field: 'class_recyclage_periodicite', headerName: 'Recycl. Perio', hide: true, flex: 1, minWidth: 100, }, + { field: 'nb_jour_avant_recyclage', headerName: 'Jrs avant Recycl.', hide: true, flex: 1, minWidth: 100, }, - { + /* { field: "Detail", headerName: 'Voir détail', renderCell: (cellValues) => { return ( @@ -367,9 +367,9 @@ const Apprenant = (props) => { ); } - }, + },*/ - {/* + /* { field: "delete", headerName: 'Supprimer', renderCell: (cellValues) => { return ( @@ -425,7 +425,7 @@ const Apprenant = (props) => { ); } - */}, + },*/ ] @@ -722,6 +722,8 @@ const Apprenant = (props) => { const [p_detail_matricule, setp_detail_matricule] = useState(""); + const [p_detail_ine, setp_detail_ine] = useState(""); + // fin 04/06/2025 const [p_detail_nom, setp_detail_nom] = useState(""); @@ -1216,6 +1218,12 @@ const Apprenant = (props) => { setp_detail_matricule(""); } + if (mylocaltraining.ine) { + setp_detail_ine(mylocaltraining.ine); + } else { + setp_detail_ine(""); + } + if (mylocaltraining.type_mobilite) { setp_detail_type_mobilite(mylocaltraining.type_mobilite); } else { @@ -1672,6 +1680,8 @@ const Apprenant = (props) => { setp_detail_matricule(''); + setp_detail_ine(''); + setp_detail_type_mobilite(''); setp_detail_telephone_bis(''); @@ -1971,7 +1981,7 @@ const Apprenant = (props) => { } const list_champs = ["field_detail_lieu_naissance", "field_detail_departement_naissance", "field_detail_pays_naissance", "field_type_pi", "field_num_pi", - "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss", "field_matricule"] + "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss", "field_matricule", "field_ine"] for (let i = 0; i < list_champs.length; i++) { if (document.getElementsByName(String(list_champs[i])) && document.getElementsByName(String(list_champs[i]))[0]) { @@ -2058,7 +2068,7 @@ const Apprenant = (props) => { } const list_champs = ["field_detail_lieu_naissance", "field_detail_departement_naissance", "field_detail_pays_naissance", "field_type_pi", "field_num_pi", - "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss", "field_matricule"] + "field_type_mobilite", "field_nationalite", "field_droit_image", "field_rgpd", "field_sitation_famille", "field_num_ss", "field_matricule", "field_ine"] for (let i = 0; i < list_champs.length; i++) { if (document.getElementsByName(String(list_champs[i])) && document.getElementsByName(String(list_champs[i]))[0]) { @@ -2456,6 +2466,11 @@ const Apprenant = (props) => { else form.append("matricule", ""); + if (p_detail_ine) + form.append("ine", p_detail_ine); + else + form.append("ine", ""); + /* @@ -7941,7 +7956,7 @@ const Apprenant = (props) => { /> } />} - + @@ -8050,7 +8065,7 @@ const Apprenant = (props) => { />} - +
@@ -9588,6 +9603,30 @@ const Apprenant = (props) => { />
+
+ + Identifiant National Étudiant (INE)   +
+ { + setp_detail_ine(e.target.value); + setapprenant_data_changed("1"); + } + } + /> +
+
@@ -9951,7 +9990,7 @@ const Apprenant = (props) => {
} - + @@ -10072,14 +10111,14 @@ const Apprenant = (props) => { className="datagridclass" onRowDoubleClick={(newSelectionModel) => { - /* setgridline_id(newSelectionModel.row.id); - setselected_apprenant_id(newSelectionModel.row._id); - setselected_apprenant_row_id(newSelectionModel.row.id); - setselected_apprenant_email(newSelectionModel.row.email); - - - setDialog_apprenant_message(String(JSON.parse(Get_All_Apprenant_result[newSelectionModel.row.id]).title)); - setDialog_apprenant_open(true);*/ + if (newSelectionModel.row._id && String(newSelectionModel.row._id).length > 2) { + var tmp = newSelectionModel.row.session_code + "&" + newSelectionModel.row.session_id + "&" + newSelectionModel.row.class_internal_url + "&" + p_detail_email; + + window.open( + process.env.REACT_APP_FRONT_URL + "Partner/mes_stagiaires/" + String(newSelectionModel.row._id) + "/" + String(tmp), + '_blank' + ); + } }} diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index ba94828..06e28d3 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -1378,9 +1378,9 @@ const DisplayPartnerStagiaires = (props) => { setaddOneParticipant(); setdisplay_detail_stagiaire("1"); - if (document.getElementById('detail_session')) { + if (document.getElementById('myRef_details')) { // myRef.current.scrollIntoView({ behavior: "smooth" }); - var divh = document.getElementById('detail_session').offsetTop; + var divh = document.getElementById('myRef_details').offsetTop; window.scrollTo({ top: divh, behavior: "smooth", @@ -1440,6 +1440,8 @@ const DisplayPartnerStagiaires = (props) => { const [selected_code_session, setselected_code_session] = useState(); const [selected_internal_url, setselected_internal_url] = useState(); + const [selected_class_is_ftion_initiale, setselected_class_is_ftion_initiale] = useState(); + const [selected_class_id, setselected_class_id] = useState(); const [selected_class_title, setselected_class_title] = useState(); @@ -1667,6 +1669,10 @@ const DisplayPartnerStagiaires = (props) => { setp_detail_status_inscrit(); setp_detail_status_inscrit_label(); setp_detail_opco(); + + setp_detail_matricule(""); + setp_detail_ine(""); + setp_detail_client_rattachement_nom(); setp_detail_client_rattachement_id(); @@ -2282,6 +2288,16 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_tuteur2_phone")[0].style.backgroundColor = "#ECEFF1"; } + if (document.getElementsByName("detail_ine")[0]) { + document.getElementsByName("detail_ine")[0].disabled = true; + document.getElementsByName("detail_ine")[0].style.backgroundColor = "#ECEFF1"; + } + + if (document.getElementsByName("detail_matricule")[0]) { + document.getElementsByName("detail_matricule")[0].disabled = true; + document.getElementsByName("detail_matricule")[0].style.backgroundColor = "#ECEFF1"; + } + } @@ -2320,7 +2336,7 @@ const DisplayPartnerStagiaires = (props) => { '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', 'detail_comment', 'detail_memo', 'detail_naissance', 'detail_mail', 'detail_prenom', 'detail_nom', 'detail_civilite', 'detail_tel', 'detail_adresse', 'detail_code_postal', 'detail_ville', - 'detail_pays'] + 'detail_pays', 'detail_ine', 'detail_matricule'] @@ -2385,6 +2401,17 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("detail_opco")[0].style.backgroundColor = "#FFFFFF"; } + if (document.getElementsByName("detail_ine")[0]) { + document.getElementsByName("detail_ine")[0].disabled = false; + document.getElementsByName("detail_ine")[0].style.backgroundColor = "#FFFFFF"; + } + + + if (document.getElementsByName("detail_matricule")[0]) { + document.getElementsByName("detail_matricule")[0].disabled = false; + document.getElementsByName("detail_matricule")[0].style.backgroundColor = "#FFFFFF"; + } + if (document.getElementsByName("detail_mode_financement")[0]) { document.getElementsByName("detail_mode_financement")[0].disabled = false; document.getElementsByName("detail_mode_financement")[0].style.backgroundColor = "#FFFFFF"; @@ -3041,8 +3068,6 @@ const DisplayPartnerStagiaires = (props) => { var local_title_session = JSON.parse(x).titre; var local_code_session = JSON.parse(x).code_session; - - //--- var node = { "_id": local_id, @@ -3815,6 +3840,9 @@ const DisplayPartnerStagiaires = (props) => { 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_matricule, setp_detail_matricule] = useState(); + const [p_detail_ine, setp_detail_ine] = useState(); + const [p_detail_facture_client_rattachement_id, setp_detail_facture_client_rattachement_id] = useState(""); const [p_detail_financeur_rattachement_id, setp_detail_financeur_rattachement_id] = useState(); @@ -3871,6 +3899,9 @@ const DisplayPartnerStagiaires = (props) => { //--- + + const [p_one_formation_is_ftion_initiale, setp_one_formation_is_ftion_initiale] = useState(""); + const [p_one_civilite_part, setp_one_civilite_part] = useState(); const [p_one_formation, setp_one_formation] = useState(); const [p_one_detail_session_class, setp_one_detail_session_class] = useState(); @@ -3890,6 +3921,9 @@ const DisplayPartnerStagiaires = (props) => { const [p_one_detail_modefinancement, setp_one_detail_modefinancement] = useState(""); + const [p_one_matricule, setp_one_matricule] = useState(); + const [p_one_ine, setp_one_ine] = 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(); @@ -4033,6 +4067,18 @@ const DisplayPartnerStagiaires = (props) => { setp_detail_opco(""); } + if (mylocalattendee.ine) + setp_detail_ine(mylocalattendee.ine); + else { + setp_detail_ine(""); + } + + if (mylocalattendee.matricule) + setp_detail_matricule(mylocalattendee.matricule); + else { + setp_detail_matricule(""); + } + if (mylocalattendee.client_rattachement_id) { setp_detail_client_rattachement_id(mylocalattendee.client_rattachement_id); @@ -4455,9 +4501,9 @@ const DisplayPartnerStagiaires = (props) => { var myelement; - if (document.getElementById('ajout_participant')) { + if (document.getElementById('myRef_details')) { //myelement = document.getElementById('ajout_participant'); - var divh = document.getElementById('ajout_participant').offsetTop; + var divh = document.getElementById('myRef_details').offsetTop; window.scrollTo({ top: divh, behavior: "smooth", @@ -4755,6 +4801,9 @@ const DisplayPartnerStagiaires = (props) => { form.append("modefinancement", p_one_detail_modefinancement); + form.append("matricule", p_one_matricule); + form.append("ine", p_one_ine); + /* @@ -4989,6 +5038,17 @@ const DisplayPartnerStagiaires = (props) => { else form.append("opco", ""); + if (p_detail_ine) + form.append("ine", p_detail_ine); + else + form.append("ine", ""); + + if (p_detail_matricule) + form.append("matricule", p_detail_matricule); + else + form.append("matricule", ""); + + if (p_detail_type_apprenant) form.append("type_apprenant", p_detail_type_apprenant); else @@ -5558,6 +5618,7 @@ const DisplayPartnerStagiaires = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); form.append("archive", "0"); + form.append("is_ftion_initiale", "2"); var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_partner_class/"; setLoading(true); @@ -5578,6 +5639,7 @@ const DisplayPartnerStagiaires = (props) => { var local_internal_url = JSON.parse(x).internal_url; var local_title = JSON.parse(x).title; var local_external_code = JSON.parse(x).external_code; + var local_is_ftion_initiale = JSON.parse(x).is_ftion_initiale; //--- @@ -5587,7 +5649,8 @@ const DisplayPartnerStagiaires = (props) => { "label": local_title, "internal_url": local_internal_url, "title": local_title, - "external_code": local_external_code + "external_code": local_external_code, + "is_ftion_initiale": local_is_ftion_initiale }; new_data2.push(node); }); @@ -5598,7 +5661,8 @@ const DisplayPartnerStagiaires = (props) => { "label": "", "internal_url": "", "title": "", - "external_code": "" + "external_code": "", + "is_ftion_initiale": "" }; new_data2.push(node); @@ -10256,7 +10320,8 @@ const DisplayPartnerStagiaires = (props) => {
- Code Promo + {selected_class_is_ftion_initiale === "1" && "Code Promo"} + {selected_class_is_ftion_initiale !== "1" && "Code Session"}
{selected_row_data_json.code_session &&
@@ -10268,7 +10333,8 @@ const DisplayPartnerStagiaires = (props) => {
- Début Session + {selected_class_is_ftion_initiale === "1" && "Début Promo"} + {selected_class_is_ftion_initiale !== "1" && "Début Session"}
{selected_row_data_json.date_du &&
@@ -10280,7 +10346,9 @@ const DisplayPartnerStagiaires = (props) => {
- Fin Session + {selected_class_is_ftion_initiale === "1" && "Fin Promo"} + {selected_class_is_ftion_initiale !== "1" && "Fin Session"} +
{selected_row_data_json.date_au &&
@@ -11858,6 +11926,7 @@ const DisplayPartnerStagiaires = (props) => { warning_recyclage_alert: JSON.parse(item).warning_recyclage, archive: JSON.parse(item).archive, + is_ftion_initiale: JSON.parse(item).is_ftion_initiale, } ))} @@ -11874,7 +11943,9 @@ const DisplayPartnerStagiaires = (props) => { setselected_internal_url(newSelectionModel.row.class_internal_url); setselected_class_id(newSelectionModel.row.class_id); - setselected_session_id(newSelectionModel.session_id); + setselected_session_id(newSelectionModel.row.session_id); + + setselected_class_is_ftion_initiale(newSelectionModel.row.is_ftion_initiale); setinscription_invoiced(newSelectionModel.row.invoiced); @@ -12657,6 +12728,12 @@ const DisplayPartnerStagiaires = (props) => { setp_one_formation(value.internal_url); setp_one_detail_session_class(''); setp_one_detail_session_class(""); + setp_one_formation_is_ftion_initiale(value.is_ftion_initiale); + } else { + setp_one_formation(""); + setp_one_detail_session_class(''); + setp_one_detail_session_class(""); + setp_one_formation_is_ftion_initiale(""); } }} @@ -12669,7 +12746,9 @@ const DisplayPartnerStagiaires = (props) => { />
- {p_one_formation && Getall_TrainingSession_result &&
Session + {p_one_formation && Getall_TrainingSession_result &&
+ {p_one_formation_is_ftion_initiale !== "1" && "Session"} + {p_one_formation_is_ftion_initiale === "1" && " Promotion"}
{
+ {p_one_formation_is_ftion_initiale === "1" && <> + +
  + +
Matricule
+ { + setp_one_matricule(e.target.value); + } + } + /> +
+ +
+ + + Identifiant National Étudiant (INE)   + + +
+ { + setp_one_ine(e.target.value); + } + } + /> +
+ + +
+ + } +
@@ -13649,7 +13783,11 @@ const DisplayPartnerStagiaires = (props) => { }}> - {String(participant_data_edit_mode) !== "1" &&
Session
+ {String(participant_data_edit_mode) !== "1" &&
+ {selected_class_is_ftion_initiale === "1" && "Promotion"} + {selected_class_is_ftion_initiale !== "1" && "Session"} + +
{ className="disabled_style disabled_style_left_text_with_visualiser_icone" value={p_detail_session_class} - - /> @@ -13845,7 +13981,7 @@ const DisplayPartnerStagiaires = (props) => {
} {New_Get_List_Partner_Clients_result && New_Get_List_Partner_Clients_result.length > 0 && String(participant_data_edit_mode) !== "1" && - diff --git a/src/components/Module_Admission_Candidat_Synthese.js b/src/components/Module_Admission_Candidat_Synthese.js index ab4f0f6..03c549f 100644 --- a/src/components/Module_Admission_Candidat_Synthese.js +++ b/src/components/Module_Admission_Candidat_Synthese.js @@ -984,7 +984,7 @@ const Module_Admission_Candidat_Synthese = (props) => { form.append("type_apprenant", p_dialog_type_apprenant); form.append("modefinancement", p_dialog_financement); - + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Candidat_Inscrire_To_Session/"; diff --git a/src/components/Session_Admission_FI.js b/src/components/Session_Admission_FI.js index 9556f16..5ecaa35 100644 --- a/src/components/Session_Admission_FI.js +++ b/src/components/Session_Admission_FI.js @@ -389,9 +389,9 @@ const Session_Admission_FI = (props) => { }, { - field: 'notification', headerName: 'Notif.', hide: false, Width: 100, renderCell: (params) => { + field: 'notification', headerName: 'Notif.', hide: false, Width: 100, renderCell: (params) => { return ( -
diff --git a/src/styles/components/_session_admission_fi.scss b/src/styles/components/_session_admission_fi.scss index 69f2c34..1231cbd 100644 --- a/src/styles/components/_session_admission_fi.scss +++ b/src/styles/components/_session_admission_fi.scss @@ -1761,7 +1761,7 @@ float: left; margin-bottom: 1rem; margin-top: 15px; - margin-left: 0px; + margin-left: 15px; } .block_en_mass_select { @@ -2387,7 +2387,7 @@ float: left; margin-bottom: 1rem; margin-top: 15px; - margin-left: 0px; + margin-left: 15px; } .block_en_mass_select {