@@ -1250,13 +1262,101 @@ const DistplayPartnerTraningsPage = (props) => {
- Civilité
+ Code
- -----
+ {}
+
+
+ Titre
+
+
+ {}
+
+
+
+
+
+ Domaine
+
+
+ {}
+
+
+
+
+
+ Coût
+
+
+
+ {}
+
+
+
+
+
+ Durée
+
+
+ {selected_row_data_json.duration_in_hour && String(selected_row_data_json.duration_unit) === "jour" &&
+ }
+
+ {String(selected_row_data_json.duration_unit) !== "jour" &&
+ }
+
+
+
+
+
+ Présentiel
+
+
+
+
+ {selected_row_data_json.published && }
+
+
+
+
+
+ Distanciel
+
+
+
+
+ {selected_row_data_json.published && }
+
+
+
+
+
+
+ Publié Web
+
+
+
+ {selected_row_data_json.published && }
+
+
+
+
+
+ Cible
+
+
+ {}
+
+
@@ -1621,6 +1721,14 @@ const DistplayPartnerTraningsPage = (props) => {
description: parse((JSON.parse(item).description).replace(/(<([^>]+)>)/ig, '')),
published: JSON.parse(item).published,
lms_class_code: JSON.parse(item).lms_class_code,
+ duration: JSON.parse(item).duration,
+ duration_unit: JSON.parse(item).duration_unit,
+ duration_in_hour: JSON.parse(item).duration_in_hour,
+ presentiel: JSON.parse(item).presentiel.presentiel,
+ distanciel: JSON.parse(item).presentiel.distantiel,
+ cible: JSON.parse(item).pourqui,
+ currecny: JSON.parse(item).currecny,
+
}
))}
@@ -1633,11 +1741,13 @@ const DistplayPartnerTraningsPage = (props) => {
Closecreatetraining();
closeTrainingForm();
+ var al = JSON.parse(rowss[newSelectionModel.row.id])
+
+ setselected_row_data_json(JSON.parse(rowss[newSelectionModel.row.id]));
+
+
setreftrainingtoupdate(newSelectionModel.row.internal_url);
setexternalcodetraining_toupdate(newSelectionModel.row.external_code);
-
-
-
setDialog_formation_open(true);
}
diff --git a/src/components/Employes.js b/src/components/Employes.js
index 995a5f5..8e65f9f 100644
--- a/src/components/Employes.js
+++ b/src/components/Employes.js
@@ -583,6 +583,7 @@ const Employes = (props) => {
function clean_all_filters() {
+ setgridline_id('');
setp_filtre1();
setp_filtre1_value();
@@ -802,7 +803,9 @@ const Employes = (props) => {
function Display_Detail_Employe(employee_id) {
- //clearDetailAttendeFields();
+
+
+ clearEmployeeFields()
setadd_One_Employee();
setdisplay_detail_employe("1");
@@ -811,6 +814,35 @@ const Employes = (props) => {
}
+ function clearEmployeeFields() {
+
+ setp_one_detail_nom('');
+ setp_one_detail_prenom('');
+ setp_one_detail_mail('');
+ setp_one_detail_naissance(new Date().toLocaleDateString('fr-FR'));
+ setp_one_detail_tel('');
+ setp_one_detail_adresse('');
+ setp_one_detail_code_postal('');
+ setp_one_detail_ville('');
+ setp_one_detail_resp_hierarchie_id('');
+ setp_one_detail_civilite('');
+ setp_one_detail_fonction('');
+ setp_one_detail_profil('');
+ setp_one_detail_profil_label('');
+
+ setp_one_detail_pays('');
+ setp_one_detail_tel_mobile('');
+ setp_one_detail_linkedIn('');
+ setp_one_detail_facebook('');
+ setp_one_detail_twitter('');
+ setp_one_detail_ismanager('0');
+
+ setp_one_detail_ismanager_label('');
+ setp_one_detail_resp_hierarchie_nom('');
+ setp_one_detail_resp_hierarchie_prenom('');
+
+ }
+
function handleClick_delete(event, cellValues) {
var local_rh_id = cellValues.row._id;
@@ -831,6 +863,10 @@ const Employes = (props) => {
const [p_detail_nom, setp_detail_nom] = useState();
const [p_detail_prenom, setp_detail_prenom] = useState();
const [p_detail_mail, setp_detail_mail] = useState();
+
+ const [p_detail_naissance, setp_detail_naissance] = useState(new Date().toLocaleDateString('fr-FR'));
+
+
const [p_detail_tel, setp_detail_tel] = useState();
const [p_detail_adresse, setp_detail_adresse] = useState();
const [p_detail_code_postal, setp_detail_code_postal] = useState();
@@ -857,6 +893,11 @@ const Employes = (props) => {
const [p_one_detail_nom, setp_one_detail_nom] = useState();
const [p_one_detail_prenom, setp_one_detail_prenom] = useState();
const [p_one_detail_mail, setp_one_detail_mail] = useState();
+
+ const [p_one_detail_naissance, setp_one_detail_naissance] = useState(new Date().toLocaleDateString('fr-FR'));
+
+
+
const [p_one_detail_tel, setp_one_detail_tel] = useState();
const [p_one_detail_adresse, setp_one_detail_adresse] = useState();
const [p_one_detail_code_postal, setp_one_detail_code_postal] = useState();
@@ -900,9 +941,11 @@ const Employes = (props) => {
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Given_Ressource_Humaine/";
+ setLoading(true);
axios.post(myurl, form).then(res => {
if (String(res.data.status) === "true") {
+ setLoading(false);
//console.log(" In Get_Employee_Data res.data.status = " + res.data.status);
//console.log(" In Get_Employee_Data res.data.message r_class = " + res.data.message);
setGetAttendee_api("true");
@@ -923,6 +966,10 @@ const Employes = (props) => {
setp_detail_mail(mylocal_employe.email);
}
+ if (mylocal_employe.date_naissance) {
+ setp_detail_naissance(mylocal_employe.date_naissance);
+ }
+
if (mylocal_employe.telephone_mobile) {
setp_detail_tel_mobile(mylocal_employe.telephone_mobile);
@@ -1060,6 +1107,7 @@ const Employes = (props) => {
}
else {
+ setLoading(false);
setGetAttendee_api("false");
setGetAttendee_message(res.data.message);
alert(res.data.message);
@@ -1442,6 +1490,11 @@ const Employes = (props) => {
document.getElementsByName("detail_mail")[0].style.backgroundColor = "#ECEFF1";
}
+ if (document.getElementsByName("detail_naissance")[0]) {
+ document.getElementsByName("detail_naissance")[0].disabled = true;
+ document.getElementsByName("detail_naissance")[0].style.backgroundColor = "#ECEFF1";
+ }
+
if (document.getElementsByName("detail_tel")[0]) {
document.getElementsByName("detail_tel")[0].disabled = true;
@@ -1548,6 +1601,9 @@ const Employes = (props) => {
document.getElementsByName("detail_mail")[0].disabled = false;
document.getElementsByName("detail_mail")[0].style.backgroundColor = "#FFFFFF";
+ document.getElementsByName("detail_naissance")[0].disabled = false;
+ document.getElementsByName("detail_naissance")[0].style.backgroundColor = "#FFFFFF";
+
document.getElementsByName("detail_tel")[0].disabled = false;
document.getElementsByName("detail_tel")[0].style.backgroundColor = "#FFFFFF";
@@ -1637,6 +1693,7 @@ const Employes = (props) => {
form.append("token", stored_cookie);
form.append("nom", p_detail_nom);
form.append("email", p_detail_mail);
+ form.append("date_naissance", p_detail_naissance);
if (p_detail_prenom)
form.append("prenom", p_detail_prenom);
@@ -2100,6 +2157,7 @@ const Employes = (props) => {
setDelete_Employee_api("true");
setDelete_Employee_result(res.data.message);
clean_all_filters();
+ clearEmployeeFields();
alert(res.data.message);
}
else {
@@ -2186,6 +2244,7 @@ const Employes = (props) => {
function submenu_add_one_employee() {
setdisplay_detail_employe();
+ clearEmployeeFields();
setadd_One_Employee("1");
setsubmenu("detail_employe");
@@ -2233,12 +2292,20 @@ const Employes = (props) => {
}
+ if (p_one_detail_naissance.trim() == "") {
+ alert(" Vous devez saisir la date de naissance l'employé");
+ return;
+ }
+
+
+
if (p_one_detail_mail.trim() == "") {
alert(" Vous devez saisir l'email de l'employé");
return;
}
+
var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
if (!p_one_detail_mail.trim().match(validRegex)) {
alert("L'adresse email est invalide.");
@@ -2253,6 +2320,7 @@ const Employes = (props) => {
form.append("email", p_one_detail_mail);
form.append("prenom", p_one_detail_prenom);
form.append("civilite", p_one_detail_civilite);
+ form.append("date_naissance", p_one_detail_naissance);
@@ -5260,6 +5328,29 @@ const Employes = (props) => {
/>
+
+
Date Naissance
+ {
+ setp_detail_naissance(format(date, 'd/MM/yyyy'));
+ setEmployee_data_changed("1");
+ }
+ }
+ showTimeSelect={false}
+ dateFormat="dd/MM/yyyy"
+ className="disabled_style enable_style"
+ locale='fr-FR'
+
+ />
+
+
+
+
+
+
Téléphone Mobile
{
/>
+
Date Naissance
+
+ {
+ setp_one_detail_naissance(format(date, 'd/MM/yyyy'));
+ setEmployee_data_changed("1");
+ }
+ }
+ showTimeSelect={false}
+ dateFormat="dd/MM/yyyy"
+ className="disabled_style enable_style"
+ locale='fr-FR'
+
+ />
+
+
+
+
+
Téléphone Mobile
{
}
function clean_all_filters() {
+
+ setgridline_id('');
setp_filtre1();
setp_filtre1_value();
diff --git a/src/styles/components/_apprenant.scss b/src/styles/components/_apprenant.scss
index a370429..cfd1df9 100644
--- a/src/styles/components/_apprenant.scss
+++ b/src/styles/components/_apprenant.scss
@@ -377,8 +377,17 @@
.img_class_logo {
display: block;
- width: 128px;
- height: 128px;
+ width: 96px;
+ height: 96px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
+ .img_class_logo_mini {
+ display: block;
+ width: 64px;
+ height: 64px;
border-radius: 10px !important;
border: 1px solid black;
float: left;
@@ -1010,8 +1019,17 @@
.img_class_logo {
display: block;
- width: 168px;
- height: 168px;
+ width: 112px;
+ height: 112px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
+ .img_class_logo_mini {
+ display: block;
+ width: 96px;
+ height: 96px;
border-radius: 10px !important;
border: 1px solid black;
float: left;
@@ -1686,6 +1704,15 @@
float: left;
}
+ .img_class_logo_mini {
+ display: block;
+ width: 112px;
+ height: 112px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
.bton_supprime_image_class {
font-size: small;
text-align: center;
@@ -2319,6 +2346,15 @@
float: left;
}
+ .img_class_logo_mini {
+ display: block;
+ width: 112px;
+ height: 112px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
.bton_supprime_image_class {
font-size: small;
text-align: center;
diff --git a/src/styles/components/_displaypartnersession.scss b/src/styles/components/_displaypartnersession.scss
index 8267681..48a08bc 100644
--- a/src/styles/components/_displaypartnersession.scss
+++ b/src/styles/components/_displaypartnersession.scss
@@ -693,6 +693,15 @@
width: 200px !important;
}
+ .img_class_logo_mini {
+ display: block;
+ width: 64px;
+ height: 64px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
}
@media only screen and (min-width: 601px) and (max-width: 991px) {
@@ -1316,6 +1325,15 @@
width: 500px !important;
}
+ .img_class_logo_mini {
+ display: block;
+ width: 64px;
+ height: 64px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
}
@media only screen and (min-width: 992px) and (max-width: 1199px) {
@@ -1862,6 +1880,15 @@
width: 500px !important;
}
+ .img_class_logo_mini {
+ display: block;
+ width: 112px;
+ height: 112px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
}
@media only screen and (min-width: 1200px) {
@@ -2529,6 +2556,15 @@
top: -13px;
}
+ .img_class_logo_mini {
+ display: block;
+ width: 112px;
+ height: 112px;
+ border-radius: 10px !important;
+ border: 1px solid black;
+ float: left;
+ }
+
}
// end media
@@ -2623,8 +2659,14 @@
.MuiMenu-paper {
max-width: 30% !important;
+
}
+
+ .MuiPaper-root{
+ border-radius: 10px !important;
+ background: #F8F9F9 !important;
+ }
}
diff --git a/src/styles/components/_toggleswitch.scss b/src/styles/components/_toggleswitch.scss
index 8c852a1..6bb45d4 100644
--- a/src/styles/components/_toggleswitch.scss
+++ b/src/styles/components/_toggleswitch.scss
@@ -1,6 +1,7 @@
.toggleswitch {
.container {
text-align: center;
+ padding-right: 5px !important;
}
.toggle-switch {
position: relative;