caxlsx 4.0.0 → 4.4.1

data/lib/axlsx/workbook/worksheet/comment.rb

@@ -11,8 +11,8 @@ module Axlsx
     # @param [Hash] options
     # @option [String] author the author of the comment
     # @option [String] text The text for the comment
-    # @option [String] ref The refence (e.g. 'A3' where this comment will be anchored.
-    # @option [Boolean] visible This controls the visiblity of the associated vml_shape.
+    # @option [String] ref The reference (e.g. 'A3' where this comment will be anchored.
+    # @option [Boolean] visible This controls the visibility of the associated vml_shape.
     def initialize(comments, options = {})
       raise ArgumentError, "A comment needs a parent comments object" unless comments.is_a?(Comments)
 

data/lib/axlsx/workbook/worksheet/comments.rb

@@ -37,7 +37,7 @@ module Axlsx
     # @note the author, text and ref options are required
     # @option options [String] author The name of the author for this comment
     # @option options [String] text The text for this comment
-    # @option options [Stirng|Cell] ref The cell that this comment is attached to.
+    # @option options [String|Cell] ref The cell that this comment is attached to.
     def add_comment(options = {})
       raise ArgumentError, "Comment require an author" unless options[:author]
       raise ArgumentError, "Comment requires text" unless options[:text]

data/lib/axlsx/workbook/worksheet/conditional_formatting.rb

@@ -61,9 +61,15 @@ module Axlsx
     end
 
     # @see rules
-    def rules=(v); @rules = v end
+    def rules=(v)
+      @rules = v
+    end
+
     # @see sqref
-    def sqref=(v); Axlsx.validate_string(v); @sqref = v end
+    def sqref=(v)
+      Axlsx.validate_string(v)
+      @sqref = v
+    end
 
     # Serializes the conditional formatting element
     # @example Conditional Formatting XML looks like:
@@ -77,7 +83,7 @@ module Axlsx
     def to_xml_string(str = +'')
       str << '<conditionalFormatting sqref="' << sqref << '">'
       rules.each_with_index do |rule, index|
-        str << ' ' unless index.zero?
+        str << ' ' unless index == 0
         rule.to_xml_string(str)
       end
       str << '</conditionalFormatting>'

data/lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb

@@ -24,7 +24,7 @@ module Axlsx
     # @option options [Integer] rank If a top/bottom N rule, the value of N
     # @option options [Integer] stdDev The number of standard deviations above or below the average to match
     # @option options [Boolean] stopIfTrue Stop evaluating rules after this rule matches
-    # @option options [Symbol]  timePeriod The time period in a date occuring... rule
+    # @option options [Symbol]  timePeriod The time period in a date occurring... rule
     # @option options [String] formula The formula to match against in i.e. an equal rule. Use a [minimum, maximum] array for cellIs between/notBetween conditionals.
     def initialize(options = {})
       @color_scale = @data_bar = @icon_set = @formula = nil
@@ -155,33 +155,88 @@ module Axlsx
     end
 
     # @see type
-    def type=(v); Axlsx.validate_conditional_formatting_type(v); @type = v end
+    def type=(v)
+      Axlsx.validate_conditional_formatting_type(v)
+      @type = v
+    end
+
     # @see aboveAverage
-    def aboveAverage=(v); Axlsx.validate_boolean(v); @aboveAverage = v end
+    def aboveAverage=(v)
+      Axlsx.validate_boolean(v)
+      @aboveAverage = v
+    end
+
     # @see bottom
-    def bottom=(v); Axlsx.validate_boolean(v); @bottom = v end
+    def bottom=(v)
+      Axlsx.validate_boolean(v)
+      @bottom = v
+    end
+
     # @see dxfId
-    def dxfId=(v); Axlsx.validate_unsigned_numeric(v); @dxfId = v end
+    def dxfId=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @dxfId = v
+    end
+
     # @see equalAverage
-    def equalAverage=(v); Axlsx.validate_boolean(v); @equalAverage = v end
+    def equalAverage=(v)
+      Axlsx.validate_boolean(v)
+      @equalAverage = v
+    end
+
     # @see priority
-    def priority=(v); Axlsx.validate_unsigned_numeric(v); @priority = v end
+    def priority=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @priority = v
+    end
+
     # @see operator
-    def operator=(v); Axlsx.validate_conditional_formatting_operator(v); @operator = v end
+    def operator=(v)
+      Axlsx.validate_conditional_formatting_operator(v)
+      @operator = v
+    end
+
     # @see text
-    def text=(v); Axlsx.validate_string(v); @text = v end
+    def text=(v)
+      Axlsx.validate_string(v)
+      @text = v
+    end
+
     # @see percent
-    def percent=(v); Axlsx.validate_boolean(v); @percent = v end
+    def percent=(v)
+      Axlsx.validate_boolean(v)
+      @percent = v
+    end
+
     # @see rank
-    def rank=(v); Axlsx.validate_unsigned_numeric(v); @rank = v end
+    def rank=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @rank = v
+    end
+
     # @see stdDev
-    def stdDev=(v); Axlsx.validate_unsigned_numeric(v); @stdDev = v end
+    def stdDev=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @stdDev = v
+    end
+
     # @see stopIfTrue
-    def stopIfTrue=(v); Axlsx.validate_boolean(v); @stopIfTrue = v end
+    def stopIfTrue=(v)
+      Axlsx.validate_boolean(v)
+      @stopIfTrue = v
+    end
+
     # @see timePeriod
-    def timePeriod=(v); Axlsx.validate_time_period_type(v); @timePeriod = v end
+    def timePeriod=(v)
+      Axlsx.validate_time_period_type(v)
+      @timePeriod = v
+    end
+
     # @see formula
-    def formula=(v); [*v].each { |x| Axlsx.validate_string(x) }; @formula = [*v].map { |form| ::CGI.escapeHTML(form) } end
+    def formula=(v)
+      [*v].each { |x| Axlsx.validate_string(x) }
+      @formula = [*v].map { |form| ::CGI.escapeHTML(form) }
+    end
 
     # @see color_scale
     def color_scale=(v)

data/lib/axlsx/workbook/worksheet/conditional_formattings.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Axlsx
-  # A simple, self serializing class for storing conditional formattings
+  # A simple, self serializing class for storing conditional formatting
   class ConditionalFormattings < SimpleTypedList
     # creates a new Tables object
     def initialize(worksheet)
       raise ArgumentError, "you must provide a worksheet" unless worksheet.is_a?(Worksheet)
 
-      super ConditionalFormatting
+      super(ConditionalFormatting)
       @worksheet = worksheet
     end
 
@@ -15,7 +15,7 @@ module Axlsx
     # @return [Worksheet]
     attr_reader :worksheet
 
-    # serialize the conditional formattings
+    # serialize the conditional formatting
     def to_xml_string(str = +'')
       return if empty?
 

data/lib/axlsx/workbook/worksheet/data_validation.rb

@@ -178,31 +178,58 @@ module Axlsx
     attr_reader :type
 
     # @see formula1
-    def formula1=(v); Axlsx.validate_string(v); @formula1 = v end
+    def formula1=(v)
+      Axlsx.validate_string(v)
+      @formula1 = v
+    end
 
     # @see formula2
-    def formula2=(v); Axlsx.validate_string(v); @formula2 = v end
+    def formula2=(v)
+      Axlsx.validate_string(v)
+      @formula2 = v
+    end
 
     # @see allowBlank
-    def allowBlank=(v); Axlsx.validate_boolean(v); @allowBlank = v end
+    def allowBlank=(v)
+      Axlsx.validate_boolean(v)
+      @allowBlank = v
+    end
 
     # @see error
-    def error=(v); Axlsx.validate_string(v); @error = v end
+    def error=(v)
+      Axlsx.validate_string(v)
+      @error = v
+    end
 
     # @see errorStyle
-    def errorStyle=(v); Axlsx.validate_data_validation_error_style(v); @errorStyle = v end
+    def errorStyle=(v)
+      Axlsx.validate_data_validation_error_style(v)
+      @errorStyle = v
+    end
 
     # @see errorTitle
-    def errorTitle=(v); Axlsx.validate_string(v); @errorTitle = v end
+    def errorTitle=(v)
+      Axlsx.validate_string(v)
+      @errorTitle = v
+    end
 
     # @see operator
-    def operator=(v); Axlsx.validate_data_validation_operator(v); @operator = v end
+    def operator=(v)
+      Axlsx.validate_data_validation_operator(v)
+      @operator = v
+    end
 
     # @see prompt
-    def prompt=(v); Axlsx.validate_string(v); @prompt = v end
+    def prompt=(v)
+      Axlsx.validate_string(v)
+      @prompt = v
+    end
 
     # @see promptTitle
-    def promptTitle=(v); Axlsx.validate_string(v); @promptTitle = v end
+    def promptTitle=(v)
+      Axlsx.validate_string(v)
+      @promptTitle = v
+    end
 
     # @see showDropDown
     def showDropDown=(v)
@@ -219,16 +246,28 @@ module Axlsx
     end
 
     # @see showErrorMessage
-    def showErrorMessage=(v); Axlsx.validate_boolean(v); @showErrorMessage = v end
+    def showErrorMessage=(v)
+      Axlsx.validate_boolean(v)
+      @showErrorMessage = v
+    end
 
     # @see showInputMessage
-    def showInputMessage=(v); Axlsx.validate_boolean(v); @showInputMessage = v end
+    def showInputMessage=(v)
+      Axlsx.validate_boolean(v)
+      @showInputMessage = v
+    end
 
     # @see sqref
-    def sqref=(v); Axlsx.validate_string(v); @sqref = v end
+    def sqref=(v)
+      Axlsx.validate_string(v)
+      @sqref = v
+    end
 
     # @see type
-    def type=(v); Axlsx.validate_data_validation_type(v); @type = v end
+    def type=(v)
+      Axlsx.validate_data_validation_type(v)
+      @type = v
+    end
 
     # Serializes the data validation
     # @param [String] str
@@ -239,7 +278,7 @@ module Axlsx
 
       str << '<dataValidation '
       h.each_with_index do |key_value, index|
-        str << ' ' unless index.zero?
+        str << ' ' unless index == 0
         str << key_value.first << '="' << Axlsx.booleanize(key_value.last).to_s << '"'
       end
       str << '>'

data/lib/axlsx/workbook/worksheet/data_validations.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Axlsx
-  # A simple, self serializing class for storing conditional formattings
+  # A simple, self serializing class for storing conditional formatting
   class DataValidations < SimpleTypedList
     # creates a new Tables object
     def initialize(worksheet)
       raise ArgumentError, "you must provide a worksheet" unless worksheet.is_a?(Worksheet)
 
-      super DataValidation
+      super(DataValidation)
       @worksheet = worksheet
     end
 
@@ -15,7 +15,7 @@ module Axlsx
     # @return [Worksheet]
     attr_reader :worksheet
 
-    # serialize the conditional formattings
+    # serialize the conditional formatting
     def to_xml_string(str = +'')
       return if empty?
 

data/lib/axlsx/workbook/worksheet/date_time_converter.rb

@@ -3,9 +3,9 @@
 require "date"
 
 module Axlsx
-  # The DateTimeConverter class converts both data and time types to their apprpriate Excel serializations
+  # The DateTimeConverter class converts both data and time types to their appropriate Excel serializations
   class DateTimeConverter
-    # The date_to_serial method converts Date objects to the equivelant Excel serialized forms
+    # The date_to_serial method converts Date objects to the equivalent Excel serialized forms
     # @param [Date] date the date to be serialized
     # @return [Numeric]
     def self.date_to_serial(date)

data/lib/axlsx/workbook/worksheet/dimension.rb

@@ -28,7 +28,7 @@ module Axlsx
 
     attr_reader :worksheet
 
-    # the full refernece for this dimension
+    # the full reference for this dimension
     # @return [String]
     def sqref
       "#{first_cell_reference}:#{last_cell_reference}"

data/lib/axlsx/workbook/worksheet/header_footer.rb

@@ -7,7 +7,7 @@ module Axlsx
   # of plain text and control characters. A fairly comprehensive list of control
   # characters can be found here:
   # https://github.com/randym/axlsx/blob/master/notes_on_header_footer.md
-  #     
+  #
   # @note The recommended way of managing header/footers is via Worksheet#header_footer
   # @see Worksheet#initialize
   class HeaderFooter

data/lib/axlsx/workbook/worksheet/icon_set.rb

@@ -56,7 +56,10 @@ module Axlsx
     attr_reader :interpolationPoints
 
     # @see iconSet
-    def iconSet=(v); Axlsx.validate_icon_set(v); @iconSet = v end
+    def iconSet=(v)
+      Axlsx.validate_icon_set(v)
+      @iconSet = v
+    end
 
     # @see interpolationPoints
     def interpolationPoints=(v)
@@ -66,13 +69,22 @@ module Axlsx
     end
 
     # @see showValue
-    def showValue=(v); Axlsx.validate_boolean(v); @showValue = v end
+    def showValue=(v)
+      Axlsx.validate_boolean(v)
+      @showValue = v
+    end
 
     # @see percent
-    def percent=(v); Axlsx.validate_boolean(v); @percent = v end
+    def percent=(v)
+      Axlsx.validate_boolean(v)
+      @percent = v
+    end
 
     # @see reverse
-    def reverse=(v); Axlsx.validate_boolean(v); @reverse = v end
+    def reverse=(v)
+      Axlsx.validate_boolean(v)
+      @reverse = v
+    end
 
     # Serialize this object to an xml string
     # @param [String] str
@@ -87,7 +99,7 @@ module Axlsx
 
     private
 
-    # Initalize the simple typed list of value objects
+    # Initialize the simple typed list of value objects
     def initialize_value_objects
       @value_objects = SimpleTypedList.new Cfvo
       @interpolationPoints.each { |point| @value_objects << Cfvo.new(type: :percent, val: point) }

data/lib/axlsx/workbook/worksheet/merged_cells.rb

@@ -8,7 +8,7 @@ module Axlsx
     def initialize(worksheet)
       raise ArgumentError, 'you must provide a worksheet' unless worksheet.is_a?(Worksheet)
 
-      super String
+      super(String)
     end
 
     # adds cells to the merged cells collection

data/lib/axlsx/workbook/worksheet/outline_pr.rb

@@ -13,7 +13,7 @@ module Axlsx
                             :apply_styles
 
     # These attributes are all boolean so I'm doing a bit of a hand
-    # waving magic show to set up the attriubte accessors
+    # waving magic show to set up the attribute accessors
     boolean_attr_accessor :summary_below,
                           :summary_right,
                           :apply_styles

data/lib/axlsx/workbook/worksheet/page_margins.rb

@@ -73,22 +73,45 @@ module Axlsx
       margins.select do |k, v|
         next unless MARGIN_KEYS.include? k
 
-        send("#{k}=", v)
+        send(:"#{k}=", v)
       end
     end
 
     # @see left
-    def left=(v); Axlsx.validate_unsigned_numeric(v); @left = v end
+    def left=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @left = v
+    end
+
     # @see right
-    def right=(v); Axlsx.validate_unsigned_numeric(v); @right = v end
+    def right=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @right = v
+    end
+
     # @see top
-    def top=(v); Axlsx.validate_unsigned_numeric(v); @top = v end
+    def top=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @top = v
+    end
+
     # @see bottom
-    def bottom=(v); Axlsx.validate_unsigned_numeric(v); @bottom = v end
+    def bottom=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @bottom = v
+    end
+
     # @see header
-    def header=(v); Axlsx.validate_unsigned_numeric(v); @header = v end
+    def header=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @header = v
+    end
+
     # @see footer
-    def footer=(v); Axlsx.validate_unsigned_numeric(v); @footer = v end
+    def footer=(v)
+      Axlsx.validate_unsigned_numeric(v)
+      @footer = v
+    end
 
     # Serializes the page margins element
     # @param [String] str

data/lib/axlsx/workbook/worksheet/page_set_up_pr.rb

@@ -17,8 +17,7 @@ module Axlsx
 
     serializable_attributes :auto_page_breaks, :fit_to_page
 
-    attr_reader :auto_page_breaks
-    attr_reader :fit_to_page
+    attr_reader :auto_page_breaks, :fit_to_page
 
     # Flag indicating whether the Fit to Page print option is enabled.
     # @param [Boolean] value

data/lib/axlsx/workbook/worksheet/page_setup.rb

@@ -38,13 +38,13 @@ module Axlsx
     # * verticalDpi
 
     # Number of vertical pages to fit on.
-    # @note PageSetup#fit_to is the recomended way to manage page fitting as only specifying one of fit_to_width/fit_to_height will result in the counterpart
+    # @note PageSetup#fit_to is the recommended way to manage page fitting as only specifying one of fit_to_width/fit_to_height will result in the counterpart
     # being set to 1.
     # @return [Integer]
     attr_reader :fit_to_height
 
     # Number of horizontal pages to fit on.
-    # @note PageSetup#fit_to is the recomended way to manage page fitting as only specifying one of width/height will result in the counterpart
+    # @note PageSetup#fit_to is the recommended way to manage page fitting as only specifying one of width/height will result in the counterpart
     # being set to 1.
     # @return [Integer]
     attr_reader :fit_to_width
@@ -198,17 +198,40 @@ module Axlsx
     end
 
     # @see fit_to_height
-    def fit_to_height=(v); Axlsx.validate_unsigned_int(v); @fit_to_height = v; end
+    def fit_to_height=(v)
+      Axlsx.validate_unsigned_int(v)
+      @fit_to_height = v
+    end
+
     # @see fit_to_width
-    def fit_to_width=(v); Axlsx.validate_unsigned_int(v); @fit_to_width = v; end
+    def fit_to_width=(v)
+      Axlsx.validate_unsigned_int(v)
+      @fit_to_width = v
+    end
+
     # @see orientation
-    def orientation=(v); Axlsx.validate_page_orientation(v); @orientation = v; end
+    def orientation=(v)
+      Axlsx.validate_page_orientation(v)
+      @orientation = v
+    end
+
     # @see paper_height
-    def paper_height=(v); Axlsx.validate_number_with_unit(v); @paper_height = v; end
+    def paper_height=(v)
+      Axlsx.validate_number_with_unit(v)
+      @paper_height = v
+    end
+
     # @see paper_width
-    def paper_width=(v); Axlsx.validate_number_with_unit(v); @paper_width = v; end
+    def paper_width=(v)
+      Axlsx.validate_number_with_unit(v)
+      @paper_width = v
+    end
+
     # @see scale
-    def scale=(v); Axlsx.validate_scale_10_400(v); @scale = v; end
+    def scale=(v)
+      Axlsx.validate_scale_10_400(v)
+      @scale = v
+    end
 
     # convenience method to achieve sanity when setting fit_to_width and fit_to_height
     # as they both default to 1 if only their counterpart is specified.
@@ -226,7 +249,7 @@ module Axlsx
     # @return [Boolean]
     def fit_to_page?
       # is there some better way to express this?
-      (!fit_to_width.nil? || !fit_to_height.nil?)
+      !fit_to_width.nil? || !fit_to_height.nil?
     end
 
     # Serializes the page settings element.

data/lib/axlsx/workbook/worksheet/pane.rb

@@ -8,6 +8,7 @@ module Axlsx
   class Pane
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
+
     # Creates a new {Pane} object
     # @option options [Symbol] active_pane Active Pane
     # @option options [Symbol] state Split State
@@ -114,10 +115,16 @@ module Axlsx
     end
 
     # @see x_split
-    def x_split=(v); Axlsx.validate_unsigned_int(v); @x_split = v end
+    def x_split=(v)
+      Axlsx.validate_unsigned_int(v)
+      @x_split = v
+    end
 
     # @see y_split
-    def y_split=(v); Axlsx.validate_unsigned_int(v); @y_split = v end
+    def y_split=(v)
+      Axlsx.validate_unsigned_int(v)
+      @y_split = v
+    end
 
     # Serializes the data validation
     # @param [String] str

data/lib/axlsx/workbook/worksheet/pivot_table.rb

@@ -26,6 +26,7 @@ module Axlsx
       @pages = []
       @subtotal = nil
       @no_subtotals_on_headers = []
+      @grand_totals = :both
       @sort_on_headers = {}
       @style_info = {}
       parse_options options
@@ -51,6 +52,19 @@ module Axlsx
       @sort_on_headers = headers
     end
 
+    # Defines which Grand Totals are to be shown.
+    # @return [Symbol] The row and/or column Grand Totals that are to be shown.
+    # Defaults to `:both` to show both row & column grand totals.
+    # Set to `:row_only`, `:col_only`, or `:none` to hide one or both Grand Totals.
+    attr_reader :grand_totals
+
+    # (see #grand_totals)
+    def grand_totals=(value)
+      RestrictionValidator.validate "PivotTable.grand_totals", [:both, :row_only, :col_only, :none], value
+
+      @grand_totals = value
+    end
+
     # Style info for the pivot table
     # @return [Hash]
     attr_accessor :style_info
@@ -114,7 +128,8 @@ module Axlsx
       @columns = v
     end
 
-    # The data
+    # The data as an array of either headers (String) or hashes or mix of the two.
+    # Hash in format of { ref: header, num_fmt: numFmts, subtotal: subtotal }, where header is String, numFmts is Integer, and subtotal one of %w[sum count average max min product countNums stdDev stdDevp var varp]; leave subtotal blank to sum values
     # @return [Array]
     attr_reader :data
 
@@ -188,7 +203,11 @@ module Axlsx
     def to_xml_string(str = +'')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
 
-      str << '<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"' << (data.size <= 1 ? ' dataOnRows="1"' : '') << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">'
+      str << '<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"'
+      str << ' dataOnRows="1"' if data.size <= 1
+      str << ' rowGrandTotals="0"' if grand_totals == :col_only || grand_totals == :none
+      str << ' colGrandTotals="0"' if grand_totals == :row_only || grand_totals == :none
+      str << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">'
 
       str << '<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>'
       str << '<pivotFields count="' << header_cells_count.to_s << '">'
@@ -244,8 +263,9 @@ module Axlsx
       unless data.empty?
         str << "<dataFields count=\"#{data.size}\">"
         data.each do |datum_value|
-          # The correct name prefix in ["Sum","Average", etc...]
-          str << "<dataField name='#{datum_value[:subtotal] || ''} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
+          subtotal_name = datum_value[:subtotal] || 'sum'
+          subtotal_name = 'count' if name == 'countNums' # both count & countNums are labelled as count
+          str << "<dataField name='#{subtotal_name.capitalize} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
           str << " numFmtId='#{datum_value[:num_fmt]}'" if datum_value[:num_fmt]
           str << " subtotal='#{datum_value[:subtotal]}' " if datum_value[:subtotal]
           str << "/>"
@@ -311,7 +331,11 @@ module Axlsx
       elsif columns.include? cell_ref
         attributes << 'axis="axisCol"'
         attributes << "sortType=\"#{sorttype == :descending ? 'descending' : 'ascending'}\"" if sorttype
-        include_items_tag = true
+        if subtotal
+          include_items_tag = true
+        else
+          attributes << 'defaultSubtotal="0"'
+        end
       elsif pages.include? cell_ref
         attributes << 'axis="axisPage"'
         include_items_tag = true
@@ -319,7 +343,7 @@ module Axlsx
         attributes << 'dataField="1"'
       end
 
-      "<pivotField #{attributes.join(' ')}>#{include_items_tag ? items_tag : nil}</pivotField>"
+      "<pivotField #{attributes.join(' ')}>#{items_tag if include_items_tag}</pivotField>"
     end
 
     def data_refs