how_are_we_doing 0.0.4 → 0.0.5

data/app/controllers/reports_controller.rb

@@ -1,54 +1,3 @@
 class ReportsController < ApplicationController
-  respond_to :html, :json, :xml, :js
-  before_filter :set_dates, :only => :index
-  
-  def index
-    respond_to do |format|
-      format.html
-      format.json do
-        render :json => { 
-          :metrics => {
-            :totals => params[:exclude_totals] ? {} : {
-              :data => Total.json_data_for_chart(params[:start_date],params[:end_date]),
-              :label => "Totals",
-              :color => 0,
-              :ticks => Total.json_labels_for_chart(params[:start_date],params[:end_date])
-            },
-            :prints => params[:exclude_prints] ? {} : {
-              :data => Print.json_data_for_chart(params[:start_date],params[:end_date]),
-              :label => "Prints",
-              :color => 1,
-              :ticks => Print.json_labels_for_chart(params[:start_date],params[:end_date])
-            },
-            :views => params[:exclude_views] ? {} : {
-              :data => View.json_data_for_chart(params[:start_date],params[:end_date]),
-              :label => "Views",
-              :color => 2,
-              :ticks => View.json_labels_for_chart(params[:start_date],params[:end_date])
-            },
-            :shares => params[:exclude_shares] ? {} : {
-              :data => Share.json_data_for_chart(params[:start_date],params[:end_date]),
-              :label => "Shares",
-              :color => 3,
-              :ticks => Share.json_labels_for_chart(params[:start_date],params[:end_date])
-            }
-          },
-          :format_options => {
-            :xaxis => {
-              :max => params[:end_date].to_time.to_i,
-              :min => params[:start_date].to_time.to_i
-            }
-          }
-        }
-      end
-    end
-  end
-  
-  protected
-  def set_dates
-    params[:start_date] ||= (Date.today - 1.month)
-    params[:end_date] ||= (Date.today + 1.day)#Time.now.end_of_day.to_date
-    params[:start_date] = Date.parse(params[:start_date].to_s)
-    params[:end_date] = Date.parse(params[:end_date].to_s)
-  end
+  include HowAreWeDoing::Controllers::ReportsHelpers
 end

data/app/helpers/reports_helper.rb

@@ -2,21 +2,46 @@ module ReportsHelper
   def how_are_we_doing_chart(form_id,graph_container_id,graph_type) 
     <<-END.gsub(/^ {6}/, '')
       <script>
+        $("##{form_id} #analyticals").live('click',function(){
+          $(this).attr('size',10);
+        });
+        
+        $('##{form_id} #analyticals').live('change',function(){
+          $(this).parents('form').find('#analytical_ids').val($(this).val());
+          $(this).parents('form').trigger('submit');
+        });
+        
+        
         $('##{form_id} input:checkbox').live('change',function(){
-          $('#'+$(this).attr('id').replace('include_','exclude_')).val($(this).attr("checked") ? "" : true);
+          $(this).parents('form').find('#'+$(this).attr('id').replace('include_','exclude_')).val($(this).attr("checked") ? "" : true);
+          $(this).parents('form').trigger('submit');
         });
         
         $('##{form_id}').live('submit',function(){
           var data = {};
+          var allowable_params = {
+            exclude_totals:1,
+            exclude_prints:1,
+            exclude_shares:1,
+            exclude_views:1,
+            start_date:1,
+            end_date:1,
+            start_date:1,
+            parent_type: 1,
+            parent_id: 1,
+            analytical_ids: 1,
+            analytical_type:1
+          };
 
           $(this).find('input,select').each(function(i,element){
-            if(element.id && element.id.match(/exclude_/) && $(element).val()) {
+            if(element.name && allowable_params[element.name] && $(element).val()) {
               data[element.name] = $(element).val();
             }
-          })
+          });
+
           
           $.ajax({
-            url: "#{reports_path(:json)}",
+            url: $(this).attr('action')+".json",
             method: 'get',
             data: $.param(data),
             dataType: 'json',
@@ -29,6 +54,7 @@ module ReportsHelper
         
         $(function(){
           $('##{form_id}').trigger('submit');
+          $(".date-selector").datepicker();
         });
       </script>
     END

data/app/models/print.rb

@@ -1,31 +1,3 @@
 class Print < ActiveRecord::Base
-  belongs_to :printable, :polymorphic => true
-  belongs_to :user
-  
-  validates :printable_type, :presence => true, :on => :create
-  validates :printable_id, :presence => true, :on => :create
-  
-  after_create :create_total
-  
-  def self.json_data_for_chart(start_date,end_date)
-    arr = []
-    start_date.beginning_of_day.to_date.upto(end_date.end_of_day.to_date) do |day|
-      prints = self.where("created_at between ? and ?",day,day+1.day)
-      arr << [day.to_time.to_i,prints.count]
-    end
-    arr
-  end
-  
-  def self.json_labels_for_chart(start_date,end_date)
-    prints = self.where("created_at between ? and ?",start_date.beginning_of_day,end_date.end_of_day)
-    count = prints.count
-    prints = prints.where(:printable_id.not_eq => nil)
-    label = prints.first.nil? ? "" : prints.first.printable.to_print_chart_label
-    
-    [count,label]
-  end
-  
-  def create_total
-    printable.totals.create
-  end
+  acts_as_analytical
 end

data/app/models/share.rb

@@ -1,37 +1,11 @@
 class Share < ActiveRecord::Base
-  belongs_to :shareable, :polymorphic => true
-  belongs_to :user
-  
-  before_create :set_url_hash
+  acts_as_analytical
   
   after_create :create_total
+
   
-  validates :shareable_type, :presence => true, :on => :create
-  validates :shareable_id, :presence => true, :on => :create
-  
+  protected
   def set_url_hash
     self.url_hash = Digest::SHA1.hexdigest("#{shareable_type}#{shareable_id}#{user_id}how_are_we_doing#{service_ident}")
   end
-  
-  def self.json_data_for_chart(start_date,end_date)
-    arr = []
-    start_date.beginning_of_day.to_date.upto(end_date.end_of_day.to_date) do |day|
-      shares = self.where("created_at between ? and ?",day,day+1.day)
-      arr << [day.to_time.to_i,shares.count]
-    end
-    arr
-  end
-  
-  def self.json_labels_for_chart(start_date,end_date)
-    shares = self.where("created_at between ? and ?",start_date.beginning_of_day,end_date.end_of_day)
-    count = shares.count
-    shares = shares.where(:shareable_id.not_eq => nil)
-    label = shares.first.nil? ? "" : shares.first.shareable.to_share_chart_label
-
-    [count,label]
-  end
-  
-  def create_total
-    shareable.totals.create
-  end
 end

data/app/models/total.rb

@@ -1,25 +1,6 @@
 class Total < ActiveRecord::Base
-  belongs_to :totalable, :polymorphic => true
-  belongs_to :user
+  acts_as_analytical
   
-  validates :totalable_type, :presence => true, :on => :create
-  validates :totalable_id, :presence => true, :on => :create
-  
-  def self.json_data_for_chart(start_date,end_date)
-    arr = []
-    start_date.beginning_of_day.to_date.upto(end_date.end_of_day.to_date) do |day|
-      totals = self.where("created_at between ? and ?",day,day+1.day)
-      arr << [day.to_time.to_i,totals.count]
-    end
-    arr
-  end
-  
-  def self.json_labels_for_chart(start_date,end_date)
-    totals = self.where("created_at between ? and ?",start_date.beginning_of_day,end_date.end_of_day)
-    count = totals.count
-    totals = totals.where(:totalable_id.not_eq => nil)
-    label = totals.first.nil? ? "" : totals.first.totalable.to_total_chart_label
-    
-    [count,label]
+  def create_total
   end
 end

data/app/models/view.rb

@@ -1,31 +1,3 @@
 class View < ActiveRecord::Base
-  belongs_to :viewable, :polymorphic => true
-  belongs_to :user
-  
-  validates :viewable_type, :presence => true, :on => :create
-  validates :viewable_id, :presence => true, :on => :create
-  
-  after_create :create_total
-  
-  def self.json_data_for_chart(start_date,end_date)
-    arr = []
-    start_date.beginning_of_day.to_date.upto(end_date.end_of_day.to_date) do |day|
-      views = self.where("created_at between ? and ?",day,day+1.day)
-      arr << [day.to_time.to_i,views.count]
-    end
-    arr
-  end
-  
-  def self.json_labels_for_chart(start_date,end_date)
-    views = self.where("created_at between ? and ?",start_date.beginning_of_day,end_date.end_of_day)
-    count = views.count
-    views = views.where(:viewable_id.not_eq => nil)
-    label = views.first.nil? ? "" : views.first.viewable.to_view_chart_label
-
-    [count,label]
-  end
-  
-  def create_total
-    viewable.totals.create
-  end
+  acts_as_analytical
 end

data/app/views/reports/_bar_graph.html.erb

@@ -0,0 +1,48 @@
+<% content_for :javascripts do -%>
+  <%= raw how_are_we_doing_chart("bar-graph-form","bar-graph-container","bar") %>
+<% end -%>
+
+
+<%= form_tag(params[:parent_type] && params[:parent_id] ? "/#{params[:parent_type]}/#{params[:parent_id]}/reports" : "/reports", {:method => "get", :id => "bar-graph-form"}) do %>
+  <fieldset class="graph-dates">
+    <%= label_tag 'start_date', t('hawd.start_date') %>
+    <%= text_field_tag 'start_date', "", :class => "date-selector", :placeholder => l(params[:start_date],:format => :analytics), :id => "bar-graph-form_start_date" %>
+
+    <%= label_tag 'start_date', t('hawd.end_date') %>
+    <%= text_field_tag 'end_date', "", :class => "date-selector", :placeholder => l(params[:end_date],:format => :analytics), :id => "bar-graph-form_end_date" %>  
+  </fieldset>
+  
+  <div class="button-wrapper">
+    <%= hidden_field_tag 'exclude_prints' %>
+    <%= hidden_field_tag 'exclude_totals' %>
+    <%= hidden_field_tag 'exclude_views' %>
+    <%= hidden_field_tag 'exclude_shares' %>
+    <%= hidden_field_tag 'analytical_type', (params[:analytical_type]||params[:default_analytical_type]) %>
+    <%= hidden_field_tag 'analytical_ids', (@analytical_ids||[]) %>
+  
+    <%= submit_tag(t(:submit)) %>
+    <%= image_submit_tag("hawd/blank.png") %>
+  </div>
+  
+  <fieldset class="graph-compare">
+    <%= label_tag 'analyticals', t('hawd.comparision', :analytical => (params[:analytical_type]||params[:default_analytical_type]||"")) %>
+    <%= select_tag "analyticals", options_from_collection_for_select(@analyticals, "id", "to_s", {:selected => lambda { |analytical| @analytical_ids.include?(analytical.id) }}), :multiple => true, :size => 1 %>
+  </fieldset>
+  
+  <fieldset class="graph-filters">
+    <%= check_box_tag('include_totals', "1", true) %>
+    <%= label_tag 'include_totals', t('hawd.totals') %>
+  
+    <%= check_box_tag('include_views', "1", true) %>
+    <%= label_tag 'include_views', t('hawd.views') %>
+  
+    <%= check_box_tag('include_shares', "1", true) %>
+    <%= label_tag 'include_shares', t('hawd.shares') %>
+  
+    <%= check_box_tag('include_prints', "1", true) %>
+    <%= label_tag 'include_prints', t('hawd.prints') %>
+  </fieldset>
+  
+<% end -%>
+
+<div id="bar-graph-container" class="graph-chart"></div>

data/app/views/reports/_line_graph.html.erb

@@ -0,0 +1,40 @@
+<% content_for :javascripts do -%>
+  <%= raw how_are_we_doing_chart("line-graph-form","line-graph-container","line") %>
+<% end -%>
+
+<%= form_tag(params[:parent_type] && params[:parent_id] ? "/#{params[:parent_type]}/#{params[:parent_id]}/reports" : "/reports", {:method => "get", :id => "line-graph-form"}) do %>
+  <fieldset class="graph-dates">
+    <%= label_tag 'start_date', t('hawd.start_date') %>
+    <%= text_field_tag 'start_date', "", :class => "date-selector", :placeholder => l(params[:start_date],:format => :analytics), :id => "line-graph-form_start_date" %>
+  
+    <%= label_tag 'start_date', t('hawd.end_date') %>
+    <%= text_field_tag 'end_date', "", :class => "date-selector", :placeholder => l(params[:end_date],:format => :analytics), :id => "line-graph-form_end_date" %>
+  </fieldset>
+  
+  <div class="button-wrapper">
+    <%= hidden_field_tag 'exclude_prints' %>
+    <%= hidden_field_tag 'exclude_totals' %>
+    <%= hidden_field_tag 'exclude_views' %>
+    <%= hidden_field_tag 'exclude_shares' %>
+  
+    <%= submit_tag(t(:submit)) %>
+    <%= image_submit_tag("hawd/blank.png") %>
+  </div>
+  
+  <fieldset class="graph-filters">
+    <%= check_box_tag('include_totals', "1", true) %>
+    <%= label_tag 'include_totals', t('hawd.totals') %>
+  
+    <%= check_box_tag('include_views', "1", true) %>
+    <%= label_tag 'include_views', t('hawd.views') %>
+  
+    <%= check_box_tag('include_shares', "1", true) %>
+    <%= label_tag 'include_shares', t('hawd.shares') %>
+  
+    <%= check_box_tag('include_prints', "1", true) %>
+    <%= label_tag 'include_prints', t('hawd.prints') %>
+  </fieldset>
+<% end -%>
+
+
+<div id="line-graph-container" class="graph-chart"></div>

data/app/views/reports/_recent_bar_graph.html.erb

@@ -0,0 +1,41 @@
+<% content_for :javascripts do -%>
+  <%= raw how_are_we_doing_chart("recent-bar-graph-form","recent-bar-graph-container","bar") %>
+<% end -%>
+
+
+<%= form_tag(params[:parent_type] && params[:parent_id] ? "/#{params[:parent_type]}/#{params[:parent_id]}/reports" : "/reports", {:method => "get", :id => "recent-bar-graph-form"}) do %>  
+  <fieldset class="graph-dates">
+    <%= label_tag 'start_date', t('hawd.start_date') %>
+    <%= text_field_tag 'start_date', "", :class => "date-selector", :placeholder => l(params[:start_date],:format => :analytics), :id => "recent-bar-graph-form_start_date" %>
+  
+    <%= label_tag 'start_date', t('hawd.end_date') %>
+    <%= text_field_tag 'end_date', "", :class => "date-selector", :placeholder => l(params[:end_date],:format => :analytics), :id => "recent-bar-graph-form_end_date" %>
+  </fieldset>
+  
+  <div class="button-wrapper">
+    <%= hidden_field_tag 'exclude_prints' %>
+    <%= hidden_field_tag 'exclude_totals' %>
+    <%= hidden_field_tag 'exclude_views' %>
+    <%= hidden_field_tag 'exclude_shares' %>
+    <%= hidden_field_tag 'analytical_type', (params[:analytical_type]||params[:default_analytical_type]) %>
+  
+    <%= submit_tag(t(:submit)) %>
+    <%= image_submit_tag("hawd/blank.png") %>
+  </div>
+  
+  <fieldset class="graph-filters">
+    <%= check_box_tag('include_totals', "1", true) %>
+    <%= label_tag 'include_totals', t('hawd.totals') %>
+  
+    <%= check_box_tag('include_views', "1", true) %>
+    <%= label_tag 'include_views', t('hawd.views') %>
+  
+    <%= check_box_tag('include_shares', "1", true) %>
+    <%= label_tag 'include_shares', t('hawd.shares') %>
+  
+    <%= check_box_tag('include_prints', "1", true) %>
+    <%= label_tag 'include_prints', t('hawd.prints') %>
+  </fieldset>
+<% end -%>
+
+<div id="recent-bar-graph-container" class="graph-chart"></div>

data/app/views/reports/index.html.erb

@@ -1,28 +1,18 @@
 <% content_for :javascripts do -%>
-  <%= javascript_include_tag 'flot/jquery.flot.js', 'how_are_we_doing' %>
-  <%= raw how_are_we_doing_chart("test","line-graph","line") %>
+  <%= javascript_include_tag 'flot/excanvas.min.js','flot/jquery.flot.js', 'jquery-ui-1.8.10.custom.min.js', 'how_are_we_doing' %>
 <% end -%>
 
-<%= form_tag("/reports", {:method => "get", :id => "test"}) do %>
-  <%= label_tag 'include_totals', 'Totals' %>
-  <%= check_box_tag('include_totals', "1", true) %>
-  
-  <%= label_tag 'include_views', 'Views' %>
-  <%= check_box_tag('include_views', "1", true) %>
-  
-  <%= label_tag 'include_shares', 'Shares' %>
-  <%= check_box_tag('include_shares', "1", true) %>
-  
-  <%= label_tag 'include_prints', 'Prints' %>
-  <%= check_box_tag('include_prints', "1", true) %>
-  
-  <%= hidden_field_tag 'exclude_prints' %>
-  <%= hidden_field_tag 'exclude_totals' %>
-  <%= hidden_field_tag 'exclude_views' %>
-  <%= hidden_field_tag 'exclude_shares' %>
-  
-  <%= submit_tag("Submit") %>
+<% content_for :stylesheets do -%>
+  <%= stylesheet_link_tag "ui-lightness/jquery-ui-1.8.10.custom.css" %>
+  <style>
+  .graph-chart {
+    height: 300px;
+  }
+  </style>
 <% end -%>
 
+<%= render :partial => "line_graph" %>
 
-<div id="line-graph" style="height:900px;"></div>
+<%= render :partial => "recent_bar_graph" %>
+
+<%= render :partial => "bar_graph" %>

data/config/locales/en.yml

@@ -0,0 +1,16 @@
+en:
+  date:
+    formats:
+      analytics: "%m/%d/%Y"
+  time:
+    formats:
+      analytics: "%m/%d/%Y"
+  hawd:
+    totals: Totals
+    prints: Prints
+    start_date: Start Date
+    end_date: End Date
+    views: Views
+    prints: Prints
+    shares: Shares
+    comparision: "Select %{analytical} to compare:"

data/lib/generators/how_are_we_doing/install/install_generator.rb

@@ -30,6 +30,7 @@ module HowAreWeDoing
       
       def generate_routes
         route("match '/reports' => 'reports#index'")
+        route("match ':parent_type/:parent_id/reports' => 'reports#index'")
         route("match ':viewable_type/:viewable_id/views' => 'views#create', :via => :post")
         route("match ':printable_type/:printable_id/prints' => 'prints#create', :via => :post")
         route("match ':shareable_type/:shareable_id/shares' => 'shares#create', :via => :post")