diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index 8561488..34f5bab 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -26431,10 +26431,10 @@ const DisplayPartnerPromotion = (props) => { {String(addOneParticipant) !== "1" &&
-
+
{ ))} columns={columns_preinscrit} - pageSize={10} + pageSize={20} className="datagridclass" - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick components={{ Toolbar: GridToolbar, @@ -27689,12 +27689,12 @@ const DisplayPartnerPromotion = (props) => { {String(addOneParticipant) !== "1" &&
-
+
  { ))} columns={columns_inscrit} - pageSize={10} + pageSize={20} className="datagridclass" getCellClassName={(params) => { @@ -27806,7 +27806,7 @@ const DisplayPartnerPromotion = (props) => { } - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick components={{ Toolbar: GridToolbar, @@ -29419,7 +29419,7 @@ const DisplayPartnerPromotion = (props) => { { ))} columns={columns_list_emargement} - pageSize={10} + pageSize={20} className="datagridclass" - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick components={{ Toolbar: GridToolbar, @@ -30041,11 +30041,11 @@ const DisplayPartnerPromotion = (props) => { {String(submenu) === String("unite_enseignement") &&
-
+
  { ))} columns={columns_list_unite_enseignement} - pageSize={10} + pageSize={20} className="datagridclass" onRowDoubleClick={(newSelectionModel) => { @@ -30128,7 +30128,7 @@ const DisplayPartnerPromotion = (props) => { - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick components={{ Toolbar: GridToolbar, diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index c434d0e..9f07e82 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -547,6 +547,7 @@ const DisplayPartnerStagiaires = (props) => { { field: 'type_eval_id', headerName: 'type_eval_id', hide: true, Width: 0 }, + { field: 'semestre', headerName: 'Sem.', hide: false, Width: 50, renderCell: (params) => , }, { field: 'class_ue_code', headerName: 'Code UE', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'class_ue_titre', headerName: 'Titre UE', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'note_evaluation_code', headerName: 'Evaluation', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, @@ -3965,7 +3966,7 @@ const DisplayPartnerStagiaires = (props) => { if (String(res.data.status) === String("true")) { //console.log(" In Get_Inscrit_Notes_Of_Evaluations res.data.status = " + res.data.status); - //console.log(" In Get_Inscrit_Notes_Of_Evaluations res.data.message r_class = " + res.data.message); + console.log(" In Get_Inscrit_Notes_Of_Evaluations res.data.message r_class = " + res.data.message); setGet_Inscrit_Notes_Of_Evaluations_api("true"); setGet_Inscrit_Notes_Of_Evaluations_result(res.data.message); } @@ -12488,7 +12489,6 @@ const DisplayPartnerStagiaires = (props) => {
} -
@@ -17864,29 +17864,24 @@ const DisplayPartnerStagiaires = (props) => { -
+ {/*}
-
+
*/}
-
+
  { }} > { setselectionModel_notes(newSelectionModel); @@ -17939,23 +17934,27 @@ const DisplayPartnerStagiaires = (props) => { eval_date_heure_debut: JSON.parse(item).eval_date_heure_debut, eval_date_heure_fin: JSON.parse(item).eval_date_heure_fin, note: JSON.parse(item).note, + semestre: JSON.parse(item).semestre, } ))} columns={columns_notes} - pageSize={10} + pageSize={20} className="datagridclass" onRowDoubleClick={(newSelectionModel) => { }} - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick components={{ - Toolbar: GridToolbar, + Toolbar: CustomToolbar }} + + componentsProps={{ toolbar: { data_colums: columns_notes } }} + //sx={datagridSx} getCellClassName={(params) => { //field === 'distantiel' @@ -17982,13 +17981,9 @@ const DisplayPartnerStagiaires = (props) => { }} getRowClassName={(params) => { - // Pour la gestion de la couleur de zone double cliquée - if (String(params.row.id) === String(gridline_id)) { + - return 'line--statut--selected'; - } - - else if (parseInt(String(params.row.id)) % 2 === 0) { + if (parseInt(String(params.row.id)) % 2 === 0) { return 'line--statut--pair'; } else if (parseInt(String(params.row.id)) % 2 !== 0) { @@ -18024,13 +18019,7 @@ const DisplayPartnerStagiaires = (props) => { height: 500, width: '100%', paddingRight: '1px', - - - /*"& .MuiDataGrid-virtualScrollerRenderZone": { - "& .MuiDataGrid-row": { - "&:nth-child(2n)": { backgroundColor: "rgba(235, 235, 235, .7)" } - } - },*/ + "& .MuiDataGrid-columnHeaders": { backgroundColor: "#dfe8f2", color: "#0a2a4d", diff --git a/src/components/DisplayPartnerUnite_Enseignement.js b/src/components/DisplayPartnerUnite_Enseignement.js index d864869..851a1c5 100644 --- a/src/components/DisplayPartnerUnite_Enseignement.js +++ b/src/components/DisplayPartnerUnite_Enseignement.js @@ -978,6 +978,9 @@ const DisplayPartnerUnite_Enseignement = (props) => { setp_detail_domaine(""); setp_detail_bloc(""); setp_detail_conclusive(false); + setp_detail_ects("1"); + setp_detail_semestre("1"); + setp_detail_seuil_validation("1"); } @@ -2676,7 +2679,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { }} > { setSelectionModel(newSelectionModel); @@ -4240,7 +4243,7 @@ const DisplayPartnerUnite_Enseignement = (props) => { />
-
Seuil Validation 03
+
Seuil Validation
{
-
+
  { ))} columns={columns_participants} - pageSize={10} + pageSize={20} className="datagridclass" onRowDoubleClick={(newSelectionModel) => { @@ -1222,7 +1222,7 @@ const Module_Selection_Apprenants = (props) => { //handleClick_edit_evaluation_From_Line(newSelectionModel.row.id); }} - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick components={{ Toolbar: GridToolbar, @@ -1342,7 +1342,7 @@ const Module_Selection_Apprenants = (props) => {
+ }} className="detail_class_submenu" id='calcul_moyenne' name='calcul_moyenne'> Notes Globales
- {/* - { - setselectionModel_note_Session_classement(newSelectionModel); - - if (newSelectionModel.length !== 1) { - - } - }} - - - - - selectionModel={selectionModel_note_Session_classement} - - localeText={frFR.components.MuiDataGrid.defaultProps.localeText} - rows={New_Getall_Session_Final_Note_Classement_result.map((item, index) => ( - { - id: index, - _id: (item)._id, - session_id: (item).session_id, - apprenant_id: (item).apprenant_id, - class_id: (item).class_id, - nom: (item).nom, - prenom: (item).prenom, - rang: (item).rang, - note_finale: (item).note_finale, - rang_calculation_date: (item).rang_calculation_date.substring(0, 10), - credit_acquis: (item).credit_acquis, - - jury_note: (item).jury_note, - jury_observation: (item).jury_observation, - jury_validation: (item).jury_validation, - jury_validation_champ_technique: (item).jury_validation_champ_technique, - - } - ))} - - columns={columns_list_session_note_classement_final} - pageSize={10} - className="datagridclass" - - onRowDoubleClick={(newSelectionModel) => { - - }} - - rowsPerPageOptions={[10]} - disableSelectionOnClick - - - components={{ - Toolbar: CustomToolbar - }} - componentsProps={{ toolbar: { data_colums: columns_list_session_note_classement_final } }} - //sx={datagridSx} - - - getCellClassName={(params) => { - - // Traitement des cellules du jury (note, commentaire, validation) - if (String(params.field).startsWith("jury")) { - return 'cell--jury'; - } - - }} - getRowClassName={(params) => { - // Pour la gestion de la couleur de zone double cliquée - if (String(params.row.ue_validation) === "1") { - return 'line--statut--isvalide'; - } - - if (String(params.row.id) === String(gridline_id)) { - return 'line--statut--selected'; - } - else if (parseInt(String(params.row.id)) % 2 === 0) { - return 'line--statut--pair'; - } - else if (parseInt(String(params.row.id)) % 2 !== 0) { - return 'line--statut--impair'; - } - - - }} - getEstimatedRowHeight={() => 200} - getRowHeight={() => "auto"} - sx={{ - "& .MuiDataGrid-cellContent": { - minHeight: 50, - - } - }} - - /> - */}
{/** La V2 du calcul */} Calcul V222 { color: "#0a2a4d", }, '& .line--statut--isvalide': { - backgroundColor: '#ABEBC6', + backgroundColor: '#dbf1e4', color: "#0a2a4d", fontWeight: '600', }, @@ -4252,6 +4132,7 @@ const Module_Session_Notes_Classement = (props) => { ue_seuil_validation: (item).ue_seuil_validation, is_eu_validated: (item).is_eu_validated, semestre: (item).semestre, + is_domaine_competence_validated: (item).is_domaine_competence_validated, jury_note: (item).jury_note, @@ -4263,14 +4144,14 @@ const Module_Session_Notes_Classement = (props) => { ))} columns={columns_list_session_note_classement_final_BC_Diplome_UE} - pageSize={10} + pageSize={20} className="datagridclass" onRowDoubleClick={(newSelectionModel) => { }} - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick /* components={{ Toolbar: GridToolbar, @@ -4286,14 +4167,14 @@ const Module_Session_Notes_Classement = (props) => { getCellClassName={(params) => { // Traitement des cellules du jury (note, commentaire, validation) - if (String(params.field).startsWith("jury")) { - return 'cell--jury'; - } + /* if (String(params.field).startsWith("jury")) { + return 'cell--jury'; + }*/ }} getRowClassName={(params) => { // Pour la gestion de la couleur de zone double cliquée - if (String(params.row.ue_validation) === "1") { + if (String(params.row.is_eu_validated) === "1") { return 'line--statut--isvalide'; } @@ -5099,13 +4980,13 @@ const Module_Session_Notes_Classement = (props) => {
-
+
  - + { color: "#0a2a4d", }, '& .line--statut--isvalide': { - backgroundColor: '#ABEBC6', + backgroundColor: '#dbf1e4', color: "#0a2a4d", fontWeight: '600', }, @@ -5223,7 +5104,7 @@ const Module_Session_Notes_Classement = (props) => { ))} columns={columns_list_Detailled_Note_After_UE_Calculation} - pageSize={10} + pageSize={20} className="datagridclass" onRowDoubleClick={(newSelectionModel) => { @@ -5232,7 +5113,7 @@ const Module_Session_Notes_Classement = (props) => { }} - rowsPerPageOptions={[10]} + rowsPerPageOptions={[20]} disableSelectionOnClick /* components={{ Toolbar: GridToolbar, diff --git a/src/components/Module_Session_Planification.js b/src/components/Module_Session_Planification.js index 29bf93b..ad3144f 100644 --- a/src/components/Module_Session_Planification.js +++ b/src/components/Module_Session_Planification.js @@ -5461,7 +5461,7 @@ const Module_Session_Planification = (props) => {