Site
/
clarion
11
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Ugly fix

This commit is contained in:
Petko Bordjukov 2015-10-22 00:04:38 +03:00
parent 898850ba8a
commit e42e050a95
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/conference.rb
View File

@ -33,7 +33,7 @@ class Conference < ActiveRecord::Base
end end
def submissions_grouped_by_confirmation_day def submissions_grouped_by_confirmation_day
submissions = events.approved.confirmed.group('date(propositions.confirmed_at)').select('date(propositions.confirmed_at) as confirmed_at, count(events.id) as number') submissions = events.joins(:proposition).approved.confirmed.group('date(propositions.confirmed_at)').select('date(propositions.confirmed_at) as confirmed_at, count(events.id) as number')
submissions.group_by { |s| s.confirmed_at.to_date } submissions.group_by { |s| s.confirmed_at.to_date }
end end

12
app/views/management/conferences/show.html.slim
View File

@ -31,9 +31,9 @@
= icon 'thumbs-down', '', class: 'fa-5x' = icon 'thumbs-down', '', class: 'fa-5x'
.col-xs-9.text-right .col-xs-9.text-right
.huge .huge
= @conference.events.rejected.count = @conference.events.joins(:proposition).rejected.count
div div
= t 'event_states.rejected', count: @conference.events.rejected.count = t 'event_states.rejected', count: @conference.events.joins(:proposition).rejected.count
= link_to [:management, @conference, :events, {status: :rejected}] = link_to [:management, @conference, :events, {status: :rejected}]
.panel-footer.text-danger .panel-footer.text-danger
span.pull-left = t 'views.conference.see_details' span.pull-left = t 'views.conference.see_details'
@ -48,9 +48,9 @@
= icon 'thumbs-up', class: 'fa-5x' = icon 'thumbs-up', class: 'fa-5x'
.col-xs-9.text-right .col-xs-9.text-right
.huge .huge
= @conference.events.approved.count = @conference.events.joins(:proposition).approved.count
div div
= t 'event_states.approved', count: @conference.events.approved.count = t 'event_states.approved', count: @conference.events.joins(:proposition).approved.count
= link_to [:management, @conference, :events, {status: :approved}] = link_to [:management, @conference, :events, {status: :approved}]
.panel-footer.text-info .panel-footer.text-info
span.pull-left = t 'views.conference.see_details' span.pull-left = t 'views.conference.see_details'
@ -64,9 +64,9 @@
= icon 'check', '', class: 'fa-5x' = icon 'check', '', class: 'fa-5x'
.col-xs-9.text-right .col-xs-9.text-right
.huge .huge
= @conference.events.approved.confirmed.count = @conference.events.joins(:proposition).approved.confirmed.count
div div
= t 'event_states.confirmed', count: @conference.events.approved.confirmed.count = t 'event_states.confirmed', count: @conference.events.joins(:proposition).approved.confirmed.count
= link_to [:management, @conference, :events, {status: :approved, confirmed: true}] = link_to [:management, @conference, :events, {status: :approved, confirmed: true}]
.panel-footer.text-success .panel-footer.text-success
span.pull-left = t 'views.conference.see_details' span.pull-left = t 'views.conference.see_details'