28/05/2026 - 22h00

branche_01062025
Cherif 2026-05-28 22:03:53 +02:00
parent 3a6497820b
commit 0e94c18fce
4 changed files with 956 additions and 32 deletions

View File

@ -498,10 +498,9 @@ const AddClassManual = (props) => {
const columns_list_evaluation_unite_enseignement = [
{ field: 'id', headerName: 'id', hide: true },
{ field: '_id', headerName: '_id', hide: true },
{ diplome_id: '_id', headerName: 'diplome_id', hide: true },
{ field: 'diplome_id', headerName: 'diplome_id', hide: true },
{ field: 'class_id', headerName: 'class_id', Width: 0, hide: true, },
{ field: 'class_ue_id', headerName: 'class_ue_id', Width: 0, hide: true },
{ field: 'class_ue_id', headerName: 'class_ue_id', hide: true },
{ field: 'diplome_code', headerName: 'Diplome.', minWidth: 150, flex: 1, renderCell: (params) => <ExpandableCell_50 {...params} />, },
@ -511,11 +510,21 @@ const AddClassManual = (props) => {
renderCell: (cellValues) => {
return (
<div style={{ paddingLeft: "5px", paddingRight: "15px", "display": "block", wordBreak: "break-all" }}>
{New_Getall_Class_List_UE_result && New_Getall_Class_List_UE_result.length > 0 && <nav>
{New_Getall_Class_List_UE_result.filter((data) => (data)._id === String(cellValues.row.class_ue_id))[0].label}
{/*cellValues.row.class_ue_id*/}
</nav>}
{
New_Getall_Class_List_UE_result &&
New_Getall_Class_List_UE_result.length > 0 && (
<nav>
{
New_Getall_Class_List_UE_result.find((data) =>
String(data._id) === String(cellValues.row.class_ue_id) &&
String(data.diplome_id) === String(cellValues.row.diplome_id)
)?.label || ""
}
</nav>
)
}
</div>
@ -4738,6 +4747,7 @@ const AddClassManual = (props) => {
setadd_one_eu_to_class("");
setselected_ue_coefficient("1");
setselected_ue_seuil_validation("");
setselected_ue_domaine_competence_id("");
setselected_ue_diplome_id("")
setselected_ue_semestre("");
@ -4748,6 +4758,7 @@ const AddClassManual = (props) => {
setselected_ue_id("");
setselected_ue_credit_ects("");
setselected_ue_seuil_validation("");
setselected_ue_domaine_competence_id("");
setselected_ue_semestre("");
setselected_ue_is_noted("1");
setselected_ue_pres_dist_hyp("0");
@ -4762,6 +4773,7 @@ const AddClassManual = (props) => {
setselected_ue_id("");
setselected_ue_credit_ects("");
setselected_ue_seuil_validation("");
setselected_ue_domaine_competence_id("");
setselected_ue_semestre("");
setselected_ue_is_noted("1");
setselected_ue_pres_dist_hyp("0");
@ -4796,6 +4808,10 @@ const AddClassManual = (props) => {
form.append("is_noted", selected_ue_is_noted);
form.append("seuil_validation", selected_ue_seuil_validation);
form.append("diplome_id", selected_ue_diplome_id);
form.append("domaine_competence_id", selected_ue_domaine_competence_id);
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_UE_To_Class/";
@ -6891,6 +6907,7 @@ const AddClassManual = (props) => {
setselected_ue_diplome_id("");
setselected_ue_credit_ects("");
setselected_ue_seuil_validation("");
setselected_ue_domaine_competence_id("");
setselected_ue_semestre("");
setselected_ue_is_noted("1");
setselected_ue_pres_dist_hyp("0");
@ -7658,7 +7675,7 @@ const AddClassManual = (props) => {
</div>
<div className="session_caract_Dialog"> <b> Est Evalué </b><br />
@ -8369,7 +8386,11 @@ const AddClassManual = (props) => {
setgridline_ue_id(newSelectionModel.row.id);
setselected_ue_id(newSelectionModel.row._id)
var current_class_ue_data = New_Getall_Class_List_UE_result.filter((ue_data) => ue_data._id === String((newSelectionModel.row._id)))
var current_class_ue_data = New_Getall_Class_List_UE_result.filter((ue_data) =>
ue_data._id === String(newSelectionModel.row._id) &&
ue_data.diplome_id === String(newSelectionModel.row.diplome_id) &&
ue_data.domaine_competence_id === String(newSelectionModel.row.domaine_competence_id)
);
// console.log(" ### current_class_ue_data[0] = ", current_class_ue_data[0]);
setselected_ue_credit_ects(current_class_ue_data[0]['credit']);
@ -8378,6 +8399,8 @@ const AddClassManual = (props) => {
setselected_ue_pres_dist_hyp(current_class_ue_data[0]['pres_dist_hyp']);
setselected_ue_coefficient(current_class_ue_data[0]['coefficient']);
setselected_ue_seuil_validation(current_class_ue_data[0]['seuil_validation']);
setselected_ue_domaine_competence_id(current_class_ue_data[0]['domaine_competence_id']);
setadd_one_eu_to_class("0");
setDialog_Unite_Enseignement_open(true);
}
@ -8518,7 +8541,6 @@ const AddClassManual = (props) => {
max_note: JSON.parse(item).max_note,
type_notation: JSON.parse(item).type_notation,
ponderation_type_eval: JSON.parse(item).ponderation_type_eval,
diplome_id: JSON.parse(item).diplome_id,
diplome_code: JSON.parse(item).diplome_code,
}

View File

@ -15713,7 +15713,7 @@ const DisplayPartnerPromotion = (props) => {
setLoading(false);
if (String(res.data.status) === String("true")) {
//console.log(" In Getall_Class_List_UE res.data.status = " + res.data.status);
console.log(" In Getall_Class_List_UE res.data.message r_class = " + res.data.message);
// console.log(" In Getall_Class_List_UE res.data.message r_class = " + res.data.message);
setGetall_Class_List_UE_api("true");
setGetall_Class_List_UE_result(res.data.message);
@ -15780,7 +15780,7 @@ const DisplayPartnerPromotion = (props) => {
setNew_Getall_Class_List_UE_result(new_data2);
console.log(" ### new_data2 = ", new_data2)
// console.log(" ### new_data2 = ", new_data2)
}
else {
setGetall_Class_List_UE_api("false");

File diff suppressed because it is too large Load Diff

View File

@ -2134,7 +2134,7 @@ const Notes_Evaluation = (props) => {
})
}
useEffect(() => {
sethistory_securite_read(props.check_user_acces_right("historique", "read"))
@ -6684,7 +6684,7 @@ const Notes_Evaluation = (props) => {
multiple
onChange={(event, newValue) => {
setevaluation_data_changed("1");
console.log(" ## == newValue EDIIIT =", newValue)
setscope_diplome([
...fixedVal_scope_diplome,
...newValue.filter((i) => fixedVal_scope_diplome.indexOf(i) === -1),