query_report 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0461f6e9e28d8ae3b6f2f6dd661c3a3e6f387d
-  data.tar.gz: 6567d8bd870bdb828092433c696235c3ea224f09
+  metadata.gz: 43187b542e2b2f2fe34fd7e25b489b50227fee5f
+  data.tar.gz: 8fdff9153ed76142aa42d7af7f8d5e4b892fbb75
 SHA512:
-  metadata.gz: 45f9063e2482cda3faf2f05dab9aa8f3bfb62688a9d81bbb6d861a30bcd786a23352e9c6f9f42b5bfecd085423dd3c26ac2da39116bc299acb8f0c1219d72c43
-  data.tar.gz: 20d34bbfc7f21995235dadf79b59a1dd2898c6f60a2a0989b7e45a521f04383b7a76372fa48875225270ce50a6167b97cf663bc46f754095d176459643dfabf5
+  metadata.gz: 27ec5569dbd669ce8accbe73eab9b9f5cd96419817f7b77b30d64b9222da118134d44950db950a913e65159aa6116f80ba06ce00882e379a4c470378adacf534
+  data.tar.gz: e089420de5bc97df677c94af2ce4e1da51d3ab4d8bc28582c15f468cbe823b674dec1b166be350630e4dbec8e77f3b7b2c6ce001152bedcc81f85a5afd5101cb

data/app/helpers/query_report_engine_filter_helper.rb

@@ -1,17 +1,17 @@
 module QueryReportEngineFilterHelper
-  def query_report_text_filter(name, value, options={})
+  def query_report_default_text_filter(name, value, options={})
     text_field_tag name, value, options
   end
 
-  def query_report_date_filter(name, value, options={})
+  def query_report_default_date_filter(name, value, options={})
     text_field_tag name, value, options.merge(class: :date)
   end
 
-  def query_report_datetime_filter(name, value, options={})
+  def query_report_default_datetime_filter(name, value, options={})
     text_field_tag name, value, options.merge(class: :datetime)
   end
 
-  def query_report_boolean_filter(name, value, options={})
+  def query_report_default_boolean_filter(name, value, options={})
     concat(label_tag options[:placeholder])
     select_tag name, options_for_select([['', ''], ['true', 'true'], ['false', 'false']], value)
   end

data/app/helpers/query_report_engine_helper.rb

@@ -7,12 +7,18 @@ module QueryReportEngineHelper
     value = comparator.param_value
 
     method_name = :"query_report_#{filter.type.to_s}_filter"
-    if main_app.respond_to? method_name
-      main_app.send method_name, search_tag_name, value, :placeholder => hint
-    elsif self.respond_to? method_name
-      self.send method_name, search_tag_name, value, :placeholder => hint
+    default_method_name = :"query_report_default_#{filter.type.to_s}_filter"
+    if respond_to? method_name
+      send method_name, search_tag_name, value, :placeholder => hint
+    elsif respond_to? default_method_name
+      send default_method_name, search_tag_name, value, :placeholder => hint
     else
-      raise QueryReport::FilterNotDefined, "#{filter.type.to_s} filter is not defined"
+      raise QueryReport::FilterNotDefined, %Q{#{filter.type.to_s} filter is not defined.
+        Please define a method as following,
+        def #{method_name}(name, value, options={})
+          text_field_tag name, value, options
+        end
+      }
     end
   end
 

data/app/helpers/query_report_engine_link_helper.rb

@@ -1,13 +1,25 @@
 module QueryReportEngineLinkHelper
-  def link_to_download_report_pdf
-    link_to t('views.links.pdf'), export_report_url_with_format('pdf'), :target => "_blank"
+  def link_to_default_download_report_pdf
+    if respond_to? :link_to_download_report_pdf
+      link_to_download_report_pdf
+    else
+      link_to t('views.links.pdf'), export_report_url_with_format('pdf'), :target => "_blank"
+    end
   end
 
-  def link_to_download_report_csv
-    link_to t('views.links.csv'), export_report_url_with_format('csv'), :target => "_blank"
+  def link_to_default_download_report_csv
+    if respond_to? :link_to_download_report_csv
+      link_to_download_report_csv
+    else
+      link_to t('views.links.csv'), export_report_url_with_format('csv'), :target => "_blank"
+    end
   end
 
-  def link_to_email_query_report(target_dom_id)
-    link_to t('views.labels.email'), 'javascript:void(0)', :onclick => "QueryReportEmail.openEmailModal('#{target_dom_id}');" if QueryReport.config.allow_email_report
+  def link_to_default_email_query_report(target_dom_id)
+    if respond_to? :link_to_email_query_report
+      link_to_email_query_report(target_dom_id)
+    else
+      link_to t('views.labels.email'), 'javascript:void(0)', :onclick => "QueryReportEmail.openEmailModal('#{target_dom_id}');" if QueryReport.config.allow_email_report
+    end
   end
 end

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

@@ -1,3 +1,3 @@
-<%= link_to_download_report_pdf %>
-<%= link_to_download_report_csv %>
-<%= link_to_email_query_report(@target_dom_id) %>
+<%= link_to_default_download_report_pdf %>
+<%= link_to_default_download_report_csv %>
+<%= link_to_default_email_query_report(@target_dom_id) %>

data/lib/query_report/chart_adapter.rb

@@ -21,15 +21,14 @@ module QueryReport
         @chart_type = chart_type
         @chart = "Chartify::#{chart_type.to_s.camelize}Chart".constantize.new
         @chart.title = chart_title
-        # do |chart|
-        #   chart.data = [{hours_remain: 100, estimated_hours_remain: 100, day: 3.days.ago.to_date},
-        #                 {hours_remain: 50, estimated_hours_remain: 45, day: 2.days.ago.to_date},
-        #                 {hours_remain: 5, estimated_hours_remain: 10, day: 1.days.ago.to_date}]
-        #   chart.columns = {hours_remain: 'Hours remaining', estimated_hours_remain: 'Estimated hours remaining'}
-        #   chart.label_column = :day
-        # end
       end
 
+      def sum_with(options)
+        @chart.data = []
+        options.each do |column_title, column|
+          @chart.data << [column_title, query.sum(column)]
+        end
+      end
     end
   end
 end

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - A.K.M. Ashrafuzzaman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -104,30 +104,30 @@ dependencies:
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: chartify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement