diff --git a/public/index.html b/public/index.html index 33cfdae..83e1b6c 100644 --- a/public/index.html +++ b/public/index.html @@ -105,17 +105,19 @@ gtag("config", "UA-37423053-2"); - + diff --git a/src/App.js b/src/App.js index 3c6a335..f98c11a 100644 --- a/src/App.js +++ b/src/App.js @@ -108,8 +108,14 @@ function App() { const MySyIA = lazy(() => import("./pages/iamysy")); const AutomaticQuotation = lazy(() => import("./pages/automaticquotation")); const Emarge_QR_Code = lazy(() => import("./pages/emarge_qr_code")); + + const Survey_Eval_QR_Code = lazy(() => import("./pages/survey_eval_qr_code")); + + const UpdateAttendeeList = lazy(() => import("./pages/updateattendeelist")); const SurveyDocument = lazy(() => import("./pages/surveydocument")); + const SurveyDocument_Qr_Code = lazy(() => import("./pages/surveydocument_qr_code")); + const ESignDiplayDignedDocument = lazy(() => import("./pages/edigndiplaydigneddocument")); const ESign = lazy(() => import("./pages/eSigne")); const Test_Drag_Drop2 = lazy(() => import("./pages/test_dnd")); @@ -274,10 +280,13 @@ function App() { + + + @@ -323,6 +332,8 @@ function App() { + + {/* Debut Migration */} @@ -362,7 +373,7 @@ function App() { - + diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 8cd9df6..6712174 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -41,6 +41,8 @@ import { LineChart } from '@mui/x-charts/LineChart'; import BarChartIcon from '@mui/icons-material/BarChart'; import SsidChartIcon from '@mui/icons-material/SsidChart'; import { RiFileExcel2Line } from "react-icons/ri"; +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' @@ -91,6 +93,7 @@ const useStyles = makeStyles((theme) => ({ })); const AddClassManual = (props) => { + registerLocale('fr', fr); const history = useHistory(); const url = process.env.REACT_APP_API_URL + "/myclass/api/add_partner_account/"; const [inputs, setInputs] = useState({}); @@ -2274,7 +2277,7 @@ const AddClassManual = (props) => { var mynote = document.getElementsByName("note")[0].value; var localmycpf = mycpf; - var mycertif = mycertif; + var local_mycertif = mycertif; var trainingSupport = mytrainingsupport; var banniereImg = document.getElementsByName("class_banner_img_url")[0].value; @@ -2514,6 +2517,7 @@ const AddClassManual = (props) => { formData.append('version', version); formData.append('referentiel_padagogique_id', mytraining_ref_peda_id); + formData.append('recyclage_delai', p_detail_recyclage_delai); formData.append('recyclage_periodicite', p_detail_recyclage_periodicite); @@ -2527,7 +2531,9 @@ const AddClassManual = (props) => { formData.append('cpf', localmycpf); - formData.append('certif', mycertif); + formData.append('certif', local_mycertif); + + // console.log(" function mycertif = ", local_mycertif); formData.append('pourqui', pourqui); formData.append('support', trainingSupport); @@ -2539,6 +2545,7 @@ const AddClassManual = (props) => { formData.append('contenu_attestation', contenu_attestation); +console.log(" ### formData = ", formData) /* Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenaire */ @@ -6686,6 +6693,8 @@ const AddClassManual = (props) => { setmycertif_label(value.label); setdatamodification("1"); + console.log(" ### setmycertif = ",value.value ) + } else { setmycertif(""); setmycertif_label(""); @@ -8710,7 +8719,7 @@ const AddClassManual = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 65bd530..58de8bc 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -45,6 +45,8 @@ import Autocomplete from '@mui/material/Autocomplete'; import { FcOpenedFolder } from "react-icons/fc"; import Module_Absence from "./Module_Absence"; import { RiMoreFill } from "react-icons/ri"; +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 moment from "moment"; @@ -103,7 +105,7 @@ const useStyles = makeStyles((theme) => ({ })); const Apprenant = (props) => { - +registerLocale('fr', fr); const classes = useStyles(); const history = useHistory(); @@ -8131,7 +8133,7 @@ const Apprenant = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -8962,7 +8964,7 @@ const Apprenant = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -10185,7 +10187,7 @@ const Apprenant = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -10212,7 +10214,7 @@ const Apprenant = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -10634,7 +10636,7 @@ const Apprenant = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -10660,7 +10662,7 @@ const Apprenant = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} diff --git a/src/components/Article.js b/src/components/Article.js index e6b13fe..dffa48b 100644 --- a/src/components/Article.js +++ b/src/components/Article.js @@ -15,6 +15,8 @@ import moment from "moment"; import SendIcon from '@mui/icons-material/Send'; import axios from "axios"; import { Editor } from '@tinymce/tinymce-react'; +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' @@ -80,7 +82,7 @@ const useStyles = makeStyles((theme) => ({ const Article = (props) => { - +registerLocale('fr', fr); const classes = useStyles(); const history = useHistory(); const [isLoading, setLoading] = useState(); diff --git a/src/components/Autre_RH.js b/src/components/Autre_RH.js index 5de40f8..0a4fad3 100644 --- a/src/components/Autre_RH.js +++ b/src/components/Autre_RH.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 Autre_RH = (props) => { const classes = useStyles(); - +registerLocale('fr', fr); const history = useHistory(); const [submenu, setsubmenu] = useState(""); const [rowss, setRows] = useState([]); @@ -7080,7 +7082,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> @@ -7100,6 +7102,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" + locale={'fr'} /> @@ -7980,7 +7983,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> @@ -8002,7 +8005,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> @@ -9060,7 +9063,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> } @@ -9079,7 +9082,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> } @@ -9510,7 +9513,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -10007,7 +10010,7 @@ const Autre_RH = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> } @@ -10043,7 +10046,7 @@ const Autre_RH = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> } @@ -10218,7 +10221,7 @@ const Autre_RH = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -10237,7 +10240,7 @@ const Autre_RH = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -11345,7 +11348,7 @@ const Autre_RH = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -11372,7 +11375,7 @@ const Autre_RH = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -11623,7 +11626,7 @@ const Autre_RH = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -11649,7 +11652,7 @@ const Autre_RH = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -11869,7 +11872,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> @@ -11892,6 +11895,7 @@ const Autre_RH = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" + locale={'fr'} /> diff --git a/src/components/Conseil_Classe.js b/src/components/Conseil_Classe.js index 7de6177..a874fd7 100644 --- a/src/components/Conseil_Classe.js +++ b/src/components/Conseil_Classe.js @@ -18,6 +18,8 @@ import fileDownload from 'js-file-download'; import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; +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 moment from "moment"; @@ -113,7 +115,8 @@ const useStyles = makeStyles((theme) => ({ const Conseil_Classe = (props) => { - +registerLocale('fr', fr); + const classes = useStyles(); const history = useHistory(); const [submenu, setsubmenu] = useState(""); @@ -2188,7 +2191,7 @@ const Conseil_Classe = (props) => { function getExcelData(apiRef) { // Select rows and columns const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__" ); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"); // Format the data. Here we only keep the value const data = filteredSortedRowIds.map((id) => { @@ -2213,7 +2216,7 @@ const Conseil_Classe = (props) => { function handleExport(apiRef, data_colums) { const data = getExcelData(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__" ); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"); const local_config = { @@ -4418,6 +4421,13 @@ const Conseil_Classe = (props) => { ] + const [type_groupe, settype_groupe] = useState(""); + const New_Option_Type_Groupe = [ + { "id": "grp_td", "label": "Grp TD", "value": "grp_td" }, + { "id": "grp_tp", "label": "Grp TP", "value": "grp_tp" }, + ] + + return (
{isLoading &&
@@ -5266,7 +5276,7 @@ const Conseil_Classe = (props) => { className="disabled_style enable_style datepicker_complement" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -5296,7 +5306,7 @@ const Conseil_Classe = (props) => { className="disabled_style enable_style datepicker_complement" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -5941,7 +5951,7 @@ const Conseil_Classe = (props) => { className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -5967,7 +5977,7 @@ const Conseil_Classe = (props) => { className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -6794,7 +6804,7 @@ const Conseil_Classe = (props) => {
+ Site & Adresse 1
@@ -7132,7 +7142,7 @@ const Conseil_Classe = (props) => {
+ Site & Adresse 2
@@ -7475,10 +7485,7 @@ const Conseil_Classe = (props) => {
} -
Cible
- Groupe (TD, TP, etc) -
{selected_jury_cible && String(selected_jury_cible) === "soutenance" && New_Option_Cible_Jury && New_Get_List_UE_From_Session_Id_result && New_Get_List_UE_From_Session_Id_result.length > 0 && @@ -7590,9 +7597,25 @@ const Conseil_Classe = (props) => {
+
+ Classe +
+
+ +
Cible
+ Groupe (TD, TP, etc) zzzz + +
+ + +
+ + +
+
diff --git a/src/components/Crm_Opportunite.js b/src/components/Crm_Opportunite.js index 938dcce..a7a2251 100644 --- a/src/components/Crm_Opportunite.js +++ b/src/components/Crm_Opportunite.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' @@ -99,7 +101,7 @@ const useStyles = makeStyles((theme) => ({ })); const CRM_Opportunite = (props) => { - +registerLocale('fr', fr); const classes_dialog = useStyles(); const history = useHistory(); @@ -2029,7 +2031,7 @@ const CRM_Opportunite = (props) => { dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Factures.js b/src/components/Dashbord_Factures.js index 9350a0c..611b831 100644 --- a/src/components/Dashbord_Factures.js +++ b/src/components/Dashbord_Factures.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -39,7 +41,7 @@ const palette = ['red', 'blue', 'green']; const Dashbord_Factures = (props) => { - +registerLocale('fr', fr); const history = useHistory(); const [isLoading, setLoading] = useState(); @@ -697,7 +699,7 @@ const Dashbord_Factures = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Factures_Devis_Par_Periode.js b/src/components/Dashbord_Factures_Devis_Par_Periode.js index 02e2fc8..2584921 100644 --- a/src/components/Dashbord_Factures_Devis_Par_Periode.js +++ b/src/components/Dashbord_Factures_Devis_Par_Periode.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -39,6 +41,7 @@ const pieParams = { height: 200, margin: { right: 5 } }; const palette = ['red', 'blue', 'green']; const Dashbord_Factures_Devis_Par_Periode = (props) => { + registerLocale('fr', fr); const history = useHistory(); const [isLoading, setLoading] = useState(); @@ -474,7 +477,7 @@ const Dashbord_Factures_Devis_Par_Periode = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Factures_Par_Client.js b/src/components/Dashbord_Factures_Par_Client.js index e08e19e..5a35ea1 100644 --- a/src/components/Dashbord_Factures_Par_Client.js +++ b/src/components/Dashbord_Factures_Par_Client.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -38,6 +40,7 @@ import fileDownload from 'js-file-download' const Dashbord_Factures_Par_Client = (props) => { + registerLocale('fr', fr); const history = useHistory(); const [isLoading, setLoading] = useState(); @@ -496,7 +499,7 @@ const Dashbord_Factures_Par_Client = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Factures_Par_Periode.js b/src/components/Dashbord_Factures_Par_Periode.js index dc7c7ae..e396008 100644 --- a/src/components/Dashbord_Factures_Par_Periode.js +++ b/src/components/Dashbord_Factures_Par_Periode.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -39,6 +41,7 @@ const pieParams = { height: 200, margin: { right: 5 } }; const palette = ['red', 'blue', 'green']; const Dashbord_Factures_Par_Periode = (props) => { + registerLocale('fr', fr); const history = useHistory(); const [isLoading, setLoading] = useState(); @@ -483,7 +486,7 @@ const Dashbord_Factures_Par_Periode = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js b/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js index 287ab13..4d4d3ce 100644 --- a/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js +++ b/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -39,6 +41,7 @@ const pieParams = { height: 200, margin: { right: 5 } }; const palette = ['red', 'blue', 'green']; const Dashbord_Factures_Previsionnel_Par_Periode = (props) => { + registerLocale('fr', fr); const history = useHistory(); const [isLoading, setLoading] = useState(); @@ -420,7 +423,7 @@ const Dashbord_Factures_Previsionnel_Par_Periode = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Formation.js b/src/components/Dashbord_Formation.js index 816bd9b..36a10a8 100644 --- a/src/components/Dashbord_Formation.js +++ b/src/components/Dashbord_Formation.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -31,7 +33,7 @@ import { TbColumns2, TbColumns1 } from "react-icons/tb"; const Dashbord_Formation = (props) => { - +registerLocale('fr', fr); const history = useHistory(); const [isLoading, setLoading] = useState(); @@ -277,7 +279,7 @@ const Dashbord_Formation = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Formation_Evol_Session.js b/src/components/Dashbord_Formation_Evol_Session.js index f464a59..4297c06 100644 --- a/src/components/Dashbord_Formation_Evol_Session.js +++ b/src/components/Dashbord_Formation_Evol_Session.js @@ -264,7 +264,7 @@ const Dashbord_Formation_Evol_Session = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Inscription.js b/src/components/Dashbord_Inscription.js index b1b03b2..c9002fd 100644 --- a/src/components/Dashbord_Inscription.js +++ b/src/components/Dashbord_Inscription.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -34,7 +36,7 @@ import { pieArcLabelClasses } from '@mui/x-charts/PieChart'; const Dashbord_Inscriptions = (props) => { const history = useHistory(); const [isLoading, setLoading] = useState(); - +registerLocale('fr', fr); const theme = useTheme(); const colors = tokens(theme.palette.mode); @@ -375,7 +377,7 @@ const Dashbord_Inscriptions = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Inscription_All_Inscription.js b/src/components/Dashbord_Inscription_All_Inscription.js index a69e9d9..a61f6ad 100644 --- a/src/components/Dashbord_Inscription_All_Inscription.js +++ b/src/components/Dashbord_Inscription_All_Inscription.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -38,7 +40,7 @@ import { RiFileExcel2Line } from "react-icons/ri"; const Dashbord_Inscriptions_all_inscriptions = (props) => { const history = useHistory(); const [isLoading, setLoading] = useState(); - +registerLocale('fr', fr); const theme = useTheme(); const colors = tokens(theme.palette.mode); @@ -472,7 +474,7 @@ const Dashbord_Inscriptions_all_inscriptions = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Ressources_Humaines.js b/src/components/Dashbord_Ressources_Humaines.js index 086471d..181d303 100644 --- a/src/components/Dashbord_Ressources_Humaines.js +++ b/src/components/Dashbord_Ressources_Humaines.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -559,7 +561,7 @@ const Dashbord_Ressources_Humaines = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js index 6def28d..aa1a272 100644 --- a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js +++ b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js @@ -28,6 +28,8 @@ import Autocomplete from '@mui/material/Autocomplete'; import TextField from '@mui/material/TextField'; import { format } from 'date-fns' import moment from "moment"; +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 Button from '@mui/material/Button'; @@ -37,7 +39,7 @@ const Dashbord_Ressources_Humaines_Tache_Couts = (props) => { const [isLoading, setLoading] = useState(); const [selectionModel, setSelectionModel] = React.useState([]); const [user_dashbord_id, setuser_dashbord_id] = useState(props.user_dashbord_id); - +registerLocale('fr', fr); var date_today_90j = new Date(); date_today_90j.setDate(date_today_90j.getDate() - 90); @@ -435,7 +437,7 @@ const Dashbord_Ressources_Humaines_Tache_Couts = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js index ae496af..7cda5cb 100644 --- a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js +++ b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js @@ -28,6 +28,8 @@ import Autocomplete from '@mui/material/Autocomplete'; import TextField from '@mui/material/TextField'; import { format } from 'date-fns' import moment from "moment"; +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 Button from '@mui/material/Button'; @@ -37,7 +39,7 @@ const Dashbord_Ressources_Humaines_Tache_by_rhid = (props) => { const [isLoading, setLoading] = useState(); const [selectionModel, setSelectionModel] = React.useState([]); const [user_dashbord_id, setuser_dashbord_id] = useState(props.user_dashbord_id); - +registerLocale('fr', fr); var date_today_90j = new Date(); date_today_90j.setDate(date_today_90j.getDate() - 90); @@ -412,7 +414,7 @@ const Dashbord_Ressources_Humaines_Tache_by_rhid = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Session.js b/src/components/Dashbord_Session.js index fae5820..d69de5a 100644 --- a/src/components/Dashbord_Session.js +++ b/src/components/Dashbord_Session.js @@ -10,6 +10,8 @@ import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import 'reactjs-popup/dist/index.css'; +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' @@ -29,7 +31,7 @@ import { ResponsiveBar } from "@nivo/bar"; import { TbColumns2, TbColumns1 } from "react-icons/tb"; const Dashbord_Session = (props) => { - +registerLocale('fr', fr); const history = useHistory(); const [isLoading, setLoading] = useState(); @@ -393,7 +395,7 @@ const Dashbord_Session = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/Dashbord_Session_Repartition_Fteur.js b/src/components/Dashbord_Session_Repartition_Fteur.js index 8ada74a..b926529 100644 --- a/src/components/Dashbord_Session_Repartition_Fteur.js +++ b/src/components/Dashbord_Session_Repartition_Fteur.js @@ -446,7 +446,7 @@ const Dashbord_Session_Repartition_Fteur = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index d0e9561..a9c781b 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -20,6 +20,8 @@ import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; import { FcSearch } from "react-icons/fc"; import { FcAlarmClock, FcMultipleSmartphones, FcWorkflow, FcComments } 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' @@ -155,7 +157,7 @@ const useStyles = makeStyles((theme) => ({ const DisplayPartnerPromotion = (props) => { - + registerLocale('fr', fr); const stored_cookie_session_display_view = getCookie('mysy_session_display_view'); const stored_cookie_session_data_row_grouped_by = getCookie('mysy_session_data_row_grouped_by'); @@ -260,6 +262,7 @@ const DisplayPartnerPromotion = (props) => { const open = Boolean(anchorEl); const options_menu_vertical_promotion = [ + 'Décaler', 'Archiver/Désarch.', 'Supprimer', ]; @@ -491,6 +494,11 @@ const DisplayPartnerPromotion = (props) => { setdialogOpen_archive(true); } + + else if (option && String(option) === "Décaler") { + Get_Session_Nb_Sequence_Ftion(); + setDialog_Session_Decalage(true); + } }} > {option} @@ -653,10 +661,14 @@ const DisplayPartnerPromotion = (props) => { ); }, }, - - ] + const [session_debut_for_decalage, setsession_debut_for_decalage] = React.useState(''); + const [session_fin_for_decalage, setsession_fin_for_decalage] = React.useState(''); + + const [session_new_debut_for_decalage, setsession_new_debut_for_decalage] = React.useState(''); + const [session_id_for_decalage, setsession_id_for_decalage] = React.useState(''); + const [promo_archive_status, setpromo_archive_status] = React.useState(''); const [working_cellValues_promo, setworking_cellValues_promo] = useState(false); @@ -1214,6 +1226,11 @@ const DisplayPartnerPromotion = (props) => { setdialogOpen_update(false) }; + const [dialogOpen_supp_in_menu, setdialogOpen_supp_in_menu] = useState(false); + const Dialog_menuitem_close_supp_in_menu = () => { + setdialogOpen_supp_in_menu(false) + }; + const [working_cellValues, setworking_cellValues] = useState(false); const [dialogOpen_supp, setdialogOpen_supp] = useState(false); @@ -1228,7 +1245,6 @@ const DisplayPartnerPromotion = (props) => { - const columns_inscrit = [ { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, @@ -1402,7 +1418,7 @@ const DisplayPartnerPromotion = (props) => { else if (option && String(option) === "Annuler Insc.") { - setdialogOpen_supp(true); + setdialogOpen_supp_in_menu(true); } else if (option && String(option) === "Env. Code LMS") { @@ -1439,8 +1455,7 @@ const DisplayPartnerPromotion = (props) => { } else if (option && String(option) === "Annuler Insc.") { - - setdialogOpen_supp(true); + setdialogOpen_supp_in_menu(true); } @@ -1454,8 +1469,8 @@ const DisplayPartnerPromotion = (props) => { {/*** GESTION Dialog menu item pour suppression */} - {dialogOpen_supp && null} @@ -1484,7 +1499,7 @@ const DisplayPartnerPromotion = (props) => {
-
MySy Information
@@ -1503,7 +1518,7 @@ const DisplayPartnerPromotion = (props) => {
@@ -1512,7 +1527,7 @@ const DisplayPartnerPromotion = (props) => { className="gest_bton_popup_annuler" onClick={() => { console.log('modal closed '); - Dialog_menuitem_close_supp(); + Dialog_menuitem_close_supp_in_menu(); }} > Annuler @@ -5251,7 +5266,7 @@ const DisplayPartnerPromotion = (props) => { //console.log(" In Invoice_Session_Formation_By_Selected_Inscrit res.data.message r_class = " + res.data.message); setInvoice_Session_Formation_By_Selected_Inscrit_api("true"); setInvoice_Session_Formation_By_Selected_Inscrit_result(res.data.message); - GetListeInscrit(selected_session_id, selected_internal_url); + //GetListeInscrit(selected_session_id, selected_internal_url); // alert(res.data.message); setdisplay_alert_mysy("1"); @@ -9862,7 +9877,52 @@ const DisplayPartnerPromotion = (props) => { } + const [Get_Session_Nb_Sequence_Ftion_api, setGet_Session_Nb_Sequence_Ftion_api] = useState(); + const [Get_Session_Nb_Sequence_Ftion_message, setGet_Session_Nb_Sequence_Ftion_message] = useState(); + const [Get_Session_Nb_Sequence_Ftion_result, setGet_Session_Nb_Sequence_Ftion_result] = useState(); + function Get_Session_Nb_Sequence_Ftion() { + var form = new FormData(); + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("session_id", session_id_for_decalage); + + + //console.log("### form = ", form); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Session_Nb_Sequence/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + //console.log(" In Get_Session_Nb_Sequence_Ftion res.data.status = " + res.data.status); + //console.log(" In Get_Session_Nb_Sequence_Ftion res.data.message r_class = " + res.data.message); + + setLoading(false); + if (String(res.data.status) === String("true")) { + + setGet_Session_Nb_Sequence_Ftion_api("true"); + setGet_Session_Nb_Sequence_Ftion_result(res.data.message); + + } + else { + setGet_Session_Nb_Sequence_Ftion_api("false"); + setGet_Session_Nb_Sequence_Ftion_message(res.data.message); + + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } + + }).catch((error) => { + setLoading(false); + + console.warn('Get_Session_Nb_Sequence_Ftion : Not good man :( Get_Session_Nb_Sequence_Ftion = ' + error); + setGet_Session_Nb_Sequence_Ftion_api("false"); + alert(" Impossible de récuperer le nombre de séquences "); + }) + + + } @@ -14697,6 +14757,17 @@ const DisplayPartnerPromotion = (props) => { { "id": "", "label": "", "value": "" }, ] + const New_Option_Session_Declage_Raison = [ + { "id": "taux_remplissage", "label": "Remplissage", "value": "taux_remplissage" }, + { "id": "organisation", "label": "Organisation", "value": "organisation" }, + { "id": "autre", "label": "Autre", "value": "autre" }, + { "id": "", "label": "", "value": "" }, + ] + + const [decalage_raison, setdecalage_raison] = useState(""); + const [decalage_comment, setdecalage_comment] = useState(""); + const [nb_jour_decalage, setnb_jour_decalage] = useState(""); + // Debut Gestion Finance const New_Option_Type_Cout = [ { "id": "fixe", "label": "Charge Fixe", "value": "fixe" }, @@ -14909,6 +14980,106 @@ const DisplayPartnerPromotion = (props) => { }) } + const [Decalage_Session_Function_api, setDecalage_Session_Function_api] = useState(); + const [Decalage_Session_Function_message, setDecalage_Session_Function_message] = useState(); + const [Decalage_Session_Function_result, setDecalage_Session_Function_result] = useState(); + function Decalage_Session_Function() { + setLoading(true); + var form = new FormData(); + //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); + + + var local_debut_actuel = moment(session_debut_for_decalage); + var local_debut_nouvelle_date = moment(session_new_debut_for_decalage); + var local_nb_jour_decalage = moment.duration(local_debut_nouvelle_date.diff(local_debut_actuel)).asDays(); + + //console.log(" ### local_nb_jour_decalage = ", local_nb_jour_decalage); + + if (local_nb_jour_decalage < -90 || local_nb_jour_decalage > 90) { + var local_message = "Le décalage doit être compris entre 90 jours avant et 90 jours après la date de référence." + setdisplay_alert_mysy("1"); + setalert_message(local_message); + setalert_type("success"); + } + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + + var local_raison_decalage = New_Option_Session_Declage_Raison.filter((data) => (data).value === String(decalage_raison))[0].label + + form.append("tab_session_ids", session_id_for_decalage); + form.append("nb_jour_decalage", local_nb_jour_decalage); + form.append("decalage_raison", local_raison_decalage); + form.append("decalage_comment", decalage_comment); + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Decale_Session_Sequence_X_days/"; + + axios.post(myurl, form).then(res => { + setLoading(false); + // console.log(" In Decalage_Session_Function res.data.status = " + res.data.status); + //console.log(" In Decalage_Session_Function res.data.message r_class = " + res.data.message); + + if (String(res.data.status) === String("true")) { + setDecalage_Session_Function_api("true"); + setDecalage_Session_Function_result(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + + + if (props.object_key && String(props.object_key).length > 2) { + + setLoading(true); + + let text = String(props.object_key); + + if (props.object_key === "class") { + Getall_TrainingSession_For_Given_Class(props.class_internal_url); + } else { + Getall_TrainingSession(); + GetCurrentSession(props.object_key, props.class_internal_url); + Display_session_From_Props(props.object_key, props.class_internal_url); + } + setLoading(false); + } else { + // Getall_TrainingSession(); + Getall_TrainingSession_no_filter(); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + } + + + Dialog_Decalage_Session_Date_handleClose_buton(); + + } + else { + setDecalage_Session_Function_api("false"); + setDecalage_Session_Function_message(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + + } + + }).catch((error) => { + setLoading(false); + console.warn('Decalage_Session_Function : Not good man :( mysearchtext = ' + error); + setDecalage_Session_Function_api("false"); + // alert(" Impossible d'ajouter l'évaluation l'UE "); + setdisplay_alert_mysy("1"); + setalert_message("Impossible de décaler la session "); + setalert_type("error"); + + }) + } + + + const [Delete_Given_Financial_Caracteristique_api, setDelete_Given_Financial_Caracteristique_api] = useState(); const [Delete_Given_Financial_Caracteristique_message, setDelete_Given_Financial_Caracteristique_message] = useState(); const [Delete_Given_Financial_Caracteristique_result, setDelete_Given_Financial_Caracteristique_result] = useState(); @@ -15072,6 +15243,14 @@ const DisplayPartnerPromotion = (props) => { const fixedValo = []; const [valo, setValo] = useState([...fixedValo]); + const [Dialog_Session_Decalage, setDialog_Session_Decalage] = React.useState(false); + + const Dialog_Decalage_Session_Date_handleClose_buton = () => { + setDialog_Session_Decalage(false); + setdecalage_raison(""); + setdecalage_comment(""); + + }; return (
@@ -15093,6 +15272,229 @@ const DisplayPartnerPromotion = (props) => { + {/* Dialog pour gerer les Décalage Session Date */} + null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '5rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > + + MySy Information + + + Décaler date session + + +
+ +
Dates actuelles +
Debut + { + setsession_debut_for_decalage(date); + } + } + + showTimeSelect={false} + filterTime={filterPassedTime_start} + dateFormat="dd/MM/yyyy" + className="disabled_style" + // locale={'fr'} + todayButton="Aujourd'hui" + closeOnScroll={true} + disabled={true} + locale={'fr'} + /> +
+ +
Fin + +
+ +
+ +
+ + Décalage   + + +
Nouvelle date début + { + setsession_new_debut_for_decalage(date); + } + } + + showTimeSelect={false} + filterTime={filterPassedTime_start} + dateFormat="dd/MM/yyyy" + className="disabled_style" + locale={'fr'} + todayButton="Aujourd'hui" + closeOnScroll={true} + + /> + +
+ +
+ +
+
Nb Séquences à decaler + + +
+ + +
Raison + (data).value === String(decalage_raison))[0].label} + + fullWidth + + options={New_Option_Session_Declage_Raison} + onChange={(event, value) => { + if (value && value.value) { + setdecalage_raison(value.value); + } else { + setdecalage_raison(""); + } + }} + renderInput={(params) => + } + /> + +
+ + +
Commentaire + { + setdecalage_comment(e.target.value); + + }} + + /> + +
+ +
+ + + + + + + +
+
+ +
+ + + +
+ +
+
+ +
+ +
+ {/* FIN Dialog pour gerer les Décalage Session Date */} + + + {/* Dialog pour gerer la selection des émargements */} {
Date Promotion
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style datepicker_complement" - locale='fr-FR' + locale={'fr'} /> @@ -15613,6 +16016,7 @@ const DisplayPartnerPromotion = (props) => {
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style datepicker_complement" - locale='fr-FR' + locale={'fr'} />
@@ -16505,6 +16909,7 @@ const DisplayPartnerPromotion = (props) => {
Date de fin acces E-Learning { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect={false} dateFormat="dd/MM/yyyy" @@ -17130,6 +17535,7 @@ const DisplayPartnerPromotion = (props) => {
Debut { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -17154,6 +17560,7 @@ const DisplayPartnerPromotion = (props) => {
Fin { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -17489,6 +17896,7 @@ const DisplayPartnerPromotion = (props) => {
Dupliquer Du : { filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style " - locale='fr-FR' + locale={'fr'} />
@@ -17527,6 +17935,7 @@ const DisplayPartnerPromotion = (props) => { Dupliquer Au : { filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style " - locale='fr-FR' + locale={'fr'} />
@@ -18151,6 +18560,7 @@ const DisplayPartnerPromotion = (props) => {
Debut { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -18175,6 +18585,7 @@ const DisplayPartnerPromotion = (props) => {
Fin { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -18567,7 +18978,7 @@ const DisplayPartnerPromotion = (props) => { {Math.round((JSON.parse(rowss[session_selected_row_id]).taux_remplissage) * 100)} % } {rowss[session_selected_row_id] && JSON.parse(rowss[session_selected_row_id]).taux_remplissage && - parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) >= 0.6 && + parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) > 0.6 && }
} @@ -18712,6 +19123,7 @@ const DisplayPartnerPromotion = (props) => {
Debut { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -18737,6 +19149,7 @@ const DisplayPartnerPromotion = (props) => {
Fin { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -21727,41 +22140,6 @@ const DisplayPartnerPromotion = (props) => {
- {edit_session_form &&
Inclus au BPF
- - { - if (value && value.value) { - setp_detail_is_bpf(value.value); - setp_detail_is_bpf_label(value.label); - IssessionChanged(); - - } else { - setp_detail_is_bpf(""); - setp_detail_is_bpf_label(""); - IssessionChanged(); - } - }} - - renderInput={(params) => - } - /> - - - -
} - - {edit_session_form &&
Statut
@@ -21980,6 +22358,7 @@ const DisplayPartnerPromotion = (props) => {
Date début { filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -22005,6 +22384,7 @@ const DisplayPartnerPromotion = (props) => {
Date Fin { filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style" + locale={'fr'} />
Nombre Places
@@ -22051,6 +22432,7 @@ const DisplayPartnerPromotion = (props) => { Date début des inscriptions   { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} />
} @@ -22081,6 +22463,7 @@ const DisplayPartnerPromotion = (props) => { Date Fin des inscriptions   { //filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style" + locale={'fr'} />
} @@ -22244,6 +22628,43 @@ const DisplayPartnerPromotion = (props) => {
} + {edit_session_form &&
Inclus au BPF
+ + { + if (value && value.value) { + setp_detail_is_bpf(value.value); + setp_detail_is_bpf_label(value.label); + IssessionChanged(); + + } else { + setp_detail_is_bpf(""); + setp_detail_is_bpf_label(""); + IssessionChanged(); + } + }} + + renderInput={(params) => + } + /> + + + +
} + + + + {edit_session_form &&
Session à la demande
@@ -22818,6 +23239,7 @@ const DisplayPartnerPromotion = (props) => {
Date début { filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
Date Fin { filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" + locale={'fr'} />
@@ -22858,6 +23282,7 @@ const DisplayPartnerPromotion = (props) => { Date début des inscriptions   { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -22884,6 +23309,7 @@ const DisplayPartnerPromotion = (props) => { Date Fin des inscriptions { //filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" + locale={'fr'} />
} @@ -23737,6 +24164,7 @@ const DisplayPartnerPromotion = (props) => {
Date Naissance
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -24377,6 +24805,7 @@ const DisplayPartnerPromotion = (props) => {
Date Naissance
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -24592,6 +25021,7 @@ const DisplayPartnerPromotion = (props) => {
Date Naissance
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -25816,13 +26246,14 @@ const DisplayPartnerPromotion = (props) => {
Date Inscription
@@ -26207,6 +26638,7 @@ const DisplayPartnerPromotion = (props) => {
Date Evaluation { dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -26308,13 +26740,14 @@ const DisplayPartnerPromotion = (props) => { {detailuser_date_certification &&
Attestation delivrée le @@ -26323,13 +26756,14 @@ const DisplayPartnerPromotion = (props) => { {!detailuser_date_certification &&
Attestation NON délivrée encore } {rowss[session_selected_row_id] && JSON.parse(rowss[session_selected_row_id]).taux_remplissage && - parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) >= 0.6 && + parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) > 0.6 && }
} @@ -18767,6 +19200,7 @@ const DisplayPartnerSession = (props) => {
Debut { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -18792,6 +19226,7 @@ const DisplayPartnerSession = (props) => {
Fin { className="disabled_style session_caract_Dialog_DatePicker" style={{ width: "99%" }} - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -21780,41 +22215,6 @@ const DisplayPartnerSession = (props) => {
- {edit_session_form &&
Inclus au BPF
- - { - if (value && value.value) { - setp_detail_is_bpf(value.value); - setp_detail_is_bpf_label(value.label); - IssessionChanged(); - - } else { - setp_detail_is_bpf(""); - setp_detail_is_bpf_label(""); - IssessionChanged(); - } - }} - - renderInput={(params) => - } - /> - - - -
} - - - {edit_session_form &&
Statut
{ }}>
- Date début + Date début { filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' - - + locale={'fr'} /> + +
Date Fin { filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style" + locale={'fr'} />
Nombre Places
@@ -22102,6 +22505,7 @@ const DisplayPartnerSession = (props) => { Date début des inscriptions   { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} />
} @@ -22132,6 +22536,7 @@ const DisplayPartnerSession = (props) => { Date Fin des inscriptions   { //filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style" + locale={'fr'} />
} @@ -22292,6 +22698,39 @@ const DisplayPartnerSession = (props) => { /> +
} + + {edit_session_form &&
Inclus au BPF
+ + { + if (value && value.value) { + setp_detail_is_bpf(value.value); + setp_detail_is_bpf_label(value.label); + IssessionChanged(); + + } else { + setp_detail_is_bpf(""); + setp_detail_is_bpf_label(""); + IssessionChanged(); + } + }} + + renderInput={(params) => + } + /> + + +
} @@ -22871,6 +23310,7 @@ const DisplayPartnerSession = (props) => {
Date début { filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
Date Fin { filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" + locale={'fr'} />
@@ -22911,6 +23353,7 @@ const DisplayPartnerSession = (props) => { Date début des inscriptions   { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -22937,6 +23380,7 @@ const DisplayPartnerSession = (props) => { Date Fin des inscriptions { //filterTime={filterPassedTime_end} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" + locale={'fr'} />
} @@ -23796,6 +24241,7 @@ const DisplayPartnerSession = (props) => {
Date Naissance
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -24126,8 +24572,7 @@ const DisplayPartnerSession = (props) => { client_rattachement_id: JSON.parse(item).client_rattachement_id, client_facture: JSON.parse(item).facture_client_rattachement_id, - - + telephone: JSON.parse(item).telephone, } ))} @@ -24439,6 +24884,7 @@ const DisplayPartnerSession = (props) => {
Date Naissance
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -24656,6 +25102,7 @@ const DisplayPartnerSession = (props) => {
Date Naissance
{ showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -24999,6 +25446,8 @@ const DisplayPartnerSession = (props) => { client_facture: JSON.parse(item).facture_client_rattachement_id, + telephone: JSON.parse(item).telephone, + lms_class_code: JSON.parse(item).lms_class_code, lms_user_id: JSON.parse(item).lms_user_id, lms_account_expiration_date: JSON.parse(item).lms_account_expiration_date, @@ -25881,13 +26330,14 @@ const DisplayPartnerSession = (props) => {
Date Inscription
@@ -26272,6 +26722,7 @@ const DisplayPartnerSession = (props) => {
Date Evaluation { dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -26373,13 +26824,14 @@ const DisplayPartnerSession = (props) => { {detailuser_date_certification &&
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'} />
@@ -8171,7 +8226,6 @@ const Employes = (props) => { -

Mes employés

@@ -8206,9 +8260,8 @@ const Employes = (props) => {
-
- {p_filtre1 && + {p_filtre1 && String(p_filtre1) !== "competence" && { }} /> + } + + {p_filtre1 && String(p_filtre1) === "competence" && + + }
+ + + {p_filtre1 &&
- {String(p_filtre2).length > 2 && + {String(p_filtre2).length > 2 && String(p_filtre2) !== "competence" && { }} />} + + {String(p_filtre2).length > 2 && String(p_filtre2) === "competence" && + } +
{String(p_filtre2).length > 2 &&
@@ -8391,27 +8499,10 @@ const Employes = (props) => { } />} - {/* { - setp_filtre3(e.target.value) - }} - > - Email   - Nom   - Lié a la Formation (code externe)   - Lié a la Session (code session)   - - - */}
- {String(p_filtre3).length > 2 && + {String(p_filtre3).length > 2 && String(p_filtre3) !== "competence" && { }} />} + + {String(p_filtre3).length > 2 && String(p_filtre3) === "competence" && + } +
- {String(p_filtre2).length > 2 &&
} + {String(p_filtre3).length > 2 &&
@@ -8464,76 +8578,7 @@ const Employes = (props) => {
} - {/* - {p_filtre4 && -
-
- { - setp_filtre4(e.target.value) - }} - > - Email   - Nom   - Code Session    - Titre Formation   - - - -
-
- {String(p_filtre4).length > 2 && - setp_filtre2_value(e.target.value)} - InputProps={{ - endAdornment: ( - - { - setp_filtre4_value(""); - }} /> - - ), - }} - - />} -
- - - - {String(p_filtre2).length > 2 && } - -
- } - */}
@@ -8900,28 +8945,28 @@ const Employes = (props) => { paddingLeft: '10px', flexWrap: 'wrap' }}> - {String(employee_data_edit_mode) !== "1" && p_detail_civilite && - String(p_detail_civilite).length > 0 &&
Civilité
- 0 &&
Civilité
+ + /> -
} +
} {String(employee_data_edit_mode) === "1" &&
Civilité
- {New_civilite.length > 0 && 0 && { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_prenom} onChange={(e) => { @@ -9006,7 +9051,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_mail} onChange={(e) => { @@ -9032,7 +9077,7 @@ const Employes = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
} @@ -9050,7 +9095,7 @@ const Employes = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
} @@ -9081,7 +9126,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_tel_mobile} onChange={(e) => { @@ -9142,7 +9187,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_code_postal} onChange={(e) => { @@ -9161,7 +9206,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_ville} onChange={(e) => { @@ -9201,7 +9246,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_linkedIn} onChange={(e) => { @@ -9221,7 +9266,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_facebook} onChange={(e) => { @@ -9241,7 +9286,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_twitter} onChange={(e) => { @@ -9274,7 +9319,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_profil} @@ -9318,7 +9363,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_fonction} onChange={(e) => { @@ -9339,7 +9384,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_ismanager_label} @@ -9356,7 +9401,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_ismanager} onChange={(e) => { @@ -9380,7 +9425,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_resp_hierarchie_nom + " " + p_detail_resp_hierarchie_prenom} @@ -9440,7 +9485,7 @@ const Employes = (props) => { sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }} required name={JSON.parse(champ_spec).field_name} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} id={JSON.parse(champ_spec).field_name} type="number" inputProps={{ min: "1", max: "999999", step: "1" }} @@ -9464,7 +9509,7 @@ const Employes = (props) => { required name={JSON.parse(champ_spec).field_name} id={JSON.parse(champ_spec).field_name} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} InputLabelProps={{ shrink: true, @@ -9562,7 +9607,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_user_login} /> @@ -9718,7 +9763,7 @@ const Employes = (props) => { InputLabelProps={{ shrink: true, }} - disabled={Boolean(employee_data_edit_mode)} + disabled={Boolean(employee_data_edit_mode)} className="disabled_style" value={p_detail_lms_login} /> @@ -10032,7 +10077,7 @@ const Employes = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} /> @@ -10706,7 +10751,7 @@ const Employes = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
} @@ -10742,7 +10787,7 @@ const Employes = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
} @@ -10917,7 +10962,7 @@ const Employes = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
@@ -10936,7 +10981,7 @@ const Employes = (props) => { //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
@@ -12044,7 +12089,7 @@ const Employes = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -12071,7 +12116,7 @@ const Employes = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -12322,7 +12367,7 @@ const Employes = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -12348,7 +12393,7 @@ const Employes = (props) => { className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} showTimeSelect timeFormat="HH:mm" timeIntervals={15} @@ -12568,7 +12613,7 @@ const Employes = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" - locale='fr-FR' + locale={'fr'} /> @@ -12591,6 +12636,7 @@ const Employes = (props) => { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style session_caract_Dialog_DatePicker" + locale={'fr'} /> diff --git a/src/components/Ent_Intranet.js b/src/components/Ent_Intranet.js index da53b8d..23488a6 100644 --- a/src/components/Ent_Intranet.js +++ b/src/components/Ent_Intranet.js @@ -2692,7 +2692,7 @@ const Ent_Intranet = (props) => { function func_display_list_view() { setdisplay_mode_grid_or_list("list"); } - + return ( @@ -2714,7 +2714,7 @@ const Ent_Intranet = (props) => {
- {New_Get_Subdomain_Partner_Data_result[0].nom} +
@@ -2732,7 +2732,7 @@ const Ent_Intranet = (props) => {
-
+ {String(New_Get_Subdomain_Partner_Data_result[0].affiche_indicateur) === "1" &&
Indicateurs
{New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_1_txt && @@ -2778,8 +2778,10 @@ const Ent_Intranet = (props) => { }}> {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_4_txt}
} -
-
+
} + + + {String(New_Get_Subdomain_Partner_Data_result[0].affiche_raison_sociale) === "1" &&
{New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && } -
-
+
} + + + {String(New_Get_Subdomain_Partner_Data_result[0].affiche_contact) === "1" &&
Contact
Tel : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_telephone}
Email : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_email} -
+
}
@@ -2832,17 +2836,17 @@ const Ent_Intranet = (props) => {
- {New_Get_Subdomain_Partner_Data_result[0].nom} +
-
+ {String(New_Get_Subdomain_Partner_Data_result[0].affiche_contact) === "1" &&
Contact
Tel : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_telephone}
Email : {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_contact_public_email} -
+
} -
+ {String(New_Get_Subdomain_Partner_Data_result[0].affiche_indicateur) === "1" &&
Indicateurs
{New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_1_txt && @@ -2887,13 +2891,13 @@ const Ent_Intranet = (props) => { fontWeight: `${New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_4_gras}`, }}> {New_Get_Subdomain_Partner_Data_result[0].catalog_pub_indicateur_4_txt}
} -
+
}
-
+ {String(New_Get_Subdomain_Partner_Data_result[0].affiche_raison_sociale) === "1" &&
{New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && } -
+
} +
diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index 78274d8..2217535 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -17,6 +17,8 @@ import { AiFillFolderOpen, AiFillMinusSquare } from "react-icons/ai"; import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; +import fr from 'date-fns/locale/fr'; +import { registerLocale } from 'react-datepicker'; import DatePicker from "react-datepicker"; import "react-datepicker/dist/react-datepicker.css"; @@ -6458,7 +6460,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
@@ -6498,7 +6500,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style enable_style" - locale='fr-FR' + locale={'fr'} />
@@ -7167,7 +7169,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -7207,7 +7209,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair //filterTime={filterPassedTime_start} dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -8749,7 +8751,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -9154,7 +9156,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -9254,7 +9256,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} /> @@ -9269,7 +9271,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair dateFormat="dd/MM/yyyy" className="disabled_style" - locale='fr-FR' + locale={'fr'} style={{ "visibility": "hidden" }} /> diff --git a/src/components/Groupe_Apprenant.js b/src/components/Groupe_Apprenant.js index e1a1663..bc748fc 100644 --- a/src/components/Groupe_Apprenant.js +++ b/src/components/Groupe_Apprenant.js @@ -4595,7 +4595,7 @@ const Groupe_Apprenant = (props) => {   - } + } {String(submenu) === "selection" &&
diff --git a/src/components/HebergementLms.js b/src/components/HebergementLms.js index f9135f5..16b8d47 100644 --- a/src/components/HebergementLms.js +++ b/src/components/HebergementLms.js @@ -745,7 +745,7 @@ function HebergementLms(props) {
Choisir un exemple de thème :

+ {} + + + + + {isimgclassSelected && String(isimgclassSaved) === "0" && } +
+ +
+ + + + + +
+   +
+ +
+
+ +
+ + { + Signature_E_Document(1); + }}>J'etais présent + + + + } + modal + nested + position="center center" + > + {close => ( +
+ +
MySy Information
+
+ {' '} + + En confirmant cette opération, vous validez votre présence aux {selectionModel_sequence.length} séquence(s)
+ + +
+
+
+ + +
+
+ +
+
+
+ )} +
+ + + +
+ +
+ +
+
+
+ } + + + + {!is_valide_e_document &&
+   + +
} + + +
+   +
+ + + ); +} + +export default Survey_Eval_QR_Code; \ No newline at end of file diff --git a/src/components/TestUrl.js b/src/components/TestUrl.js index b48262b..880d62b 100644 --- a/src/components/TestUrl.js +++ b/src/components/TestUrl.js @@ -3,7 +3,7 @@ import axios from "axios"; import { Helmet } from "react-helmet"; import SideBar from "./sidebar"; import ReactPlayer from 'react-player' -import { Slide } from 'react-slideshow-image'; +import { Slide } from 'react-slideshow-image'; import { Zoom } from 'react-slideshow-image'; import logowhite from "../mysy_img/MYSY-LOGO-WHITE.png"; import 'react-slideshow-image/dist/styles.css' @@ -92,6 +92,11 @@ import Box from '@mui/material/Box'; import { makeStyles } from '@mui/styles'; import Checkbox from '@mui/material/Checkbox'; import { Container, Row, Col } from 'react-grid-system'; +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 { es } from 'date-fns/esm/locale'; import steph_img from "../mysy_img/spteph.jpg"; @@ -241,6 +246,7 @@ const rows21 = [ const TestUrl = (props) => { + registerLocale('fr', fr); const stripe = useStripe(); const elements = useElements(); @@ -770,20 +776,26 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa   -
- - - - One of three columns - - - One of three columns - - - One of three columns - - - +
+ + + Date début + + + +
@@ -941,7 +953,7 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa - Subscribe + Subscribe To subscribe to this website, please enter your email address here. We @@ -1182,17 +1194,17 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa
-
+

Mysy Training Logo
-
+
Cherif BALDE
-
- Directeur Général
MySy Training / ELYOS +
+ Directeur Général
MySy Training / ELYOS
@@ -1201,7 +1213,7 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa
-
+
 +337 69 20 39 45
 +331 77 00 38 57
 cbalde@mysy-training.com
@@ -1212,22 +1224,22 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa
-
-
+
+
-
+

Mysy Training Logo
-
- Isabelle LALYRE
+
+ Nicole BEAUCHESNE
-
- Business Developer
MySy Training / ELYOS +
+ Responsable Qualité & Support
MySy Training / ELYOS
@@ -1236,19 +1248,19 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa
-
-
 +337 75 73 26 40
+
+
+
 +331 77 00 38 57
-
 ilalyre@mysy-training.com
+
 nbeauchesne@mysy-training.com
 https://www.mysy-training.com/
-
 +337 75 73 26 40
- + d
-
-
+
+
@@ -1305,24 +1317,26 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa Mysy Training Logo
-
+
Mysy Training Logo + style={{ + "maxWidth": "15%", "marginTop": "2rem", border: 'none', paddingLeft: '10px', marginLeft: '10px', + marginTop: '1px' + }} /> -
+
Stéphanie BERNHARD
-
+
Responsable développement

 +337 63 97 23 78
@@ -1332,9 +1346,9 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa
- - + +
@@ -1408,17 +1422,17 @@ Cette fonction recuperer les stats des TOP 5 formations sur la periode saisie pa
- - - -
-
+ +
+ + +
diff --git a/src/components/TestUrl_new.js b/src/components/TestUrl_new.js index c10a982..c908069 100644 --- a/src/components/TestUrl_new.js +++ b/src/components/TestUrl_new.js @@ -12,7 +12,7 @@ import TextField from '@mui/material/TextField'; import MenuItem from '@mui/material/MenuItem'; import { getCookie, setCookie } from 'react-use-cookie'; import { useHistory } from "react-router-dom"; - + import { Calendar, dateFnsLocalizer } from 'react-big-calendar' import format from 'date-fns/format' import Link from '@mui/material/Link'; diff --git a/src/components/Test_Drag_Drop.js b/src/components/Test_Drag_Drop.js index 45b5194..392a9d3 100644 --- a/src/components/Test_Drag_Drop.js +++ b/src/components/Test_Drag_Drop.js @@ -21,6 +21,8 @@ import fileDownload from 'js-file-download' import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; 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' diff --git a/src/components/UpdateAttendeeList.js b/src/components/UpdateAttendeeList.js index 4c24cc9..a591477 100644 --- a/src/components/UpdateAttendeeList.js +++ b/src/components/UpdateAttendeeList.js @@ -909,7 +909,7 @@ function UpdateAttendeeList() { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style datepicker_complement" - locale='fr-FR' + locale={'fr'} /> @@ -932,7 +932,7 @@ function UpdateAttendeeList() { showTimeSelect={false} dateFormat="dd/MM/yyyy" className="disabled_style enable_style datepicker_complement" - locale='fr-FR' + locale={'fr'} />
diff --git a/src/components/UpdateUserGoals.js b/src/components/UpdateUserGoals.js index da42e2e..f81b997 100644 --- a/src/components/UpdateUserGoals.js +++ b/src/components/UpdateUserGoals.js @@ -13,6 +13,8 @@ import { getCookie } from 'react-use-cookie'; import { AiTwotoneEdit, AiTwotoneSave } from "react-icons/ai"; import { useHistory } from "react-router-dom"; import { format } from 'date-fns'; +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 { Editor } from '@tinymce/tinymce-react'; diff --git a/src/components/UpdateUserProfil.js b/src/components/UpdateUserProfil.js index c2b973a..00f488c 100644 --- a/src/components/UpdateUserProfil.js +++ b/src/components/UpdateUserProfil.js @@ -13,6 +13,8 @@ import { getCookie } from 'react-use-cookie'; import { AiTwotoneEdit, AiTwotoneSave } from "react-icons/ai"; import { useHistory } from "react-router-dom"; import { format } from 'date-fns'; +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 { Editor } from '@tinymce/tinymce-react'; diff --git a/src/mysy_img/jmj_bannier_mobile.png b/src/mysy_img/jmj_bannier_mobile.png index 4646b90..88d6e67 100644 Binary files a/src/mysy_img/jmj_bannier_mobile.png and b/src/mysy_img/jmj_bannier_mobile.png differ diff --git a/src/mysy_img/jmj_bannier_mobile_old.png b/src/mysy_img/jmj_bannier_mobile_old.png new file mode 100644 index 0000000..4646b90 Binary files /dev/null and b/src/mysy_img/jmj_bannier_mobile_old.png differ diff --git a/src/pages/emarge_qr_code.js b/src/pages/emarge_qr_code.js index 8634e7b..31dc601 100644 --- a/src/pages/emarge_qr_code.js +++ b/src/pages/emarge_qr_code.js @@ -11,7 +11,6 @@ export default function emarge_qr_code() {
- diff --git a/src/pages/survey_eval_qr_code.js b/src/pages/survey_eval_qr_code.js new file mode 100644 index 0000000..10ef318 --- /dev/null +++ b/src/pages/survey_eval_qr_code.js @@ -0,0 +1,19 @@ +import Link from "next/link"; +import Navigation from "../components/Navigation"; +import Survey_Eval_QR_Code from "../components/Survey_Eval_QR_Code"; + +import New_Navigation_2025 from "../components/New_Navigation_2025"; +import New_C_Header_2025_V2 from "../components/header_automatic_files/Header"; +import New_C_Footer_Without_Testimony_2025_V2 from "../components/footer_automatic_files/Layout_Without_Testimony"; + +export default function emarge_qr_code() { + return ( +
+ + + + + +
+ ); +} diff --git a/src/pages/surveydocument.js b/src/pages/surveydocument.js index 85d2dc1..9744c45 100644 --- a/src/pages/surveydocument.js +++ b/src/pages/surveydocument.js @@ -6,7 +6,7 @@ import New_C_Header_2025_V2 from "../components/header_automatic_files/Header"; import New_C_Footer_Without_Testimony_2025_V2 from "../components/footer_automatic_files/Layout_Without_Testimony"; -export default function Login() { +export default function Surveydocument() { return (
diff --git a/src/pages/surveydocument_qr_code.js b/src/pages/surveydocument_qr_code.js new file mode 100644 index 0000000..2bb14b2 --- /dev/null +++ b/src/pages/surveydocument_qr_code.js @@ -0,0 +1,18 @@ +import Link from "next/link"; +import Navigation from "../components/Navigation"; +import SurveyDocument_Qr_Code from "../components/SurveyDocument_Qr_Code" +import New_Navigation_2025 from "../components/New_Navigation_2025"; +import New_C_Header_2025_V2 from "../components/header_automatic_files/Header"; +import New_C_Footer_Without_Testimony_2025_V2 from "../components/footer_automatic_files/Layout_Without_Testimony"; + + +export default function Surveydocument_Qr_Code() { + return ( +
+ + + + +
+ ); +} diff --git a/src/styles/components/_employes.scss b/src/styles/components/_employes.scss index e3abe95..edf0e86 100644 --- a/src/styles/components/_employes.scss +++ b/src/styles/components/_employes.scss @@ -429,7 +429,7 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - + text-align: left; } @@ -482,7 +482,7 @@ } .bton_enreg { - font-family: DM sans; + font-family: DM sans; border-radius: 5rem; font-size: small; background: #81BC3A !important; @@ -1032,7 +1032,7 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - + text-align: left; } @@ -1089,7 +1089,7 @@ } .bton_enreg { - font-family: DM sans; + font-family: DM sans; border-radius: 5rem; font-size: small; background: #81BC3A !important; @@ -1541,7 +1541,7 @@ } .bton_enreg { - font-family: DM sans; + font-family: DM sans; border-radius: 5rem; font-size: small; background: #81BC3A !important; @@ -1701,7 +1701,7 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - + text-align: left; } @@ -1723,7 +1723,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal; @@ -2145,7 +2145,7 @@ } .bton_enreg { - font-family: DM sans; + font-family: DM sans; border-radius: 5rem; font-size: small; background: #81BC3A !important; @@ -2305,7 +2305,7 @@ margin: 0.4rem !important; margin-top: 0px !important; margin-bottom: 2px !important; - + text-align: left; } @@ -2327,7 +2327,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal; @@ -2396,7 +2396,7 @@ // end media - .disabled_style_no_border{ + .disabled_style_no_border { border: none !important; } @@ -2405,7 +2405,7 @@ padding: 5px !important; font-family: 'DM Sans'; } - + .separator { display: flex; align-items: center; @@ -2434,7 +2434,7 @@ .separator:not(:empty)::after { margin-left: .35em; } - + .separator_label { width: 10rem; @@ -2602,8 +2602,8 @@ width: 110%; } - .css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input { - font-size: small !important; - font-family: "DM Sans" !important; +.css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input { + font-size: small !important; + font-family: "DM Sans" !important; padding-left: 5px !important; } \ No newline at end of file diff --git a/src/styles/components/_mon_catalogue_public.scss b/src/styles/components/_mon_catalogue_public.scss index 48f6316..9db8d36 100644 --- a/src/styles/components/_mon_catalogue_public.scss +++ b/src/styles/components/_mon_catalogue_public.scss @@ -5790,9 +5790,10 @@ margin-top: 15rem; text-align: center; font-family: 'DM Sans'; - width: 25%; + width: 30%; color: #16274F; margin-right: 2rem; + padding-right: 5px; } @@ -5809,7 +5810,7 @@ text-align: left; font-family: 'DM Sans'; width: 30%; - margin-left: 2rem; + margin-left: 1rem; } @@ -9167,6 +9168,7 @@ font-family: 'DM Sans'; width: 25%; color: #16274F; + padding-right: 5px; } @@ -12573,8 +12575,9 @@ margin-top: 15rem; text-align: center; font-family: 'DM Sans'; - width: 25%; + width: 28%; color: #16274F; + padding-right: 20px; } @@ -16020,17 +16023,6 @@ text-align: right; } - .jmj_bloc_logo_indic_contact { - width: 18%; - float: right; - text-align: right; - - margin-top: 15rem; - text-align: center; - font-family: 'DM Sans'; - width: 25%; - color: #16274F; - } .bloc_logo_indic_indic { @@ -16388,6 +16380,7 @@ font-family: 'DM Sans'; width: 25%; color: #16274F; + padding-right: 20px; } } diff --git a/src/styles/components/_mon_intranet_public.scss b/src/styles/components/_mon_intranet_public.scss index d86889f..e203899 100644 --- a/src/styles/components/_mon_intranet_public.scss +++ b/src/styles/components/_mon_intranet_public.scss @@ -3,7 +3,7 @@ width: 100%; float: left; - + min-height: calc(100vh - 5rem); .css-1nmdiq5-menu { background: transparent !important; @@ -13352,7 +13352,7 @@ - + .Partner_Catalog_Background_Header { // position: absolute;