From 9c3a753204796394a1056bc922eb81a542c07a09 Mon Sep 17 00:00:00 2001 From: cherif Date: Sun, 10 Mar 2024 14:50:01 +0100 Subject: [PATCH] ss --- src/components/DisplayPartnerStagiaires.js | 6 ++-- src/components/Employes.js | 36 ++++++++++++++++++---- src/components/Partner.js | 8 +++++ src/components/SignIn.js | 2 +- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index c870d35..2a1e52b 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -1546,8 +1546,7 @@ const DisplayPartnerStagiaires = (props) => { function disableAttendeeDetailFields() { setparticipant_data_edit_mode("0"); - console.log( " disableAttendeeDetailFieldsdisableAttendeeDetailFields "); - + if (document.getElementsByName("detail_session_class")[0]) { document.getElementsByName("detail_session_class")[0].disabled = true; document.getElementsByName("detail_session_class")[0].style.backgroundColor = "#ECEFF1"; @@ -2265,7 +2264,7 @@ const DisplayPartnerStagiaires = (props) => { if (new_data2.length > 0) { setNew_Getall_TrainingSession_result(new_data2); - console.log(" ### new_data2 = ", new_data2); + // console.log(" ### new_data2 = ", new_data2); } @@ -2817,6 +2816,7 @@ const DisplayPartnerStagiaires = (props) => { }); } + disableAttendeeDetailFields(); diff --git a/src/components/Employes.js b/src/components/Employes.js index 7e26e70..949e2df 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -124,7 +124,7 @@ const Employes = (props) => { { field: 'id', headerName: 'id', hide: true, Width: 0 }, { field: 'date_naissance', headerName: 'date_naissance', hide: true, Width: 0 }, { - field: 'civilite', headerName: 'Civilité', minWidth: 50, flex: 1, maxWidth: 100, hide: false, + field: 'civilite', headerName: 'Civilité', minWidth: 100, flex: 1, maxWidth: 100, hide: false, }, @@ -1073,16 +1073,22 @@ const Employes = (props) => { if (mylocal_employe.date_naissance) { setp_detail_naissance(mylocal_employe.date_naissance); + }else{ + setp_detail_naissance(""); } if (mylocal_employe.telephone_mobile) { setp_detail_tel_mobile(mylocal_employe.telephone_mobile); + }else{ + setp_detail_tel_mobile(""); } if (mylocal_employe.civilite) { setp_detail_civilite(mylocal_employe.civilite); + }else{ + setp_detail_civilite(""); } @@ -1092,43 +1098,61 @@ const Employes = (props) => { if (mylocal_employe.adr_adresse) { setp_detail_adresse(mylocal_employe.adr_adresse); + }else{ + setp_detail_adresse(""); } if (mylocal_employe.adr_code_postal) { setp_detail_code_postal(mylocal_employe.adr_code_postal); + }else{ + setp_detail_code_postal(""); } if (mylocal_employe.adr_ville) { setp_detail_ville(mylocal_employe.adr_ville); + }else{ + setp_detail_ville(""); } if (mylocal_employe.adr_pays) { setp_detail_pays(mylocal_employe.adr_pays); + }else{ + setp_detail_pays(""); } if (mylocal_employe.linkedin) { setp_detail_linkedIn(mylocal_employe.linkedin); + }else{ + setp_detail_linkedIn(""); } if (mylocal_employe.facebook) { setp_detail_facebook(mylocal_employe.facebook); + }else{ + setp_detail_facebook(""); } if (mylocal_employe.twitter) { setp_detail_twitter(mylocal_employe.twitter); + }else{ + setp_detail_twitter(""); } if (mylocal_employe.profil) { setp_detail_profil(mylocal_employe.profil); + }else{ + setp_detail_profil(""); } if (mylocal_employe.fonction) { setp_detail_fonction(mylocal_employe.fonction); + }else{ + setp_detail_fonction(""); } if (mylocal_employe.lms_username) { @@ -1464,7 +1488,7 @@ const Employes = (props) => { setliste_sessions_file_change_result(result['message']); setliste_sessions_file_change_api("true"); clean_all_filters(); - Getall_Training_Employee(); + Getall_Training_Employee_No_Filter(); alert(" Les employés ont été correctement importés"); } @@ -2014,7 +2038,7 @@ const Employes = (props) => { setUpdate_One_Employee_Data_result(res.data.message); Get_List_Managers(); - Getall_Training_Employee(); + Getall_Training_Employee_No_Filter(); disable_Employee_DetailFields(); setemployee_data_changed(""); @@ -6054,9 +6078,9 @@ const Employes = (props) => { setEmployee_data_changed("1"); }} > - M.    - Mme.   - Neutre   + M.    + Mme.   + Neutre   } diff --git a/src/components/Partner.js b/src/components/Partner.js index 5318545..182d5c4 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -275,8 +275,16 @@ const Partner = (props) => { const [connected_user_access_right, setconnected_user_access_right] = React.useState(null); function retrieve_user_acces_right() { const stored_cookie = getCookie('tokenmysypart'); + + if( !stored_cookie || String(stored_cookie).trim() === ""){ + history.push("/Connexion"); + return; + } + var acces_right_token_name = stored_cookie + "_uar"; + + var acces_right_token_val = getCookie(acces_right_token_name, { path: '/' }); var tab_json_access_right = JSON.parse(acces_right_token_val); diff --git a/src/components/SignIn.js b/src/components/SignIn.js index 5145be3..f0f3785 100644 --- a/src/components/SignIn.js +++ b/src/components/SignIn.js @@ -213,7 +213,7 @@ function SignIn() { .catch((error) => { console.error('Error:', error); setisconnected("false"); - setmyApimyApiMessage("Le service est momentanémentindisponible, merci de ressayer plus tard. "); + setmyApimyApiMessage("Le service est momentanément indisponible, merci de ressayer plus tard. "); }); }