gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show charts for survey replies

Browse source
This commit is contained in:
Stella Rouzi 2018-02-13 16:11:52 +02:00
parent 683f62a27c
commit e1adf28081
10 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -125,6 +125,7 @@ gem 'jquery-datatables-rails', '~> 2.2.1'
# for charts # for charts
gem 'chart-js-rails' gem 'chart-js-rails'
gem 'chartkick'
# for displaying maps # for displaying maps
gem 'leaflet-rails' gem 'leaflet-rails'

2
Gemfile.lock
View file

@ -113,6 +113,7 @@ GEM
fastimage fastimage
chart-js-rails (0.0.6) chart-js-rails (0.0.6)
railties (> 3.1) railties (> 3.1)
chartkick (2.2.5)
chronic (0.10.2) chronic (0.10.2)
chunky_png (1.3.8) chunky_png (1.3.8)
climate_control (0.2.0) climate_control (0.2.0)
@ -590,6 +591,7 @@ DEPENDENCIES
carrierwave carrierwave
carrierwave-bombshelter carrierwave-bombshelter
chart-js-rails chart-js-rails
chartkick
climate_control climate_control
cloudinary cloudinary
cocoon cocoon

1
app/assets/javascripts/application.js
View file

@ -20,7 +20,6 @@
//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
//= require cocoon //= require cocoon
//= require bootstrap //= require bootstrap
//= require Chart
//= require osem //= require osem
//= require osem-dashboard //= require osem-dashboard
//= require ahoy //= require ahoy

1
app/views/admin/conferences/index.html.haml
View file

@ -1,3 +1,4 @@
= javascript_include_tag 'Chart'
.row .row
.col-sm-3.col-xs-3 .col-sm-3.col-xs-3
.dashbox.text-center .dashbox.text-center

2
app/views/admin/conferences/show.html.haml
View file

@ -1,3 +1,5 @@
= javascript_include_tag 'Chart'
%h1 %h1
%span.fa.fa-tachometer %span.fa.fa-tachometer
Dashboard for #{@conference.title} Dashboard for #{@conference.title}

2
app/views/admin/events/index.html.haml
View file

@ -1,3 +1,5 @@
= javascript_include_tag 'Chart'
.row .row
.col-md-12 .col-md-12
.page-header .page-header

2
app/views/admin/physical_tickets/index.html.haml
View file

@ -1,3 +1,5 @@
= javascript_include_tag 'Chart'
.container .container
.row .row
.col-md-12.page-header .col-md-12.page-header

2
app/views/admin/registrations/index.html.haml
View file

@ -1,3 +1,5 @@
= javascript_include_tag 'Chart'
.row .row
.col-md-12 .col-md-12
.page-header .page-header

0
app/views/admin/surveys/_survey_question_body.html.haml
View file

1
config/initializers/assets.rb
View file

@ -9,3 +9,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# Rails.application.config.assets.precompile += %w( search.js ) # Rails.application.config.assets.precompile += %w( search.js )
Rails.application.config.assets.precompile += %w( Chart.js )