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

[Bugfix] Conference methods related to weeks now database independent

Browse source
This commit is contained in:
Chrisbr 2014-06-25 14:58:33 +02:00
parent fd95570c02
commit 596027e49b
6 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/conference.rb
View file

@ -179,7 +179,7 @@ class Conference < ActiveRecord::Base
result = []
if call_for_papers && events
submissions = events.group("strftime('%W', created_at)").count
submissions = events.group(:week).count
start_week = call_for_papers.start_week
weeks = call_for_papers.weeks
result = calculate_items_per_week(start_week, weeks, submissions)
@ -196,7 +196,7 @@ class Conference < ActiveRecord::Base
result = []
if call_for_papers && events
submissions = events.where('state = ?', state).group("strftime('%W', created_at)").count
submissions = events.where('state = ?', state).group(:week).count
start_week = call_for_papers.start_week
weeks = call_for_papers.weeks
result = calculate_items_per_week(start_week, weeks, submissions)
@ -216,7 +216,7 @@ class Conference < ActiveRecord::Base
registration_start_date &&
registration_end_date
reg = registrations.group("strftime('%W', created_at)").count
reg = registrations.group(:week).count
start_week = get_registration_start_week
weeks = registration_weeks
result = calculate_items_per_week(start_week, weeks, reg)