Replaced old dashboard with new one based on petition_reports table.

app/controllers/admin/petitions_controller.rb

@@ -3,13 +3,6 @@ class Admin::PetitionsController < ApplicationController
   before_filter :require_admin
 
   def index
-    respond_to do |format|
-      format.html { }
-      format.json { render json: PetitionsDatatable.new(view_context, PetitionStatisticsBuilder.new) }
-    end
-  end
-
-  def new_dashboard
     respond_to do |format|
       format.html {}
       format.json { render json: PetitionsDatatable.new(view_context, PetitionReportRepository.new) }

app/datatables/petitions_datatable.rb

@@ -12,7 +12,7 @@
 =end
 
 class PetitionsDatatable
-  delegate :params, :h, :float_to_percentage, :format_date_time, :link_to, to: :@view
+  delegate :params, :h, :float_to_percentage, :format_date_time, :link_to, :petition_path, to: :@view
 
   def initialize(view, statistics_builder)
     @view = view
@@ -43,7 +43,7 @@ def dpct(numerator, denominator, percentify=true)
   def data
     petitions.map do |petition|
       [
-        link_to(petition.petition_title, petition.p),
+        link_to(petition.petition_title, petition_path(petition.petition_id)),
         h(petition.email_count),
         dpct(petition.opened_emails_count, petition.email_count),
         dpct(petition.clicked_emails_count, petition.email_count),

app/views/admin/petitions/index.html.haml

@@ -2,11 +2,10 @@
   %h1 Petitions dashboard
 
   %p
-    - labels = 'today', 'yesterday', 'a week ago', 'a month ago', 'a year ago'
-    - today = Date.today
-    - values = today, today - 1.day, today - 1.week, today - today.month, today - 1.year
-    - options = Hash[labels.zip(values.map(&:to_s))]
-    Activity since #{link_to_self_with_param :since, options, " | "}
+    - labels  = 'day', 'week', 'month', 'year'
+    - options = Hash[labels.zip(labels)]
+    - params[:since] ||= 'year'
+    Activity since last #{link_to_self_with_param :since, options, " | "}
 
   <button style="float: right" class="btn btn-success" onClick="$('table').dataTable().fnDraw()">Reload</button>
 

config/routes.rb

@@ -32,9 +32,7 @@
   get 'contact', to: 'user_feedbacks#new', as: 'contact'
 
   namespace(:admin) do
-    resources :petitions do
-      collection { get 'new_dashboard' }
-    end
+    resources :petitions
     resources :users
 
     resource :stats do

spec/controllers/admin/petitions_controller_spec.rb

@@ -1,16 +1,11 @@
 module Admin
   describe PetitionsController do
-    before :each do
-      AnalyticsGateway.stub(:get_report_results).and_return({})
+    before do
       stub_bandit controller
     end
     describe "GET index" do
       let(:action) { get :index }
       it_behaves_like "an admin only resource page"
     end
-    describe "GET new_dashboard" do
-      let(:action) { get :new_dashboard }
-      it_behaves_like "an admin only resource page"
-    end
   end
 end