11/07/2024 - 13h14

recette2
cherif 2024-07-11 13:14:27 +02:00
parent 30f51ccdaa
commit b789903d35
5 changed files with 150 additions and 29 deletions

View File

@ -5953,7 +5953,7 @@ const AddClassManual = (props) => {
<div className="session_caract"> <div className="session_caract">
Choisir une question Choisir une question
{New_Getall_Employee_Statistic_Question_List_result && New_Getall_Employee_Statistic_Question_List_result.length > 0 && {New_Getall_Employee_Statistic_Question_List_result && New_Getall_Employee_Statistic_Question_List_result.length > 0 &&
<div style={{ width: '100%', }}> <div style={{ width: '90%', }}>
<Autocomplete <Autocomplete
@ -6054,8 +6054,6 @@ const AddClassManual = (props) => {
<nav className="mode_affichage" onClick={func_display_line_view}> <SsidChartIcon /> Ligne </nav> <nav className="mode_affichage" onClick={func_display_line_view}> <SsidChartIcon /> Ligne </nav>
<nav className="mode_affichage mode_affichage_selected" onClick={func_display_bars_view}> <BarChartIcon /> Bar </nav> <nav className="mode_affichage mode_affichage_selected" onClick={func_display_bars_view}> <BarChartIcon /> Bar </nav>
</div>} </div>}
{display_view && String(display_view) === "line" && <div style={{ "textAlign": "right", "float": "right", "width": "100%" }}> {display_view && String(display_view) === "line" && <div style={{ "textAlign": "right", "float": "right", "width": "100%" }}>

View File

@ -804,6 +804,11 @@ const DisplayPartnerSession = (props) => {
<Button <Button
onClick={(event) => { onClick={(event) => {
if( String(cellValues.row.client_rattachement_id) === String(cellValues.row.client_facture)){
alert(" Le client facturé est le même que client. Aucun partage à faire");
return;
}
setselected_inscription_id(cellValues.row._id); setselected_inscription_id(cellValues.row._id);
setp_detail_invoice_split_type("percent"); setp_detail_invoice_split_type("percent");
setp_detail_invoice_split_client_rattachement_id(cellValues.row.client_rattachement_id); setp_detail_invoice_split_client_rattachement_id(cellValues.row.client_rattachement_id);
@ -1002,7 +1007,7 @@ const DisplayPartnerSession = (props) => {
}, },
}, },
{ {
field: 'date_emargement', headerName: 'Émargé le', width: 180, hide: true, editable: false, field: 'date_emargement', headerName: 'Émargé le', width: 180, hide: false, editable: false,
renderCell: (cellValues) => { renderCell: (cellValues) => {
return ( return (
<div style={{ paddingLeft: "5px", paddingRight: "10px", "display": "block", wordBreak: "break-all" }}> <div style={{ paddingLeft: "5px", paddingRight: "10px", "display": "block", wordBreak: "break-all" }}>

View File

@ -1236,7 +1236,7 @@ const DisplayPartnerStagiaires = (props) => {
document.getElementsByName("detail_session_class")[0].value = ""; document.getElementsByName("detail_session_class")[0].value = "";
if (document.getElementsByName("detail_civilite") && document.getElementsByName("detail_nom")[0]) if (document.getElementsByName("detail_civilite") && document.getElementsByName("detail_civilite")[0])
document.getElementsByName("detail_civilite")[0].value = ""; document.getElementsByName("detail_civilite")[0].value = "";
@ -1663,14 +1663,17 @@ const DisplayPartnerStagiaires = (props) => {
function AnnuleAttendeeDetailFields() { function AnnuleAttendeeDetailFields() {
GetAttendee_Data(selected_participant_email, selected_session_id, selected_internal_url); GetAttendee_Data(selected_participant_email, selected_session_id, selected_internal_url);
disableAttendeeDetailFields();
setparticipant_data_changed(); setparticipant_data_changed();
setparticipant_data_edit_mode(); setparticipant_data_edit_mode();
disableAttendeeDetailFields();
} }
function disableAttendeeDetailFields() { async function disableAttendeeDetailFields() {
setparticipant_data_edit_mode("0"); setparticipant_data_edit_mode("0");
await sleep(10);
if (document.getElementsByName("detail_session_class")[0]) { if (document.getElementsByName("detail_session_class")[0]) {
document.getElementsByName("detail_session_class")[0].disabled = true; document.getElementsByName("detail_session_class")[0].disabled = true;
@ -1701,7 +1704,6 @@ const DisplayPartnerStagiaires = (props) => {
} }
if (document.getElementsByName("detail_nom")[0]) { if (document.getElementsByName("detail_nom")[0]) {
document.getElementsByName("detail_nom")[0].disabled = true; document.getElementsByName("detail_nom")[0].disabled = true;
document.getElementsByName("detail_nom")[0].style.backgroundColor = "#ECEFF1"; document.getElementsByName("detail_nom")[0].style.backgroundColor = "#ECEFF1";
@ -2014,6 +2016,54 @@ const DisplayPartnerStagiaires = (props) => {
} }
function EnableAttendeeDetailFields_Deja_Inscrit() {
/**
* Important :
* Si l'inscription est deja validé, alors il devient impossible de modifier les données de l'inscrit depuis cet écran
* Il faut aller dans les apprenants pour modifier l'apprenant.
*/
if (selected_id_status && String(selected_id_status) === "1") {
var message = "Cette inscription a déjà été validée. Seuls quelques données sont modifiable. \
Pour modifier les données personnelles de l'apprenant, merci de passer par le menu 'mes apprenants'. ";
setDialog_1_message(message);
setDialog_1_open(true);
// return;
}
setparticipant_data_edit_mode("1");
document.getElementsByName("detail_client_rattachement")[0].disabled = false;
document.getElementsByName("detail_client_rattachement")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_facture_client_rattachement")[0].disabled = false;
document.getElementsByName("detail_facture_client_rattachement")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_financeur_rattachement")[0].disabled = false;
document.getElementsByName("detail_financeur_rattachement")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_opco")[0].disabled = false;
document.getElementsByName("detail_opco")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_cout")[0].disabled = false;
document.getElementsByName("detail_cout")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_mode_fin")[0].disabled = false;
document.getElementsByName("detail_mode_fin")[0].style.backgroundColor = "#FFFFFF";
document.getElementsByName("detail_employeur")[0].disabled = false;
document.getElementsByName("detail_employeur")[0].style.backgroundColor = "#FFFFFF";
}
const [detailuser_date_inscription, setdetailuser_date_inscription] = useState(); const [detailuser_date_inscription, setdetailuser_date_inscription] = useState();
const [detailuser_date_evaluation, setdetailuser_date_evaluation] = useState(); const [detailuser_date_evaluation, setdetailuser_date_evaluation] = useState();
@ -9066,7 +9116,7 @@ const DisplayPartnerStagiaires = (props) => {
</div>} </div>}
{String(participant_data_edit_mode) !== "1" && <div className="session_caract"> Statut<br /> {(String(participant_data_edit_mode) !== "1" || String(p_detail_apprenant_id).trim().length > 3) && <div className="session_caract"> Statut<br />
<TextField <TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }} sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required required
@ -9083,7 +9133,7 @@ const DisplayPartnerStagiaires = (props) => {
</div>} </div>}
{String(participant_data_edit_mode) === "1" && <div className="session_caract"> Statut <br /> {String(participant_data_edit_mode) === "1" && String(p_detail_apprenant_id).trim().length <= 3 && <div className="session_caract"> Statut <br />
<Autocomplete <Autocomplete
disablePortal disablePortal
@ -9110,7 +9160,7 @@ const DisplayPartnerStagiaires = (props) => {
</div>} </div>}
{String(participant_data_edit_mode) === "1" && <div className="session_caract"> <b> Civilité </b> <br /> {String(participant_data_edit_mode) === "1" && String(p_detail_apprenant_id).trim().length <= 3 && <div className="session_caract"> <b> Civilité </b> <br />
<Autocomplete <Autocomplete
disablePortal disablePortal
@ -9140,7 +9190,7 @@ const DisplayPartnerStagiaires = (props) => {
</div>} </div>}
{String(participant_data_edit_mode) !== "1" && <div className="session_caract"> <b> Civilité </b> <br /> {(String(participant_data_edit_mode) !== "1" || String(p_detail_apprenant_id).trim().length > 3) && <div className="session_caract"> <b> Civilité </b> <br />
{New_civilite && New_civilite.length > 0 && p_detail_civilite && <TextField {New_civilite && New_civilite.length > 0 && p_detail_civilite && <TextField
sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }} sx={{ '& legend': { display: 'none' }, '& fieldset': { top: 0 }, }}
required required
@ -9532,11 +9582,19 @@ const DisplayPartnerStagiaires = (props) => {
</div> </div>
{String(participant_data_edit_mode) !== "1" && <div className="div_row_gauche" style={{ "textAlign": 'left', 'marginLeft': '15px' }}>
<Button variant="contained" className="bton_edit" onClick={EnableAttendeeDetailFields_Deja_Inscrit}>Editer
</Button>
</div>}
{String(participant_data_edit_mode) !== "1" && <div className="div_row_droite" style={{ "textAlign": 'right', 'marginRight': '15px' }}> {String(participant_data_edit_mode) !== "1" && <div className="div_row_droite" style={{ "textAlign": 'right', 'marginRight': '15px' }}>
{String(selected_id_status) !== "1" && (!p_detail_apprenant_id || String(p_detail_apprenant_id).trim().length <= 3) && <Button variant="contained" className="bton_edit" onClick={EnableAttendeeDetailFields}>Editer {String(selected_id_status) !== "1" && (!p_detail_apprenant_id || String(p_detail_apprenant_id).trim().length <= 3) && <Button variant="contained" className="bton_edit" onClick={EnableAttendeeDetailFields}>Editer
</Button>} </Button>}
{selected_id_status && String(selected_id_status) === "1" && p_detail_apprenant_id && {selected_id_status && String(selected_id_status) === "1" && p_detail_apprenant_id &&
String(p_detail_apprenant_id).trim().length > 3 && <Button variant="contained" className="bton_annule" onClick={open_apprenant_dossier}>Voir dossier &nbsp; String(p_detail_apprenant_id).trim().length > 3 && <Button variant="contained" className="bton_annule" onClick={open_apprenant_dossier}>Voir dossier &nbsp;
<Tooltip className="tooltip_css" id="tooltip_id_01" /> <Tooltip className="tooltip_css" id="tooltip_id_01" />
@ -9600,9 +9658,6 @@ const DisplayPartnerStagiaires = (props) => {
)} )}
</Popup> </Popup>
} }

View File

@ -10364,7 +10364,7 @@ const Employes = (props) => {
<div className="session_caract"> <div className="session_caract">
Choisir une question Choisir une question
{New_Getall_Employee_Statistic_Question_List_result && New_Getall_Employee_Statistic_Question_List_result.length > 0 && {New_Getall_Employee_Statistic_Question_List_result && New_Getall_Employee_Statistic_Question_List_result.length > 0 &&
<div style={{ width: '100%', }}> <div style={{ width: '90%', }}>
<Autocomplete <Autocomplete

View File

@ -412,7 +412,12 @@
font-size: small; font-size: small;
} }
.mode_affichage {
width: 25%;
float: right;
cursor: pointer;
text-align: center;
}
} }
@media only screen and (min-width: 601px) and (max-width: 991px) { @media only screen and (min-width: 601px) and (max-width: 991px) {
@ -871,6 +876,12 @@
font-size: small; font-size: small;
} }
.mode_affichage {
width: 15%;
float: right;
cursor: pointer;
text-align: center;
}
} }
@media only screen and (min-width: 992px) and (max-width: 1199px) { @media only screen and (min-width: 992px) and (max-width: 1199px) {
@ -1329,6 +1340,13 @@
font-size: small; font-size: small;
} }
.mode_affichage {
width: 12%;
float: right;
cursor: pointer;
text-align: center;
}
} }
@media only screen and (min-width: 1200px) { @media only screen and (min-width: 1200px) {
@ -1453,13 +1471,24 @@
} }
.disabled_style { .disabled_style {
font-size: small !important;
color: black;
width: 90% !important;
height: 3.5rem !important;
margin: 5px !important;
//border: none !important;
border-radius: 5px;
background: white;
border: solid gainsboro 1px;
//background-color: #ECEFF1; //background-color: #ECEFF1;
font-size: small !important; font-size: small !important;
color: black; color: black;
width: 90% !important; width: 90% !important;
height: 3rem !important; height: 3rem !important;
margin: 5px !important; margin: 5px !important;
border: none !important; // border: none !important;
} }
.css-1sqnrkk-MuiInputBase-input-MuiOutlinedInput-input, .css-1sqnrkk-MuiInputBase-input-MuiOutlinedInput-input,
@ -1752,8 +1781,29 @@
} }
.bton_enreg_dialog {
border-radius: 5rem;
font-size: small;
background: #81BC3A !important;
text-align: center;
height: 2.5rem;
width: 80%;
color: white;
margin-left: 10px;
margin-right: 10px;
} }
.mode_affichage {
width: 8%;
float: right;
cursor: pointer;
text-align: center;
}
}
// - end media
.MuiOutlinedInput-root { .MuiOutlinedInput-root {
height: 3rem !important; height: 3rem !important;
} }
@ -1803,9 +1853,22 @@
font-size: small; font-size: small;
} }
// - end media
.mode_affichage_selected {
text-underline-offset: 8px;
text-decoration: green wavy underline;
text-decoration-color: #F8C471;
text-decoration-style: solid;
text-decoration-thickness: 5px;
background: #F4F6F6;
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.1);
border-radius: 5px;
} }
}
.MuiMenuItem-root { .MuiMenuItem-root {
color: black !important; color: black !important;
} }