diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 929683a..d9fd83f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,6 +16,7 @@ //= require dataTables/extras/dataTables.responsive //= require dataTables/jquery.dataTables //= require select2 +//= require jquery-dateFormat //= require turbolinks //= require_tree . diff --git a/app/controllers/concerns/data_table.rb b/app/controllers/concerns/data_table.rb index 5a3a74e..ff2b31c 100644 --- a/app/controllers/concerns/data_table.rb +++ b/app/controllers/concerns/data_table.rb @@ -1,5 +1,4 @@ class DataTable - def initialize user, params @user = user @params = sanitize_params(params) @@ -15,11 +14,11 @@ class DataTable data: data } end - private - def data - run_query(paginated_query.project(Arel.star)) + run_query(paginated_query.project(Arel.star)).map do |record| + record.reject! {|k,v| k.is_a? Numeric} # Remove unneeded query results + end end def count diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 0265901..022c9bb 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -61,6 +61,20 @@ { data: 'peer', name: 'Peer', width: "15%", className: 'min-mobile'}, { data: 'issuer', name: 'Issuer', width: "15%", className: 'min-desktop'}, { data: 'message', name: 'Message', width: "45%", className: 'min-tablet-p'} + ], + columnDefs: [ + { + targets: 0, + render: function(data, type, full, meta) { + return $.format.date(data, 'E dd/MM/yyyy HH:mm'); + } + }, + { + targets: 1, + render: function(data, type, full, meta) { + return data/100; + } + } ] });