From 2de6c2e331bf292dc91617727f1c6d1a5c0c56d8 Mon Sep 17 00:00:00 2001 From: cherif Date: Fri, 9 Aug 2024 13:17:13 +0200 Subject: [PATCH] ss --- src/components/Groupe_Apprenant.js | 202 +++++++++++++----- src/components/TestUrl_new.js | 133 +++++++++--- .../components/_displaypartnersession.scss | 62 +++--- 3 files changed, 286 insertions(+), 111 deletions(-) diff --git a/src/components/Groupe_Apprenant.js b/src/components/Groupe_Apprenant.js index 4ee7ec0..d2f6cfd 100644 --- a/src/components/Groupe_Apprenant.js +++ b/src/components/Groupe_Apprenant.js @@ -60,7 +60,36 @@ import Module_Selection_Apprenants from "./Module_Selection_Apprenants"; import { FcAlarmClock, FcMultipleSmartphones, FcWorkflow } from "react-icons/fc"; +import { makeStyles } from "@material-ui/core/styles"; +import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; +import { IconButton } from '@material-ui/core'; +import Paper from '@material-ui/core/Paper'; +import Draggable from 'react-draggable'; + +const useStyles = makeStyles((theme) => ({ + + dialog: { + position: 'fixed', + // left: 10, + top: 400 + }, + + paper: { + overflowY: 'unset', + }, + customizedButton: { + position: 'absolute', + left: '95%', + top: '-9%', + backgroundColor: 'lightgray', + color: 'gray', + }, +})); + + const Groupe_Apprenant = (props) => { + + const classes = useStyles(); const history = useHistory(); const [submenu, setsubmenu] = useState(""); const [rowss, setRows] = useState([]); @@ -71,6 +100,8 @@ const Groupe_Apprenant = (props) => { date_today_90j.setDate(date_today_90j.getDate() + 90); + + const [p_filtre1, setp_filtre1] = useState(""); const [p_filtre1_value, setp_filtre1_value] = useState(""); @@ -939,7 +970,7 @@ const Groupe_Apprenant = (props) => { } if (file_1_name && file_1_name.name) { - console.log(" ### Traitement de : ", file_1_name.name); + //console.log(" ### Traitement de : ", file_1_name.name); const formData = new FormData(); formData.append('File', file_1_name); @@ -1867,14 +1898,12 @@ const Groupe_Apprenant = (props) => { alert(res.data.message); - if (document.getElementById('myRef')) { - // myRef.current.scrollIntoView({ behavior: "smooth" }); - var divh = document.getElementById('myRef').offsetTop; - window.scrollTo({ - top: divh, - behavior: "smooth", - }); - } + + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + } else { @@ -1908,10 +1937,14 @@ const Groupe_Apprenant = (props) => { form.append("split_type", p_detail_split_type_auto); form.append("class_id", p_detail_class_id_auto); form.append("session_id", p_detail_session_id_auto); + form.append("type_groupe_code", p_detail_type_groupe_code_auto); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Automatic_Split_Member_Inscrit_To_Grps/"; + + + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Automatic_Split_Membre_No_Grp_Creation res.data.status = " + res.data.status); @@ -1928,20 +1961,17 @@ const Groupe_Apprenant = (props) => { setgrp_apprenant_data_edit_mode(""); setSelectionModel([]); clear_DetailFieds(); - // Dialog_GRP_AUTOMATIC_handleClose_buton(); + Dialog_GRP_AUTOMATIC_handleClose_buton(); Getall_Partner_Groupe_Inscrit(); alert(res.data.message); - if (document.getElementById('myRef')) { - // myRef.current.scrollIntoView({ behavior: "smooth" }); - var divh = document.getElementById('myRef').offsetTop; - window.scrollTo({ - top: divh, - behavior: "smooth", - }); - } + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + } else { @@ -2076,6 +2106,10 @@ const Groupe_Apprenant = (props) => { setsubmenu_grp_dialog("update"); } + const handleClose = () => { + //setOpen(false); + }; + return (
{isLoading &&
@@ -2092,6 +2126,23 @@ const Groupe_Apprenant = (props) => { static onClose={() => null} + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + //top: '5rem' + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + > Création automatique des groupes @@ -2180,6 +2231,43 @@ const Groupe_Apprenant = (props) => {
+
Type de Groupe
+ {New_Getall_Groupe_Apprenant_Type_result && New_Getall_Groupe_Apprenant_Type_result.length > 0 && + + (data).code === String(p_detail_type_groupe_code_auto))[0].label} + + onChange={(event, value) => { + if (value && value.code) { + + setp_detail_type_groupe_code_auto(value.code); + setgrp_apprenant_data_changed("1"); + } else { + + setp_detail_type_groupe_code_auto(""); + setgrp_apprenant_data_changed("1"); + } + + }} + + renderInput={(params) => + } + /> + + } + + +
+ +
Grouper les inscrits par {
- -
Type de Groupe
- {New_Getall_Groupe_Apprenant_Type_result && New_Getall_Groupe_Apprenant_Type_result.length > 0 && - - (data).code === String(p_detail_type_groupe_code_auto))[0].label} - - onChange={(event, value) => { - if (value && value.code) { - - setp_detail_type_groupe_code_auto(value.code); - setgrp_apprenant_data_changed("1"); - } else { - - setp_detail_type_groupe_code_auto(""); - setgrp_apprenant_data_changed("1"); - } - - }} - - renderInput={(params) => - } - /> - - } - - -
-
Racine {
-   + +
- + +
@@ -2314,10 +2367,37 @@ const Groupe_Apprenant = (props) => {
+ + +
+ + + } + {String(submenu_grp_dialog) !== "create" && + + + + + + } + + + + @@ -2843,14 +2923,20 @@ const Groupe_Apprenant = (props) => {
-
+
diff --git a/src/components/TestUrl_new.js b/src/components/TestUrl_new.js index 8338769..c41e00b 100644 --- a/src/components/TestUrl_new.js +++ b/src/components/TestUrl_new.js @@ -40,6 +40,12 @@ import Module_Editique from "./Module_Editique"; import Module_Attestation_Formation from "./Module_Attestation_Formation"; import Module_Email_Management from "./Module_Email_Management"; +import Paper from '@material-ui/core/Paper'; + +import { makeStyles } from '@material-ui/core/styles'; + +import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; +import { IconButton } from '@material-ui/core'; import ReactDOM from 'react-dom'; import Draggable from 'react-draggable'; @@ -47,6 +53,32 @@ import Draggable from 'react-draggable'; import SignatureCanvas from 'react-signature-canvas'; + +const useStyles = makeStyles((theme) => ({ + paper: { + overflowY: 'unset', + }, + customizedButton: { + position: 'absolute', + left: '95%', + top: '-9%', + backgroundColor: 'lightgray', + color: 'gray', + }, +})); + +function PaperComponent(props) { + return ( + + + + ); +} + + const locales = { 'en-US': enUS, } @@ -611,7 +643,16 @@ const TestUrl_New = (props) => { } + const classes = useStyles(); + const [open1, setOpen1] = React.useState(false); + const handleClickOpen1 = () => { + setOpen1(true); + }; + + const handleClose1 = () => { + setOpen1(false); + }; return (
@@ -655,16 +696,25 @@ const TestUrl_New = (props) => { { /********* Dialog email */} null} - onClose={Dialog_1_handleClose} + //onClose={Dialog_1_handleClose} className="module_email_management" PaperProps={{ sx: { width: "100%", maxWidth: "920px!important", }, + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '5rem' + }, }} open={Dialog_1_open} + hideBackdrop={true} + disableScrollLock > @@ -674,25 +724,24 @@ const TestUrl_New = (props) => { - + - {/* -
-
- + + + + -
-
- -
-
- -
*/} +
{ /********* Fin Dialog email */} @@ -703,21 +752,49 @@ const TestUrl_New = (props) => {

Page de test * testurl_new

parametres courseid = {courseid}, tabid = {tabid}
-

Signature padd

- - - -
- image signé : - +
+ + FIN Signature padd + PaperProps={{ + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + }, + }} + + > + + Subscribe + + + + To subscribe to this website, please enter your email address here. + We will send updates occasionally. + + + + + + + + + +
I can now be moved around!
@@ -735,7 +812,7 @@ const TestUrl_New = (props) => { }}>Envoie email - + zzz
diff --git a/src/styles/components/_displaypartnersession.scss b/src/styles/components/_displaypartnersession.scss index 8e99455..6cc53d7 100644 --- a/src/styles/components/_displaypartnersession.scss +++ b/src/styles/components/_displaypartnersession.scss @@ -3,10 +3,10 @@ .tooltip_css { background: #81BC3A; z-index: 9999; - } - - - .css-1bp1ao6{ + } + + + .css-1bp1ao6 { height: 3.5rem !important; } @@ -23,7 +23,7 @@ top: 0px; opacity: 80%; left: 0px; - } + } .spinner { width: 20rem; @@ -938,7 +938,7 @@ height: 2rem !important; } - + .bton_import_excel { background: #c8cfd5; @@ -1456,7 +1456,7 @@ margin-right: 1rem; padding: 0.3rem; margin-bottom: 0.5rem; - // width: 11rem; + // width: 11rem; text-align: center; border: 1px solid #9cf; color: #3b3e40; @@ -1616,10 +1616,11 @@ width: 40%; height: 2rem !important; } + .bton_add_session_create_automatic { background: #c8cfd5; color: black; - width:60% !important; + width: 60% !important; height: 2rem !important; } @@ -2247,7 +2248,7 @@ } - .bton_traiter_en_mass:hover{ + .bton_traiter_en_mass:hover { border-radius: 5px; font-size: small; padding: 0.3rem; @@ -2258,8 +2259,8 @@ color: white !important; } - - + + .bton_fermer { border-radius: 5px; @@ -2648,7 +2649,7 @@ top: -13px; } - + .img_class_logo_mini { display: block; @@ -2669,25 +2670,25 @@ width: 900px !important; max-width: none !important; } - - .planification_Dialog_DatePicker_row{ + + .planification_Dialog_DatePicker_row { float: left; width: 100%; } - .planification_Dialog_DatePicker{ + .planification_Dialog_DatePicker { background-color: #FFFFFF; width: 50% !important; float: left; } - + } // end media - + .DialogContent_width_for_week_model { width: 900px !important; max-width: none !important; @@ -2697,7 +2698,7 @@ width: 80% !important; } - .disabled_style_with_visualiser_icone{ + .disabled_style_with_visualiser_icone { float: left; text-align: center; width: 100%; @@ -2705,20 +2706,20 @@ padding-top: 10px; } - .disabled_style_left_text_with_visualiser_icone{ + .disabled_style_left_text_with_visualiser_icone { width: 80% !important; float: left; } - .disabled_style_right_bton_visualiser{ + .disabled_style_right_bton_visualiser { width: 9% !important; float: left; cursor: pointer; } - - .css-md26zr-MuiInputBase-root-MuiOutlinedInput-root{ + + .css-md26zr-MuiInputBase-root-MuiOutlinedInput-root { height: 3rem !important; } @@ -2789,16 +2790,27 @@ .MuiMenu-paper { max-width: 30% !important; - + } - - .MuiPaper-root{ + + .MuiPaper-root { border-radius: 10px !important; background: #FFFFFF !important; max-width: none !important; } + .MuiModal-root { + position: absolute !important; + } + + .css-zw3mfo-MuiModal-root-MuiDialog-root { + position: absolute !important; + } +} + +.MuiModal-root { + position: absolute !important; } .MuiMenu-paper {