diff --git a/public/index.html b/public/index.html index 86392c3..33cfdae 100644 --- a/public/index.html +++ b/public/index.html @@ -2,6 +2,7 @@ + @@ -126,14 +127,16 @@ gtag('config', 'G-17B18WZKPN'); - + + + diff --git a/public/sample/template_import_stagiaires.csv b/public/sample/template_import_stagiaires.csv index 671dd57..58fdedf 100644 --- a/public/sample/template_import_stagiaires.csv +++ b/public/sample/template_import_stagiaires.csv @@ -1,4 +1,4 @@ -formation_code_externe;code_session;client_rattachement_email;client_rattachement_nom;facture_client_rattachement_email;facture_client_rattachement_nom;civilite;prenom;nom;employeur;telephone;email;adresse;code_postal;ville;pays;modefinancement;opco;status;prix;type_apprenant -IFOD_01;test_facturatop_dup ;mysytraining+client1@gmail.com;Client 1;PP_ETAT_GENERAL_01@mysy-training.com ;PP_ETAT_GENERAL_01 ;mme;Ibrahim uuu;nom1;employeur 4;10101;mysytraining+apprenant8@gmail.com;adresse03;code_postal03;ville03;pays03;modefinancement;;0;18500;0 -IFOD_01;test_facturatop_dup ;mysytraining+client2@gmail.com;Client 2;mysylaplumedepierrot@gmail.com;Etat financeur;mme;Alice excel;nom2;employeur 5;10101;mysytraining+apprenant9@gmail.com;adresse04;code_postal04;ville04;pays04;modefinancement;;0;15009; -IFOD_01;test_facturatop_dup ;mysytraining+client2@gmail.com;Client 2;mysylaplumedepierrot@gmail.com;Etat financeur;mme;Thomas excel;nom3;employeur 6;10101;mysytraining+apprenant10@gmail.com;adresse05;code_postal05;ville05;pays05;modefinancement;;0;120;0 +formation_code_externe;code_session;client_rattachement_email;client_rattachement_nom;facture_client_rattachement_email;facture_client_rattachement_nom;civilite;prenom;nom;employeur;telephone;email;adresse;code_postal;ville;pays;modefinancement;opco;status;prix;type_apprenant;date_naissance +IFOD_01;test_facturatop_dup ;mysytraining+client1@gmail.com;Client 1;PP_ETAT_GENERAL_01@mysy-training.com ;PP_ETAT_GENERAL_01 ;mme;Ibrahim uuu;nom1;employeur 4;10101;mysytraining+apprenant8@gmail.com;adresse03;code_postal03;ville03;pays03;modefinancement;;0;18500;0;20/12/1990 +IFOD_01;test_facturatop_dup ;mysytraining+client2@gmail.com;Client 2;mysylaplumedepierrot@gmail.com;Etat financeur;mme;Alice excel;nom2;employeur 5;10101;mysytraining+apprenant9@gmail.com;adresse04;code_postal04;ville04;pays04;modefinancement;;0;15009;;06/04/1977 +IFOD_01;test_facturatop_dup ;mysytraining+client2@gmail.com;Client 2;mysylaplumedepierrot@gmail.com;Etat financeur;mme;Thomas excel;nom3;employeur 6;10101;mysytraining+apprenant10@gmail.com;adresse05;code_postal05;ville05;pays05;modefinancement;;0;120;0; diff --git a/src/App.css b/src/App.css index e2849b4..2f39d65 100644 --- a/src/App.css +++ b/src/App.css @@ -1,3 +1,46 @@ + + + +/* latin-ext */ +@font-face { + font-family: 'DM Sans'; + font-style: italic; + font-weight: 100 1000; + font-display: swap; + src: url(./fonts_elyos/dmsans/DMSans.ttf) format('truetype'); + unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'DM Sans'; + font-style: italic; + font-weight: 100 1000; + font-display: swap; + src: url(./fonts_elyos/dmsans/DMSans.ttf) format('truetype'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* latin-ext */ +@font-face { + font-family: 'DM Sans'; + font-style: normal; + font-weight: 100 1000; + font-display: swap; + src: url(./fonts_elyos/dmsans/DMSans.ttf) format('truetype'); + unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'DM Sans'; + font-style: normal; + font-weight: 100 1000; + font-display: swap; + src: url(./fonts_elyos/dmsans/DMSans.ttf) format('truetype'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + + + + .react-confirm-alert-body { font-family: Arial, Helvetica, sans-serif; padding: 30px; diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js index 7de6c31..65bd530 100644 --- a/src/components/Apprenant.js +++ b/src/components/Apprenant.js @@ -5777,7 +5777,9 @@ const Apprenant = (props) => { function getExcelData(apiRef) { // Select rows and columns const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "Detail"). + filter((data) => (data) !== "delete"); // Format the data. Here we only keep the value const data = filteredSortedRowIds.map((id) => { @@ -5802,7 +5804,9 @@ const Apprenant = (props) => { function handleExport(apiRef, data_colums) { const data = getExcelData(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "Detail"). + filter((data) => (data) !== "delete"); const local_config = { @@ -9560,7 +9564,7 @@ const Apprenant = (props) => { } {String(display_detail_inscriptions) === "1" && String(add_One_Apprenant) !== "1" && selected_apprenant_id &&
- +
diff --git a/src/components/Conseil_Classe.js b/src/components/Conseil_Classe.js index 819c482..7de6177 100644 --- a/src/components/Conseil_Classe.js +++ b/src/components/Conseil_Classe.js @@ -2188,7 +2188,7 @@ const Conseil_Classe = (props) => { function getExcelData(apiRef) { // Select rows and columns const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__" ); // Format the data. Here we only keep the value const data = filteredSortedRowIds.map((id) => { @@ -2213,7 +2213,7 @@ const Conseil_Classe = (props) => { function handleExport(apiRef, data_colums) { const data = getExcelData(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__" ); const local_config = { diff --git a/src/components/DisplayPartnerPromotion.js b/src/components/DisplayPartnerPromotion.js index 64b5e8d..d0e9561 100644 --- a/src/components/DisplayPartnerPromotion.js +++ b/src/components/DisplayPartnerPromotion.js @@ -4345,7 +4345,7 @@ const DisplayPartnerPromotion = (props) => { var new_data2 = []; var nb_line_invoices = 0; - + const new_data = data['message'].map((x) => { //--- @@ -9308,7 +9308,7 @@ const DisplayPartnerPromotion = (props) => { const [p_detail_is_bpf, setp_detail_is_bpf] = useState(); const [p_detail_is_bpf_label, setp_detail_is_bpf_label] = useState(); - + const emplacement_tab = [ { @@ -13906,14 +13906,15 @@ const DisplayPartnerPromotion = (props) => { function getExcelData(apiRef) { // Select rows and columns const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "is_session_alert").filter((data) => (data) !== "bton_vertif"); // Format the data. Here we only keep the value const data = filteredSortedRowIds.map((id) => { const row = {}; visibleColumnsField.forEach((field) => { - - row[field] = apiRef.current.getCellParams(id, field).value; + if (String(field) !== "__check__" && String(field) !== "bton_vertif") + row[field] = apiRef.current.getCellParams(id, field).value; }); return row; }); @@ -13932,7 +13933,8 @@ const DisplayPartnerPromotion = (props) => { function handleExport(apiRef, data_colums) { const data = getExcelData(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "is_session_alert").filter((data) => (data) !== "bton_vertif"); const local_config = { diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index c388125..871f154 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -300,11 +300,11 @@ const DisplayPartnerSession = (props) => { { field: 'class_lms_class_code', headerName: 'class_lms_class_code', hide: true, disableExport: true, }, { field: 'is_bpf', headerName: 'is_bpf', hide: true, }, - { field: 'session_alert_message', headerName: 'session_alert_message', hide: true }, - { field: 'class_internal_url', headerName: 'class_internal_url', hide: true }, + { field: 'session_alert_message', headerName: 'session_alert_message', hide: true, disableExport: true, }, + { field: 'class_internal_url', headerName: 'class_internal_url', hide: true, disableExport: true, }, { - field: 'is_session_alert', headerName: '', hide: false, Width: 50, flex: 1, + field: 'is_session_alert', headerName: '', hide: false, Width: 50, flex: 1, disableExport: true, renderCell: (cellValues) => { return (
@@ -331,7 +331,7 @@ const DisplayPartnerSession = (props) => { renderCell: (cellValues) => { return ( -
+
{String(cellValues.row.statut) === "1" && "Actif"}  {String(cellValues.row.statut) !== "1" && "Inactif"} 
@@ -438,7 +438,7 @@ const DisplayPartnerSession = (props) => { { field: 'duration', headerName: 'Durée', minWidth: datagrid_columns_size_model2, align: "center", hide: true, renderCell: (params) => , }, { - field: 'bton_vertif', headerName: 'Gestion', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", + field: 'bton_vertif', headerName: 'Gestion', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", disableExport: true, renderCell: (cellValues) => { return (
@@ -13960,14 +13960,15 @@ const DisplayPartnerSession = (props) => { function getExcelData(apiRef) { // Select rows and columns const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "is_session_alert").filter((data) => (data) !== "bton_vertif"); // Format the data. Here we only keep the value const data = filteredSortedRowIds.map((id) => { const row = {}; visibleColumnsField.forEach((field) => { - - row[field] = apiRef.current.getCellParams(id, field).value; + if (String(field) !== "__check__" && String(field) !== "bton_vertif" ) + row[field] = apiRef.current.getCellParams(id, field).value; }); return row; }); @@ -13986,7 +13987,8 @@ const DisplayPartnerSession = (props) => { function handleExport(apiRef, data_colums) { const data = getExcelData(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "is_session_alert").filter((data) => (data) !== "bton_vertif"); const local_config = { diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index d58d4fc..e5a3c96 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -861,7 +861,7 @@ const DisplayPartnerStagiaires = (props) => { setRecyclage_Desactivation_api("true"); setRecyclage_Desactivation_result(res.data.message); setSelectionModel([]); - setactionmass_ftion_val(""); + setactionmass_ftion_val(""); Getall_TrainingParticipant(); // alert(res.data.message); setdisplay_alert_mysy("1"); @@ -985,7 +985,7 @@ const DisplayPartnerStagiaires = (props) => { setnb_stagiaire_Preinscrit(""); setnb_stagiaire_Inscrit(""); setSelectionModel([]); - setactionmass_ftion_val(""); + setactionmass_ftion_val(""); setRows([]); setRows_insc([]); setRows_preinsc([]); @@ -1317,7 +1317,7 @@ const DisplayPartnerStagiaires = (props) => { function submenu_add_one_stagiaire() { setsubmenu(""); setSelectionModel([]); - setactionmass_ftion_val(""); + setactionmass_ftion_val(""); setselected_code_session(); Get_List_Partner_Financeurs(); setaddOneParticipant("1"); @@ -5937,7 +5937,7 @@ const DisplayPartnerStagiaires = (props) => { setDelete_LIST_Stagiaires_api("true"); setDelete_LIST_Stagiaires_result(res.data.message); setSelectionModel([]); - setactionmass_ftion_val(""); + setactionmass_ftion_val(""); Getall_TrainingParticipant(); //alert(res.data.message); setdisplay_alert_mysy("1"); @@ -7024,7 +7024,7 @@ const DisplayPartnerStagiaires = (props) => { const handleChange_display_stagiaire_with_alert = (event) => { setSelectionModel([]); - setactionmass_ftion_val(""); + setactionmass_ftion_val(""); setdisplay_stagiaire_with_alert(event.target.checked); }; @@ -7052,13 +7052,19 @@ const DisplayPartnerStagiaires = (props) => { function getExcelData(apiRef) { // Select rows and columns const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "warning_recyclage_alert"). + filter((data) => (data) !== "Detail"). + filter((data) => (data) !== "Action"). + filter((data) => (data) !== "delete"); + // Format the data. Here we only keep the value const data = filteredSortedRowIds.map((id) => { const row = {}; visibleColumnsField.forEach((field) => { - row[field] = apiRef.current.getCellParams(id, field).value; + if (String(field) !== "__check__" && String(field) !== "warning_recyclage_alert") + row[field] = apiRef.current.getCellParams(id, field).value; }); return row; }); @@ -7077,9 +7083,13 @@ const DisplayPartnerStagiaires = (props) => { function handleExport(apiRef, data_colums) { const data = getExcelData(apiRef); - const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef); - + const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef).filter((data) => (data) !== "__check__"). + filter((data) => (data) !== "warning_recyclage_alert"). + filter((data) => (data) !== "Detail"). + filter((data) => (data) !== "Action"). + filter((data) => (data) !== "delete"); + const local_config = { keys: visibleColumnsField, @@ -9696,8 +9706,8 @@ const DisplayPartnerStagiaires = (props) => { /> - {String(props.check_user_acces_right("stagiaire", "write")) === "1" && selectionModel && selectionModel.length >= 1 && actionmass_ftion_val && String(actionmass_ftion_val).length > 2 && - String(actionmass_ftion_val) !== "sendemail" + {String(props.check_user_acces_right("stagiaire", "write")) === "1" && selectionModel && selectionModel.length >= 1 && actionmass_ftion_val && String(actionmass_ftion_val).length > 2 && + String(actionmass_ftion_val) !== "sendemail" && String(actionmass_ftion_val) !== "pushdocument" &&