diff --git a/src/components/Jurys.js b/src/components/Jurys.js index c717a3f..70b78b9 100644 --- a/src/components/Jurys.js +++ b/src/components/Jurys.js @@ -9,7 +9,8 @@ import { useHistory } from "react-router-dom"; import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid'; import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import TextareaAutosize from '@mui/material/TextareaAutosize'; - +import MoreVertIcon from '@mui/icons-material/MoreVert'; +import Menu from '@mui/material/Menu'; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' @@ -524,6 +525,115 @@ const Jury = (props) => { } }, + { + field: 'gestion', headerName: 'Gestion', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", + renderCell: (cellValues) => { + return ( +
+ +
+ ); + }, + }, + + + { field: 'event_comment', headerName: 'Comment', flex: 1, hide: true, editable: false, }, ] @@ -600,6 +710,35 @@ const Jury = (props) => { ] + const [working_cellValues, setworking_cellValues] = useState(false); + + const [dialogOpen_supp, setdialogOpen_supp] = useState(false); + const Dialog_menuitem_close_supp = () => { + setdialogOpen_supp(false) + }; + + + const options_menu_vertical = [ + 'Apprenants', + 'Supprimer', + 'Jury Edit', + ]; + + + const ITEM_HEIGHT = 48; + + + const [anchorEl, setAnchorEl] = React.useState(null); + const open = Boolean(anchorEl); + const handleClick_option_button_vertical = (event) => { + setAnchorEl(event.currentTarget); + }; + const handleClose_option_button_vertical = (event, value) => { + setAnchorEl(null); + }; + + + const [selectionModel_jury_seance_participants, setselectionModel_jury_seance_participants] = React.useState([]); const [selectionModel_columns_jury_seance, setselectionModel_columns_jury_seance] = React.useState([]); @@ -1558,6 +1697,7 @@ const Jury = (props) => { form.append("token", stored_cookie); form.append("jury_id", selected_id); + form.append("jury_soutenance_id", selected_jury_soutenance_id); form.append("agenda_id", selected_agenda_id); form.append("sujet", p_detail_soutenance_sujet); form.append("note", p_detail_soutenance_note); @@ -2592,7 +2732,7 @@ const Jury = (props) => { const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); - form.append("equipe_id", selected_id); + form.append("jury_id", selected_id); form.append("tab_ids", local_tab_ids); @@ -4033,6 +4173,18 @@ const Jury = (props) => { + const [Dialog_JURY_INFO_open, setDialog_JURY_INFO_open] = React.useState(false); + + const Dialog_JURY_INFO_handleClose_buton = () => { + setDialog_JURY_INFO_open(false); + }; + + const [p_detail_jury_observation, setp_detail_jury_observation] = useState(""); + const [p_detail_jury_note, setp_detail_jury_note] = useState(""); + const [p_detail_jury_validation, setp_detail_jury_validation] = useState(""); + const [selected_inscription_id_for_jury, setselected_inscription_id_for_jury] = useState(""); + + return (
{isLoading &&
@@ -4051,6 +4203,145 @@ const Jury = (props) => { {/*** FIN Affichage des messages d'alerte*/} + {/* Dialog pour gerer les JURY_INFO */} + 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" + + > + + Délibération du Jury + + + {Dialog_1_message} + + +
Observation
+ + { + setp_detail_jury_observation(e.target.value); + + }} + + /> + +
+ +
Note
+ + { + setp_detail_jury_note(e.target.value); + }} + + /> + +
+ +
Validation
+ + { + setp_detail_jury_validation(e.target.value); + }} + + /> + +
+ + + +
+ + + + + + + +
+
+ + +
+ + +
+ +
+
+ +
+ +
+ {/* FIN Dialog pour gerer les JURY_INFO */} + {/* Dialog pour gerer les CONVOCATION_JURY_MEMBRE */} @@ -4881,6 +5172,7 @@ const Jury = (props) => { { setselectionModel_jury_seance_participants(newSelectionModel); /*if (newSelectionModel.length === 1) @@ -4914,7 +5206,7 @@ const Jury = (props) => { }} rowsPerPageOptions={[10]} - disableSelectionOnClick + components={{ Toolbar: GridToolbar, }} @@ -5756,6 +6048,7 @@ const Jury = (props) => { > { }} rowsPerPageOptions={[10]} - disableSelectionOnClick - /* components={{ - Toolbar: GridToolbar, - }}*/ - //sx={datagridSx} + getCellClassName={(params) => { @@ -6707,6 +6996,7 @@ const Jury = (props) => { componentsProps={{ toolbar: { data_colums: columns_jury_membre } }} checkboxSelection + disableSelectionOnClick onSelectionModelChange={(newSelectionModel) => { setselectionModel_columns_jury_membre(newSelectionModel); /*if (newSelectionModel.length === 1) @@ -6751,11 +7041,8 @@ const Jury = (props) => { }} rowsPerPageOptions={[10]} - disableSelectionOnClick - /* components={{ - Toolbar: GridToolbar, - }}*/ - //sx={datagridSx} + + getCellClassName={(params) => { // Traitement de la cellule 'notes' @@ -7165,6 +7452,7 @@ const Jury = (props) => { > { setselectionModel_columns_jury_seance(newSelectionModel); @@ -7194,7 +7482,6 @@ const Jury = (props) => { jury_session_id: (item).jury_session_id, convocation_apprenant_send: (item).convocation_apprenant_send, convocation_apprenant_date_sending: (item).convocation_apprenant_date_sending, - } ))} @@ -7205,10 +7492,7 @@ const Jury = (props) => { onRowDoubleClick={(newSelectionModel) => { setselected_agenda_id(newSelectionModel.row._id); - - setselected_jury_soutenance_id(newSelectionModel.row.jury_soutenance_id); - setp_detail_linked_collection_recid(newSelectionModel.row.jury_session_id); setsubmenu_detail_seance("display_jury_seance"); GetCurrentSession(newSelectionModel.row.jury_session_id);