Merge pull request code-dot-org#5431 from code-dot-org/hocSignupsDashboard

ashercodeorg · ashercodeorg · commit ceaf2e6aad77 · 2015-11-17T13:48:19.000-06:00
Creates a dashboard page at /admin/temp/hoc_signups showing HOC 2015 signups.
diff --git a/dashboard/app/controllers/admin_reports_controller.rb b/dashboard/app/controllers/admin_reports_controller.rb
@@ -202,6 +202,16 @@ def all_usage
     render 'reports/usage', formats: [:html]
   end
 
+  def hoc_signups
+    # Requested by Roxanne on 16 November 2015 to track HOC 2015 signups by day.
+    authorize! :read, :reports
+
+    # Get the HOC 2015 signup counts by day, deduped by email and name.
+    # TODO(asher): Is this clumsy notation really necessary? Is Sequel really this stupid?
+    signups_by_day = DB[:forms].where(kind: 'HocSignup2015').group(:name, :email).group_and_count(Sequel.as(Sequel.qualify(:forms, :created_at).cast(:date),:created_at_day)).all.map{|row| [row[:created_at_day].to_s, row[:count].to_i]}
+    render locals: {signups_by_day: signups_by_day}
+  end
+
   # Use callbacks to share common setup or constraints between actions.
   def set_script
     @script = Script.get_from_cache(params[:script_id]) if params[:script_id]
diff --git a/dashboard/app/views/admin_reports/hoc_signups.html.haml b/dashboard/app/views/admin_reports/hoc_signups.html.haml
@@ -0,0 +1,39 @@
+- content_for :head do
+  %script{src:'https://www.google.com/jsapi'}
+
+%h1
+  Hour of Code 2015 Signups
+
+.by_day
+  #chart_by_day
+  %table
+    %tr
+      %th Day
+      %th Count
+    - signups_by_day.each do |day|
+      %tr
+        %td
+          %span= day[0]
+        %td
+          %span= day[1]
+
+- content_for :body_scripts do
+  :javascript
+    // Load the Visualization API and the appropriate packages, setting a callback
+    // to run when the API is loaded.
+    google.load('visualization', '1.0', {'packages':['corechart']});
+    google.setOnLoadCallback(drawChart);
+    var signups_by_day = #{signups_by_day.try(:to_json)}
+    // The callback that creates and populates the data table, instantiates the
+    // chart, and draws it.
+    function drawChart() {
+      var data = new google.visualization.DataTable();
+      data.addColumn('string', 'Date');
+      data.addColumn('number', 'Count');
+      data.addRows(signups_by_day);
+
+      // Instantiate and draw our chart, passing in some options.
+      var options = {'title': 'HOC 2015 Signups By Day', 'width':400, 'height':300};
+      var chart = new google.visualization.LineChart(document.getElementById('chart_by_day'));
+      chart.draw(data, options);
+    }
diff --git a/dashboard/config/routes.rb b/dashboard/config/routes.rb
@@ -178,7 +178,8 @@ def redirect_to_teacher_dashboard
   post '/milestone/:user_id/:script_level_id', :to => 'activities#milestone', :as => 'milestone'
 
   # one-off internal reports
-  get '/admin/brook/csppd', to: 'reports#csp_pd_responses', as: 'csp_pd_responses'
+  get '/admin/temp/csppd', to: 'reports#csp_pd_responses', as: 'csp_pd_responses'
+  get '/admin/temp/hoc_signups', to: 'admin_reports#hoc_signups', as: 'hoc_signups'
 
   # internal report dashboards
   get '/admin/concepts', to: 'admin_reports#admin_concepts', as: 'admin_concepts'
diff --git a/dashboard/test/controllers/admin_reports_controller_test.rb b/dashboard/test/controllers/admin_reports_controller_test.rb
@@ -30,6 +30,7 @@ class AdminReportsControllerTest < ActionController::TestCase
   generate_admin_only_tests_for :admin_stats
   generate_admin_only_tests_for :funometer
   # TODO(asher): Add :funometer_by_script and :funometer_by_script_level after fixing routing.
+  # TODO(asher): Add :hoc_signups after fixing the pegasus-test DB issue.
 
   test 'should get admin progress page' do
     get :admin_progress
