From cc734c23213cb1dd530036e13a0b89e05489bc4b Mon Sep 17 00:00:00 2001 From: Cherif Date: Thu, 26 Jun 2025 21:43:43 +0200 Subject: [PATCH] qsd --- src/components/DisplayPartnerSession.js | 2 +- .../DisplayPartnerTrainingsPagination.js | 4 +- src/components/Jurys.js | 2 +- .../Module_Session_Notes_Classement.js | 15 ++--- .../Module_Session_Planification.js | 56 +++++++++---------- 5 files changed, 38 insertions(+), 41 deletions(-) diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 8c213be..516bbf9 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -20927,7 +20927,7 @@ const DisplayPartnerSession = (props) => { - {String(props.check_user_acces_right("session", "write")) === "1" && String(props.formation_initiale) === "1" && } + {/*String(props.check_user_acces_right("session", "write")) === "1" && String(props.formation_initiale) === "1" && */} diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index 842edd8..66ece67 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -3859,7 +3859,7 @@ const DistplayPartnerTraningsPage = (props) => {   - {props.check_user_acces_right("formation", "write") === "1" &&
+ {String(props.check_user_acces_right("formation", "write")) === "1" &&
} - {props.check_user_acces_right("formation", "write") === "1" &&
+ {String(props.check_user_acces_right("formation", "write")) === "1" &&
} - + { String(submenu) === "planning" &&
diff --git a/src/components/Module_Session_Notes_Classement.js b/src/components/Module_Session_Notes_Classement.js index ec2a02a..4d31dd0 100644 --- a/src/components/Module_Session_Notes_Classement.js +++ b/src/components/Module_Session_Notes_Classement.js @@ -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) => , }, + { field: 'ue_id_code', headerName: 'UE/Matière', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => , }, { field: 'inscription_id_nom', headerName: 'Nom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => , }, { field: 'inscription_id_prenom', headerName: 'Prenom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (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) => , }, + { field: 'ue_id_code', headerName: 'UE/Matière', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => , }, { field: 'inscription_id_nom', headerName: 'Nom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => , }, { field: 'inscription_id_prenom', headerName: 'Prenom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (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) => , align: "left", }, + { field: 'jury_note', headerName: 'Note Jury', width: 200, editable: jury_cell_editable, renderCell: (params) => , align: "left", }, - { field: 'detail', headerName: 'Detail Note', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (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) => {
  - + {
  - + { 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) => } /> - {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" && } - {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" && -
UE / Matière +
UE / Matière {New_Getall_Class_List_UE_result && New_Getall_Class_List_UE_result.length > 0 && { 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) => } /> - {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" && } - {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" &&