diff --git a/src/components/Module_Bloc_Competence_Pedagogique.js b/src/components/Module_Bloc_Competence_Pedagogique.js index 45d69cb..c3979be 100644 --- a/src/components/Module_Bloc_Competence_Pedagogique.js +++ b/src/components/Module_Bloc_Competence_Pedagogique.js @@ -284,6 +284,15 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { { field: 'code', headerName: 'Code', flex: 1, hide: false, flex: 1, renderCell: (params) => , }, { field: 'rang', headerName: 'Rang', hide: false, maxWidth: 100, renderCell: (params) => , }, { field: 'description', headerName: 'Description', flex: 1, hide: false, renderCell: (params) => , }, + { + field: 'couleur', headerName: 'Couleur', minWidth: 200, flex: 1, maxWidth: 250, hide: false, editable: false, + renderCell: (cellValues) => { + return ( + + ); + } + + }, { field: "delete", headerName: 'Supprimer', @@ -391,7 +400,15 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { } }, { field: 'pres_dist_hyp', headerName: 'Animation', hide: true, Width: 50, renderCell: (params) => , }, + { + field: 'couleur', headerName: 'Couleur', Width: 80, hide: false, editable: false, + renderCell: (cellValues) => { + return ( + + ); + } + }, { field: "delete", headerName: 'Supprimer', @@ -1172,8 +1189,10 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { - if (competence_pedago.tab_ue_competence_with_code) + if (competence_pedago.tab_ue_competence_with_code) { setp_detail_pole_bloc_competence_pedago_tab_ue_competence_with_code(competence_pedago.tab_ue_competence_with_code); + console.log(" ### ", competence_pedago.tab_ue_competence_with_code) + } else setp_detail_pole_bloc_competence_pedago_tab_ue_competence_with_code([]); @@ -1602,6 +1621,8 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { const [selected_domaine_compet_to_add_id, setselected_domaine_compet_to_add_id] = useState(""); const [selected_domaine_compet_to_add_rang, setselected_domaine_compet_to_add_rang] = useState("1"); + const [selected_domaine_compet_to_add_couleur, setselected_domaine_compet_to_add_couleur] = useState("#3573CB"); + const [New_Getall_Partner_Domaine_Competence_result, setNew_Getall_Partner_Domaine_Competence_result] = useState([{ @@ -1610,6 +1631,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { "label": "", "code": "", "description": "", + "couleur": "", }]); const [Getall_Partner_Domaine_Competence_api, setGetall_Partner_Domaine_Competence_api] = useState(); @@ -1642,6 +1664,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { var local_id = JSON.parse(x)._id; var code = JSON.parse(x).code; var description = JSON.parse(x).description; + var couleur = JSON.parse(x).couleur; @@ -1651,6 +1674,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { "label": code + " - " + String(description).substring(0, 50), "code": code, "description": description, + "couleur": couleur, }; new_data2.push(node); @@ -1665,6 +1689,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { "label": "", "code": "", "description": "", + "couleur": "", }; new_data2.push(node); @@ -2073,6 +2098,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { form.append("bloc_competence_id", selected_id); form.append("domaine_competence_id", local_dom_comp_id); form.append("rang", local_rang); + form.append("couleur", selected_domaine_compet_to_add_couleur); @@ -2285,28 +2311,30 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { if (value && value._id) { setselected_domaine_compet_to_add_id(value._id); + setselected_domaine_compet_to_add_couleur(value.couleur); } else { setselected_domaine_compet_to_add_id(""); + setselected_domaine_compet_to_add_couleur("#3573CB"); } }} renderInput={(params) => @@ -2436,19 +2464,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { }} renderInput={(params) => @@ -2479,19 +2507,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { renderInput={(params) => @@ -2533,19 +2561,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { }} renderInput={(params) => @@ -2577,19 +2605,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { renderInput={(params) => @@ -2620,19 +2648,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { renderInput={(params) => @@ -2755,19 +2783,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { } }} renderInput={(params) => } @@ -2795,19 +2823,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { } }} renderInput={(params) => } @@ -2934,19 +2962,19 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { renderInput={(params) => @@ -4004,6 +4032,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { code: (item).code, description: (item).description, rang: (item).rang, + couleur: (item).couleur, } ))} @@ -4217,6 +4246,7 @@ const Module_Bloc_bloc_competence_pedagogique = (props) => { is_noted: (item).is_noted, pres_dist_hyp: (item).pres_dist_hyp, credit: (item).credit, + couleur: (item).couleur, } diff --git a/src/components/Module_Session_Planification.js b/src/components/Module_Session_Planification.js index 28720c9..425fd9a 100644 --- a/src/components/Module_Session_Planification.js +++ b/src/components/Module_Session_Planification.js @@ -1653,7 +1653,7 @@ const Module_Session_Planification = (props) => { setLoading(false); if (String(res.data.status) === String("true")) { //console.log(" In Getall_Sequence_Of_Session res.data.status = " + res.data.status); - // console.log(" In Getall_Sequence_Of_Session res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Sequence_Of_Session res.data.message r_class = " + res.data.message); setGetall_Sequence_Of_Session_api("true"); setGetall_Sequence_Of_Session_result(res.data.message); @@ -2758,7 +2758,7 @@ const Module_Session_Planification = (props) => { setGetall_List_Sequence_Ressource_result([]); setselectionModel_sequence([]); - // console.log(" ### arg.event.extendedProps = ", arg.event.extendedProps); + // console.log(" ### arg.event.extendedProps = ", arg.event.extendedProps); //console.log(" ### arg.event.extendedProps.local_type = ", arg.event.extendedProps.local_type); @@ -5239,7 +5239,7 @@ const Module_Session_Planification = (props) => {