diff --git a/Gemfile b/Gemfile index 3d897cef..b2d02c2d 100644 --- a/Gemfile +++ b/Gemfile @@ -116,8 +116,9 @@ end gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47' # data tables +gem 'jquery-datatables' gem 'ajax-datatables-rails' -gem 'jquery-datatables-rails' +# gem 'jquery-datatables-rails' # for charts gem 'chartkick' diff --git a/Gemfile.lock b/Gemfile.lock index 0a549452..8fda9704 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,11 +238,7 @@ GEM io-like (0.3.0) iso-639 (0.2.8) jaro_winkler (1.5.3) - jquery-datatables-rails (3.4.0) - actionpack (>= 3.1) - jquery-rails - railties (>= 3.1) - sass-rails + jquery-datatables (1.10.20) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -650,7 +646,7 @@ DEPENDENCIES haml-rails haml_lint iso-639 - jquery-datatables-rails + jquery-datatables jquery-rails jquery-ui-rails (~> 4.2.1) json-schema diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index da958dc3..d57d7852 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,8 +16,14 @@ //= require jquery.ui.draggable //= require jquery.ui.droppable //= require waypoints/jquery.waypoints + //= require dataTables/jquery.dataTables -//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap +//= require dataTables/dataTables.bootstrap +//= require datatables/extensions/Buttons/dataTables.buttons +//= require datatables/extensions/Buttons/buttons.bootstrap +// = require datatables/extensions/Buttons/buttons.html5 +// = require datatables/extensions/Buttons/buttons.dataTables + //= require cocoon //= require bootstrap //= require Chart.bundle diff --git a/app/assets/javascripts/osem-datatables.js b/app/assets/javascripts/osem-datatables.js index f9bdb008..57a97754 100644 --- a/app/assets/javascripts/osem-datatables.js +++ b/app/assets/javascripts/osem-datatables.js @@ -1,5 +1,7 @@ $(function () { $.extend(true, $.fn.dataTable.defaults, { + "buttons": ["csv"], + "dom": "lBfrtip", "stateSave": true, "autoWidth": false, "pagingType": "full_numbers", diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 0b80bc19..d6b84f1d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,7 +1,13 @@ /* + *= require dataTables/dataTables.bootstrap + *= require datatables/extensions/Responsive/responsive.dataTables + *= require dataTables/extensions/Responsive/responsive.bootstrap + *= require dataTables/extensions/Select/select.bootstrap + *= require dataTables/extensions/Buttons/buttons.dataTables + *= require dataTables/extensions/Buttons/buttons.bootstrap *= require strap-on *= require formtastic-bootstrap - *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap + *= require selectize *= require selectize.bootstrap3 *= require bootstrap-select diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 28f4f94f..5d9eabf4 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -8,7 +8,8 @@ module Admin # load_and_authorize_resource :event, through: :program def index - @events = Event.accessible_by(current_ability).where(program: @program) + @events = Event.accessible_by(current_ability).where(program: @program, + state: [:confirmed, :unconfirmed]) @events_commercials = Commercial.where(commercialable_type: 'Event', commercialable_id: @events.pluck(:id)) @events_missing_commercial = @events.where.not(id: @events_commercials.pluck(:commercialable_id)) @events_with_requirements = @events.where.not(description: ['', nil]) diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index e2b47504..91a751e5 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -24,6 +24,7 @@ :javascript $(function () { $('#users.datatable').DataTable({ + "buttons": { buttons: ["csv"] }, "processing": true, "serverSide": true, "ajax": $('#users.datatable').data('source'),