25/08/23 - 21h

recette2
cherif 2023-08-25 20:53:17 +02:00
parent c3ab4c755d
commit 426bc94fa0
4 changed files with 725 additions and 291 deletions

View File

@ -148,8 +148,28 @@ const DisplayPartnerSession = (props) => {
{ field: 'date_debut', headerName: 'Date debut', hide: false, width: datagrid_columns_size_model2, },
{ field: 'date_fin', headerName: 'Datefin', hideable: false, width: datagrid_columns_size_model2, },
{ field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2, },
{ field: 'presentiel', headerName: 'Presentiel', width: datagrid_columns_size_model2, },
{
field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2,
valueFormatter: (params) => {
if (String(params.value) === "0")
return "Non";
else if (String(params.value) === "1")
return "Oui";
else
return "?";
},
},
{
field: 'presentiel', headerName: 'Presentiel', width: datagrid_columns_size_model2,
valueFormatter: (params) => {
if (String(params.value) === "0")
return "Non";
else if (String(params.value) === "1")
return "Oui";
else
return "?";
},
},
{ field: 'formateur', headerName: 'Formateur', width: datagrid_columns_size_model1, hide: true, hideable: true, },
{ field: 'nb_participant', headerName: 'Nb Parti.', width: datagrid_columns_size_model2, align: "center", },
{
@ -840,12 +860,12 @@ const DisplayPartnerSession = (props) => {
const stored_cookie = getCookie('tokenmysypart');
formData.append("token", stored_cookie);
formData.append("session_id", selected_session_id);
formData.append("class_internal_url", selected_internal_url);
//formData.append("session_id", selected_session_id);
//formData.append("class_internal_url", selected_internal_url);
//console.log("token = " + stored_cookie);
fetch(
process.env.REACT_APP_API_URL + "myclass/api/AddStagiairetoClass_mass/",
process.env.REACT_APP_API_URL + "myclass/api/AddStagiairetoClass_mass_for_many_session/",
{
method: 'POST',
body: formData,
@ -857,8 +877,8 @@ const DisplayPartnerSession = (props) => {
//console.log('Success:', result['message']);
setliste_participants_file_change_result(result['message']);
setliste_participants_file_change_api("true");
GetListePreinscrit(selected_code_session, selected_internal_url);
GetListeInscrit(selected_code_session, selected_internal_url);
GetListePreinscrit(selected_session_id, selected_internal_url);
GetListeInscrit(selected_session_id, selected_internal_url);
alert(" Les stagiaires ont été correctement importés");
submenu_inscrit();
@ -871,12 +891,14 @@ const DisplayPartnerSession = (props) => {
else {
setliste_participants_file_change_message(result['message']);
setliste_participants_file_change_api("false");
alert(result['message']);
}
})
.catch((error) => {
console.error('Error:', error);
setliste_participants_file_change_api("false");
alert(" Impossible d'importer la liste des participants");
});
};
@ -1171,9 +1193,7 @@ const DisplayPartnerSession = (props) => {
else if (String(data['status']) === String("true")) {
setGetListePreinscrit_api("true");
setnb_stagiaire_Preinscrit(data['message'].length);
//console.log(" ### setnb_stagiaire_Preinscrit = ", data['message'].length);
}
else {
//console.log("erreur rrrr:" + data['status'])
@ -1213,6 +1233,7 @@ const DisplayPartnerSession = (props) => {
}
var one_email_part = p_one_email_part;
console.log(" one_email_part = ", one_email_part);
if (one_email_part.trim() == "") {
alert(" Vous devez saisir l'email du participant");
return;
@ -1299,6 +1320,14 @@ const DisplayPartnerSession = (props) => {
value: '0',
label: 'PréInscription',
},
{
value: '-1',
label: 'Annulation',
},
{
value: '2',
label: 'En Cours',
},
];
@ -1796,6 +1825,9 @@ const DisplayPartnerSession = (props) => {
document.getElementsByName("ville")[0].disabled = true;
document.getElementsByName("ville")[0].style.backgroundColor = "#ECEFF1";
document.getElementsByName("pays")[0].disabled = true;
document.getElementsByName("pays")[0].style.backgroundColor = "#ECEFF1";
document.getElementsByName("formateur")[0].disabled = true;
document.getElementsByName("formateur")[0].style.backgroundColor = "#ECEFF1";
@ -1861,6 +1893,10 @@ const DisplayPartnerSession = (props) => {
document.getElementsByName("ville")[0].disabled = false;
document.getElementsByName("ville")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("pays")[0].disabled = false;
document.getElementsByName("pays")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("lms_class_code")[0].disabled = false;
document.getElementsByName("lms_class_code")[0].style.backgroundColor = "#FFFFFF";
@ -1919,6 +1955,10 @@ const DisplayPartnerSession = (props) => {
if (document.getElementsByName("ville")[0])
document.getElementsByName("ville")[0].value = "";
if (document.getElementsByName("pays")[0])
document.getElementsByName("pays")[0].value = "";
if (document.getElementsByName("nb_participant")[0])
document.getElementsByName("nb_participant")[0].value = "";
@ -1952,6 +1992,7 @@ const DisplayPartnerSession = (props) => {
setp_code_session();
setp_adresse();
setp_ville();
setp_pays();
setp_formateur();
setp_lms_class_code();
setp_nb_participant();
@ -2147,6 +2188,7 @@ const DisplayPartnerSession = (props) => {
form.append("adresse", adress);
form.append("code_postal", codepostal);
form.append("ville", ville);
form.append("pays", p_pays);
form.append("code_session", code_session);
form.append("formateur", formateur);
form.append("lms_class_code", lms_class_code);
@ -2338,6 +2380,7 @@ const DisplayPartnerSession = (props) => {
form.append("adresse", p_one_adresse);
form.append("code_postal", p_one_code_postal);
form.append("ville", p_one_ville);
form.append("pays", p_one_pays);
form.append("formateur", p_one_formateur);
form.append("lms_class_code", p_one_lms_class_code);
form.append("session_status", p_one_session_status);
@ -2487,7 +2530,6 @@ const DisplayPartnerSession = (props) => {
if (mylocaltraining.session_etape) {
setp_session_etape(mylocaltraining.session_etape);
if (String(mylocaltraining.session_etape) === "0")
setp_session_etape_label("Projet");
else if (String(mylocaltraining.session_etape) === "1")
@ -2501,6 +2543,11 @@ const DisplayPartnerSession = (props) => {
else if (String(mylocaltraining.session_etape) === "-1")
setp_session_etape_label("Annulée");
} else {
setp_session_etape_label("Projet");
setp_session_etape("0");
}
@ -2562,11 +2609,9 @@ const DisplayPartnerSession = (props) => {
setp_session_ondemande(mylocaltraining.session_ondemande);
if (String(mylocaltraining.session_ondemande) === "1")
setp_session_ondemande_label("Oui");
else if (String(mylocaltraining.session_ondemande) === "0")
else
setp_session_ondemande_label("Non")
else
setp_session_ondemande_label("?")
}
if (mylocaltraining.presentiel) {
@ -2591,6 +2636,11 @@ const DisplayPartnerSession = (props) => {
setp_ville(mylocaltraining.ville);
}
document.getElementsByName("pays")[0].value = "";
if (mylocaltraining.ville) {
setp_pays(mylocaltraining.pays);
}
document.getElementsByName("formateur")[0].value = "";
if (mylocaltraining.formateur) {
setp_formateur(mylocaltraining.formateur);
@ -2613,6 +2663,8 @@ const DisplayPartnerSession = (props) => {
setsessionStatus(false);
desableSessionFields();
if (myRef.current) {
myRef.current.scrollIntoView({ behavior: "smooth" });
}
@ -2643,6 +2695,7 @@ const DisplayPartnerSession = (props) => {
const [p_adresse, setp_adresse] = useState("");
const [p_code_postal, setp_code_postal] = useState("");
const [p_ville, setp_ville] = useState("");
const [p_pays, setp_pays] = useState("");
const [p_formateur, setp_formateur] = useState("");
const [p_lms_class_code, setp_lms_class_code] = useState("");
const [p_nb_participant, setp_nb_participant] = useState("");
@ -2655,6 +2708,7 @@ const DisplayPartnerSession = (props) => {
const [p_one_adresse, setp_one_adresse] = useState("");
const [p_one_code_postal, setp_one_code_postal] = useState("");
const [p_one_ville, setp_one_ville] = useState("");
const [p_one_pays, setp_one_pays] = useState("");
const [p_one_formateur, setp_one_formateur] = useState("");
const [p_one_lms_class_code, setp_one_lms_class_code] = useState("");
const [p_one_nb_participant, setp_one_nb_participant] = useState("");
@ -2970,8 +3024,8 @@ const DisplayPartnerSession = (props) => {
if (String(res.data.status) === String("true")) {
setUpdateStagiaireData_api("true");
setUpdateStagiaireData_result(res.data.message);
GetListePreinscrit(selected_session_id);
GetListeInscrit(selected_session_id);
GetListePreinscrit(selected_session_id, selected_internal_url);
GetListeInscrit(selected_session_id, selected_internal_url);
setretval_ch("1");
alert(" La mise à jour été correctement faite.")
@ -3801,6 +3855,15 @@ const DisplayPartnerSession = (props) => {
setp_filtre2();
setp_filtre2_value();
setnb_stagiaire_Preinscrit("");
setnb_stagiaire_Inscrit("");
setSelectionModel([]);
setRows([]);
setRows_insc([]);
setRows_preinsc([]);
setsubmenu("");
Getall_TrainingSession_no_filter();
}
@ -3859,6 +3922,9 @@ const DisplayPartnerSession = (props) => {
document.getElementsByName("detail_ville")[0].disabled = true;
document.getElementsByName("detail_ville")[0].style.backgroundColor = "#ECEFF1";
document.getElementsByName("detail_pays")[0].disabled = true;
document.getElementsByName("detail_pays")[0].style.backgroundColor = "#ECEFF1";
document.getElementsByName("detail_cout")[0].disabled = true;
document.getElementsByName("detail_cout")[0].style.backgroundColor = "#ECEFF1";
@ -3934,6 +4000,9 @@ const DisplayPartnerSession = (props) => {
document.getElementsByName("detail_ville")[0].disabled = false;
document.getElementsByName("detail_ville")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_pays")[0].disabled = false;
document.getElementsByName("detail_pays")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_cout")[0].disabled = false;
document.getElementsByName("detail_cout")[0].style.backgroundColor = "#FFFFFF";
@ -4276,10 +4345,11 @@ const DisplayPartnerSession = (props) => {
setSelectionModel(newSelectionModel);
if (newSelectionModel.length === 1)
handleClick_edit_session_From_Line(newSelectionModel);
if (newSelectionModel.length === 0) {
if (newSelectionModel.length !== 1) {
setaddOneParticipant();
setdisplay_detail_insc();
setselected_code_session();
setsubmenu();
}
}}
selectionModel={selectionModel}
@ -4653,6 +4723,7 @@ const DisplayPartnerSession = (props) => {
</div>}
{!edit_session_form && <div className="session_caract">Etape *<br />
<TextField
name="session_etape"
id="session_etape"
@ -4838,7 +4909,7 @@ const DisplayPartnerSession = (props) => {
</div>}
<div className="session_caract"> Adresse a<br />
<div className="session_caract"> Adresse<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required
@ -4888,6 +4959,23 @@ const DisplayPartnerSession = (props) => {
/>
</div>
<div className="session_caract"> Pays<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required
name="pays"
id="pays"
InputLabelProps={{
shrink: true,
}}
disabled={false}
className="disabled_style"
value={p_pays}
onChange={(e) => setp_pays(e.target.value)}
/>
</div>
<div className="session_caract"> Formateur<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
@ -5038,7 +5126,7 @@ const DisplayPartnerSession = (props) => {
</Button>}
{edit_session_form && selected_session_id &&
<Button variant="contained" className="bton_enreg" onClick={CreateSessionFormation}>Enregistrer les modifications
<Button variant="contained" className="bton_enreg" onClick={CreateSessionFormation}>Enregistrer les modifications aa
</Button>}
</div>
@ -5142,7 +5230,7 @@ const DisplayPartnerSession = (props) => {
</div>
<div className="session_caract">Statut b * <br />
<div className="session_caract">Statut * <br />
<TextField
name="session_status"
id="session_status"
@ -5358,6 +5446,25 @@ const DisplayPartnerSession = (props) => {
/>
</div>
<div className="session_caract"> Pays<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required
name="one_pays"
id="one_pays"
InputLabelProps={{
shrink: true,
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_pays}
onChange={(e) => setp_one_pays(e.target.value)}
/>
</div>
<div className="session_caract"> Formateur<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
@ -5524,7 +5631,7 @@ const DisplayPartnerSession = (props) => {
{String(addOneParticipant) === "1" && <div className="div_row session_data" style={{ "border": "None", "backgroundColor": "#F0F0F0" }}>
<div className="titre1"> Ajout d'un nouveau participant a la session <u> {selected_code_session} </u> de la formation <u> {selected_class_title} </u></div>
<div className="titre1"> Ajout d'un nouveau participant a la session <u> {selected_code_session} </u> de la formation <u> {selected_class_title} </u></div>
<div className="session_caract"> Nom *<br />
<TextField
@ -5538,7 +5645,11 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_nom_part}
onChange={(e) => {
setp_one_nom_part(e.target.value);
}
}
/>
</div>
@ -5555,11 +5666,15 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_prenom_part}
onChange={(e) => {
setp_one_prenom_part(e.target.value);
}
}
/>
</div>
<div className="session_caract"> Email *<br />
<div className="session_caract"> Email *<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required
@ -5571,7 +5686,11 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_email_part}
onChange={(e) => {
setp_one_email_part(e.target.value);
}
}
/>
</div>
@ -5587,7 +5706,11 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_phone_part}
onChange={(e) => {
setp_one_phone_part(e.target.value);
}
}
/>
</div>
@ -5608,7 +5731,7 @@ const DisplayPartnerSession = (props) => {
className="disabled_style enable_style"
>
{status_inscription.map((option) => (
<MenuItem key={option.value} value={option.value}>
<MenuItem key={option.value} value={option.value} style={{ "paddingLeft": "5px", "textAlign": "left", "width": "100%", "fontSize": "12px" }}>
{option.label} &nbsp; <br />
</MenuItem>
))}
@ -5828,7 +5951,7 @@ const DisplayPartnerSession = (props) => {
/>
</div>
<div className="session_caract"> Email *<br />
<div className="session_caract"> Email ss*<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required
@ -5841,11 +5964,13 @@ const DisplayPartnerSession = (props) => {
disabled={false}
className="disabled_style enable_style"
value={p_one_email_part}
onChange={(e) => setp_one_email_part(e.target.value)}
onChange={(e) => {
setp_one_email_part(e.target.value);
}}
/>
</div>
<div className="session_caract"> téléphone *<br />
<div className="session_caract"> téléphone ss*<br />
<TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required
@ -5879,7 +6004,7 @@ const DisplayPartnerSession = (props) => {
className="disabled_style enable_style"
>
{status_inscription.map((option) => (
<MenuItem key={option.value} value={option.value}>
<MenuItem key={option.value} value={option.value} style={{ "paddingLeft": "5px", "textAlign": "left", "width": "100%", "fontSize": "12px" }}>
{option.label} &nbsp; <br />
</MenuItem>
))}
@ -5915,7 +6040,7 @@ const DisplayPartnerSession = (props) => {
</div>}
{String(addOneParticipant) === "1" && <div className="div_row session_data" style={{ "border": "None", "backgroundColor": "#F0F0F0" }}>
<div className="titre1"> Ajout d'un nouveau participant a la session <u> {selected_code_session} </u> de la formation <u> {selected_class_title} </u></div>
<div className="titre1"> Ajout d'un nouveau participant a la session <u> {selected_code_session} </u> de la formation <u> {selected_class_title} </u></div>
<div className="session_caract"> Nom *<br />
@ -5930,7 +6055,11 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_nom_part}
onChange={(e) => {
setp_one_nom_part(e.target.value);
}
}
/>
</div>
@ -5947,7 +6076,11 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_prenom_part}
onChange={(e) => {
setp_one_prenom_part(e.target.value);
}
}
/>
</div>
@ -5963,7 +6096,11 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_status_part}
onChange={(e) => {
setp_one_status_part(e.target.value);
}
}
/>
</div>
@ -5979,7 +6116,11 @@ const DisplayPartnerSession = (props) => {
}}
disabled={false}
className="disabled_style enable_style"
value={p_one_phone_part}
onChange={(e) => {
setp_one_phone_part(e.target.value);
}
}
/>
</div>
@ -6000,7 +6141,7 @@ const DisplayPartnerSession = (props) => {
className="disabled_style enable_style"
>
{status_inscription.map((option) => (
<MenuItem key={option.value} value={option.value}>
<MenuItem key={option.value} value={option.value} style={{ "paddingLeft": "5px", "textAlign": "left", "width": "100%", "fontSize": "12px" }}>
{option.label} &nbsp; <br />
</MenuItem>
))}
@ -6394,6 +6535,7 @@ const DisplayPartnerSession = (props) => {
<MenuItem value="1" style={{ "paddingLeft": "5px", "textAlign": "left", "width": "100%" }}>Inscrit &nbsp;&nbsp;</MenuItem>
<MenuItem value="0" style={{ "paddingLeft": "5px", "textAlign": "left", "width": "100%" }} >Preinscrit &nbsp;</MenuItem>
<MenuItem value="-1" style={{ "paddingLeft": "5px", "textAlign": "left", "width": "100%" }} >Annule &nbsp;</MenuItem>
<MenuItem value="2" style={{ "paddingLeft": "5px", "textAlign": "left", "width": "100%" }} >Encours &nbsp;</MenuItem>
</TextField>
</div>}

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,7 @@ import logowhite from "../mysy_img/MYSY-LOGO-WHITE.png";
import downarrow from "../mysy_img/downarrow.png";
import uparrow from "../mysy_img/uparrow.png";
import { GiTeacher } from "react-icons/gi";
import Footer from "./Fotter";
import { confirmAlert } from 'react-confirm-alert'; // Import
import { useCookies } from "react-cookie";
@ -160,7 +160,12 @@ const Partner = (props) => {
setapiexcelimportmessage(result['status']);
if (String(result['status']) === String("true")) {
sethandleSubmission_api("true");
alert(result['message']);
var local_message = result['message'] + " Vous allez être redirigé vers la liste des formations"
alert(local_message);
history.push("/Partner/affichage");
window.location.reload();
return;
} else if (String(result['status']) === String("Err_Connexion")) {
alert('Erreur: ' + result['message']);
history.push("/Connexion");
@ -234,7 +239,7 @@ const Partner = (props) => {
}
var list_menu = ['creation', 'infopartner', 'statistique', 'abonnement', 'affichage', 'ordervalide',
'mes_sessions', 'setuplms', 'facture', 'pricing', 'mes_clients', 'mes_devis', 'mes_cmd',
'mes_sessions', 'setuplms', 'facture', 'pricing', 'mes_clients', 'mes_devis', 'mes_cmd',
'mes_stagiaires', 'mes_employes']
@ -728,8 +733,8 @@ const Partner = (props) => {
{String(menu) === "mes_stagiaires" && <div className="sousmenu_selected" onClick={DiplayStagiaireList} ><FcReading className="icone_menu" /> MES STAGIAIRES</div>}
<hr className="my_hr" />
{String(menu) !== "mes_stagiaires" && <div className="sousmenu" onClick={DisplayeEmployeList} > <FcReading className="icone_menu" /> MES EMPLOYES </div>}
{String(menu) === "mes_stagiaires" && <div className="sousmenu_selected" onClick={DisplayeEmployeList} ><FcReading className="icone_menu" /> MES EMPLOYES</div>}
{String(menu) !== "mes_employes" && <div className="sousmenu" onClick={DisplayeEmployeList} > <GiTeacher className="icone_menu" /> MES EMPLOYES </div>}
{String(menu) === "mes_employes" && <div className="sousmenu_selected" onClick={DisplayeEmployeList} ><GiTeacher className="icone_menu" /> MES EMPLOYES</div>}
<hr className="my_hr" />

View File

@ -352,10 +352,10 @@
width: 100% !important;
height: 3.5rem !important;
//border: none !important;
border-radius: 5px;
background: white;
border: solid gainsboro 1px;
border: solid gainsboro 1px !important;
}
@ -729,7 +729,7 @@
//border: none !important;
border-radius: 5px;
background: white;
border: solid gainsboro 1px;
border: solid gainsboro 1px !important;
padding-top: 0.5rem !important;
}
@ -1103,7 +1103,7 @@
//border: none !important;
border-radius: 5px;
background: white;
border: solid gainsboro 1px;
border: solid gainsboro 1px !important;
padding-top: 0.5rem !important;
}
@ -1473,10 +1473,9 @@
margin: 5px !important;
//border: none !important;
border-radius: 5px;
background: white;
border: solid gainsboro 1px;
padding-top: 0.5rem !important;
border: none !important;
background: white;
border: solid gainsboro 1px !important;
}
.training_caract {