aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranicet2015-06-16 11:10:22 +0200
committeranicet2015-06-16 11:10:22 +0200
commit4f6a0dbb0f6704c4350c4f3d29dfedc75817f45e (patch)
treeefb9f90c3aff39b93c275cd86aa46be0ea4cddf7
parent5528857e90c5accb252768519f82bb500db74ac2 (diff)
downloadchouette-core-4f6a0dbb0f6704c4350c4f3d29dfedc75817f45e.tar.bz2
IE report : add DataTable
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--app/assets/javascripts/application.js1
-rw-r--r--app/assets/javascripts/partials/ie_report.js.coffee.erb2
-rw-r--r--app/assets/stylesheets/application.css.scss.erb1
-rw-r--r--app/views/shared/_ie_report_file.html.erb2
-rw-r--r--app/views/shared/_ie_report_line.html.erb2
7 files changed, 10 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 9f04c6c5d..1ab629699 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,6 +87,7 @@ gem "modernizr-rails", "~> 2.0.6"
source 'https://rails-assets.org' do
gem 'rails-assets-morrisjs', "~> 0.5.1"
gem 'rails-assets-raphael', "~> 2.1.3"
+ gem 'rails-assets-datatables'
# Use twitter bootstrap resources
gem 'rails-assets-bootstrap-sass-official', '~> 3.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index abf2f19c2..93d13e01a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -307,6 +307,8 @@ GEM
rails-assets-jquery (>= 1.9.0)
rails-assets-bootstrap-sass-official (3.3.4)
rails-assets-jquery (>= 1.9.0)
+ rails-assets-datatables (1.10.7)
+ rails-assets-jquery (>= 1.7.0)
rails-assets-eonasdan-bootstrap-datetimepicker (3.1.3)
rails-assets-bootstrap (>= 3.0)
rails-assets-jquery (>= 1.8.3)
@@ -533,6 +535,7 @@ DEPENDENCIES
rabl
rails (= 4.1.10)
rails-assets-bootstrap-sass-official (~> 3.3.0)!
+ rails-assets-datatables!
rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3)!
rails-assets-jquery-tokeninput (~> 1.7.0)!
rails-assets-morrisjs (~> 0.5.1)!
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b8e391129..da1def5cb 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,6 +18,7 @@
//= require moment/locale/fr
//= require eonasdan-bootstrap-datetimepicker
//= require tagmanager
+//= require datatables
//= require_directory ./plugins
//= require_directory .
//= require_directory ./stop_areas
diff --git a/app/assets/javascripts/partials/ie_report.js.coffee.erb b/app/assets/javascripts/partials/ie_report.js.coffee.erb
index 579335521..673d28c2e 100644
--- a/app/assets/javascripts/partials/ie_report.js.coffee.erb
+++ b/app/assets/javascripts/partials/ie_report.js.coffee.erb
@@ -4,3 +4,5 @@ $(".imports.show, .exports.show, .compliance_checks.show").ready ->
if refreshInterval > 0
reloadPage = () -> window.location.reload()
setInterval(reloadPage,refreshInterval * 1000)
+
+ $('.data-table').DataTable();
diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
index 00ca42512..4899582e2 100644
--- a/app/assets/stylesheets/application.css.scss.erb
+++ b/app/assets/stylesheets/application.css.scss.erb
@@ -28,6 +28,7 @@ $body-bg: #eee;
@import "morrisjs";
@import "formtastic";
@import 'eonasdan-bootstrap-datetimepicker';
+@import 'datatables';
@import "vendor/openlayers_style";
@import "vendor/openlayers_ie6-style";
diff --git a/app/views/shared/_ie_report_file.html.erb b/app/views/shared/_ie_report_file.html.erb
index 3d28b19bb..efb4b314f 100644
--- a/app/views/shared/_ie_report_file.html.erb
+++ b/app/views/shared/_ie_report_file.html.erb
@@ -2,7 +2,7 @@
<p class="caption"><%= t(".graph.files.title_default", {:job => job.class.model_name.human, :extension => job.filename_extension} ) %></p>
</p>
<div class="report results" data-refresh-interval="<%= job_refresh_interval(job) %>">
- <table class="table table-hover table-striped">
+ <table class="table table-hover table-striped data-table">
<thead>
<tr>
<th class="state"><%= t(".table.line.state") %></th>
diff --git a/app/views/shared/_ie_report_line.html.erb b/app/views/shared/_ie_report_line.html.erb
index 3fa40f641..bc978f826 100644
--- a/app/views/shared/_ie_report_line.html.erb
+++ b/app/views/shared/_ie_report_line.html.erb
@@ -4,7 +4,7 @@
<p><b><%=t('.unsaved_lines') %></b> : <%= job.report.unsaved_lines %></p>
</p>
<div class="report" data-refresh-interval="<%= job_refresh_interval(job) %>">
- <table class="table table-hover table-striped">
+ <table class="table table-hover table-striped data-table">
<thead>
<tr>
<th class="save"><%= t(".table.line.save") %></th>