diff --git a/src/App.js b/src/App.js index eeb79db..950fac9 100644 --- a/src/App.js +++ b/src/App.js @@ -32,6 +32,7 @@ import Recherche_new from "./pages/recherche_new"; import Recherche_old from "./pages/recherche"; import UserSignFirst from "./pages/usersigninfirst"; import GestionAdministrative from "./components/GestionAdministrative"; +import Emargement from "./pages/emargementOk"; function App() { @@ -84,6 +85,7 @@ function App() { + diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index 3afa73c..f6a2033 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -37,12 +37,12 @@ function GestionAdministrative(props) { const columns_preinscrit = [ { field: 'id', headerName: 'id', hide: true }, { field: 'email', headerName: 'email', width: 200, hideable: false, flex: 1 }, - { field: 'nom', headerName: 'nom', width: 200, hide: false, editable: true }, - { field: 'prenom', headerName: 'prenom', width: 200, hide: false, editable: true }, + { field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true }, + { field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: true }, { field: 'employeur', headerName: 'Employeur', width: 200, hide: false, editable: true }, - { field: 'opco', headerName: 'Centre Opco', width: 200, hide: false, editable: true }, - { field: 'modefinancement', headerName: 'Financement', width: 200, hide: false, editable: true }, - { field: 'amount', headerName: 'Montant Formation', width: 200, type: 'number', hideable: false, flex: 1, editable: true }, + { field: 'opco', headerName: 'Centre Opco', width: 150, hide: false, editable: true }, + { field: 'modefinancement', headerName: 'Financement', width: 150, hide: false, editable: true }, + { field: 'amount', headerName: 'Montant Formation', width: 150, type: 'number', hideable: false, flex: 1, editable: true }, { field: "update", headerName: 'Mise à jour', renderCell: (cellValues) => { @@ -191,13 +191,13 @@ function GestionAdministrative(props) { const columns_inscrit = [ { field: 'id', headerName: 'id', hide: true }, - { field: 'email', headerName: 'email s', width: 200, hideable: false, flex: 1, minWidth: 150, maxWidth: 300 }, - { field: 'nom', headerName: 'nom', width: 200, hide: false, editable: true, resizable: true }, - { field: 'prenom', headerName: 'prenom', width: 200, hide: false, editable: true }, + { field: 'email', headerName: 'emails', width: 200, hideable: false, flex: 1, minWidth: 150, maxWidth: 300 }, + { field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true, resizable: true }, + { field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: true }, { field: 'employeur', headerName: 'Employeur', width: 200, hide: false, editable: true }, - { field: 'opco', headerName: 'Centre Opco', width: 200, hide: false, editable: true }, - { field: 'modefinancement', headerName: 'Financement', width: 200, hide: false, editable: true }, - { field: 'amount', headerName: 'Montant Formation', width: 200, type: 'number', hideable: false, flex: 1, editable: true }, + { field: 'opco', headerName: 'Centre Opco', width: 150, hide: false, editable: true }, + { field: 'modefinancement', headerName: 'Financement', width: 150, hide: false, editable: true }, + { field: 'amount', headerName: 'Montant Formation', width: 150, type: 'number', hideable: false, flex: 1, editable: true }, { field: "sendmail", headerName: 'Email Confirmation', renderCell: (cellValues) => { @@ -266,12 +266,12 @@ function GestionAdministrative(props) { const columns_list_emargement = [ { field: 'id', headerName: 'id', hide: true }, - { field: 'date', headerName: 'date', width: 200, hideable: false, flex: 1 }, - { field: 'email', headerName: 'email', width: 200, hideable: false, flex: 1 }, - { field: 'nom', headerName: 'nom', width: 200, hide: false, editable: true }, - { field: 'prenom', headerName: 'prenom', width: 200, hide: false, editable: false }, - { field: 'matin', headerName: 'Matin', width: 200, hide: false, editable: true, type: 'boolean', }, - { field: 'apresmidi', headerName: 'Apres midi', width: 200, hide: false, editable: true, type: 'boolean', }, + { field: 'date', headerName: 'date', width: 100, hideable: false, flex: 1 }, + { field: 'email', headerName: 'email', width: 250, hideable: false, flex: 1 }, + { field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true }, + { field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: false }, + { field: 'matin', headerName: 'Matin', width: 100, hide: false, editable: true, type: 'boolean', }, + { field: 'apresmidi', headerName: 'Apres midi', width: 100, hide: false, editable: true, type: 'boolean', }, { field: "valide", headerName: 'Valider', renderCell: (cellValues) => { @@ -1164,12 +1164,12 @@ function GestionAdministrative(props) { function GetSelectedRowsEmargement() { var tab_tmp = [] - + for (var i = 0; i < selectionModel_emarg.length; i++) { var myid = parseInt(String(selectionModel_emarg[i])); tab_tmp.push(JSON.parse(rowss_emarg[myid])._id); - + } setselectedemargement(tab_tmp); return tab_tmp; @@ -1180,6 +1180,11 @@ function GestionAdministrative(props) { const [ActionMassListEmargement_result, setActionMassListEmargement_result] = useState(); function ActionMassListEmargement(e) { + if( selectionModel_emarg.length <= 0 ){ + alert(" Selectionnez un enregistrement pour envoyer la demande d'emargement"); + return; + } + var actionenmasse = "" if (document.getElementById("actionmass_emarge")) { actionenmasse = document.getElementById("actionmass_emarge").value; @@ -1187,8 +1192,8 @@ function GestionAdministrative(props) { var liste_emargement_id = GetSelectedRowsEmargement(); - console.log("liste_formation = "+liste_emargement_id); - + console.log("liste_formation = " + liste_emargement_id); + var form = new FormData(); //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); const stored_cookie = getCookie('tokenmysypart'); @@ -1216,9 +1221,7 @@ function GestionAdministrative(props) { }) - alert(" envoi des emargements"); - - + if (String(actionenmasse) === String("depublier")) { @@ -1770,15 +1773,14 @@ function GestionAdministrative(props) { {String(submenu) === String("emargement") &&
-
-
- +
+ + +
+
-
- -
-
+ {String(CreateListEmargement_api) === "true" &&
La liste d'emargement a été créée
} @@ -1787,15 +1789,25 @@ function GestionAdministrative(props) { {CreateListEmargement_message}
} + {String(ActionMassListEmargement_api) === "true" &&
+ Les demandes d'emargement ont bien été envoyées +
} + + {String(ActionMassListEmargement_api) === "false" &&
+ {CreateListEmargement_message} +
} + + +
{ setSelectionModel_emarg(newSelectionModel_emarg); console.log("ch selected--" + newSelectionModel_emarg); - + }} - + selectionModel={selectionModel_emarg} localeText={frFR.components.MuiDataGrid.defaultProps.localeText} rows={rowss_emarg.map((item, index) => ( @@ -1826,9 +1838,9 @@ function GestionAdministrative(props) {
-
+
+ -
} diff --git a/src/mysy_img/Ok_PNG.png b/src/mysy_img/Ok_PNG.png new file mode 100644 index 0000000..6d02fbb Binary files /dev/null and b/src/mysy_img/Ok_PNG.png differ diff --git a/src/pages/emargementOk.js b/src/pages/emargementOk.js new file mode 100644 index 0000000..84f4264 --- /dev/null +++ b/src/pages/emargementOk.js @@ -0,0 +1,60 @@ +import React, { useState, useEffect } from "react"; +import Navigation from "../components/Navigation"; +import bannerimg2 from "./../mysy_img/MYSY-LOGO-BLUE.png"; +import ok_png from "./../mysy_img/Ok_PNG.png"; +import { Helmet } from "react-helmet"; +import Footer from "./../components/Fotter"; +import Header from "./../components/Header"; + + +const EmargementOk = () => { + + const [tempo, settempo] = useState("."); + setInterval(check, 2300); + + + window.setTimeout(function () { + window.location.href = process.env.REACT_APP_BASE_URL + }, 7000); + + + function check() { + var val = tempo + " ."; + //alert(" val = "+val); + settempo(val); + + } + return ( +
+
+ +
+ + MySy Training, Emargement + + + + + + +
+ + +
+
Votre demande d'emargement bien été prise en compte
+
+
+ Vous allez etre redirigé vers le moteur de recherche dans quelques secondes. {tempo} +
+
+
+
+
+ + +
+ ) +} + +export default EmargementOk; \ No newline at end of file diff --git a/src/styles/components/_gestionadministrative.scss b/src/styles/components/_gestionadministrative.scss index 0495711..a6daf74 100644 --- a/src/styles/components/_gestionadministrative.scss +++ b/src/styles/components/_gestionadministrative.scss @@ -98,6 +98,7 @@ background-color: #104277; color: white; } + .detail_class_submenu:focus { //border: 3px dotted green; background-color: #104277; @@ -157,7 +158,7 @@ border-radius: 10px; margin-top: 10px; margin-bottom: 10px; - + } .session_caract { @@ -275,6 +276,7 @@ background-color: #104277; color: white; } + .detail_class_submenu:focus { //border: 3px dotted green; background-color: #104277; @@ -336,7 +338,7 @@ border-radius: 10px; margin-top: 10px; margin-bottom: 10px; - + } .session_caract { @@ -454,6 +456,7 @@ background-color: #104277; color: white; } + .detail_class_submenu:focus { //border: 3px dotted green; background-color: #104277; @@ -515,7 +518,7 @@ border-radius: 10px; margin-top: 10px; margin-bottom: 10px; - + } .session_caract { @@ -633,6 +636,7 @@ background-color: #104277; color: white; } + .detail_class_submenu:focus { //border: 3px dotted green; background-color: #104277; @@ -694,7 +698,7 @@ border-radius: 10px; margin-top: 10px; margin-bottom: 10px; - + } .session_caract { @@ -724,8 +728,17 @@ padding-bottom: 5px !important; } - .css-1t10bd6-MuiFormControl-root-MuiTextField-root fieldset{ + .css-1t10bd6-MuiFormControl-root-MuiTextField-root fieldset { border-color: white !important; border-radius: 20px !important; } -} + + .bton_emarge { + border-radius: 5rem; + font-size: small; + padding: 0.5rem; + background: rgb(129, 188, 58); + margin-left: 5px; + margin-right: 5px; + } +} \ No newline at end of file diff --git a/src/styles/components/_notfound.scss b/src/styles/components/_notfound.scss index 22d84ce..1fb11b7 100644 --- a/src/styles/components/_notfound.scss +++ b/src/styles/components/_notfound.scss @@ -19,6 +19,10 @@ margin-right: auto; } + .img_ok { + width: 5%; + } + .containerBox { position: relative; display: inline-block; @@ -63,6 +67,31 @@ color: red; font-style: italic; } + + .div_mobile { + position: relative; + top: 7rem; + z-index: 1; + width: 98%; + height: 100%; + margin: 0.3rem; + margin-left: auto; + margin-right: auto; + } + + .pieddepage { + z-index: 50; + width: 100%; + float: left; + margin-top: 10rem; + + @media only screen and (min-height: 801px) { + margin-top: 35rem; + } + + + } + } @media only screen and (min-width: 601px) and (max-width: 991px) { @@ -129,6 +158,35 @@ color: red; font-style: italic; } + + .img_ok { + width: 5%; + } + + .div_mobile { + position: absolute; + top: 11rem; + z-index: 1; + width: 100%; + } + + .pieddepage { + z-index: 50; + width: 100%; + float: left; + margin-top: 2rem; + + @media only screen and (min-height: 1000px) { /* Ipaid */ + margin-top: 40rem; + } + + @media only screen and (min-height: 1101px) { /* Ipad Air */ + margin-top: 60rem; + } + + } + + } @media only screen and (min-width: 992px) and (max-width: 1199px) { @@ -196,6 +254,30 @@ color: red; font-style: italic; } + + .img_ok { + width: 5%; + } + + .div_mobile { + position: absolute; + top: 11rem; + z-index: 1; + width: 100%; + } + + + .pieddepage { + z-index: 50; + width: 100%; + float: left; + margin-top: 20rem; + + @media only screen and (min-height: 1000px) { + margin-top: 30rem; + } + } + } @media only screen and (min-width: 1200px) { @@ -240,6 +322,7 @@ border-radius: 1rem; text-align: left; } + .div_row_droite { float: right; //border:0px solid black; @@ -263,10 +346,10 @@ font-style: italic; } - + .div_mobile { position: absolute; - top: 15rem; + top: 11rem; z-index: 1; width: 100%; } @@ -275,9 +358,19 @@ z-index: 50; width: 100%; float: left; - //margin-top: 5rem; - margin-top: calc(100vh - 5%); + margin-top: 40rem; + + @media only screen and (min-height: 901px) { + margin-top: 18rem; + } + + @media only screen and (min-height: 1201px) { + margin-top: 28rem; + } } + .img_ok { + max-width: 5%; + } } -} +} \ No newline at end of file