From e7dc6fb1efe7d5f2c3fd4535780e8b7d378bddbf Mon Sep 17 00:00:00 2001 From: cherif Date: Mon, 8 Jan 2024 22:40:41 +0100 Subject: [PATCH] 08/01/24 - 22h30 --- public/sample/template_import_employes.csv | 10 ++++---- src/components/Apprenant.js | 29 +++++++++++++++------- src/components/Employes.js | 7 ++++-- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/public/sample/template_import_employes.csv b/public/sample/template_import_employes.csv index aa72c3e..36652da 100644 --- a/public/sample/template_import_employes.csv +++ b/public/sample/template_import_employes.csv @@ -1,5 +1,5 @@ -nom;prenom;email;telephone_mobile;telephone;profil;ismanager;superieur_hierarchie_email;civilite;adresse;code_postal;ville;pays;facebook;fonction;linkedin;twitter -nom_namanger1;Prenom_Mnager1;manager_01@mysy.com;6555555;1222222;directeur;non;;Mme;emp_adresse01;582222;paris01;France;;;; -nom_namanger2;Prenom_Mnager2;manager_02@mysy.com;6555555;1222222;administratif;non;;Neutre;emp_adresse02;582223;paris02;France;;;; -emp_test01;prenom01;testnom01@mysy.com;6555555;1222222;enseignant;non;manager_01@mysy.com;M;emp_adresse01;582222;paris01;France;em_face01;emp_fonction01;emp_link01;emp_tiwter01 -emp_test02;prenom02;testnom02@mysy.com;6555555;1222222;enseignant;non;manager_01@mysy.com;Neutre;emp_adresse02;582223;paris02;France;em_face02;emp_fonction02;emp_link02;emp_tiwter02 +civilite;nom;prenom;date_naissance;email;telephone_mobile;telephone;profil;ismanager;superieur_hierarchie_email;adresse;code_postal;ville;pays;facebook;fonction;linkedin;twitter +M;nom_namanger1;Prenom_Mnager1;01/12/1985;manager_01@mysy.com;6555555;1222222;directeur;non;;emp_adresse01;582222;paris01;France;;;; +Mme;nom_namanger2;Prenom_Mnager2;05/07/1988;manager_02@mysy.com;6555555;1222222;administratif;non;;emp_adresse02;582223;paris02;France;;;; +M;emp_test01;prenom01;12/12/2012;testnom01@mysy.com;6555555;1222222;enseignant;non;billardman01@hotmail.com;emp_adresse01;582222;paris01;France;em_face01;emp_fonction01;emp_link01;emp_tiwter01 +Neutre;emp_test02;prenom02;11/11/2011;testnom02@mysy.com;6555555;1222222;enseignant;non;billardman01@hotmail.com;emp_adresse02;582223;paris02;France;em_face02;emp_fonction02;emp_link02;emp_tiwter02 diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 76e84fd..253dc14 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -414,8 +414,8 @@ const Apprenant = (props) => { - const [selected_apprenant_id, setselected_apprenant_id] = useState(); - const [selected_apprenant_row_id, setselected_apprenant_row_id] = useState(); + const [selected_apprenant_id, setselected_apprenant_id] = useState(""); + const [selected_apprenant_row_id, setselected_apprenant_row_id] = useState(""); @@ -3611,8 +3611,11 @@ const Apprenant = (props) => {
Civilité
- {Get_All_Apprenant_result && selected_apprenant_id && - String(selected_apprenant_id).length > 0 &&
+ {Get_All_Apprenant_result && + selected_apprenant_id && + String(selected_apprenant_id).length > 0 && + Get_All_Apprenant_result[selected_apprenant_row_id] && +
{JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).civilite}
}
@@ -3622,7 +3625,9 @@ const Apprenant = (props) => { Nom & Prénom {Get_All_Apprenant_result && selected_apprenant_id && - String(selected_apprenant_id).length > 0 &&
+ String(selected_apprenant_id).length > 0 && + Get_All_Apprenant_result[selected_apprenant_row_id] && +
{JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).nom.toUpperCase()} {JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).prenom.charAt(0).toUpperCase() + JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).prenom.slice(1)} @@ -3635,7 +3640,8 @@ const Apprenant = (props) => { E-mail
{Get_All_Apprenant_result && selected_apprenant_id && - String(selected_apprenant_id).length > 0 &&
+ String(selected_apprenant_id).length > 0 && + Get_All_Apprenant_result[selected_apprenant_row_id] &&
{JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).email}
}
@@ -3646,7 +3652,8 @@ const Apprenant = (props) => { Téléphone
{Get_All_Apprenant_result && selected_apprenant_id && - String(selected_apprenant_id).length > 0 &&
+ String(selected_apprenant_id).length > 0 && + Get_All_Apprenant_result[selected_apprenant_row_id] &&
{JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).telephone}
}
@@ -3656,7 +3663,9 @@ const Apprenant = (props) => { Age {Get_All_Apprenant_result && selected_apprenant_id && - String(selected_apprenant_id).length > 0 &&
+ String(selected_apprenant_id).length > 0 && + Get_All_Apprenant_result[selected_apprenant_row_id] && +
{selected_row_data_json_age} ans - {JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).date_naissance}
} @@ -3668,7 +3677,9 @@ const Apprenant = (props) => { Adresse postale
{Get_All_Apprenant_result && selected_apprenant_id && - String(selected_apprenant_id).length > 0 &&
+ String(selected_apprenant_id).length > 0 && + Get_All_Apprenant_result[selected_apprenant_row_id] && +
{JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).adresse}
{JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).code_postal} {JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).ville}
{JSON.parse(Get_All_Apprenant_result[selected_apprenant_row_id]).pays.toUpperCase()} diff --git a/src/components/Employes.js b/src/components/Employes.js index 383c2a2..83abce5 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -1276,7 +1276,8 @@ const Employes = (props) => { formData.append("token", stored_cookie); //console.log("token = " + stored_cookie); - fetch( + setLoading(true); + fetch( process.env.REACT_APP_API_URL + "myclass/api/Add_Ressource_Humaine_mass/", { method: 'POST', @@ -1286,6 +1287,7 @@ const Employes = (props) => { .then((response) => response.json()) .then((result) => { + setLoading(false); //console.log(" ## result['status'] = ", result['status']) if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); @@ -1296,7 +1298,7 @@ const Employes = (props) => { //console.log('Success:', result['message']); setliste_sessions_file_change_result(result['message']); setliste_sessions_file_change_api("true"); - + clean_all_filters(); Getall_Training_Employee(); alert(" Les employés ont été correctement importés"); @@ -1312,6 +1314,7 @@ const Employes = (props) => { }) .catch((error) => { + setLoading(false); console.error('Error:', error); setliste_sessions_file_change_api("false"); alert(" Impossible d'importer les employés ");