From 9cf5c59f287be92dc82e626d663dac063f77ff77 Mon Sep 17 00:00:00 2001 From: differentreality Date: Mon, 9 Sep 2013 20:05:51 +0300 Subject: [PATCH] final registrations stats Conflicts: app/views/admin/stats/index.html.haml --- .../admin/stats/_registered_attended.html | 82 ++++++++++++++++++ app/views/admin/stats/_registered_time.html | 86 +++++++++++++++++++ .../admin/stats/_registrations.html.haml | 74 +--------------- app/views/admin/stats/index.html.haml | 4 +- 4 files changed, 172 insertions(+), 74 deletions(-) create mode 100644 app/views/admin/stats/_registered_attended.html create mode 100644 app/views/admin/stats/_registered_time.html diff --git a/app/views/admin/stats/_registered_attended.html b/app/views/admin/stats/_registered_attended.html new file mode 100644 index 00000000..2eb094ac --- /dev/null +++ b/app/views/admin/stats/_registered_attended.html @@ -0,0 +1,82 @@ + + + \ No newline at end of file diff --git a/app/views/admin/stats/_registered_time.html b/app/views/admin/stats/_registered_time.html new file mode 100644 index 00000000..5b700ced --- /dev/null +++ b/app/views/admin/stats/_registered_time.html @@ -0,0 +1,86 @@ + \ No newline at end of file diff --git a/app/views/admin/stats/_registrations.html.haml b/app/views/admin/stats/_registrations.html.haml index 679c4947..74d41e4b 100644 --- a/app/views/admin/stats/_registrations.html.haml +++ b/app/views/admin/stats/_registrations.html.haml @@ -1,72 +1,2 @@ -.row-fluid - .span12 - %h3 - Total Registrations - - if @registered - = "(#{@registered})" - - if @attendees - = " - Attendees (#{@attendees})" -.row-fluid - .span3 - %table.table.table-bordered.table-striped - %thead - %th General Stats - %th # - %tr - %td Registered attended - %td= @pre_registered_attended - %tr - %td Registered not attended - %td= @pre_registered - @pre_registered_attended - %tr - %td Attended with partner - %td= @attended_with_partner - %tr - %td Registred to attend with partner - %td= @registered_with_partner - %tr - %td Handicapped Access for - %td= @handicapped_access - %tr - %td Staying at suggested hotel - %td= @suggested_hotel_stay - - .span3 - - if @conference.use_dietary_choices == true - - diet_choices = [] - - @conference.dietary_choices.each do |d| - - count = diet_count(d.id) - - if count > 0 - - diet_choices << [d.title, count] - - if diet_choices.any? - %table.table.table-bordered.table-striped - %thead - %th Dietary Choice - %th # - %th Percentage - - diet_choices.each do |d| - %tr - %td= d[0] - %td= d[1] - %td - - if @registered and @registered > 0 - = "#{d[1] * 100 / @registered}% of registered" - - if @attendees and @attendees > 0 - %br - = "#{d[1] * 100 / @attendees}% of attendees" - .span3 - - if @conference.social_events.count > 0 - - social_events = [] - - @conference.social_events.each do |social_event| - - count = social_event_count(social_event) - - if count > 0 - - social_events << [social_event.title, count] - - if social_events.any? - %table.table.table-bordered.table-striped - %thead - %th Social Event - %th # - - social_events.each do |s| - %tr - %td= s[0] - %td= s[1] \ No newline at end of file += render :partial => "registered_attended" += render :partial => "registered_time" \ No newline at end of file diff --git a/app/views/admin/stats/index.html.haml b/app/views/admin/stats/index.html.haml index e7ffb859..b001a953 100644 --- a/app/views/admin/stats/index.html.haml +++ b/app/views/admin/stats/index.html.haml @@ -15,8 +15,8 @@ = render :partial => 'speakers' .tab-pane#tickets = render :partial => 'tickets' - -:javascript + +:javascript $('#myTab a').click(function (e) { e.preventDefault(); $(this).tab('show');