diff --git a/src/components/Autre_RH.js b/src/components/Autre_RH.js index 7f23ffd..6df4e70 100644 --- a/src/components/Autre_RH.js +++ b/src/components/Autre_RH.js @@ -204,7 +204,7 @@ const Autre_RH = (props) => { field: 'is_ent_compte', headerName: 'Compte ENT', width: 150, hide: false, renderCell: (cellValues) => { return ( -
+
{cellValues.row.is_ent_compte && cellValues.row.is_ent_compte === "1" && "Oui"} {!cellValues.row.is_ent_compte || cellValues.row.is_ent_compte !== "1" && "Non"} @@ -218,7 +218,7 @@ const Autre_RH = (props) => { field: 'is_ent_compte_locked', headerName: 'ENT. Vourouillé', width: 150, hide: false, renderCell: (cellValues) => { return ( -
+
{cellValues.row.is_ent_compte_locked && cellValues.row.is_ent_compte_locked === "1" && "Oui"} {!cellValues.row.is_ent_compte_locked || cellValues.row.is_ent_compte_locked !== "1" && "Non"} @@ -1182,7 +1182,7 @@ const Autre_RH = (props) => { var form = new FormData(); //form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA"); - // console.log(" scope_class == ", scope_class); + // console.log(" scope_class == ", scope_class); const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); @@ -7015,7 +7015,7 @@ const Autre_RH = (props) => { setLoading(false); - } + } const fixedVal_scope_session = []; const [scope_session, setscope_session] = useState([...fixedVal_scope_session]); @@ -7334,19 +7334,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -7563,19 +7563,19 @@ const Autre_RH = (props) => { } }} renderInput={(params) => @@ -7675,19 +7675,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -7720,19 +7720,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -8540,19 +8540,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -8638,19 +8638,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -8755,19 +8755,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -9189,19 +9189,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -9468,19 +9468,19 @@ const Autre_RH = (props) => { } }} renderInput={(params) => @@ -10359,19 +10359,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -11681,19 +11681,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -11913,19 +11913,19 @@ const Autre_RH = (props) => { value={scope_class} options={New_GetCurrentPartnerClass_result} renderInput={(params) => @@ -11956,19 +11956,19 @@ const Autre_RH = (props) => { value={scope_session} options={New_Getall_TrainingSession_Without_Scope_Action_result} renderInput={(params) => @@ -12750,19 +12750,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -13041,19 +13041,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -13211,19 +13211,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index 239f644..f7d75ab 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -2407,7 +2407,8 @@ const DisplayPartnerStagiaires = (props) => { 'detail_ville', 'detail_pays', 'certif_date', 'detail_cout', 'detail_mode_fin', 'detail_employeur', 'date_evaluation', 'certif_date', 'note_eval', 'detail_type_apprenant', 'date_evaluation', 'detail_incr_date', 'detail_comment', 'detail_memo', 'detail_naissance', 'detail_mail', 'detail_prenom', 'detail_nom', 'detail_civilite', 'detail_tel', 'detail_adresse', 'detail_code_postal', 'detail_ville', - 'detail_pays', 'detail_ine', 'detail_matricule'] + 'detail_pays', 'detail_ine', 'detail_matricule', 'detail_nom_jeune_fille', 'detail_cvec', 'field_nationalite', 'field_detail_lieu_naissance', 'field_detail_departement_naissance', + 'field_detail_pays_naissance'] @@ -2613,6 +2614,39 @@ const DisplayPartnerStagiaires = (props) => { document.getElementsByName("field_nationalite")[0].style.backgroundColor = "#FFFFFF"; } + // --- + + if (document.getElementsByName("detail_nom_jeune_fille")[0]) { + document.getElementsByName("detail_nom_jeune_fille")[0].disabled = false; + document.getElementsByName("detail_nom_jeune_fille")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("detail_cvec")[0]) { + document.getElementsByName("detail_cvec")[0].disabled = false; + document.getElementsByName("detail_cvec")[0].style.backgroundColor = "#FFFFFF"; + } + + + if (document.getElementsByName("field_nationalite")[0]) { + document.getElementsByName("field_nationalite")[0].disabled = false; + document.getElementsByName("field_nationalite")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("field_detail_lieu_naissance")[0]) { + document.getElementsByName("field_detail_lieu_naissance")[0].disabled = false; + document.getElementsByName("field_detail_lieu_naissance")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("field_detail_departement_naissance")[0]) { + document.getElementsByName("field_detail_departement_naissance")[0].disabled = false; + document.getElementsByName("field_detail_departement_naissance")[0].style.backgroundColor = "#FFFFFF"; + } + + if (document.getElementsByName("field_detail_pays_naissance")[0]) { + document.getElementsByName("field_detail_pays_naissance")[0].disabled = false; + document.getElementsByName("field_detail_pays_naissance")[0].style.backgroundColor = "#FFFFFF"; + } + } @@ -9686,19 +9720,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -9762,19 +9796,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -9802,19 +9836,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -9843,19 +9877,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -9906,19 +9940,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -9975,19 +10009,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -10011,19 +10045,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -10047,19 +10081,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -10256,19 +10290,19 @@ const DisplayPartnerStagiaires = (props) => { renderInput={(params) => @@ -10313,19 +10347,19 @@ const DisplayPartnerStagiaires = (props) => { renderInput={(params) => @@ -10367,19 +10401,19 @@ const DisplayPartnerStagiaires = (props) => { renderInput={(params) => @@ -11119,19 +11153,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => @@ -11323,19 +11357,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => @@ -11601,19 +11635,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -11928,19 +11962,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -12004,19 +12038,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12044,19 +12078,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12084,19 +12118,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12148,19 +12182,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -12217,19 +12251,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12253,19 +12287,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12289,19 +12323,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12357,19 +12391,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -12426,19 +12460,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12463,19 +12497,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -12500,19 +12534,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => } @@ -13075,19 +13109,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -13342,7 +13376,7 @@ const DisplayPartnerStagiaires = (props) => { />
- {p_one_civilite_part !== "m" &&
Nom jeune fille
+ {p_one_civilite_part !== "m" &&
Nom jeune fille 01
{ }} renderInput={(params) => @@ -13881,19 +13915,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -14008,19 +14042,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -14417,19 +14451,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -14610,19 +14644,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => @@ -14677,7 +14711,7 @@ const DisplayPartnerStagiaires = (props) => { />
- {p_detail_civilite !== "m" &&
Nom Jeune Fille
+ {p_detail_civilite !== "m" &&
Nom Jeune Fille 02
{ }} renderInput={(params) => @@ -15196,19 +15230,19 @@ const DisplayPartnerStagiaires = (props) => { value={p_detail_client_rattachement_nom} renderInput={(params) => @@ -15344,19 +15378,19 @@ const DisplayPartnerStagiaires = (props) => { renderInput={(params) => @@ -15391,19 +15425,19 @@ const DisplayPartnerStagiaires = (props) => { value={p_detail_financeur_rattachement_nom} renderInput={(params) => @@ -15493,19 +15527,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -15557,19 +15591,19 @@ const DisplayPartnerStagiaires = (props) => { }} renderInput={(params) => @@ -15689,19 +15723,19 @@ const DisplayPartnerStagiaires = (props) => { renderInput={(params) => @@ -15758,19 +15792,19 @@ const DisplayPartnerStagiaires = (props) => { renderInput={(params) => @@ -15803,19 +15837,19 @@ const DisplayPartnerStagiaires = (props) => { } }} renderInput={(params) => @@ -16150,7 +16184,14 @@ const DisplayPartnerStagiaires = (props) => { + {String(participant_data_edit_mode) !== "1" && String(props.check_user_acces_right("stagiaire", "write")) === "1" && (!p_detail_apprenant_id || String(p_detail_apprenant_id).trim().length <= 3) && +
+ +
} + {String(participant_data_edit_mode) !== "1" &&
+ {selected_id_status && String(selected_id_status) === "1" && p_detail_apprenant_id && String(p_detail_apprenant_id).trim().length > 3 && } - {String(props.check_user_acces_right("stagiaire", "write")) === "1" && (!p_detail_apprenant_id || String(p_detail_apprenant_id).trim().length <= 3) && - } + {selected_id_status && String(selected_id_status) === "-1" && p_detail_apprenant_id && String(p_detail_apprenant_id).trim().length > 3 && diff --git a/src/components/Module_Domaine_Competence_Pedagogique.js b/src/components/Module_Domaine_Competence_Pedagogique.js index 27d132e..76fc8ff 100644 --- a/src/components/Module_Domaine_Competence_Pedagogique.js +++ b/src/components/Module_Domaine_Competence_Pedagogique.js @@ -13,6 +13,7 @@ import 'reactjs-popup/dist/index.css'; import "react-datepicker/dist/react-datepicker.css"; import 'moment/locale/fr'; import Box from '@mui/material/Box'; +import ColorPicker from 'react-pick-color'; import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; import Autocomplete from '@mui/material/Autocomplete'; import { gridClasses } from '@mui/x-data-grid'; @@ -138,14 +139,29 @@ const Module_Domaine_Competence_Pedagogique = (props) => { const columns = [ { field: '_id', headerName: '_id', hide: true, Width: 0, disableExport: true, }, { field: 'id', headerName: 'id', hide: true, Width: 0, disableExport: true, }, - { field: 'code', headerName: 'Code', flex: 1, hide: false, renderCell: (params) => , }, + { field: 'code', headerName: 'Code', flex: 1, hide: false, renderCell: (params) => , }, { field: 'description', headerName: 'Description', flex: 1, hide: false, minWidth: 200, renderCell: (params) => , }, + { field: 'commentaire', headerName: 'Commentaire', flex: 1, maxWidth: 250, renderCell: (params) => , }, + { + field: 'couleur', headerName: 'Couleur', width: 180, + renderCell: (cellValues) => { + return ( +
+ +
+ ); + } + }, { @@ -839,6 +855,9 @@ const Module_Domaine_Competence_Pedagogique = (props) => { + const [p_detail_domaine_compet_pedago_couleur, setp_detail_domaine_compet_pedago_couleur] = React.useState("#33b8ff"); + + const [p_detail_domaine_compet_pedago_moyen_ressource, setp_detail_domaine_compet_pedago_moyen_ressource] = useState(""); @@ -879,6 +898,7 @@ const Module_Domaine_Competence_Pedagogique = (props) => { setp_detail_domaine_compet_pedago_description(""); setp_detail_domaine_compet_pedago_commentaire(""); setp_one_detail_pole_activite_pedago_id(""); + setp_detail_domaine_compet_pedago_couleur("#3573CB") setdomaine_compet_pedago_data_changed(""); @@ -908,6 +928,8 @@ const Module_Domaine_Competence_Pedagogique = (props) => { form.append("commentaire", p_detail_domaine_compet_pedago_commentaire); form.append("code", p_detail_domaine_compet_pedago_code); + form.append("couleur", p_detail_domaine_compet_pedago_couleur); + setLoading(true); axios.post(myurl, form).then(res => { @@ -963,6 +985,7 @@ const Module_Domaine_Competence_Pedagogique = (props) => { form.append("commentaire", p_detail_domaine_compet_pedago_commentaire); form.append("code", p_detail_domaine_compet_pedago_code); + form.append("couleur", p_detail_domaine_compet_pedago_couleur); setLoading(true); axios.post(myurl, form).then(res => { @@ -1108,7 +1131,7 @@ const Module_Domaine_Competence_Pedagogique = (props) => { if (String(res.data.status) === "true") { setLoading(false); //console.log(" In Get_Given_Domain_Compet_pedago_data res.data.status = " + res.data.status); - // console.log(" In Get_Given_Domain_Compet_pedago_data res.data.message r_class = " + res.data.message); + // console.log(" In Get_Given_Domain_Compet_pedago_data res.data.message r_class = " + res.data.message); setGet_Given_Domain_Compet_pedago_data_api("true"); setGet_Given_Domain_Compet_pedago_data_result(res.data.message); @@ -1134,6 +1157,12 @@ const Module_Domaine_Competence_Pedagogique = (props) => { setp_detail_domaine_compet_pedago_code(""); + if (pdomaine_compet_pedago.couleur) + setp_detail_domaine_compet_pedago_couleur(pdomaine_compet_pedago.couleur); + else + setp_detail_domaine_compet_pedago_couleur(""); + + if (pdomaine_compet_pedago.description) setp_detail_domaine_compet_pedago_description(pdomaine_compet_pedago.description); else @@ -1488,6 +1517,7 @@ const Module_Domaine_Competence_Pedagogique = (props) => { setp_detail_domaine_compet_pedago_code(""); setp_detail_domaine_compet_pedago_description(""); setp_detail_domaine_compet_pedago_commentaire(""); + setp_detail_domaine_compet_pedago_couleur("#3573CB") } @@ -1541,6 +1571,8 @@ const Module_Domaine_Competence_Pedagogique = (props) => { form.append("code", p_detail_domaine_compet_pedago_code); form.append("description", p_detail_domaine_compet_pedago_description); form.append("commentaire", p_detail_domaine_compet_pedago_commentaire); + form.append("couleur", p_detail_domaine_compet_pedago_couleur); + setLoading(true); @@ -2021,6 +2053,20 @@ const Module_Domaine_Competence_Pedagogique = (props) => { + const [Dialog_GRP_COLOR_message, setDialog_GRP_COLOR_message] = React.useState(false); + const [Dialog_GRP_COLOR_open, setDialog_GRP_COLOR_open] = React.useState(false); + + + const Dialog_GRP_COLOR_handleClose = () => { + //alert(" Utiliser le bouton 'fermer' "); + //setOpen(false); + }; + + const Dialog_GRP_COLOR_handleClose_buton = () => { + setDialog_GRP_COLOR_open(false); + + }; + return (
@@ -2040,6 +2086,78 @@ const Module_Domaine_Competence_Pedagogique = (props) => { } {/*** FIN Affichage des messages d'alerte*/} + {/*** Dialog pickup Color */} + null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + //top: '5rem' + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + className="groupe_apprenant_dialog" + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > + + Choisir une couleur + + + + + +
Code couleur
+ { + setp_detail_domaine_compet_pedago_couleur(color.hex); + setdomaine_compet_pedago_data_changed("1"); + } + } + /> + +
+ + + + + + + + + + + + {/*** Fin ajout pickup Color */} {/* Dialog pour ajouter une COMPETENCE A UN DOMAINE DE COMPET */} @@ -2055,7 +2173,6 @@ const Module_Domaine_Competence_Pedagogique = (props) => { PaperProps={{ - className: classes.paper, // Apply the paper style style: { overflowY: 'unset', @@ -2101,19 +2218,19 @@ const Module_Domaine_Competence_Pedagogique = (props) => { renderInput={(params) => @@ -2207,12 +2324,12 @@ const Module_Domaine_Competence_Pedagogique = (props) => { // Gestion des cellule a distance ou presentiel '& .cell--distantiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .cell--presentiel': { backgroundColor: '#AFE1AF', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -2224,11 +2341,11 @@ const Module_Domaine_Competence_Pedagogique = (props) => { '& .line--statut--inscrit': { backgroundColor: '#CEF6D8', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--preinscrit': { backgroundColor: '#F7F2E0', - color: "#0a2a4d", + color: "#0a2a4d", }, @@ -2264,7 +2381,7 @@ const Module_Domaine_Competence_Pedagogique = (props) => { }} > { setSelectionModel(newSelectionModel); /*if (newSelectionModel.length === 1) @@ -2285,6 +2402,7 @@ const Module_Domaine_Competence_Pedagogique = (props) => { code: JSON.parse(item).code, description: JSON.parse(item).description, commentaire: JSON.parse(item).commentaire, + couleur: JSON.parse(item).couleur, } ))} @@ -2460,31 +2578,43 @@ const Module_Domaine_Competence_Pedagogique = (props) => { paddingLeft: '10px', flexWrap: 'wrap' }}> -
Code
- +
Code
+ { - setp_detail_domaine_compet_pedago_code(e.target.value); - setdomaine_compet_pedago_data_changed("1"); - }} + InputLabelProps={{ + shrink: true, + }} + disabled={false} + className="disabled_style" + value={p_detail_domaine_compet_pedago_code} + onChange={(e) => { + setp_detail_domaine_compet_pedago_code(e.target.value); + setdomaine_compet_pedago_data_changed("1"); + }} + + /> +
+ + +
Couleur
+ + +
- />
- -
Description
{ style={{ border: "1px solid #e8eef6", width: '99%', padding: '2px', maxHeight: '5rem', height: '5rem', minHeight: '5rem', marginBottom: '1rem', - fontFamily: 'DM Sans', fontSize: '14px' + fontFamily: 'DM Sans', fontSize: '14px', }} disabled={false} value={p_detail_domaine_compet_pedago_description} @@ -2607,32 +2737,44 @@ const Module_Domaine_Competence_Pedagogique = (props) => { paddingLeft: '10px', flexWrap: 'wrap' }}> -
Code
- - InputLabelProps={{ - shrink: true, - }} - disabled={!domaine_compet_pedago_edit_data} - className="disabled_style" - value={p_detail_domaine_compet_pedago_code} - onChange={(e) => { - setp_detail_domaine_compet_pedago_code(e.target.value); - setdomaine_compet_pedago_data_changed("1"); - }} +
Code
+ { + setp_detail_domaine_compet_pedago_code(e.target.value); + setdomaine_compet_pedago_data_changed("1"); + }} + /> +
+ +
Couleur
+ + +
+ - />
-
Description
{ style={{ border: "1px solid #e8eef6", width: '99%', padding: '2px', maxHeight: '5rem', height: '5rem', minHeight: '5rem', marginBottom: '1rem', - fontFamily: 'DM Sans', fontSize: '14px' + fontFamily: 'DM Sans', fontSize: '14px', }} disabled={Boolean(domaine_compet_pedago_edit_data)} value={p_detail_domaine_compet_pedago_description} @@ -2771,11 +2913,11 @@ const Module_Domaine_Competence_Pedagogique = (props) => { '& .line--statut--inscrit': { backgroundColor: '#CEF6D8', - color: "#0a2a4d", + color: "#0a2a4d", }, '& .line--statut--preinscrit': { backgroundColor: '#F7F2E0', - color: "#0a2a4d", + color: "#0a2a4d", }, diff --git a/src/components/Notes_Evaluation.js b/src/components/Notes_Evaluation.js index fbd568a..a502a5b 100644 --- a/src/components/Notes_Evaluation.js +++ b/src/components/Notes_Evaluation.js @@ -1009,6 +1009,7 @@ const Notes_Evaluation = (props) => { { "id": "code_session", "label": "Lié a la Promotion(code Classe) ", "value": "code_session" }, { "id": "code_ue", "label": "Lié a l'UE (code UE) ", "value": "code_ue" }, { "id": "rattrapage", "label": "Rattrapage", "value": "rattrapage" }, + { "id": "tab_diplome_id", "label": "Diplome", "value": "tab_diplome_id" }, { "id": "", "label": "", "value": "" }, { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. ] @@ -2034,6 +2035,91 @@ const Notes_Evaluation = (props) => { } + const [New_Getall_Parter_config_diplome_result, setNew_Getall_Parter_config_diplome_result] = useState([]); + + const [Getall_Parter_config_diplome_api, setGetall_Parter_config_diplome_api] = useState(); + const [Getall_Parter_config_diplome_message, setGetall_Parter_config_diplome_message] = useState(); + const [Getall_Parter_config_diplome_result, setGetall_Parter_config_diplome_result] = useState([]); + function Getall_Parter_config_diplome(event) { + + var form = new FormData(); + + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Diplome/"; + + setLoading(true); + axios.post(myurl, form).then(res => { + setLoading(false); + + if (String(res.data.status) === String("true")) { + //console.log(" In Getall_Parter_config_diplome res.data.status = " + res.data.status); + //console.log(" In Getall_Parter_config_diplome res.data.message r_class = " + res.data.message); + setGetall_Parter_config_diplome_api("true"); + setGetall_Parter_config_diplome_result(res.data.message); + //setRows(res.data.message); + + var new_data2 = []; + const new_data = res.data.message.map((x) => { + + //--- + var localid = JSON.parse(x).id; + var local_id = JSON.parse(x)._id; + var local_code = JSON.parse(x).code; + var local_description = JSON.parse(x).description; + + + //--- + var node = { + "_id": local_id, + "id": localid, + "label": local_code, + "code": local_code, + "description": local_description, + + }; + new_data2.push(node); + }); + + //--- + var node = { + "_id": "", + "id": "", + "label": "", + "code": "", + "description": "", + + }; + new_data2.push(node); + + + if (new_data2.length > 0) + setNew_Getall_Parter_config_diplome_result(new_data2); + + } + else { + setGetall_Parter_config_diplome_api("false"); + setGetall_Parter_config_diplome_message(res.data.message); + // alert(res.data.message) + setdisplay_alert_mysy("1"); + setalert_message(res.data.message); + setalert_type("error"); + } + + }).catch((error) => { + setLoading(false); + console.warn('Not good man :( Getall_Parter_config_diplome = ', error); + setGetall_Parter_config_diplome_api("false"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer la liste des diplomes"); + setalert_type("error"); + //setmyApimyApiMessage("") + }) + } + useEffect(() => { @@ -2045,7 +2131,7 @@ const Notes_Evaluation = (props) => { Getall_Partner_Type_Evalution_List(); Getall_Training_Employee_No_Filter(); Getall_Training_Materiel_No_Filter(); - + Getall_Parter_config_diplome(); Getall_Partner_Evaluation(); window.scrollTo({ @@ -2115,16 +2201,26 @@ const Notes_Evaluation = (props) => { form.append(filtre4, p_filtre4_value); } + var tab_scope_diplome_id = [] + for (var i = 0; i < scope_filter_diplome.length; i++) { + tab_scope_diplome_id.push(scope_filter_diplome[i]._id) + } + + if (tab_scope_diplome_id.length > 0) { + form.append("tab_diplome_id", tab_scope_diplome_id); + } const stored_cookie = getCookie('tokenmysypart'); form.append("token", stored_cookie); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Evaluation_Planification_With_Filter/"; + console.log(" ### form = ", form); + setLoading(true); axios.post(myurl, form).then(res => { - + setLoading(false); if (String(res.data.status) === String("true")) { //console.log(" In Getall_Training_Employee_With_Filter res.data.status = " + res.data.status); //console.log(" In Getall_Training_Employee_With_Filter res.data.message r_class = " + res.data.message); @@ -2198,6 +2294,7 @@ const Notes_Evaluation = (props) => { } }).catch((error) => { + setLoading(false); console.warn('Not good man :( Getall_Training_Employee_With_Filter = ', error); setGetall_Training_Employee_With_Filter_api("false"); //setmyApimyApiMessage("") @@ -2227,7 +2324,7 @@ const Notes_Evaluation = (props) => { form.append("rattrapage", p_detail_rattrapage); - // console.log(" ### scope_diplome == ", scope_diplome) + // console.log(" ### scope_diplome == ", scope_diplome) var tab_scope_diplome_id = [] for (var i = 0; i < scope_diplome.length; i++) { @@ -4371,6 +4468,19 @@ const Notes_Evaluation = (props) => { )); }; + const fixedVal_filter_diplome = []; + const [scope_filter_diplome, setscope_filter_diplome] = useState([...fixedVal_filter_diplome]); + const CustomChip_filter_diplome = (chipVal, getTagProps) => { + return chipVal.map((item, index) => ( + + )); + }; + + return (
{isLoading &&
@@ -4992,7 +5102,7 @@ const Notes_Evaluation = (props) => { - {p_filtre1 && p_filtre1 !== "rattrapage" &&
+ {p_filtre1 && p_filtre1 !== "rattrapage" && p_filtre1 !== "tab_diplome_id" &&
{ />
} + {p_filtre1 && p_filtre1 === "tab_diplome_id" && New_Getall_Parter_config_diplome_result && New_Getall_Parter_config_diplome_result.length > 0 && +
+ { + setscope_filter_diplome([ + ...fixedVal_filter_diplome, + ...newValue.filter((i) => fixedVal_filter_diplome.indexOf(i) === -1), + ]); + + }} + + options={New_Getall_Parter_config_diplome_result} + value={scope_filter_diplome} + + + renderInput={(params) => + } + /> +
} + {p_filtre1 &&
@@ -5125,7 +5276,7 @@ const Notes_Evaluation = (props) => {
- {String(p_filtre2).length > 2 && p_filtre2 !== "rattrapage" && + {String(p_filtre2).length > 2 && p_filtre2 !== "rattrapage" && p_filtre2 !== "tab_diplome_id" && { /> } + {String(p_filtre2).length > 2 && p_filtre2 === "tab_diplome_id" && New_Getall_Parter_config_diplome_result && New_Getall_Parter_config_diplome_result.length > 0 && + { + setscope_filter_diplome([ + ...fixedVal_filter_diplome, + ...newValue.filter((i) => fixedVal_filter_diplome.indexOf(i) === -1), + ]); + + }} + + options={New_Getall_Parter_config_diplome_result} + value={scope_filter_diplome} + + renderInput={(params) => + } + /> + } +
@@ -5263,7 +5453,7 @@ const Notes_Evaluation = (props) => {
- {String(p_filtre3).length > 2 && p_filtre3 !== "rattrapage" && + {String(p_filtre3).length > 2 && p_filtre3 !== "rattrapage" && p_filtre3 !== "tab_diplome_id" && { } /> } + + {String(p_filtre3).length > 2 && p_filtre3 === "tab_diplome_id" && New_Getall_Parter_config_diplome_result && New_Getall_Parter_config_diplome_result.length > 0 && + { + setscope_filter_diplome([ + ...fixedVal_filter_diplome, + ...newValue.filter((i) => fixedVal_filter_diplome.indexOf(i) === -1), + ]); + + }} + + options={New_Getall_Parter_config_diplome_result} + value={scope_filter_diplome} + + renderInput={(params) => + } + /> + }
{String(p_filtre2).length > 2 && } {String(p_filtre3).length > 2 &&
@@ -5684,7 +5905,7 @@ const Notes_Evaluation = (props) => { style={{ border: "1px solid #e8eef6", width: '99%', padding: '2px', maxHeight: '5rem', height: '5rem', minHeight: '5rem', marginBottom: '1rem', - fontFamily: 'DM Sans', fontSize: '14px' + fontFamily: 'DM Sans', fontSize: '14px', width:'96%' }} disabled={false} value={p_detail_description} @@ -5811,7 +6032,7 @@ const Notes_Evaluation = (props) => { // options={New_Get_List_UE_From_Session_Id_Diplome_result} options={New_Get_List_UE_From_Session_Id_Diplome_result.filter((data) => (data).ue_id === String(p_detail_class_eu_id))} multiple - + disabled={true} value={scope_diplome} @@ -6149,7 +6370,7 @@ const Notes_Evaluation = (props) => { style={{ border: "1px solid #e8eef6", width: '99%', padding: '2px', maxHeight: '5rem', height: '5rem', minHeight: '5rem', marginBottom: '1rem', - fontFamily: 'DM Sans', fontSize: '14px' + fontFamily: 'DM Sans', fontSize: '14px', width:'96%' }} disabled={false} value={p_detail_description} @@ -6886,7 +7107,7 @@ const Notes_Evaluation = (props) => { style={{ border: "1px solid #e8eef6", width: '99%', padding: '2px', maxHeight: '5rem', height: '5rem', minHeight: '5rem', marginBottom: '1rem', - fontFamily: 'DM Sans', fontSize: '14px' + fontFamily: 'DM Sans', fontSize: '14px', width:'96%' }} disabled={false} className="disabled_style" diff --git a/src/components/Partner_Admission_Process_Ftion_Initiale.js b/src/components/Partner_Admission_Process_Ftion_Initiale.js index 91c35d6..478b7fa 100644 --- a/src/components/Partner_Admission_Process_Ftion_Initiale.js +++ b/src/components/Partner_Admission_Process_Ftion_Initiale.js @@ -189,7 +189,7 @@ const Partner_Admission_Process_Ftion_Initiale = (props) => { { field: 'rang', headerName: 'rang', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'comment', headerName: 'comment', minWidth: 150, flex: 1, hide: true, renderCell: (params) => , }, { - field: 'code_couleur', headerName: 'code_couleur', minWidth: 150, flex: 1, renderCell: (params) => , + field: 'code_couleur', headerName: 'Couleur', minWidth: 150, flex: 1, renderCell: (params) => , renderCell: (cellValues) => { return (
diff --git a/src/components/Partner_Config_Technique.js b/src/components/Partner_Config_Technique.js index ff06b6d..3eecc68 100644 --- a/src/components/Partner_Config_Technique.js +++ b/src/components/Partner_Config_Technique.js @@ -32,6 +32,7 @@ import Paper from '@material-ui/core/Paper'; import Draggable from 'react-draggable'; import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; import { IconButton } from '@material-ui/core'; +import { id } from "date-fns/locale"; function PaperComponent(props) { return ( @@ -1105,6 +1106,13 @@ const Partner_Configuration_Technique = (props) => { const myRef_doc_auto = useRef(null) + + const New_Option_Sequence_Code_Couleur = [ + { "id": "ue", "label": "UE", "value": "ue" }, + { "id": "grp_apprenant", "label": "grp_apprenant", "value": "grp_apprenant" }, + { "id": "", "label": "", "value": "" }, + ] + useEffect(() => { @@ -2037,6 +2045,15 @@ const Partner_Configuration_Technique = (props) => { var local_config_value = line.config_value; setp_detail_config_valeur(local_config_value); + + if (line.config_name === "sequence_code_couleur") { + + if (!['', 'ue', 'grp_apprenant'].includes(line.config_value)) { + console.log(" OOO ") + setp_detail_config_valeur(""); + } + } + Disable_Config_DetailFields(); if (document.getElementById('myRef')) { @@ -4677,7 +4694,7 @@ const Partner_Configuration_Technique = (props) => { setp_categorie_desc(line.description); - setDialog_categorie_1_open(true); + setDialog_categorie_1_open(true); } @@ -5384,19 +5401,19 @@ const Partner_Configuration_Technique = (props) => { }} renderInput={(params) => @@ -5980,19 +5997,19 @@ const Partner_Configuration_Technique = (props) => { } }} renderInput={(params) => @@ -6157,19 +6174,19 @@ const Partner_Configuration_Technique = (props) => { }} renderInput={(params) => @@ -6580,7 +6597,10 @@ const Partner_Configuration_Technique = (props) => {
{String(config_data_edit_mode) === "1" &&
Valeur de configuration
- { } } } - /> + />} + + + {p_detail_config_point === "sequence_code_couleur" && New_Option_Sequence_Code_Couleur && New_Option_Sequence_Code_Couleur.length > 0 && + + (data).value === String(p_detail_config_valeur))[0].label} + onChange={(event, value) => { + if (value && value.value) { + setp_detail_config_valeur(value.value); + setConfig_data_changed("1"); + + } + }} + + renderInput={(params) => + } + /> + + + } + +
} {String(config_data_edit_mode) !== "1" &&
Valeur de configuration
@@ -7945,19 +8008,19 @@ const Partner_Configuration_Technique = (props) => { }} renderInput={(params) => @@ -8448,19 +8511,19 @@ const Partner_Configuration_Technique = (props) => { } }} renderInput={(params) => @@ -8491,19 +8554,19 @@ const Partner_Configuration_Technique = (props) => { } }} renderInput={(params) => @@ -8534,19 +8597,19 @@ const Partner_Configuration_Technique = (props) => { } }} renderInput={(params) => diff --git a/src/styles/components/_note_evaluation.scss b/src/styles/components/_note_evaluation.scss index a2866ed..9ad4c26 100644 --- a/src/styles/components/_note_evaluation.scss +++ b/src/styles/components/_note_evaluation.scss @@ -13,7 +13,7 @@ top: 0px; opacity: 80%; left: 0px; - } + } .tooltip_css { background: #81BC3A; @@ -86,7 +86,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal; @@ -661,7 +661,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal; @@ -1294,7 +1294,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal; @@ -1720,7 +1720,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal; @@ -1822,7 +1822,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal; @@ -2312,7 +2312,7 @@ text-align: center; margin-bottom: 0.8rem; color: white; - cursor: pointer; + cursor: default; font-style: italic; background-color: gray; font-weight: normal;