diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js
index 442224b..eb23e80 100644
--- a/src/components/Apprenant.js
+++ b/src/components/Apprenant.js
@@ -62,11 +62,50 @@ import {
GridPreferencePanelsValue,
} from '@mui/x-data-grid';
- import * as XLSX from 'xlsx';
- import Module_Alert_Confirmation from "./Module_Alert_Confirmation";
-
+import * as XLSX from 'xlsx';
+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 Apprenant = (props) => {
+ const classes = useStyles();
+
const history = useHistory();
const [submenu, setsubmenu] = useState("");
@@ -127,8 +166,8 @@ const Apprenant = (props) => {
const columns = [
- { field: 'id', headerName: 'id', hide: true , disableExport: true,},
- { field: '_id', headerName: '_id', hide: true , disableExport: true,},
+ { field: 'id', headerName: 'id', hide: true, disableExport: true, },
+ { field: '_id', headerName: '_id', hide: true, disableExport: true, },
{
field: 'civilite', headerName: 'Civ.', minWidth: 100, flex: 1, maxWidth: 100, hide: false, editable: false, editable: false,
@@ -540,12 +579,18 @@ const Apprenant = (props) => {
Get_Appenant_List_Suivi_Pedagogique(selected_apprenant_id);
- alert(res.data.message);
+ // alert(res.data.message);
+ setdisplay_alert_mysy("1");
+ setalert_message(res.data.message);
+ setalert_type("success");
}
else {
setDelete_Suivi_Pedago_Data_api("false");
setDelete_Suivi_Pedago_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");
}
@@ -934,7 +979,11 @@ const Apprenant = (props) => {
setLoading(false);
setGet_Current_Apprenant_Data_api("false");
setGet_Current_Apprenant_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) => {
@@ -959,7 +1008,7 @@ const 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);
@@ -1800,8 +1849,10 @@ const Apprenant = (props) => {
Disable_Detail_Apprenant_Fields();
- 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;
@@ -1816,7 +1867,10 @@ const Apprenant = (props) => {
setUpdate_Apprenant_Data_api("false");
setUpdate_Apprenant_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) => {
@@ -2108,7 +2162,10 @@ const Apprenant = (props) => {
else {
setGet_Partner_Object_Specific_Fields_apprenant_api("false");
setGet_Partner_Object_Specific_Fields_apprenant_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) => {
@@ -2187,7 +2244,10 @@ const Apprenant = (props) => {
else {
setGetall_Training_Employee_No_Filter_api("false");
setGetall_Training_Employee_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) => {
@@ -2228,7 +2288,10 @@ const Apprenant = (props) => {
else {
setGetall_Training_Materiel_No_Filter_api("false");
setGetall_Training_Materiel_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) => {
@@ -2591,9 +2654,6 @@ const Apprenant = (props) => {
setAdd_Update_Suiv_Pedagogique_result(res.data.message);
Dialog_Suivi_Pedago_handleClose_buton();
-
-
-
setgiven_suivi_ped_changed("");
setgiven_suivi_ped_data_edit_mode("");
setadd_one_suivi_ped("");
@@ -2611,7 +2671,10 @@ const Apprenant = (props) => {
Get_Appenant_List_Suivi_Pedagogique(selected_apprenant_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')) {
// myRef.current.scrollIntoView({ behavior: "smooth" });
@@ -2626,7 +2689,10 @@ const Apprenant = (props) => {
else {
setAdd_Update_Suiv_Pedagogique_api("false");
setAdd_Update_Suiv_Pedagogique_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) => {
@@ -2783,7 +2849,10 @@ const Apprenant = (props) => {
else {
setGetall_Partner_Class_Reduice_Fields_api("false");
setGetall_Partner_Class_Reduice_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) => {
@@ -3764,7 +3833,11 @@ const Apprenant = (props) => {
setapprenant_data_edit_mode("");
setadd_One_Apprenant("0");
- 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({
@@ -3834,7 +3907,10 @@ const Apprenant = (props) => {
setp_dialog_type_apprenant('');
setp_dialog_financement('');
- 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({
@@ -3895,7 +3971,10 @@ const Apprenant = (props) => {
top: 0,
behavior: "smooth",
});
- alert(res.data.message);
+ // alert(res.data.message);
+ setdisplay_alert_mysy("1");
+ setalert_message(res.data.message);
+ setalert_type("success");
}
else {
setDelete_Apprenant_Data_api("false");
@@ -3955,7 +4034,10 @@ const Apprenant = (props) => {
Get_All_Apprenant();
- alert(res.data.message);
+ // alert(res.data.message);
+ setdisplay_alert_mysy("1");
+ setalert_message(res.data.message);
+ setalert_type("success");
}
else {
setDelete_LIST_Apprenant_api("false");
@@ -4014,7 +4096,10 @@ const Apprenant = (props) => {
setp_dialog_financement('');
setSelectionModel([]);
- 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({
@@ -4376,7 +4461,10 @@ const Apprenant = (props) => {
setAdd_Update_Apprenant_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 {
@@ -4834,116 +4922,130 @@ const Apprenant = (props) => {
}
-
-// DEBUT EXPORT EXCEL DATAGRID
-function CustomToolbar(props) {
+ // DEBUT EXPORT EXCEL DATAGRID
+
+ function CustomToolbar(props) {
- return (
-
+ return (
+
-
-
-
-
-
+
+
+
+
+
-
- );
-}
+
+ );
+ }
-function getExcelData(apiRef) {
- // Select rows and columns
- const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef);
- const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef);
+ function getExcelData(apiRef) {
+ // Select rows and columns
+ const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef);
+ const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef);
- // Format the data. Here we only keep the value
- const data = filteredSortedRowIds.map((id) => {
- const row = {};
- visibleColumnsField.forEach((field) => {
- row[field] = apiRef.current.getCellParams(id, field).value;
+ // Format the data. Here we only keep the value
+ const data = filteredSortedRowIds.map((id) => {
+ const row = {};
+ visibleColumnsField.forEach((field) => {
+ row[field] = apiRef.current.getCellParams(id, field).value;
+ });
+ return row;
});
- return row;
- });
- return data;
-}
+ return data;
+ }
-function ExportButton(props) {
- return (
-
-
-
- );
-}
+ function ExportButton(props) {
+ return (
+
+
+
+ );
+ }
-function handleExport(apiRef, data_colums) {
- const data = getExcelData(apiRef);
- const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef);
-
+ function handleExport(apiRef, data_colums) {
+ const data = getExcelData(apiRef);
+ const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef);
- const local_config = {
- keys: visibleColumnsField,
- columnNames: data_colums.filter((mydata) => (mydata).disableExport !== true).map(function (mydata) {
- if (mydata.headerName && visibleColumnsField.includes(mydata.field)) {
- if (mydata.headerName) {
- return mydata.headerName;
+ const local_config = {
+ keys: visibleColumnsField,
+
+ columnNames: data_colums.filter((mydata) => (mydata).disableExport !== true).map(function (mydata) {
+ if (mydata.headerName && visibleColumnsField.includes(mydata.field)) {
+ if (mydata.headerName) {
+ return mydata.headerName;
+ }
}
+
+ }),
+
+ fileName: 'data_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_") + '.xlsx',
+ sheetName: 'Export_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_"),
+ };
+
+ local_config.columnNames = local_config.columnNames.filter(function (element) {
+ return element !== undefined;
+ });
+
+
+ const rows = data.map((row) => {
+ const mRow = {};
+ for (const key of local_config.keys) {
+ mRow[key] = row[key];
}
+ return mRow;
+ });
- }),
+ const worksheet = XLSX.utils.json_to_sheet(rows);
+ XLSX.utils.sheet_add_aoa(worksheet, [[...local_config.columnNames]], {
+ origin: 'A1',
+ });
- fileName: 'data_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_") + '.xlsx',
- sheetName: 'Export_' + String(new Date().toJSON().slice(0, 10)).replaceAll("-", "_"),
- };
+ const workbook = XLSX.utils.book_new();
+ XLSX.utils.book_append_sheet(workbook, worksheet, local_config.sheetName);
+ XLSX.writeFile(workbook, local_config.fileName, { compression: true });
+ }
- local_config.columnNames = local_config.columnNames.filter(function( element ) {
- return element !== undefined;
- });
+ function ExportMenuItem(props) {
+ const apiRef = useGridApiContext();
+ const { hideMenu } = props;
+ return (
+
+ );
+ }
- const rows = data.map((row) => {
- const mRow = {};
- for (const key of local_config.keys) {
- mRow[key] = row[key];
- }
- return mRow;
- });
+ // FIN EXPORT EXCEL DATAGRID
- const worksheet = XLSX.utils.json_to_sheet(rows);
- XLSX.utils.sheet_add_aoa(worksheet, [[...local_config.columnNames]], {
- origin: 'A1',
- });
+ const [display_alert_mysy, setdisplay_alert_mysy] = useState("");
+ const [alert_message, setalert_message] = useState("");
+ const [alert_type, setalert_type] = useState("");
- const workbook = XLSX.utils.book_new();
- XLSX.utils.book_append_sheet(workbook, worksheet, local_config.sheetName);
- XLSX.writeFile(workbook, local_config.fileName, { compression: true });
-}
-
-function ExportMenuItem(props) {
- const apiRef = useGridApiContext();
- const { hideMenu } = props;
-
- return (
-
- );
-}
-
-// FIN EXPORT EXCEL DATAGRID
+ function clear_alert_message() {
+ setalert_message("");
+ }
+ function clear_alert_type() {
+ setalert_type("");
+ }
+ function clear_display_alert_mysy() {
+ setdisplay_alert_mysy("");
+ }
return (
@@ -4952,14 +5054,49 @@ function ExportMenuItem(props) {
}
+
+ {/*** Affichage des messages d'alerte*/}
+ {display_alert_mysy && String(display_alert_mysy) === "1" &&
+
+ }
+ {/*** FIN Affichage des messages d'alerte*/}
+
+
{/***** Dialog Suivi Pedagogique */}