branche_01062025
Cherif 2025-06-27 20:00:40 +02:00
parent cc734c2321
commit aad4648592
3 changed files with 22 additions and 11 deletions

View File

@ -368,6 +368,7 @@ const Module_Session_Notes_Classement = (props) => {
{ field: 'seuil_validation', headerName: 'Seuil val.', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
{ field: 'ue_coefficient', headerName: 'Coeff.', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
{ field: 'credit', headerName: 'Credit.', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
{ field: 'moyenne_session_ue', headerName: 'Moy. Ens.', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
{
@ -838,6 +839,8 @@ const Module_Session_Notes_Classement = (props) => {
var inscription_id_nom = JSON.parse(x).inscription_id_nom;
var inscription_id_prenom = JSON.parse(x).inscription_id_prenom;
var moyenne_session_ue = JSON.parse(x).moyenne_session_ue;
//---
@ -867,6 +870,7 @@ const Module_Session_Notes_Classement = (props) => {
"inscription_id_mail": inscription_id_mail,
"inscription_id_nom": inscription_id_nom,
"inscription_id_prenom": inscription_id_prenom,
"moyenne_session_ue": moyenne_session_ue,
};
new_data2.push(node);
@ -895,6 +899,7 @@ const Module_Session_Notes_Classement = (props) => {
"seuil_validation": "",
"ue_coefficient": "",
"ue_validation": "",
"moyenne_session_ue": "",
};
new_data2.push(node);
@ -2627,7 +2632,7 @@ const Module_Session_Notes_Classement = (props) => {
&nbsp;
<div style={{ width: '100%', float: 'left' }}>
<nav style={{ textAlign: 'center', width: '50%', float: 'left' }}> Notes & Classement Final (session)</nav>
<nav style={{ textAlign: 'center', width: '50%', float: 'left' }}> Notes & Classement Final (Promotion)</nav>
<nav style={{ textAlign: 'right', width: '50%', float: 'left' }}>
<Button variant="outlined" onClick={Calcul_Note_Classement_Session} className="detail_class_submenu" id='calcul_moyenne' name='calcul_moyenne'> Calcul Moyenne </Button>
@ -3287,6 +3292,8 @@ const Module_Session_Notes_Classement = (props) => {
jury_note: JSON.parse(item).jury_note,
jury_observation: JSON.parse(item).jury_observation,
jury_validation: JSON.parse(item).jury_validation,
moyenne_session_ue: JSON.parse(item).moyenne_session_ue,
}
))}

View File

@ -3527,6 +3527,7 @@ const Module_Session_Planification = (props) => {
aria-labelledby="draggable-dialog-title"
className="displaypartnersession mysy_MuiPaper-root"
disableEnforceFocus={true}
>
<DialogTitle style={{ cursor: 'move', background: '#fff', fontFamily: 'DM Sans' }} id="draggable-dialog-title">
@ -3640,6 +3641,7 @@ const Module_Session_Planification = (props) => {
aria-labelledby="draggable-dialog-title"
className="displaypartnersession mysy_MuiPaper-root"
disableEnforceFocus={true}
>
<DialogTitle style={{ cursor: 'move', background: '#fff', fontFamily: 'DM Sans' }} id="draggable-dialog-title">
@ -3813,6 +3815,7 @@ const Module_Session_Planification = (props) => {
aria-labelledby="draggable-dialog-title"
className="displaypartnersession mysy_MuiPaper-root"
disableEnforceFocus={true}
>
<DialogTitle style={{ cursor: 'move', background: '#fff', fontFamily: 'DM Sans' }} id="draggable-dialog-title">
@ -4159,7 +4162,7 @@ const Module_Session_Planification = (props) => {
</div>
<div className="session_caract_Dialog" > UE / Matière
<div className="session_caract_Dialog" > UE / Matière 2
{New_Getall_Class_List_UE_result && New_Getall_Class_List_UE_result.length > 0 && <Autocomplete
@ -4489,7 +4492,7 @@ const Module_Session_Planification = (props) => {
PaperComponent={PaperComponent}
aria-labelledby="draggable-dialog-title"
disableEnforceFocus={true}
>
<DialogTitle style={{ cursor: 'move', background: '#fff', fontFamily: 'DM Sans' }} id="draggable-dialog-title"> Ajout ressource {/*: <font size="3"> <i> {selected_sequence_startDate} au {selected_sequence_endDate} </i> </font> */} </DialogTitle>
@ -4704,7 +4707,7 @@ const Module_Session_Planification = (props) => {
PaperComponent={PaperComponent}
aria-labelledby="draggable-dialog-title"
disableEnforceFocus={true}
>
<DialogTitle style={{ cursor: 'move', background: '#fff', fontFamily: 'DM Sans' }} id="draggable-dialog-title"> MySy Information</DialogTitle>
@ -5040,6 +5043,7 @@ const Module_Session_Planification = (props) => {
PaperComponent={PaperComponent}
aria-labelledby="draggable-dialog-title"
disableEnforceFocus={true}
>
<DialogTitle style={{ cursor: 'move', background: '#fff', fontFamily: 'DM Sans' }} id="draggable-dialog-title"> {Dialog_seq_CREATION_SEMAINE_TYPE_message} </DialogTitle>
@ -5449,6 +5453,8 @@ const Module_Session_Planification = (props) => {
aria-labelledby="draggable-dialog-title"
className="module_agenda mysy_MuiPaper-root"
disableEnforceFocus={true}
>
<DialogTitle style={{ cursor: 'move', background: '#fff', fontFamily: 'DM Sans' }} id="draggable-dialog-title"> MySy Information</DialogTitle>
@ -5795,7 +5801,7 @@ const Module_Session_Planification = (props) => {
</div>
<div className="session_caract_Dialog" > UE / Matière
<div className="session_caract_Dialog" > UE / Matière 1
{New_Getall_Class_List_UE_result && New_Getall_Class_List_UE_result.length > 0 &&
@ -5924,7 +5930,7 @@ const Module_Session_Planification = (props) => {
</div>
<div className="session_caract_Dialog" > Debut
<div className="session_caract_Dialog" > Debut 11
<DatePicker
name="event_dialog_start"
id="event_dialog_start"

View File

@ -466,8 +466,8 @@ const Mon_Tableau_De_Bord = (props) => {
axios.post(myurl, form).then(res => {
setLoading(false);
if (String(res.data.status) === String("true")) {
console.log(" In Getall_Qry_Formation_Session res.data.status = " + res.data.status);
console.log(" In Getall_Qry_Formation_Session res.data.message r_class = " + res.data.message);
//console.log(" In Getall_Qry_Formation_Session res.data.status = " + res.data.status);
// console.log(" In Getall_Qry_Formation_Session res.data.message r_class = " + res.data.message);
setGetall_Qry_Formation_Session_result_JSON(JSON.parse('[' + res.data.message + ']'));
@ -1860,9 +1860,7 @@ const Mon_Tableau_De_Bord = (props) => {
</div>
<BarChart
dataset={Getall_Qry_Inscription_Data_result_JSON[0].data}
// xAxis={[{ scaleType: 'band', dataKey: 'label', tickPlacement: 'middle' }]}
xAxis={[{
@ -1874,7 +1872,7 @@ const Mon_Tableau_De_Bord = (props) => {
return `${month.slice(0, 4)}`
}
else if (String(month).length >= 4 && String(month).length <= 8) {
else if (String(month).length >= 4 && String(month).length <= 8) {
return `${month.slice(0, 4)}` + " \n" + `${month.slice(4, String(month).length)}`
}