diff --git a/src/components/Employes.js b/src/components/Employes.js
index db498da..0761168 100644
--- a/src/components/Employes.js
+++ b/src/components/Employes.js
@@ -587,6 +587,8 @@ const Employes = (props) => {
Getall_Employee_Affectation(employe_id);
Getall_Employee_Acces_Right(employe_id);
+
+
}
@@ -669,6 +671,9 @@ const Employes = (props) => {
const [p_detail_resp_hierarchie_nom, setp_detail_resp_hierarchie_nom] = useState("");
const [p_detail_resp_hierarchie_prenom, setp_detail_resp_hierarchie_prenom] = useState("");
+ const [p_detail_user_login, setp_detail_user_login] = useState();
+ const [p_detail_user_pass, setp_detail_user_pass] = useState();
+
const [p_one_detail_nom, setp_one_detail_nom] = useState();
const [p_one_detail_prenom, setp_one_detail_prenom] = useState();
@@ -805,6 +810,13 @@ const Employes = (props) => {
setp_detail_fonction(mylocal_employe.fonction);
}
+ if (mylocal_employe.user_login) {
+ setp_detail_user_login(mylocal_employe.user_login);
+ setp_new_login(mylocal_employe.user_login)
+ }else{
+ setp_new_login(mylocal_employe.email)
+ }
+
if (mylocal_employe.ismanager) {
@@ -1290,6 +1302,12 @@ const Employes = (props) => {
document.getElementsByName("detail_ismanager")[0].style.backgroundColor = "#ECEFF1";
}
+ if (document.getElementsByName("detail_user_login")[0]) {
+ document.getElementsByName("detail_user_login")[0].disabled = true;
+ document.getElementsByName("detail_user_login")[0].style.backgroundColor = "#ECEFF1";
+ }
+
+
if (document.getElementsByName("detail_resp_hierarchie_id")[0]) {
document.getElementsByName("detail_resp_hierarchie_id")[0].disabled = true;
document.getElementsByName("detail_resp_hierarchie_id")[0].style.backgroundColor = "#ECEFF1";
@@ -1353,6 +1371,9 @@ const Employes = (props) => {
document.getElementsByName("detail_ismanager")[0].disabled = false;
document.getElementsByName("detail_ismanager")[0].style.backgroundColor = "#FFFFFF";
+ document.getElementsByName("detail_user_login")[0].disabled = false;
+ document.getElementsByName("detail_user_login")[0].style.backgroundColor = "#FFFFFF";
+
document.getElementsByName("detail_resp_hierarchie_id")[0].disabled = false;
document.getElementsByName("detail_resp_hierarchie_id")[0].style.backgroundColor = "#FFFFFF";
@@ -1467,6 +1488,8 @@ const Employes = (props) => {
else
form.append("twitter", "");
+
+
if (p_detail_ismanager)
form.append("ismanager", p_detail_ismanager);
else
@@ -2134,71 +2157,29 @@ const Employes = (props) => {
async function submenu_droit_acces() {
- var form = new FormData();
-
-
- const stored_cookie = getCookie('tokenmysypart');
- form.append("token", stored_cookie);
- form.append("module_name", 'employe');
- form.append("action", 'read');
-
- var myurl = process.env.REACT_APP_API_URL + "myclass/api/Is_User_Has_Right_To_Action/";
-
-
-
- axios.post(myurl, form).then(res => {
-
- if (String(res.data.status) === String("true")) {
- //console.log(" In Check_User_Access_Right res.data.status = " + res.data.status);
- //console.log(" In Check_User_Access_Right res.data.message r_class = " + res.data.message);
- setCheck_User_Access_Right_api("true");
- setCheck_User_Access_Right_result(res.data.message);
-
- setsubmenu("droit_acces");
-
- sleep(5);
-
- if (document.getElementById("droit_acces")) {
- document.getElementById("droit_acces").style.backgroundColor = "#104277";
- document.getElementById("droit_acces").style.color = "white";
- }
-
- if (document.getElementById("detail_employe")) {
- document.getElementById("detail_employe").style.backgroundColor = "#d8edfc";
- document.getElementById("detail_employe").style.color = "black";
- }
-
- if (document.getElementById("affectation")) {
- document.getElementById("affectation").style.backgroundColor = "#d8edfc";
- document.getElementById("affectation").style.color = "black";
- }
- setSelectionModel_affectations([]);
- setdisplay_affectation("0");
- setAdd_new_affectation("");
- clean_affectation_fields();
- clean_nouvelle_affectation_fields();
-
-
-
- }
- else {
- setCheck_User_Access_Right_api("false");
- setCheck_User_Access_Right_message(res.data.message);
- alert(res.data.message)
- }
-
- }).catch((error) => {
- console.warn('Not good man :( Check_User_Access_Right = ', error);
- setCheck_User_Access_Right_api("false");
- alert(" Impossible de recuperer la matrice des droits d'acces de l'employé");
- //setmyApimyApiMessage("")
- })
-
-
+ setsubmenu("droit_acces");
+ sleep(5);
+ if (document.getElementById("droit_acces")) {
+ document.getElementById("droit_acces").style.backgroundColor = "#104277";
+ document.getElementById("droit_acces").style.color = "white";
+ }
+ if (document.getElementById("detail_employe")) {
+ document.getElementById("detail_employe").style.backgroundColor = "#d8edfc";
+ document.getElementById("detail_employe").style.color = "black";
+ }
+ if (document.getElementById("affectation")) {
+ document.getElementById("affectation").style.backgroundColor = "#d8edfc";
+ document.getElementById("affectation").style.color = "black";
+ }
+ setSelectionModel_affectations([]);
+ setdisplay_affectation("0");
+ setAdd_new_affectation("");
+ clean_affectation_fields();
+ clean_nouvelle_affectation_fields();
}
@@ -2771,6 +2752,63 @@ const Employes = (props) => {
};
+
+ const [Dialog_1_message_create_update_login_pwd, setDialog_1_message_create_update_login_pwd] = React.useState(false);
+ const [Dialog_1_open_create_update_login_pwd, setDialog_1_open_create_update_login_pwd] = React.useState(false);
+
+ function Dialog_1_handle_change_login_pwd() {
+ setDialog_1_message_create_update_login_pwd("Souhaitez-vous modifier les accès (login & pwd) de l'utilisateur ?");
+ setDialog_1_open_create_update_login_pwd(true);
+ }
+
+ const Dialog_1_handleClose_buton_create_update_login_pwd = () => {
+ //alert(" Utiliser le bouton 'fermer' ");
+ //setOpen(false);
+ };
+
+ const Dialog_1_handle_OK_buton_create_update_login_pwd = () => {
+
+ setDialog_1_open_create_update_login_pwd(false);
+ setDialog_1_open_create_update_login_pwd_update(true);
+ };
+
+
+ const Dialog_1_handleCancel_buton_create_update_login_pwd = () => {
+ setDialog_1_open_create_update_login_pwd(false);
+ };
+
+ const [Dialog_1_message_create_update_login_pwd_update, setDialog_1_message_create_update_login_pwd_update] = React.useState(false);
+ const [Dialog_1_open_create_update_login_pwd_update, setDialog_1_open_create_update_login_pwd_update] = React.useState(false);
+
+ function Dialog_1_handle_change_login_pwd_update() {
+ setDialog_1_message_create_update_login_pwd_update("Souhaitez-vous modifier les accès (login & pwd) de l'utilisateur ?");
+ setDialog_1_open_create_update_login_pwd_update(true);
+ }
+
+ const Dialog_1_handleClose_buton_create_update_login_pwd_update = () => {
+ //alert(" Utiliser le bouton 'fermer' ");
+ //setOpen(false);
+ };
+
+ const Dialog_1_handle_OK_buton_create_update_login_pwd_update = () => {
+
+ setDialog_1_open_create_update_login_pwd_update(false);
+ };
+
+
+ const Dialog_1_handleCancel_buton_create_update_login_pwd_update = () => {
+ setDialog_1_open_create_update_login_pwd_update(false);
+ //setp_new_login('');
+ setp_new_pwd('');
+ setp_conf_new_login('');
+
+ };
+
+
+ const [p_new_login, setp_new_login] = React.useState("");
+ const [p_new_pwd, setp_new_pwd] = React.useState("");
+ const [p_conf_new_login, setp_conf_new_login] = React.useState("");
+
function OnchangeCellDataGrid(params) {
@@ -2826,6 +2864,92 @@ const Employes = (props) => {
}
+
+ const [Add_Update_Employee_Login_Pass_Data_api, setAdd_Update_Employee_Login_Pass_Data_api] = useState();
+ const [Add_Update_Employee_Login_Pass_Data_message, setAdd_Update_Employee_Login_Pass_Data_message] = useState();
+ const [Add_Update_Employee_Login_Pass_Data_result, setAdd_Update_Employee_Login_Pass_Data_result] = useState();
+ function Add_Update_Employee_Login_Pass_Data() {
+ var form = new FormData();
+ //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA");
+
+ // Controle sur les champs
+
+ if (p_new_login.trim() == "") {
+ alert(" Vous devez saisir le mail de login");
+ return;
+ }
+
+
+ if (p_new_pwd.trim() == "") {
+ alert(" Vous devez saisir un mot de passe");
+ return;
+ }
+
+
+ if (p_conf_new_login.trim() == "") {
+ alert(" Vous devez confirmer le mot de passe");
+ return;
+ }
+
+
+ var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+ if (!p_new_login.match(validRegex)) {
+ alert("L'adresse email est invalide.");
+ return;
+ }
+
+
+
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+ form.append("email", p_new_login);
+ form.append("pwd", p_new_pwd);
+ form.append("ressource_humaine_id", selected_id);
+
+
+
+ console.log(" form == ", form);
+
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_Employee_Login_Pass/";
+
+ axios.post(myurl, form).then(res => {
+ //console.log(" In Add_Update_Employee_Login_Pass_Data res.data.status = " + res.data.status);
+ //console.log(" In Add_Update_Employee_Login_Pass_Data res.data.message r_class = " + res.data.message);
+
+ if (String(res.data.status) === String("true")) {
+ setAdd_Update_Employee_Login_Pass_Data_api("true");
+ setAdd_Update_Employee_Login_Pass_Data_result(res.data.message);
+
+ setp_detail_user_login(p_new_login);
+
+ setDialog_1_open_create_update_login_pwd_update(false);
+ alert(res.data.message);
+ setp_new_login('');
+ setp_new_pwd('');
+ setp_conf_new_login('');
+
+ }
+ else {
+ setAdd_Update_Employee_Login_Pass_Data_api("false");
+ setAdd_Update_Employee_Login_Pass_Data_message(res.data.message);
+ alert(res.data.message);
+ }
+
+ }).catch((error) => {
+
+ console.warn('UpdateStagiaireData : Not good man :( Add_Update_Employee_Login_Pass_Data = ' + error);
+ setAdd_Update_Employee_Login_Pass_Data_api("false");
+ alert(" Impossible de créer ou mettre à jour le compte l'employé");
+
+ })
+ }
+
+ function Generate_Pwd(){
+ var randomstring = Math.random().toString(36).slice(-8);
+ setp_new_pwd(randomstring);
+ setp_conf_new_login(randomstring);
+ }
+
return (
+
+
+
+
+
+
Vos employés
Utilisez les filtres !
@@ -3883,6 +4128,42 @@ const Employes = (props) => {
}
+
+
+
+ {String(employee_data_edit_mode) !== "1" &&
Login
+
+
}
+
+ {String(employee_data_edit_mode) === "1" &&
Login
+
+
}
+
diff --git a/src/components/Partner.js b/src/components/Partner.js
index 73ccd53..51649e2 100644
--- a/src/components/Partner.js
+++ b/src/components/Partner.js
@@ -49,6 +49,12 @@ import Employes from "./Employes";
import Materiels from "./Materiels";
import Partner_Commande from "./Partner_Commande";
import Config_Documents from "./Config_Document";
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogContentText from '@mui/material/DialogContentText';
+import DialogTitle from '@mui/material/DialogTitle';
+
//import { FcHome} from "react-icons/fc";
const Partner = (props) => {
@@ -252,9 +258,11 @@ const Partner = (props) => {
// check du droit d'acces de l'utilisateur
function check_user_acces_right(local_module, local_action) {
- //console.log(" #### check_user_acces_right = ", local_module, " --- local_action = ", local_action);
+ console.log(" ### connected_user_access_right = ", connected_user_access_right);
+ console.log(" #### check_user_acces_right = ", local_module, " --- local_action = ", local_action);
for (let i = 0; i < connected_user_access_right.length; i++) {
if (String(connected_user_access_right[i].module) === String(local_module)) {
+
return 1;
}
}
@@ -303,67 +311,103 @@ const Partner = (props) => {
function CreateTraining(event) {
- setmenu("creation");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/creation");
+ var security_retval = check_user_acces_right("formation", "read");
+ if (security_retval === 1) {
+ setmenu("creation");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/creation");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function PersonnalData(event) {
- setmenu("infopartner");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/infopartner");
+ var security_retval = check_user_acces_right("compte_partner", "read");
+ if (security_retval === 1) {
+ setmenu("infopartner");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/infopartner");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function config_document_func(event) {
- setmenu("config_document");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/config_document");
+ var security_retval = check_user_acces_right("config_document", "read");
+ if (security_retval === 1) {
+ setmenu("config_document");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/config_document");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function DisplayStat(event) {
- setmenu("statistique");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/statistique");
+ var security_retval = check_user_acces_right("formation", "read");
+ if (security_retval === 1) {
+ setmenu("statistique");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/statistique");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function DisplaySetUpLMS(event) {
- setmenu("setuplms");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/setuplms");
+ var security_retval = check_user_acces_right("lms", "read");
+ if (security_retval === 1) {
+ setmenu("setuplms");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/setuplms");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
+
}
function DisplayFacure(event) {
+ var security_retval = check_user_acces_right("commande", "read");
+ if (security_retval === 1) {
+ setmenu("facture");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/facture");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
- setmenu("facture");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/facture");
}
function Abonnement_func(event) {
- setmenu("abonnement");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/abonnement");
+ var security_retval = check_user_acces_right("abonnement", "read");
+ if (security_retval === 1) {
+ setmenu("abonnement");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/abonnement");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
+
}
function pricing_func(event) {
var security_retval = check_user_acces_right("prix", "read");
-
if (security_retval === 1) {
setmenu("pricing");
setapiexcelimportmessage();
setformation_file_name();
history.push("/Partner/pricing");
} else {
- alert("Vous droits ne sont pas suffisants");
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
}
}
@@ -377,51 +421,85 @@ const Partner = (props) => {
setformation_file_name();
history.push("/Partner/mes_clients");
} else {
- alert("Vous droits ne sont pas suffisants");
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
}
}
function mes_devis_func(event) {
- setmenu("mes_devis");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/mes_devis");
+ var security_retval = check_user_acces_right("commande", "read");
+ if (security_retval === 1) {
+ setmenu("mes_devis");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/mes_devis");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
+
function mes_cmd_func(event) {
- setmenu("mes_cmd");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/mes_cmd");
+ var security_retval = check_user_acces_right("commande", "read");
+ if (security_retval === 1) {
+ setmenu("mes_cmd");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/mes_cmd");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function DiplaySessionList(event) {
- setmenu("mes_sessions");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/mes_sessions");
+ var security_retval = check_user_acces_right("session", "read");
+
+
+ if (security_retval === 1) {
+ setmenu("mes_sessions");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/mes_sessions");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function DiplayStagiaireList(event) {
- setmenu("mes_stagiaires");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/mes_stagiaires");
+ var security_retval = check_user_acces_right("stagiaire", "read");
+ if (security_retval === 1) {
+ setmenu("mes_stagiaires");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/mes_stagiaires");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function DisplayeEmployeList(event) {
- setmenu("mes_employes");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/mes_employes");
+ var security_retval = check_user_acces_right("employe", "read");
+ if (security_retval === 1) {
+ setmenu("mes_employes");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/mes_employes");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
function DisplayeMaterielList(event) {
- setmenu("mon_materiel");
- setapiexcelimportmessage();
- setformation_file_name();
- history.push("/Partner/mon_materiel");
+ var security_retval = check_user_acces_right("materiel", "read");
+
+ if (security_retval === 1) {
+ setmenu("mon_materiel");
+ setapiexcelimportmessage();
+ setformation_file_name();
+ history.push("/Partner/mon_materiel");
+ } else {
+ Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants");
+ }
}
@@ -743,6 +821,22 @@ const Partner = (props) => {
}
+ const [Dialog_1_message, setDialog_1_message] = React.useState(false);
+ const [Dialog_1_open, setDialog_1_open] = React.useState(false);
+ function Dialog_1_handle_acces_insuffisant(message) {
+ setDialog_1_message(message);
+ setDialog_1_open(true);
+ }
+
+ const Dialog_1_handleClose = () => {
+ //alert(" Utiliser le bouton 'fermer' ");
+ //setOpen(false);
+ };
+
+ const Dialog_1_handleClose_buton = () => {
+ setDialog_1_open(false);
+ };
+
return (
@@ -762,6 +856,26 @@ const Partner = (props) => {
{isLoading &&
}
+
+

diff --git a/src/components/UpdatePartnerInfo.js b/src/components/UpdatePartnerInfo.js
index 09832c6..8bab995 100644
--- a/src/components/UpdatePartnerInfo.js
+++ b/src/components/UpdatePartnerInfo.js
@@ -1555,7 +1555,7 @@ function UpdateParnterInfo(props) {
if (security_retval === 1)
setsubmenu("submenu_donnee_securite");
else
- alert("Vous droits ne sont pas suffisants");
+ alert("Vos droits ne sont pas suffisants");
}
async function submenu_contact() {
diff --git a/src/styles/components/_employes.scss b/src/styles/components/_employes.scss
index df09f58..c6b53f5 100644
--- a/src/styles/components/_employes.scss
+++ b/src/styles/components/_employes.scss
@@ -2170,6 +2170,41 @@
// end media
+
+ .session_caract_Dialog {
+ width: 100%;
+ padding: 5px;
+ float: left;
+ text-align: left;
+ font-size: small;
+ margin-bottom: 1rem !important;
+ }
+
+ .bton_enreg_dialog {
+ border-radius: 5rem;
+ font-size: small;
+ background: #81BC3A !important;
+ text-align: center;
+ height: 2.5rem;
+ width: 80%;
+ color: white;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
+
+ .bton_annule_dialog {
+ border-radius: 5rem;
+ font-size: small;
+ background: lightgray !important;
+ text-align: right;
+ height: 2.5rem;
+ width: 80%;
+ color: black;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+
.css-1v4ccyo {
height: 3.5rem !important;
font-size: small;