diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index 805f0b4..246f36d 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -9611,7 +9611,7 @@ const DisplayPartnerPromotion = (props) => { label: 'Intra', }, { - value: 'extra', + value: 'inter', label: 'Inter', }, { diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 514a0d4..7dad0ec 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -9836,7 +9836,7 @@ const DisplayPartnerSession = (props) => { label: 'Intra', }, { - value: 'extra', + value: 'inter', label: 'Inter', }, { diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index 567604f..b456e60 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -1435,7 +1435,7 @@ const DisplayPartnerStagiaires = (props) => { }).catch((error) => { setloading_datagrid(false); setLoading(false); - console.warn('Not good man :( Getall_TrainingParticipant = ', error); + // console.warn('Not good man :( Getall_TrainingParticipant = ', error); setGetall_TrainingParticipant_api("false"); //setmyApimyApiMessage("") }) @@ -8571,7 +8571,7 @@ const DisplayPartnerStagiaires = (props) => { { "id": "nom", "label": "Nom / Prénom / Tél / Mail ", "value": "nom" }, { "id": "session_id", "label": "Session/Promo", "value": "session_id" }, { "id": "class_title", "label": "Titre Formation", "value": "class_title" }, - { "id": "client_nom", "label": "Lié au Client (nom client) ", "value": "client_nom" }, + { "id": "client_nom", "label": "Lié au Client (Nom / Raison sociale / Tél / Mail) ", "value": "client_nom" }, { "id": "archive", "label": "Archivé", "value": "archive" }, { "id": "invoiced", "label": "Facturé", "value": "invoiced" }, { "id": "", "label": "", "value": "" }, diff --git a/src/components/Employes.js b/src/components/Employes.js index 6c8e64e..e3d5e5b 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -1558,6 +1558,58 @@ const Employes = (props) => { } + // zzzzzz + const [p_detail_nom_fille, setp_detail_nom_fille] = useState(""); + const [p_detail_num_secu, setp_detail_num_secu] = useState(""); + const [p_detail_nationalite, setp_detail_nationalite] = useState(""); + const [p_detail_siret, setp_detail_siret] = useState(""); + const [p_detail_profession, setp_detail_profession] = useState(""); + const [p_detail_naissance_lieu, setp_detail_naissance_lieu] = useState(""); + const [p_detail_piece_identite_type, setp_detail_piece_identite_type] = useState(""); + const [p_detail_piece_identite_num, setp_detail_piece_identite_num] = useState(""); + const [p_detail_age, setp_detail_age] = useState(""); + const [p_detail_is_handicap, setp_detail_is_handicap] = useState(""); + const [p_detail_is_droit_image, setp_detail_is_droit_image] = useState(""); + const [p_detail_is_rgpd, setp_detail_is_rgpd] = useState(""); + const [p_detail_situation_famille, setp_detail_situation_famille] = useState(""); + + const [p_detail_naissance_departement, setp_detail_naissance_departement] = useState(""); + const [p_detail_naissance_pays, setp_detail_naissance_pays] = useState(""); + + const handleChange_is_handicap_checked = (event) => { + setp_detail_is_handicap(event.target.checked); + }; + + + const handleChange_droit_image_checked = (event) => { + setp_detail_is_droit_image(event.target.checked); + }; + + const handleChange_is_rgpd_checked = (event) => { + setp_detail_is_rgpd(event.target.checked); + }; + + const New_Option_Piece_Identite = [ + { "id": "cni", "label": "CNI", "value": "cni" }, + { "id": "permis", "label": "Permis Conduire", "value": "permis" }, + { "id": "passport", "label": "Passport", "value": "passport" }, + { "id": "titre_sejour", "label": "Titre Séjour", "value": "titre_sejour" }, + { "id": "autre", "label": "Autre", "value": "autre" }, + { "id": "", "label": "", "value": "" }, + ] + + + const New_Option_Famille_Situation = [ + { "id": "marie", "label": "Marié", "value": "marie" }, + { "id": "pacse", "label": "Pacsé", "value": "pacse" }, + { "id": "divorce", "label": "Divorcé", "value": "divorce" }, + { "id": "separe", "label": "Séparé", "value": "separe" }, + { "id": "celibataire", "label": "Célibataire", "value": "célibataire" }, + { "id": "veuf", "label": "Veuf/ve", "value": "veuf" }, + { "id": "autre", "label": "Autre", "value": "autre" }, + { "id": "", "label": "", "value": "" }, + ] + const [p_detail_nom, setp_detail_nom] = useState(""); const [p_detail_prenom, setp_detail_prenom] = useState(""); @@ -1611,6 +1663,7 @@ const Employes = (props) => { const [p_one_detail_nom, setp_one_detail_nom] = useState(); + const [p_one_detail_nom_fille, setp_one_detail_nom_fille] = useState(); const [p_one_detail_prenom, setp_one_detail_prenom] = useState(); const [p_one_detail_mail, setp_one_detail_mail] = useState(); @@ -1697,8 +1750,23 @@ const Employes = (props) => { if (mylocal_employe.date_naissance) { setp_detail_naissance(mylocal_employe.date_naissance); + + var date_eval = new Date(moment(mylocal_employe.date_naissance, "DD/MM/YYYY")); + var diff = Date.now() - date_eval.getTime(); + var age = new Date(diff); + var reel_age = Math.abs(age.getUTCFullYear() - 1970); + setselected_row_data_json_age(reel_age); + setp_detail_age(reel_age); + } else { - setp_detail_naissance(""); + setp_detail_naissance("01/01/1900"); + + var date_eval = new Date(moment("01/01/1900", "DD/MM/YYYY")); + var diff = Date.now() - date_eval.getTime(); + var age = new Date(diff); + var reel_age = Math.abs(age.getUTCFullYear() - 1970); + setselected_row_data_json_age(reel_age); + setp_detail_age(reel_age); } @@ -1873,6 +1941,106 @@ const Employes = (props) => { setp_detail_resp_hierarchie_id(""); } + + // 01/02/2025 + if (mylocal_employe.is_handicap) { + setp_detail_is_handicap(false); + if (String(mylocal_employe.is_handicap) === "1") { + setp_detail_is_handicap(true); + } + } else { + setp_detail_is_handicap(false); + } + + if (mylocal_employe.is_droit_image) { + setp_detail_is_droit_image(false); + if (String(mylocal_employe.is_droit_image) === "1") + setp_detail_is_droit_image(true); + } else { + setp_detail_is_droit_image(false); + } + + if (mylocal_employe.is_rgpd) { + setp_detail_is_rgpd(false); + if (String(mylocal_employe.is_rgpd) === "1") + setp_detail_is_rgpd(true); + } else { + setp_detail_is_rgpd(false); + } + + if (mylocal_employe.nationalite) { + setp_detail_nationalite(mylocal_employe.nationalite); + } else { + setp_detail_nationalite(""); + } + + if (mylocal_employe.situation_famille) { + setp_detail_situation_famille(mylocal_employe.situation_famille); + } else { + setp_detail_situation_famille(""); + } + + if (mylocal_employe.naissance_lieu) { + setp_detail_naissance_lieu(mylocal_employe.naissance_lieu); + } else { + setp_detail_naissance_lieu(""); + } + + if (mylocal_employe.naissance_departement) { + setp_detail_naissance_departement(mylocal_employe.naissance_departement); + } else { + setp_detail_naissance_departement(""); + } + + if (mylocal_employe.naissance_pays) { + setp_detail_naissance_pays(mylocal_employe.naissance_pays); + } else { + setp_detail_naissance_pays(""); + } + + if (mylocal_employe.num_secu) { + setp_detail_num_secu(mylocal_employe.num_secu); + } else { + setp_detail_num_secu(""); + } + + + if (mylocal_employe.identite_type) { + setp_detail_piece_identite_type(mylocal_employe.identite_type); + } else { + setp_detail_piece_identite_type(""); + } + + if (mylocal_employe.piece_identite_num) { + setp_detail_piece_identite_num(mylocal_employe.piece_identite_num); + } else { + setp_detail_piece_identite_num(""); + } + + + if (mylocal_employe.profession) { + setp_detail_profession(mylocal_employe.profession); + } else { + setp_detail_profession(""); + } + + + if (mylocal_employe.siret) { + setp_detail_siret(mylocal_employe.siret); + } else { + setp_detail_siret(""); + } + + + if (mylocal_employe.nom_fille) { + setp_detail_nom_fille(mylocal_employe.nom_fille); + } else { + setp_detail_nom_fille(""); + } + + + + /* * Update 22/10/2023 : Gestion des champs spécifiques. ils commencent tous par 'my_' @@ -2218,7 +2386,11 @@ const Employes = (props) => { else { setliste_sessions_file_change_message(result['message']); setliste_sessions_file_change_api("false"); - alert('Erreur: ' + result['message']); + //alert('Erreur: ' + result['message']); + + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); } @@ -2537,6 +2709,59 @@ const Employes = (props) => { document.getElementsByName("detail_competence")[0].style.backgroundColor = "#f8f9fa"; } + ///---- + if (document.getElementsByName("detail_lieu_naissance")[0]) { + document.getElementsByName("detail_lieu_naissance")[0].disabled = true; + document.getElementsByName("detail_lieu_naissance")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("detail_depart_naissance")[0]) { + document.getElementsByName("detail_depart_naissance")[0].disabled = true; + document.getElementsByName("detail_depart_naissance")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("detail_pays_naissance")[0]) { + document.getElementsByName("detail_pays_naissance")[0].disabled = true; + document.getElementsByName("detail_pays_naissance")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("num_piece_identite")[0]) { + document.getElementsByName("num_piece_identite")[0].disabled = true; + document.getElementsByName("num_piece_identite")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("type_piece_identite")[0]) { + document.getElementsByName("type_piece_identite")[0].disabled = true; + document.getElementsByName("type_piece_identite")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("detail_nationalite")[0]) { + document.getElementsByName("detail_nationalite")[0].disabled = true; + document.getElementsByName("detail_nationalite")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("detail_profession")[0]) { + document.getElementsByName("detail_profession")[0].disabled = true; + document.getElementsByName("detail_profession")[0].style.backgroundColor = "#f8f9fa"; + } + + if (document.getElementsByName("detail_siret")[0]) { + document.getElementsByName("detail_siret")[0].disabled = true; + document.getElementsByName("detail_siret")[0].style.backgroundColor = "#f8f9fa"; + } + + + if (document.getElementsByName("detail_nom_fille")[0]) { + document.getElementsByName("detail_nom_fille")[0].disabled = true; + document.getElementsByName("detail_nom_fille")[0].style.backgroundColor = "#f8f9fa"; + } + // Pour les champs spécifiques for (let i = 0; i < rows_champs_specifics.length; i++) { @@ -2667,7 +2892,67 @@ const Employes = (props) => { } + ///--- + if (document.getElementsByName("detail_lieu_naissance") && document.getElementsByName("detail_lieu_naissance")[0]) { + document.getElementsByName("detail_lieu_naissance")[0].disabled = false; + document.getElementsByName("detail_lieu_naissance")[0].style.backgroundColor = "#FFFFFF"; + } + if (document.getElementsByName("detail_depart_naissance") && document.getElementsByName("detail_depart_naissance")[0]) { + document.getElementsByName("detail_depart_naissance")[0].disabled = false; + document.getElementsByName("detail_depart_naissance")[0].style.backgroundColor = "#FFFFFF"; + + } + + if (document.getElementsByName("detail_pays_naissance") && document.getElementsByName("detail_pays_naissance")[0]) { + document.getElementsByName("detail_pays_naissance")[0].disabled = false; + document.getElementsByName("detail_pays_naissance")[0].style.backgroundColor = "#FFFFFF"; + + } + + if (document.getElementsByName("detail_resp_hierarchie_id") && document.getElementsByName("detadetail_resp_hierarchie_idil_civilite")[0]) { + document.getElementsByName("detail_resp_hierarchie_id")[0].disabled = false; + document.getElementsByName("detail_resp_hierarchie_id")[0].style.backgroundColor = "#FFFFFF"; + + } + if (document.getElementsByName("num_piece_identite") && document.getElementsByName("num_piece_identite")[0]) { + document.getElementsByName("num_piece_identite")[0].disabled = false; + document.getElementsByName("num_piece_identite")[0].style.backgroundColor = "#FFFFFF"; + + } + + if (document.getElementsByName("type_piece_identite") && document.getElementsByName("type_piece_identite")[0]) { + document.getElementsByName("type_piece_identite")[0].disabled = false; + document.getElementsByName("type_piece_identite")[0].style.backgroundColor = "#FFFFFF"; + + } + + + + if (document.getElementsByName("detail_nationalite") && document.getElementsByName("detail_nationalite")[0]) { + document.getElementsByName("detail_nationalite")[0].disabled = false; + document.getElementsByName("detail_nationalite")[0].style.backgroundColor = "#FFFFFF"; + + } + + + if (document.getElementsByName("detail_profession") && document.getElementsByName("detail_profession")[0]) { + document.getElementsByName("detail_profession")[0].disabled = false; + document.getElementsByName("detail_profession")[0].style.backgroundColor = "#FFFFFF"; + + } + + if (document.getElementsByName("detail_siret") && document.getElementsByName("detail_siret")[0]) { + document.getElementsByName("detail_siret")[0].disabled = false; + document.getElementsByName("detail_siret")[0].style.backgroundColor = "#FFFFFF"; + + } + + + if (document.getElementsByName("detail_nom_fille") && document.getElementsByName("detail_nom_fille")[0]) { + document.getElementsByName("detail_nom_fille")[0].disabled = false; + document.getElementsByName("detail_nom_fille")[0].style.backgroundColor = "#FFFFFF"; + } // Pour les champs spécifiques @@ -2808,6 +3093,86 @@ const Employes = (props) => { form.append("_id", selected_id); + if (p_detail_is_handicap) + form.append("is_handicap", "1"); + else + form.append("is_handicap", "0"); + + if (p_detail_is_droit_image) + form.append("is_droit_image", "1"); + else + form.append("is_droit_image", "0"); + + + if (p_detail_is_rgpd) + form.append("is_rgpd", "1"); + else + form.append("is_rgpd", "0"); + + + if (p_detail_num_secu) + form.append("num_secu", p_detail_num_secu); + else + form.append("num_secu", ""); + + + if (p_detail_nationalite) + form.append("nationalite", p_detail_nationalite); + else + form.append("nationalite", ""); + + if (p_detail_naissance_lieu) + form.append("naissance_lieu", p_detail_naissance_lieu); + else + form.append("naissance_lieu", ""); + + if (p_detail_piece_identite_type) + form.append("identite_type", p_detail_piece_identite_type); + else + form.append("identite_type", ""); + + if (p_detail_situation_famille) + form.append("situation_famille", p_detail_situation_famille); + else + form.append("situation_famille", ""); + + + if (p_detail_piece_identite_num) + form.append("piece_identite_num", p_detail_piece_identite_num); + else + form.append("piece_identite_num", ""); + + + + if (p_detail_naissance_departement) + form.append("naissance_departement", p_detail_naissance_departement); + else + form.append("naissance_departement", ""); + + + if (p_detail_naissance_pays) + form.append("naissance_pays", p_detail_naissance_pays); + else + form.append("naissance_pays", ""); + + + if (p_detail_nom_fille) + form.append("nom_fille", p_detail_nom_fille); + else + form.append("nom_fille", ""); + + if (p_detail_profession) + form.append("profession", p_detail_profession); + else + form.append("profession", ""); + + + if (p_detail_siret) + form.append("siret", p_detail_siret); + else + form.append("siret", ""); + + /* Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenaire */ @@ -3586,6 +3951,12 @@ const Employes = (props) => { form.append("date_naissance", p_one_detail_naissance); form.append("type_rh", ""); + if (p_one_detail_nom_fille) + form.append("nom_fille", p_one_detail_tel); + else + form.append("nom_fille", ""); + + if (p_one_detail_tel) form.append("telephone", p_one_detail_tel); else @@ -6031,10 +6402,9 @@ const Employes = (props) => { } const New_Option_Filter = [ - { "id": "nom", "label": "Nom ", "value": "nom" }, - { "id": "email", "label": "Email ", "value": "email" }, - { "id": "formation", "label": "Lié a la Formation (code externe) ", "value": "formation" }, - { "id": "session", "label": "Lié a la Session (code session) ", "value": "session" }, + { "id": "nom", "label": "Nom / Prénom / Tél / Mail ", "value": "nom" }, + /* { "id": "formation", "label": "Lié a la Formation (code externe) ", "value": "formation" }, + { "id": "session", "label": "Lié a la Session (code session) ", "value": "session" },*/ { "id": "competence", "label": "Competence ", "value": "competence" }, { "id": "", "label": "", "value": "" }, { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. @@ -7367,7 +7737,7 @@ const Employes = (props) => { // Get_Order_Data(selected_id); - // alert(res.data.message); zzzzz + // alert(res.data.message); setdisplay_alert_mysy("1"); setalert_message(res.data.message); setalert_type("success"); @@ -8772,7 +9142,7 @@ const Employes = (props) => { onChange={(event, value) => { if (value && value.description) { - setdetail_competence_code(value.description); // zzzzz + setdetail_competence_code(value.description); setnew_competence_id(value._id); } else { setdetail_competence_code(""); @@ -10610,34 +10980,37 @@ const Employes = (props) => { {String(submenu) === "detail_employe" && String(add_One_Employee) !== "1" &&