query_report 1.0.16 → 1.0.17

data/lib/query_report/column.rb

@@ -90,7 +90,7 @@ module QueryReport
       end
 
       def total
-        @total ||= has_total? ? report.records.inject(0) { |sum, r| sum + report.content_from_element(r[humanize]).to_f } : nil
+        @total ||= has_total? ? report.records_with_rowspan.inject(0) { |sum, r| sum + report.content_from_element(r[humanize]).to_f } : nil
       end
     end
   end

data/lib/query_report/report_pdf.rb

@@ -71,12 +71,14 @@ module QueryReport
         item_values
       end
 
+      ap report.column_total_with_colspan
       if report.has_total?
         items = items << report.column_total_with_colspan.collect do |total|
-          total[:content] = fix_content(total[:content]) if total.kind_of?(Hash)
+          total[:content] = fix_content(total[:content])
           total
         end
       end
+      ap items
       items
     end
 

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "1.0.16"
+  VERSION = "1.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
   prerelease: 
 platform: ruby
 authors: