diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index b609054..c09ffab 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -200,8 +200,12 @@ const AddClassManual = (props) => { { field: 'domaine_competence_id', headerName: 'domaine_competence_id', hide: true }, { field: 'competence_id', headerName: 'competence_id', hide: true }, + { field: 'diplome_id', headerName: 'diplome_id', hide: true }, - { field: 'semestre', headerName: 'Semest.', Width: 80, renderCell: (params) => , }, + + { field: 'diplome_code', headerName: 'Diplome', Width: 100, renderCell: (params) => , }, + + { field: 'semestre', headerName: 'Semest.', Width: 80, renderCell: (params) => , }, { field: 'domaine_competence_code', headerName: 'Dom. Compétence', maxWidth: 250, flex: 1, renderCell: (params) => , }, { field: 'competence_code', headerName: 'Compétence', maxWidth: 250, flex: 1, renderCell: (params) => , }, @@ -494,10 +498,14 @@ 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: 'class_id', headerName: 'class_id', Width: 0, hide: true, }, { field: 'class_ue_id', headerName: 'class_ue_id', Width: 0, hide: true }, + { field: 'diplome_code', headerName: 'Diplome.', minWidth: 150, flex: 1, renderCell: (params) => , }, + + { field: 'class_ue_code', headerName: 'Code UE', minWidth: 150, flex: 1, renderCell: (params) => , renderCell: (cellValues) => { @@ -665,13 +673,18 @@ const AddClassManual = (props) => { function handleClick_delete_UE_From_Class(event, cellValues) { - Delete_Given_UE_From_Class(cellValues.row._id); + + var local_diplome_id = "" + if (cellValues.row.diplome_id) + local_diplome_id = cellValues.row.diplome_id + + Delete_Given_UE_From_Class(cellValues.row._id, local_diplome_id); } const [Delete_Given_UE_From_Class_api, setDelete_Given_UE_From_Class_api] = useState(); const [Delete_Given_UE_From_Class_message, setDelete_Given_UE_From_Class_message] = useState(); const [Delete_Given_UE_From_Class_result, setDelete_Given_UE_From_Class_result] = useState(); - function Delete_Given_UE_From_Class(local_ue_id) { + function Delete_Given_UE_From_Class(local_ue_id, local_diplome_id) { var form = new FormData(); @@ -686,6 +699,7 @@ const AddClassManual = (props) => { form.append("ue_id", local_ue_id); + form.append("diplome_id", local_diplome_id); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_UE_From_Class/"; @@ -784,6 +798,8 @@ const AddClassManual = (props) => { var local_competence_id = JSON.parse(x).competence_id; var local_competence_code = JSON.parse(x).competence_code; + var local_diplome_id = JSON.parse(x).diplome_id; + var local_diplome_code = JSON.parse(x).diplome_code; @@ -791,7 +807,7 @@ const AddClassManual = (props) => { var node = { "_id": local_id, "id": localid, - "label": local_code + " - " + String(local_titre).substring(0, 20), + "label": local_code + " - " + String(local_diplome_code).substring(0, 20), "code": local_code, "titre": local_titre, "credit": local_credit, @@ -806,6 +822,8 @@ const AddClassManual = (props) => { "competence_id": local_competence_id, "competence_code": local_competence_code, + "diplome_id": local_diplome_id, + "diplome_code": local_diplome_code, }; new_data2.push(node); @@ -828,6 +846,8 @@ const AddClassManual = (props) => { "domaine_competence_code": "", "competence_id": "", "competence_code": "", + "diplome_id": "", + "diplome_code": "", }; new_data2.push(node); @@ -849,7 +869,10 @@ const AddClassManual = (props) => { setLoading(false); console.warn('Not good man :( Getall_Class_List_UE = ', error); setGetall_Class_List_UE_api("false"); - alert(" Impossible de recuperer la liste des UE de la formation"); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer la liste des UE de la formation"); + setalert_type("error"); //setmyApimyApiMessage("") }) } @@ -1433,6 +1456,10 @@ const AddClassManual = (props) => { var local_max_note = JSON.parse(x).max_note; var local_ponderation_type_eval = JSON.parse(x).ponderation_type_eval; + var local_diplome_id = JSON.parse(x).diplome_id; + var local_diplome_code = JSON.parse(x).diplome_code; + + //--- var node = { @@ -1445,6 +1472,10 @@ const AddClassManual = (props) => { "max_note": local_max_note, "ponderation_type_eval": local_ponderation_type_eval, + "diplome_id": local_diplome_id, + "diplome_code": local_diplome_code, + + }; new_data2.push(node); }); @@ -1458,7 +1489,9 @@ const AddClassManual = (props) => { "class_ue_id": "", "type_evaluation_id": "", "max_note": "", - "ponderation_type_eval": "" + "ponderation_type_eval": "", + "diplome_id": "", + "diplome_code": "", }; new_data2.push(node); @@ -4671,6 +4704,7 @@ const AddClassManual = (props) => { const [selected_ue_coefficient, setselected_ue_coefficient] = useState("1"); const [selected_ue_seuil_validation, setselected_ue_seuil_validation] = useState(""); + const [selected_ue_diplome_id, setselected_ue_diplome_id] = useState(""); const [selected_class_note_calculation_id, setselected_class_note_calculation_id] = useState(""); @@ -4702,6 +4736,7 @@ const AddClassManual = (props) => { setadd_one_eu_to_class(""); setselected_ue_coefficient("1"); setselected_ue_seuil_validation(""); + setselected_ue_diplome_id("") }; @@ -4714,6 +4749,7 @@ const AddClassManual = (props) => { setselected_ue_pres_dist_hyp("0"); setadd_one_eu_to_class(""); setselected_ue_coefficient("1"); + setselected_ue_diplome_id("") } @@ -4726,6 +4762,7 @@ const AddClassManual = (props) => { setselected_ue_pres_dist_hyp("0"); setadd_one_eu_to_class(""); setselected_ue_coefficient("1"); + setselected_ue_diplome_id("") }; const [Dialog_1_message, setDialog_1_message] = React.useState(false); @@ -4813,6 +4850,7 @@ const AddClassManual = (props) => { form.append("max_note", p_detail_max_note); form.append("ponderation_type_eval", p_detail_ponderation_type_eval); form.append("type_notation", p_detail_type_notation); + form.append("diplome_id", selected_ue_diplome_id); var myurl = ""; @@ -4842,6 +4880,7 @@ const AddClassManual = (props) => { setadd_ue_evalution(""); setselected_ue_id(""); + setselected_ue_diplome_id(""); setselected_eu_evalution_id(""); setsetgridline_evaluation_ue_id(""); setp_detail_max_note("20"); @@ -6842,6 +6881,7 @@ const AddClassManual = (props) => { const Dialog_Module_Ftion_handleClose_buton = () => { setDialog_Module_Ftion_open(false); setselected_ue_id(""); + setselected_ue_diplome_id(""); setselected_ue_credit_ects(""); setselected_ue_seuil_validation(""); setselected_ue_is_noted("1"); @@ -7031,8 +7071,12 @@ const AddClassManual = (props) => { setselected_ue_id(value._id); setselected_ue_credit_ects(value.ects); setselected_ue_seuil_validation(value.seuil_validation); + } else { setselected_ue_id(""); + setselected_ue_credit_ects(""); + setselected_ue_seuil_validation(""); + } }} @@ -7085,6 +7129,19 @@ const AddClassManual = (props) => { } }} renderInput={(params) => } @@ -7113,6 +7170,19 @@ const AddClassManual = (props) => { } }} renderInput={(params) => @@ -7271,6 +7341,19 @@ const AddClassManual = (props) => { } }} renderInput={(params) => @@ -7472,8 +7555,13 @@ const AddClassManual = (props) => { setselected_ue_id(value._id); setselected_ue_credit_ects(value.ects); setselected_ue_seuil_validation(value.seuil_validation); + setselected_ue_diplome_id(value.diplome_id); + // console.log('#### value.diplome_id == ', value.diplome_id) } else { setselected_ue_id(""); + setselected_ue_credit_ects(""); + setselected_ue_seuil_validation(""); + setselected_ue_diplome_id(""); } }} @@ -7582,6 +7670,19 @@ const AddClassManual = (props) => { } }} renderInput={(params) => } @@ -7610,6 +7711,19 @@ const AddClassManual = (props) => { } }} renderInput={(params) => @@ -7707,9 +7821,14 @@ const AddClassManual = (props) => { if (value && value._id) { setselected_ue_id(value._id); + setselected_ue_diplome_id(value.diplome_id); + console.log('#### value.diplome_id == ', value.diplome_id); + console.log('#### EU._id == ', value._id); } else { setselected_ue_id(""); + setselected_ue_diplome_id(""); + } }} @@ -7840,6 +7959,19 @@ const AddClassManual = (props) => { } }} renderInput={(params) => @@ -8008,7 +8140,7 @@ const AddClassManual = (props) => { }} > { setselectionModel_list_unite_enseignement(newSelectionModel); @@ -8052,6 +8184,7 @@ const AddClassManual = (props) => { // console.log(" ### current_class_ue_data[0] = ", current_class_ue_data[0]); setselected_ue_credit_ects(current_class_ue_data[0]['credit']); + setselected_ue_diplome_id(current_class_ue_data[0]['diplome_id']); setselected_ue_is_noted(current_class_ue_data[0]['is_noted']); setselected_ue_pres_dist_hyp(current_class_ue_data[0]['pres_dist_hyp']); setselected_ue_coefficient(current_class_ue_data[0]['coefficient']); @@ -8174,7 +8307,7 @@ const AddClassManual = (props) => { }} > { setselectionModel_list_unite_enseignement(newSelectionModel); @@ -8206,6 +8339,8 @@ const AddClassManual = (props) => { competence_id: JSON.parse(item).competence_id, competence_code: JSON.parse(item).competence_code, + diplome_id: JSON.parse(item).diplome_id, + diplome_code: JSON.parse(item).diplome_code, duration: JSON.parse(item).duration, duration_unite: JSON.parse(item).duration_unite, @@ -8229,6 +8364,7 @@ const AddClassManual = (props) => { // console.log(" ### current_class_ue_data[0] = ", current_class_ue_data[0]); setselected_ue_credit_ects(current_class_ue_data[0]['credit']); setselected_ue_is_noted(current_class_ue_data[0]['is_noted']); + setselected_ue_diplome_id(current_class_ue_data[0]['diplome_id']); 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']); @@ -8372,6 +8508,9 @@ 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, } ))} @@ -8387,6 +8526,8 @@ const AddClassManual = (props) => { setselected_ue_id(newSelectionModel.row.class_ue_id); setp_detail_max_note(newSelectionModel.row.max_note); + setselected_ue_diplome_id(newSelectionModel.row.max_note.diplome_id); + setp_detail_type_notation(newSelectionModel.row.type_notation); @@ -9824,6 +9965,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -9860,6 +10014,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -9898,6 +10065,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -9935,6 +10115,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -9971,6 +10164,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -10000,6 +10206,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -10036,6 +10255,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -10065,6 +10297,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -10101,6 +10346,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -10131,6 +10389,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -10167,6 +10438,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -10195,6 +10479,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => } @@ -11355,6 +11652,19 @@ const AddClassManual = (props) => { }} renderInput={(params) => diff --git a/src/components/AddClassManual_ARG.js b/src/components/AddClassManual_ARG.js index 3687829..abdd10a 100644 --- a/src/components/AddClassManual_ARG.js +++ b/src/components/AddClassManual_ARG.js @@ -6652,6 +6652,19 @@ const AddClassManual_ARG = (props) => { } }} renderInput={(params) => @@ -6963,6 +6976,19 @@ const AddClassManual_ARG = (props) => { } }} renderInput={(params) => } @@ -6991,6 +7017,19 @@ const AddClassManual_ARG = (props) => { } }} renderInput={(params) => @@ -8888,6 +8927,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -8924,6 +8976,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -8962,6 +9027,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -8999,6 +9077,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9035,6 +9126,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9064,6 +9168,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9100,6 +9217,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9129,6 +9259,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9165,6 +9308,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9195,6 +9351,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9231,6 +9400,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -9259,6 +9441,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => } @@ -10419,6 +10614,19 @@ const AddClassManual_ARG = (props) => { }} renderInput={(params) => diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index fcd08df..079f6f5 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -4996,6 +4996,19 @@ const AddParnerClient = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -5023,6 +5036,19 @@ const AddParnerClient = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -5056,6 +5082,19 @@ const AddParnerClient = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -5087,6 +5126,19 @@ const AddParnerClient = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => } @@ -5691,6 +5743,19 @@ const AddParnerClient = (props) => { renderInput={(params) => @@ -5743,6 +5808,19 @@ const AddParnerClient = (props) => { renderInput={(params) => @@ -5775,6 +5853,19 @@ const AddParnerClient = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -5981,6 +6072,19 @@ const AddParnerClient = (props) => { } }} renderInput={(params) => @@ -6091,6 +6195,19 @@ const AddParnerClient = (props) => { }} renderInput={(params) => @@ -6225,6 +6342,19 @@ const AddParnerClient = (props) => { } }} renderInput={(params) => @@ -6395,6 +6525,19 @@ const AddParnerClient = (props) => { } }} renderInput={(params) => @@ -6902,6 +7045,19 @@ const AddParnerClient = (props) => { }} renderInput={(params) => @@ -7518,6 +7674,19 @@ const AddParnerClient = (props) => { }} renderInput={(params) => @@ -8119,6 +8288,19 @@ const AddParnerClient = (props) => { } }} renderInput={(params) => @@ -8228,6 +8410,19 @@ const AddParnerClient = (props) => { }} renderInput={(params) => @@ -8489,6 +8684,19 @@ const AddParnerClient = (props) => { } }} renderInput={(params) => diff --git a/src/components/AddPartnerClient_ARG_100526.js b/src/components/AddPartnerClient_ARG_100526.js index 316a2ca..d4914b1 100644 --- a/src/components/AddPartnerClient_ARG_100526.js +++ b/src/components/AddPartnerClient_ARG_100526.js @@ -4556,6 +4556,19 @@ const AddPartnerClient_ARG_100526 = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -4583,6 +4596,19 @@ const AddPartnerClient_ARG_100526 = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -4616,6 +4642,19 @@ const AddPartnerClient_ARG_100526 = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -4647,6 +4686,19 @@ const AddPartnerClient_ARG_100526 = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => } @@ -5249,6 +5301,19 @@ const AddPartnerClient_ARG_100526 = (props) => { renderInput={(params) => @@ -5301,6 +5366,19 @@ const AddPartnerClient_ARG_100526 = (props) => { renderInput={(params) => @@ -5333,6 +5411,19 @@ const AddPartnerClient_ARG_100526 = (props) => { //value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -5539,6 +5630,19 @@ const AddPartnerClient_ARG_100526 = (props) => { } }} renderInput={(params) => @@ -5649,6 +5753,19 @@ const AddPartnerClient_ARG_100526 = (props) => { }} renderInput={(params) => @@ -5783,6 +5900,19 @@ const AddPartnerClient_ARG_100526 = (props) => { } }} renderInput={(params) => @@ -5953,6 +6083,19 @@ const AddPartnerClient_ARG_100526 = (props) => { } }} renderInput={(params) => diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 16734c1..1f44887 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -7254,6 +7254,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => @@ -7531,6 +7544,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => @@ -7720,6 +7746,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => @@ -7961,6 +8000,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -7984,6 +8036,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8008,6 +8073,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8031,6 +8109,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8056,6 +8147,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8080,6 +8184,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8179,6 +8296,19 @@ const Apprenant = (props) => { renderInput={(params) => @@ -8242,6 +8372,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8301,6 +8444,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => } @@ -8349,6 +8505,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8406,6 +8575,19 @@ const Apprenant = (props) => { } }} renderInput={(params) => } @@ -8659,6 +8841,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -8974,6 +9169,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -9028,6 +9236,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -9284,6 +9505,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -9643,6 +9877,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -9827,6 +10074,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -10175,6 +10435,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -10905,6 +11178,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -10938,6 +11224,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -10975,6 +11274,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11059,6 +11371,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11352,6 +11677,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11386,6 +11724,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11424,6 +11775,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -11508,6 +11872,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -12009,6 +12386,19 @@ const Apprenant = (props) => { setfacturation_data_changed("1"); }} renderInput={(params) => @@ -12131,6 +12521,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -12163,6 +12566,19 @@ const Apprenant = (props) => { }} renderInput={(params) => @@ -12193,6 +12609,19 @@ const Apprenant = (props) => { }} renderInput={(params) => diff --git a/src/components/Autre_RH.js b/src/components/Autre_RH.js index 7c9b7e9..7f23ffd 100644 --- a/src/components/Autre_RH.js +++ b/src/components/Autre_RH.js @@ -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,6 +7334,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -7550,6 +7563,19 @@ const Autre_RH = (props) => { } }} renderInput={(params) => @@ -7649,6 +7675,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -7681,6 +7720,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -8488,6 +8540,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -8573,6 +8638,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -8677,6 +8755,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -9098,6 +9189,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -9364,6 +9468,19 @@ const Autre_RH = (props) => { } }} renderInput={(params) => @@ -9777,6 +9894,19 @@ const Autre_RH = (props) => { } }} renderInput={(params) => @@ -10229,6 +10359,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -10605,6 +10748,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -11525,6 +11681,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -11744,6 +11913,19 @@ const Autre_RH = (props) => { value={scope_class} options={New_GetCurrentPartnerClass_result} renderInput={(params) => @@ -11774,6 +11956,19 @@ const Autre_RH = (props) => { value={scope_session} options={New_Getall_TrainingSession_Without_Scope_Action_result} renderInput={(params) => @@ -12555,6 +12750,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -12833,6 +13041,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => @@ -12990,6 +13211,19 @@ const Autre_RH = (props) => { }} renderInput={(params) => diff --git a/src/components/Config_Champs_Personnalise.js b/src/components/Config_Champs_Personnalise.js index f35fbe5..32025ed 100644 --- a/src/components/Config_Champs_Personnalise.js +++ b/src/components/Config_Champs_Personnalise.js @@ -1764,6 +1764,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => @@ -1826,6 +1839,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => @@ -1855,6 +1881,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => @@ -1974,6 +2013,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => @@ -2044,6 +2096,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => @@ -2070,6 +2135,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => @@ -2097,6 +2175,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => @@ -2126,6 +2217,19 @@ const Config_Champs_Personnalise = (props) => { }} renderInput={(params) => diff --git a/src/components/Config_Document.js b/src/components/Config_Document.js index b39e25c..8313f5e 100644 --- a/src/components/Config_Document.js +++ b/src/components/Config_Document.js @@ -2424,6 +2424,19 @@ const Config_Documents = (props) => { }} renderInput={(params) => @@ -2525,6 +2538,19 @@ const Config_Documents = (props) => { }} renderInput={(params) => @@ -3380,6 +3406,19 @@ const Config_Documents = (props) => { }} renderInput={(params) => diff --git a/src/components/Config_Document_Super_Admin.js b/src/components/Config_Document_Super_Admin.js index 72d48fc..05deace 100644 --- a/src/components/Config_Document_Super_Admin.js +++ b/src/components/Config_Document_Super_Admin.js @@ -2295,6 +2295,19 @@ const Config_Documents_Super_Admin = (props) => { }} renderInput={(params) => @@ -2396,6 +2409,19 @@ const Config_Documents_Super_Admin = (props) => { }} renderInput={(params) => @@ -3212,6 +3238,19 @@ const Config_Documents_Super_Admin = (props) => { }} renderInput={(params) => diff --git a/src/components/Conseil_Classe.js b/src/components/Conseil_Classe.js index 7a7ffa8..4a50185 100644 --- a/src/components/Conseil_Classe.js +++ b/src/components/Conseil_Classe.js @@ -6314,6 +6314,19 @@ const Conseil_Classe = (props) => { } }} renderInput={(params) => @@ -6354,7 +6367,20 @@ const Conseil_Classe = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } /> @@ -7123,6 +7149,19 @@ const Conseil_Classe = (props) => { } }} renderInput={(params) => @@ -7163,7 +7202,20 @@ const Conseil_Classe = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } /> @@ -7444,6 +7496,19 @@ const Conseil_Classe = (props) => { } }} renderInput={(params) => @@ -7484,7 +7549,20 @@ const Conseil_Classe = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } /> @@ -7775,6 +7853,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -7810,6 +7901,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => } @@ -7850,6 +7954,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => } @@ -7887,6 +8004,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => } @@ -8043,6 +8173,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => } @@ -8077,6 +8220,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -8261,6 +8417,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -8346,6 +8515,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -8431,6 +8613,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -8705,6 +8900,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9347,6 +9555,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9388,6 +9609,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9423,6 +9657,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9457,6 +9704,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9535,6 +9795,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9581,6 +9854,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9617,6 +9903,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -9800,6 +10099,19 @@ const Conseil_Classe = (props) => { } } renderInput={(params) => @@ -10036,6 +10348,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -10075,6 +10400,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -10109,6 +10447,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -10142,6 +10493,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -10217,6 +10581,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -10267,6 +10644,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -10303,6 +10693,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -10483,6 +10886,19 @@ const Conseil_Classe = (props) => { } } renderInput={(params) => @@ -10802,6 +11218,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => @@ -11611,6 +12040,19 @@ const Conseil_Classe = (props) => { }} renderInput={(params) => diff --git a/src/components/Crm_Opportunite.js b/src/components/Crm_Opportunite.js index dff952c..50095a7 100644 --- a/src/components/Crm_Opportunite.js +++ b/src/components/Crm_Opportunite.js @@ -1794,6 +1794,19 @@ const CRM_Opportunite = (props) => { }} renderInput={(params) => @@ -1829,6 +1842,19 @@ const CRM_Opportunite = (props) => { }} renderInput={(params) => @@ -1927,6 +1953,19 @@ const CRM_Opportunite = (props) => { }} renderInput={(params) => @@ -1958,6 +1997,19 @@ const CRM_Opportunite = (props) => { setopport_changed("1"); }} renderInput={(params) => @@ -2053,6 +2105,19 @@ const CRM_Opportunite = (props) => { }} renderInput={(params) => @@ -2147,6 +2212,19 @@ const CRM_Opportunite = (props) => { }} renderInput={(params) => @@ -2232,6 +2310,19 @@ const CRM_Opportunite = (props) => { }} renderInput={(params) => @@ -2318,6 +2409,19 @@ const CRM_Opportunite = (props) => { }} renderInput={(params) => diff --git a/src/components/Dashbord_Factures.js b/src/components/Dashbord_Factures.js index 611b831..58b0d50 100644 --- a/src/components/Dashbord_Factures.js +++ b/src/components/Dashbord_Factures.js @@ -758,6 +758,19 @@ registerLocale('fr', fr); }} renderInput={(params) => diff --git a/src/components/Dashbord_Factures_Devis_Par_Periode.js b/src/components/Dashbord_Factures_Devis_Par_Periode.js index 75f0ace..c290b98 100644 --- a/src/components/Dashbord_Factures_Devis_Par_Periode.js +++ b/src/components/Dashbord_Factures_Devis_Par_Periode.js @@ -536,6 +536,19 @@ const Dashbord_Factures_Devis_Par_Periode = (props) => { }} renderInput={(params) => diff --git a/src/components/Dashbord_Factures_Par_Client.js b/src/components/Dashbord_Factures_Par_Client.js index 5a35ea1..19ffdbb 100644 --- a/src/components/Dashbord_Factures_Par_Client.js +++ b/src/components/Dashbord_Factures_Par_Client.js @@ -558,6 +558,19 @@ const Dashbord_Factures_Par_Client = (props) => { }} renderInput={(params) => diff --git a/src/components/Dashbord_Factures_Par_Periode.js b/src/components/Dashbord_Factures_Par_Periode.js index e396008..5b32e75 100644 --- a/src/components/Dashbord_Factures_Par_Periode.js +++ b/src/components/Dashbord_Factures_Par_Periode.js @@ -545,6 +545,19 @@ const Dashbord_Factures_Par_Periode = (props) => { }} renderInput={(params) => diff --git a/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js b/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js index 4d4d3ce..2b0e5ec 100644 --- a/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js +++ b/src/components/Dashbord_Factures_Previsionnel_Par_Periode.js @@ -482,6 +482,19 @@ const Dashbord_Factures_Previsionnel_Par_Periode = (props) => { }} renderInput={(params) => diff --git a/src/components/Dashbord_Ressources_Humaines.js b/src/components/Dashbord_Ressources_Humaines.js index 42dbd85..a87d070 100644 --- a/src/components/Dashbord_Ressources_Humaines.js +++ b/src/components/Dashbord_Ressources_Humaines.js @@ -614,6 +614,19 @@ const Dashbord_Ressources_Humaines = (props) => { }} renderInput={(params) => @@ -643,6 +656,19 @@ const Dashbord_Ressources_Humaines = (props) => { }} renderInput={(params) => diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js index c642eea..b91da7f 100644 --- a/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js +++ b/src/components/Dashbord_Ressources_Humaines_Tache_Couts.js @@ -490,6 +490,19 @@ registerLocale('fr', fr); }} renderInput={(params) => @@ -519,6 +532,19 @@ registerLocale('fr', fr); }} renderInput={(params) => diff --git a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js index bf489f1..455d897 100644 --- a/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js +++ b/src/components/Dashbord_Ressources_Humaines_Tache_by_rhid.js @@ -467,6 +467,19 @@ registerLocale('fr', fr); }} renderInput={(params) => @@ -496,6 +509,19 @@ registerLocale('fr', fr); }} renderInput={(params) => diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index 8e5424d..336cf16 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -1363,7 +1363,8 @@ const DisplayPartnerPromotion = (props) => { { field: 'employeur', headerName: 'Employeur', minWidth: 150, flex: 1, maxWidth: 200, hide: true, editable: false }, { field: 'opco', headerName: 'Centre Opco', minWidth: 100, flex: 1, maxWidth: 150, hide: true, editable: false }, { field: 'modefinancement', headerName: 'Financement', minWidth: 100, flex: 1, maxWidth: 150, hide: true, editable: false }, - { field: 'amount', headerName: 'Prix', minWidth: 150, flex: 1, maxWidth: 250, type: 'number', flex: 1, editable: false , + { + field: 'amount', headerName: 'Prix', minWidth: 150, flex: 1, maxWidth: 250, type: 'number', flex: 1, editable: false, align: 'right', renderCell: (params) => , }, @@ -2155,6 +2156,8 @@ const DisplayPartnerPromotion = (props) => { { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, { field: 'formateur_id', headerName: 'formateur_id', hide: true }, + { field: 'diplome_id', headerName: 'diplome_id', hide: true }, + { field: 'diplome_code', headerName: 'Diplome', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'code', headerName: 'Code', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'titre', headerName: 'Titre', minWidth: 150, flex: 1, renderCell: (params) => , }, { field: 'formateur_prenom_nom', headerName: 'Formateur', minWidth: 150, flex: 1, renderCell: (params) => , }, @@ -2191,7 +2194,7 @@ const DisplayPartnerPromotion = (props) => {
@@ -15596,6 +15599,9 @@ const DisplayPartnerPromotion = (props) => { var local_formateur_id = JSON.parse(x).formateur_id; var local_formateur_prenom_nom = JSON.parse(x).formateur_prenom_nom; + var local_diplome_id = JSON.parse(x).diplome_id; + var local_diplome_code = JSON.parse(x).diplome_code; + //--- @@ -15608,6 +15614,9 @@ const DisplayPartnerPromotion = (props) => { "formateur_id": local_formateur_id, "formateur_prenom_nom": local_formateur_prenom_nom, + "diplome_id": local_diplome_id, + "diplome_code": local_diplome_code, + }; new_data2.push(node); @@ -15622,6 +15631,8 @@ const DisplayPartnerPromotion = (props) => { "titre": "", "formateur_id": "", "formateur_prenom_nom": "", + "diplome_id": "", + "diplome_code": "", }; new_data2.push(node); @@ -15643,7 +15654,12 @@ const DisplayPartnerPromotion = (props) => { setLoading(false); console.warn('Not good man :( Getall_Promotion_List_UE = ', error); setGetall_Promotion_List_UE_api("false"); - alert(" Impossible de recuperer la liste des UE de la promotion"); + + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de recuperer la liste des UE de la promotion"); + setalert_type("error"); + //setmyApimyApiMessage("") }) } @@ -15692,13 +15708,17 @@ const DisplayPartnerPromotion = (props) => { var local_coefficient = JSON.parse(x).coefficient; var local_seuil_validation = JSON.parse(x).seuil_validation; + var local_diplome_id = JSON.parse(x).diplome_id; + var local_diplome_code = JSON.parse(x).diplome_code; + + //--- var node = { "_id": local_id, "id": localid, - "label": local_code + " - " + String(local_titre).substring(0, 20), + "label": local_code + " - " + String(local_diplome_code).substring(0, 20), "code": local_code, "titre": local_titre, "credit": local_credit, @@ -15707,6 +15727,10 @@ const DisplayPartnerPromotion = (props) => { "coefficient": local_coefficient, "seuil_validation": local_seuil_validation, + "diplome_id": local_diplome_id, + "diplome_code": local_diplome_code, + + }; new_data2.push(node); }); @@ -15723,6 +15747,8 @@ const DisplayPartnerPromotion = (props) => { "is_noted": "", "coefficient": "", "seuil_validation": "", + "diplome_id": "", + "diplome_code": "", }; new_data2.push(node); @@ -15758,7 +15784,10 @@ const DisplayPartnerPromotion = (props) => { setselected_ue_pres_dist_hyp(""); setselected_ue_coefficient(""); setselected_ue_seuil_validation(""); - setselected_ue_changed("") + setselected_ue_changed(""); + setselected_ue_diplome_id(""); + setselected_ue_formateur_id(""); + }; @@ -15766,11 +15795,13 @@ const DisplayPartnerPromotion = (props) => { setDialog_Unite_Enseignement_open(false); setselected_ue_id(""); setselected_ue_credit_ects(""); + setselected_ue_diplome_id(""); setselected_ue_is_noted(""); setselected_ue_pres_dist_hyp(""); setselected_ue_coefficient(""); setselected_ue_seuil_validation(""); setselected_ue_changed(""); + setselected_ue_formateur_id(""); }; @@ -15781,6 +15812,9 @@ const DisplayPartnerPromotion = (props) => { const [selected_ue_coefficient, setselected_ue_coefficient] = useState(""); const [selected_ue_seuil_validation, setselected_ue_seuil_validation] = useState(""); + const [selected_ue_diplome_id, setselected_ue_diplome_id] = useState(""); + + const [selected_ue_formateur_id, setselected_ue_formateur_id] = useState(""); const [selected_ue_changed, setselected_ue_changed] = useState(""); @@ -15806,6 +15840,7 @@ const DisplayPartnerPromotion = (props) => { form.append("session_id", selected_session_id); form.append("ue_id", selected_ue_id); form.append("formateur_id", selected_ue_formateur_id); + form.append("diplome_id", selected_ue_diplome_id); @@ -15857,7 +15892,7 @@ const DisplayPartnerPromotion = (props) => { const [Delete_Given_UE_From_Promotion_api, setDelete_Given_UE_From_Promotion_api] = useState(); const [Delete_Given_UE_From_Promotion_message, setDelete_Given_UE_From_Promotion_message] = useState(); const [Delete_Given_UE_From_Promotion_result, setDelete_Given_UE_From_Promotion_result] = useState(); - function Delete_Given_UE_From_Promotion(local_ue_id) { + function Delete_Given_UE_From_Promotion(local_ue_id, local_diplome_id) { var form = new FormData(); @@ -15867,6 +15902,7 @@ const DisplayPartnerPromotion = (props) => { form.append("session_id", selected_session_id); form.append("ue_id", local_ue_id); + form.append("diplome_id", local_diplome_id); @@ -15901,7 +15937,11 @@ const DisplayPartnerPromotion = (props) => { console.warn('Delete_Given_UE_From_Promotion : Not good man :( mysearchtext = ' + error); setDelete_Given_UE_From_Promotion_api("false"); - alert(" Impossible de supprimer l'UE "); + + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de supprimer l'UE "); + setalert_type("error"); + }) } @@ -16149,6 +16189,7 @@ const DisplayPartnerPromotion = (props) => { setselected_ue_pres_dist_hyp(value.pres_dist_hyp); setselected_ue_coefficient(value.coefficient); setselected_ue_seuil_validation(value.seuil_validation); + setselected_ue_diplome_id(value.diplome_id); } else { setselected_ue_id(""); @@ -16157,6 +16198,7 @@ const DisplayPartnerPromotion = (props) => { setselected_ue_pres_dist_hyp(""); setselected_ue_coefficient(""); setselected_ue_seuil_validation(""); + setselected_ue_diplome_id(""); } } }} @@ -16191,6 +16233,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -16608,6 +16663,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -16980,6 +17048,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -17133,6 +17214,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -17163,6 +17257,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -17322,6 +17429,19 @@ const DisplayPartnerPromotion = (props) => { renderInput={(params) => @@ -17448,6 +17568,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -17530,6 +17663,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -17790,6 +17936,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -17827,7 +17986,20 @@ const DisplayPartnerPromotion = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } /> @@ -18315,6 +18487,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -18628,6 +18813,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -19241,6 +19439,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -19352,7 +19563,20 @@ const DisplayPartnerPromotion = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } /> @@ -19653,6 +19877,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -20751,6 +20988,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -20763,7 +21013,7 @@ const DisplayPartnerPromotion = (props) => { - {String(p_filtre1) !== "archive" &&
+ {String(p_filtre1) !== "archive" &&
{p_filtre1 && { }
} - {String(p_filtre1) === "archive" &&
+ {String(p_filtre1) === "archive" &&
{p_filtre1 && { } }} renderInput={(params) => } @@ -20866,6 +21129,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -20873,7 +21149,7 @@ const DisplayPartnerPromotion = (props) => { />}
-
+
{String(p_filtre2).length > 2 && String(p_filtre2) !== "archive" && { } }} renderInput={(params) => } @@ -22947,9 +23236,9 @@ const DisplayPartnerPromotion = (props) => {
}
- {String(submenu) === String("detail_session") &&
+ {String(submenu) === String("detail_session") &&
- {String(addOneSession) !== "1" &&
+ {String(addOneSession) !== "1" &&
  {p_detail_archive && String(p_detail_archive) === "1" &&
Document Archivé
} @@ -23065,6 +23354,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23175,6 +23477,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -23296,6 +23611,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23346,6 +23674,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23460,6 +23801,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23750,6 +24104,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -23790,6 +24157,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24027,6 +24407,19 @@ const DisplayPartnerPromotion = (props) => { renderInput={(params) => @@ -24091,6 +24484,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24165,6 +24571,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -24260,6 +24679,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24291,6 +24723,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24322,6 +24767,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24488,6 +24946,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24568,6 +25039,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -24597,6 +25081,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25246,6 +25743,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25376,6 +25886,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -25438,6 +25961,19 @@ const DisplayPartnerPromotion = (props) => { value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -25467,6 +26003,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25496,6 +26045,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25521,6 +26083,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25547,6 +26122,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25573,6 +26161,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25599,6 +26200,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -25908,6 +26522,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26129,6 +26756,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -26354,6 +26994,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -26487,6 +27140,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -26547,6 +27213,19 @@ const DisplayPartnerPromotion = (props) => { value={p_one_detail_client_rattachement_nom} renderInput={(params) => @@ -26577,6 +27256,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26606,6 +27298,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26631,6 +27336,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26657,6 +27375,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26683,6 +27414,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -26709,6 +27453,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -27037,7 +27794,7 @@ const DisplayPartnerPromotion = (props) => { }, }} - getRowClassName={(params) => { + getRowClassName={(params) => { if (parseInt(String(params.row.id)) % 2 === 0) { return 'line--statut--pair'; @@ -27080,6 +27837,19 @@ const DisplayPartnerPromotion = (props) => { }} renderInput={(params) => @@ -27451,6 +28221,19 @@ const DisplayPartnerPromotion = (props) => { value={p_detail_client_rattachement_nom} renderInput={(params) => @@ -27505,6 +28288,19 @@ const DisplayPartnerPromotion = (props) => { renderInput={(params) => @@ -27592,6 +28388,19 @@ const DisplayPartnerPromotion = (props) => { value={p_detail_financeur_rattachement_nom} renderInput={(params) => @@ -27677,6 +28486,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -27844,6 +28666,19 @@ const DisplayPartnerPromotion = (props) => { } }} renderInput={(params) => @@ -29236,6 +30071,9 @@ const DisplayPartnerPromotion = (props) => { titre: JSON.parse(item).titre, formateur_id: JSON.parse(item).formateur_id, formateur_prenom_nom: JSON.parse(item).formateur_prenom_nom, + + diplome_id: JSON.parse(item).diplome_id, + diplome_code: JSON.parse(item).diplome_code, } ))} @@ -29314,6 +30152,7 @@ const DisplayPartnerPromotion = (props) => { {String(props.check_user_acces_right("session", "write")) === "1" &&
} + {String(history_securite_read) !== "1" && } +
+ + ); + } + + }, { @@ -755,6 +814,8 @@ const Notes_Evaluation = (props) => { if (res.data.message.length > 0) { var mylocal_evaluation = JSON.parse(res.data.message); + console.log(" ### mylocal_evaluation = ", mylocal_evaluation) + if (mylocal_evaluation.code) setp_detail_code(mylocal_evaluation.code); else @@ -806,6 +867,33 @@ const Notes_Evaluation = (props) => { setp_detail_mode_animation(""); } + if (mylocal_evaluation.rattrapage) { + setp_detail_rattrapage(mylocal_evaluation.rattrapage); + } else { + setp_detail_rattrapage(""); + } + + // iiiiiii + if (mylocal_evaluation.tab_all_ue_diplome) { + setNew_Get_List_UE_From_Session_Id_Diplome_result(mylocal_evaluation.tab_all_ue_diplome); + } else { + setNew_Get_List_UE_From_Session_Id_Diplome_result([{ + "_id": "", + "code": "", + "label": "", + "ue_id": "" + }]); + } + + if (mylocal_evaluation.tab_evaluation_selected_diplome) { + setscope_diplome(mylocal_evaluation.tab_evaluation_selected_diplome); + } else { + setscope_diplome([]); + } + + //iii + + if (mylocal_evaluation.type_eval_id) { setp_detail_type_eval_id(mylocal_evaluation.type_eval_id); } else { @@ -854,6 +942,8 @@ const Notes_Evaluation = (props) => { } + + if (mylocal_evaluation.responsable_id) { setp_detail_responsable_id(mylocal_evaluation.responsable_id); } else { @@ -918,6 +1008,7 @@ const Notes_Evaluation = (props) => { { "id": "class_external_code", "label": "Lié a la Formation (code externe) ", "value": "class_external_code" }, { "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": "", "label": "", "value": "" }, { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. ] @@ -1107,7 +1198,7 @@ const Notes_Evaluation = (props) => { if (String(res.data.status) === String("true")) { //console.log(" In Getall_Evaluation_Participant_List res.data.status = " + res.data.status); - //console.log(" In Getall_Evaluation_Participant_List res.data.message r_class = " + res.data.message); + // console.log(" In Getall_Evaluation_Participant_List res.data.message r_class = " + res.data.message); setGetall_Evaluation_Participant_List_api("true"); setGetall_Evaluation_Participant_List_result(res.data.message); setRows(res.data.message); @@ -1132,6 +1223,13 @@ const Notes_Evaluation = (props) => { var local_convocation_send_date = JSON.parse(x).convocation_send_date; var local_convocation_send_type = JSON.parse(x).convocation_send_type; + var local_publish_by = JSON.parse(x).publish_by; + var local_publish_date = JSON.parse(x).publish_date; + var local_is_validated_date = JSON.parse(x).is_validated_date; + + var local_has_history = JSON.parse(x).has_history; + + //--- var node = { @@ -1149,6 +1247,11 @@ const Notes_Evaluation = (props) => { "group_inscription_id": local_group_inscription_id, "convocation_send_date": String(local_convocation_send_date).substring(0, 10), "convocation_send_type": String(local_convocation_send_type).substring(0, 10), + "publish_by": local_publish_by, + "publish_date": local_publish_date, + "is_validated_date": local_is_validated_date, + "has_history": local_has_history, + }; new_data2.push(node); @@ -1555,6 +1658,17 @@ const Notes_Evaluation = (props) => { const [New_Get_List_UE_From_Class_Id_result, setNew_Get_List_UE_From_Class_Id_result] = useState([]); + const [Distinct_UE_New_Get_List_UE_From_Class_Id_result, setDistinct_UE_New_Get_List_UE_From_Class_Id_result] = useState([{ + "_id": "", + "id": "", + "label": "", + "code": "", + "titre": "", + "class_id": "", + "internal_url": "", + }]); + + const [Get_List_UE_From_Class_Id_api, setGet_List_UE_From_Class_Id_api] = useState(); const [Get_List_UE_From_Class_Id_message, setGet_List_UE_From_Class_Id_message] = useState(); const [Get_List_UE_From_Class_Id_result, setGet_List_UE_From_Class_Id_result] = useState(); @@ -1581,7 +1695,10 @@ const Notes_Evaluation = (props) => { setGet_List_UE_From_Class_Id_api("true"); setGet_List_UE_From_Class_Id_result(res.data.message); + + var tab_tmp_storage_ue_id = [] var new_data2 = []; + var new_data2_Distinct_UE = []; const new_data = res.data.message.map((x) => { //--- @@ -1593,20 +1710,40 @@ const Notes_Evaluation = (props) => { var local_class_id = JSON.parse(x).class_id; var local_internal_url = JSON.parse(x).internal_url; - + var local_diplome_id = JSON.parse(x).diplome_id; + var local_diplome_code = JSON.parse(x).diplome_code; //--- var node = { "_id": local_id, "id": localid, - "label": local_code + " - " + String(local_titre).substring(0, 20), + "label": local_code + " - " + String(local_diplome_code).substring(0, 20), "code": local_code, "titre": local_titre, "class_id": local_class_id, "internal_url": local_internal_url, + "diplome_id": local_diplome_id, + "diplome_code": local_diplome_code, }; + + + if (!tab_tmp_storage_ue_id.includes(local_id)) { + + var node_distinct = { + "_id": local_id, + "id": localid, + "label": local_code + " - " + String(local_diplome_code).substring(0, 20), + "code": local_code, + "titre": local_titre, + "class_id": local_class_id, + "internal_url": local_internal_url, + }; + tab_tmp_storage_ue_id.push(local_id) + new_data2_Distinct_UE.push(node_distinct) + } + new_data2.push(node); }); @@ -1620,11 +1757,30 @@ const Notes_Evaluation = (props) => { "class_id": "", "internal_url": "", + "diplome_id": "", + "diplome_code": "", }; new_data2.push(node); - if (new_data2.length > 0) - setNew_Get_List_UE_From_Class_Id_result(new_data2); + + var node_distinct = { + "_id": "", + "id": "", + "label": "", + "code": "", + "titre": "", + "class_id": "", + "internal_url": "", + }; + new_data2_Distinct_UE.push(node_distinct) + + setNew_Get_List_UE_From_Class_Id_result(new_data2); + setDistinct_UE_New_Get_List_UE_From_Class_Id_result(new_data2_Distinct_UE); + + console.log(" ========== CMP ======") + console.log(" new_data2_Distinct_UE = ", new_data2_Distinct_UE); + console.log(" new_data2 = ", new_data2); + } else { setGet_List_UE_From_Class_Id_api("false"); @@ -1651,6 +1807,14 @@ const Notes_Evaluation = (props) => { const [New_Get_List_UE_From_Session_Id_result, setNew_Get_List_UE_From_Session_Id_result] = useState([]); + const [New_Get_List_UE_From_Session_Id_Diplome_result, setNew_Get_List_UE_From_Session_Id_Diplome_result] = useState([{ + '_id': '', + 'code': '', + 'label': '', + 'ue_id': '', + }] + ); + const [Get_List_UE_From_Session_Id_api, setGet_List_UE_From_Session_Id_api] = useState(); const [Get_List_UE_From_Session_Id_message, setGet_List_UE_From_Session_Id_message] = useState(); const [Get_List_UE_From_Session_Id_result, setGet_List_UE_From_Session_Id_result] = useState(); @@ -1674,9 +1838,12 @@ const Notes_Evaluation = (props) => { if (String(res.data.status) === String("true")) { //console.log(" In Get_List_UE_From_Session_Id res.data.status = " + res.data.status); //console.log(" In Get_List_UE_From_Session_Id res.data.message r_class = " + res.data.message); + console.log(" In Get_List_UE_From_Session_Id res.data.diplomediplome r_class = " + res.data.diplome); setGet_List_UE_From_Session_Id_api("true"); setGet_List_UE_From_Session_Id_result(res.data.message); + var new_data2_diplome = []; + var new_data2 = []; const new_data = res.data.message.map((x) => { @@ -1689,7 +1856,15 @@ const Notes_Evaluation = (props) => { var local_class_id = JSON.parse(x).class_id; var local_internal_url = JSON.parse(x).internal_url; + var local_diplome_id = JSON.parse(x).diplome_id; + var local_diplome_code = JSON.parse(x).diplome_code; + var node_diplome = { + '_id': local_diplome_id, + 'code': local_diplome_code, + 'label': local_diplome_code, + 'ue_id': local_id, + } //--- @@ -1701,9 +1876,12 @@ const Notes_Evaluation = (props) => { "titre": local_titre, "class_id": local_class_id, "internal_url": local_internal_url, + "diplome_id": local_diplome_id, + "diplome_code": local_diplome_code, }; new_data2.push(node); + new_data2_diplome.push(node_diplome) }); //--- @@ -1715,13 +1893,35 @@ const Notes_Evaluation = (props) => { "titre": "", "class_id": "", "internal_url": "", + "diplome_id": "", + "diplome_code": "", }; new_data2.push(node); + + var node_diplome = { + '_id': '', + 'code': '', + 'label': '', + 'ue_id': '', + } + new_data2_diplome.push(node_diplome) + + if (new_data2.length > 0) { setNew_Get_List_UE_From_Session_Id_result(new_data2); setNew_Get_List_UE_From_Class_Id_result(new_data2); + setNew_Get_List_UE_From_Session_Id_Diplome_result(new_data2_diplome); + + console.log(" ## new_data2_diplome = ", new_data2_diplome); + + console.log(" ## new_data2 = ", new_data2); + + } else { + setNew_Get_List_UE_From_Session_Id_result([]); + setNew_Get_List_UE_From_Class_Id_result([]); + setNew_Get_List_UE_From_Session_Id_Diplome_result([]); } } else { @@ -1833,7 +2033,7 @@ const Notes_Evaluation = (props) => { }) } - const [history_securite_read, sethistory_securite_read] = useState(""); + useEffect(() => { @@ -2025,6 +2225,16 @@ const Notes_Evaluation = (props) => { form.append("type_eval_id", p_detail_type_eval_id); form.append("mode_animation", p_detail_mode_animation); + form.append("rattrapage", p_detail_rattrapage); + + // console.log(" ### scope_diplome == ", scope_diplome) + + var tab_scope_diplome_id = [] + for (var i = 0; i < scope_diplome.length; i++) { + tab_scope_diplome_id.push(scope_diplome[i]._id) + } + form.append("tab_diplome_ids", tab_scope_diplome_id); + var new_p_detail_eval_date_heure_debut = ""; if (typeof p_detail_eval_date_heure_debut == "object") { @@ -2066,7 +2276,7 @@ const Notes_Evaluation = (props) => { } - + console.log(" ### form = ", form) setLoading(true); axios.post(myurl, form).then(res => { //console.log(" In Add_Update_Evaluation_Data res.data.status = " + res.data.status); @@ -2232,6 +2442,11 @@ const Notes_Evaluation = (props) => { } + const New_Option_Oui_Non = [ + { "id": "1", "label": "Oui", "value": "1" }, + { "id": "0", "label": "Non", "value": "0" }, + { "id": "", "label": "", "value": "" }, + ] const [p_detail_type_notation, setp_detail_type_notation] = React.useState(""); const [p_detail_max_note, setp_detail_max_note] = React.useState(""); @@ -2261,6 +2476,11 @@ const Notes_Evaluation = (props) => { const [p_detail_responsable_id, setp_detail_responsable_id] = React.useState(""); const [p_detail_session_id, setp_detail_session_id] = React.useState(""); + const [p_detail_rattrapage, setp_detail_rattrapage] = React.useState("0"); + + + const [p_detail_eval_note_publication_deplication_date_heure, setp_detail_eval_note_publication_deplication_date_heure] = useState(new Date()); + function clear_DetailFieds() { setp_detail_code(""); @@ -2271,6 +2491,8 @@ const Notes_Evaluation = (props) => { setp_detail_class_eu_id(""); setp_detail_type_eval_id(""); + setp_detail_rattrapage("0"); + setp_detail_type_notation(""); setp_detail_max_note(""); @@ -2293,7 +2515,7 @@ 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_cp', 'detail_ville', 'detail_pays', 'detail_responsable', 'detail_mode_animation', 'detail_rattrapage'] for (let i = 0; i < liste_champs.length; i++) { if (document.getElementsByName(String(liste_champs[i])) && document.getElementsByName(String(liste_champs[i]))[0]) { @@ -2316,7 +2538,7 @@ 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_cp', 'detail_ville', 'detail_pays', 'detail_responsable', 'detail_titre_01', 'detail_mode_animation', 'detail_rattrapage'] for (let i = 0; i < liste_champs.length; i++) { @@ -2601,6 +2823,15 @@ const Notes_Evaluation = (props) => { form.append("tab_inscription_id", selected_note_lines_id); form.append("publish_status", local_publish_status); + var new_publish_unpublish_date_heure_debut = ""; + if (typeof p_detail_eval_note_publication_deplication_date_heure == "object") { + var act_deadline = format(p_detail_eval_note_publication_deplication_date_heure, 'dd/MM/yyyy HH:mm'); + new_publish_unpublish_date_heure_debut = act_deadline; + } else { + new_publish_unpublish_date_heure_debut = p_detail_eval_note_publication_deplication_date_heure; + } + form.append("action_date_time", new_publish_unpublish_date_heure_debut); + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Publish_Unpublish_Participant_Evaluation_Note/"; @@ -2620,7 +2851,7 @@ const Notes_Evaluation = (props) => { setdisplay_alert_mysy("1"); setalert_message(res.data.message); setalert_type("success"); - + setp_detail_eval_note_publication_deplication_date_heure(new Date()); } else { @@ -4049,6 +4280,97 @@ const Notes_Evaluation = (props) => { }; + const [NewGet_Historique_Note_Change_result, setNewGet_Historique_Note_Change_result] = useState([]); + + const [Get_Historique_Note_Change_api, setGet_Historique_Note_Change_api] = useState(); + const [Get_Historique_Note_Change_message, setGet_Historique_Note_Change_message] = useState(); + const [Get_Historique_Note_Change_result, setGet_Historique_Note_Change_result] = useState([]); + function Get_Historique_Note_Change(local_note_id) { + + var form = new FormData(); + + const stored_cookie = getCookie('tokenmysypart'); + form.append("token", stored_cookie); + form.append("note_evaluation_participant_id", local_note_id); + + //console.log(" ### Get_Historique_Note_Change form = ", form) + var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_Given_Participant_Notes_Change_History/"; + + + setLoading(true); + axios.post(myurl, form).then(res => { + + setLoading(false); + if (String(res.data.status) === String("true")) { + setLoading(false); + //console.log(" In Get_Historique_Note_Change res.data.status = " + res.data.status); + // console.log(" In Get_Historique_Note_Change res.data.message r_class = " + res.data.message); + setGet_Historique_Note_Change_api("true"); + setGet_Historique_Note_Change_result(res.data.message); + + if (res.data.message.length > 0) { + var local_json = JSON.parse(res.data.message[0]); + + + var new_data2 = []; + const new_data = local_json.map((x) => { + new_data2.push(x) + + }); + if (new_data2.length > 0) + setNewGet_Historique_Note_Change_result(new_data2); + + else + setNewGet_Historique_Note_Change_result([]) + } else { + setNewGet_Historique_Note_Change_result([]) + } + + } + else { + setLoading(false); + setGet_Historique_Note_Change_api("false"); + setGet_Historique_Note_Change_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 :( Get_Historique_Note_Change = ', error); + setGet_Historique_Note_Change_api("false"); + setdisplay_alert_mysy("1"); + setalert_message(" Impossible de récuperer l'historique "); + setalert_type("error"); + + }) + } + + + + + const [Dialog_Historique_Note_Change_open, setDialog_Historique_Note_Change_open] = useState(false); + + const Close_Dialog_Historique_Note_Change_open = () => { + // clean_order_detail_fields(); + setDialog_Historique_Note_Change_open(false); + }; + + const fixedVal_scope_diplome = []; + const [scope_diplome, setscope_diplome] = useState([...fixedVal_scope_diplome]); + const CustomChip = (chipVal, getTagProps) => { + return chipVal.map((item, index) => ( + + )); + }; + return (
{isLoading &&
@@ -4066,6 +4388,122 @@ const Notes_Evaluation = (props) => { } {/*** FIN Affichage des messages d'alerte*/} + + + + {/********** Dialog pour Historique_Note_Change */} + null} + + PaperProps={{ + + + className: classes.paper, // Apply the paper style + style: { + overflowY: 'unset', + position: 'absolute', + top: '25rem', + margin: "2px", + maxWidth: 'unset', + width: '50rem' + }, + }} + hideBackdrop={true} + disableScrollLock + classes={{ + paper: classes.dialog + }} + + PaperComponent={PaperComponent} + aria-labelledby="draggable-dialog-title" + > + + Historique des modifications de note + + + + + {NewGet_Historique_Note_Change_result && NewGet_Historique_Note_Change_result.length > 0 &&
+
+ +
+
+ +
+ {NewGet_Historique_Note_Change_result.length} modification(s) +
+ +
+ {NewGet_Historique_Note_Change_result.map((modif) => ( + + ))} + +
+
+
+ + + +
+
} + + {NewGet_Historique_Note_Change_result && NewGet_Historique_Note_Change_result.length <= 0 &&
+
+ +
+
+ +
+ Aucune modification +
+ +
+ + +
+
+
+ + + +
+
} + + + + + + + + + + + + + + + {/********** FIN Dialog pour Historique_Note_Change */} + + + {/* Dialog pour gerer les CONVOCATION_EVAL */} { } }} - renderInput={(params) => + renderInput={(params) => } /> @@ -4146,7 +4597,20 @@ const Notes_Evaluation = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } /> @@ -4496,14 +4960,27 @@ const Notes_Evaluation = (props) => { value={New_Option_Filter.filter((data) => (data).value === String(p_filtre1))[0].label} options={New_Option_Filter} onChange={(event, value) => { + setp_filtre2_value(""); if (value && value.value) { setp_filtre1(value.value); - } }} renderInput={(params) => @@ -4515,37 +4992,76 @@ const Notes_Evaluation = (props) => { -
- {p_filtre1 && - + + { setp_filtre1_value(e.target.value); }} + InputProps={{ + endAdornment: ( + + { + setp_filtre1_value(""); + }} /> + + ), + }} + + /> +
} + + {p_filtre1 && p_filtre1 === "rattrapage" && New_Option_Oui_Non && New_Option_Oui_Non.length > 0 && +
+ { setp_filtre1_value(e.target.value); }} - InputProps={{ - endAdornment: ( - - { - setp_filtre1_value(""); - }} /> - - ), + options={New_Option_Oui_Non} + value={New_Option_Oui_Non.filter((data) => (data).value === String(p_filtre1_value))[0].label} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre1_value(value.value); + } else { + setp_filtre1_value(""); + } }} - /> + renderInput={(params) => + } + /> +
} + + - } -
{p_filtre1 &&
- {String(p_filtre2).length > 2 && + {String(p_filtre2).length > 2 && p_filtre2 !== "rattrapage" && { }} />} + + {String(p_filtre2).length > 2 && p_filtre2 === "rattrapage" && New_Option_Oui_Non && New_Option_Oui_Non.length > 0 && + (data).value === String(p_filtre2_value))[0].label} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2_value(value.value); + } else { + setp_filtre2_value(""); + } + }} + + renderInput={(params) => + } + /> + } + +
{String(p_filtre2).length > 2 &&
@@ -4666,14 +5233,27 @@ const Notes_Evaluation = (props) => { value={New_Option_Filter.filter((data) => (data).value === String(p_filtre3))[0].label} options={New_Option_Filter} onChange={(event, value) => { + setp_filtre3_value(""); if (value && value.value) { setp_filtre3(value.value); - } }} renderInput={(params) => @@ -4683,7 +5263,7 @@ const Notes_Evaluation = (props) => {
- {String(p_filtre3).length > 2 && + {String(p_filtre3).length > 2 && p_filtre3 !== "rattrapage" && { }} />} + + {String(p_filtre3).length > 2 && p_filtre3 === "rattrapage" && New_Option_Oui_Non && New_Option_Oui_Non.length > 0 && + (data).value === String(p_filtre3_value))[0].label} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre3_value(value.value); + } else { + setp_filtre3_value(""); + } + }} + + renderInput={(params) => + } + /> + }
{String(p_filtre2).length > 2 &&
@@ -4860,6 +5477,7 @@ const Notes_Evaluation = (props) => { max_note: JSON.parse(item).max_note, type_notation: JSON.parse(item).type_notation, + rattrapage: JSON.parse(item).rattrapage, } @@ -5128,7 +5746,7 @@ const Notes_Evaluation = (props) => {
-
Unite D'enseignement
+
Unite d'enseignement
{New_Getall_Partner_List_UE_result && New_Getall_Partner_List_UE_result.length > 0 && {
-
Type d'évaluation
+
Type d'évaluation 01
{New_Getall_Partner_Type_Evalution_List_result && New_Getall_Partner_Type_Evalution_List_result.length > 0 && {
+
Rattrapage
+ {New_Option_Oui_Non && New_Option_Oui_Non.length > 0 && (data).value === String(p_detail_rattrapage))[0].label} + + />} + +
+ +
Diplome 002
+ + {New_Get_List_UE_From_Session_Id_Diplome_result && New_Get_List_UE_From_Session_Id_Diplome_result.length > 0 && + (data).ue_id === String(p_detail_class_eu_id))} + multiple + + disabled={true} + value={scope_diplome} + + renderInput={(params) => + } + />} + +
+
@@ -5443,6 +6116,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -5529,6 +6215,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -5567,6 +6266,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -5579,7 +6291,7 @@ const Notes_Evaluation = (props) => { -
Unite D'enseignement
+
Unite d'enseignement
{New_Getall_Partner_List_UE_result && New_Getall_Partner_List_UE_result.length > 0 && { }} renderInput={(params) => @@ -5613,7 +6338,7 @@ const Notes_Evaluation = (props) => {
-
Type d'évaluation
+
Type d'évaluation 02
{New_Getall_Partner_Type_Evalution_List_result && New_Getall_Partner_Type_Evalution_List_result.length > 0 && { }} renderInput={(params) => @@ -5645,6 +6383,95 @@ const Notes_Evaluation = (props) => {
+
Rattrapage 01
+ {New_Option_Oui_Non && New_Option_Oui_Non.length > 0 && + (data).value === String(p_detail_rattrapage))[0].label} + + onChange={(event, value) => { + if (value && value.value) { + setp_detail_rattrapage(value.value); + setevaluation_data_changed("1"); + } else { + setp_detail_rattrapage(""); + setevaluation_data_changed("1"); + } + }} + + renderInput={(params) => + } + /> + + } + +
+ +
Diplome 002
+ + {New_Get_List_UE_From_Session_Id_Diplome_result && New_Get_List_UE_From_Session_Id_Diplome_result.length > 0 && + (data).ue_id === String(p_detail_class_eu_id))} + 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), + ]); + + }} + value={scope_diplome} + + renderInput={(params) => + } + />} + +
+
@@ -5746,6 +6573,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -5933,7 +6773,7 @@ const Notes_Evaluation = (props) => {
- Infos Générales + Infos générales 001
{
-
Type d'évaluation
- {New_Getall_Partner_Type_Evalution_List_result && New_Getall_Partner_Type_Evalution_List_result.length > 0 && - (data)._id === String(p_detail_type_eval_id))[0].label} - onChange={(event, value) => { - if (value && value._id) { - setp_detail_type_eval_id(value._id); - setevaluation_data_changed("1"); - } else { - setp_detail_type_eval_id(""); - setevaluation_data_changed("1"); - } - }} - renderInput={(params) => - } - /> - - } - -
Responsable
@@ -6041,6 +6853,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -6130,6 +6955,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -6166,6 +7004,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -6176,8 +7027,8 @@ const Notes_Evaluation = (props) => {
-
Unite D'enseignement
- {New_Get_List_UE_From_Class_Id_result && +
Unite d'enseignement
+ {Distinct_UE_New_Get_List_UE_From_Class_Id_result && Distinct_UE_New_Get_List_UE_From_Class_Id_result.length > 0 && { id="detail_ue" className="disabled_style" //className="disabled_style enable_style" - options={New_Get_List_UE_From_Class_Id_result.filter((data) => (data).class_id === String(p_detail_class_id))} - value={New_Getall_Partner_List_UE_result.filter((data) => (data)._id === String(p_detail_class_eu_id))[0].label} + options={Distinct_UE_New_Get_List_UE_From_Class_Id_result.filter((data) => (data).class_id === String(p_detail_class_id))} + value={Distinct_UE_New_Get_List_UE_From_Class_Id_result.filter((data) => (data)._id === String(p_detail_class_eu_id))[0].label} // value={New_Get_List_UE_From_Class_Id_result.filter((data) => (data)._id === String(p_detail_class_eu_id))[0].label} @@ -6201,6 +7052,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -6211,6 +7075,138 @@ const Notes_Evaluation = (props) => {
+
Type d'évaluation
+ {New_Getall_Partner_Type_Evalution_List_result && New_Getall_Partner_Type_Evalution_List_result.length > 0 && + (data)._id === String(p_detail_type_eval_id))[0].label} + + onChange={(event, value) => { + if (value && value._id) { + setp_detail_type_eval_id(value._id); + setevaluation_data_changed("1"); + } else { + setp_detail_type_eval_id(""); + setevaluation_data_changed("1"); + } + }} + + renderInput={(params) => + } + /> + + } + +
+ + +
Rattrapage
+ {New_Option_Oui_Non && New_Option_Oui_Non.length > 0 && + (data).value === String(p_detail_rattrapage))[0].label} + + onChange={(event, value) => { + if (value && value.value) { + setp_detail_rattrapage(value.value); + setevaluation_data_changed("1"); + } else { + setp_detail_rattrapage(""); + setevaluation_data_changed("1"); + } + }} + + renderInput={(params) => + } + /> + + } + +
+ +
Diplome 001
+ {New_Get_List_UE_From_Session_Id_Diplome_result && New_Get_List_UE_From_Session_Id_Diplome_result.length > 0 && + (data).ue_id === String(p_detail_class_eu_id))} + multiple + onChange={(event, newValue) => { + console.log(" ## == newValue =", newValue) + setscope_diplome([ + ...fixedVal_scope_diplome, + ...newValue.filter((i) => fixedVal_scope_diplome.indexOf(i) === -1), + ]); + + }} + //value={scope_diplome.code} + + renderInput={(params) => + } + />} +
+
@@ -6305,6 +7301,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -6433,444 +7442,7 @@ const Notes_Evaluation = (props) => { - {/*} -
- -
-
Code
- { - setp_detail_code(e.target.value); - setevaluation_data_changed("1"); - } - } - /> - -
- -
Titre
- { - setp_detail_titre(e.target.value); - setevaluation_data_changed("1"); - } - } - /> - -
- -
Description
- { - setp_detail_description(e.target.value); - setevaluation_data_changed("1"); - } - } - /> - -
- - - -
Formation
- {New_Getall_Partner_Class_Reduice_Fields_result && New_Getall_Partner_Class_Reduice_Fields_result.length > 0 && - - (data)._id === String(p_detail_class_id))[0].label} - //value={New_Getall_Partner_Session_Reduice_Fields_result.filter((data) => (data)._id === String(p_detail_class_id))[0].label} - onChange={(event, value) => { - if (value && value._id) { - Get_List_UE_From_Class_Id(value._id); - - setp_detail_class_id(value._id); - setp_detail_class_internal_url(value.internal_url); - setevaluation_data_changed("1"); - } else { - Get_List_UE_From_Class_Id(""); - - setp_detail_class_id(""); - setp_detail_class_internal_url(""); - setevaluation_data_changed("1"); - } - - // Quand on modifie la formation, la session et l'UE sont reinitialitées - setp_detail_session_id(""); - setp_detail_class_eu_id(""); - }} - - renderInput={(params) => - } - /> - - } - -
- - -
Promotion
- {New_Getall_Partner_Session_Reduice_Fields_result && New_Getall_Partner_Session_Reduice_Fields_result.length > 0 && - - (data).class_internal_url === String(p_detail_class_internal_url))} - value={New_Getall_Partner_Session_Reduice_Fields_result.filter((data) => (data)._id === String(p_detail_session_id))[0].label} - onChange={(event, value) => { - if (value && value._id) { - setp_detail_session_id(value._id); - setevaluation_data_changed("1"); - } else { - setp_detail_session_id(""); - setevaluation_data_changed("1"); - } - }} - - renderInput={(params) => - } - /> - - } - -
- -
Unite D'enseignement
- {New_Get_List_UE_From_Class_Id_result && - - (data).class_id === String(p_detail_class_id))} - value={New_Getall_Partner_List_UE_result.filter((data) => (data)._id === String(p_detail_class_eu_id))[0].label} - - // value={New_Get_List_UE_From_Class_Id_result.filter((data) => (data)._id === String(p_detail_class_eu_id))[0].label} - - onChange={(event, value) => { - if (value && value._id) { - setp_detail_class_eu_id(value._id); - setevaluation_data_changed("1"); - } else { - setp_detail_class_eu_id(""); - setevaluation_data_changed("1"); - } - }} - - renderInput={(params) => - } - /> - - } - -
- -
Type d'évaluation
- {New_Getall_Partner_Type_Evalution_List_result && New_Getall_Partner_Type_Evalution_List_result.length > 0 && - (data)._id === String(p_detail_type_eval_id))[0].label} - - onChange={(event, value) => { - if (value && value._id) { - setp_detail_type_eval_id(value._id); - setevaluation_data_changed("1"); - } else { - setp_detail_type_eval_id(""); - setevaluation_data_changed("1"); - } - }} - - renderInput={(params) => - } - /> - - } - -
- -
Mode Animation
- {New_Option_mode_animation && New_Option_mode_animation.length > 0 && (data).value === String(p_detail_mode_animation))[0].label} - onChange={(event, value) => { - if (value && value.value) { - setp_detail_mode_animation(value.value); - - } else { - setp_detail_mode_animation(""); - } - - - }} - - renderInput={(params) => - } - />} - -
- - -
Début
- { - setp_detail_eval_date_heure_debut(format(date, 'dd/MM/yyyy HH:mm')); - setevaluation_data_changed("1"); - } - } - - - className="disabled_style enable_style" - locale={'fr'} - showTimeSelect - timeFormat="HH:mm" - timeIntervals={15} - dateFormat="dd/MM/yyyy HH:mm" - is24Hour - - /> - -
- - - -
Fin
- { - - setp_detail_eval_date_heure_fin(format(date, 'dd/MM/yyyy HH:mm')); - setevaluation_data_changed("1"); - } - } - - - className="disabled_style enable_style" - locale={'fr'} - showTimeSelect - timeFormat="HH:mm" - timeIntervals={15} - dateFormat="dd/MM/yyyy HH:mm" - is24Hour - - /> - -
- - - -
Adresse
- { - setp_detail_adress(e.target.value); - setevaluation_data_changed("1"); - } - } - /> - -
- -
Code postal
- { - setp_detail_cp(e.target.value); - setevaluation_data_changed("1"); - } - } - /> - -
- - -
Ville
- { - setp_detail_ville(e.target.value); - setevaluation_data_changed("1"); - } - } - /> - -
- - - -
Pays
- { - setp_detail_pays(e.target.value); - setevaluation_data_changed("1"); - } - } - /> - -
- - - - -
Responsable
- {New_Getall_Training_Employee_No_Filter_result && New_Getall_Training_Employee_No_Filter_result.length > 0 && - - (data)._id === String(p_detail_responsable_id))[0].label} - - onChange={(event, value) => { - if (value && value._id) { - setp_detail_responsable_id(value._id); - setevaluation_data_changed("1"); - } else { - setp_detail_responsable_id(""); - setevaluation_data_changed("1"); - } - }} - - renderInput={(params) => - } - /> - - } - -
- -
-   -
- -
-
-   -
-
-*/}
 
@@ -7016,6 +7588,13 @@ const Notes_Evaluation = (props) => { note_changed: (item).note_changed, convocation_send_date: (item).convocation_send_date, convocation_send_type: (item).convocation_send_type, + + publish_by: (item).publish_by, + publish_date: (item).publish_date, + is_validated_date: (item).is_validated_date, + + has_history: (item).has_history, + } ))} @@ -7094,6 +7673,8 @@ const Notes_Evaluation = (props) => { fullWidth options={New_Option_PreInscription} onChange={(event, value) => { + setp_detail_eval_note_publication_deplication_date_heure(new Date()); + if (value && value.value) { if (String(value.value) === "delete_inscr" || String(value.value) === "send_convocation" || String(value.value) === "publish_note" @@ -7112,6 +7693,19 @@ const Notes_Evaluation = (props) => { }} renderInput={(params) => @@ -7152,10 +7746,74 @@ const Notes_Evaluation = (props) => { {String(actionmass_eval_inscr_val) === "publish_note" && Confirmer la publication des notes sur l'ENT en masse pour {selectionModel_evalutions_participant.length} lignes. +
 
+ +
+
Date Publication
+ +
+ { + setp_detail_eval_note_publication_deplication_date_heure(format(date, 'dd/MM/yyyy HH:mm')); + + } + } + + + className="disabled_style enable_style" + locale={'fr'} + showTimeSelect + timeFormat="HH:mm" + timeIntervals={15} + dateFormat="dd/MM/yyyy HH:mm" + is24Hour + + /> + +
+
+ +
 
+ } {String(actionmass_eval_inscr_val) === "un_publish_note" && Confirmer la DE-publication des notes sur l'ENT en masse pour {selectionModel_evalutions_participant.length} lignes. + +
 
+ +
+
Date dépublication
+ +
+ { + setp_detail_eval_note_publication_deplication_date_heure(format(date, 'dd/MM/yyyy HH:mm')); + + } + } + + + className="disabled_style enable_style" + locale={'fr'} + showTimeSelect + timeFormat="HH:mm" + timeIntervals={15} + dateFormat="dd/MM/yyyy HH:mm" + is24Hour + + /> + +
+
+ +
 
} {String(actionmass_eval_inscr_val) === "valide_note" && @@ -7174,7 +7832,7 @@ const Notes_Evaluation = (props) => {