oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 03:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add date filter bar to stats page

Browse Source
This commit is contained in:
cole m alban 2017-03-31 16:09:16 -04:00
parent 129eff3821
commit 0ffa44897a
9 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pearlception/Gemfile
View File

@ -21,7 +21,7 @@ gem 'coffee-rails', '~> 4.2'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
gem 'chart-js-rails'
gem 'jquery-ui-rails'
# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks

3
Pearlception/Gemfile.lock
View File

@ -88,6 +88,8 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
kaminari (1.0.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
@ -222,6 +224,7 @@ DEPENDENCIES
hirb-unicode
jbuilder (~> 2.5)
jquery-rails
jquery-ui-rails
kaminari
listen (~> 3.0.5)
mysql2 (>= 0.3.18, < 0.5)

1
Pearlception/app/assets/javascripts/application.js
View File

@ -16,3 +16,4 @@
//= require bootstrap/bootstrap-rails-tooltip
//= require bootstrap/bootstrap-rails-popover
//= require Chart
//= require jquery-ui

3
Pearlception/app/assets/javascripts/dashboard.coffee
View File

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

0
Pearlception/app/assets/javascripts/dashboard.js Normal file
View File

6
Pearlception/app/assets/javascripts/statistics.js
View File

@ -1,3 +1,8 @@
$('#from_datepicker').datepicker()
$('#to_datepicker').datepicker()
/*
*This is code for the grades chart.
*/
var ctx = document.getElementById("gradesChart");
var myChart = new Chart(ctx, {
type: 'bar',
@ -35,3 +40,4 @@ var myChart = new Chart(ctx, {
}
}
});

1
Pearlception/app/assets/stylesheets/application.css
View File

@ -14,4 +14,5 @@
*= require_self
*= require bootstrap/bootstrap-rails-tooltip
*= require bootstrap/bootstrap-rails-popover
*= require jquery-ui
*/

4
Pearlception/app/controllers/statistics_controller.rb
View File

@ -1,2 +1,6 @@
class StatisticsController < ApplicationController
def index
puts params.inspect
end
end

26
Pearlception/app/views/statistics/index.html.erb
View File

@ -40,22 +40,34 @@
<% if current_user.admin? %>
<li><a href="companies#index">Companies</a></li>
<% else %>
<li class"active"><a href="statistics#index">Statistics</a></li>
<li class="active"><a href="statistics#index">Statistics</a></li>
<li><a href="grades#index">Grades <span class="sr-only">(current)</span></a></li>
<% end %>
</ul>
</div>
</div>
</div>
<div class="row">
<form action="/statistics?name=cole">
<%= csrf_meta_tag %>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<div class="col-md-4">
<div class="col-md-2">
<p>From: <input type="text" id="from_datepicker" name="from_date"></p>
</div>
<div class="col-md-2">
<p>To: <input type="text" id="to_datepicker" name="to_date"></p>
</div>
<div class="col-md-2">
<button class="btn btn-primary" type="submit">Filter</button>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<div class="col-lg-12">
<canvas id="gradesChart"></canvas>
</div>
<div class="col-md-4">
<canvas id="secondChart"></canvas>
</div>
<div class="col-md-4">
<canvas id="thirdChart"></canvas>
</div>
</div>
<%= javascript_include_tag "statistics.js" %>