From 2a770120e85e08d61b7b011cab149d6edbed9b04 Mon Sep 17 00:00:00 2001 From: Cherif Date: Wed, 25 Jun 2025 18:09:01 +0200 Subject: [PATCH] 25/06/2025 - 18h --- src/components/DisplayPartnerSession.js | 27 ++++++++++++++----- .../DisplayPartnerTrainingsPagination.js | 11 +++++++- src/components/Partner_Config_Technique.js | 3 ++- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index f11aa72..8c213be 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -118,6 +118,10 @@ import Timeline, { import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'; import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew'; +import CircularProgress, { + CircularProgressProps, +} from '@mui/material/CircularProgress'; + import randomColor from "randomcolor"; @@ -2096,6 +2100,8 @@ const DisplayPartnerSession = (props) => { const [Getall_TrainingSession_result, setGetall_TrainingSession_result] = useState(); function Getall_TrainingSession(event) { + setloading_datagrid(true); + var form = new FormData(); @@ -2271,10 +2277,9 @@ const DisplayPartnerSession = (props) => { setNew_Getall_TrainingSession_result(new_data2); setNew_Getall_TrainingSession_result_Timeline_Item(timeline_item); setNew_Getall_TrainingSession_result_Timeline_Group(timeline_grp); - - } + setloading_datagrid(false); } else { setGetall_TrainingSession_api("false"); @@ -2283,6 +2288,7 @@ const DisplayPartnerSession = (props) => { setdisplay_alert_mysy("1"); setalert_message(res.data.message); setalert_type("error"); + setloading_datagrid(false); } setLoading(false); @@ -2291,6 +2297,7 @@ const DisplayPartnerSession = (props) => { console.warn('Not good man :( Getall_TrainingSession = ', error); setGetall_TrainingSession_api("false"); alert("Impossible de lancer la recherche"); + setloading_datagrid(false); //setmyApimyApiMessage("") }) } @@ -2299,6 +2306,7 @@ const DisplayPartnerSession = (props) => { function Getall_TrainingSession_no_filter(event) { + setloading_datagrid(true); var form = new FormData(); const stored_cookie = getCookie('tokenmysypart'); @@ -2308,7 +2316,6 @@ const DisplayPartnerSession = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/GetAllValideSessionPartner_List/"; - axios.post(myurl, form).then(res => { if (String(res.data.status) === String("true")) { @@ -2446,15 +2453,19 @@ const DisplayPartnerSession = (props) => { } + + setloading_datagrid(false) } else { setGetall_TrainingSession_api("false"); setGetall_TrainingSession_message(res.data.message); + setloading_datagrid(false) } }).catch((error) => { console.warn('Not good man :( Getall_TrainingSession = ', error); setGetall_TrainingSession_api("false"); + setloading_datagrid(false) //setmyApimyApiMessage("") }) } @@ -9307,6 +9318,8 @@ const DisplayPartnerSession = (props) => { const [isLoading, setLoading] = useState(); + const [loading_datagrid, setloading_datagrid] = useState(true); + // -- Gestion pièces jointes @@ -19021,8 +19034,6 @@ const DisplayPartnerSession = (props) => { } - -
{(!display_session_with_alert || display_session_with_alert !== true) &&
@@ -19138,6 +19149,10 @@ const DisplayPartnerSession = (props) => { }} > { {Get_List_Of_All_PJ_For_Session_result && Get_List_Of_All_PJ_For_Session_result.map((val) => (

- {String(props.check_user_acces_right("session", "write")) === "1" && Supprimer diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 42e985b..842edd8 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -57,6 +57,7 @@ import Menu from '@mui/material/Menu'; import MoreVertIcon from '@mui/icons-material/MoreVert'; import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; +import { TbRuler2 } from 'react-icons/tb'; function PaperComponent(props) { return ( @@ -390,6 +391,8 @@ const DistplayPartnerTraningsPage = (props) => { function GetAllClass_new(event) { + setloading_datagrid(true); + var form = new FormData(); // Recuperation des parametres @@ -435,6 +438,7 @@ const DistplayPartnerTraningsPage = (props) => { // console.log(" String(data['status'] = ", String(data['status'])); setTableData(data['message']); setRows(data['message']); + setloading_datagrid(false); if (String(data['status']) === String("false")) { //console.log("erreur rrrr:" + data['status']) setmyApiResponse("False"); @@ -447,6 +451,7 @@ const DistplayPartnerTraningsPage = (props) => { }).catch((error) => { console.error('Error:', error); setmyApiResponse("false"); + setloading_datagrid(false); }); } @@ -2066,6 +2071,8 @@ const DistplayPartnerTraningsPage = (props) => { const [ismobilephone, setismobilephone] = useState(); + const [loading_datagrid, setloading_datagrid] = useState(true); + useEffect(() => { Get_List_Domaines(); @@ -3411,6 +3418,8 @@ const DistplayPartnerTraningsPage = (props) => { New_Get_List_Categorie_result.length > 0 && {
 
- {String(props.check_user_acces_right("formation", "write")) === "1" &&
+ {String(props.check_user_acces_right("formation", "write")) === "1" &&
{selectionModel && selectionModel.length >= 1 &&
 
diff --git a/src/components/Partner_Config_Technique.js b/src/components/Partner_Config_Technique.js index 329182f..854fbcc 100644 --- a/src/components/Partner_Config_Technique.js +++ b/src/components/Partner_Config_Technique.js @@ -3830,7 +3830,8 @@ const Partner_Configuration_Technique = (props) => { {display_detail_config && String(display_detail_config) === "1" &&
-
Point de configuration
+ +
Point de configuration