DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

If not super admin do not display current month in cumul

Browse source
This commit is contained in:
Mathieu Magnin 2017-10-06 09:34:02 +02:00 • committed by gregoirenovel
parent fc490f05e8
commit 08f76f336c
2 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/stats_controller.rb
View file

@ -36,13 +36,16 @@ class StatsController < ApplicationController
private
def max_date
if administration_signed_in?
Time.now.to_date
else
Time.now.beginning_of_month - 1.second
end
end
def last_four_months_hash(association, date_attribute)
min_date = 3.months.ago.beginning_of_month.to_date
if administration_signed_in?
max_date = Time.now.to_date
else
max_date = Time.now.beginning_of_month - 1.second
end
association
.where(date_attribute => min_date..max_date)
@ -56,6 +59,7 @@ class StatsController < ApplicationController
def cumulative_hash(association, date_attribute)
sum = 0
association
.where("#{date_attribute.to_s} < ?", max_date)
.group("DATE_TRUNC('month', #{date_attribute.to_s})")
.count
.to_a