Attestation delivrée le
@@ -26388,13 +26840,14 @@ const DisplayPartnerSession = (props) => {
{!detailuser_date_certification &&
Attestation NON délivrée encore
@@ -11834,7 +11837,7 @@ const DisplayPartnerStagiaires = (props) => {
selected={detailuser_date_evaluation}
dateFormat="dd/MM/yyyy"
className="disabled_style"
- locale='fr-FR'
+ locale={'fr'}
/>
@@ -11937,7 +11940,7 @@ const DisplayPartnerStagiaires = (props) => {
dateFormat="dd/MM/yyyy"
className="disabled_style"
- locale='fr-FR'
+ locale={'fr'}
/>
@@ -11952,7 +11955,7 @@ const DisplayPartnerStagiaires = (props) => {
dateFormat="dd/MM/yyyy"
className="disabled_style"
- locale='fr-FR'
+ locale={'fr'}
style={{ "visibility": "hidden" }}
/>
diff --git a/src/components/Display_Action_And_Class.js b/src/components/Display_Action_And_Class.js
index 16d045d..6a40094 100644
--- a/src/components/Display_Action_And_Class.js
+++ b/src/components/Display_Action_And_Class.js
@@ -1,18 +1,17 @@
import React, { useRef, useState, useEffect } from "react";
-import { useParams } from 'react-router-dom'
+
import axios from "axios";
-import Popup from 'reactjs-popup';
+
import 'reactjs-popup/dist/index.css';
-import bannerimg2 from "../mysy_img/MYSY-LOGO-BLUE.png";
-import logowhite from "../mysy_img/MYSY-LOGO-WHITE.png";
+
import { Helmet } from "react-helmet";
import 'react-slideshow-image/dist/styles.css'
-import { Fade } from 'react-slideshow-image';
+
import slideimg1 from "../mysy_img/education.jpg";
import slideimg4 from "../mysy_img/mysy_img.png";
import Footer from "./Fotter";
import Header from "./Header";
-import bannerimg from "../mysy_img/MYSY_banner_compte.png";
+
import img_met_program from "../mysy_img/met_programmation.jpg";
import img_met_hotel from "../mysy_img/met_hotel.jpg";
import img_met_graphisme from "../mysy_img/metier_graphisme.jpg";
@@ -26,15 +25,14 @@ import img_met_rh from "../mysy_img/met_rh.jpg";
import img_met_bureautic from "../mysy_img/met_burautic.jpg";
import img_met_vente from "../mysy_img/met_vente.jpg";
-import img_met_sport from "../mysy_img/met_sport.png";
-import img_met_sante_nat from "../mysy_img/met_sante_nat.jpeg";
+
/*
/!\ important: les images du slides doivent avoir une dimension de : 250 X 450
*/
import { Button, } from "reactstrap";
import { useHistory } from "react-router-dom";
import { useCookies } from "react-cookie";
-import { FacebookShareButton, LinkedinShareButton, TwitterShareButton } from "react-share";
+
import { SocialIcon } from 'react-social-icons';
import { confirmAlert } from 'react-confirm-alert';
//import { Rating } from 'react-simple-star-rating';
@@ -42,11 +40,7 @@ import Rating from '@mui/material/Rating';
import parse from 'html-react-parser';
import Inscription from "./Inscription_Information";
-import mysy_logo2 from "../mysy_img2/Logo_MySy.png"
-import { FaSearch, FaRegArrowAltCircleDown, FaRegArrowAltCircleUp } from 'react-icons/fa';
-import { areOptionsEqual } from "@mui/base";
-import { style } from "@mui/system";
-
+
const Display_Action_And_Class = (props) => {
const [classId, setclassId] = useState(props.classId);
const [action, setaction] = useState(props.action);
@@ -328,7 +322,7 @@ const Display_Action_And_Class = (props) => {
function Display(e) {
- var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_class/";
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_class_without_marketplace_check/";
var form = new FormData();
form.append("internal_url", classId);
diff --git a/src/components/Display_Partner_Catalog_DetailClass_new_v2.js b/src/components/Display_Partner_Catalog_DetailClass_new_v2.js
index 87fe460..218d77a 100644
--- a/src/components/Display_Partner_Catalog_DetailClass_new_v2.js
+++ b/src/components/Display_Partner_Catalog_DetailClass_new_v2.js
@@ -62,7 +62,7 @@ import Social_Fa_icon from '../img_new_design_2025/social_i_Fa.png';
import 'react-tooltip/dist/react-tooltip.css'
import { Tooltip } from 'react-tooltip'
-import { FcInfo } from "react-icons/fc";
+import { FcInfo } from "react-icons/fc";
const Display_Partner_Catalog_DetailClass_new_v2 = (props) => {
const { classId, action } = useParams();
@@ -2260,7 +2260,7 @@ const Display_Partner_Catalog_DetailClass_new_v2 = (props) => {
e.preventDefault();
//test(props.formation.external_code);
window.open(
- "/Display-Detail-formation/" + JSON.parse(formation).internal_url,
+ "/Display-Partner-Catalog-Detail-formation/" + JSON.parse(formation).internal_url,
'_self'
);
@@ -3036,7 +3036,7 @@ const Display_Partner_Catalog_DetailClass_new_v2 = (props) => {
e.preventDefault();
//test(props.formation.external_code);
window.open(
- "/Display-Detail-formation/" + JSON.parse(formation).internal_url,
+ "/Display-Partner-Catalog-Detail-formation/" + JSON.parse(formation).internal_url,
'_self'
);
diff --git a/src/components/ESign.js b/src/components/ESign.js
index 8768a9e..120625d 100644
--- a/src/components/ESign.js
+++ b/src/components/ESign.js
@@ -23,6 +23,8 @@ import Popup from 'reactjs-popup';
import 'reactjs-popup/dist/index.css';
import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif";
import { FcCancel, FcApproval, FcAcceptDatabase, FcPrint } from "react-icons/fc";
+import fr from 'date-fns/locale/fr';
+import { registerLocale } from 'react-datepicker';
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import { format } from 'date-fns'
@@ -90,7 +92,7 @@ const useStyles = makeStyles((theme) => ({
function ESign() {
-
+registerLocale('fr', fr);
const classes = useStyles();
const history = useHistory();
diff --git a/src/components/ESignDiplayDignedDocument.js b/src/components/ESignDiplayDignedDocument.js
index 1e23115..a467f80 100644
--- a/src/components/ESignDiplayDignedDocument.js
+++ b/src/components/ESignDiplayDignedDocument.js
@@ -23,6 +23,8 @@ import Popup from 'reactjs-popup';
import 'reactjs-popup/dist/index.css';
import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif";
import { FcCancel, FcApproval, FcAcceptDatabase, FcPrint } from "react-icons/fc";
+import fr from 'date-fns/locale/fr';
+import { registerLocale } from 'react-datepicker';
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import { format } from 'date-fns'
@@ -48,7 +50,7 @@ import { FcInfo } from "react-icons/fc";
import { Document, Page } from 'react-pdf'
function ESignDiplayDignedDocument() {
-
+registerLocale('fr', fr);
const history = useHistory();
const { document_id, secret_key_signature, partner_owner_recid } = useParams();
const [isLoading, setLoading] = useState();
diff --git a/src/components/Employes.js b/src/components/Employes.js
index b3ab15d..096d15e 100644
--- a/src/components/Employes.js
+++ b/src/components/Employes.js
@@ -21,6 +21,8 @@ import fileDownload from 'js-file-download';
import Popup from 'reactjs-popup';
import 'reactjs-popup/dist/index.css';
import { FcAcceptDatabase, FcPrint } from "react-icons/fc";
+import fr from 'date-fns/locale/fr';
+import { registerLocale } from 'react-datepicker';
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import { format } from 'date-fns'
@@ -99,7 +101,7 @@ const useStyles = makeStyles((theme) => ({
const Employes = (props) => {
const classes = useStyles();
-
+registerLocale('fr', fr);
const history = useHistory();
const [submenu, setsubmenu] = useState("");
const [rowss, setRows] = useState([]);
@@ -876,7 +878,7 @@ const Employes = (props) => {
setSelectionModel_affectations([]);
setSelectionModel([]);
setsubmenu("");
-
+ setscope_filt_recherche([]);
Getall_Training_Employee_No_Filter();
}
@@ -1303,6 +1305,7 @@ const Employes = (props) => {
useEffect(() => {
sethistory_securite_read(props.check_user_acces_right("historique", "read"))
+ Getall_Partner_Competence_List();
Getall_Training_Employee_No_Filter();
Get_List_Managers();
Get_List_RH_Profils();
@@ -1875,27 +1878,59 @@ const Employes = (props) => {
var filtre4_value = "";
// Recuperation des valeurs de filtres
- if (p_filtre1_value) {
+
+ if (p_filtre1_value && String(filtre1) !== "competence") {
filtre1_value = p_filtre1_value;
form.append(filtre1, filtre1_value);
}
+ else if (String(filtre1) === "competence" && scope_filt_recherche.length > 0) {
+ var tab_competence_ids = []
+ for (var i = 0; i < scope_filt_recherche.length; i++) {
+ tab_competence_ids.push(scope_filt_recherche[i]._id);
+ }
+ form.append(filtre1, tab_competence_ids);
+ }
- if (p_filtre2_value) {
+
+
+ if (p_filtre2_value && String(filtre2) !== "competence") {
filtre2_value = p_filtre2_value;
form.append(filtre2, filtre2_value);
+ } else if (String(filtre2) === "competence" && scope_filt_recherche.length > 0) {
+ var tab_competence_ids = []
+ for (var i = 0; i < scope_filt_recherche.length; i++) {
+ tab_competence_ids.push(scope_filt_recherche[i]._id);
+ }
+ form.append(filtre2, tab_competence_ids);
}
- if (p_filtre3_value) {
+
+
+ if (p_filtre3_value && String(filtre3) !== "competence") {
filtre3_value = p_filtre3_value;
form.append(filtre3, p_filtre3_value);
+ } else if (String(filtre3) === "competence" && scope_filt_recherche.length > 0) {
+ var tab_competence_ids = []
+ for (var i = 0; i < scope_filt_recherche.length; i++) {
+ tab_competence_ids.push(scope_filt_recherche[i]._id);
+ }
+ form.append(filtre3, tab_competence_ids);
}
- if (p_filtre4_value) {
+
+ if (p_filtre4_value && String(filtre4) !== "competence") {
filtre4_value = p_filtre4_value;
form.append(filtre4, p_filtre4_value);
+ } else if (String(filtre4) === "competence" && scope_filt_recherche.length > 0) {
+ var tab_competence_ids = []
+ for (var i = 0; i < scope_filt_recherche.length; i++) {
+ tab_competence_ids.push(scope_filt_recherche[i]._id);
+ }
+ form.append(filtre4, tab_competence_ids);
}
+
const stored_cookie = getCookie('tokenmysypart');
form.append("token", stored_cookie);
form.append("type_rh", "");
@@ -5798,6 +5833,7 @@ const Employes = (props) => {
{ "id": "email", "label": "Email ", "value": "email" },
{ "id": "formation", "label": "Lié a la Formation (code externe) ", "value": "formation" },
{ "id": "session", "label": "Lié a la Session (code session) ", "value": "session" },
+ { "id": "competence", "label": "Competence ", "value": "competence" },
{ "id": "", "label": "", "value": "" },
{ "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres.
]
@@ -5832,6 +5868,8 @@ const Employes = (props) => {
const [detail_competence_niveau, setdetail_competence_niveau] = React.useState("");
const [selected_competence_id, setselected_competence_id] = React.useState("");
+ const [new_competence_id, setnew_competence_id] = React.useState("");
+
const [Add_Update_One_Competence_api, setAdd_Update_One_Competence_api] = useState();
const [Add_Update_One_Competence_message, setAdd_Update_One_Competence_message] = useState();
const [Add_Update_One_Competence_result, setAdd_Update_One_Competence_result] = useState();
@@ -5852,6 +5890,7 @@ const Employes = (props) => {
form.append("token", stored_cookie);
form.append("rh_id", selected_id);
form.append("competence_id", selected_competence_id);
+ form.append("new_competence_id", new_competence_id);
form.append("competence", detail_competence_code);
form.append("niveau", detail_competence_niveau);
@@ -6950,6 +6989,19 @@ const Employes = (props) => {
const [scope_session, setscope_session] = useState([...fixedVal_scope_session]);
+ const fixedVal_scope_filt_recherche = [];
+ const [scope_filt_recherche, setscope_filt_recherche] = useState([...fixedVal_scope_filt_recherche]);
+ const CustomChip_recherche = (chipVal, getTagProps) => {
+ return chipVal.map((item, index) => (
+
+ ));
+ };
+
+
const fixedVal_scope_class = [];
const [scope_class, setscope_class] = useState([...fixedVal_scope_class]);
const CustomChip = (chipVal, getTagProps) => {
@@ -7064,7 +7116,7 @@ const Employes = (props) => {
showTimeSelect={false}
dateFormat="dd/MM/yyyy"
className="disabled_style session_caract_Dialog_DatePicker"
- locale='fr-FR'
+ locale={'fr'}
/>
@@ -7084,6 +7136,7 @@ const Employes = (props) => {
showTimeSelect={false}
dateFormat="dd/MM/yyyy"
className="disabled_style session_caract_Dialog_DatePicker"
+ locale={'fr'}
/>
@@ -7348,9 +7401,11 @@ const Employes = (props) => {
onChange={(event, value) => {
if (value && value.description) {
- setdetail_competence_code(value.description);
+ setdetail_competence_code(value.description); // zzzzz
+ setnew_competence_id(value._id);
} else {
setdetail_competence_code("");
+ setnew_competence_id("");
}
}}
@@ -7964,7 +8019,7 @@ const Employes = (props) => {
showTimeSelect={false}
dateFormat="dd/MM/yyyy"
className="disabled_style session_caract_Dialog_DatePicker"
- locale='fr-FR'
+ locale={'fr'}
/>
@@ -7986,7 +8041,7 @@ const Employes = (props) => {
showTimeSelect={false}
dateFormat="dd/MM/yyyy"
className="disabled_style session_caract_Dialog_DatePicker"
- locale='fr-FR'
+ locale={'fr'}
/>