admin_data 1.1.12 → 1.1.13

data/.gitignore

@@ -15,3 +15,4 @@ test/rails_root/db/*.sqlite3
 test/rails_root/.rvmrc
 test/rails_root/.bundle
 test/rails_root/.bundle/*
+test/rails_root/config/database.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    admin_data (1.1.12)
+    admin_data (1.1.13)
       will_paginate (= 3.0.pre2)
 
 GEM

data/README.md

@@ -10,7 +10,7 @@
 
 #Test#
 
-<tt>cd _test/rails_root</tt> and read the instructions mentioned at README.md there.
+<tt>cd test/rails_root</tt> and read the instructions mentioned at README.md there.
 
 
 

data/app/controllers/admin_data/analytics_controller.rb

@@ -0,0 +1,38 @@
+module AdminData
+  class AnalyticsController < ApplicationController
+
+    before_filter :get_class_from_params
+    before_filter :set_ivars
+
+    rescue_from AdminData::NoCreatedAtColumnException, :with => :render_no_created_at
+
+    def render_no_created_at
+      render :text => "Model #{@klass} does not have created_at column"
+    end
+
+    def daily
+      @chart_title = "#{@klass.name} records created in the last 30 days"
+
+      a = AdminData::Analytics.daily_report(@klass, Time.now)
+      @chart_data_s = a.map {|e| e.last }.join(', ')
+      @chart_data_x_axis = a.map {|e| e.first}.join(', ')
+      render :action => 'index'
+    end
+
+    def monthly
+      @chart_title = "#{@klass.name} rercords created last year"
+      a = AdminData::Analytics.monthly_report(@klass, Time.now)
+      @chart_data_s = a.map {|e| e.last }.join(', ')
+      @chart_data_x_axis = a.map {|e| e.first}.join(', ')
+      render :action => 'index'
+    end
+
+    def set_ivars
+      @chart_width = 950
+      @chart_height = 400
+      @chart_h_axis_title = ''
+      @chart_legend_name = 'Created'
+    end
+
+  end
+end

data/app/controllers/admin_data/public_controller.rb

@@ -15,6 +15,8 @@ module AdminData
         content_type = "text/javascript"
       when /\.png$/i
         content_type = "image/png"
+      when /\.jpg$/i
+        content_type = "image/jpg"
       else
         render :nothing => true, :status => 404 and return
       end

data/app/controllers/admin_data/search_controller.rb

@@ -1,5 +1,3 @@
-require File.join(AdminData::LIBPATH, 'admin_data', 'search')
-
 class SearchAction
   attr_accessor :relation, :success_message
 
@@ -27,12 +25,13 @@ module AdminData
 
     layout 'search'
 
-    include Search
+    include AdminData::Search
 
     before_filter :get_class_from_params
     before_filter :ensure_valid_children_klass, :only => [:quick_search]
     before_filter :ensure_is_authorized_for_update_opration, :only => [:advance_search]
     before_filter :set_column_type_info, :only => [:advance_search]
+    before_filter :handle_sorting
 
 
     def quick_search
@@ -48,7 +47,7 @@ module AdminData
         @records = has_many_proxy.send(:paginate, h)
       else
         params[:query] = params[:query].strip unless params[:query].blank?
-        cond = build_quick_search_conditions(@klass, params[:query])
+        cond = build_quick_search_condition(@klass, params[:query])
         h = { :page => params[:page], :per_page => per_page, :order => order, :conditions => cond }
         @records = @klass.unscoped.paginate(h)
       end
@@ -58,7 +57,7 @@ module AdminData
 
     def advance_search
       @page_title = "Advance search #{@klass.name.underscore}"
-      hash = build_advance_search_conditions(@klass, params[:adv_search])
+      hash = build_advance_search_condition(@klass, params[:adv_search])
       relation = hash[:cond]
       errors = hash[:errors]
       order = default_order
@@ -134,5 +133,11 @@ module AdminData
       @column_type_info = "{#{column_type_info}}"
     end
 
+    def handle_sorting
+      sort_order = params[:sortby] || 'id desc'
+      @sort_by_column_name, @sort_order = sort_order.split
+      @sort_css = @sort_order == 'asc' ? 'sort_by_asc' : 'sort_by_desc'
+    end
+
   end
 end

data/app/helpers/admin_data/application_helper.rb

@@ -1,6 +1,27 @@
 module AdminData
   module ApplicationHelper
 
+    def get_sort_order(column)
+      if column == @sort_by_column_name && @sort_order == 'desc'
+        "#{column} asc"
+      else
+        "#{column} desc"
+      end
+    end
+
+    def get_sort_title_with_url(column, klass)
+      order = get_sort_order(column)
+      link_to column_title(klass, column), admin_data_search_path(:klass => klass, :query => params[:query], :sortby => order)
+    end
+
+    def get_sort_class(column)
+      sort_class = 'sortable'
+      if column == @sort_by_column_name
+        sort_class << ' ' + @sort_css
+      end
+      sort_class
+    end
+
     def parent_layout(layout)
       @_content_for[:layout] = self.output_buffer
       self.output_buffer = render(:file => "layouts/#{layout}")

data/app/views/admin_data/analytics/_bar_chart.html.erb

@@ -0,0 +1,39 @@
+
+<%= javascript_include_tag "https://www.google.com/jsapi" %>
+<script>
+google.load('visualization', '1', {'packages':['corechart']});
+google.setOnLoadCallback(drawChart);
+
+function drawChart() {
+
+  var data = new google.visualization.DataTable();
+  var raw_data = [['<%= chart_legend_name %>', <%= chart_data_s %>]];
+
+  var years = [<%= chart_data_x_axis %>];
+            
+  data.addColumn('string', 'Year');
+  for (var i = 0; i  < raw_data.length; ++i) {
+    data.addColumn('number', raw_data[i][0]);    
+  }
+
+  data.addRows(years.length);
+
+  for (var j = 0; j < years.length; ++j) {    
+    data.setValue(j, 0, years[j].toString());    
+  }
+
+  for (var i = 0; i  < raw_data.length; ++i) {
+    for (var j = 1; j  < raw_data[i].length; ++j) {
+      data.setValue(j-1, i+1, raw_data[i][j]);    
+    }
+  }
+
+  // Create and draw the visualization.  
+  var chart = new google.visualization.ColumnChart(document.getElementById('chart_div'));
+  chart.draw(data,
+    { title: '<%= chart_title %>',             
+      width: <%= chart_width %>, 
+      height: <%= chart_height %>,            
+      hAxis: {title: '<%= chart_h_axis_title %>'}});      
+}
+</script>

data/app/views/admin_data/analytics/index.html.erb

@@ -0,0 +1,41 @@
+<%= render 'bar_chart', :chart_title => @chart_title, 
+                        :chart_h_axis_title => @chart_h_axis_title,  
+                        :chart_legend_name => @chart_legend_name,
+                        :chart_data_s => @chart_data_s,
+                        :chart_data_x_axis => @chart_data_x_axis,
+                        :chart_width => @chart_width, 
+                        :chart_height => @chart_height %>
+
+<div id="main">
+
+  <%= breadcrum do %>
+    <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>
+  <% end %>
+
+  <%= render 'admin_data/shared/flash_message', :model => @model %>
+
+  <div class="block" id="block-tables">
+    <div class="secondary-navigation">
+      <%= render 'admin_data/shared/secondary_navigation', :klass => @klass %>
+      <div class="clear"></div>
+    </div>
+    <div class="content rounded">
+      <div>
+      <h2 class="title" style='float:left;'>Analytics</h2>
+
+      <div style='float:left;margin-top:18px;margin-left:20px;'>
+        <%= radio_button_tag :report_type, admin_data_daily_analytics_path(:klass => @klass), params[:action] == 'daily' %> Daily
+        &nbsp;
+        <%= radio_button_tag :report_type, admin_data_monthly_analytics_path(:klass => @klass), params[:action] == 'monthly' %> Monthly
+      </div>
+      <div style='clear:both;'></div>
+    </div>
+
+
+      <div class="inner">
+         <div id="chart_div"></div>
+
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/admin_data/search/search/_advance_search_form.html.erb

@@ -6,15 +6,9 @@
   <div id='advance_search' class='search_box'>
     <table id='advance_search_table' class='advtable'>
     </table>
+    <input type="hidden" id="advance_search_sortby" name="sortby" value="<%=params[:sortby]%>" />
 
     <div class='sortby_umbrella'>
-      <div class='group'>
-        <div class='sortby_text'>Sort by</div>
-        <select name='sortby' id='sortby'>
-          <%= AdminData::Util.build_sort_options(klass,params[:sortby]).html_safe %>
-        </select>
-        <br />
-      </div>
       <div class='clear'></div>
       <input type="submit" value="Search" class='submit_search' />
     </div>

data/app/views/admin_data/search/search/_listing.html.erb

@@ -10,9 +10,11 @@
 <table cellspacing="3" cellpadding="3" id="view_table" class='table colorize'>
 
   <thead>
-     <tr>
+     <tr class='thead'>
       <% columns_order(klass).each do |column| %>
-        <th> <%= column_title(klass, column) %> </th>
+        <th class='<%=get_sort_class(column)%>' data-sortby='<%=get_sort_order(column)%>'> 
+          <%= get_sort_title_with_url(column, klass) %>
+        </th>
       <% end %>
     </tr>
   </thead>

data/app/views/admin_data/search/search/_search_form.html.erb

@@ -4,7 +4,6 @@
     <div id='quick_search'>
       <label class='label keyword_label'>Search keyword</label>
       <input type="text" id="quick_search_input" name="query" value="<%=params[:query]%>" />
-      <%= render :partial => 'admin_data/search/search/sortby', :locals => {:klass => klass} %>
       <div class='clear'></div>
       <%= submit_tag 'Search', :name => nil, :disable_with => 'searching ...', :class => 'submit_search' %>
     </div>

data/app/views/admin_data/shared/_secondary_navigation.html.erb

@@ -1,6 +1,7 @@
 <%
   quick_search_tab_active = params[:action] == 'quick_search' ? 'active' : ''
   advance_search_tab_active = params[:action] == 'advance_search' ? 'active' : ''
+  analytics_tab_active = params[:controller] == 'admin_data/analytics' ? 'active' : ''
   table_structure_tab_active = params[:controller] == 'admin_data/table_structure' ? 'active' : ''
   add_new_record_tab_active = %w(new create).include?(params[:action]) ? 'active' : ''
 %>
@@ -14,6 +15,10 @@
     <%= link_to 'Advance Search', admin_data_advance_search_path(:klass => klass.name.underscore)  %>
   </li>
 
+  <li class="<%=analytics_tab_active%>">
+    <%= link_to 'Analytics', admin_data_daily_analytics_path(:klass => klass.name.underscore)  %>
+  </li>
+
   <li class="<%=table_structure_tab_active%>">
     <%= link_to 'Table Structure', admin_data_table_structure_path(:klass => klass.name.underscore) %>
   </li>

data/app/views/layouts/admin_data.html.erb

@@ -29,8 +29,11 @@
                                                  'advance_search/act_on_result',
                                                  'advance_search/build_first_row',
                                                  'advance_search/event_bindings',
-                                                 'advance_search/trigger_submit_on_domready'
+                                                 'advance_search/trigger_submit_on_domready',
+                                                 'advance_search/sortby'
                                                 ) %>
+    <% elsif params[:controller] == 'admin_data/analytics' %>
+      <%= javascript_include_tag('analytics/report') %>
     <% end %>
 
     <%= csrf_meta_tag %>

data/config/routes.rb

@@ -19,15 +19,18 @@ Rails.application.routes.draw do
           match '/jstest',    :to => :jstest, :as => :jstest
         end
 
-        match '/table_structure/:klass' => "table_structure#index", :as => :table_structure
+        match '/table_structure/:klass' => "table_structure#index",  :as => :table_structure
 
-        match '/quick_search/:klass' => "search#quick_search",      :as => :search
+        match '/quick_search/:klass'    => "search#quick_search",    :as => :search
 
-        match '/advance_search/:klass' => "search#advance_search",  :as => :advance_search
+        match '/advance_search/:klass'  => "search#advance_search",  :as => :advance_search
 
-        match '/feed/:klasss' => "feed#index", :defaults => { :format =>'rss' }, :as => :feed
+        match '/analytics/daily/:klass'       => "analytics#daily",        :as => :daily_analytics
+        match '/analytics/monthly/:klass'       => "analytics#monthly",      :as => :monthly_analytics
 
-        match '/public/*file' => "public#serve", :as => :public
+        match '/feed/:klasss'           => "feed#index", :defaults => { :format =>'rss' }, :as => :feed
+
+        match '/public/*file'           => "public#serve", :as => :public
 
         root :to => "home#index"
       end

data/lib/admin_data/analytics.rb

@@ -0,0 +1,176 @@
+require "active_support/all"
+
+module AdminData
+  module Analytics
+
+    # a utility class to handle date interpolation for different databases
+    class Dater
+      attr_accessor :adapter, :type
+
+      def initialize(adapter, type = 'daily')
+        @adapter = adapter
+        @type = type
+      end
+
+      def date_select_key
+        "date_data"
+      end
+
+      def group_by_key
+        if adapter =~ /postgresql/i
+          self.type == 'monthly' ? "date_part('year', created_at), date_part('month', created_at)" : "date_data"
+        elsif adapter =~ /mysql/i
+          self.type == 'monthly' ? "YEAR(created_at), MONTH(created_at)" : "date_data"
+        else
+          self.type == 'monthly' ? "strftime('%Y', created_at), strftime('%m', created_at)" : "date_data"
+        end
+      end
+
+      def count_select_key
+        "count_data"
+      end
+
+      def count_function
+        "count(*) as count_data"
+      end
+
+      def date_select_function
+        self.type == 'monthly' ? date_select_function_monthly : date_select_function_daily
+      end
+
+      private
+
+      def date_select_function_monthly
+        if adapter =~ /mysql/i
+          "MONTH(created_at) as date_data"
+        elsif adapter =~ /postgresql/i
+          "date_part('month', created_at) as date_data"
+        else
+          "strftime('%m', created_at) as date_data"
+        end
+      end
+
+      def date_select_function_daily
+        if adapter =~ /mysql/i
+          "date_format(created_at, '%Y-%m-%d') as date_data"
+        else
+          "date(created_at) as date_data"
+        end
+      end
+
+    end
+
+    def self.monthly_report(klass, end_date)
+      begin_date = end_date.ago(1.year)
+      raise "begin_date should not be after end_date" if begin_date > end_date
+      raise AdminData::NoCreatedAtColumnException unless klass.columns.find {|r| r.name == 'created_at'}
+
+      begin_date = begin_date.beginning_of_day
+      end_date = end_date.end_of_day
+
+      dater = Dater.new(ActiveRecord::Base.connection.adapter_name, 'monthly')
+
+      query = klass.unscoped
+      query = query.where(["created_at >= ?", begin_date])
+      query = query.where(["created_at <= ?", end_date])
+      query = query.group(dater.group_by_key)
+      query = query.select(dater.date_select_function)
+      query = query.select(dater.count_function)
+      debug "sql: " + query.to_sql
+      result = query.all
+      debug "sql result: #{result.inspect}"
+
+      extract_data_from_result_set_monthly(result, dater, begin_date, end_date)
+    end
+
+    def self.extract_data_from_result_set_monthly(result, dater, begin_date, end_date)
+      debug "extracting from result set now"
+      result_hash = {}
+      result.each do |record|
+        result_hash.merge!(record[dater.date_select_key].to_i => record[dater.count_select_key])
+      end
+
+      debug "result_hash.inspect is #{result_hash.inspect}"
+      
+      current_month = begin_date.strftime('%m').to_i
+      months_order = (1..current_month).to_a.reverse + (current_month..12).to_a.reverse
+      months_order.uniq!.reverse!
+
+      debug "months order is #{months_order.inspect}"
+
+      final_hash = ActiveSupport::OrderedHash.new
+      months_order.each do |month|
+        month = month.to_i #sqlite3 has months as 03 instead of 3
+        m = Time.now.change(:month => month)
+        m = m.ago(1.year) if month > current_month
+
+        key = m.strftime('%b-%Y')
+        key = "'#{key}'"
+        if dater.adapter =~ /postgresql/i
+          value = result_hash[month]
+        elsif dater.adapter =~ /mysql/i
+          value = result_hash[month]
+        else
+          value = result_hash[month]
+        end
+        value = value.to_i
+        debug "month: #{month} key: #{key} value: #{value}"
+        final_hash.merge!(key => value)
+      end
+
+      final_hash.to_a.tap {|e| debug e.inspect }
+    end
+      
+    def self.daily_report(klass, end_date)
+      begin_date = end_date.ago(1.month)
+      raise "begin_date should not be after end_date" if begin_date > end_date
+      raise AdminData::NoCreatedAtColumnException unless klass.columns.find {|r| r.name == 'created_at'}
+
+      begin_date = begin_date.beginning_of_day
+      end_date = end_date.end_of_day
+
+      dater = Dater.new(ActiveRecord::Base.connection.adapter_name)
+
+      query = klass.unscoped
+      query = query.where(["created_at >= ?", begin_date])
+      query = query.where(["created_at <= ?", end_date])
+      query = query.group(dater.group_by_key)
+      query = query.select(dater.date_select_function)
+      query = query.select(dater.count_function)
+      debug "sql: " + query.to_sql
+      result = query.all
+      debug "sql result: #{result.inspect}"
+
+      extract_data_from_result_set_daily(result, dater, begin_date, end_date).tap {|e| debug "formatted output: "+e.inspect}
+    end
+
+    def self.extract_data_from_result_set_daily(result, dater, begin_date, end_date)
+      count = result.map {|r| r[dater.count_select_key] }
+      dates = result.map {|r| r[dater.date_select_key] }
+
+      debug "count is: #{count.inspect}"
+      debug "dates is: #{dates.inspect}"
+
+      final_output= []
+
+      while(begin_date) do
+        s = begin_date.strftime('%Y-%m-%d')
+        final_count = if index = dates.index(s)
+          count[index].to_i
+        else
+          0
+        end
+        final_output << ["'#{s}'", final_count]
+        begin_date = begin_date.tomorrow
+        break if begin_date > end_date
+      end
+      final_output
+    end
+
+    def self.debug(msg)
+      puts msg
+    end
+
+  end
+
+end

data/lib/admin_data/exceptions.rb

@@ -0,0 +1,5 @@
+module AdminData
+
+  class NoCreatedAtColumnException < Exception; end
+
+end