qsd
parent
2a770120e8
commit
cc734c2321
|
@ -20927,7 +20927,7 @@ const DisplayPartnerSession = (props) => {
|
|||
|
||||
<Button variant="outlined" onClick={submenu_piece_jointe} className="detail_class_submenu" id='piece_jointe' name='piece_jointe'>Pièces Jointes </Button>
|
||||
|
||||
{String(props.check_user_acces_right("session", "write")) === "1" && String(props.formation_initiale) === "1" && <Button variant="outlined" onClick={submenu_notes_classement} className="detail_class_submenu" id='notes_classement' name='notes_classement'>Notes & Classem.</Button>}
|
||||
{/*String(props.check_user_acces_right("session", "write")) === "1" && String(props.formation_initiale) === "1" && <Button variant="outlined" onClick={submenu_notes_classement} className="detail_class_submenu" id='notes_classement' name='notes_classement'>Notes & Classem.</Button>*/}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -3859,7 +3859,7 @@ const DistplayPartnerTraningsPage = (props) => {
|
|||
|
||||
|
||||
|
||||
{props.check_user_acces_right("formation", "write") === "1" && <div className='div_row' >
|
||||
{String(props.check_user_acces_right("formation", "write")) === "1" && <div className='div_row' >
|
||||
|
||||
<Button variant="outlined" onClick={changeHandler2} className="detail_class_submenu bton_add_session_long"
|
||||
id='menu_import_formation' name='menu_import_formation'>Choisir un fichier et importer <GrDocumentCsv style={{ "fontSize": "large" }} /> <SendIcon />
|
||||
|
@ -3888,7 +3888,7 @@ const DistplayPartnerTraningsPage = (props) => {
|
|||
|
||||
</div>}
|
||||
|
||||
{props.check_user_acces_right("formation", "write") === "1" && <div className="import_excel_text">
|
||||
{String(props.check_user_acces_right("formation", "write")) === "1" && <div className="import_excel_text">
|
||||
|
||||
<nav className="titre1"> Comment utiliser le fichier d'import des formations ? </nav>
|
||||
<nav style={{ "color": "orange" }}>
|
||||
|
|
|
@ -8251,7 +8251,7 @@ const Jury = (props) => {
|
|||
</div>
|
||||
}
|
||||
|
||||
|
||||
|
||||
{
|
||||
String(submenu) === "planning" && <div className="div_row ">
|
||||
<nav style={{ "border": "None", "fontSize": "22px", "fontWeight": "600" }}> Soutenances</nav>
|
||||
|
|
|
@ -333,7 +333,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
{ field: 'ue_id', headerName: 'ue_id', hide: true },
|
||||
{ field: 'class_id', headerName: 'class_id', hide: true },
|
||||
{ field: 'class_id_external_code', headerName: 'Code Formation', hide: true },
|
||||
{ field: 'ue_id_code', headerName: 'UE Code', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'ue_id_code', headerName: 'UE/Matière', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'inscription_id_nom', headerName: 'Nom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'inscription_id_prenom', headerName: 'Prenom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
|
@ -359,7 +359,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
{ field: 'ue_id', headerName: 'ue_id', hide: true },
|
||||
{ field: 'class_id', headerName: 'class_id', hide: true },
|
||||
{ field: 'class_id_external_code', headerName: 'Code Formation', hide: true },
|
||||
{ field: 'ue_id_code', headerName: 'UE Code', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'ue_id_code', headerName: 'UE/Matière', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'inscription_id_nom', headerName: 'Nom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'inscription_id_prenom', headerName: 'Prenom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
|
@ -388,11 +388,12 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
{ field: 'note_td', headerName: 'note_td', hide: true },
|
||||
{ field: 'note_tp', headerName: 'note_tp', hide: true },
|
||||
{ field: 'note_examen', headerName: 'note_examen', hide: true },
|
||||
{ field: 'jury_note', headerName: 'Note Jury', hide: true },
|
||||
|
||||
{ field: 'jury_observation', headerName: 'Observ. Jury', width: 200, editable: jury_cell_editable, renderCell: (params) => <ExpandableCell_50_bg_hiligt_red_color {...params} />, align: "left", },
|
||||
|
||||
{ field: 'jury_note', headerName: 'Note Jury', width: 200, editable: jury_cell_editable, renderCell: (params) => <ExpandableCell_50_bg_hiligt_red_color {...params} />, align: "left", },
|
||||
|
||||
{ field: 'detail', headerName: 'Detail Note', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'detail', headerName: 'Detail Note', hide: true },
|
||||
|
||||
{
|
||||
field: 'gestion', headerName: 'Gestion', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center",
|
||||
|
@ -1507,7 +1508,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
|
||||
|
||||
const New_Option_Filter = [
|
||||
{ "id": "ue_id", "label": "Code UE", "value": "ue_id" },
|
||||
{ "id": "ue_id", "label": "UE/matière", "value": "ue_id" },
|
||||
{ "id": "inscrit_id", "label": "Apprenant ", "value": "inscrit_id" },
|
||||
{ "id": "", "label": "", "value": "" },
|
||||
{ "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres.
|
||||
|
@ -3170,7 +3171,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
<div style={{ height: 550, width: '100%', paddingRight: '5px' }}>
|
||||
|
||||
|
||||
<nav style={{ textAlign: 'center' }}> Notes & Rang par UE</nav>
|
||||
<nav style={{ textAlign: 'center' }}> Notes & Rang par UE/Matière</nav>
|
||||
<Box
|
||||
sx={{
|
||||
height: 500,
|
||||
|
@ -3368,7 +3369,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
<div style={{ height: 550, width: '100%', paddingRight: '5px' }}>
|
||||
|
||||
|
||||
<nav style={{ textAlign: 'center' }}> Matrice détaillée des notes Toutes UE </nav>
|
||||
<nav style={{ textAlign: 'center' }}> Matrice détaillée des notes Toutes UE/Matières </nav>
|
||||
<Box
|
||||
sx={{
|
||||
height: 500,
|
||||
|
|
|
@ -3137,6 +3137,8 @@ const Module_Session_Planification = (props) => {
|
|||
var event_start = String(selected_sequence_startDate);
|
||||
var event_end = String(selected_sequence_endDate);
|
||||
|
||||
console.log(" ### sequence_startDate 333 = ", sequence_startDate)
|
||||
|
||||
var local_event_start = moment(sequence_startDate).format("DD/MM/YYYY HH:mm");
|
||||
var local_event_end = moment(sequence_endDate).format("DD/MM/YYYY HH:mm");
|
||||
|
||||
|
@ -3167,7 +3169,6 @@ const Module_Session_Planification = (props) => {
|
|||
console.log(" In Get_Ressource_Avabilities res.data.message r_class = " + res.data.message);
|
||||
console.log(" In Get_Ressource_Avabilities res.data.avability_check r_class = " + res.data.avability_check);
|
||||
*/
|
||||
|
||||
setGet_Ressource_Avabilities_api("true");
|
||||
setGet_Ressource_Avabilities_result(res.data.message);
|
||||
setGet_Ressource_Avabilities_avability_check(res.data.avability_check);
|
||||
|
@ -3897,11 +3898,9 @@ const Module_Session_Planification = (props) => {
|
|||
onChange={(event, value) => {
|
||||
if (value && value._id) {
|
||||
setDialog_seq_ressource_1_selected_ressource_id(value._id);
|
||||
//console.log(" ### check_ressource_avabilities = ", check_ressource_avabilities)
|
||||
if (check_ressource_avabilities === "1") {
|
||||
// On ne fait le controle de disponibilité que si on une sequence precise. pas quand c'est en masse.
|
||||
Get_Ressource_Avabilities(value._id);
|
||||
}
|
||||
// On ne fait le controle de disponibilité que si on une sequence precise. pas quand c'est en masse.
|
||||
Get_Ressource_Avabilities(value._id);
|
||||
|
||||
} else {
|
||||
setGet_Ressource_Avabilities_avability_check("");
|
||||
setDialog_seq_ressource_1_selected_ressource_id("");
|
||||
|
@ -3911,7 +3910,7 @@ const Module_Session_Planification = (props) => {
|
|||
renderInput={(params) => <TextField {...params} placeholder="Choisir une option " />
|
||||
}
|
||||
/>
|
||||
{check_ressource_avabilities === "1" && Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "0" &&
|
||||
{Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "0" &&
|
||||
<div className="session_caract_Dialog koUpdateData">
|
||||
<Tooltip className="tooltip_css" id="ressource_indispo_01" style={{ "fontSize": "12px" }} />
|
||||
<a data-tooltip-id="ressource_indispo_01" data-tooltip-html="Cette ressource n'est pas disponible sur ce créneau. Verifiez son agenda">
|
||||
|
@ -3920,7 +3919,7 @@ const Module_Session_Planification = (props) => {
|
|||
</div>
|
||||
}
|
||||
|
||||
{check_ressource_avabilities === "1" && Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "1" &&
|
||||
{Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "1" &&
|
||||
<div className="session_caract_Dialog okUpdateData" >
|
||||
<Tooltip className="tooltip_css" id="ressource_indispo_02" style={{ "fontSize": "12px" }} />
|
||||
<a data-tooltip-id="ressource_indispo_02" data-tooltip-html="Disponible de la ressource est ok">
|
||||
|
@ -4160,7 +4159,7 @@ const Module_Session_Planification = (props) => {
|
|||
</div>
|
||||
|
||||
|
||||
<div className="session_caract_Dialog" > UE / Matière
|
||||
<div className="session_caract_Dialog" > UE / Matière
|
||||
|
||||
|
||||
{New_Getall_Class_List_UE_result && New_Getall_Class_List_UE_result.length > 0 && <Autocomplete
|
||||
|
@ -4513,9 +4512,8 @@ const Module_Session_Planification = (props) => {
|
|||
setDialog_seq_ressource_1_selected_ressource_id("");
|
||||
if (value && value.value) {
|
||||
setDialog_seq_ressource_1_selected_type_ressource(value.value);
|
||||
|
||||
setsequence_startDate(selected_sequence_startDate);
|
||||
setsequence_endDate(selected_sequence_endDate);
|
||||
setsequence_startDate(moment(selected_sequence_startDate).format("DD/MM/YYYY HH:mm"));
|
||||
setsequence_endDate(moment(selected_sequence_endDate).format("DD/MM/YYYY HH:mm"));
|
||||
|
||||
} else {
|
||||
setDialog_seq_ressource_1_selected_type_ressource("");
|
||||
|
@ -4547,11 +4545,8 @@ const Module_Session_Planification = (props) => {
|
|||
onChange={(event, value) => {
|
||||
if (value && value._id) {
|
||||
|
||||
|
||||
setDialog_seq_ressource_1_selected_ressource_id(value._id);
|
||||
|
||||
//console.log(" ### check_ressource_avabilities = ", check_ressource_avabilities)
|
||||
|
||||
// On ne fait le controle de disponibilité que si on une sequence precise. pas quand c'est en masse.
|
||||
Get_Ressource_Avabilities(value._id);
|
||||
|
||||
} else {
|
||||
|
@ -4599,10 +4594,9 @@ const Module_Session_Planification = (props) => {
|
|||
onChange={(event, value) => {
|
||||
if (value && value._id) {
|
||||
setDialog_seq_ressource_1_selected_ressource_id(value._id);
|
||||
if (check_ressource_avabilities === "1") {
|
||||
// On ne fait le controle de disponibilité que si on une sequence precise. pas quand c'est en masse.
|
||||
Get_Ressource_Avabilities(value._id);
|
||||
}
|
||||
// On ne fait le controle de disponibilité que si on une sequence precise. pas quand c'est en masse.
|
||||
Get_Ressource_Avabilities(value._id);
|
||||
|
||||
|
||||
} else {
|
||||
setGet_Ressource_Avabilities_avability_check("");
|
||||
|
@ -5441,7 +5435,7 @@ const Module_Session_Planification = (props) => {
|
|||
style: {
|
||||
overflowY: 'unset',
|
||||
position: 'absolute',
|
||||
top: position_h_myRef_seq_calendrier_01,
|
||||
top: 1500,
|
||||
margin: "2px",
|
||||
},
|
||||
}}
|
||||
|
@ -5530,13 +5524,11 @@ const Module_Session_Planification = (props) => {
|
|||
|
||||
onChange={(event, value) => {
|
||||
if (value && value._id) {
|
||||
setDialog_seq_ressource_1_selected_ressource_id(value._id);
|
||||
|
||||
//console.log(" ### check_ressource_avabilities = ", check_ressource_avabilities)
|
||||
if (check_ressource_avabilities === "1") {
|
||||
// On ne fait le controle de disponibilité que si on une sequence precise. pas quand c'est en masse.
|
||||
Get_Ressource_Avabilities(value._id);
|
||||
}
|
||||
setDialog_seq_ressource_1_selected_ressource_id(value._id);
|
||||
// On ne fait le controle de disponibilité que si on une sequence precise. pas quand c'est en masse.
|
||||
Get_Ressource_Avabilities(value._id);
|
||||
|
||||
} else {
|
||||
setGet_Ressource_Avabilities_avability_check("");
|
||||
setDialog_seq_ressource_1_selected_ressource_id("");
|
||||
|
@ -5546,7 +5538,7 @@ const Module_Session_Planification = (props) => {
|
|||
renderInput={(params) => <TextField {...params} placeholder="Choisir une option " />
|
||||
}
|
||||
/>
|
||||
{check_ressource_avabilities === "1" && Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "0" &&
|
||||
{Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "0" &&
|
||||
<div className="session_caract_Dialog koUpdateData">
|
||||
<Tooltip className="tooltip_css" id="ressource_indispo_01" style={{ "fontSize": "12px" }} />
|
||||
<a data-tooltip-id="ressource_indispo_01" data-tooltip-html="Cette ressource n'est pas disponible sur ce créneau. Verifiez son agenda">
|
||||
|
@ -5555,7 +5547,7 @@ const Module_Session_Planification = (props) => {
|
|||
</div>
|
||||
}
|
||||
|
||||
{check_ressource_avabilities === "1" && Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "1" &&
|
||||
{Get_Ressource_Avabilities_avability_check && String(Get_Ressource_Avabilities_avability_check) === "1" &&
|
||||
<div className="session_caract_Dialog okUpdateData" >
|
||||
<Tooltip className="tooltip_css" id="ressource_indispo_02" style={{ "fontSize": "12px" }} />
|
||||
<a data-tooltip-id="ressource_indispo_02" data-tooltip-html="Disponible de la ressource est ok">
|
||||
|
@ -5939,7 +5931,11 @@ const Module_Session_Planification = (props) => {
|
|||
selected={sequence_startDate}
|
||||
onChange={(date) => {
|
||||
|
||||
return setsequence_startDate(date);
|
||||
setsequence_startDate(date);
|
||||
window.scrollTo({
|
||||
top: 1500,
|
||||
behavior: "smooth",
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue