diff --git a/package-lock.json b/package-lock.json index 21f750e..dd0479a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -88,6 +88,7 @@ "powerbi-client": "^2.19.1", "powerbi-client-react": "^1.3.3", "prerender-node": "^3.5.0", + "randomcolor": "^0.6.2", "react": "^18.2.0", "react-apexcharts": "^1.4.0", "react-app-rewired": "^2.2.1", @@ -96,6 +97,7 @@ "react-big-calendar": "^1.8.4", "react-bootstrap": "^2.1.2", "react-burger-menu": "^3.0.6", + "react-calendar-timeline": "^0.30.0-beta.2", "react-canvas-js": "^1.0.1", "react-comments-section": "^2.0.10", "react-confirm-alert": "^2.8.0", @@ -9778,6 +9780,11 @@ "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==" }, + "node_modules/batch-processor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz", + "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==" + }, "node_modules/bcryptjs": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", @@ -10652,9 +10659,9 @@ } }, "node_modules/classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "node_modules/clean-css": { "version": "5.3.1", @@ -13603,6 +13610,14 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, + "node_modules/element-resize-detector": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.4.tgz", + "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==", + "dependencies": { + "batch-processor": "1.0.0" + } + }, "node_modules/elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -25988,6 +26003,11 @@ "safe-buffer": "^5.1.0" } }, + "node_modules/randomcolor": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/randomcolor/-/randomcolor-0.6.2.tgz", + "integrity": "sha512-Mn6TbyYpFgwFuQ8KJKqf3bqqY9O1y37/0jgSK/61PUxV4QfIMv0+K2ioq8DfOjkBslcjwSzRfIDEXfzA9aCx7A==" + }, "node_modules/randomfill": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", @@ -26235,6 +26255,28 @@ "react-dom": ">=0.14.0" } }, + "node_modules/react-calendar-timeline": { + "version": "0.30.0-beta.2", + "resolved": "https://registry.npmjs.org/react-calendar-timeline/-/react-calendar-timeline-0.30.0-beta.2.tgz", + "integrity": "sha512-WD+c7crXxOxbwOxg1+YOcjwNhkvjhuiCvzCKl+1Xd4HDG9EY8IqxUwUSd0veHlVhvgAM+PW/z4s0BJA3UJ/lQw==", + "dependencies": { + "classnames": "^2.5.1", + "element-resize-detector": "^1.2.4", + "lodash": "^4.17.21", + "memoize-one": "^6.0.0" + }, + "peerDependencies": { + "dayjs": ">=1.10.0", + "interactjs": "1.10.27", + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/react-calendar-timeline/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-canvas-js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/react-canvas-js/-/react-canvas-js-1.0.1.tgz", @@ -42223,6 +42265,11 @@ "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==" }, + "batch-processor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz", + "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==" + }, "bcryptjs": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", @@ -42903,9 +42950,9 @@ } }, "classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "clean-css": { "version": "5.3.1", @@ -45166,6 +45213,14 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, + "element-resize-detector": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.4.tgz", + "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==", + "requires": { + "batch-processor": "1.0.0" + } + }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -54530,6 +54585,11 @@ "safe-buffer": "^5.1.0" } }, + "randomcolor": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/randomcolor/-/randomcolor-0.6.2.tgz", + "integrity": "sha512-Mn6TbyYpFgwFuQ8KJKqf3bqqY9O1y37/0jgSK/61PUxV4QfIMv0+K2ioq8DfOjkBslcjwSzRfIDEXfzA9aCx7A==" + }, "randomfill": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", @@ -54717,6 +54777,24 @@ "snapsvg-cjs": "0.0.6" } }, + "react-calendar-timeline": { + "version": "0.30.0-beta.2", + "resolved": "https://registry.npmjs.org/react-calendar-timeline/-/react-calendar-timeline-0.30.0-beta.2.tgz", + "integrity": "sha512-WD+c7crXxOxbwOxg1+YOcjwNhkvjhuiCvzCKl+1Xd4HDG9EY8IqxUwUSd0veHlVhvgAM+PW/z4s0BJA3UJ/lQw==", + "requires": { + "classnames": "^2.5.1", + "element-resize-detector": "^1.2.4", + "lodash": "^4.17.21", + "memoize-one": "^6.0.0" + }, + "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-canvas-js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/react-canvas-js/-/react-canvas-js-1.0.1.tgz", diff --git a/package.json b/package.json index f1508a8..de9b293 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "powerbi-client": "^2.19.1", "powerbi-client-react": "^1.3.3", "prerender-node": "^3.5.0", + "randomcolor": "^0.6.2", "react": "^18.2.0", "react-apexcharts": "^1.4.0", "react-app-rewired": "^2.2.1", @@ -91,6 +92,7 @@ "react-big-calendar": "^1.8.4", "react-bootstrap": "^2.1.2", "react-burger-menu": "^3.0.6", + "react-calendar-timeline": "^0.30.0-beta.2", "react-canvas-js": "^1.0.1", "react-comments-section": "^2.0.10", "react-confirm-alert": "^2.8.0", diff --git a/public/sitemap.xml b/public/sitemap.xml index d4daa1a..8c34ffb 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -162,5 +162,21 @@ 1.0000 + + https://www.mysy-training.com/Display-Detail-Article/certification-qualiopi-explication-complete + 2025-01-13T15:35:41+00:00 + daily + 1.0000 + + + + + https://www.mysy-training.com/Display-Detail-Article/mysy-training-votre-partenaire-pour-la-certification-qualiopi + 2025-01-15T00:35:41+00:00 + daily + 1.0000 + + + \ No newline at end of file diff --git a/src/components/Config_Champs_Personnalise.js b/src/components/Config_Champs_Personnalise.js index 50d3c61..87b929b 100644 --- a/src/components/Config_Champs_Personnalise.js +++ b/src/components/Config_Champs_Personnalise.js @@ -41,7 +41,49 @@ import { TransitionProps } from '@mui/material/transitions'; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; import { gridClasses } from '@mui/x-data-grid'; +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; + +import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; +import { makeStyles } from "@material-ui/core/styles"; +import Paper from '@material-ui/core/Paper'; +import Draggable from 'react-draggable'; +import { IconButton } from '@material-ui/core'; + +function PaperComponent(props) { + return ( + + + + ); +} + +const useStyles = makeStyles((theme) => ({ + + dialog: { + position: 'absolute', + // left: 10, + top: 400 + }, + + paper: { + overflowY: 'unset', + }, + customizedButton: { + position: 'absolute', + left: '98%', + top: '-3%', + backgroundColor: 'lightgray', + color: 'gray', + }, +})); + + const Config_Champs_Personnalise = (props) => { + const classes = useStyles(); + const history = useHistory(); const [submenu, setsubmenu] = useState(""); const [rowss, setRows] = useState([]); @@ -318,7 +360,10 @@ const Config_Champs_Personnalise = (props) => { else { setGet_Given_Specific_Fields_api("false"); setGet_Given_Specific_Fields_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -399,7 +444,11 @@ const Config_Champs_Personnalise = (props) => { setgridline_id(""); - alert(" Le document a été correctement supprimé."); + // alert(" Le document a été correctement supprimé."); + var txt = " Le document a été correctement supprimé."; + setdisplay_alert_mysy("1"); + setalert_message(txt); + setalert_type("success"); //myRef_head.current.scrollIntoView({ behavior: "smooth" }); if (document.getElementById('myRef_head')) { var divh = document.getElementById('myRef_head').offsetTop; @@ -413,7 +462,10 @@ const Config_Champs_Personnalise = (props) => { else { setDelete_Personalise_Field_Data_api("false"); setDelete_Personalise_Field_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -452,7 +504,10 @@ const Config_Champs_Personnalise = (props) => { else { setGetall_Partner_Personalised_Fields_No_filter_api("false"); setGetall_Partner_Personalised_Fields_No_filter_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -519,7 +574,10 @@ const Config_Champs_Personnalise = (props) => { else { setGetall_Partner_Personalised_Fields_with_filter_api("false"); setGetall_Partner_Personalised_Fields_with_filter_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -554,7 +612,10 @@ const Config_Champs_Personnalise = (props) => { else { setGet_Obj_Metier_Eligible_Cham_Spe_api("false"); setGet_Obj_Metier_Eligible_Cham_Spe_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -903,13 +964,20 @@ const Config_Champs_Personnalise = (props) => { Getall_Partner_Personalised_Fields_No_filter(); Get_Given_Specific_Fields(selected_id); setgridline_id(""); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setUpdate_One_Specific_field_Data_api("false"); setUpdate_One_Specific_field_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1022,7 +1090,10 @@ const Config_Champs_Personnalise = (props) => { setdisplay_personalised_field(); setadd_one_personal_field(); setgridline_id(""); - alert(res.data.message); + /// alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); if (document.getElementById('myRef_head')) { var divh = document.getElementById('myRef_head').offsetTop; window.scrollTo({ @@ -1035,7 +1106,10 @@ const Config_Champs_Personnalise = (props) => { else { setAdd_One_Specific_field_Data_api("false"); setAdd_One_Specific_field_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1047,17 +1121,63 @@ const Config_Champs_Personnalise = (props) => { }) } + const [display_alert_mysy, setdisplay_alert_mysy] = useState(""); + const [alert_message, setalert_message] = useState(""); + const [alert_type, setalert_type] = useState(""); + + function clear_alert_message() { + setalert_message(""); + } + function clear_alert_type() { + setalert_type(""); + } + function clear_display_alert_mysy() { + setdisplay_alert_mysy(""); + } return (
+ {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} + null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" > - MySy Information + MySy Information {Dialog_1_message} @@ -1066,6 +1186,14 @@ const Config_Champs_Personnalise = (props) => { + + + diff --git a/src/components/Config_Document.js b/src/components/Config_Document.js index fbaf13b..9dcb279 100644 --- a/src/components/Config_Document.js +++ b/src/components/Config_Document.js @@ -35,7 +35,49 @@ import Checkbox from '@mui/material/Checkbox'; import Autocomplete from '@mui/material/Autocomplete'; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; + +import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; +import { makeStyles } from "@material-ui/core/styles"; +import Paper from '@material-ui/core/Paper'; +import Draggable from 'react-draggable'; +import { IconButton } from '@material-ui/core'; + +function PaperComponent(props) { + return ( + + + + ); +} + +const useStyles = makeStyles((theme) => ({ + + dialog: { + position: 'absolute', + // left: 10, + top: 400 + }, + + paper: { + overflowY: 'unset', + }, + customizedButton: { + position: 'absolute', + left: '98%', + top: '-3%', + backgroundColor: 'lightgray', + color: 'gray', + }, +})); + + const Config_Documents = (props) => { + const classes = useStyles(); + const history = useHistory(); const [submenu, setsubmenu] = useState(""); const [rowss, setRows] = useState([]); @@ -283,7 +325,12 @@ const Config_Documents = (props) => { setdisplay_detail_document(); setSelectionModel([]); - alert(" Le document a été correctement supprimé."); + // alert(" Le document a été correctement supprimé."); + var text = " Le document a été correctement supprimé."; + setdisplay_alert_mysy("1"); + setalert_message(text); + setalert_type("success"); + //myRef_head.current.scrollIntoView({ behavior: "smooth" }); if (document.getElementById('myRef_head')) { var divh = document.getElementById('myRef_head').offsetTop; @@ -297,7 +344,10 @@ const Config_Documents = (props) => { else { setDelete_Partner_Document_Data_api("false"); setDelete_Partner_Document_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -544,7 +594,10 @@ const Config_Documents = (props) => { else { setGet_Partner_Document_Data_api("false"); setGet_Partner_Document_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -583,15 +636,13 @@ const Config_Documents = (props) => { axios.post(myurl, form).then(res => { setLoading(false); if (String(res.data.status) === "true") { - console.log(" In Get_Default_Original_Partner_Document_Data res.data.status = " + res.data.status); - console.log(" In Get_Default_Original_Partner_Document_Data res.data.message r_class = " + res.data.message); + // console.log(" In Get_Default_Original_Partner_Document_Data res.data.status = " + res.data.status); + // console.log(" In Get_Default_Original_Partner_Document_Data res.data.message r_class = " + res.data.message); + - console.log(" ~~~11111"); setGet_Default_Original_Partner_Document_Data_api("true"); - console.log(" ~~~2222"); setGet_Default_Original_Partner_Document_Data_result(res.data.message); - console.log(" ~~~333"); if (res.data.message.length > 0) { console.log(" ~~~444"); var mylocal_document = JSON.parse(res.data.message); @@ -670,7 +721,10 @@ const Config_Documents = (props) => { else { setGet_Default_Original_Partner_Document_Data_api("false"); setGet_Default_Original_Partner_Document_Data_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -807,7 +861,10 @@ const Config_Documents = (props) => { else { setGet_Default_Original_Partner_Document_Data_By_id_api("false"); setGet_Default_Original_Partner_Document_Data_By_id_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -976,7 +1033,10 @@ const Config_Documents = (props) => { else { setGet_Personnalisable_Collection_and_Fields_api("false"); setGet_Personnalisable_Collection_and_Fields_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1013,7 +1073,10 @@ const Config_Documents = (props) => { else { setGet_Personnalisable_Collections_api("false"); setGet_Personnalisable_Collections_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1198,7 +1261,11 @@ const Config_Documents = (props) => { setadd_one_document(); setdisplay_add_one_document(); Getall_Partner_Document_No_filter(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + window.scrollTo({ top: 0, left: 0, @@ -1208,7 +1275,10 @@ const Config_Documents = (props) => { else { setAdd_one_Partner_Document_api("false"); setAdd_one_Partner_Document_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -1279,7 +1349,10 @@ const Config_Documents = (props) => { else { setGet_Given_Personnalisable_Collection_and_Fields_api("false"); setGet_Given_Personnalisable_Collection_and_Fields_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1344,7 +1417,11 @@ const Config_Documents = (props) => { setDuplicate_Partner_Document_result(res.data.message); Dialog_duplicate_doc_handleClose_buton(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + clear_one_detail_fields(); setadd_one_document(); setdisplay_add_one_document(); @@ -1353,7 +1430,10 @@ const Config_Documents = (props) => { else { setDuplicate_Partner_Document_api("false"); setDuplicate_Partner_Document_message(res.data.message); - alert(res.data.message); + //alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -1513,13 +1593,20 @@ const Config_Documents = (props) => { setpartner_document_data_edit_mode("0"); setpartner_document_data_changed("0"); Get_Partner_Document_Data(selected_id); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setUpdate_one_Partner_Document_api("false"); setUpdate_one_Partner_Document_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1556,7 +1643,11 @@ const Config_Documents = (props) => { else { setGetall_Partner_Document_No_filter_api("false"); setGetall_Partner_Document_No_filter_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1614,7 +1705,11 @@ const Config_Documents = (props) => { else { setGetall_Partner_Document_With_filter_api("false"); setGetall_Partner_Document_With_filter_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1656,7 +1751,11 @@ const Config_Documents = (props) => { else { setGet_Given_Personnalisable_Fields_From_template_ID_api("false"); setGet_Given_Personnalisable_Fields_From_template_ID_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -1733,7 +1832,11 @@ const Config_Documents = (props) => { else { setGet_List_Personnalisable_Default_Document_api("false"); setGet_List_Personnalisable_Default_Document_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2114,11 +2217,38 @@ const Config_Documents = (props) => { } }); + const [display_alert_mysy, setdisplay_alert_mysy] = useState(""); + const [alert_message, setalert_message] = useState(""); + const [alert_type, setalert_type] = useState(""); + + function clear_alert_message() { + setalert_message(""); + } + function clear_alert_type() { + setalert_type(""); + } + function clear_display_alert_mysy() { + setdisplay_alert_mysy(""); + } + + return (
{isLoading &&
} + {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} + + { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" > - MySy Information + MySy Information
Type Document @@ -2212,8 +2364,16 @@ const Config_Documents = (props) => { - + + + +
-
} + {p_detail_statut_is_gagne && String(p_detail_statut_is_gagne) === "1" && +
+ +
}
Titre
{ + + + +
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index dd3cfd7..3d26e39 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -10,7 +10,7 @@ import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid'; import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import { Editor } from '@tinymce/tinymce-react'; import parse from 'html-react-parser'; -import { FcViewDetails, FcDisapprove, FcInfo, FcExpired } from "react-icons/fc"; +import { FcViewDetails, FcDisapprove, FcInfo, FcExpired, FcTimeline } from "react-icons/fc"; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import add_plus from "../mysy_img/plus.png"; @@ -26,13 +26,13 @@ import "react-datepicker/dist/react-datepicker.css"; import { format } from 'date-fns' import moment from "moment"; import 'moment/locale/fr'; - +import { useCookies } from "react-cookie"; import InputAdornment from '@mui/material/InputAdornment'; import { AiFillCloseCircle, AiOutlineConsoleSql } from "react-icons/ai"; import Box from '@mui/material/Box'; import { Typography, LinearProgress } from '@mui/material'; import styled from 'styled-components'; -import { CiTrash } from "react-icons/ci"; +import { CiTrash, CiViewTimeline } from "react-icons/ci"; import { MdAddCircleOutline, MdRemoveCircleOutline } from "react-icons/md"; import Dialog from '@mui/material/Dialog'; import DialogActions from '@mui/material/DialogActions'; @@ -111,6 +111,15 @@ import { HTML5Backend } from "react-dnd-html5-backend"; import update from "immutability-helper"; import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; + +import 'moment/locale/fr'; +import Timeline, { + TimelineHeaders, + SidebarHeader, + DateHeader +} from 'react-calendar-timeline'; +import randomColor from "randomcolor"; + function PaperComponent(props) { return ( ({ const DisplayPartnerSession = (props) => { + 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'); + const classes = useStyles(); const history = useHistory(); @@ -1444,6 +1456,11 @@ const DisplayPartnerSession = (props) => { ] + /** Pour l'affichage en mode timeline */ + const [New_Getall_TrainingSession_result_Timeline_Item, setNew_Getall_TrainingSession_result_Timeline_Item] = useState([]); + const [New_Getall_TrainingSession_result_Timeline_Group, setNew_Getall_TrainingSession_result_Timeline_Group] = useState({}); + /** Fin Pour l'affichage en mode timeline */ + const [New_Getall_TrainingSession_result, setNew_Getall_TrainingSession_result] = useState(); const [Getall_TrainingSession_api, setGetall_TrainingSession_api] = useState(); @@ -1501,6 +1518,10 @@ const DisplayPartnerSession = (props) => { var new_data2 = []; + + var timeline_item = []; + var timeline_grp = []; + const new_data = res.data.message.map((x) => { //--- @@ -1514,6 +1535,7 @@ const DisplayPartnerSession = (props) => { var local_is_session_alert = JSON.parse(x).is_session_alert; var local_invoiced_statut = JSON.parse(x).invoiced_statut; var local_session_alert_message = JSON.parse(x).session_alert_message; + var local_session_class_id = JSON.parse(x).class_id; //--- @@ -1530,12 +1552,49 @@ const DisplayPartnerSession = (props) => { "is_session_alert": local_is_session_alert, "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, - - + "class_id": local_session_class_id, }; new_data2.push(node); setTaskStatus(new_data2); + /** Pour le timeline Groupe */ + var node_timeline_grp = { + 'id': local_id, + 'title': local_code_session + } + timeline_grp.push(node_timeline_grp); + + /** Pour le timeline Item */ + var node_timeline_item = { + "_id": local_id, + "id": localid, + "group": local_id, + "label": local_code_session, + "code_session": local_code_session, + "titre": local_titre, + "date_debut": local_date_debut, + "date_fin": local_date_fin, + "session_etape": local_session_etape, + "is_session_alert": local_is_session_alert, + "is_session_alert": local_is_session_alert, + "invoiced_statut": local_invoiced_statut, + "session_alert_message": local_session_alert_message, + "class_id": local_session_class_id, + "title": local_code_session + " - " + local_date_debut + " au " + local_date_fin, + "start_time": moment(local_date_debut, "DD/MM/YYYY"), + "end_time": moment(local_date_fin, "DD/MM/YYYY").add(1, 'days'), + "canMove": false, + itemProps: { + style: { + color: "black", + background: randomColor({ luminosity: "light", seed: local_code_session }) + } + } + }; + timeline_item.push(node_timeline_item); + + + }); var node = { "_id": "", @@ -1549,12 +1608,14 @@ const DisplayPartnerSession = (props) => { "is_session_alert": "", "invoiced_statut": "", "session_alert_message": "", + "class_id": "", }; new_data2.push(node); if (new_data2.length > 0) { setNew_Getall_TrainingSession_result(new_data2); - + setNew_Getall_TrainingSession_result_Timeline_Item(timeline_item); + setNew_Getall_TrainingSession_result_Timeline_Group(timeline_grp); } } @@ -1758,6 +1819,10 @@ const DisplayPartnerSession = (props) => { setRows(res.data.message); var new_data2 = []; + + var timeline_item = []; + var timeline_grp = []; + const new_data = res.data.message.map((x) => { //--- @@ -1771,6 +1836,7 @@ const DisplayPartnerSession = (props) => { var local_is_session_alert = JSON.parse(x).is_session_alert; var local_invoiced_statut = JSON.parse(x).invoiced_statut; var local_session_alert_message = JSON.parse(x).session_alert_message; + var local_session_class_id = JSON.parse(x).class_id; //--- @@ -1786,11 +1852,48 @@ const DisplayPartnerSession = (props) => { "is_session_alert": local_is_session_alert, "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, + "class_id": local_session_class_id, }; new_data2.push(node); setTaskStatus(new_data2); + /** Pour le timeline Groupe */ + var node_timeline_grp = { + 'id': local_id, + 'title': local_code_session + } + timeline_grp.push(node_timeline_grp); + + /** Pour le timeline Item */ + var node_timeline_item = { + "_id": local_id, + "id": localid, + "group": local_id, + "label": local_code_session, + "code_session": local_code_session, + "titre": local_titre, + "date_debut": local_date_debut, + "date_fin": local_date_fin, + "session_etape": local_session_etape, + "is_session_alert": local_is_session_alert, + "invoiced_statut": local_invoiced_statut, + "session_alert_message": local_session_alert_message, + "class_id": local_session_class_id, + "title": local_code_session + " - " + local_date_debut + " au " + local_date_fin, + "start_time": moment(local_date_debut, "DD/MM/YYYY"), + "end_time": moment(local_date_fin, "DD/MM/YYYY").add(1, 'days'), + "canMove": false, + itemProps: { + style: { + color: "black", + background: randomColor({ luminosity: "light", seed: local_code_session }) + } + } + }; + timeline_item.push(node_timeline_item); + + }); var node = { "_id": "", @@ -1804,12 +1907,15 @@ const DisplayPartnerSession = (props) => { "is_session_alert": "", "invoiced_statut": "", "session_alert_message": "", + "class_id": "", + }; new_data2.push(node); if (new_data2.length > 0) { setNew_Getall_TrainingSession_result(new_data2); - + setNew_Getall_TrainingSession_result_Timeline_Item(timeline_item); + setNew_Getall_TrainingSession_result_Timeline_Group(timeline_grp); } } @@ -2410,8 +2516,86 @@ const DisplayPartnerSession = (props) => { } + const [Update_Connexion_Context_api, setUpdate_Connexion_Context_api] = useState(); + const [Update_Connexion_Context_message, setUpdate_Connexion_Context_message] = useState(); + const [Update_Connexion_Context_result, setUpdate_Connexion_Context_result] = useState([]); + function Update_Connexion_Context(local_key, local_value) { + + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("partner_id", props.conntected_account_id); + + var my_key = local_key; + + var local_node = {}; + + local_node[String(my_key)] = local_value; + + var tab_node = []; + tab_node.push(local_node) + + var tab_context_json_str = JSON.stringify(tab_node); + form.append("tab_context_json", tab_context_json_str); + + + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Update_Context_Partner_Account/"; + setLoading(true); + axios.post(myurl, form).then(res => { + //console.log(" In Update_Connexion_Context res.data.status = " + res.data.status); + //console.log(" In Update_Connexion_Context res.data.message r_class = " + res.data.message); + + setLoading(false); + if (String(res.data.status) === String("true")) { + setUpdate_Connexion_Context_api("true"); + setUpdate_Connexion_Context_result(res.data.message); + + + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + + } + else { + setUpdate_Connexion_Context_api("false"); + setUpdate_Connexion_Context_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('Update_Connexion_Context : Not good man :( mysearchtext = ' + error); + setUpdate_Connexion_Context_api("false"); + alert(" Impossible de mettre à jour le contexte de connexion"); + + }) + } + + + useEffect(() => { + // Recuperation du mode d'affichage + if (stored_cookie_session_display_view) { + if (String(stored_cookie_session_display_view) === "kanban") + setsession_display_view("kanban"); + else if (String(stored_cookie_session_display_view) === "timeline") + setsession_display_view("timeline"); + else + setsession_display_view("list"); + } + else { + setsession_display_view("list"); + } + + + sethistory_securite_read(props.check_user_acces_right("historique", "read")) Get_Partner_Object_Specific_Fields_stagiaire(); Get_Partner_Object_Specific_Fields("session_formation"); @@ -2431,7 +2615,6 @@ const DisplayPartnerSession = (props) => { } - if (props.object_key && String(props.object_key).length > 2) { setLoading(true); @@ -2454,6 +2637,15 @@ const DisplayPartnerSession = (props) => { }); } + // Recuperation de mode de regroupement des données de session + if (stored_cookie_session_data_row_grouped_by) { + Getall_Parter_OR_Default_Session_Steps(); + setdata_row_grouped_by(stored_cookie_session_data_row_grouped_by); + setdata_row_grouped_field(stored_cookie_session_data_row_grouped_by); + datagrid_grouped_by(stored_cookie_session_data_row_grouped_by); + console.log(" ### stored_cookie_session_data_row_grouped_by = ", stored_cookie_session_data_row_grouped_by); + } + }, []) @@ -2695,8 +2887,6 @@ const DisplayPartnerSession = (props) => { desableSessionFields(); } - - } async function submenu_sequence_session() { @@ -11887,7 +12077,6 @@ const DisplayPartnerSession = (props) => { function datagrid_grouped_by(champ_filtre) { setdata_row_grouped_field(champ_filtre); - getTreeDataPath(rowss) } @@ -11899,14 +12088,39 @@ const DisplayPartnerSession = (props) => { const [session_display_view, setsession_display_view] = useState("list"); + const [cookie_session_display_view, setcookie_session_display_view, , removecookiesession_display_view,] = useCookies(['mysy_session_display_view,']); + function func_sesion_display_kanban_view() { setsession_display_view("kanban"); + setcookie_session_display_view("mysy_session_display_view", "kanban", { path: '/' }); + + // Mettre à jour le context de connexion, coté backoffice + Update_Connexion_Context("mysy_session_display_view", "kanban"); } function func_session_display_list_view() { setsession_display_view("list"); + setcookie_session_display_view("mysy_session_display_view", "list", { path: '/' }); + + // Mettre à jour le context de connexion, coté backoffice + Update_Connexion_Context("mysy_session_display_view", "list"); } + function func_session_display_timeline_view() { + setsession_display_view("timeline"); + setcookie_session_display_view("mysy_session_display_view", "timeline", { path: '/' }); + + // Mettre à jour le context de connexion, coté backoffice + Update_Connexion_Context("mysy_session_display_view", "timeline"); + } + + + function func_session_data_grouped_by(grouped_by) { + setdata_row_grouped_by(grouped_by); + setdata_row_grouped_field(grouped_by); + datagrid_grouped_by(grouped_by); + setcookie_session_display_view("mysy_session_data_row_grouped_by", String(grouped_by), { path: '/' }); + } // MySy Comment : design d'une tache (couleur, taille, etc) const classes_session_step = { @@ -12091,7 +12305,10 @@ const DisplayPartnerSession = (props) => { function clear_display_alert_mysy() { setdisplay_alert_mysy(""); } - + + const defaultTimeStart = moment().startOf("day").add(-3, "day").toDate(); + const defaultTimeEnd = moment().startOf("day").add(15, "day").toDate(); + return (
@@ -12106,7 +12323,7 @@ const DisplayPartnerSession = (props) => { alert_type={alert_type} clear_alert_message={clear_alert_message} clear_alert_type={clear_alert_type} - clear_display_alert_mysy = {clear_display_alert_mysy} + clear_display_alert_mysy={clear_display_alert_mysy} /> } {/*** FIN Affichage des messages d'alerte*/} @@ -12120,7 +12337,7 @@ const DisplayPartnerSession = (props) => { className="displaypartnersession" > - MySy Information + MySy Information {selected_emargement_date}
{selected_emargement_user} @@ -12155,6 +12372,14 @@ const DisplayPartnerSession = (props) => { {String(selected_session_invoiced_statut) !== "1" && String(selected_session_invoiced_statut) !== "2" &&
+ + +
@@ -12231,11 +12456,34 @@ const DisplayPartnerSession = (props) => { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information Répartition Facture pour {p_detail_invoice_split_inscrit_prenom}   {p_detail_invoice_split_inscrit_nom} @@ -12341,6 +12589,15 @@ const DisplayPartnerSession = (props) => { || String(p_detail_invoice_split_type) === "fixe") && String(p_detail_invoice_split_facture_done) !== "1" &&
+ + + +
@@ -12405,6 +12662,15 @@ const DisplayPartnerSession = (props) => { + + + +
{ {String(p_detail_invoice_split_facture_done) === "1" &&
+ + + +
@@ -12494,13 +12769,36 @@ const DisplayPartnerSession = (props) => { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information {Dialog_EVENT_SEMAINE_TYPE_message} @@ -12693,6 +12991,15 @@ const DisplayPartnerSession = (props) => { + + + +
{String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" &&
{p_detail_sequence_event_type_semaine_id && String(p_detail_sequence_event_type_semaine_id) !== "" && } @@ -12714,6 +13021,15 @@ const DisplayPartnerSession = (props) => { {p_detail_sequence_event_type_semaine_id && String(p_detail_sequence_event_type_semaine_id) !== "" && + + + +
{ null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - {Dialog_seq_CREATION_SEMAINE_TYPE_message} + {Dialog_seq_CREATION_SEMAINE_TYPE_message} {Dialog_seq_CREATION_SEMAINE_TYPE_message} @@ -12998,6 +13337,15 @@ const DisplayPartnerSession = (props) => { + + + +
@@ -13038,11 +13386,34 @@ const DisplayPartnerSession = (props) => { {/* Dialog pour gerer les LIST_HOT_EVALUATION_QUESTION */} null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information {Dialog_1_message} @@ -13079,6 +13450,15 @@ const DisplayPartnerSession = (props) => { + + + +
-
@@ -13120,11 +13499,34 @@ const DisplayPartnerSession = (props) => { {/* Dialog pour gerer les EMARGEMENT */} null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information @@ -13177,6 +13579,15 @@ const DisplayPartnerSession = (props) => { + + + +
@@ -13189,7 +13600,6 @@ const DisplayPartnerSession = (props) => {
-
@@ -13205,13 +13615,35 @@ const DisplayPartnerSession = (props) => { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - Choisir un modèle de planification + Choisir un modèle de planification {Dialog_seq_choix_model_emargement_message} @@ -13277,6 +13709,15 @@ const DisplayPartnerSession = (props) => { + + + +
@@ -13331,13 +13772,36 @@ const DisplayPartnerSession = (props) => { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information {Dialog_DIALOG_AGENDA_message} @@ -13529,6 +13993,15 @@ const DisplayPartnerSession = (props) => { + + + +
{String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" &&
{p_detail_event_id && String(p_detail_event_id) !== "" && } @@ -13549,6 +14022,15 @@ const DisplayPartnerSession = (props) => { {String(props.write_access) === "1" && String(p_detail_sequence_session_id) === "" && p_detail_event_id && String(p_detail_event_id) !== "" && + + + +
{ null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information {Dialog_1_message} @@ -13631,6 +14136,14 @@ const DisplayPartnerSession = (props) => { + + + @@ -13801,13 +14314,13 @@ const DisplayPartnerSession = (props) => {
  -
+ { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - + {String(update_sequence) !== "1" && "Ajouter une séquence"} {String(update_sequence) === "1" && "Mettre à jour une séquence"} @@ -14001,6 +14537,15 @@ const DisplayPartnerSession = (props) => { + + + +
@@ -14009,8 +14554,6 @@ const DisplayPartnerSession = (props) => {
- -
@@ -14024,13 +14567,36 @@ const DisplayPartnerSession = (props) => { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - Ajout ressource + Ajout ressource {Dialog_seq_ressource_1_message} @@ -14141,6 +14707,14 @@ const DisplayPartnerSession = (props) => { + + +
@@ -14162,13 +14736,36 @@ const DisplayPartnerSession = (props) => { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - Ajout ressource + Ajout ressource {Dialog_tuteur_1_message} @@ -14179,6 +14776,15 @@ const DisplayPartnerSession = (props) => { + + + +
@@ -14199,11 +14805,34 @@ const DisplayPartnerSession = (props) => { null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information @@ -14453,6 +15082,15 @@ const DisplayPartnerSession = (props) => { + + + +
{String(selected_convention_type) === "email" && }
- -
@@ -14488,11 +15124,34 @@ const DisplayPartnerSession = (props) => { {/* Dialog pour gerer les FACTURATION_FORMATION */} null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '7rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > - MySy Information + MySy Information
@@ -14512,6 +15171,15 @@ const DisplayPartnerSession = (props) => { + + + +
@@ -14717,7 +15385,9 @@ const DisplayPartnerSession = (props) => {
+ {/** Affichage Timeline */} + {/*** Fin affichage timeline */} {(!display_session_with_alert || display_session_with_alert !== true) &&
@@ -14730,17 +15400,20 @@ const DisplayPartnerSession = (props) => { id="filtre11" className="disabled_style" options={New_option_group_by} + value={data_row_grouped_field} onChange={(event, value) => { if (value && value.value) { - setdata_row_grouped_by(value.value); + // setdata_row_grouped_by(value.value); setdata_row_grouped_field(value.value); datagrid_grouped_by(value.value); + func_session_data_grouped_by(value.value); } else { - setdata_row_grouped_by(""); + //setdata_row_grouped_by(""); setdata_row_grouped_field(""); datagrid_grouped_by(""); + func_session_data_grouped_by(""); } }} @@ -14772,6 +15445,8 @@ const DisplayPartnerSession = (props) => {
diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index b351fbf..9d33153 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -72,6 +72,7 @@ import { import * as XLSX from 'xlsx'; +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; import { makeStyles } from "@material-ui/core/styles"; import Paper from '@material-ui/core/Paper'; @@ -678,7 +679,10 @@ const DisplayPartnerStagiaires = (props) => { setRefuse_Inscritpion_with_Motif_api("true"); setRefuse_Inscritpion_with_Motif_result(res.data.message); Getall_TrainingParticipant(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else if (String(res.data.status) === String("Err_Connexion")) { @@ -690,7 +694,10 @@ const DisplayPartnerStagiaires = (props) => { setLoading(false); setRefuse_Inscritpion_with_Motif_api("false"); setRefuse_Inscritpion_with_Motif_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -737,7 +744,10 @@ const DisplayPartnerStagiaires = (props) => { setAccept_Inscritpion_api("true"); setAccept_Inscritpion_result(res.data.message); Getall_TrainingParticipant(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else if (String(res.data.status) === String("Err_Connexion")) { @@ -749,7 +759,10 @@ const DisplayPartnerStagiaires = (props) => { setLoading(false); setAccept_Inscritpion_api("false"); setAccept_Inscritpion_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -786,7 +799,10 @@ const DisplayPartnerStagiaires = (props) => { setAccept_List_Inscritpion_api("true"); setAccept_List_Inscritpion_result(res.data.message); Getall_TrainingParticipant(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else if (String(res.data.status) === String("Err_Connexion")) { @@ -798,7 +814,10 @@ const DisplayPartnerStagiaires = (props) => { setLoading(false); setAccept_List_Inscritpion_api("false"); setAccept_List_Inscritpion_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -837,7 +856,10 @@ const DisplayPartnerStagiaires = (props) => { setRecyclage_Desactivation_result(res.data.message); setSelectionModel([]); Getall_TrainingParticipant(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else if (String(res.data.status) === String("Err_Connexion")) { @@ -849,7 +871,10 @@ const DisplayPartnerStagiaires = (props) => { setLoading(false); setRecyclage_Desactivation_api("false"); setRecyclage_Desactivation_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -915,7 +940,10 @@ const DisplayPartnerStagiaires = (props) => { else { setDeleteStagiaireData_api("false"); setDeleteStagiaireData_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -1070,7 +1098,10 @@ const DisplayPartnerStagiaires = (props) => { else { setGetall_TrainingParticipant_api("false"); setGetall_TrainingParticipant_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -2933,7 +2964,10 @@ const DisplayPartnerStagiaires = (props) => { else { setGet_List_UE_From_Class_Id_api("false"); setGet_List_UE_From_Class_Id_message(res.data.message); - alert(res.data.message); + //alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -3030,7 +3064,10 @@ const DisplayPartnerStagiaires = (props) => { else { setGetall_Class_List_Evalution_api("false"); setGetall_Class_List_Evalution_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -3658,7 +3695,10 @@ const DisplayPartnerStagiaires = (props) => { else { setGetAttendee_api("false"); setGetAttendee_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -3941,7 +3981,10 @@ const DisplayPartnerStagiaires = (props) => { clear_one_Attende_Fields(); setselected_id(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); //myRef_head.current.scrollIntoView({ behavior: "smooth" }); if (document.getElementById('myRef_head')) { @@ -3960,7 +4003,10 @@ const DisplayPartnerStagiaires = (props) => { else { setOne_Create_Participant_api("false"); setOne_Create_Participant_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -4170,7 +4216,10 @@ const DisplayPartnerStagiaires = (props) => { else { setUpdateStagiaireData_api("false"); setUpdateStagiaireData_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -4241,7 +4290,10 @@ const DisplayPartnerStagiaires = (props) => { else { setRe_Preinscrire_Cancelled_Attendee_api("false"); setRe_Preinscrire_Cancelled_Attendee_message(res.data.message); - alert(res.data.message); + //alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -5556,12 +5608,18 @@ const DisplayPartnerStagiaires = (props) => { setDelete_LIST_Stagiaires_result(res.data.message); setSelectionModel([]); Getall_TrainingParticipant(); - alert(res.data.message); + //alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_LIST_Stagiaires_api("false"); setDelete_LIST_Stagiaires_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -5626,7 +5684,10 @@ const DisplayPartnerStagiaires = (props) => { else { setGet_Partner_Object_Specific_Fields_api("false"); setGet_Partner_Object_Specific_Fields_message(res.data.message); - alert(res.data.message) + //alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -5895,13 +5956,19 @@ const DisplayPartnerStagiaires = (props) => { setAdd_Update_Stagiaire_Tuteur_result(res.data.message); Dialog_tuteur_1_handleClose_buton(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setAdd_Update_Stagiaire_Tuteur_api("false"); setAdd_Update_Stagiaire_Tuteur_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -6036,7 +6103,10 @@ const DisplayPartnerStagiaires = (props) => { else { setGet_List_Stagiaire_Conventions_Individuel_api("false"); setGet_List_Stagiaire_Conventions_Individuel_message(res.data.message); - alert(res.data.message); + //alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -6083,13 +6153,19 @@ const DisplayPartnerStagiaires = (props) => { setSend_Stagiaire_Conventions_By_Email_api("true"); setSend_Stagiaire_Conventions_By_Email_result(res.data.message); - alert(res.data.message); + //alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Dialog_convention_handleClose_buton() } else { setSend_Stagiaire_Conventions_By_Email_api("false"); setSend_Stagiaire_Conventions_By_Email_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -6270,7 +6346,10 @@ const DisplayPartnerStagiaires = (props) => { else { setGet_Stagiaire_List_Email_Com_api("false"); setGet_Stagiaire_List_Email_Com_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -6318,13 +6397,19 @@ const DisplayPartnerStagiaires = (props) => { setSend_Stagiaire_Conventions_By_Email_Masse_api("true"); setSend_Stagiaire_Conventions_By_Email_Masse_result(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Dialog_convention_handleClose_buton() } else { setSend_Stagiaire_Conventions_By_Email_Masse_api("false"); setSend_Stagiaire_Conventions_By_Email_Masse_message(res.data.message); - alert(res.data.message); + //alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -6516,15 +6601,19 @@ const DisplayPartnerStagiaires = (props) => { Get_Inscrit_List_UE(selected_id); Get_Inscrit_List_Evaluation_Par_UE(selected_id); - alert(res.data.message); - - + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setUpdate_UE_and_Evaluation_api("false"); setUpdate_UE_and_Evaluation_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -6705,12 +6794,35 @@ const DisplayPartnerStagiaires = (props) => { } // FIN EXPORT EXCEL DATAGRID + const [display_alert_mysy, setdisplay_alert_mysy] = useState(""); + const [alert_message, setalert_message] = useState(""); + const [alert_type, setalert_type] = useState(""); + function clear_alert_message() { + setalert_message(""); + } + function clear_alert_type() { + setalert_type(""); + } + function clear_display_alert_mysy() { + setdisplay_alert_mysy(""); + } return (
{isLoading &&
} + {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} + diff --git a/src/components/Module_Alert_Confirmation.js b/src/components/Module_Alert_Confirmation.js index e032efd..c2606db 100644 --- a/src/components/Module_Alert_Confirmation.js +++ b/src/components/Module_Alert_Confirmation.js @@ -1,13 +1,14 @@ import React, { useRef, useState, useEffect } from "react"; import Alert from '@mui/material/Alert'; import Stack from '@mui/material/Stack'; - + const Module_Alert_Confirmation = (props) => { const [showElement, setShowElement] = React.useState(true); useEffect(() => { const timer = setTimeout(function () { + props.clear_display_alert_mysy(); setShowElement(false) }, 4000); diff --git a/src/components/Partner.js b/src/components/Partner.js index cc0ed3c..12e5507 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -1284,7 +1284,7 @@ const Partner = (props) => { if (String(res.data.status) === String("true")) { setGetPartnerNameFromToken_api_result(true); //console.log(" In GetPartnerNameFromToken res.data.status = " + res.data.status); - // console.log(" In GetPartnerNameFromToken res.data.message = " + res.data.message); + // console.log(" In GetPartnerNameFromToken res.data.message = " + res.data.message); setparntername(JSON.parse(res.data.message).nom); setconntected_employee_email(JSON.parse(res.data.message).email); @@ -2129,7 +2129,7 @@ const Partner = (props) => { {String(menu) === "tous_mes_document" &&
- + { {String(menu) === "mes_sessions" &&
- + check_user_acces_right={check_user_acces_right} reduce={"0"} />
} @@ -3080,9 +3082,11 @@ const Partner = (props) => { {String(menu) === "mes_sessions" &&
- + check_user_acces_right={check_user_acces_right} reduce={"1"} />
} diff --git a/src/components/TestUrl_new.js b/src/components/TestUrl_new.js index 5a74a7b..6a26e74 100644 --- a/src/components/TestUrl_new.js +++ b/src/components/TestUrl_new.js @@ -70,7 +70,7 @@ import SignatureCanvas from 'react-signature-canvas'; import BuildIcon from '@mui/icons-material/Build'; import PersonIcon from '@mui/icons-material/Person'; - +import randomColor from "randomcolor"; import Box from '@mui/material/Box'; import { DataGrid, frFR, GridToolbar, GridToolbarContainer, GridToolbarExport, GridToolbarColumnsButton, @@ -90,6 +90,16 @@ import useSound from 'use-sound'; import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; +import 'moment/locale/fr'; + +import Timeline, { + TimelineHeaders, + SidebarHeader, + DateHeader +} from 'react-calendar-timeline'; + + + const useStyles = makeStyles((theme) => ({ paper: { overflowY: 'unset', @@ -128,10 +138,9 @@ const localizer = dateFnsLocalizer({ }) - const TestUrl_New = (props) => { - + // DEBUT EXPORT EXCEL DATAGRID @@ -1200,23 +1209,239 @@ const TestUrl_New = (props) => { const [display_alert_mysy, setdisplay_alert_mysy] = useState("1"); - /* -const [tempo, settempo] = useState("."); - setInterval(check, 2000); + const groups = [{ id: 1, title: 'group 1' }, { id: 2, title: 'group 2' }] + + const items = [ + { + id: 1, + group: 1, + title: 'item 1', + start_time: moment(), + end_time: moment().add(1, 'hour') + }, + { + id: 2, + group: 2, + title: 'item 2', + start_time: moment().add(-0.5, 'hour'), + end_time: moment().add(0.5, 'hour') + }, + { + id: 3, + group: 1, + title: 'item 3', + start_time: moment().add(2, 'hour'), + end_time: moment().add(3, 'hour') + } + ] + + const groups22 = [ + { id: "676afefbbe666367d11e53cc", title: 'IFOD_22_Sess_AOUT_DEV_2412' }, + { id: "6707909797308f17f8a74e5a", title: 'tetet' }, + { id: "66e561baf6d6f0c1ee9620d3", title: 'sess_test' }, + { id: "66cdeb5d7e8061b7b6f9b068", title: 'IFOD_44_Sess_RESA_DEV' }, + { id: "66cdeb5d7e8061b7b6f9b066", title: 'IFOD_44_Sess_JUIN_DEV' }, + + ] + + const items22 = [ + { + "_id": "676afefbbe666367d11e53cc", + "group": "676afefbbe666367d11e53cc", + "id": "0", + "label": "IFOD_22_Sess_AOUT_DEV_2412", + "code_session": "IFOD_22_Sess_AOUT_DEV_2412", + "titre": "Session Juinje", + "date_debut": "12/01/2025", + "date_fin": "17/01/2025", + "session_etape": "Planification", + "is_session_alert": "0", + "invoiced_statut": "0", + "session_alert_message": "OK", + "title": "IFOD_22_Sess_AOUT_DEV_2412", + "start_time": moment().add(-2, 'day'), + "end_time": moment().add(1, 'day'), + "canMove": false, + itemProps: { + style: { + color: "black", + background: randomColor({ luminosity: "light", seed: "IFOD_22_Sess_AOUT_DEV_2412" }) + }, + onDoubleClick: () => { console.log('You clicked double 0111!') } + } + }, + { + "_id": "6707909797308f17f8a74e5a", + "group": "6707909797308f17f8a74e5a", + "id": "1", + "label": "tetet", + "code_session": "tetet", + "titre": "ezrezdddd", + "date_debut": "13/10/2024", + "date_fin": "15/10/2024", + "session_etape": "Projet", + "is_session_alert": "0", + "invoiced_statut": "0", + "session_alert_message": "OK", + "title": "tetet", + "start_time": moment().add(2, 'day'), + "end_time": moment().add(3, 'day'), + "canMove": false, + itemProps: { + style: { + color: "black", + background: randomColor({ luminosity: "light", seed: "tetet" }) + }, + onDoubleClick: () => { console.log('You clicked double 0 2222!') } + } + }, + { + "_id": "66e561baf6d6f0c1ee9620d3", + "group": "66e561baf6d6f0c1ee9620d3", + "id": "2", + "label": "sess_test", + "code_session": "sess_test", + "titre": "Session Juin", + "date_debut": "22/09/2024", + "date_fin": "26/09/2024", + "session_etape": "Planifiée", + "is_session_alert": "0", + "invoiced_statut": "0", + "session_alert_message": "OK", + "title": "sess_test", + "start_time": moment().add(5, 'day'), + "end_time": moment().add(10, 'day'), + "canMove": false, + itemProps: { + style: { + color: "black", + background: randomColor({ luminosity: "light", seed: "sess_test" }) + } + } + }, + { + "_id": "66cdeb5d7e8061b7b6f9b068", + "group": "66cdeb5d7e8061b7b6f9b068", + "id": "3", + "label": "IFOD_44_Sess_RESA_DEV", + "code_session": "IFOD_44_Sess_RESA_DEV", + "titre": "Session Reservation", + "date_debut": "24/06/2024", + "date_fin": "27/06/2024", + "session_etape": "2", + "is_session_alert": "0", + "invoiced_statut": "0", + "session_alert_message": "OK", + "title": "IFOD_44_Sess_RESA_DEV", + "start_time": moment("18/01/2025", "DD/MM/YYYY"), + "end_time": moment("22/01/2025", "DD/MM/YYYY").add(1, 'days'), + "canMove": false, + itemProps: { + style: { + color: "black", + background: randomColor({ luminosity: "light", seed: "IFOD_44_Sess_RESA_DEV" }) + } + } + }, + { + "_id": "66cdeb5d7e8061b7b6f9b066", + "group": "66cdeb5d7e8061b7b6f9b066", + "id": "4", + "label": "IFOD_44_Sess_JUIN_DEV", + "code_session": "IFOD_44_Sess_JUIN_DEV", + "titre": "Session Juin", + "date_debut": "22/01/2025", + "date_fin": "26/01/2025", + "session_etape": "2", + "is_session_alert": "1", + "invoiced_statut": "0", + "session_alert_message": "
CONVENTION_STAGIAIRE_ENTREPRISE Non Commencé
CONVOCATION_STAGIAIRE Non Commencé
QUESTION_POSITIONNEMENT Non Commencé" + }, + + ] + + console.log(" ### items22 == ", items22); + + const defaultTimeStart = moment().startOf("day").add(-3, "day").toDate(); + const defaultTimeEnd = moment().startOf("day").add(10, "day").toDate(); + + const func_handleItemMove = (itemId, dragTime, newGroupOrder) => { + + console.log(" ## dans fonction func_handleItemMove"); + console.log(" ## itemId = ", itemId); + console.log(" ## dragTime = ", dragTime); + console.log(" ## newGroupOrder = ", newGroupOrder); + + const local_group = groups22[newGroupOrder]; + console.log(" ## local_group = ", local_group); + + var local_item = items22.filter((data) => data._id === String((local_group.id))); + + console.log(" ## local_item = ", local_item); + + var new_date = new Date(dragTime); + console.log(" ### PREVIOUS DATA") + console.log(" ## OLD_date start = ", local_item[0].start_time); + console.log(" ## OLD_date END = ", local_item[0].end_time); - window.setTimeout(function() { - window.location.href = process.env.REACT_APP_BASE_URL - }, 7000); - - function check() { - var val = tempo+" ."; - //alert(" val = "+val); - settempo(val); - }*/ + console.log(" ## new_date start = ", new_date); + + + var tmpe = dragTime + (local_item[0].end_time - local_item[0].start_time); + + + + var new_end_date_v2 = new Date(dragTime + (local_item[0].end_time - local_item[0].start_time)); + console.log(" ## new_END_date= ", new_end_date_v2); + + /* + const diffTime = Math.abs(local_item[0].end_time - local_item[0].start_time); + const diffminute = Math.abs(local_item[0].end_time - local_item[0].start_time) / 60000; + + const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24)); + console.log(diffTime + " milliseconds"); + console.log(diffminute + " minute"); + console.log(diffDays + " days"); + + var newDateObj = moment(new_date).add(diffminute, 'm').toDate(); + + console.log(newDateObj + " newDateObj"); + */ + + }; + + const func_handleItemResize = (itemId, time, edge) => { + + console.log(" ## dans fonction func_handleItemResize"); + console.log(" ## itemId = ", itemId); + console.log(" ## time = ", time); + console.log(" ## edge = ", edge); + + }; + + const func_handleItemDrag = (eventType, itemId, time, edge, newGroupOrder) => { + + console.log(" ## dans fonction func_handleItemDrag"); + console.log(" ## eventType = ", eventType); + console.log(" ## itemId = ", itemId); + console.log(" ## time = ", time); + console.log(" ## edge = ", edge); + console.log(" ## newGroupOrder = ", newGroupOrder); + + }; + + const func_handleItemClick = (itemId, _, time) => { + console.log("Clicked: " + itemId, moment(time).format()); + }; + + const func_handleItemDoubleClick = (itemId, _, time) => { + console.log("Double Click: " + itemId, moment(time).format()); + }; + return (
@@ -1319,6 +1544,51 @@ const [tempo, settempo] = useState(".");

Page de test * testurl_new

parametres courseid = {courseid}, tabid = {tabid}
+ Affichage Timeline
+
+ Rendered by react! + { + console.log(" ## cherif ItemId = ", ItemId); + console.log(" ## cherif items = ", items22[ItemId]); + console.log(" ## cherif items._id = ", items22[ItemId]._id) + }} + onItemMove={func_handleItemMove} + // onItemResize={func_handleItemResize} + // onItemDrag={func_handleItemDrag} + > + + + {({ getRootProps }) => { + return
Date/
Code Session
+ }} +
+ + +
+
+ +
, + + + +
Datagrid Grouping
diff --git a/src/styles/components/_displaypartnersession.scss b/src/styles/components/_displaypartnersession.scss index 6ee92b2..f09ee5f 100644 --- a/src/styles/components/_displaypartnersession.scss +++ b/src/styles/components/_displaypartnersession.scss @@ -2711,7 +2711,7 @@ top: -13px; } - + .img_class_logo_mini { display: block;