From 8e2d357c3d6a4822282583d1fe053467028b7549 Mon Sep 17 00:00:00 2001 From: cole m alban Date: Tue, 4 Apr 2017 12:20:22 -0400 Subject: [PATCH] Started on date filtering for stats --- Pearlception/app/controllers/sessions_controller.rb | 3 --- Pearlception/app/controllers/statistics_controller.rb | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Pearlception/app/controllers/sessions_controller.rb b/Pearlception/app/controllers/sessions_controller.rb index b19f09c..a135d84 100644 --- a/Pearlception/app/controllers/sessions_controller.rb +++ b/Pearlception/app/controllers/sessions_controller.rb @@ -6,15 +6,12 @@ class SessionsController < Devise::RegistrationsController end def create - puts "NOW IN CREATE" params = sign_in_params @user = User.find_by(email: params[:email]) if @user == nil || !@user.valid_password?(params[:password]) redirect_to "/signin" return end - super - #Do we need this code below? It was never running before resource = warden.authenticate!(:scope => :user) sign_in(:user, resource) if !current_user.admin diff --git a/Pearlception/app/controllers/statistics_controller.rb b/Pearlception/app/controllers/statistics_controller.rb index b5568cb..0af7084 100644 --- a/Pearlception/app/controllers/statistics_controller.rb +++ b/Pearlception/app/controllers/statistics_controller.rb @@ -1,6 +1,14 @@ class StatisticsController < ApplicationController def index - puts params.inspect + if params[:from_date] != nil && params[:to_date] != nil + from_date = Date.parse params[:from_date] + to_date = Date.parse params[:to_date] + runs = Run.where(:runDate => from_date.beginning_of_day..to_date.end_of_day) + puts runs.inspect + else + runs = Run.all + puts runs.inspect + end end end