diff --git a/src/App.js b/src/App.js index d090748..4130644 100644 --- a/src/App.js +++ b/src/App.js @@ -158,8 +158,6 @@ function App() { - - diff --git a/src/components/Abonnement.js b/src/components/Abonnement.js index 3fc3d73..602605c 100644 --- a/src/components/Abonnement.js +++ b/src/components/Abonnement.js @@ -1,5 +1,4 @@ import React, { useState, useEffect } from "react"; -import UpdateUserInfo from "../components/UpdateUserInfo"; import Button from '@mui/material/Button'; import { AiOutlineEdit } from "react-icons/ai"; @@ -34,8 +33,9 @@ import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; -import { FcCancel, FcApproval, FcAcceptDatabase, FcPrint } from "react-icons/fc"; - + +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; + function Abonnement(props) { const [myApiResponse, setmyApiResponse] = useState(""); @@ -52,10 +52,10 @@ function Abonnement(props) { const columns = [ { field: 'id', headerName: 'id', hide: true }, - { field: 'num_facture', headerName: 'Num Facture', width: 200, flex: 1 }, - { field: 'client_nom', headerName: 'Client', width: 200, flex: 1 }, - { field: 'montant_ht', headerName: 'Montant HT €', width: 200, flex: 1 }, - { field: 'montant_ttc', headerName: 'Montant TTC €', width: 100, flex: 1 }, + { field: 'num_facture', headerName: 'Num Facture', width: 200, flex: 1 }, + { field: 'client_nom', headerName: 'Client', width: 200, flex: 1 }, + { field: 'montant_ht', headerName: 'Montant HT €', width: 200, flex: 1 }, + { field: 'montant_ttc', headerName: 'Montant TTC €', width: 100, flex: 1 }, { field: 'reduction', headerName: 'Discount', width: 150, flex: 1 }, { field: 'date_facture', headerName: 'Date Facture', width: 150, flex: 1 }, { field: 'mode_payement', headerName: 'Mode paiement', width: 150, flex: 1 }, @@ -137,7 +137,9 @@ function Abonnement(props) { } else { setmyApiResponse("True"); - + setdisplay_alert_mysy("1"); + setalert_message(data['message']); + setalert_type("error"); } }).catch((error) => { @@ -189,7 +191,10 @@ function Abonnement(props) { } else if (String(data['status']) === String("Err_Connexion")) { - alert('Erreur: ' + data['message']); + // alert('Erreur: ' + data['message']); + setdisplay_alert_mysy("1"); + setalert_message(data['message']); + setalert_type("error"); history.push("/Connexion"); return; } @@ -328,7 +333,10 @@ function Abonnement(props) { desablefield1(); } else if (String(result['status']) === String("Err_Connexion")) { - alert('Erreur: ' + result['message']); + // alert('Erreur: ' + result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); history.push("/Connexion"); } @@ -572,7 +580,12 @@ function Abonnement(props) { } if (!paymentmode || Object.keys(paymentmode).length <= 0) { - alert(" Vous devez ajouter un mode de Paiement pour activer de ce pack") + // alert(" Vous devez ajouter un mode de Paiement pour activer de ce pack") + + + setdisplay_alert_mysy("1"); + setalert_message("Vous devez ajouter un mode de paiement pour activer de ce pack"); + setalert_type("error"); return; } else { @@ -675,7 +688,10 @@ function Abonnement(props) { } if (!paymentmode || Object.keys(paymentmode).length <= 0) { - alert(" Vous devez ajouter un mode de Paiement pour activer de ce pack") + // alert(" Vous devez ajouter un mode de Paiement pour activer de ce pack") + setdisplay_alert_mysy("1"); + setalert_message("Vous devez ajouter un mode de paiement pour activer de ce pack"); + setalert_type("error"); return; } else { @@ -992,12 +1008,20 @@ function Abonnement(props) { // Mise à jour du plan de payement Update_Payement_Plan_Qty(); setLoading(false); + setdisplay_alert_mysy("1"); + setalert_message(data['message']); + setalert_type("success"); } else { setNew_Ordervalidation_api("false"); setNew_Ordervalidation_message(data['message']); setLoading(false); + + setdisplay_alert_mysy("1"); + setalert_message(data['message']); + setalert_type("error"); + } @@ -1006,6 +1030,10 @@ function Abonnement(props) { setneworderid(""); setNew_Ordervalidation_api("false"); setLoading(false); + setdisplay_alert_mysy("1"); + setalert_message("Impossible de créer la commande"); + setalert_type("error"); + }); // setLoading(false); @@ -1105,7 +1133,10 @@ function Abonnement(props) { //console.log(" old qty = ", parnternbformation, " New qty = ", new_nb_formations); if (parnternbformation == new_nb_formations) { - alert(" Le nombre de formations est identique à l'abonnement actuel."); + // alert(" Le nombre de formations est identique à l'abonnement actuel."); + setdisplay_alert_mysy("1"); + setalert_message("Le nombre de formations est identique à l'abonnement actuel."); + setalert_type("error"); return; } @@ -1117,13 +1148,22 @@ function Abonnement(props) { */ if (active_class_in_lms && parseInt(active_class_in_lms) > parseInt(new_nb_formations)) { - alert("Vous avez " + active_class_in_lms + " formation(s) active(s) dans le LMS, vous devez réduire ce nombre à au moins " + new_nb_formations + "."); + // alert("Vous avez " + active_class_in_lms + " formation(s) active(s) dans le LMS, vous devez réduire ce nombre à au moins " + new_nb_formations + "."); + var txt = "Vous avez " + active_class_in_lms + " formation(s) active(s) dans le LMS, vous devez réduire ce nombre à au moins " + new_nb_formations + "."; + setdisplay_alert_mysy("1"); + setalert_message(txt); + setalert_type("error"); + return; } if (active_class_in_mysy && parseInt(active_class_in_mysy) > parseInt(new_nb_formations)) { - alert("Vous avez " + active_class_in_mysy + " formation(s) publiée(s) dans le moteur de recherche, vous devez réduire ce nombre à au moins " + new_nb_formations + "."); + // alert("Vous avez " + active_class_in_mysy + " formation(s) publiée(s) dans le moteur de recherche, vous devez réduire ce nombre à au moins " + new_nb_formations + "."); + var txt = "Vous avez " + active_class_in_mysy + " formation(s) publiée(s) dans le moteur de recherche, vous devez réduire ce nombre à au moins " + new_nb_formations + "."; + setdisplay_alert_mysy("1"); + setalert_message(txt); + setalert_type("error"); return; } @@ -1202,12 +1242,40 @@ function Abonnement(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*/} + {String(gotocheckout) === String("1") &&
@@ -1761,7 +1829,7 @@ function Abonnement(props) {
 
- Tarifs + Tarifs
Marketplace @@ -1998,74 +2066,74 @@ function Abonnement(props) {
-
Standard
-
-
- Pour chaque Formation -
-
-   -
+
Standard
+
+
+ Pour chaque Formation +
+
+   +
-
+
- OK -
+ OK +
-
- KO -
-
- KO -
+
+ KO +
+
+ KO +
-
- OK -
+
+ OK +
-
- KO -
+
+ KO +
-
-   -
+
+   +
-
- OK -
-
- KO -
+
+ OK +
+
+ KO +
-
-   -
+
+   +
-
- KO -
-
- KO -
+
+ KO +
+
+ KO +
-
- KO -
+
+ KO +
-
- 50 HT €/mois +
+ 50 HT €/mois -
+
-
-   -
+
+   +
- {String(currentpack2).toLowerCase() !== "standard" &&
+ {String(currentpack2).toLowerCase() !== "standard" &&
} -
+
-
-
Gold
-
-
- Pour chaque Formation -
-
-   -
+
+
Gold
+
+
+ Pour chaque Formation +
+
+   +
-
+
- OK -
+ OK +
-
- OK -
-
- OK -
+
+ OK +
+
+ OK +
-
- OK -
+
+ OK +
-
- OK -
+
+ OK +
-
-   -
+
+   +
-
- OK -
-
- OK -
+
+ OK +
+
+ OK +
-
-   -
+
+   +
-
- OK -
-
- OK -
+
+ OK +
+
+ OK +
-
- OK -
+
+ OK +
-
- 90 € HT /mois +
+ 90 € HT /mois -
+
-
-   -
+
+   +
- {String(currentpack2).toLowerCase() !== "gold" &&
+ {String(currentpack2).toLowerCase() !== "gold" &&
+
diff --git a/src/components/Account.js b/src/components/Account.js index 6873adf..26f6abd 100644 --- a/src/components/Account.js +++ b/src/components/Account.js @@ -58,7 +58,7 @@ function Account() { if (typeof (stored_user) === "undefined" || String(stored_user) === '') { //alert(" début puch"); - history.push("/mysy-training-login/0/0"); + history.push("/Connexion"); } @@ -138,7 +138,7 @@ function Account() { /* si c'est une connexion partner qui est active */ if (typeof (stored_user) != "undefined") { removeCookie('tokenmysych', { path: '/' }); - history.push("/mysy-training-login/0/0"); + history.push("/Connexion"); } } @@ -187,6 +187,11 @@ function Account() { }; + const displayProfil_Attestation = () => { + setmenu("mes_attestations"); + }; + + const displayProfil_Stagiaires = () => { setmenu("mes_stagiaires"); }; @@ -416,8 +421,11 @@ function Account() { {String(menu) !== "mes_conventions" &&
CONVENTIONS
} {String(menu) === "mes_conventions" &&
CONVENTIONS
}
- {String(menu) !== "mes_convocations" &&
CONVOCATION
} - {String(menu) === "mes_convocations" &&
CONVOCATION
} + {String(menu) !== "mes_convocations" &&
CONVOCATIONS
} + {String(menu) === "mes_convocations" &&
CONVOCATIONS
} +
+ {String(menu) !== "mes_attestations" &&
ATTESTATIONS
} + {String(menu) === "mes_attestations" &&
ATTESTATIONS
}
{String(menu) !== "mes_devis" &&
DEVIS
} {String(menu) === "mes_devis" &&
DEVIS
} @@ -429,8 +437,8 @@ function Account() { {String(menu) !== "modules_mes_documents" &&
TOUS LES DOCUMENTS
} {String(menu) === "modules_mes_documents" &&
TOUS LES DOCUMENTS
}
-
SUPPRIMER MON COMPTE
-
+ {/*
SUPPRIMER MON COMPTE
+
*/}
} {/** Menu pour un utilisateur NON type 'user' exemple un apprenant */} @@ -447,8 +455,8 @@ function Account() {
MES FACTURES

-
SUPPRIMER MON COMPTE
-
+ {/*
SUPPRIMER MON COMPTE
+
*/}
}
@@ -486,6 +494,10 @@ function Account() { connected_user_data.partner_client_id && } {/*String(menu) === String("tout_documents") && connected_user_data && connected_user_data.partner_owner_recid && @@ -507,11 +519,13 @@ function Account() { {String(menu) === String("mes_devis") && connected_user_data && connected_user_data.partner_owner_recid && connected_user_data.partner_client_id && - } {String(menu) === String("mes_conventions") && connected_user_data && connected_user_data.partner_owner_recid && @@ -521,6 +535,7 @@ function Account() { my_title={"MES CONVENTIONS"} type_document={"convention"} type_user_connected={"user_account"} + filter_all_document={"0"} />} @@ -531,6 +546,17 @@ function Account() { my_title={"MES CONVOCATIONS"} type_document={"convocation"} type_user_connected={"user_account"} + filter_all_document={"0"} + />} + + {String(menu) === String("mes_attestations") && connected_user_data && connected_user_data.partner_owner_recid && + connected_user_data.partner_client_id && + } diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 7f25bb3..4481e62 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -677,7 +677,11 @@ const AddClassManual = (props) => { else { setGetall_Partner_List_UE_api("false"); setGetall_Partner_List_UE_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) => { @@ -756,7 +760,11 @@ const AddClassManual = (props) => { else { setGetall_Partner_Type_Evalution_List_api("false"); setGetall_Partner_Type_Evalution_List_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) => { @@ -797,7 +805,7 @@ const AddClassManual = (props) => { setLoading(false); if (String(res.data.status) === String("true")) { //console.log(" In Getall_Class_List_Evalution res.data.status = " + res.data.status); - // console.log(" In Getall_Class_List_Evalution res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Class_List_Evalution res.data.message r_class = " + res.data.message); setGetall_Class_List_Evalution_api("true"); setGetall_Class_List_Evalution_result(res.data.message); @@ -847,7 +855,11 @@ const AddClassManual = (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) => { @@ -1060,7 +1072,7 @@ const AddClassManual = (props) => { //document.getElementsByName("objectif")[0].value = ""; //document.getElementsByName("programme")[0].value = ""; //document.getElementsByName("prerequis")[0].value = ""; - // alert(" La formation a été correctement supprimée."); + // alert(" La formation a été correctement supprimée."); history.push({ pathname: "/Partner/", @@ -1071,10 +1083,10 @@ const AddClassManual = (props) => { }); window.location.reload(); } else if (String(result['status']) === "false") { - // alert(result['message']); + // alert(result['message']); setdisplay_alert_mysy("1"); setalert_message(result['message']); - setalert_type("error"); + setalert_type("error"); } else if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); @@ -1149,7 +1161,11 @@ const AddClassManual = (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) => { @@ -2702,7 +2718,11 @@ const AddClassManual = (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) => { @@ -3412,15 +3432,22 @@ const AddClassManual = (props) => { setAdd_Update_UE_To_Class_result(res.data.message); Getall_Class_List_UE(); Dialog_Unite_Enseignement_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_UE_To_Class_api("false"); setAdd_Update_UE_To_Class_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) => { @@ -3484,13 +3511,21 @@ const AddClassManual = (props) => { Dialog_Evaluation_Unite_Enseignement_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_Evaluation_to_UE_api("false"); setAdd_Update_Evaluation_to_UE_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) => { @@ -3625,7 +3660,11 @@ const AddClassManual = (props) => { else { setGetall_Employee_Statistic_Question_List_api("false"); setGetall_Employee_Statistic_Question_List_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) => { @@ -3740,7 +3779,11 @@ const AddClassManual = (props) => { else { setGetall_Qry_Survey_Data_api("false"); setGetall_Qry_Survey_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) => { @@ -3875,7 +3918,7 @@ const AddClassManual = (props) => { function clear_display_alert_mysy() { setdisplay_alert_mysy(""); -} + } return ( @@ -3890,7 +3933,7 @@ const AddClassManual = (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*/} @@ -3936,7 +3979,7 @@ const AddClassManual = (props) => { { {/* Dialog pour gerer les Unite_Enseignement */} null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '5rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" > MySy Information @@ -4091,6 +4156,16 @@ const AddClassManual = (props) => { + + + + +
+
@@ -755,26 +802,36 @@ const ButtonHilight = () => { Une Demo ?
} -
{ + {String(userconnected) !== String("1") &&
{ setDialog_contact_open(true); }}> Contact -
+
} -
+ {String(userconnected) === String("1") &&
{ + setDialog_contact_open(true); + }}> + Contact Editeur +
} + + {String(userconnected) !== String("1") &&
Tarifs -
+
} -
{ + {String(userconnected) !== String("1") &&
{ history.push("/fonctionnalites") }}> Fonctionnalites -
+
} -
- A propos -
+ {String(userconnected) !== String("1") &&
+ A propos de +
} + + {String(userconnected) === String("1") &&
+ L'editeur MySy Training +
} @@ -782,18 +839,7 @@ const ButtonHilight = () => {
- {/*
-
- -
- -
-
*/} +
diff --git a/src/components/CheckOut.js b/src/components/CheckOut.js index cd20ae3..76d1559 100644 --- a/src/components/CheckOut.js +++ b/src/components/CheckOut.js @@ -33,7 +33,7 @@ import Popup from 'reactjs-popup'; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' - +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; const stripePromise = loadStripe('pk_test_51LUUfAAbmaEugrFTI25uZBD3IFjbtaL6jUfRV83diDf7nco8worna4NGKhMHbPP71WCwT5EHFRdDNatxPrJWwgZ300kgH5EO4p'); //const stripePromise_PROD = loadStripe('pk_live_51LUUfAAbmaEugrFTyfNe4Dj0vbxc5qXQqNs0rztjAKy8oSlc5EEQyJGjA8Z5kXmP2gvUMcYLUBYCIyWWzLCw59RY00PtGInkVf'); @@ -586,7 +586,7 @@ function CheckOut(props) { if (String(data['status']) === String("true")) { - console.log(" status = OKKK "); + // console.log(" status = OKKK "); //console.log(" subscriptionId = " + subscriptionId + " -- et clientSecret = " + clientSecret); //setclientSecret_id(data['payment_intent_client_secret']); //setpayement_id(data['subscription_id']); @@ -651,7 +651,7 @@ function CheckOut(props) { }) .then((data) => data.json()) .then((data) => { - //console.log('Success:', data['message'], "data['status'] = ", data['status'], "ORDER ID = ", data['order_id']); + //console.log('message:', data['message'], "data['status'] = ", data['status'], "ORDER ID = ", data['order_id']); if (String(data['status']) === String("true")) { setorderid(data['order_id']); setapiorderid("1"); @@ -660,7 +660,11 @@ function CheckOut(props) { setpaymentmode(""); setgotocheckout(""); - console.log(" ### packprice = ", packprice); + setdisplay_alert_mysy("1"); + setalert_message(data['message']); + setalert_type("success"); + + // console.log(" ### packprice = ", packprice); /* IMPORTANT : @@ -674,7 +678,7 @@ function CheckOut(props) { window.location.reload(); } } else { - console.log(" laaaaa ") + // console.log(" laaaaa ") if (String(props.packs).toLowerCase() === String("decouverte")) { MySy_LMS_Account_Management(); setLoading(false); @@ -687,17 +691,15 @@ function CheckOut(props) { window.location.reload(); } - - - } - - } else { setapiorderid("0"); setapiorderidmessage(data['message']); setLoading(false); + setdisplay_alert_mysy("1"); + setalert_message(data['message']); + setalert_type("error"); } @@ -705,6 +707,9 @@ function CheckOut(props) { console.error('Error:', error); setapiorderid("0"); setLoading(false); + setdisplay_alert_mysy("1"); + setalert_message("Impossible de mettre à jour votre abonnement "); + setalert_type("error"); }); @@ -1217,6 +1222,21 @@ function CheckOut(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 (
@@ -1225,6 +1245,16 @@ function CheckOut(props) {
} + {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} {String(apiorderid) === String("0") &&
Impossible de créer la commande.
{apiorderidmessage} @@ -1265,7 +1295,7 @@ function CheckOut(props) { ))} - +
Détail prix
diff --git a/src/components/DisplayDetailClass_new_v3.js b/src/components/DisplayDetailClass_new_v3.js index c35e048..fa813a8 100644 --- a/src/components/DisplayDetailClass_new_v3.js +++ b/src/components/DisplayDetailClass_new_v3.js @@ -408,8 +408,8 @@ const DisplayDetailClass_new_v3 = (props) => { //alert("myurl = "+myurl); axios.post(myurl, form).then(res => { - // console.log(" In Display res.data.status = " + res.data.status); - // console.log(" In Display res.data.message = " + res.data.message); + // console.log(" In Display res.data.status = " + res.data.status); + // console.log(" In Display res.data.message = " + res.data.message); if (String(res.data.status) === String("true")) { if (res.data.message.length > 0) { @@ -2273,7 +2273,7 @@ const DisplayDetailClass_new_v3 = (props) => {
- {/****** Stick droire */} + {/****** Stick droite */}
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index a951b36..585ecd1 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -118,6 +118,8 @@ import Timeline, { SidebarHeader, DateHeader } from 'react-calendar-timeline'; + + import randomColor from "randomcolor"; function PaperComponent(props) { @@ -1539,9 +1541,9 @@ const DisplayPartnerSession = (props) => { var local_session_nb_participant = JSON.parse(x).nb_participant; var local_session_nb_inscrit = JSON.parse(x).nb_inscrit; - var local_session_taux_remplissage = JSON.parse(x).taux_remplissage; - + var local_session_taux_remplissage = String(parseFloat(String(JSON.parse(x).taux_remplissage)).toFixed(2)); + console.log(" ### local_session_taux_remplissage == ", local_session_taux_remplissage); //--- var node = { @@ -1598,7 +1600,7 @@ const DisplayPartnerSession = (props) => { "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+" -- "+parseFloat(local_session_taux_remplissage)*100+'%', + "title": local_code_session + " - " + local_date_debut + " au " + local_date_fin + " -- " + parseFloat(local_session_taux_remplissage) * 100 + '%', "start_time": moment(local_date_debut, "DD/MM/YYYY"), "end_time": moment(local_date_fin, "DD/MM/YYYY").add(1, 'days'), "canMove": false, @@ -1640,7 +1642,10 @@ const DisplayPartnerSession = (props) => { else { setGetall_TrainingSession_api("false"); setGetall_TrainingSession_message(res.data.message); - alert(res.data.message) + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } setLoading(false); @@ -1858,7 +1863,7 @@ const DisplayPartnerSession = (props) => { var local_session_nb_participant = JSON.parse(x).nb_participant; var local_session_nb_inscrit = JSON.parse(x).nb_inscrit; - var local_session_taux_remplissage = JSON.parse(x).taux_remplissage; + var local_session_taux_remplissage = String(parseFloat(String(JSON.parse(x).taux_remplissage)).toFixed(2)); //--- var node = { @@ -1892,14 +1897,14 @@ const DisplayPartnerSession = (props) => { timeline_grp.push(node_timeline_grp); - // Determination de la couleur background selon le taux de remplissage - var bg_color = ""; - if (parseFloat(local_session_taux_remplissage) < 0.3) - bg_color = "#ffb343"; - else if (parseFloat(local_session_taux_remplissage) >= 0.3 && parseFloat(local_session_taux_remplissage) <= 0.6) - bg_color = "#ececa3"; - else if (parseFloat(local_session_taux_remplissage) > 0.6) - bg_color = "#a5c90f"; + // Determination de la couleur background selon le taux de remplissage + var bg_color = ""; + if (parseFloat(local_session_taux_remplissage) < 0.3) + bg_color = "#ffb343"; + else if (parseFloat(local_session_taux_remplissage) >= 0.3 && parseFloat(local_session_taux_remplissage) <= 0.6) + bg_color = "#ececa3"; + else if (parseFloat(local_session_taux_remplissage) > 0.6) + bg_color = "#a5c90f"; /** Pour le timeline Item */ @@ -1917,7 +1922,7 @@ const DisplayPartnerSession = (props) => { "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+" -- "+parseFloat(local_session_taux_remplissage)*100+'%', + "title": local_code_session + " - " + local_date_debut + " au " + local_date_fin + " -- " + parseFloat(local_session_taux_remplissage) * 100 + '%', "start_time": moment(local_date_debut, "DD/MM/YYYY"), "end_time": moment(local_date_fin, "DD/MM/YYYY").add(1, 'days'), "canMove": false, @@ -1959,7 +1964,10 @@ const DisplayPartnerSession = (props) => { else { setGetall_TrainingSession_For_Given_Class_api("false"); setGetall_TrainingSession_For_Given_Class_message(res.data.message); - alert(res.data.message) + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } setLoading(false); @@ -2186,7 +2194,10 @@ const DisplayPartnerSession = (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) => { @@ -2254,7 +2265,10 @@ const DisplayPartnerSession = (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) => { @@ -2382,7 +2396,7 @@ const DisplayPartnerSession = (props) => { setkanban_colonne_width(tmp_val); } - console.log(" 222 local_opport_chanel = ", local_opport_chanel); + // console.log(" 222 local_opport_chanel = ", local_opport_chanel); } else { setNew_Getall_Parter_Session_Steps_result([]); @@ -2411,7 +2425,10 @@ const DisplayPartnerSession = (props) => { else { setGetall_Parter_OR_Default_Session_Steps_api("false"); setGetall_Parter_OR_Default_Session_Steps_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) => { @@ -2548,12 +2565,12 @@ const DisplayPartnerSession = (props) => { else { setGetall_Parter_Session_Steps_api("false"); setGetall_Parter_Session_Steps_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) => { console.warn('Not good man :( Getall_Parter_Session_Steps = ', error); setGetall_Parter_Session_Steps_api("false"); @@ -2690,7 +2707,7 @@ const DisplayPartnerSession = (props) => { 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); + // console.log(" ### stored_cookie_session_data_row_grouped_by = ", stored_cookie_session_data_row_grouped_by); } @@ -2724,7 +2741,10 @@ const DisplayPartnerSession = (props) => { GetListeInscrit(selected_session_id, selected_internal_url); setselectionModel_preinsc([]); setactionmass_preinsc_val(); - 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")) { @@ -2736,7 +2756,10 @@ const DisplayPartnerSession = (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"); } @@ -2782,12 +2805,19 @@ const DisplayPartnerSession = (props) => { GetListeInscrit(selected_session_id, selected_internal_url); setselectionModel_preinsc([]); setactionmass_preinsc_val(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setUpdate_PresInsc_Data_By_Client_api("false"); setUpdate_PresInsc_Data_By_Client_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } @@ -2831,12 +2861,19 @@ const DisplayPartnerSession = (props) => { GetListeInscrit(selected_session_id, selected_internal_url); setselectionModel_preinsc([]); setactionmass_preinsc_val(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setRefuse_List_Inscritpion_api("false"); setRefuse_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"); + } @@ -3126,13 +3163,21 @@ const DisplayPartnerSession = (props) => { GetListeInscrit(selected_session_id, selected_internal_url); GetListeEmargement(selected_session_id, selected_internal_url); + var txt = " Les stagiaires ont été correctement importés"; + setdisplay_alert_mysy("1"); + setalert_message(txt); + setalert_type("success"); - alert(" Les stagiaires ont été correctement importés"); + + // alert(" Les stagiaires ont été correctement importés"); submenu_inscrit(); } else if (String(result['status']) === String("Err_Connexion")) { setLoading(false); - alert('Erreur: ' + result['message']); + // alert('Erreur: ' + result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); history.push("/Connexion"); } @@ -3140,7 +3185,10 @@ const DisplayPartnerSession = (props) => { setLoading(false); setliste_participants_file_change_message(result['message']); setliste_participants_file_change_api("false"); - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); } }) @@ -3279,7 +3327,11 @@ const DisplayPartnerSession = (props) => { else { setGetall_Sequence_Of_Session_api("false"); setGetall_Sequence_Of_Session_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) => { @@ -3459,14 +3511,23 @@ const DisplayPartnerSession = (props) => { top: 0, behavior: "smooth", }); - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("success"); + } else { setliste_sessions_file_change_message(result['message']); setliste_sessions_file_change_api("false"); - alert('Erreur: ' + result['message']); + // alert('Erreur: ' + result['message']); + + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); + } @@ -3797,7 +3858,10 @@ const DisplayPartnerSession = (props) => { submenu_inscrit(); One_clearParticipantFields(); - 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")) { alert('Erreur: ' + res.data.message); @@ -3806,7 +3870,10 @@ const DisplayPartnerSession = (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) => { @@ -4180,13 +4247,19 @@ const DisplayPartnerSession = (props) => { setInvoice_Session_Formation_By_Selected_Inscrit_result(res.data.message); GetListeInscrit(selected_session_id, selected_internal_url); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setInvoice_Session_Formation_By_Selected_Inscrit_api("false"); setInvoice_Session_Formation_By_Selected_Inscrit_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) => { @@ -4262,13 +4335,21 @@ const DisplayPartnerSession = (props) => { GetListeEmargement(selected_session_id, selected_internal_url); setretval_ch("1"); - alert(" La mise à jour a été correctement faite.") + // alert(" La mise à jour a été correctement faite.") + + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message("La mise à jour a été correctement faite."); + setalert_type("success"); } else { setDeleteStagiaireData_api("false"); setDeleteStagiaireData_message(res.data.message); setretval_ch("-1"); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -4321,12 +4402,20 @@ const DisplayPartnerSession = (props) => { setsubmenu(); Getall_TrainingSession(); - alert(" La session a été correctement supprimée.") + // alert(" La session a été correctement supprimée."); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message("La session a été correctement supprimée."); + setalert_type("success"); + } else { setDelete_Session_Formation_api("false"); setDelete_Session_Formation_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -4480,7 +4569,10 @@ const DisplayPartnerSession = (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) => { @@ -6043,7 +6135,10 @@ const DisplayPartnerSession = (props) => { setLoading(false); setGetCurrentSession_api("false"); setGetCurrentSession_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) => { @@ -6256,7 +6351,7 @@ const DisplayPartnerSession = (props) => { const [SessionendDateInscription, setSessionendDateInscription] = useState(); const [New_GetCurrentPartnerClass_result, setNew_GetCurrentPartnerClass_result] = useState([]); - + const [GetCurrentPartnerClass_api, setGetCurrentPartnerClass_api] = useState(); const [GetCurrentPartnerClass_message, setGetCurrentPartnerClass_message] = useState(); @@ -6468,7 +6563,10 @@ const DisplayPartnerSession = (props) => { setUpdateStagiaireData_api("false"); setUpdateStagiaireData_message(res.data.message); setretval_ch("-1"); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -6951,7 +7049,10 @@ const DisplayPartnerSession = (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) => { @@ -7068,7 +7169,10 @@ const DisplayPartnerSession = (props) => { } else { - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); } }) @@ -7315,7 +7419,10 @@ const DisplayPartnerSession = (props) => { else { setSendEvaluationEmail_api("false"); setSendEvaluationEmail_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) => { @@ -7353,7 +7460,10 @@ const DisplayPartnerSession = (props) => { GetListeEmargement(selected_session_id, selected_internal_url); GetListeEvaluation(selected_session_id); - 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")) { alert('Erreur: ' + res.data.message); @@ -7362,7 +7472,10 @@ const DisplayPartnerSession = (props) => { else { setSendEvaluationEmail_api("false"); setSendEvaluationEmail_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) => { @@ -8206,7 +8319,11 @@ const DisplayPartnerSession = (props) => { setDelete_one_attached_document_result(result['message']); setDelete_one_attached_document_api("true"); Get_List_Of_All_PJ(selected_inscription_id); - alert(result['message']) + // alert(result['message']) + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("success"); + } else { @@ -8260,7 +8377,11 @@ const DisplayPartnerSession = (props) => { setDelete_one_attached_document_For_Session_api("true"); Get_List_Of_All_PJ_For_Session(selected_session_id); - alert(result['message']) + // alert(result['message']) + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("success"); + } else { @@ -8378,7 +8499,10 @@ const DisplayPartnerSession = (props) => { setGet_Class_Data_api("false"); setGet_Class_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) => { @@ -8577,12 +8701,19 @@ const DisplayPartnerSession = (props) => { setsubmenu(); Getall_TrainingSession(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + } else { setDelete_LIST_Session_Formation_api("false"); setDelete_LIST_Session_Formation_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -8629,12 +8760,18 @@ const DisplayPartnerSession = (props) => { setsubmenu(); Getall_TrainingSession(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDupliquer_LIST_Session_Formation_api("false"); setDupliquer_LIST_Session_Formation_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -8697,7 +8834,10 @@ const DisplayPartnerSession = (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) => { @@ -8815,7 +8955,10 @@ const DisplayPartnerSession = (props) => { else { setGet_Partner_Object_Specific_Fields_stagiaire_api("false"); setGet_Partner_Object_Specific_Fields_stagiaire_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) => { @@ -9006,14 +9149,21 @@ const DisplayPartnerSession = (props) => { - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); Dialog_DIALOG_AGENDA_handleClose_buton(); } else { setAdd_One_Sequence_Session_api("false"); setAdd_One_Sequence_Session_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) => { @@ -9075,14 +9225,20 @@ const DisplayPartnerSession = (props) => { setDialog_seq_planif_periode_type(""); setplanification_ecrase_existing_seq(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); } else { setAdd_Automatic_Sequence_Session_api("false"); setAdd_Automatic_Sequence_Session_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) => { @@ -9146,7 +9302,10 @@ const DisplayPartnerSession = (props) => { setDialog_seq_choix_model_emargement_open(false); setDialog_seq_planif_periode_type(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); Dialog_seq_CREATION_SEMAINE_TYPE_handleClose_buton(); @@ -9154,7 +9313,11 @@ const DisplayPartnerSession = (props) => { else { setAdd_Automatic_Sequence_Session_From_Week_Model_api("false"); setAdd_Automatic_Sequence_Session_From_Week_Model_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) => { @@ -9218,7 +9381,10 @@ const DisplayPartnerSession = (props) => { setDialog_seq_choix_model_emargement_open(false); setDialog_seq_planif_periode_type(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); Dialog_seq_CREATION_SEMAINE_TYPE_handleClose_buton(); @@ -9226,7 +9392,10 @@ const DisplayPartnerSession = (props) => { else { setAdd_Automatic_Sequence_Session_From_Month_Model_api("false"); setAdd_Automatic_Sequence_Session_From_Month_Model_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) => { @@ -9291,13 +9460,19 @@ const DisplayPartnerSession = (props) => { setupdate_sequence(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); } else { setUpdate_One_Sequence_Session_api("false"); setUpdate_One_Sequence_Session_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) => { @@ -9351,12 +9526,18 @@ const DisplayPartnerSession = (props) => { Dialog_DIALOG_AGENDA_handleClose_buton(); - alert(res.data.message) + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Sequence_Session_Data_api("false"); setDelete_Sequence_Session_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"); } @@ -9409,12 +9590,18 @@ const DisplayPartnerSession = (props) => { settab_selected_sequence_id([]); - alert(res.data.message) + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Sequence_Session_Data_Mass_api("false"); setDelete_Sequence_Session_Data_Mass_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -9462,7 +9649,10 @@ const DisplayPartnerSession = (props) => { else { setGetall_List_Sequence_Ressource_api("false"); setGetall_List_Sequence_Ressource_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) => { @@ -9577,13 +9767,19 @@ const DisplayPartnerSession = (props) => { setDialog_seq_ressource_1_selected_ressource_id(); setDialog_seq_ressource_1_selected_ressource_poste(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Dialog_seq_ressource_1_handleClose_buton(); } else { setAdd_One_Sequence_Session_Ressource_api("false"); setAdd_One_Sequence_Session_Ressource_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) => { @@ -9625,13 +9821,21 @@ const DisplayPartnerSession = (props) => { Getall_List_Sequence_Ressource(selected_sequence_id); - alert(res.data.message) + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + } else { setDelete_Sequence_Session_Ressource_Data_api("false"); setDelete_Sequence_Session_Ressource_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"); + } @@ -9689,13 +9893,20 @@ const DisplayPartnerSession = (props) => { setAdd_One_Sequence_Session_mass(); settab_selected_sequence_id([]); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Dialog_seq_ressource_1_handleClose_buton(); } else { setAdd_One_Sequence_Session_Ressource_Mass_api("false"); setAdd_One_Sequence_Session_Ressource_Mass_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) => { @@ -9890,16 +10101,25 @@ const DisplayPartnerSession = (props) => { setActionMassListEmargement_api("true"); setActionMassListEmargement_result(res.data.message); GetListeEmargement(selected_session_id, selected_internal_url); - 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")) { - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); history.push("/Connexion"); } else { setActionMassListEmargement_api("false"); setActionMassListEmargement_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -9998,7 +10218,10 @@ const DisplayPartnerSession = (props) => { else { setGet_List_Modele_Emargement_api("false"); setGet_List_Modele_Emargement_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) => { @@ -10039,8 +10262,10 @@ const DisplayPartnerSession = (props) => { setCreateListEmargement_api("true"); setCreateListEmargement_result(res.data.message); GetListeEmargement(selected_session_id, selected_internal_url); - 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")) { alert('Erreur: ' + res.data.message); history.push("/Connexion"); @@ -10048,7 +10273,11 @@ const DisplayPartnerSession = (props) => { else { setCreateListEmargement_api("false"); setCreateListEmargement_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) => { @@ -10147,7 +10376,10 @@ const DisplayPartnerSession = (props) => { setUpdateStagiaireEmargement_api("true"); setUpdateStagiaireEmargement_result(res.data.message); GetListeEmargement(selected_session_id, selected_internal_url); - 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")) { alert('Erreur: ' + res.data.message); history.push("/Connexion"); @@ -10155,7 +10387,10 @@ const DisplayPartnerSession = (props) => { else { setUpdateStagiaireEmargement_api("false"); setUpdateStagiaireEmargement_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -10202,7 +10437,10 @@ const DisplayPartnerSession = (props) => { setUpdate_Comment_Given_Emargement_api("true"); setUpdate_Comment_Given_Emargement_result(res.data.message); GetListeEmargement(selected_session_id, selected_internal_url); - 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")) { alert('Erreur: ' + res.data.message); history.push("/Connexion"); @@ -10210,7 +10448,10 @@ const DisplayPartnerSession = (props) => { else { setUpdate_Comment_Given_Emargement_api("false"); setUpdate_Comment_Given_Emargement_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -10429,7 +10670,10 @@ const DisplayPartnerSession = (props) => { else { setGet_List_Stagiaire_Conventions_api("false"); setGet_List_Stagiaire_Conventions_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) => { @@ -10484,13 +10728,19 @@ const DisplayPartnerSession = (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) => { @@ -10586,20 +10836,27 @@ const DisplayPartnerSession = (props) => { .then((result) => { setLoading(false); - console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.status = " + result['status']); - console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.message r_class = " + result['message']); + // console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.status = " + result['status']); + // console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.message r_class = " + result['message']); if (String(result['status']) === String("true")) { setSend_Stagiaire_Conventions_By_Email_Test_api("true"); setSend_Stagiaire_Conventions_By_Email_Test_result(result['message']); - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("success"); + Dialog_convention_handleClose_buton() } else { setSend_Stagiaire_Conventions_By_Email_Test_api("false"); setSend_Stagiaire_Conventions_By_Email_Test_message(result['message']); - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); } }).catch((error) => { @@ -10650,7 +10907,10 @@ const DisplayPartnerSession = (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) => { @@ -10852,7 +11112,10 @@ const DisplayPartnerSession = (props) => { setSelectionModel_evaluation([]); setactionmass_eval_val(""); - 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")) { alert('Erreur: ' + res.data.message); @@ -10861,7 +11124,10 @@ const DisplayPartnerSession = (props) => { else { setSend_Survey_By_Email_For_Ids_api("false"); setSend_Survey_By_Email_For_Ids_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) => { @@ -10995,7 +11261,10 @@ const DisplayPartnerSession = (props) => { else { setGetall_Partner_Site_Formation_api("false"); setGetall_Partner_Site_Formation_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) => { @@ -11223,7 +11492,10 @@ const DisplayPartnerSession = (props) => { setCreate_List_Survey_hot_eval_For_Session_For_Inscrit_api("true"); setCreate_List_Survey_hot_eval_For_Session_For_Inscrit_result(res.data.message); Getall_Survey_hot_evaluation_By_Session(); - 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")) { alert('Erreur: ' + res.data.message); @@ -11232,7 +11504,11 @@ const DisplayPartnerSession = (props) => { else { setCreate_List_Survey_hot_eval_For_Session_For_Inscrit_api("false"); setCreate_List_Survey_hot_eval_For_Session_For_Inscrit_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) => { @@ -11769,7 +12045,10 @@ const DisplayPartnerSession = (props) => { setAdd_Update_Split_Invoice_api("true"); setAdd_Update_Split_Invoice_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_SPLIT_INVOICE_handleClose_buton(); } else if (String(res.data.status) === String("Err_Connexion")) { @@ -11779,7 +12058,10 @@ const DisplayPartnerSession = (props) => { else { setAdd_Update_Split_Invoice_api("false"); setAdd_Update_Split_Invoice_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) => { @@ -11847,7 +12129,10 @@ const DisplayPartnerSession = (props) => { else { setGet_Inscription_Split_Invoice_api("false"); setGet_Inscription_Split_Invoice_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) => { @@ -11881,7 +12166,11 @@ const DisplayPartnerSession = (props) => { setDelete_Inscription_Split_Invoice_api("true"); setDelete_Inscription_Split_Invoice_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_SPLIT_INVOICE_handleClose_buton(); @@ -11892,7 +12181,10 @@ const DisplayPartnerSession = (props) => { else { setDelete_Inscription_Split_Invoice_api("false"); setDelete_Inscription_Split_Invoice_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) => { @@ -12333,7 +12625,10 @@ const DisplayPartnerSession = (props) => { else { setUpdate_Session_Formation_Only_Step_api("false"); setUpdate_Session_Formation_Only_Step_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) => { @@ -14332,7 +14627,21 @@ const DisplayPartnerSession = (props) => { Taux Remplissage
{rowss && String(session_selected_row_id).length > 0 &&
- {JSON.parse(rowss[session_selected_row_id]).taux_remplissage} + + {rowss[session_selected_row_id] && JSON.parse(rowss[session_selected_row_id]).taux_remplissage && + parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) < 0.3 && } + + {rowss[session_selected_row_id] && JSON.parse(rowss[session_selected_row_id]).taux_remplissage && + parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) >= 0.3 && parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) <= 0.6 && + } + + {rowss[session_selected_row_id] && JSON.parse(rowss[session_selected_row_id]).taux_remplissage && + parseFloat(String(JSON.parse(rowss[session_selected_row_id]).taux_remplissage)).toFixed(2) >= 0.6 && + }
} @@ -15665,7 +15974,7 @@ const DisplayPartnerSession = (props) => { nb_participant: JSON.parse(item).nb_participant, title: JSON.parse(item).titre, domaine: JSON.parse(item).domaine, - taux_remplissage: JSON.parse(item).taux_remplissage, + taux_remplissage: String(parseFloat(String(JSON.parse(item).taux_remplissage)).toFixed(2)), nb_inscrit: JSON.parse(item).nb_inscrit, nb_preinscrit: JSON.parse(item).nb_preinscrit, duration: JSON.parse(item).duration_concat, @@ -15979,10 +16288,11 @@ const DisplayPartnerSession = (props) => { {String(item.nb_participant) && } - - {item.taux_remplissage && parseFloat(item.taux_remplissage) < 0.3 && } - {item.taux_remplissage && parseFloat(item.taux_remplissage) >= 0.3 && parseFloat(item.taux_remplissage) <= 0.6 && } - {item.taux_remplissage && parseFloat(item.taux_remplissage) > 0.6 && } + {item.taux_remplissage && parseFloat(item.taux_remplissage) < 0.3 && } + {item.taux_remplissage && parseFloat(item.taux_remplissage) >= 0.3 && parseFloat(item.taux_remplissage) <= 0.6 && } + {item.taux_remplissage && parseFloat(item.taux_remplissage) > 0.6 && } @@ -16127,9 +16437,9 @@ const DisplayPartnerSession = (props) => { var myrow_id = New_Getall_TrainingSession_result_Timeline_Item[ItemId]._id; var my_invoice_status = New_Getall_TrainingSession_result_Timeline_Item[ItemId].invoiced_statut; var my_class_id = New_Getall_TrainingSession_result_Timeline_Item[ItemId].class_id; - var my_title = JSON.parse(rowss[ItemId]).title - var my_taux_remplissage = parseFloat(String(JSON.parse(rowss[ItemId]).taux_remplissage))*100; + var my_title = JSON.parse(rowss[ItemId]).title; + var my_taux_remplissage = parseFloat(String(JSON.parse(rowss[ItemId]).taux_remplissage)).toFixed(2) * 100; setgridline_id(ItemId); @@ -16345,7 +16655,8 @@ const DisplayPartnerSession = (props) => { nb_participant: JSON.parse(item).nb_participant, title: JSON.parse(item).titre, domaine: JSON.parse(item).domaine, - taux_remplissage: JSON.parse(item).taux_remplissage, + taux_remplissage: String(parseFloat(String(JSON.parse(item).taux_remplissage)).toFixed(2)), + nb_inscrit: JSON.parse(item).nb_inscrit, nb_preinscrit: JSON.parse(item).nb_preinscrit, duration: JSON.parse(item).duration_concat, @@ -16647,7 +16958,8 @@ const DisplayPartnerSession = (props) => { nb_participant: JSON.parse(item).nb_participant, title: JSON.parse(item).titre, domaine: JSON.parse(item).domaine, - taux_remplissage: JSON.parse(item).taux_remplissage, + taux_remplissage: String(parseFloat(String(JSON.parse(item).taux_remplissage)).toFixed(2)), + nb_inscrit: JSON.parse(item).nb_inscrit, nb_preinscrit: JSON.parse(item).nb_preinscrit, duration: JSON.parse(item).duration_concat, @@ -16966,7 +17278,7 @@ const DisplayPartnerSession = (props) => { {item.taux_remplissage && parseFloat(item.taux_remplissage) < 0.3 && } {item.taux_remplissage && parseFloat(item.taux_remplissage) >= 0.3 && parseFloat(item.taux_remplissage) <= 0.6 && } - {item.taux_remplissage && parseFloat(item.taux_remplissage) > 0.6 && } + {item.taux_remplissage && parseFloat(item.taux_remplissage) > 0.6 && } @@ -17111,7 +17423,7 @@ const DisplayPartnerSession = (props) => { var my_invoice_status = New_Getall_TrainingSession_result_Timeline_Item[ItemId].invoiced_statut; var my_class_id = New_Getall_TrainingSession_result_Timeline_Item[ItemId].class_id; var my_title = JSON.parse(rowss[ItemId]).title - var my_taux_remplissage = parseFloat(String(JSON.parse(rowss[ItemId]).taux_remplissage))*100; + var my_taux_remplissage = parseFloat(String(JSON.parse(rowss[ItemId]).taux_remplissage)) * 100; setgridline_id(ItemId); diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 9141f5d..75e24be 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -157,7 +157,12 @@ const DistplayPartnerTraningsPage = (props) => { //console.log("file_size = ",file_size," file_type = ",file_type); if (file_size > 1000000) { - alert("Le fichier ne doit pas dépasser un 1 Méga octets"); + //alert("Le fichier ne doit pas dépasser un 1 Méga octets"); + + setdisplay_alert_mysy("1"); + setalert_message("Le fichier ne doit pas dépasser un 1 Méga octets"); + setalert_type("error"); + return; } @@ -200,6 +205,11 @@ const DistplayPartnerTraningsPage = (props) => { }); alert(local_message); + + setdisplay_alert_mysy("1"); + setalert_message(local_message); + setalert_type("success"); + //history.push("/Partner/affichage"); //window.location.reload(); //return; @@ -216,7 +226,11 @@ const DistplayPartnerTraningsPage = (props) => { top: 0, behavior: "smooth", }); - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); + setformation_file_name(""); @@ -230,7 +244,13 @@ const DistplayPartnerTraningsPage = (props) => { setmyApiResponse("false"); setapiexcelimportmessage("-1"); sethandleSubmission_api("false"); - alert(" Impossible d'importer/mettre à jour les formations"); + // alert(" Impossible d'importer/mettre à jour les formations"); + + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message("Impossible d'importer/mettre à jour les formations"); + setalert_type("error"); + }); }; @@ -356,7 +376,7 @@ const DistplayPartnerTraningsPage = (props) => { .then((data) => data.json()) .then((data) => { // console.log('GetAllClass_new ==> Success:', data['message'], "data['status'] = ", data['status']); - // console.log(" String(data['status'] = ", String(data['status'])); + // console.log(" String(data['status'] = ", String(data['status'])); setTableData(data['message']); setRows(data['message']); if (String(data['status']) === String("false")) { @@ -1464,13 +1484,22 @@ const DistplayPartnerTraningsPage = (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) => { console.warn('Not good man :( Get_Partner_Object_Specific_Fields = ', error); setGet_Partner_Object_Specific_Fields_api("false"); - alert(" Impossible de recuperer la liste des collection et champs personnalisables"); + + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message("Impossible de recuperer la liste des collection et champs personnalisables"); + setalert_type("error"); + + // alert(" Impossible de recuperer la liste des collection et champs personnalisables"); //setmyApimyApiMessage("") }) } @@ -1823,12 +1852,18 @@ const DistplayPartnerTraningsPage = (props) => { setDelete_Class_result(res.data.message); GetAllClass_new(); - alert(res.data.message) + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Class_api("false"); setDelete_Class_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -1836,7 +1871,13 @@ const DistplayPartnerTraningsPage = (props) => { console.log('Delete_Class : Not good man :( Delete_Class = ' + error); setDelete_Class_api("false"); - alert(" Impossible de supprimer la formation"); + + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message("Impossible de supprimer la formation"); + setalert_type("error"); + + //alert(" Impossible de supprimer la formation"); }) } @@ -1852,7 +1893,12 @@ const DistplayPartnerTraningsPage = (props) => { function handlepush_to_lms(event, cellValues) { if (cellValues.row.lms_class_code && String(cellValues.row.lms_class_code).length > 2) { - alert(" Cette formation est déjà publiée sur la plateforme de E-Learning"); + // alert(" Cette formation est déjà publiée sur la plateforme de E-Learning"); + + setdisplay_alert_mysy("1"); + setalert_message(" Cette formation est déjà publiée sur la plateforme de E-Learning"); + setalert_type("error"); + return; } @@ -1876,7 +1922,10 @@ const DistplayPartnerTraningsPage = (props) => { setLoading(false); GetAllClass_new(); - alert(res.data.message); + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } @@ -1890,7 +1939,13 @@ const DistplayPartnerTraningsPage = (props) => { sethandlepush_to_lms_api("false"); sethandlepush_to_lms_message(res.data.message); setLoading(false); - alert("Erreur : " + res.data.message); + + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + + //alert("Erreur : " + res.data.message); } }).catch((error) => { @@ -2070,12 +2125,18 @@ const DistplayPartnerTraningsPage = (props) => { setSelectionModel([]); GetAllClass_new(); - alert(res.data.message); + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_LIST_Formations_api("false"); setDelete_LIST_Formations_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -2083,7 +2144,12 @@ const DistplayPartnerTraningsPage = (props) => { console.warn('Delete_LIST_Formations : Not good man :( mysearchtext = ' + error); setDelete_LIST_Formations_api("false"); - alert(" Impossible de supprimer la liste des sessions de formation"); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message("Impossible de supprimer la liste des sessions de formation"); + setalert_type("error"); + + //alert(" Impossible de supprimer la liste des sessions de formation"); }) } @@ -2257,7 +2323,7 @@ const DistplayPartnerTraningsPage = (props) => { var local_tmp = data_row_grouped_field; var local_tab_array = []; - + if (param[local_tmp]) { local_tab_array.push(String(param[local_tmp])); } else { @@ -2292,6 +2358,22 @@ const DistplayPartnerTraningsPage = (props) => { setcookie_catalog_display_view("mysy_catalog_data_row_grouped_by", String(grouped_by), { path: '/' }); } + + 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 (
@@ -2299,7 +2381,16 @@ const DistplayPartnerTraningsPage = (props) => {
} - + {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} { } - {data_row_grouped_by && (String(data_row_grouped_by) === "domain" || String(data_row_grouped_by) === "metier" || - String(data_row_grouped_by) === "categorie") && + {data_row_grouped_by && (String(data_row_grouped_by) === "domain" || String(data_row_grouped_by) === "metier" || + String(data_row_grouped_by) === "categorie") &&
{ const history = useHistory(); @@ -387,14 +386,21 @@ const DisplayPartnerUnite_Enseignement = (props) => { setadd_one_ue(""); setsubmenu(""); + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); - alert(res.data.message) } else { setDelete_Given_UE_api("false"); setDelete_Given_UE_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } @@ -435,13 +441,20 @@ const DisplayPartnerUnite_Enseignement = (props) => { setDelete_Given_UE_Planif_Line_api("true"); setDelete_Given_UE_Planif_Line_result(res.data.message); Getall_UE_Planif_data(selected_id); - alert(res.data.message); + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Given_UE_Planif_Line_api("false"); setDelete_Given_UE_Planif_Line_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } @@ -508,7 +521,11 @@ const DisplayPartnerUnite_Enseignement = (props) => { else { setGetall_Parter_Unite_Enseignement_api("false"); setGetall_Parter_Unite_Enseignement_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) => { @@ -576,7 +593,11 @@ const DisplayPartnerUnite_Enseignement = (props) => { else { setGetall_Parter_Unite_Enseignement_with_Filter_api("false"); setGetall_Parter_Unite_Enseignement_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) => { @@ -783,7 +804,11 @@ const DisplayPartnerUnite_Enseignement = (props) => { else { setGet_Given_Unite_Enseignement_api("false"); setGet_Given_Unite_Enseignement_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) => { @@ -1048,7 +1073,10 @@ const DisplayPartnerUnite_Enseignement = (props) => { seteu_changed(""); setdisplay_ue(""); clean_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')) { @@ -1062,7 +1090,11 @@ const DisplayPartnerUnite_Enseignement = (props) => { else { setAdd_Update_UE_Data_api("false"); setAdd_Update_UE_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) => { @@ -1457,7 +1489,11 @@ const DisplayPartnerUnite_Enseignement = (props) => { else { setGetall_UE_Planif_data_api("false"); setGetall_UE_Planif_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) => { @@ -1544,13 +1580,21 @@ const DisplayPartnerUnite_Enseignement = (props) => { Getall_UE_Planif_data(selected_id); - alert(res.data.message); + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + Close_Dialog_PLANIF_LINE_buton(); } else { setAdd_Update_Unite_Enseignement_Planif_api("false"); setAdd_Update_Unite_Enseignement_Planif_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) => { @@ -1670,12 +1714,41 @@ const DisplayPartnerUnite_Enseignement = (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*/} + +
Email
Clé de signature
Email
Clé d'ouverture { const handleAvis = () => { setavisMenu(null); history.push("/Recherche-Article-formation") - }; + }; function user_logout_confirmation() { /* si c'est une connexion partner qui est active */ - if (typeof (stored_user) != "undefined") { + if (typeof (stored_user) != "undefined") { const stored_cookie = getCookie('tokenmysych'); var acces_right_token_name = stored_cookie + "_uar"; @@ -283,6 +283,14 @@ const Header = () => { history.push("/recherche-formation") }; + const handlePartner_Catalog = (event) => { + // history.push("/moncatalog") + const win = window.open("/moncatalog", "_blank"); + win.focus(); + }; + + + const [Dialog_1_message, setDialog_1_message] = React.useState(false); const [Dialog_1_open, setDialog_1_open] = React.useState(false); function Dialog_1_handle_change_participant_session(message) { @@ -561,7 +569,9 @@ const Header = () => { MySy Information - Confirmez la deconnexion + Confirmez la deconnexion
+ +
@@ -569,15 +579,18 @@ const Header = () => {
- + onClick={(e) => { + if (partnerconnected && String(partnerconnected) === '1') + part_logout_confirmation(); + + if (userconnected && String(userconnected) === '1') + user_logout_confirmation(); + + }} + + className="bton_enreg_dialog">Deconnexion
@@ -688,9 +701,13 @@ const Header = () => {
-
+ {String(userconnected) !== "1" &&
Marketplace -
+
} + + {String(userconnected) === "1" &&
+ Catalogue +
}
@@ -735,25 +752,36 @@ const Header = () => { Reserver une Demo
-
{ + {String(userconnected) !== String("1") &&
{ setDialog_contact_open(true); }}> Contact -
+
} - -
+ {String(userconnected) === String("1") &&
{ + setDialog_contact_open(true); + }}> + Contact Editeur +
} + + + {String(userconnected) !== String("1") &&
Tarifs -
+
} -
{ history.push("/fonctionnalites") }}> + {String(userconnected) !== String("1") &&
{ history.push("/fonctionnalites") }}> Fonctionnalites -
+
} -
+ {String(userconnected) !== String("1") &&
A propos -
+
} + + {String(userconnected) === String("1") &&
+ L'editeur MySy Training +
} +
diff --git a/src/components/HebergementLms.js b/src/components/HebergementLms.js index 196a2d6..58473a4 100644 --- a/src/components/HebergementLms.js +++ b/src/components/HebergementLms.js @@ -4,20 +4,9 @@ import { getCookie } from 'react-use-cookie'; import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid'; import axios from "axios"; import Box from '@mui/material/Box'; -import InputLabel from '@mui/material/InputLabel'; -import InputAdornment from '@mui/material/InputAdornment'; -import FormControl from '@mui/material/FormControl'; -import TextField from '@mui/material/TextField'; -import AccountCircle from '@mui/icons-material/AccountCircle'; -import PhoneIcon from '@mui/icons-material/Phone' -import EmailIcon from '@mui/icons-material/Email' -import HomeIcon from '@mui/icons-material/Home' + import { useHistory } from "react-router-dom"; -import OrderConfirmation from "./OrderConfirmation"; -import { IoAddCircleOutline } from "react-icons/io5"; -import MyPaymentMethode from "./PaymentMethode"; -import img_visa_mastercard from "./../mysy_img/visa_mastercard.png" -import img_logo_stripe from "./../mysy_img/logo-stripe-secure.png"; + import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; import img_paypal from "./../mysy_img/paypal.png" import moment from "moment"; @@ -34,9 +23,13 @@ import SendIcon from '@mui/icons-material/Send'; import 'react-tooltip/dist/react-tooltip.css' import { Tooltip } from 'react-tooltip' +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; +import EditIcon from '@mui/icons-material/Edit'; +import { MdDeleteForever } from "react-icons/md"; +import Fab from '@mui/material/Fab'; +import { IoIosAddCircleOutline, IoMdTrash } from "react-icons/io"; - -const stripePromise = loadStripe('pk_test_51LUUfAAbmaEugrFTI25uZBD3IFjbtaL6jUfRV83diDf7nco8worna4NGKhMHbPP71WCwT5EHFRdDNatxPrJWwgZ300kgH5EO4p'); +//const stripePromise = loadStripe('pk_test_51LUUfAAbmaEugrFTI25uZBD3IFjbtaL6jUfRV83diDf7nco8worna4NGKhMHbPP71WCwT5EHFRdDNatxPrJWwgZ300kgH5EO4p'); //const stripePromise_PROD = loadStripe('pk_live_51LUUfAAbmaEugrFTyfNe4Dj0vbxc5qXQqNs0rztjAKy8oSlc5EEQyJGjA8Z5kXmP2gvUMcYLUBYCIyWWzLCw59RY00PtGInkVf'); @@ -87,10 +80,18 @@ function HebergementLms(props) { //console.log(" In GetLms_Themes res.data.message r_class = " + res.data.message); setGetLms_Themes_api("true"); setGetLms_Themes_result(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("success"); } else { setGetLms_Themes_api("false"); setGetLms_Themes_message(res.data.message); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } }).catch((error) => { @@ -136,6 +137,10 @@ function HebergementLms(props) { else { setGetLms_Themes_Logo_Banniere_api("false"); setGetLms_Themes_Logo_Banniere_message(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } }).catch((error) => { @@ -167,12 +172,22 @@ function HebergementLms(props) { setRecordData_api("true"); setRecordData_result(res.data.message); setLoading(false); - alert(" La mise à jour du theme a été correctement effectuée. "); + + setdisplay_alert_mysy("1"); + setalert_message(" La mise à jour du theme a été correctement effectuée. "); + setalert_type("success"); + + // alert(" La mise à jour du theme a été correctement effectuée. "); } else { setRecordData_api("false"); setRecordData_message(res.data.message); setLoading(false); + + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } }).catch((error) => { @@ -246,7 +261,7 @@ function HebergementLms(props) { } //image/png - if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp" ) { + if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp") { alert("Le fichier n'est pas au format PNG"); return; } @@ -335,7 +350,12 @@ function HebergementLms(props) { if (String(result['status']) === String("true")) { setSend_logo_Img_api("true"); - alert(" La mise à jour du logo a été correctement effectuée. "); + // alert(" La mise à jour du logo a été correctement effectuée. "); + + setdisplay_alert_mysy("1"); + setalert_message("La mise à jour du logo a été correctement effectuée."); + setalert_type("success"); + } else if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); @@ -345,6 +365,11 @@ function HebergementLms(props) { else { setSend_logo_Img_api("false"); setSend_logo_Img_message(result['message']); + + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); + } setLoading(false); @@ -390,7 +415,11 @@ function HebergementLms(props) { if (String(result['status']) === String("true")) { setDelete_logo_Img_api("true"); setGetLms_Themes_Logo_Img(''); - alert(" Le logo a été correctement supprimé "); + // alert(" Le logo a été correctement supprimé "); + setdisplay_alert_mysy("1"); + setalert_message(" Le logo a été correctement supprimé "); + setalert_type("success"); + } else if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); @@ -400,6 +429,11 @@ function HebergementLms(props) { else { setDelete_logo_Img_api("false"); setDelete_logo_Img_message(result['message']); + + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); + } setLoading(false); @@ -445,7 +479,12 @@ function HebergementLms(props) { if (String(result['status']) === String("true")) { setDelete_Banniere_Img_api("true"); setGetLms_Themes_Banniere_Img(''); - alert(" La bannière a été correctement supprimée "); + // alert(" La bannière a été correctement supprimée "); + + setdisplay_alert_mysy("1"); + setalert_message("La bannière a été correctement supprimée"); + setalert_type("success"); + } else if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); @@ -455,6 +494,12 @@ function HebergementLms(props) { else { setDelete_Banniere_Img_api("false"); setDelete_Banniere_Img_message(result['message']); + + + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); + } setLoading(false); @@ -492,7 +537,7 @@ function HebergementLms(props) { } //image/png - if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp" ) { + if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp") { alert("Le fichier n'est pas au format PNG"); return; } @@ -584,7 +629,11 @@ function HebergementLms(props) { if (String(result['status']) === String("true")) { setSendBackground_Img_api("true"); - alert(" L'image bannière a été correctement mise à jour") + setdisplay_alert_mysy("1"); + setalert_message("L'image bannière a été correctement mise à jour"); + setalert_type("success"); + + // alert(" L'image bannière a été correctement mise à jour") } else if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); @@ -594,6 +643,11 @@ function HebergementLms(props) { else { setSendBackground_Img_api("false"); setSendBackground_Img_message(result['message']); + + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); + } setLoading(false); @@ -658,6 +712,22 @@ function HebergementLms(props) { setlogo_file_name(); } + 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 (
@@ -665,6 +735,20 @@ function HebergementLms(props) {
} + + {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} + + + {String(menu) === String("default") &&

Parametrage de l'environnement E-Learning

@@ -738,22 +822,103 @@ function HebergementLms(props) { Logo actuel :
{""}
- +
} + + + + +
Import du logo
 
-
+ +
+ */} +
{logo_file_name && } {""}
- + {/* */}
} -
Import Bannière
+ + + + + +
 
 
+ {/*
} {showElement && props.alert_message && String(props.alert_type) === "error" &&
{ position: "fixed", marginLeft: '5%', top: "10px", "border-left": "1rem solid red", zIndex: '999999', background: '#d32f2f' }}> - + {props.alert_message} + { + props.clear_display_alert_mysy(); + setShowElement(false); + }}> + +
} {showElement && props.alert_message && String(props.alert_type) === "info" &&
{ position: "fixed", marginLeft: '5%', top: "10px", zIndex: '999999', background: '#0288d1' }}> - + {props.alert_message} + { + props.clear_display_alert_mysy(); + setShowElement(false); + }}> +
} @@ -57,9 +74,16 @@ const Module_Alert_Confirmation = (props) => { position: "fixed", marginLeft: '5%', top: "10px", zIndex: '999999', background: '#ed6c02' }}> - + {props.alert_message} + + { + props.clear_display_alert_mysy(); + setShowElement(false); + }}> + +
} diff --git a/src/components/Module_Editique.js b/src/components/Module_Editique.js index 8c82ea7..c91052c 100644 --- a/src/components/Module_Editique.js +++ b/src/components/Module_Editique.js @@ -83,6 +83,8 @@ import { IconButton } from '@material-ui/core'; import AutoFixHighOutlinedIcon from '@mui/icons-material/AutoFixHighOutlined'; import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; + function PaperComponent(props) { return ( { setInvoice_Session_Formation_result(res.data.message); Getall_Editable_Document_By_Partner_By_Collection(); props.GetListeInscrit(props.related_collection_recid, props.internal_url); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setInvoice_Session_Formation_api("false"); setInvoice_Session_Formation_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) => { @@ -692,7 +701,11 @@ const Module_Editique = (props) => { else { setGet_List_Stagiaire_Conventions_api("false"); setGet_List_Stagiaire_Conventions_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) => { @@ -775,7 +788,11 @@ const Module_Editique = (props) => { else { setGet_List_Stagiaire_Convocations_api("false"); setGet_List_Stagiaire_Convocations_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) => { @@ -885,20 +902,26 @@ const Module_Editique = (props) => { .then((result) => { setLoading(false); - console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.status = " + result['status']); - console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.message r_class = " + result['message']); + // console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.status = " + result['status']); + //console.log(" In Send_Stagiaire_Conventions_By_Email_Test res.data.message r_class = " + result['message']); if (String(result['status']) === String("true")) { setSend_Stagiaire_Conventions_By_Email_Test_api("true"); setSend_Stagiaire_Conventions_By_Email_Test_result(result['message']); - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("success"); Dialog_convention_handleClose_buton() } else { setSend_Stagiaire_Conventions_By_Email_Test_api("false"); setSend_Stagiaire_Conventions_By_Email_Test_message(result['message']); - alert(result['message']); + // alert(result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); } }).catch((error) => { @@ -990,7 +1013,11 @@ const Module_Editique = (props) => { setLoading(false); setGetCurrentSession_api("false"); setGetCurrentSession_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) => { @@ -1091,13 +1118,20 @@ const Module_Editique = (props) => { setSend_Stagiaire_Conventions_By_Email_result(res.data.message); Getall_Editable_Document_By_Partner_By_Collection(); - 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) => { @@ -1161,13 +1195,20 @@ const Module_Editique = (props) => { setSend_Stagiaire_Convocations_By_Email_result(res.data.message); Getall_Editable_Document_By_Partner_By_Collection(); - 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_Convocations_By_Email_api("false"); setSend_Stagiaire_Convocations_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) => { @@ -1287,6 +1328,21 @@ const Module_Editique = (props) => { oldExpanded_nom_traite.length === 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'] : [], ); } + + 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 (
@@ -1294,6 +1350,18 @@ const Module_Editique = (props) => {
} + {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} + + { {/* Dialog pour gerer les CONVOCATION_STAGIAIRE */} null} + static + onClose={() => null} - PaperProps={{ + PaperProps={{ - className: classes.paper, // Apply the paper style - style: { - overflowY: 'unset', - position: 'absolute', - top: '7rem', - margin: "2px", - }, - }} - hideBackdrop={true} - disableScrollLock - classes={{ - paper: classes.dialog - }} + 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" + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" > @@ -1830,7 +1898,7 @@ const Module_Editique = (props) => { - ({ @@ -560,13 +561,19 @@ const Module_Session_Planification = (props) => { setDelete_Saved_Model_Planning_api("true"); setDelete_Saved_Model_Planning_result(res.data.message); setgridline_sequence_new_planificatio_id(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Getall_Partner_Modele_Planning(); } else { setDelete_Saved_Model_Planning_api("false"); setDelete_Saved_Model_Planning_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -680,7 +687,10 @@ const Module_Session_Planification = (props) => { else { setGetall_List_Sequence_Ressource_api("false"); setGetall_List_Sequence_Ressource_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) => { @@ -732,12 +742,18 @@ const Module_Session_Planification = (props) => { Dialog_DIALOG_AGENDA_handleClose_buton(); - alert(res.data.message) + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Sequence_Session_Data_api("false"); setDelete_Sequence_Session_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"); } @@ -797,12 +813,18 @@ const Module_Session_Planification = (props) => { setselectionModel_sequence([]); - alert(res.data.message) + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Sequence_Session_Data_Mass_api("false"); setDelete_Sequence_Session_Data_Mass_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -962,13 +984,19 @@ const Module_Session_Planification = (props) => { setAdd_One_Sequence_Session_mass(); settab_selected_sequence_id([]); setselectionModel_sequence([]); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Dialog_seq_ressource_1_handleClose_buton(); } else { setAdd_One_Sequence_Session_Ressource_api("false"); setAdd_One_Sequence_Session_Ressource_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) => { @@ -1028,13 +1056,19 @@ const Module_Session_Planification = (props) => { setDialog_seq_ressource_1_selected_ressource_id(""); setDialog_seq_ressource_1_selected_ressource_poste(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); //Dialog_seq_ressource_1_handleClose_buton(); } else { setAdd_One_Ressource_Fom_Dialog_Sequence_api("false"); setAdd_One_Ressource_Fom_Dialog_Sequence_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) => { @@ -1077,13 +1111,19 @@ const Module_Session_Planification = (props) => { Getall_List_Sequence_Ressource(selected_sequence_id); - alert(res.data.message) + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setDelete_Sequence_Session_Ressource_Data_api("false"); setDelete_Sequence_Session_Ressource_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"); } @@ -1157,9 +1197,10 @@ const Module_Session_Planification = (props) => { setsequence_endDate(); */ - - - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); //Close_Dialog_Detail_seq_open(); // Dialog_DIALOG_AGENDA_handleClose_buton(); @@ -1167,7 +1208,10 @@ const Module_Session_Planification = (props) => { else { setAdd_One_Sequence_Session_api("false"); setAdd_One_Sequence_Session_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) => { @@ -1246,7 +1290,10 @@ const Module_Session_Planification = (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) => { @@ -1324,7 +1371,10 @@ const Module_Session_Planification = (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) => { @@ -1384,13 +1434,19 @@ const Module_Session_Planification = (props) => { settab_selected_sequence_id([]); setselectionModel_sequence([]); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Dialog_seq_ressource_1_handleClose_buton(); } else { setAdd_One_Sequence_Session_Ressource_Mass_api("false"); setAdd_One_Sequence_Session_Ressource_Mass_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) => { @@ -1484,7 +1540,7 @@ const Module_Session_Planification = (props) => { if (new_data2.length > 0) { setGetall_Sequence_Of_Session_result_planning_view(new_data2); - // console.log(" ### new_data2 Getall_Sequence_Of_Session = ", new_data2); + // console.log(" ### new_data2 Getall_Sequence_Of_Session = ", new_data2); } @@ -1492,7 +1548,10 @@ const Module_Session_Planification = (props) => { else { setGetall_Sequence_Of_Session_api("false"); setGetall_Sequence_Of_Session_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) => { @@ -1573,7 +1632,10 @@ const Module_Session_Planification = (props) => { else { setGetall_Partner_Modele_Planning_api("false"); setGetall_Partner_Modele_Planning_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) => { @@ -1676,7 +1738,7 @@ const Module_Session_Planification = (props) => { if (new_data2.length > 0) { setnew_planification_lines(new_data2); - // console.log(" ### new_data2 = ", new_data2); + // console.log(" ### new_data2 = ", new_data2); } // console.log(" ### ENN new_data2 = ", new_data2); @@ -1684,7 +1746,10 @@ const Module_Session_Planification = (props) => { else { setGet_Given_Sequence_Planning_Model_With_Option_api("false"); setGet_Given_Sequence_Planning_Model_With_Option_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) => { @@ -2342,14 +2407,20 @@ const Module_Session_Planification = (props) => { setDialog_seq_planif_periode_type(""); setplanification_ecrase_existing_seq(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); } else { setAdd_Automatic_Sequence_Session_api("false"); setAdd_Automatic_Sequence_Session_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) => { @@ -2419,7 +2490,10 @@ const Module_Session_Planification = (props) => { setupdate_sequence(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Dialog_DIALOG_AGENDA_handleClose_buton(); Close_Dialog_Detail_seq_open(); @@ -2427,7 +2501,10 @@ const Module_Session_Planification = (props) => { else { setUpdate_One_Sequence_Session_api("false"); setUpdate_One_Sequence_Session_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) => { @@ -2492,7 +2569,10 @@ const Module_Session_Planification = (props) => { setDialog_seq_choix_model_emargement_open(false); setDialog_seq_planif_periode_type(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); Dialog_seq_CREATION_SEMAINE_TYPE_handleClose_buton(); @@ -2503,7 +2583,10 @@ const Module_Session_Planification = (props) => { else { setAdd_Automatic_Sequence_Session_From_Week_Model_api("false"); setAdd_Automatic_Sequence_Session_From_Week_Model_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) => { @@ -2569,7 +2652,10 @@ const Module_Session_Planification = (props) => { setDialog_seq_choix_model_emargement_open(false); setDialog_seq_planif_periode_type(""); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_Detail_seq_open(); Dialog_seq_CREATION_SEMAINE_TYPE_handleClose_buton(); Dialog_EVENT_SEMAINE_TYPE_handleClose_buton(); @@ -2581,7 +2667,10 @@ const Module_Session_Planification = (props) => { else { setAdd_Automatic_Sequence_Session_From_Month_Model_api("false"); setAdd_Automatic_Sequence_Session_From_Month_Model_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) => { @@ -2688,7 +2777,10 @@ const Module_Session_Planification = (props) => { else { setGetall_Partner_Groupe_Inscrit_api("false"); setGetall_Partner_Groupe_Inscrit_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) => { @@ -2781,7 +2873,10 @@ const Module_Session_Planification = (props) => { else { setGetall_Class_List_UE_api("false"); setGetall_Class_List_UE_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) => { @@ -2875,7 +2970,10 @@ const Module_Session_Planification = (props) => { else { setGet_List_Given_UE_Planif_lines_api("false"); setGet_List_Given_UE_Planif_lines_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) => { @@ -2987,7 +3085,10 @@ const Module_Session_Planification = (props) => { else { setGet_Ressource_Avabilities_api("false"); setGet_Ressource_Avabilities_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) => { @@ -3098,13 +3199,19 @@ const Module_Session_Planification = (props) => { setRecord_New_Planning_Model_api("true"); setRecord_New_Planning_Model_result(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); Close_Dialog_RECORD_MODEL_PLANNING(); } else { setRecord_New_Planning_Model_api("false"); setRecord_New_Planning_Model_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) => { @@ -3158,7 +3265,7 @@ const Module_Session_Planification = (props) => { var local_ue_id = ""; - if( x.local_ue_id ) + if (x.local_ue_id) local_ue_id = x.local_ue_id @@ -3192,11 +3299,11 @@ const Module_Session_Planification = (props) => { "local_type": local_type, "local_ue_id": local_ue_id, "local_ue_planif_line_id": local_ue_planif_line_id, - + } new_planification_lines_normalized.push(node); - }); + }); var json_str = JSON.stringify(new_planification_lines_normalized) @@ -3216,13 +3323,19 @@ const Module_Session_Planification = (props) => { Getall_Sequence_Of_Session(selected_session_id); setnew_planification_lines([]); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); } else { setApply_Planning_To_Session_api("false"); setApply_Planning_To_Session_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) => { @@ -3244,6 +3357,21 @@ const Module_Session_Planification = (props) => { const [active_planif_modele, setactive_planif_modele] = useState(""); + 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 (
@@ -3251,6 +3379,17 @@ const Module_Session_Planification = (props) => {
} + {/*** Affichage des messages d'alerte*/} + {display_alert_mysy && String(display_alert_mysy) === "1" && + + } + {/*** FIN Affichage des messages d'alerte*/} + {/*** Dialog ajout RECORD MODEL PLANNING */} diff --git a/src/components/Modules_Mes_Documents.js b/src/components/Modules_Mes_Documents.js index 97badca..d5304f9 100644 --- a/src/components/Modules_Mes_Documents.js +++ b/src/components/Modules_Mes_Documents.js @@ -147,9 +147,9 @@ const Modules_Mes_Documents = (props) => { { field: '_id', headerName: '_id', hide: true, editable: false }, { field: 'id', headerName: 'id', hide: true, editable: false }, { field: 'file_extention', hide: true, editable: false }, - { field: 'file_name', headerName: 'file_name', hide: true, disableExport: true }, + { field: 'file_name', headerName: 'tech_file_name', hide: true, disableExport: true }, { - field: 'created_date', headerName: 'Date Creation', Width: 100, flex: 1, hide: false, editable: false, + field: 'created_date', headerName: 'Date Création', Width: 100, flex: 1, hide: false, editable: false, renderCell: (cellValues) => { return ( @@ -159,12 +159,12 @@ const Modules_Mes_Documents = (props) => { }, }, - { field: 'file_business_object', headerName: 'file_business_object', minWidth: 200, flex: 1, hide: false, editable: false, }, - { field: 'object_owner_collection', headerName: 'object_owner_collection', minWidth: 200, flex: 1, hide: false, editable: false }, - { field: 'client_raison_sociale', headerName: 'client_raison_sociale', minWidth: 200, flex: 1, hide: false, editable: false }, - { field: 'client_nom', headerName: 'client_nom', minWidth: 150, flex: 1, hide: false, editable: false }, + { field: 'file_business_object', headerName: 'Nom Fichier', minWidth: 200, flex: 1, hide: false, editable: false, }, + { field: 'object_owner_collection', headerName: 'System_Pro', minWidth: 200, flex: 1, hide: true, editable: false }, + { field: 'client_raison_sociale', headerName: 'Client Raison Soc.', minWidth: 200, flex: 1, hide: true, editable: false }, + { field: 'client_nom', headerName: 'Client Nom', minWidth: 150, flex: 1, hide: false, editable: false }, { - field: 'type_document', headerName: 'type_document', minWidth: 100, flex: 1, hide: false, editable: false, + field: 'type_document', headerName: 'Type doc.', minWidth: 100, flex: 1, hide: false, editable: false, renderCell: (cellValues) => { return ( diff --git a/src/components/Mon_Catalogue_Public.js b/src/components/Mon_Catalogue_Public.js index 46535e3..21e92f1 100644 --- a/src/components/Mon_Catalogue_Public.js +++ b/src/components/Mon_Catalogue_Public.js @@ -2906,7 +2906,7 @@ const Mon_Catalogue_Public = (props) => { - + {/******* Gestion du THEME "MySy_Theme2" */} {New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0 && String(my_theme_code) === "MySy_Theme2" &&
@@ -3139,7 +3139,7 @@ const Mon_Catalogue_Public = (props) => {
-
+
Eligible CPF @@ -3200,7 +3200,7 @@ const Mon_Catalogue_Public = (props) => {
-
+
Type @@ -3305,7 +3305,7 @@ const Mon_Catalogue_Public = (props) => {
-
+
diff --git a/src/components/Partner.js b/src/components/Partner.js index be70a53..52a8860 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -1682,7 +1682,7 @@ const Partner = (props) => { setdisplay_alert_mysy(""); } - + return (
@@ -1766,7 +1766,7 @@ const Partner = (props) => {
{ /********* Fin Dialog redaction email */} - + {left_menu === true &&
} @@ -1872,8 +1872,6 @@ const Partner = (props) => {
- - } style={{ overflow: 'hidden' }}> {String(menu) !== "infopartner" && }> MES INFORMATIONS } {String(menu) === "infopartner" && }> MES INFORMATIONS } @@ -1894,17 +1892,20 @@ const Partner = (props) => { {String(menu) !== "facture" && }> FACTURE MYSY} {String(menu) === "facture" && }>FACTURE MYSY} - {String(menu) !== "tous_mes_document" && }> DOCUMENTS (GED) } - {String(menu) === "tous_mes_document" && }> DOCUMENTS (GED)} - - -
+
+ + {String(menu) !== "tous_mes_document" &&     DOCUMENTS (GED) } + {String(menu) === "tous_mes_document" &&     DOCUMENTS (GED) } + +
+ +
@@ -1925,9 +1926,6 @@ const Partner = (props) => { {String(menu) === "part_produit_service" && }> PRODUITS & SERVICES } - - - diff --git a/src/components/PartnerClient_Activite.js b/src/components/PartnerClient_Activite.js index dbd3359..d0b0a43 100644 --- a/src/components/PartnerClient_Activite.js +++ b/src/components/PartnerClient_Activite.js @@ -12,7 +12,7 @@ import { Alert } from "@mui/material"; import { AiTwotoneEdit, AiTwotoneSave } from "react-icons/ai"; import profileimg from "../mysy_img/MYSY-profil-2.png"; import Abonnement from "./Abonnement"; -import { ConstructionOutlined, PropaneSharp, ResetTvRounded } from "@mui/icons-material"; +import { BorderBottom, ConstructionOutlined, PropaneSharp, ResetTvRounded } from "@mui/icons-material"; import { useHistory } from "react-router-dom"; import CheckOut from "./CheckOut"; import DatePicker from "react-datepicker"; @@ -35,21 +35,10 @@ import { ConsoleView } from "react-device-detect"; import fileDownload from 'js-file-download' import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; import { AiOutlineUserAdd } from "react-icons/ai"; +import { AiOutlinePlusCircle } from "react-icons/ai"; import FiberNewIcon from '@mui/icons-material/FiberNew'; -import Timeline from '@mui/lab/Timeline'; -import TimelineItem from '@mui/lab/TimelineItem'; -import TimelineSeparator from '@mui/lab/TimelineSeparator'; -import TimelineConnector from '@mui/lab/TimelineConnector'; -import TimelineContent from '@mui/lab/TimelineContent'; -import TimelineOppositeContent from '@mui/lab/TimelineOppositeContent'; -import TimelineDot from '@mui/lab/TimelineDot'; -import FastfoodIcon from '@mui/icons-material/Fastfood'; -import LaptopMacIcon from '@mui/icons-material/LaptopMac'; -import HotelIcon from '@mui/icons-material/Hotel'; -import RepeatIcon from '@mui/icons-material/Repeat'; -import Typography from '@mui/material/Typography'; import Dialog from '@mui/material/Dialog'; import DialogActions from '@mui/material/DialogActions'; @@ -69,9 +58,49 @@ import Rating from '@mui/material/Rating'; import { CiBoxList } from "react-icons/ci"; import { FcPlanner } from "react-icons/fc"; +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'; +import AutoFixHighOutlinedIcon from '@mui/icons-material/AutoFixHighOutlined'; +import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; + +import Module_Alert_Confirmation from "./Module_Alert_Confirmation"; + +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 PartnerClientActivite = (props) => { - + const classes_dialog = useStyles(); const history = useHistory(); var date_today_90j = new Date(); date_today_90j.setDate(date_today_90j.getDate() + 90); @@ -367,7 +396,7 @@ const PartnerClientActivite = (props) => { axios.post(myurl, form).then(res => { //console.log(" In Get_List_Activite_Assign_To_Me res.data.status = " + res.data.status); - // console.log(" In Get_List_Activite_Assign_To_Me res.data.message r_class = " + res.data.message); + // console.log(" In Get_List_Activite_Assign_To_Me res.data.message r_class = " + res.data.message); if (String(res.data.status) === String("true")) { setGet_List_Activite_Assign_To_Me_api("true"); @@ -469,7 +498,10 @@ const PartnerClientActivite = (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) => { @@ -574,7 +606,10 @@ const PartnerClientActivite = (props) => { setshow_all_activite_list("1"); setshowactivite_detail('0'); setadd_one_activite('0'); - 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")) { @@ -586,7 +621,10 @@ const PartnerClientActivite = (props) => { setrecordPartnerClient_Activite_Data_api("false"); setrecordPartnerClient_Activite_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"); } @@ -649,7 +687,10 @@ const PartnerClientActivite = (props) => { setUpdate_Activite_Status_api("false"); setUpdate_Activite_Status_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -747,7 +788,11 @@ const PartnerClientActivite = (props) => { Get_List_Activite_Of_client_Part(); Get_List_Activite_Assign_To_Me(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + setdatamodification_activite("0"); setformedit_mode_activite("0"); setcurrent_activite_recid(""); @@ -763,7 +808,10 @@ const PartnerClientActivite = (props) => { setrecord_One_PartnerClient_Activite_Data_api("false"); setrecord_One_PartnerClient_Activite_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"); } @@ -884,7 +932,10 @@ const PartnerClientActivite = (props) => { setDisplay_Part_Client_Activite_api("false"); setDisplay_Part_Client_Activite_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -1006,7 +1057,10 @@ const PartnerClientActivite = (props) => { setDisplay_Given_Activite_From_Activite_Recid_api("false"); setDisplay_Given_Activite_From_Activite_Recid_message(res.data.message); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); } @@ -1167,7 +1221,7 @@ const PartnerClientActivite = (props) => { const [kanban_colonne_width, setkanban_colonne_width] = useState("20vw"); // MySy Comment : design d'une tache (couleur, taille, etc) - const classes = { + const classes_old = { board: { display: "flex", margin: "0 auto", @@ -1200,6 +1254,72 @@ const PartnerClientActivite = (props) => { } }; + const classes = { + board: { + display: "flex", + margin: "0 auto", + width: "100%", + fontFamily: 'Arial, "Helvetica Neue", sans-serif' + }, + column: { + // minWidth: 200, + //width: "16vw", + width: kanban_colonne_width, + height: "80vh", + margin: "0 auto", + backgroundColor: "#FFFFFF", + border: 'solid 1px', + borderLeft: "1px solid #ecf1fc", + borderRight: "1px solid #ecf1fc", + + }, + + column_first_left: { + // minWidth: 200, + //width: "16vw", + width: kanban_colonne_width, + height: "80vh", + margin: "0 auto", + backgroundColor: "#FFFFFF", + border: 'solid 1px', + borderTop: 'none', + // borderRight: "1px solid #ecf1fc", + + }, + + column_right_solid_border: { + // minWidth: 200, + //width: "16vw", + width: kanban_colonne_width, + height: "80vh", + margin: "0 auto", + backgroundColor: "#FFFFFF", + border: "1px solid #ecf1fc", + borderRight: 'solid 1px', + borderBottom: 'solid 1px', + + }, + + columnHead: { + textAlign: "center", + padding: 5, + fontSize: "14px", + backgroundColor: "rgb(103, 164, 239)", + border: "1px solid", + marginBottom: "5px", + }, + item: { + padding: 5, + marginBottom: 10, + fontSize: "0.8em", + cursor: "pointer", + backgroundColor: "#f4f6f6", + border: "0px solid", + cursor: "move", + width: "94%", + marginLeft: "3%", + } + }; const KanbanColumn = ({ status, changeTaskStatus, children }) => { const ref = useRef(null); @@ -1299,13 +1419,20 @@ const PartnerClientActivite = (props) => { Get_List_Activite_Of_client_Part(); Get_List_Activite_Assign_To_Me(); Dialog_ACTIVITE_handleClose_buton(); - alert(res.data.message); + // alert(res.data.message); + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("success"); + } else { sethandleClick_delete_Activite_data_from_id_api("false"); sethandleClick_delete_Activite_data_from_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) => { @@ -1332,19 +1459,66 @@ const PartnerClientActivite = (props) => { setdatamodification_activite(""); }; + 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*/} {/* Dialog pour gerer une ACTIVITE */} null} + + PaperProps={{ + + + className: classes_dialog.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '5rem', + margin: "2px", + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes_dialog.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" > - MySy Information + MySy Information @@ -1516,6 +1690,15 @@ const PartnerClientActivite = (props) => { + + + +
@@ -1567,186 +1750,35 @@ const PartnerClientActivite = (props) => {
{String(show_all_activite_list) === "1" && String(showactivite_detail) !== "1" && String(add_one_activite) !== "1" &&
-
Ajouter une activité
- - {/*
-
-
-
Activité(s) qui me sont Assignée(s)
-
-
- - {Get_List_Activite_Assign_To_Me_result && String(Get_List_Activite_Assign_To_Me_api) === "true" && - Get_List_Activite_Assign_To_Me_result.map((client) => ( - - ))} - -
- -
-
-
-
-
-
-
Activté(s) que j'ai créée(s)
-
-
- - {Get_List_Activite_Of_client_Part_result && String(Get_List_Activite_Of_client_Part_api) === "true" && - Get_List_Activite_Of_client_Part_result.map((client) => ( - - ))} - -
- -
-
*/}
Activité(s) qui me sont Assignée(s)
- {/*
- Affichage : - -
*/} +
- {activite_status_list_pave_affiche.map(channel => ( + {activite_status_list_pave_affiche.map((channel, index) => ( -
-
{Opportunite_chanel_label[channel.id]}
+ + {String(index) === "0" &&
+
{Opportunite_chanel_label[channel.id]}
{Get_List_Activite_Assign_To_Me_result && Get_List_Activite_Assign_To_Me_result.length > 0 && Get_List_Activite_Assign_To_Me_result.filter(item => JSON.parse(item).status === channel.id) .map(item => (
-
@@ -1783,7 +1815,7 @@ const PartnerClientActivite = (props) => {
-
+
} + + {String(index) !== "0" &&
+
{Opportunite_chanel_label[channel.id]}
+
+ {Get_List_Activite_Assign_To_Me_result && Get_List_Activite_Assign_To_Me_result.length > 0 && + Get_List_Activite_Assign_To_Me_result.filter(item => JSON.parse(item).status === channel.id) + .map(item => ( + +
+
+ + {String(String(JSON.parse(item).status)) === "1" && + } + + {String(String(JSON.parse(item).status)) === "0" && + } + + {String(String(JSON.parse(item).status)) === "-1" && + } +
+ +
+ ))} +
+
} + + + ))} + + + +
 
@@ -1832,22 +1951,17 @@ const PartnerClientActivite = (props) => {
Activté(s) que j'ai créée(s)
- {/*
- Affichage : - -
*/} -
- {activite_status_list_pave_affiche.map(channel => ( + {activite_status_list_pave_affiche.map((channel, index) => ( -
+ {String(index) === "0" &&
{Opportunite_chanel_label[channel.id]}
{Get_List_Activite_Of_client_Part_result && Get_List_Activite_Of_client_Part_result.length > 0 && @@ -1855,7 +1969,8 @@ const PartnerClientActivite = (props) => { .map(item => (
-
@@ -1886,7 +2001,7 @@ const PartnerClientActivite = (props) => { className="detail_activite"> -
-
+
} + + {String(index) !== "0" &&
+
{Opportunite_chanel_label[channel.id]}
+
+ {Get_List_Activite_Of_client_Part_result && Get_List_Activite_Of_client_Part_result.length > 0 && + Get_List_Activite_Of_client_Part_result.filter(item => JSON.parse(item).status === channel.id) + .map(item => ( + +
+ +
+ + {String(String(JSON.parse(item).status)) === "1" && + } + + {String(String(JSON.parse(item).status)) === "0" && + } + + {String(String(JSON.parse(item).status)) === "-1" && + } +
+ +
+ ))} +
+
} + ))}
diff --git a/src/components/Partner_Client.js b/src/components/Partner_Client.js index 32ec769..5202539 100644 --- a/src/components/Partner_Client.js +++ b/src/components/Partner_Client.js @@ -154,6 +154,20 @@ const Partner_Client = (props) => { { field: 'website', headerName: 'Siteweb', width: 100, hide: true, editable: false, renderCell: (params) => , }, { field: 'is_company', headerName: 'Société', width: 100, hide: true, editable: false, renderCell: (params) => , }, + { + field: 'intranet_account_id', headerName: 'Intranet', width: 100, hide: false, editable: false, renderCell: (cellValues) => ( + + ) + }, { field: 'is_prospect', headerName: 'Pros/Cli', width: 100, hide: false, editable: false, @@ -341,7 +355,7 @@ const Partner_Client = (props) => { const [Get_List_Partner_Clients_api, setGet_List_Partner_Clients_api] = useState(); const [Get_List_Partner_Clients_message, setGet_List_Partner_Clients_message] = useState(); - const [Get_List_Partner_Clients_result, setGet_List_Partner_Clients_result] = useState(); + const [Get_List_Partner_Clients_result, setGet_List_Partner_Clients_result] = useState([]); function Get_List_Partner_Clients(event) { var form = new FormData(); @@ -805,6 +819,26 @@ const Partner_Client = (props) => {
}
+
+
+ Compte Intranet +
+ {Get_List_Partner_Clients_result && selected_id && + String(selected_id).length > 0 && JSON.parse(Get_List_Partner_Clients_result[gridline_id]).intranet_account_id && + String(JSON.parse(Get_List_Partner_Clients_result[gridline_id]).intranet_account_id).length > 5 + &&
+ Oui +
} + + {(Get_List_Partner_Clients_result && selected_id && + String(selected_id).length > 0) && + (!JSON.parse(Get_List_Partner_Clients_result[gridline_id]).intranet_account_id || + String(JSON.parse(Get_List_Partner_Clients_result[gridline_id]).intranet_account_id).length <= 5) + &&
+ Non +
} +
+
Téléphone @@ -837,6 +871,8 @@ const Partner_Client = (props) => {
}
+ +
 
@@ -1118,6 +1154,7 @@ const Partner_Client = (props) => { website: JSON.parse(item).website, is_company: JSON.parse(item).is_company, is_prospect: JSON.parse(item).is_prospect, + intranet_account_id: JSON.parse(item).intranet_account_id, } ))} diff --git a/src/components/RechercheArticles_new_v2.js b/src/components/RechercheArticles_new_v2.js index 586d78b..31d470c 100644 --- a/src/components/RechercheArticles_new_v2.js +++ b/src/components/RechercheArticles_new_v2.js @@ -4,7 +4,7 @@ import axios from "axios"; import Articles from "../components/Article"; import { FaSearch, FaRegArrowAltCircleDown, FaRegArrowAltCircleUp } from 'react-icons/fa'; import { format } from 'date-fns' -import moment from "moment"; +import moment from "moment"; import Pagination from "./TestPagination"; import data from "./data/mock-data.json"; import { useHistory } from "react-router-dom"; @@ -23,7 +23,7 @@ import connect_white from "../mysy_img/connect_white_v2.png"; import connect_green from "../mysy_img/connect_green.png"; import { BsFillXCircleFill } from "react-icons/bs"; import Fotter_v3 from "./Fotter_v3"; - + import Dialog from '@mui/material/Dialog'; import DialogActions from '@mui/material/DialogActions'; import DialogContent from '@mui/material/DialogContent'; @@ -49,12 +49,16 @@ import { FcPlus } from "react-icons/fc"; import Autocomplete from '@mui/material/Autocomplete'; import TextField from '@mui/material/TextField'; +import { FcInternal } from "react-icons/fc"; + import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; import { IconButton } from '@material-ui/core'; import { makeStyles } from "@material-ui/core/styles"; import Paper from '@material-ui/core/Paper'; import Draggable from 'react-draggable'; + + function PaperComponent(props) { return ( { var myurl = "" /* if (document.getElementById("allelement").checked !== true && - document.getElementById("SearchText").disabled !== true) { - //alert(" recherche classique laaa "); - myurl = process.env.REACT_APP_API_URL + "myclass/api/recherche_articles_avis/"; + document.getElementById("SearchText").disabled !== true) { + //alert(" recherche classique laaa "); + myurl = process.env.REACT_APP_API_URL + "myclass/api/recherche_articles_avis/"; } else if (document.getElementById("allelement").checked === true && - document.getElementById("SearchText").disabled === true) { - myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_articles_avis/"; + document.getElementById("SearchText").disabled === true) { + myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_articles_avis/"; }*/ myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_articles_avis/"; @@ -294,13 +298,13 @@ const RechercheArticles_new_v2 = (props) => { var myurl = "" /* if (document.getElementById("allelement").checked !== true && - document.getElementById("SearchText").disabled !== true) { - //alert(" recherche classique laaa "); - myurl = process.env.REACT_APP_API_URL + "myclass/api/recherche_articles_avis/"; + document.getElementById("SearchText").disabled !== true) { + //alert(" recherche classique laaa "); + myurl = process.env.REACT_APP_API_URL + "myclass/api/recherche_articles_avis/"; } else if (document.getElementById("allelement").checked === true && - document.getElementById("SearchText").disabled === true) { - myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_published_articles_avis/"; + document.getElementById("SearchText").disabled === true) { + myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_published_articles_avis/"; }*/ myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_published_articles_avis/"; @@ -361,13 +365,13 @@ const RechercheArticles_new_v2 = (props) => { var myurl = "" /* if (document.getElementById("allelement").checked !== true && - document.getElementById("SearchText").disabled !== true) { - //alert(" recherche classique laaa "); - myurl = process.env.REACT_APP_API_URL + "myclass/api/recherche_articles_avis/"; + document.getElementById("SearchText").disabled !== true) { + //alert(" recherche classique laaa "); + myurl = process.env.REACT_APP_API_URL + "myclass/api/recherche_articles_avis/"; } else if (document.getElementById("allelement").checked === true && - document.getElementById("SearchText").disabled === true) { - myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_non_published_articles_avis/"; + document.getElementById("SearchText").disabled === true) { + myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_non_published_articles_avis/"; }*/ myurl = process.env.REACT_APP_API_URL + "myclass/api/get_all_non_published_articles_avis/"; @@ -767,7 +771,7 @@ const RechercheArticles_new_v2 = (props) => { setimg_img_article_file(""); setimg_img_article_file2(""); clear_article_avis_fields(); - + setfield_texte_avis(""); }; @@ -782,6 +786,7 @@ const RechercheArticles_new_v2 = (props) => { setarticle_avis_internal_url(""); setarticle_avis_display_header_img(false); setarticle_avis_meta_description(""); + setfield_texte_avis(""); } const [article_avis_date_publication, setarticle_avis_date_publication] = useState(new Date().toLocaleDateString('fr-FR')); @@ -810,7 +815,7 @@ const RechercheArticles_new_v2 = (props) => { form.append("qualite", " --- "); form.append("note", "---"); - if( article_avis_internal_url && String(article_avis_internal_url).trim().length > 5 ){ + if (article_avis_internal_url && String(article_avis_internal_url).trim().length > 5) { form.append("internal_url", article_avis_internal_url); } @@ -865,7 +870,7 @@ const RechercheArticles_new_v2 = (props) => { setLoading(true); axios.post(myurl, form).then(res => { - setLoading(false); + setLoading(false); if (String(res.data.status) === String("false")) { alert(res.data.message); } @@ -947,7 +952,7 @@ const RechercheArticles_new_v2 = (props) => { //image/png - if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp" && + if (String(file_type) !== "image/png" && String(file_type) !== "image/jpg" && String(file_type) !== "image/webp" && String(file_type) !== "image/jpeg") { alert("Le fichier n'est pas au format PNG, String(file_type)" + String(file_type)); return; @@ -975,11 +980,11 @@ const RechercheArticles_new_v2 = (props) => { // Verification que le nom du fichier est alpha numerique /*var regExp = /^[A-Za-z0-9]+$/; if (!regExp.test(event.target.files[0].name)) { - sethandleSubmission_img_article_message(" Le nom de l'image comporte des caractères non alphanumériques"); - sethandleSubmission_img_article_api("false"); - setLoading(false); - - return + sethandleSubmission_img_article_message(" Le nom de l'image comporte des caractères non alphanumériques"); + sethandleSubmission_img_article_api("false"); + setLoading(false); + + return }*/ @@ -1137,6 +1142,40 @@ const RechercheArticles_new_v2 = (props) => { } /***** Fin gestion de l'image de l'article */ + + + function init_with_modele() { + var init_text = '
\ + 1. Une solution complète et intégrée :
\ +
\ + Mysy Training propose une plateforme tout-en-un qui simplifie la gestion de votre organisme de formation, depuis la planification des sessions jusqu\'à la facturation, en passant par le suivi des apprenants.
\ + Cette centralisation réduit les tâches administratives et optimise votre efficacité.
\ + Mysy Training propose une plateforme tout-en-un qui simplifie la gestion de votre organisme de formation, depuis la \ + planification des sessions jusqu\'à la facturation, en passant par le suivi des apprenants. Cette centralisation réduit les tâches administratives et \ + optimise votre efficacité.
\ +
\ + 2. Conformité avec les réglementations :
\ +
\ + La solution est conçue pour répondre aux exigences légales, comme Qualiopi ou les obligations de suivi des financements CPF. Vous êtes ainsi assuré de\ + rester conforme aux normes en vigueur.
\ +
\ + 3. Liste numérotée
  1. \ +
    \ + Renforcer la crédibilité des établissements de formation.
  2. \ +
    Assurer une meilleure qualité des prestations de formation.
  3. Rendre les organismes éligibles aux aides financières   (par exemple, des OPCO ou Pôle Emploi).
4. Liste bullet point
  • \ + MySy offre un module de gestion administrative permettant de centraliser tous les documents liés aux formations, y compris les conventions, convocations, programmes, et certificats de satisfaction.
  • \ +
  • \ + Grâce à des fonctionnalités telles que l\'import/export de données en Excel et la gestion automatisée des documents, \ + les organismes peuvent facilement fournir des preuves de conformité lors de l\'audit Qualiopi.
\ +
\ + 5. Une solution complète et intégrée (suite):
\ +
\ + Mysy Training propose une plateforme tout-en-un qui simplifie la gestion de votre organisme de formation, depuis la \ + planification des sessions jusqu\'à la facturation, en passant par le suivi des apprenants.
\ + Cette centralisation réduit les tâches administratives et optimise votre efficacité.
' + + setfield_texte_avis(init_text); + } return (
@@ -1170,7 +1209,7 @@ const RechercheArticles_new_v2 = (props) => { aria-labelledby="draggable-dialog-title" > - Votre article + Votre article @@ -1201,7 +1240,7 @@ const RechercheArticles_new_v2 = (props) => {
- Url souhaitée + Url souhaitée
@@ -1327,7 +1366,7 @@ const RechercheArticles_new_v2 = (props) => {
+ Le nom du fichier ne contient que des caractères alphanumériques, sans espaces ">
-
- Texte Article +
+
+ Texte Article +
+
{ + + if (field_texte_avis && String(field_texte_avis).length > 0) { + if (window.confirm("Vos modifications seront perdues, Confirmer-vous la réinitialisation du text ?")) { + init_with_modele(); + } + } else { + init_with_modele(); + } + + }}> + Init +
@@ -1561,16 +1616,16 @@ const RechercheArticles_new_v2 = (props) => {
{/*result && myApiResponse === "True" &&
- setCurrentPage2(page)} - /> + setCurrentPage2(page)} + /> -
*/} +
*/} {String(publish_status) === "all" && get_all_articles_avis_result && get_all_articles_avis_result.length > 0 && currentTableData2 && get_all_articles_avis_result.map((formation) => (
@@ -1607,16 +1662,16 @@ const RechercheArticles_new_v2 = (props) => { {/*result &&
- setCurrentPage2(page)} - /> + setCurrentPage2(page)} + /> -
- */} +
+ */}
diff --git a/src/components/SignIn.js b/src/components/SignIn.js index ad8d60a..fb2a9ec 100644 --- a/src/components/SignIn.js +++ b/src/components/SignIn.js @@ -480,7 +480,7 @@ function SignIn() { - +
diff --git a/src/components/UpdatePartnerInfo.js b/src/components/UpdatePartnerInfo.js index 2b76997..daf7e87 100644 --- a/src/components/UpdatePartnerInfo.js +++ b/src/components/UpdatePartnerInfo.js @@ -48,6 +48,7 @@ import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; import { CiTrash } from "react-icons/ci"; + const useStyles = makeStyles((theme) => ({ dialog: { @@ -844,14 +845,20 @@ function UpdateParnterInfo(props) { document.getElementsByName("iscertifvoltaire")[0].style.backgroundColor = "#ECEFF1"; } - alert(" La mise à jour a été faite "); - + // alert(" La mise à jour a été faite "); + setdisplay_alert_mysy("1"); + setalert_message(" La mise à jour a été faite "); + setalert_type("success"); } else if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); history.push("/Connexion"); } else { - alert(" Erreur : " + result['message']); + // alert(" Erreur : " + result['message']); + setdisplay_alert_mysy("1"); + setalert_message(result['message']); + setalert_type("error"); + } }) @@ -2618,7 +2625,9 @@ function UpdateParnterInfo(props) { setAdd_Update_Catalog_Pub_Banniere_api("true"); setAdd_Update_Catalog_Pub_Banniere_result(res.data.message); + setimg_bg_file(""); + Get_Partner_Catalog_Pub_Config(); // alert(res.data.message); setdisplay_alert_mysy("1"); @@ -4747,7 +4756,7 @@ function UpdateParnterInfo(props) { {Partner_Catalog_Pub_banniere && String(Partner_Catalog_Pub_banniere).length > 20 &&
Bannière actuelle :
- {""} + {""} zzzz

} -
Import du logo
+

 
@@ -5021,7 +5030,7 @@ function UpdateParnterInfo(props) {
} -
Import du logo
+

 
diff --git a/src/components/sidebar.js b/src/components/sidebar.js index 8913a59..8d306bd 100644 --- a/src/components/sidebar.js +++ b/src/components/sidebar.js @@ -30,17 +30,17 @@ const SideBar = () => { function logout_confirmation() { // si c'est une connexion partner qui est active - if (typeof (stored_partner) != "undefined") { + if (typeof (stored_partner) !== "undefined") { //alert(" c'est une connexion PARTTT qui est active"); removeCookie_part('tokenmysypart', { path: '/' }); - history.push("/PartnerLogin"); + history.push("/Connexion"); } // si c'est une connexion user qui est active - if (typeof (stored_user) != "undefined") { + if (typeof (stored_user) !== "undefined") { //alert(" c'est une connexion USERR qui est active"); removeCookie_part('tokenmysych', { path: '/' }); - history.push("/mysy-training-login/0/0"); + history.push("/intranet"); } } @@ -104,7 +104,28 @@ const SideBar = () => { } useEffect(() => { - whosisconnected(); + var local_user_connect = 0; + var local_part_connect = 0; + + if (typeof (stored_user) === "undefined" || String(stored_user) === '') { + setuserconnected("0"); + local_user_connect = 0; + } else { + setuserconnected("1"); + setsomeoneconnected("1"); + local_user_connect = 1; + //alert(" user connected OK"); + } + + if (typeof (stored_part) === "undefined" || String(stored_part) === '') { + setpartnerconnected("0"); + local_part_connect = 0; + } else { + setpartnerconnected("1"); + setsomeoneconnected("1"); + local_part_connect = 1; + //alert(" partner connected OK"); + } }, []); return ( @@ -159,7 +180,7 @@ const SideBar = () => { - {typeof (stored_partner) != "undefined" && + {typeof (stored_partner) !== "undefined" && /* Connexion partner active */