diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb index c480de34..130bcdda 100644 --- a/app/controllers/admin/stats_controller.rb +++ b/app/controllers/admin/stats_controller.rb @@ -10,37 +10,21 @@ class Admin::StatsController < ApplicationController people.public_name AS public_name, people.email AS email") - @pre_registered = @conference.registrations.where("onsite = ?", false).count - - @registered_attended = @conference.registrations.where("attended = ? AND onsite = ?", true, false).count - @registered_onsite = @conference.registrations.where("onsite LIKE ?", true).count - @registered_not_attended = @conference.registrations.where("attended LIKE ? AND onsite LIKE ?", false, false).count - @attendees = @conference.registrations.where("attended = ?", true).count + @registered = @conference.registrations.count @registered_with_partner = @conference.registrations.where("attending_with_partner = ?", true).count @attended_with_partner = @conference.registrations.where("attending_with_partner = ? AND attended = ?", true, true).count - @headers = %w[attended name email social_events with_partner need_access other_needs arrival departure onsite] - - @events = @conference.events - @tracks = @conference.tracks - @event_states = @events.state_machine.states.map @speakers = Person.joins(:events).where("events.conference_id = ? AND events.state LIKE ?", @conference.id, 'confirmed').uniq @speaker_fields_person = %w[name email affiliation] @speaker_fields_reg = %w[with_partner need_access other_needs diet arrival departure] @supporter_levels = @conference.supporter_levels - - @supporter_tickets = "t" - @professional_tickets = "t" - end - def reg_support (level) + def reg_support(level) Registration.find_by_sql("select supporter_registrations.* FROM registrations, supporter_registrations, supporter_levels WHERE registrations.id = supporter_registrations.registration_id AND registrations.conference_id = #{@conference.id} AND supporter_registrations.supporter_level_id = #{level.id}") - - end def speaker_reg(speaker) @@ -54,5 +38,4 @@ class Admin::StatsController < ApplicationController helper_method :speaker_reg helper_method :speaker_diet helper_method :reg_support - end diff --git a/app/views/admin/stats/index.html.haml b/app/views/admin/stats/index.html.haml index f9f226e5..f717bba2 100644 --- a/app/views/admin/stats/index.html.haml +++ b/app/views/admin/stats/index.html.haml @@ -22,7 +22,7 @@ %td = reg_support.count %td - = "#{reg_support.count * 100 / @pre_registered}% of registered" + = "#{reg_support.count * 100 / @registered}% of registered" - if @attendees %br = "#{reg_support.count * 100 / @attendees}% of attendees" @@ -30,9 +30,11 @@ #registrations-stats %h3 - Pre Registered - = "(#{@pre_registered}) -" - OnsiteRegistrations (#{@registered_onsite}) - Attendees (#{@attendees}) + Registered + - if @registered + = "(#{@registered})" + - if @attendees + = " - Attendees (#{@attendees})" .row-fluid .span3 %table.table.table-bordered.table-striped @@ -76,7 +78,7 @@ %td= d[0] %td= d[1] %td - = "#{d[1] * 100 / @pre_registered}% of registered" + = "#{d[1] * 100 / @registered}% of registered" - if @attendees %br = "#{d[1] * 100 / @attendees}% of attendees" @@ -121,7 +123,6 @@ - @speaker_fields_person.each do |field| %td - if field == 'name' - = speaker.id = speaker.first_name = speaker.last_name %br