diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 5db84b9..c57daa7 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -199,9 +199,9 @@ const DisplayPartnerSession = (props) => { }, { field: 'class_external_code', headerName: 'Code Formation', align: "center", hideable: true, flex: 1, hide: true, minWidth: 150, renderCell: (params) => , }, { field: 'date_debut', headerName: 'Debut', hide: false, minWidth: 150, renderCell: (params) => , }, - { field: 'date_fin', headerName: 'Fin', minWidth: 150, renderCell: (params) => , }, + { field: 'date_fin', headerName: 'Fin', minWidth: 150, renderCell: (params) => , }, { - field: 'distantiel', headerName: 'Distantiel', width: datagrid_columns_size_model2, + field: 'distantiel', headerName: 'Distantiel', width: datagrid_columns_size_model2, renderCell: (cellValues) => { return ( @@ -260,15 +260,15 @@ const DisplayPartnerSession = (props) => { renderCell: (params) => , }, { field: 'title', headerName: 'Formation', minWidth: 250, flex: 1, align: "center", hide: true, hideable: true, renderCell: (params) => , }, - { field: 'domaine', headerName: 'Domaine', minWidth: datagrid_columns_size_model1, align: "center", hide: true, renderCell: (params) => , }, - { field: 'published', headerName: 'publié', minWidth: datagrid_columns_size_model1, align: "center", hide: true, renderCell: (params) => , }, + { field: 'domaine', headerName: 'Domaine', minWidth: datagrid_columns_size_model1, align: "center", hide: true, renderCell: (params) => , }, + { field: 'published', headerName: 'publié', minWidth: datagrid_columns_size_model1, align: "center", hide: true, renderCell: (params) => , }, { field: 'site_formation_id', headerName: 'site_formation_id', with: 0, align: "center", hide: true, hideable: false }, - { field: 'site_formation_nom', headerName: 'Site Ftion', with: 150, align: "center", hide: false, renderCell: (params) => , }, + { field: 'site_formation_nom', headerName: 'Site Ftion', with: 150, align: "center", hide: false, renderCell: (params) => , }, - { field: 'duration', headerName: 'Durée', minWidth: datagrid_columns_size_model2, align: "center", hide: true, renderCell: (params) => , }, + { field: 'duration', headerName: 'Durée', minWidth: datagrid_columns_size_model2, align: "center", hide: true, renderCell: (params) => , }, { field: "Detail", headerName: 'Voir détail', renderCell: (cellValues) => { @@ -360,13 +360,13 @@ const DisplayPartnerSession = (props) => { { field: 'civilite', headerName: 'Civ.', minWidth: 70, flex: 1, maxWidth: 100, hide: false, editable: false, editable: false }, { field: 'nom', headerName: 'nom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , }, { field: 'prenom', headerName: 'prenom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , }, - { field: 'email', headerName: 'email', minWidth: 150, flex: 1, flex: 1, renderCell: (params) => , }, + { field: 'email', headerName: 'email', minWidth: 150, flex: 1, flex: 1, renderCell: (params) => , }, { field: 'client_rattachement_nom', headerName: 'Client', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: true, renderCell: (params) => , }, { field: 'client_rattachement_id', headerName: 'Client_id', Width: 0, hide: true, editable: true, }, { field: 'employeur', headerName: 'Employeur', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: true, renderCell: (params) => , }, { field: 'opco', headerName: 'Centre Opco', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: true }, { field: 'modefinancement', headerName: 'Financement', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: true }, - { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', flex: 1, editable: true, renderCell: (params) => , }, + { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', flex: 1, editable: true, renderCell: (params) => , }, { field: "update", headerName: 'Mise à jour', renderCell: (cellValues) => { @@ -620,13 +620,13 @@ const DisplayPartnerSession = (props) => { { field: 'civilite', headerName: 'Civ.', minWidth: 70, flex: 1, maxWidth: 100, hide: false, editable: false, editable: false }, { field: 'nom', headerName: 'nom', minWidth: 150, flex: 1, hide: false, editable: false, renderCell: (params) => , }, { field: 'prenom', headerName: 'prenom', minWidth: 150, flex: 1, hide: false, editable: false, renderCell: (params) => , }, - { field: 'email', headerName: 'email', minWidth: 150, flex: 1, flex: 1, renderCell: (params) => , }, + { field: 'email', headerName: 'email', minWidth: 150, flex: 1, flex: 1, renderCell: (params) => , }, { field: 'client_rattachement_nom', headerName: 'Client', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: true, renderCell: (params) => , }, { field: 'client_rattachement_id', headerName: 'Client_id', Width: 0, hide: true, editable: false, }, { field: 'employeur', headerName: 'Employeur', minWidth: 150, flex: 1, maxWidth: 200, hide: false, editable: false }, { field: 'opco', headerName: 'Centre Opco', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: false }, { field: 'modefinancement', headerName: 'Financement', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: false }, - { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', flex: 1, editable: true }, + { field: 'amount', headerName: 'Montant Formation', minWidth: 100, flex: 1, maxWidth: 150, type: 'number', flex: 1, editable: true }, { field: 'invoiced', headerName: 'Facturé', minWidth: 100, flex: 1, maxWidth: 150, hide: false, editable: false, @@ -777,11 +777,11 @@ const DisplayPartnerSession = (props) => { { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, { field: 'date', headerName: 'date', width: 100, hide: true, flex: 1 }, - { field: 'sequence_start', headerName: 'Debut', width: 100, flex: 1 }, - { field: 'sequence_end', headerName: 'Fin', width: 100, flex: 1 }, + { field: 'sequence_start', headerName: 'Debut', width: 100, flex: 1 }, + { field: 'sequence_end', headerName: 'Fin', width: 100, flex: 1 }, { field: 'is_present', headerName: 'Présent', width: 100, hide: false, editable: true, type: 'boolean', }, - { field: 'email', headerName: 'email', width: 250, flex: 1 }, + { field: 'email', headerName: 'email', width: 250, flex: 1 }, { field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true }, { field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: false }, @@ -6441,11 +6441,11 @@ const DisplayPartnerSession = (props) => { } - const [p_filtre1, setp_filtre1] = useState(); - const [p_filtre1_value, setp_filtre1_value] = useState(); + const [p_filtre1, setp_filtre1] = useState(""); + const [p_filtre1_value, setp_filtre1_value] = useState(""); - const [p_filtre2, setp_filtre2] = useState(); - const [p_filtre2_value, setp_filtre2_value] = useState(); + const [p_filtre2, setp_filtre2] = useState(""); + const [p_filtre2_value, setp_filtre2_value] = useState(""); function clean_all_filters() { setp_filtre1(); @@ -9473,6 +9473,16 @@ const DisplayPartnerSession = (props) => { { "id": "", "label": "", "value": "" }, ] + const New_Option_Filter = [ + { "id": "code_session", "label": "Code Session", "value": "code_session" }, + { "id": "class_external_code", "label": "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" }, + { "id": "", "label": "", "value": "" }, + { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. + ] + return (
@@ -10377,7 +10387,31 @@ const DisplayPartnerSession = (props) => {
Utilisez les filtres !
- 0 && (data).value === String(p_filtre1))[0].label} + options={New_Option_Filter} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre1(value.value); + + } + + }} + + renderInput={(params) => + } + />} + + + {/* { Date début session   Date fin session   - + */}
@@ -10402,7 +10436,7 @@ const DisplayPartnerSession = (props) => {
{p_filtre1 && {   { - setp_filtre1(); - setp_filtre1_value(); + setp_filtre1(""); + setp_filtre1_value(""); }} /> @@ -10455,7 +10489,29 @@ const DisplayPartnerSession = (props) => { {p_filtre2 &&
- 0 && (data).value === String(p_filtre2))[0].label} + options={New_Option_Filter} + onChange={(event, value) => { + if (value && value.value) { + setp_filtre2(value.value); + + } + + }} + + renderInput={(params) => + } + />} + {/* { Date fin session   - + */}
{String(p_filtre2).length > 3 && @@ -16126,7 +16182,9 @@ const DisplayPartnerSession = (props) => { {String(submenu) === String("editique") &&
+ related_collection_recid={selected_session_id} GetListeInscrit={GetListeInscrit} + internal_url={selected_internal_url}/> +
} diff --git a/src/components/Module_Editique.js b/src/components/Module_Editique.js index b400ce9..2c77c57 100644 --- a/src/components/Module_Editique.js +++ b/src/components/Module_Editique.js @@ -146,6 +146,8 @@ const Module_Editique = (props) => { //console.log(" In Invoice_Session_Formation res.data.message r_class = " + res.data.message); setInvoice_Session_Formation_api("true"); setInvoice_Session_Formation_result(res.data.message); + Getall_Editable_Document_By_Partner_By_Collection(); + props.GetListeInscrit(props.related_collection_recid, props.internal_url); alert(res.data.message); } @@ -1855,9 +1857,9 @@ const Module_Editique = (props) => { return; } } - - Send_Stagiaire_Conventions_By_Email(); + Dialog_convention_handleClose_buton(); + Send_Stagiaire_Conventions_By_Email(); }} className="bton_enreg_dialog">Envoyer mail } @@ -1865,8 +1867,9 @@ const Module_Editique = (props) => { {String(selected_convention_type) === "pdf" && }
diff --git a/src/components/Partner_Config_Technique.js b/src/components/Partner_Config_Technique.js index 8a977d9..8d87599 100644 --- a/src/components/Partner_Config_Technique.js +++ b/src/components/Partner_Config_Technique.js @@ -897,7 +897,7 @@ const Partner_Configuration_Technique = (props) => { const [p_detail_paiement_code, setp_detail_paiement_code] = useState(""); const [p_detail_paiement_description, setp_detail_paiement_description] = useState(""); const [p_detail_paiement_nb_jour, setp_detail_paiement_nb_jour] = useState(""); - const [p_detail_paiement_depart, setp_detail_paiement_depart] = useState(""); + const [p_detail_paiement_depart, setp_detail_paiement_depart] = useState("facture"); const [Add_Update_Client_Type_api, setAdd_Update_Client_Type_api] = useState(); @@ -1318,7 +1318,7 @@ const Partner_Configuration_Technique = (props) => { setp_detail_paiement_code(""); setp_detail_paiement_description(""); setp_detail_paiement_nb_jour(""); - setp_detail_paiement_depart(""); + setp_detail_paiement_depart("facture"); setDialog_paiement_ction_1_open(false); @@ -2737,7 +2737,7 @@ const Partner_Configuration_Technique = (props) => { setp_detail_paiement_code(""); setp_detail_paiement_description(""); setp_detail_paiement_nb_jour(""); - setp_detail_paiement_depart(""); + setp_detail_paiement_depart("facture"); setDialog_paiement_ction_1_open(true);