From d9c2b6d8562b1a7413b318e6bdef4e2b7afdf72f Mon Sep 17 00:00:00 2001 From: Cherif Date: Sat, 28 Feb 2026 21:43:03 +0100 Subject: [PATCH] 28/02/26 - 22h --- src/components/AddClassManual.js | 67 +- src/components/DisplayPartnerPromotion.js | 80 +- src/components/DisplayPartnerSession.js | 2 +- src/components/DisplayPartnerStagiaires.js | 17 +- ...playPartnerStagiaires_ARG_Before_Light.js} | 3672 ++++++++++------- .../Module_Selection_Evaluation_Apprenants.js | 2 +- src/components/Notes_Evaluation.js | 2 +- 7 files changed, 2306 insertions(+), 1536 deletions(-) rename src/components/{DisplayPartnerStagiaires_ARG.js => DisplayPartnerStagiaires_ARG_Before_Light.js} (81%) diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index 08a4891..070fa89 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -191,25 +191,25 @@ const AddClassManual = (props) => { const columns_list_unite_enseignement = [ { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, - { field: 'code', headerName: 'Code', minWidth: 150, flex: 1, renderCell: (params) => , }, + { field: 'code', headerName: 'Code', maxWidth: 250, flex: 1, renderCell: (params) => , }, { field: 'titre', headerName: 'Titre', minWidth: 150, flex: 1, renderCell: (params) => , }, - { field: 'credit', headerName: 'Credit', minWidth: 100, flex: 1, renderCell: (params) => , }, - { field: 'coefficient', headerName: 'Coef.', minWidth: 100, flex: 1, renderCell: (params) => , }, + { field: 'credit', headerName: 'Credit', maxWidth: 100, renderCell: (params) => , }, + { field: 'coefficient', headerName: 'Coef.', maxWidth: 100, flex: 1, renderCell: (params) => , }, { - field: 'pres_dist_hyp', headerName: 'Animation', minWidth: 150, flex: 1, + field: 'pres_dist_hyp', headerName: 'Animation', maxWidth: 180, renderCell: (cellValues) => { return (
- {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "1" && "Distanciel"} - {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "0" && "Présentiel"} - {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "2" && "Hybride"} + {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "1" && "Dist."} + {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "0" && "Prés."} + {cellValues.row.pres_dist_hyp && String(cellValues.row.pres_dist_hyp) === "2" && "Hybr."}
); } }, { - field: 'is_noted', headerName: 'Evalué', minWidth: 100, flex: 1, renderCell: (params) => , + field: 'is_noted', headerName: 'Evalué', maxWidth: 100, renderCell: (params) => , renderCell: (cellValues) => { return (
@@ -221,12 +221,12 @@ const AddClassManual = (props) => { ); } }, - { field: 'seuil_validation', headerName: 'Seuil val.', minWidth: 100, flex: 1, renderCell: (params) => , }, + { field: 'seuil_validation', headerName: 'Seuil val.', maxWidth: 100, renderCell: (params) => , }, - { field: 'duration_concat', headerName: 'Durée', minWidth: 100, flex: 1, renderCell: (params) => , }, - { field: 'duration', headerName: 'Durée', minWidth: 150, hide: true, flex: 1, renderCell: (params) => , }, - { field: 'duration_unite', headerName: 'Unit.', minWidth: 150, hide: true, editable: false, renderCell: (params) => , }, + { field: 'duration_concat', headerName: 'Durée', maxidth: 100, renderCell: (params) => , }, + { field: 'duration', headerName: 'Durée', maxWidth: 150, hide: true, renderCell: (params) => , }, + { field: 'duration_unite', headerName: 'Unit.', maxWidth: 150, hide: true, editable: false, renderCell: (params) => , }, { field: "delete", headerName: 'Supprimer', @@ -521,9 +521,9 @@ const AddClassManual = (props) => { setselected_ue_id(""); setselected_eu_evalution_id(""); setsetgridline_evaluation_ue_id(""); - setp_detail_max_note(""); + setp_detail_max_note("20"); setp_detail_type_notation("num"); - setp_detail_ponderation_type_eval(""); + setp_detail_ponderation_type_eval("1"); setclass_unite_enseignement_type_evaluation_id(""); } @@ -583,6 +583,7 @@ const AddClassManual = (props) => { setDelete_Given_UE_From_Class_api("true"); setDelete_Given_UE_From_Class_result(res.data.message); Getall_Class_List_UE(); + Getall_Class_List_Evalution(); // alert(res.data.message) setdisplay_alert_mysy("1"); setalert_message(res.data.message); @@ -4394,9 +4395,9 @@ const AddClassManual = (props) => { const [selected_ue_id, setselected_ue_id] = useState(""); const [selected_ue_credit_ects, setselected_ue_credit_ects] = useState(""); - const [selected_ue_is_noted, setselected_ue_is_noted] = useState(""); - const [selected_ue_pres_dist_hyp, setselected_ue_pres_dist_hyp] = useState(""); - const [selected_ue_coefficient, setselected_ue_coefficient] = useState(""); + const [selected_ue_is_noted, setselected_ue_is_noted] = useState("1"); + const [selected_ue_pres_dist_hyp, setselected_ue_pres_dist_hyp] = useState("0"); + const [selected_ue_coefficient, setselected_ue_coefficient] = useState("1"); const [selected_ue_seuil_validation, setselected_ue_seuil_validation] = useState(""); @@ -4425,10 +4426,10 @@ const AddClassManual = (props) => { setDialog_Unite_Enseignement_open(false); setselected_ue_id(""); setselected_ue_credit_ects(""); - setselected_ue_is_noted(""); - setselected_ue_pres_dist_hyp(""); + setselected_ue_is_noted("1"); + setselected_ue_pres_dist_hyp("0"); setadd_one_eu_to_class(""); - setselected_ue_coefficient(""); + setselected_ue_coefficient("1"); setselected_ue_seuil_validation(""); }; @@ -4438,10 +4439,10 @@ const AddClassManual = (props) => { setselected_ue_id(""); setselected_ue_credit_ects(""); setselected_ue_seuil_validation(""); - setselected_ue_is_noted(""); - setselected_ue_pres_dist_hyp(""); + setselected_ue_is_noted("1"); + setselected_ue_pres_dist_hyp("0"); setadd_one_eu_to_class(""); - setselected_ue_coefficient(""); + setselected_ue_coefficient("1"); } @@ -4450,10 +4451,10 @@ const AddClassManual = (props) => { setselected_ue_id(""); setselected_ue_credit_ects(""); setselected_ue_seuil_validation(""); - setselected_ue_is_noted(""); - setselected_ue_pres_dist_hyp(""); + setselected_ue_is_noted("1"); + setselected_ue_pres_dist_hyp("0"); setadd_one_eu_to_class(""); - setselected_ue_coefficient(""); + setselected_ue_coefficient("1"); }; const [Dialog_1_message, setDialog_1_message] = React.useState(false); @@ -4572,9 +4573,9 @@ const AddClassManual = (props) => { setselected_ue_id(""); setselected_eu_evalution_id(""); setsetgridline_evaluation_ue_id(""); - setp_detail_max_note(""); + setp_detail_max_note("20"); setp_detail_type_notation("num"); - setp_detail_ponderation_type_eval(""); + setp_detail_ponderation_type_eval("1"); setclass_unite_enseignement_type_evaluation_id(""); Getall_Class_List_Evalution(); @@ -4655,11 +4656,11 @@ const AddClassManual = (props) => { const [class_unite_enseignement_type_evaluation_id, setclass_unite_enseignement_type_evaluation_id] = React.useState(""); - const [p_detail_max_note, setp_detail_max_note] = React.useState(""); + const [p_detail_max_note, setp_detail_max_note] = React.useState("20"); const [p_detail_type_notation, setp_detail_type_notation] = React.useState("num"); - const [p_detail_ponderation_type_eval, setp_detail_ponderation_type_eval] = React.useState(""); + const [p_detail_ponderation_type_eval, setp_detail_ponderation_type_eval] = React.useState("1"); const [add_ue_evalution, setadd_ue_evalution] = React.useState(""); @@ -7618,7 +7619,6 @@ const AddClassManual = (props) => { type_evaluation_id: JSON.parse(item).type_evaluation_id, max_note: JSON.parse(item).max_note, type_notation: JSON.parse(item).type_notation, - ponderation_type_eval: JSON.parse(item).ponderation_type_eval, } ))} @@ -7972,7 +7972,7 @@ const AddClassManual = (props) => { { disablePortal name="formateur_id" id="formateur_id" + className="disabled_style" options={New_Getall_Training_Employee_No_Filter_result} value={p_formateur_label} @@ -8009,7 +8010,7 @@ const AddClassManual = (props) => { } }} - renderInput={(params) => + renderInput={(params) => } /> diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index e289645..03ed861 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -302,25 +302,7 @@ const DisplayPartnerPromotion = (props) => { { field: 'session_alert_message', headerName: 'session_alert_message', hide: true }, { field: 'class_internal_url', headerName: 'class_internal_url', hide: true }, - { - field: 'is_session_alert', headerName: '', hide: false, Width: 50, flex: 1, - renderCell: (cellValues) => { - return ( -
- {cellValues.row.is_session_alert && String(cellValues.row.is_session_alert) === "1" && } - {cellValues.row.is_session_alert && String(cellValues.row.is_session_alert) !== "1" && ""} - -
- - ); - } - - }, + { field: 'entre_scolaire', headerName: 'Entrée Scol.', hide: false, minWidth: 150, flex: 1, renderCell: (params) => , }, @@ -2294,7 +2276,7 @@ const DisplayPartnerPromotion = (props) => { var local_date_debut = JSON.parse(x).date_debut; var local_date_fin = JSON.parse(x).date_fin; var local_session_etape = JSON.parse(x).session_etape; - var local_is_session_alert = JSON.parse(x).is_session_alert; + var local_invoiced_statut = JSON.parse(x).invoiced_statut; var local_session_alert_message = JSON.parse(x).session_alert_message; var local_session_class_id = JSON.parse(x).class_id; @@ -2320,7 +2302,7 @@ const DisplayPartnerPromotion = (props) => { "date_debut": local_date_debut, "date_fin": local_date_fin, "session_etape": local_session_etape, - "is_session_alert": local_is_session_alert, + "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, "class_id": local_session_class_id, @@ -2339,7 +2321,7 @@ const DisplayPartnerPromotion = (props) => { var node_timeline_grp = { 'id': local_id, 'title': local_code_session, - 'is_session_alert': local_is_session_alert + } timeline_grp.push(node_timeline_grp); @@ -2366,7 +2348,7 @@ const DisplayPartnerPromotion = (props) => { "session_etape": local_session_etape, "archive": local_archive, "entre_scolaire": local_entre_scolaire, - "is_session_alert": local_is_session_alert, + "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, "class_id": local_session_class_id, @@ -2395,7 +2377,7 @@ const DisplayPartnerPromotion = (props) => { "date_debut": "", "date_fin": "", "session_etape": "", - "is_session_alert": "", + "invoiced_statut": "", "session_alert_message": "", "class_id": "", @@ -2470,7 +2452,7 @@ const DisplayPartnerPromotion = (props) => { var local_date_debut = JSON.parse(x).date_debut; var local_date_fin = JSON.parse(x).date_fin; var local_session_etape = JSON.parse(x).session_etape; - var local_is_session_alert = JSON.parse(x).is_session_alert; + var local_invoiced_statut = JSON.parse(x).invoiced_statut; var local_session_alert_message = JSON.parse(x).session_alert_message; var local_session_class_id = JSON.parse(x).class_id; @@ -2494,7 +2476,7 @@ const DisplayPartnerPromotion = (props) => { "date_debut": local_date_debut, "date_fin": local_date_fin, "session_etape": local_session_etape, - "is_session_alert": local_is_session_alert, + "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, "class_id": local_session_class_id, @@ -2512,7 +2494,7 @@ const DisplayPartnerPromotion = (props) => { var node_timeline_grp = { 'id': local_id, 'title': local_code_session, - 'is_session_alert': local_is_session_alert + } timeline_grp.push(node_timeline_grp); @@ -2538,7 +2520,7 @@ const DisplayPartnerPromotion = (props) => { "date_fin": local_date_fin, "session_etape": local_session_etape, "archive": local_archive, - "is_session_alert": local_is_session_alert, + "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, "class_id": local_session_class_id, @@ -2567,7 +2549,7 @@ const DisplayPartnerPromotion = (props) => { "date_debut": "", "date_fin": "", "session_etape": "", - "is_session_alert": "", + "invoiced_statut": "", "session_alert_message": "", "class_id": "", @@ -2765,7 +2747,7 @@ const DisplayPartnerPromotion = (props) => { var local_date_debut = JSON.parse(x).date_debut; var local_date_fin = JSON.parse(x).date_fin; var local_session_etape = JSON.parse(x).session_etape; - var local_is_session_alert = JSON.parse(x).is_session_alert; + var local_invoiced_statut = JSON.parse(x).invoiced_statut; var local_session_alert_message = JSON.parse(x).session_alert_message; var local_session_class_id = JSON.parse(x).class_id; @@ -2787,7 +2769,7 @@ const DisplayPartnerPromotion = (props) => { "date_debut": local_date_debut, "date_fin": local_date_fin, "session_etape": local_session_etape, - "is_session_alert": local_is_session_alert, + "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, "class_id": local_session_class_id, @@ -2831,7 +2813,7 @@ const DisplayPartnerPromotion = (props) => { "date_debut": local_date_debut, "date_fin": local_date_fin, "session_etape": local_session_etape, - "is_session_alert": local_is_session_alert, + "archive": local_archive, "invoiced_statut": local_invoiced_statut, "session_alert_message": local_session_alert_message, @@ -2860,7 +2842,7 @@ const DisplayPartnerPromotion = (props) => { "date_debut": "", "date_fin": "", "session_etape": "", - "is_session_alert": "", + "invoiced_statut": "", "session_alert_message": "", "class_id": "", @@ -13160,7 +13142,7 @@ const DisplayPartnerPromotion = (props) => { const New_Option_Filter = [ { "id": "code_session", "label": "Code Promotion", "value": "code_session" }, - { "id": "class_external_code", "label": "Ref. Interne", "value": "class_external_code" }, + { "id": "class_external_code", "label": "Ftion. Ref. Interne", "value": "class_external_code" }, { "id": "class_title", "label": "Titre Formation", "value": "class_title" }, { "id": "session_start_date", "label": "Date début session", "value": "session_start_date" }, { "id": "session_end_date", "label": "Date fin session", "value": "session_end_date" }, @@ -20828,17 +20810,7 @@ const DisplayPartnerPromotion = (props) => {
{(!data_row_grouped_by || String(data_row_grouped_by) === "") &&
- +