diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 6492f96..ce85921 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -1193,7 +1193,7 @@ const DisplayPartnerSession = (props) => { formData.append("token", stored_cookie); //console.log("token = " + stored_cookie); - + setLoading(true); fetch( process.env.REACT_APP_API_URL + "myclass/api/Add_Update_SessionFormation_mass_for_many_class/", { @@ -1204,8 +1204,8 @@ const DisplayPartnerSession = (props) => { .then((response) => response.json()) .then((result) => { - console.log(" ## result['status'] = ", result['status']) - + //console.log(" ## result['status'] = ", result['status']) + setLoading(false); if (String(result['status']) === String("Err_Connexion")) { alert('Erreur: ' + result['message']); history.push("/Connexion"); @@ -1232,6 +1232,7 @@ const DisplayPartnerSession = (props) => { }) .catch((error) => { + setLoading(false); console.error('Error:', error); setliste_sessions_file_change_api("false"); alert(" Impossible d'importer les sessions"); @@ -2210,8 +2211,6 @@ const DisplayPartnerSession = (props) => { setp_session_ondemande_label(); setp_session_ondemande(); - - } @@ -2256,6 +2255,29 @@ const DisplayPartnerSession = (props) => { setone_SessionstartDate(); setone_urlpreview_certif(); setone_field_contenu_ftion(); + setp_one_myclass_title(); + setp_one_code_session(); + setp_one_code_session_id(); + setp_one_adresse(); + setp_one_code_postal(); + setp_one_ville(); + setp_one_pays(); + setp_one_formateur(); + setp_one_lms_class_code(); + setp_one_nb_participant(); + setp_one_prix_session(); + setp_one_session_ondemande("0"); + setp_one_session_ondemande_label(); + setp_one_session_distance("0"); + setp_one_session_distance_label(); + setp_one_session_presentiel("0"); + setp_one_session_presentiel_label(); + setp_one_session_status(); + setp_one_session_status_label(); + setp_one_session_etape(); + setp_one_session_etape_label(); + + } const [is_lms_class_code, setis_lms_class_code] = useState(); @@ -2416,19 +2438,18 @@ const DisplayPartnerSession = (props) => { form.append("contenu_ftion", contenu_ftion); - //console.log(" ### CreateSessionFormation form = ", form); //return; var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_SessionFormation/"; - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In CreateSessionFormation res.data.status = " + res.data.status); //console.log(" In CreateSessionFormation res.data.message r_class = " + res.data.message); - + setLoading(false); if (String(res.data.status) === String("true")) { setCreateSessionFormation_api("true"); setCreateSessionFormation_result(res.data.message); @@ -2449,7 +2470,7 @@ const DisplayPartnerSession = (props) => { } }).catch((error) => { - + setLoading(false); console.warn('CreateSessionFormation : Not good man :( mysearchtext = ' + error); setCreateSessionFormation_api("false"); alert(" Impossible de mettre à jour la session"); @@ -2608,19 +2629,26 @@ const DisplayPartnerSession = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_SessionFormation/"; - + setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In One_CreateSessionFormation res.data.status = " + res.data.status); //console.log(" In One_CreateSessionFormation res.data.message r_class = " + res.data.message); - + setLoading(false); if (String(res.data.status) === String("true")) { setone_CreateSessionFormation_api("true"); setone_CreateSessionFormation_result(res.data.message); setsessionChanged(false); Getall_TrainingSession(); - alert(res.data.message); + One_clearSessionFields(); setaddOneSession(); + + setaddOneParticipant(); + setdisplay_detail_insc(); + setselected_code_session(); + setsubmenu(); + + alert(res.data.message); //GetCurrentSession(p_one_code_session, one_selected_internal_url); } else if (String(res.data.status) === String("Err_Connexion")) { @@ -2634,7 +2662,7 @@ const DisplayPartnerSession = (props) => { } }).catch((error) => { - + setLoading(false); console.warn('One_CreateSessionFormation : Not good man :( = ' + error); setone_CreateSessionFormation_api("false"); alert("Erreur : Impossible d'ajouter la session"); diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index cc96924..3875724 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -20,7 +20,10 @@ import participants from "../mysy_img/participants.png"; import fileDownload from 'js-file-download' import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; -import { FcCancel, FcApproval, FcAcceptDatabase, FcPrint } from "react-icons/fc"; +import { + FcCancel, FcApproval, FcAcceptDatabase, + FcPrint, FcDataConfiguration, FcDownload +} from "react-icons/fc"; import DatePicker from "react-datepicker"; import "react-datepicker/dist/react-datepicker.css"; import { format } from 'date-fns' @@ -127,6 +130,232 @@ const DisplayPartnerStagiaires = (props) => { { field: 'date_debut', headerName: 'Du', width: datagrid_columns_size_model1, hideable: true, }, { field: 'date_fin', headerName: 'Au', width: datagrid_columns_size_model1, hideable: true, }, { field: 'class_internal_url', headerName: 'class_internal_url', hide: true, }, + { + field: 'Action', headerName: 'Action', hide: false, width: 200, + renderCell: (cellValues) => { + + return ( +