diff --git a/app/assets/javascripts/reports/reports_datatable.js b/app/assets/javascripts/reports/reports_datatable.js index cbc7ba940..e8e30176a 100644 --- a/app/assets/javascripts/reports/reports_datatable.js +++ b/app/assets/javascripts/reports/reports_datatable.js @@ -168,7 +168,7 @@ var $table = $('#reports-table'); CHECKBOX_SELECTOR = null; REPORTS_TABLE = $table.DataTable({ - dom: "Rt<'pagination-row hidden'<'pagination-info'li><'pagination-actions'p>>", + dom: "R<'reports-toolbar'f>t<'pagination-row hidden'<'pagination-info'li><'pagination-actions'p>>", order: [[9, 'desc']], sScrollX: '100%', stateSave: true, @@ -213,10 +213,16 @@ }); DataTableHelpers.initLengthAppearance($table.closest('.dataTables_wrapper')); + DataTableHelpers.initSearchField($table.closest('.dataTables_wrapper'), I18n.t('projects.reports.index.search_reports')); $('.pagination-row').removeClass('hidden'); $('.report-row.processing').each(function() { setTimeout(() => { checkProcessingStatus($(this).data('id')); }, START_POLLING_INTERVAL); }); + + let topToolbar = $('#toolbarWrapper').detach().html(); + $('.reports-datatable .reports-toolbar').prepend(topToolbar); + + }, drawCallback: function() { if (CHECKBOX_SELECTOR) CHECKBOX_SELECTOR.checkSelectAllStatus(); @@ -334,11 +340,6 @@ }); } - - $('.reports-index').on('keyup', '.report-search', function() { - REPORTS_TABLE.search($(this).val()).draw(); - }); - $('.reports-index').on('click', '.generate-docx', function(e) { var reportId = $(this).closest('.report-row').attr('data-id'); e.preventDefault(); diff --git a/app/assets/stylesheets/report_index.scss b/app/assets/stylesheets/report_index.scss index 6403e4a5a..86b449040 100644 --- a/app/assets/stylesheets/report_index.scss +++ b/app/assets/stylesheets/report_index.scss @@ -18,13 +18,6 @@ } } } - - .search-report-container { - display: inline-block; - float: right; - margin-right: 2em; - width: 200px; - } } .reports-datatable { @@ -35,6 +28,12 @@ flex-direction: column; height: 100%; + .reports-toolbar { + display: flex; + justify-content: space-between; + padding-bottom: 1em; + } + .dataTables_scroll { display: flex; flex-direction: column; diff --git a/app/views/reports/_index_toolbar.html.erb b/app/views/reports/_index_toolbar.html.erb index 3dd2fd6f0..415b0c643 100644 --- a/app/views/reports/_index_toolbar.html.erb +++ b/app/views/reports/_index_toolbar.html.erb @@ -46,8 +46,4 @@ <% end %> -
- "> - -
<% end %>