+
+
+
+
+
+
+ {
selectionModel={selectionModel_note_UE_classement}
localeText={frFR.components.MuiDataGrid.defaultProps.localeText}
- rows={Getall_Session_UE_Final_Note_Classement_result.map((item, index) => (
+ rows={Getall_Detail_Note_of_BC_Diplome_UE_result.map((item, index) => (
{
id: index,
_id: JSON.parse(item)._id,
- inscription_id: JSON.parse(item).inscription_id,
session_id: JSON.parse(item).session_id,
- type_eval: JSON.parse(item).type_eval,
- ue_id: JSON.parse(item).ue_id,
+ inscription_id: JSON.parse(item).inscription_id,
+
+ diplome_id: JSON.parse(item).diplome_id,
+ domaine_competence_id: JSON.parse(item).domaine_competence_id,
+ evaluation_id: JSON.parse(item).evaluation_id,
class_id: JSON.parse(item).class_id,
- note_td: JSON.parse(item).note_td,
- note_tp: JSON.parse(item).note_tp,
- note_examen: JSON.parse(item).note_examen,
- note_finale: JSON.parse(item).note_finale,
- rang: JSON.parse(item).rang,
- credit: JSON.parse(item).credit,
+ class_eu_id: JSON.parse(item).class_eu_id,
- regle_calcul: JSON.parse(item).regle_calcul,
- seuil_validation: JSON.parse(item).seuil_validation,
- ue_coefficient: JSON.parse(item).ue_coefficient,
- ue_validation: JSON.parse(item).ue_validation,
+ class_eu_code: JSON.parse(item).class_eu_code,
- ue_id_code: JSON.parse(item).ue_id_code,
- class_id_external_code: JSON.parse(item).class_id_external_code,
- inscription_id_mail: JSON.parse(item).inscription_id_mail,
inscription_id_nom: JSON.parse(item).inscription_id_nom,
inscription_id_prenom: JSON.parse(item).inscription_id_prenom,
+ inscription_id_mail: JSON.parse(item).inscription_id_mail,
- jury_note: JSON.parse(item).jury_note,
- jury_observation: JSON.parse(item).jury_observation,
- jury_validation: JSON.parse(item).jury_validation,
+ diplome_id_code: JSON.parse(item).diplome_id_code,
+
+ domaine_competence_id_code: JSON.parse(item).domaine_competence_id_code,
+ evaluation_code: JSON.parse(item).evaluation_code,
+ note: JSON.parse(item).note,
+ eval_date_heure_debut: JSON.parse(item).eval_date_heure_debut,
+
+ eval_date_heure_fin: JSON.parse(item).eval_date_heure_fin,
+
+ semestre: JSON.parse(item).semestre,
- moyenne_session_ue: JSON.parse(item).moyenne_session_ue,
}
))}
- columns={columns_list_evaluation_note_classement_final}
+ columns={columns_list_Detailled_Note_After_UE_Calculation}
pageSize={10}
className="datagridclass"
@@ -4747,12 +5288,15 @@ const Module_Session_Notes_Classement = (props) => {
-
}
- {vue_note && String(vue_note) === "detail_note" &&
+
-
+ -----------
+
+
+
+ {/*
@@ -4795,11 +5339,7 @@ const Module_Session_Notes_Classement = (props) => {
},
- /*"& .MuiDataGrid-virtualScrollerRenderZone": {
- "& .MuiDataGrid-row": {
- "&:nth-child(2n)": { backgroundColor: "rgba(235, 235, 235, .7)" }
- }
- },*/
+
"& .MuiDataGrid-columnHeaders": {
backgroundColor: "#dfe8f2",
color: "#0a2a4d",
@@ -4830,12 +5370,9 @@ const Module_Session_Notes_Classement = (props) => {
checkboxSelection
onSelectionModelChange={(newSelectionModel) => {
setselectionModel_detail_note_finale_classement(newSelectionModel);
- /*if (newSelectionModel.length === 1)
- handleClick_edit_employee_From_Line(newSelectionModel);*/
+
if (newSelectionModel.length !== 1) {
- /* setsubmenu();
- setdisplay_detail_employe();
- setadd_One_Employee();*/
+
}
}}
selectionModel={selectionModel_detail_note_finale_classement}
@@ -4875,24 +5412,14 @@ const Module_Session_Notes_Classement = (props) => {
onRowDoubleClick={(newSelectionModel) => {
- /* Getall_Evaluation_Participant_List(newSelectionModel.row._id);
-
- setselected_id(newSelectionModel.row._id);
-
- setgridline_id(newSelectionModel.row.id);
-
- handleClick_edit_evaluation_From_Line(newSelectionModel.row.id);
- setselectionModel_evalutions_participant([]);
- settab_convention_pieces_jointes_result([]);*/
+
}}
rowsPerPageOptions={[10]}
disableSelectionOnClick
- /* components={{
- Toolbar: GridToolbar,
- }}*/
+
components={{
Toolbar: CustomToolbar
@@ -4938,7 +5465,7 @@ const Module_Session_Notes_Classement = (props) => {
-
+
*/}
}
diff --git a/src/components/Notes_Evaluation.js b/src/components/Notes_Evaluation.js
index 107867d..e3670ac 100644
--- a/src/components/Notes_Evaluation.js
+++ b/src/components/Notes_Evaluation.js
@@ -271,6 +271,12 @@ const Notes_Evaluation = (props) => {
}
},
+
+ {
+ field: 'semestre', headerName: 'Sem.', Width: 80, renderCell: (params) =>
,
+
+ },
+
{ field: 'statut', headerName: 'statut', minWidth: 200, flex: 1, renderCell: (params) =>
, },
@@ -873,6 +879,13 @@ const Notes_Evaluation = (props) => {
setp_detail_rattrapage("");
}
+
+ if (mylocal_evaluation.semestre) {
+ setp_detail_semestre(mylocal_evaluation.semestre);
+ } else {
+ setp_detail_semestre("");
+ }
+
// iiiiiii
if (mylocal_evaluation.tab_all_ue_diplome) {
setNew_Get_List_UE_From_Session_Id_Diplome_result(mylocal_evaluation.tab_all_ue_diplome);
@@ -1325,6 +1338,7 @@ const Notes_Evaluation = (props) => {
var local_eval_type_notation = JSON.parse(x).type_notation;
var local_eval_max_note = JSON.parse(x).max_note;
+ var local_semestre = JSON.parse(x).semestre;
//---
var node = {
@@ -1340,6 +1354,7 @@ const Notes_Evaluation = (props) => {
"eval_date_heure_fin": local_eval_date_heure_fin,
"max_note": local_eval_max_note,
"type_notation": local_eval_type_notation,
+ "semestre": local_semestre,
};
new_data2.push(node);
@@ -1359,6 +1374,8 @@ const Notes_Evaluation = (props) => {
"eval_date_heure_fin": "",
"max_note": "",
"type_notation": "",
+ "semestre": "",
+
};
new_data2.push(node);
@@ -1694,7 +1711,7 @@ const Notes_Evaluation = (props) => {
setLoading(false);
if (String(res.data.status) === String("true")) {
//console.log(" In Get_List_UE_From_Class_Id res.data.status = " + res.data.status);
- console.log(" In Get_List_UE_From_Class_Id res.data.message r_class = " + res.data.message);
+ // console.log(" In Get_List_UE_From_Class_Id res.data.message r_class = " + res.data.message);
setGet_List_UE_From_Class_Id_api("true");
setGet_List_UE_From_Class_Id_result(res.data.message);
@@ -1722,6 +1739,9 @@ const Notes_Evaluation = (props) => {
var local_domaine_competence_id = JSON.parse(x).domaine_competence_id;
var local_domaine_competence_code = JSON.parse(x).domaine_competence_code;
+ var local_semestre = JSON.parse(x).semestre;
+
+
//---
var node = {
@@ -1737,6 +1757,7 @@ const Notes_Evaluation = (props) => {
"domaine_competence_id": local_domaine_competence_id,
"domaine_competence_code": local_domaine_competence_code,
+ "semestre": local_semestre,
};
@@ -1752,6 +1773,8 @@ const Notes_Evaluation = (props) => {
"internal_url": local_internal_url,
"domaine_competence_id": local_domaine_competence_id,
"domaine_competence_code": local_domaine_competence_code,
+ "semestre": local_semestre,
+
};
tab_tmp_storage_ue_id.push(local_id)
new_data2_Distinct_UE.push(node_distinct)
@@ -1774,6 +1797,7 @@ const Notes_Evaluation = (props) => {
"diplome_code": "",
"domaine_competence_id": "",
"domaine_competence_code": "",
+ "semestre": "",
};
new_data2.push(node);
@@ -1788,6 +1812,7 @@ const Notes_Evaluation = (props) => {
"internal_url": "",
"domaine_competence_id": "",
"domaine_competence_code": "",
+ "semestre": "",
};
new_data2_Distinct_UE.push(node_distinct)
@@ -2134,7 +2159,7 @@ const Notes_Evaluation = (props) => {
})
}
-
+
useEffect(() => {
sethistory_securite_read(props.check_user_acces_right("historique", "read"))
@@ -2338,6 +2363,7 @@ const Notes_Evaluation = (props) => {
form.append("domaine_competence_id", p_detail_class_eu_domaine_competence_id);
form.append("rattrapage", p_detail_rattrapage);
+ form.append("semestre", p_detail_semestre);
// console.log(" ### scope_diplome == ", scope_diplome)
@@ -2594,6 +2620,8 @@ const Notes_Evaluation = (props) => {
const [p_detail_rattrapage, setp_detail_rattrapage] = React.useState("0");
+ const [p_detail_semestre, setp_detail_semestre] = React.useState("");
+
const [p_detail_eval_note_publication_deplication_date_heure, setp_detail_eval_note_publication_deplication_date_heure] = useState(new Date());
@@ -2608,6 +2636,7 @@ const Notes_Evaluation = (props) => {
setp_detail_type_eval_id("");
setp_detail_rattrapage("0");
+ setp_detail_semestre("");
setp_detail_type_notation("");
setp_detail_max_note("");
@@ -2631,7 +2660,8 @@ const Notes_Evaluation = (props) => {
var liste_champs = ['detail_code', 'detail_titre', 'detail_description', 'detail_classe',
'detail_ftion', 'detail_ue', 'detail_type_eval', 'detail_debut', 'detail_fin', 'detail_adresse',
- 'detail_cp', 'detail_ville', 'detail_pays', 'detail_responsable', 'detail_mode_animation', 'detail_rattrapage']
+ 'detail_cp', 'detail_ville', 'detail_pays', 'detail_responsable', 'detail_mode_animation', 'detail_rattrapage',
+ 'detail_semestre']
for (let i = 0; i < liste_champs.length; i++) {
if (document.getElementsByName(String(liste_champs[i])) && document.getElementsByName(String(liste_champs[i]))[0]) {
@@ -2654,7 +2684,8 @@ const Notes_Evaluation = (props) => {
var liste_champs = ['detail_code', 'detail_titre', 'detail_description', 'detail_classe',
'detail_ftion', 'detail_ue', 'detail_type_eval', 'detail_debut', 'detail_fin', 'detail_adresse',
- 'detail_cp', 'detail_ville', 'detail_pays', 'detail_responsable', 'detail_titre_01', 'detail_mode_animation', 'detail_rattrapage']
+ 'detail_cp', 'detail_ville', 'detail_pays', 'detail_responsable', 'detail_titre_01', 'detail_mode_animation', 'detail_rattrapage',
+ 'detail_semestre']
for (let i = 0; i < liste_champs.length; i++) {
@@ -5718,6 +5749,7 @@ const Notes_Evaluation = (props) => {
max_note: JSON.parse(item).max_note,
type_notation: JSON.parse(item).type_notation,
rattrapage: JSON.parse(item).rattrapage,
+ semestre: JSON.parse(item).semestre,
}
@@ -6077,6 +6109,24 @@ const Notes_Evaluation = (props) => {