diff --git a/src/components/Employes.js b/src/components/Employes.js index 1c12999..37c0514 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -5564,7 +5564,7 @@ const Employes = (props) => { setp_employe_contrat_specific_cout_autre(line.cout_autre); setp_employe_contrat_specific_cout_animation_periodicite(line.cout_animation_periodicite); setp_employe_contrat_specific_cout_preparation_periodicite(line.cout_preparation_periodicite); - setp_employe_contrat_specific_cout_suivi_correction_periodicite(line.suivi_correction_periodicite); + setp_employe_contrat_specific_cout_suivi_correction_periodicite(line.cout_suivi_correction_periodicite); setp_employe_contrat_specific_cout_autre_periodicite(line.cout_autre_periodicite); //** */ @@ -5676,7 +5676,7 @@ const Employes = (props) => { form.append("cout_preparation", p_employe_contrat_specific_cout_preparation); form.append("cout_preparation_periodicite", p_employe_contrat_specific_cout_preparation_periodicite); form.append("cout_suivi_correction", p_employe_contrat_specific_cout_suivi_correction); - form.append("suivi_correction_periodicite", p_employe_contrat_specific_cout_suivi_correction_periodicite); + form.append("cout_suivi_correction_periodicite", p_employe_contrat_specific_cout_suivi_correction_periodicite); form.append("cout_autre", p_employe_contrat_specific_cout_autre); form.append("cout_autre_periodicite", p_employe_contrat_specific_cout_autre_periodicite); @@ -5706,7 +5706,7 @@ const Employes = (props) => { form.append("cout_preparation", p_employe_contrat_specific_cout_preparation); form.append("cout_preparation_periodicite", p_employe_contrat_specific_cout_preparation_periodicite); form.append("cout_suivi_correction", p_employe_contrat_specific_cout_suivi_correction); - form.append("suivi_correction_periodicite", p_employe_contrat_specific_cout_suivi_correction_periodicite); + form.append("cout_suivi_correction_periodicite", p_employe_contrat_specific_cout_suivi_correction_periodicite); form.append("cout_autre", p_employe_contrat_specific_cout_autre); form.append("cout_autre_periodicite", p_employe_contrat_specific_cout_autre_periodicite); diff --git a/src/components/Materiel_Salle.js b/src/components/Materiel_Salle.js index 14ff563..c802383 100644 --- a/src/components/Materiel_Salle.js +++ b/src/components/Materiel_Salle.js @@ -2788,7 +2788,6 @@ registerLocale('fr', fr); } const New_Option_Type_Event = [ - { "id": "0", "label": "Absence", "value": "absence" }, { "id": "1", "label": "Planning", "value": "planning" }, { "id": "preparation", "label": "Préparation", "value": "preparation" }, diff --git a/src/components/Mon_Tableau_De_Bord.js b/src/components/Mon_Tableau_De_Bord.js index 8da4770..0c541a7 100644 --- a/src/components/Mon_Tableau_De_Bord.js +++ b/src/components/Mon_Tableau_De_Bord.js @@ -126,10 +126,16 @@ const Mon_Tableau_De_Bord = (props) => { { field: 'rh_event_planning_event_title', headerName: 'Planning Titre', hide: false, minWidth: 200, flex: 1, renderCell: (params) => , }, { field: 'rh_event_planning_even_comment', headerName: 'Planning Comment', hide: true, minWidth: 100, flex: 1, maxWidth: 150, renderCell: (params) => , }, { field: 'rh_event_planning_event_type', headerName: 'Planning Type', hide: false, minWidth: 150, flex: 1, maxWidth: 100, renderCell: (params) => , }, - { field: 'rh_event_planning_event_duration_hour', headerName: 'Planning Durée (h)', hide: false, minWidth: 100, flex: 1, maxWidth: 100, renderCell: (params) => , }, + + { field: 'rh_event_planning_agenda_date_jour', headerName: 'Planning Date', hide: true, minWidth: 150, flex: 1, maxWidth: 150, renderCell: (params) => , }, { field: 'rh_event_planning_event_start', headerName: 'Planning Début', hide: false, minWidth: 150, flex: 1, maxWidth: 200, renderCell: (params) => , }, { field: 'rh_event_planning_event_end', headerName: 'Planning Fin', hide: false, minWidth: 150, flex: 1, maxWidth: 200, renderCell: (params) => , }, + + { field: 'rh_event_planning_event_unit_cost', headerName: 'C. Unit', hide: false, minWidth: 150, flex: 1, maxWidth: 100, renderCell: (params) => , }, + { field: 'rh_event_planning_event_unit_cost_periodicite', headerName: 'Périod.', hide: false, minWidth: 150, flex: 1, maxWidth: 100, renderCell: (params) => , }, + { field: 'rh_event_planning_event_duration_hour', headerName: 'Planning Durée (h)', hide: false, minWidth: 100, flex: 1, maxWidth: 100, renderCell: (params) => , }, + { field: 'rh_event_planning_event_cost', headerName: 'Planning Cout Total (HT)', hide: false, minWidth: 150, flex: 1, maxWidth: 150, renderCell: (params) => , }, ] @@ -141,7 +147,7 @@ const Mon_Tableau_De_Bord = (props) => { return (