diff --git a/src/components/Employes.js b/src/components/Employes.js index 297eb92..e3efdb0 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -76,7 +76,7 @@ const Employes = (props) => { return "Oui"; else - return "?"; + return String(params.value); }, }, { field: 'telephone_mobile', headerName: 'Mobile', width: 150, hide: false, editable: true }, @@ -90,7 +90,7 @@ const Employes = (props) => { else if (String(params.value) === "-1") return " "; else - return "?"; + return String(params.value); }, }, { field: 'profil', headerName: 'profil', width: 150, hide: false, editable: true }, @@ -263,6 +263,14 @@ const Employes = (props) => { setp_filtre4(); setp_filtre4_value(); + setdisplay_affectation(""); + setAdd_new_affectation(""); + clean_affectation_fields(); + clean_nouvelle_affectation_fields(); + setSelectionModel_affectations([]); + setSelectionModel([]); + setsubmenu(""); + Getall_Training_Employee_No_Filter(); } @@ -330,6 +338,7 @@ const Employes = (props) => { setAdd_new_affectation(""); clean_affectation_fields(); clean_nouvelle_affectation_fields(); + setsubmenu(""); var line = JSON.parse(rows_affectations[selected_row_id]); @@ -634,7 +643,15 @@ const Employes = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Ressource_Humaine_with_filter/"; - + + setdisplay_affectation(""); + setAdd_new_affectation(""); + clean_affectation_fields(); + clean_nouvelle_affectation_fields(); + setSelectionModel_affectations([]); + setSelectionModel([]); + setsubmenu(""); + setSelectionModel([]); axios.post(myurl, form).then(res => { @@ -669,7 +686,7 @@ const Employes = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Ressource_Humaine_with_filter/"; + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Ressource_Humaine_no_filter/"; @@ -1877,8 +1894,8 @@ const Employes = (props) => { const [display_affectation, setdisplay_affectation] = useState(); const [p_affect_poste, setp_affect_poste] = useState(); - const [p_affect_date_du, setp_affect_date_du] = useState(); - const [p_affect_date_au, setp_affect_date_au] = useState(); + const [p_affect_date_du, setp_affect_date_du] = useState(new Date().toLocaleDateString('fr-FR')); + const [p_affect_date_au, setp_affect_date_au] = useState(new Date().toLocaleDateString('fr-FR')); const [p_affect_cible, setp_affect_cible] = useState(); const [p_affect_cible_label, setp_affect_cible_label] = useState(); @@ -1894,8 +1911,8 @@ const Employes = (props) => { function clean_affectation_fields() { setp_affect_poste(); - setp_affect_date_du(); - setp_affect_date_au(); + setp_affect_date_du(new Date().toLocaleDateString('fr-FR')); + setp_affect_date_au(new Date().toLocaleDateString('fr-FR')); setp_affect_cible(); setp_affect_cible_label(); setp_affect_cible_nom(); @@ -1933,8 +1950,8 @@ const Employes = (props) => { function clean_nouvelle_affectation_fields() { setp_one_affect_poste(); - setp_one_affect_date_du(); - setp_one_affect_date_au(); + setp_one_affect_date_du(new Date().toLocaleDateString('fr-FR')); + setp_one_affect_date_au(new Date().toLocaleDateString('fr-FR')); setp_one_affect_cible(); setp_one_affect_cible_nom(); @@ -2045,6 +2062,7 @@ const Employes = (props) => { function Annule_Affectation_DetailFields() { + clean_affectation_fields(); Get_Given_Employee_Affectation(selected_affectation_id); setAffectation_data_changed(""); setedite_affectation_form(""); @@ -2169,14 +2187,18 @@ const Employes = (props) => { }; - function add_one_affectation_block() { + function add_one_affectation_block() { setdisplay_affectation(""); + setAdd_new_affectation("1"); - + if (myRef_new_affectation.current) { myRef_new_affectation.current.scrollIntoView({ behavior: "smooth" }); } + + clean_affectation_fields(); + } @@ -4212,7 +4234,6 @@ const Employes = (props) => {
Date du
-