From a3d9886bc074d2f43abd8dda248ddb087a3ae666 Mon Sep 17 00:00:00 2001 From: cherif Date: Fri, 22 Sep 2023 12:53:21 +0200 Subject: [PATCH] 22/09/2023 - 12h53 --- package-lock.json | 202 ++++++- package.json | 5 + src/components/AddClassManual.js | 4 +- src/components/DisplayPartnerSession.js | 134 ++++- src/components/DisplayPartnerStagiaires.js | 24 +- src/components/Employes.js | 6 +- src/components/GestionAdministrative.js | 508 +++++++++++++----- src/components/HebergementLms.js | 4 +- src/components/Materiels.js | 6 +- src/components/Partner.js | 2 +- src/components/Partner_Client.js | 2 +- src/components/Partner_Commande.js | 2 +- src/components/TestUrl_new.js | 81 ++- src/components/UpdatePartnerInfo.js | 8 +- src/mysy_img/new_icon_gif.gif | Bin 0 -> 406374 bytes .../components/_displaypartnersession.scss | 32 ++ .../components/_displaypartnerstagiaire.scss | 31 ++ .../components/_gestionadministrative.scss | 266 ++++++++- src/styles/index.scss | 2 + 19 files changed, 1125 insertions(+), 194 deletions(-) create mode 100644 src/mysy_img/new_icon_gif.gif diff --git a/package-lock.json b/package-lock.json index a3aaefa..d519b56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,10 @@ "@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.18", + "@fullcalendar/core": "^6.1.8", + "@fullcalendar/daygrid": "^6.1.8", + "@fullcalendar/interaction": "^6.1.8", + "@fullcalendar/react": "^6.1.8", "@mantine/core": "^4.2.10", "@mantine/hooks": "^4.2.10", "@mantine/rte": "^4.2.10", @@ -70,6 +74,7 @@ "prerender-node": "^3.5.0", "react": "^17.0.2", "react-apexcharts": "^1.4.0", + "react-big-calendar": "^1.8.4", "react-bootstrap": "^2.1.2", "react-burger-menu": "^3.0.6", "react-canvas-js": "^1.0.1", @@ -2925,6 +2930,40 @@ "react": ">=16.x" } }, + "node_modules/@fullcalendar/core": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.8.tgz", + "integrity": "sha512-i8JBIvZCWGO9dsMEDcx9bnsQZ9PtGSJdOXGgWbhLaGq2iq41OBdp9g9gM4b/Otv2oK8bL5Gl6CsMmb/HkDtA6Q==", + "dependencies": { + "preact": "~10.12.1" + } + }, + "node_modules/@fullcalendar/daygrid": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.8.tgz", + "integrity": "sha512-kCZxQFKb9Vqa3CZRX0v7rMSJ2mlTt4gDpyLfiNJKxUAq7W51uKurPaFZWicaXy1ESHVBxKNlbx5uNjBpyu50JQ==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.8" + } + }, + "node_modules/@fullcalendar/interaction": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.8.tgz", + "integrity": "sha512-r6W4E9ohaA87M2uPSlmpE2WT7Fzu7LN0u2pE6D/tThruCEaAPbN8Pw5+sqclsuyTIL09mg0eSJm/ggJekTabSA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.8" + } + }, + "node_modules/@fullcalendar/react": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/react/-/react-6.1.8.tgz", + "integrity": "sha512-E8GQSQyZHkjpwxQW5Vci7iZgN7f33ntuRcvfGii4Fn35t9VHGz2SEyKAWXpVf38elcKTZKVgajU9ipStd+1LEg==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.8", + "react": "^16.7.0 || ^17 || ^18", + "react-dom": "^16.7.0 || ^17 || ^18" + } + }, "node_modules/@gatsbyjs/reach-router": { "version": "1.3.9", "license": "MIT", @@ -13887,6 +13926,11 @@ "license": "MIT", "peer": true }, + "node_modules/date-arithmetic": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/date-arithmetic/-/date-arithmetic-4.1.0.tgz", + "integrity": "sha512-QWxYLR5P/6GStZcdem+V1xoto6DMadYWpMXU82ES3/RfR3Wdwr3D0+be7mgOJ+Ov0G9D5Dmb9T17sNLQYj9XOg==" + }, "node_modules/date-fns": { "version": "2.29.3", "license": "MIT", @@ -13899,8 +13943,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.6", - "license": "MIT" + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "node_modules/debounce-fn": { "version": "0.0.0", @@ -17999,6 +18044,11 @@ "which": "bin/which" } }, + "node_modules/globalize": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/globalize/-/globalize-0.1.1.tgz", + "integrity": "sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA==" + }, "node_modules/globals": { "version": "11.12.0", "license": "MIT", @@ -24618,6 +24668,14 @@ "react": "^16.5.1 || ^17.0.0 || ^18.0.0" } }, + "node_modules/luxon": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz", + "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==", + "engines": { + "node": ">=12" + } + }, "node_modules/lz-string": { "version": "1.4.4", "license": "WTFPL", @@ -27611,6 +27669,17 @@ "node": "*" } }, + "node_modules/moment-timezone": { + "version": "0.5.43", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", + "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", + "dependencies": { + "moment": "^2.29.4" + }, + "engines": { + "node": "*" + } + }, "node_modules/move-concurrently": { "version": "1.0.1", "license": "ISC", @@ -33785,6 +33854,15 @@ "route-recognizer": "^0.1.11" } }, + "node_modules/preact": { + "version": "10.12.1", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.12.1.tgz", + "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "license": "MIT", @@ -34354,6 +34432,38 @@ "react": "^15.0.0 || ^16.0.0 || ^17.0.0" } }, + "node_modules/react-big-calendar": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/react-big-calendar/-/react-big-calendar-1.8.4.tgz", + "integrity": "sha512-zo2LDQxWHvcnkvtgzZlxJsCfi6fI8neOSyjG5ntePLO2CAlkhHiwwXgynxIFeWCwJ5LMnhN6tBt03IN4Y0bOzQ==", + "dependencies": { + "@babel/runtime": "^7.20.7", + "clsx": "^1.2.1", + "date-arithmetic": "^4.1.0", + "dayjs": "^1.11.7", + "dom-helpers": "^5.2.1", + "globalize": "^0.1.1", + "invariant": "^2.2.4", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "luxon": "^3.2.1", + "memoize-one": "^6.0.0", + "moment": "^2.29.4", + "moment-timezone": "^0.5.40", + "prop-types": "^15.8.1", + "react-overlays": "^5.2.1", + "uncontrollable": "^7.2.1" + }, + "peerDependencies": { + "react": "^16.14.0 || ^17 || ^18", + "react-dom": "^16.14.0 || ^17 || ^18" + } + }, + "node_modules/react-big-calendar/node_modules/memoize-one": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" + }, "node_modules/react-bootstrap": { "version": "2.6.0", "license": "MIT", @@ -48028,6 +48138,32 @@ "prop-types": "^15.8.1" } }, + "@fullcalendar/core": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.8.tgz", + "integrity": "sha512-i8JBIvZCWGO9dsMEDcx9bnsQZ9PtGSJdOXGgWbhLaGq2iq41OBdp9g9gM4b/Otv2oK8bL5Gl6CsMmb/HkDtA6Q==", + "requires": { + "preact": "~10.12.1" + } + }, + "@fullcalendar/daygrid": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.8.tgz", + "integrity": "sha512-kCZxQFKb9Vqa3CZRX0v7rMSJ2mlTt4gDpyLfiNJKxUAq7W51uKurPaFZWicaXy1ESHVBxKNlbx5uNjBpyu50JQ==", + "requires": {} + }, + "@fullcalendar/interaction": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.8.tgz", + "integrity": "sha512-r6W4E9ohaA87M2uPSlmpE2WT7Fzu7LN0u2pE6D/tThruCEaAPbN8Pw5+sqclsuyTIL09mg0eSJm/ggJekTabSA==", + "requires": {} + }, + "@fullcalendar/react": { + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/@fullcalendar/react/-/react-6.1.8.tgz", + "integrity": "sha512-E8GQSQyZHkjpwxQW5Vci7iZgN7f33ntuRcvfGii4Fn35t9VHGz2SEyKAWXpVf38elcKTZKVgajU9ipStd+1LEg==", + "requires": {} + }, "@gatsbyjs/reach-router": { "version": "1.3.9", "peer": true, @@ -55234,11 +55370,18 @@ "version": "2.0.0", "peer": true }, + "date-arithmetic": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/date-arithmetic/-/date-arithmetic-4.1.0.tgz", + "integrity": "sha512-QWxYLR5P/6GStZcdem+V1xoto6DMadYWpMXU82ES3/RfR3Wdwr3D0+be7mgOJ+Ov0G9D5Dmb9T17sNLQYj9XOg==" + }, "date-fns": { "version": "2.29.3" }, "dayjs": { - "version": "1.11.6" + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "debounce-fn": { "version": "0.0.0" @@ -57999,6 +58142,11 @@ } } }, + "globalize": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/globalize/-/globalize-0.1.1.tgz", + "integrity": "sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA==" + }, "globals": { "version": "11.12.0" }, @@ -62226,6 +62374,11 @@ "integrity": "sha512-keqxAx97PlaEN89PXZ6ki1N8nRjGWtDa4021GFYLNj0RgruM5odbpl8GHTExj0hhPq3sF6Up0gnxt6TSHu+ovw==", "requires": {} }, + "luxon": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz", + "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==" + }, "lz-string": { "version": "1.4.4" }, @@ -64258,6 +64411,14 @@ "moment": { "version": "2.29.4" }, + "moment-timezone": { + "version": "0.5.43", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", + "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", + "requires": { + "moment": "^2.29.4" + } + }, "move-concurrently": { "version": "1.0.1", "requires": { @@ -68051,6 +68212,11 @@ "route-recognizer": "^0.1.11" } }, + "preact": { + "version": "10.12.1", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.12.1.tgz", + "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==" + }, "prelude-ls": { "version": "1.2.1" }, @@ -68429,6 +68595,36 @@ "md5": "^2.0.0" } }, + "react-big-calendar": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/react-big-calendar/-/react-big-calendar-1.8.4.tgz", + "integrity": "sha512-zo2LDQxWHvcnkvtgzZlxJsCfi6fI8neOSyjG5ntePLO2CAlkhHiwwXgynxIFeWCwJ5LMnhN6tBt03IN4Y0bOzQ==", + "requires": { + "@babel/runtime": "^7.20.7", + "clsx": "^1.2.1", + "date-arithmetic": "^4.1.0", + "dayjs": "^1.11.7", + "dom-helpers": "^5.2.1", + "globalize": "^0.1.1", + "invariant": "^2.2.4", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "luxon": "^3.2.1", + "memoize-one": "^6.0.0", + "moment": "^2.29.4", + "moment-timezone": "^0.5.40", + "prop-types": "^15.8.1", + "react-overlays": "^5.2.1", + "uncontrollable": "^7.2.1" + }, + "dependencies": { + "memoize-one": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" + } + } + }, "react-bootstrap": { "version": "2.6.0", "requires": { diff --git a/package.json b/package.json index d479cc8..26a29a8 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,10 @@ "@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.18", + "@fullcalendar/core": "^6.1.8", + "@fullcalendar/daygrid": "^6.1.8", + "@fullcalendar/interaction": "^6.1.8", + "@fullcalendar/react": "^6.1.8", "@mantine/core": "^4.2.10", "@mantine/hooks": "^4.2.10", "@mantine/rte": "^4.2.10", @@ -65,6 +69,7 @@ "prerender-node": "^3.5.0", "react": "^17.0.2", "react-apexcharts": "^1.4.0", + "react-big-calendar": "^1.8.4", "react-bootstrap": "^2.1.2", "react-burger-menu": "^3.0.6", "react-canvas-js": "^1.0.1", diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index bab35ba..6de1f00 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -874,7 +874,7 @@ const AddClassManual = (props) => { //alert("file_size = "+file_size+" file_type = "+file_type+" a = "+a); if (file_size > 1000000) { - alert("L'image ne doit pas depasser un 1 Méga octets"); + alert("L'image ne doit pas dépasser un 1 Méga octets"); return; } setisimgclassSelected(event.target.files[0]); @@ -1969,7 +1969,7 @@ const AddClassManual = (props) => { Les dimensions maximales sont de 256pixels X 256pixels
  • - La taille de l'image ne doit pas depasser 1 mega octet + La taille de l'image ne doit pas dépasser 1 mega octet
  • diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index f685a9b..7c68ee2 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -37,6 +37,9 @@ import DialogActions from '@mui/material/DialogActions'; import DialogContent from '@mui/material/DialogContent'; import DialogContentText from '@mui/material/DialogContentText'; import DialogTitle from '@mui/material/DialogTitle'; +import { RestoreFromTrashRounded } from "@mui/icons-material"; +import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; + const DisplayPartnerSession = (props) => { const history = useHistory(); @@ -106,15 +109,15 @@ const DisplayPartnerSession = (props) => { })); const [datagrid_columns_size_model1, setdatagrid_columns_size_model1] = useState(200); - const [datagrid_columns_size_model2, setdatagrid_columns_size_model2] = useState(80); + const [datagrid_columns_size_model2, setdatagrid_columns_size_model2] = useState(100); const columns = [ { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, { field: 'class_internal_url', headerName: 'class_internal_url', hide: true }, - { field: 'code_session', headerName: 'Code session', hide: false, width: datagrid_columns_size_model1, }, + { field: 'code_session', headerName: 'Code session', hide: false, flex:1 }, { - field: 'statut', headerName: 'Statut', hide: false, width: datagrid_columns_size_model1, + field: 'statut', headerName: 'Statut', hide: true, width: datagrid_columns_size_model2, valueFormatter: (params) => { if (String(params.value) === "0") return "Inactif"; @@ -126,12 +129,12 @@ const DisplayPartnerSession = (props) => { }, { - field: 'etape', headerName: 'Etape', hide: false, width: datagrid_columns_size_model1, + field: 'etape', headerName: 'Etape', hide: false, width: datagrid_columns_size_model2, valueFormatter: (params) => { if (String(params.value) === "0") return "Projet"; else if (String(params.value) === "1") - return "Planification"; + return "En Planif."; else if (String(params.value) === "2") return "Planifiée"; else if (String(params.value) === "3") @@ -144,10 +147,9 @@ const DisplayPartnerSession = (props) => { return "???"; }, }, - - - { field: 'date_debut', headerName: 'Date debut', hide: false, width: datagrid_columns_size_model2, }, - { field: 'date_fin', headerName: 'Datefin', hideable: false, width: datagrid_columns_size_model2, }, + { field: 'class_external_code', headerName: 'Code Formation', align: "center", hideable: true, flex:1, hide: true,}, + { field: 'date_debut', headerName: 'Debut', hide: false, width: datagrid_columns_size_model2, }, + { field: 'date_fin', headerName: 'Fin', hideable: false, width: datagrid_columns_size_model2, }, { field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2, valueFormatter: (params) => { @@ -173,7 +175,7 @@ const DisplayPartnerSession = (props) => { { field: 'formateur', headerName: 'Formateur', width: datagrid_columns_size_model1, hide: true, hideable: true, }, { field: 'nb_participant', headerName: 'Nb Parti.', width: datagrid_columns_size_model2, align: "center", }, { - field: 'taux_remplissage', headerName: 'Remplissage', align: "center", width: datagrid_columns_size_model1, + field: 'taux_remplissage', headerName: 'Remplissage', align: "center", flex:1, align: "left", renderCell: (params) => { return ( @@ -197,6 +199,7 @@ const DisplayPartnerSession = (props) => { { field: 'prix_session', headerName: 'Prix', width: datagrid_columns_size_model2, align: "center", }, { field: 'title', headerName: 'Formation', width: datagrid_columns_size_model1, align: "center", hide: true, hideable: true, }, { field: 'domaine', headerName: 'Domaine', width: datagrid_columns_size_model1, align: "center", hide: true, hideable: true, }, + { field: 'duration', headerName: 'Durée', width: datagrid_columns_size_model2, align: "center", }, { field: "delete", headerName: 'Supprimer', @@ -584,6 +587,70 @@ const DisplayPartnerSession = (props) => { ); } }, + { + field: "annulation", headerName: 'Annulation', + renderCell: (cellValues) => { + return ( + + { + handleClick_refuse(event, cellValues); + }} + > + + + } + modal + nested + position="center center" + > + {close => ( +
    + +
    MySy Information
    +
    + {' '} + + En confirmant cette opération, l'inscription du stagiaire sera définitivement annulée.
    + Il (le stagiaire) sera automatiquement notifié par email de l'annulation de son inscription.
    +
    Motif du annulation :
    +