query_report 1.0.1 → 1.0.2

data/app/helpers/query_report_filter_helper.rb

@@ -11,12 +11,4 @@ module QueryReportFilterHelper
     concat(label_tag options[:placeholder])
     select_tag name, options_for_select([['', ''], ['true', 'true'], ['false', 'false']], value)
   end
-
-  def link_to_download_report_pdf
-    link_to t('views.links.pdf'), export_report_url_with_format('pdf'), :target => "_blank"
-  end
-
-  def link_to_download_report_csv
-    link_to t('views.links.csv'), export_report_url_with_format('csv'), :target => "_blank"
-  end
 end

data/app/helpers/query_report_link_helper.rb

@@ -0,0 +1,9 @@
+module QueryReportLinkHelper
+  def link_to_download_report_pdf
+    link_to t('views.links.pdf'), export_report_url_with_format('pdf'), :target => "_blank"
+  end
+
+  def link_to_download_report_csv
+    link_to t('views.links.csv'), export_report_url_with_format('csv'), :target => "_blank"
+  end
+end

data/app/views/query_report/_chart.html.erb

@@ -0,0 +1,10 @@
+<div class="row-fluid">
+  <% report.charts.each_with_index do |chart, i| %>
+      <% chart_id = "chart#{i}" %>
+      <div class="span6">
+        <div id="<%= chart_id %>" style="text-align: center;"></div>
+      </div>
+      <%= render_chart(chart.prepare_visualr, chart_id) %>
+  <% end %>
+  <div class="clearfix"></div>
+</div>

data/app/views/query_report/_charts.html.erb

@@ -1,10 +1,6 @@
-<div class="row-fluid">
-  <% report.charts.each_with_index do |chart, i| %>
-      <% chart_id = "chart#{i}" %>
-      <div class="span6">
-        <div id="<%= chart_id %>" style="text-align: center;"></div>
-      </div>
-      <%= render_chart(chart.prepare_visualr, chart_id) %>
-  <% end %>
-  <div class="clearfix"></div>
-</div>
+<% if report.has_chart? and report.enable_chart? and report.chart_on_web? %>
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+    <%= render :partial => "query_report/chart", locals: {report: report} %>
+<% else %>
+    <br/>
+<% end %>

data/app/views/query_report/_links.html.erb

@@ -0,0 +1,2 @@
+<%= link_to_download_report_pdf %>
+<%= link_to_download_report_csv %>

data/app/views/query_report/_records.html.erb

@@ -0,0 +1,21 @@
+<% if report.records.size > 0 %>
+    <table class="table table-bordered table-striped">
+      <thead>
+      <% report.columns.each do |column| %>
+          <th><%= sort_link(report.search, column.name) %></th>
+      <% end %>
+      </thead>
+
+      <tbody>
+      <% report.records.each do |record| %>
+          <tr>
+            <% report.columns.each do |column| %>
+                <td><%= record[column.humanize] %></td>
+            <% end %>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+<% else %>
+    <p>No record found</p>
+<% end %>

data/app/views/query_report/_search.html.erb

@@ -1,8 +1,10 @@
-<%= search_form_for report.search, :url => url_for, :html => {:method => :get, :class => 'form-inline'} do |f| %>
-    <% report.filters.each do |filter| %>
-        <% filter.comparators.each do |comparator| %>
-            <%= query_report_render_filter(filter, comparator) %>
+<% if report.has_filter? %>
+    <%= search_form_for report.search, :url => url_for, :html => {:method => :get, :class => 'form-inline'} do |f| %>
+        <% report.filters.each do |filter| %>
+            <% filter.comparators.each do |comparator| %>
+                <%= query_report_render_filter(filter, comparator) %>
+            <% end %>
         <% end %>
+        <%= f.submit 'Search', :class => 'btn btn-blue' %>
     <% end %>
-    <%= f.submit 'Search', :class => 'btn btn-blue' %>
 <% end %>

data/app/views/query_report/list.html.erb

@@ -1,14 +1,7 @@
 <%= render :partial => "query_report/search", locals: {report: @report} %>
 <br/>
-
-<%= link_to_download_report_pdf %>
-<%= link_to_download_report_csv %>
-
-<% if @report.has_chart? and @report.enable_chart? and @report.chart_on_web? %>
-    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-    <%= render :partial => "query_report/charts", locals: {report: @report} %>
-<% end %>
-
+<%= render :partial => "query_report/links", locals: {report: @report} %>
+<%= render :partial => "query_report/charts", locals: {report: @report} %>
 <br/>
 <%# if @report.scopes.size > 0 %>
 <%#= link_to_with_scope('all', @report.current_scope) %>
@@ -16,28 +9,6 @@
 <%#= link_to_with_scope(scope, @report.current_scope) %>
 <%# end %>
 <%# end %>
-<br/>
-
-<% if @report.records.size > 0 %>
-    <table class="table table-bordered table-striped">
-      <thead>
-      <% @report.columns.each do |column| %>
-          <th><%= sort_link(@report.search, column.name) %></th>
-      <% end %>
-      </thead>
-
-      <tbody>
-      <% @report.records.each do |record| %>
-          <tr>
-            <% @report.columns.each do |column| %>
-                <td><%= record[column.humanize] %></td>
-            <% end %>
-          </tr>
-      <% end %>
-      </tbody>
-    </table>
-<% else %>
-    <p>No record found</p>
-<% end %>
 
+<%= render :partial => "query_report/records", locals: {report: @report} %>
 <%= paginate @report.paginated_query if @report.paginate? %>

data/lib/query_report/filter.rb

@@ -19,38 +19,38 @@ module QueryReport
       @filters << Filter.new(@params, column, options, &block)
     end
 
+    def has_filter?
+      filters.present?
+    end
+
     def apply_filters(query, http_params)
       # apply default filter
       params = load_default_values_in_param(http_params) #need for ransack filter
-
       @search = query.search(params[:q])
       query = @search.result
 
-      @filters.each do |filter|
-        if filter.custom?
-          ordered_custom_param_values = filter.search_keys.collect do |key|
-            if filter.boolean?
-              params[:custom_search][key].present? ? params[:custom_search][key] == 'true' : nil
-            else
-              params[:custom_search][key]
-            end
-          end
-          #filter only if there is a given input
-          query = filter.block.call(query, *ordered_custom_param_values) unless ordered_custom_param_values.all? { |p| p.nil? or p == '' }
-        end
+      #apply custom filter
+      @filters.select(&:custom?).each do |filter|
+        ordered_custom_param_values = ordered_param_value_objects(filter)
+        has_no_user_input = ordered_custom_param_values.all? { |p| p.nil? or p == '' }
+        query = filter.block.call(query, *ordered_custom_param_values) unless has_no_user_input
       end
       query
     end
 
+    def ordered_param_value_objects(filter)
+      filter.comparators.collect do |comp|
+        comp.objectified_param_value
+      end
+    end
+
     def load_default_values_in_param(http_params)
       params = http_params.clone
       params = params.merge(q: {}) unless params[:q]
       params = params.merge(custom_search: {}) unless params[:custom_search]
       @filters.each do |filter|
-        if filter.has_default?
-          filter.comparators.each do |comparator|
-            params[filter.params_key][comparator.search_key] ||= comparator.default.to_s
-          end
+        filter.comparators.each do |comparator|
+          params[filter.params_key][comparator.search_key] ||= comparator.param_value
         end
       end
       params
@@ -60,7 +60,7 @@ module QueryReport
       attr_reader :filter, :type, :name, :default
 
       def initialize(filter, type, name, default=nil)
-        @filter, @type, @name, @default = filter, type, name, default.to_s
+        @filter, @type, @name, @default = filter, type, name, default
       end
 
       def search_key
@@ -72,12 +72,33 @@ module QueryReport
       end
 
       def param_value
-        @filter.params[@filter.params_key] ? @filter.params[@filter.params_key][search_key] : default
+        @filter.params[@filter.params_key] ? @filter.params[@filter.params_key][search_key] : stringified_default
       end
 
       def has_default?
         !@default.nil?
       end
+
+      def stringified_default
+        @stringified_default ||= case @filter.type
+                                   when :date
+                                     @default.kind_of?(String) ? @default : @default.to_s(:db)
+                                   else
+                                     @default.to_s
+                                 end
+      end
+
+      #convert param value which is a string to object like date and boolean
+      def objectified_param_value
+        @stringified_default ||= case @filter.type
+                                   when :date
+                                     @default.to_date
+                                   when :boolean
+                                     @default.to_boolean
+                                   else
+                                     @default
+                                 end
+      end
     end
 
     class Filter
@@ -88,10 +109,7 @@ module QueryReport
       # +params+:: The params from the http request
       def initialize(params, column, options, &block)
         @params, @column, @options, @comparators, @block = params, column, options, [], block
-        @type = options if options.kind_of? String
-        if options.kind_of? Hash
-          @type = options[:type]
-        end
+        @type = options.kind_of?(String) ? options : options[:type]
         generate_comparators
       end
 
@@ -133,10 +151,10 @@ module QueryReport
                             end
 
         if @options[:comp]
-          @options[:comp].each_with_index do |(search_key, filter_name), i|
+          @options[:comp].each_with_index do |(ransack_search_key, filter_name), i|
             default = nil
-            default = @options[:default].kind_of?(Array) ? @options[:default][i] : @options[:default] if @options[:default]
-            @comparators << Comparator.new(self, search_key, filter_name, default)
+            default = @options[:default].kind_of?(Array) ? @options[:default][i] : @options[:default] unless @options[:default].nil?
+            @comparators << Comparator.new(self, ransack_search_key, filter_name, default)
           end
         end
       end

data/lib/query_report/helper.rb

@@ -13,26 +13,26 @@ module QueryReport
       @report ||= QueryReport::Report.new(params, view_context, options)
       @report.query = query
       @report.instance_eval &block
-      render_report
+      render_report(options)
     end
 
-    def render_report
+    def render_report(options)
       respond_to do |format|
         format.js { render 'query_report/list' }
         format.html { render 'query_report/list' }
         format.json { render json: @report.all_records }
         format.csv { send_data generate_csv_for_report(@report.all_records), :disposition => "attachment;" }
-        format.pdf { send_data query_report_pdf_template_class.new(@report).to_pdf.render }
+        format.pdf { send_data query_report_pdf_template_class(options).new(@report).to_pdf.render }
       end
     end
 
-    def query_report_pdf_template_class
-      options = QueryReport.config.pdf_options
+    def query_report_pdf_template_class(options)
+      options = QueryReport.config.pdf_options.merge(options)
       if options[:template_class]
         @template_class ||= options[:template_class].to_s.constantize
         return @template_class
       end
-      return QueryReport::ReportPdf
+      QueryReport::ReportPdf
     end
 
     def generate_csv_for_report(records)

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/dummy/app/controllers/invoices_controller.rb

@@ -9,8 +9,8 @@ class InvoicesController < ApplicationController
 
     reporter(@invoices) do
       filter :title, type: :text
-      filter :created_at, type: :date, default: [5.months.ago.to_date.to_s(:db), 1.months.from_now.to_date.to_s(:db)]
-      filter :paid, type: :boolean
+      filter :created_at, type: :date, default: [5.months.ago.to_date, 1.months.from_now.to_date]
+      filter :paid, type: :boolean, default: false
 
       column :title do |invoice|
         link_to invoice.title, invoice
@@ -18,25 +18,30 @@ class InvoicesController < ApplicationController
       column :total_paid
       column :total_charged
       column :paid
-
-      column_chart('Unpaid VS Paid') do
-        add 'Unpaid' do |query|
-          (query.sum('total_charged').to_f - query.sum('total_paid').to_f).to_f
-        end
-        add 'Paid' do |query|
-          query.sum('total_paid').to_f
-        end
+      column :received_by_id do |invoice|
+        invoice.received_by.name
       end
 
-      pie_chart('Unpaid VS Paid') do
-        add 'Unpaid' do |query|
-          (query.sum('total_charged').to_f - query.sum('total_paid').to_f).to_f
-        end
-        add 'Paid' do |query|
-          query.sum('total_paid').to_f
-        end
-      end
+      #column_chart('Unpaid VS Paid') do
+      #  add 'Unpaid' do |query|
+      #    (query.sum('total_charged').to_f - query.sum('total_paid').to_f).to_f
+      #  end
+      #  add 'Paid' do |query|
+      #    query.sum('total_paid').to_f
+      #  end
+      #end
+      #
+      #pie_chart('Unpaid VS Paid') do
+      #  add 'Unpaid' do |query|
+      #    (query.sum('total_charged').to_f - query.sum('total_paid').to_f).to_f
+      #  end
+      #  add 'Paid' do |query|
+      #    query.sum('total_paid').to_f
+      #  end
+      #end
     end
+    #ap @report.filters.last.comparators.first.default
+    #ap @report.filters.last.comparators.first.param_value
   end
 
   # GET /invoices/1

data/test/dummy/app/models/invoice.rb

@@ -1,3 +1,4 @@
 class Invoice < ActiveRecord::Base
-  attr_accessible :paid, :title, :total_charged, :total_paid
+  belongs_to :received_by, :class_name => "User"
+  attr_accessible :invoiced_on, :paid, :paid_on, :received_by_id, :title, :total_charged, :total_paid
 end

data/test/dummy/app/models/user.rb

@@ -1,3 +1,8 @@
 class User < ActiveRecord::Base
-  attr_accessible :dob, :email, :name, :single
+  has_many :invoices, :foreign_key => "received_by_id"
+  attr_accessible :email, :first_name, :last_name
+
+  def name
+    "#{first_name} #{last_name}"
+  end
 end

data/test/dummy/db/migrate/20130622120853_create_users.rb

@@ -1,10 +1,9 @@
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.string :name
+      t.string :first_name
+      t.string :last_name
       t.string :email
-      t.boolean :single
-      t.date :dob
 
       t.timestamps
     end

data/test/dummy/db/migrate/20130630132513_create_invoices.rb

@@ -5,6 +5,9 @@ class CreateInvoices < ActiveRecord::Migration
       t.float :total_paid
       t.float :total_charged
       t.boolean :paid
+      t.integer :received_by_id
+      t.date :invoiced_on
+      t.date :paid_on
 
       t.timestamps
     end

data/test/dummy/db/schema.rb

@@ -18,15 +18,17 @@ ActiveRecord::Schema.define(:version => 20130630132513) do
     t.float    "total_paid"
     t.float    "total_charged"
     t.boolean  "paid"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.integer  "received_by_id"
+    t.date     "invoiced_on"
+    t.date     "paid_on"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   end
 
   create_table "users", :force => true do |t|
-    t.string   "name"
+    t.string   "first_name"
+    t.string   "last_name"
     t.string   "email"
-    t.boolean  "single"
-    t.date     "dob"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end

data/test/dummy/db/seed.rb

@@ -1,4 +1,15 @@
-r = Random.new
-1.upto(100) do |i|
-  Invoice.create(title: "Invoice ##{i}", total_paid: r.rand(100) + 200, total_charged: r.rand(500) + 200)
+User.scoped.destroy_all
+Invoice.scoped.destroy_all
+
+users = []
+users << User.create(first_name: 'A.K.M.', last_name: 'Ashrafuzzaman', email: 'ashraf@gmail.com')
+users << User.create(first_name: 'A.K.M.', last_name: 'Zahiduzzaman', email: 'zahid@gmail.com')
+users << User.create(first_name: 'Sharmin', last_name: 'Sultana', email: 'sharmin@gmail.com')
+
+1.upto(200) do |i|
+  total_paid = 100 + Random.rand(100)
+  total_charged = 100 + Random.rand(100)
+  invoiced_on = Random.rand(30).days.ago
+  Invoice.create!(title: "Invoice ##{i}", total_paid: total_paid, total_charged: total_charged, invoiced_on: invoiced_on,
+                  paid: total_paid >= total_charged, received_by_id: users[Random.rand(3)].id)
 end