Merge pull request #1305 from thkn-hofa/master

TotalSettings improvements

Examples/Tables/SalesData-WithTotalRow.ps1

@@ -0,0 +1,29 @@
+try { Import-Module $PSScriptRoot\..\..\ImportExcel.psd1 } catch { throw ; return }
+
+$data = ConvertFrom-Csv @"
+OrderId,Category,Sales,Quantity,Discount
+1,Cosmetics,744.01,07,0.7
+2,Grocery,349.13,25,0.3
+3,Apparels,535.11,88,0.2
+4,Electronics,524.69,60,0.1
+5,Electronics,439.10,41,0.0
+6,Apparels,56.84,54,0.8
+7,Electronics,326.66,97,0.7
+8,Cosmetics,17.25,74,0.6
+9,Grocery,199.96,39,0.4
+10,Grocery,731.77,20,0.3
+"@
+
+$xlfile = "$PSScriptRoot\TotalsRow.xlsx"
+Remove-Item $xlfile -ErrorAction SilentlyContinue
+
+$TableTotalSettings = @{     
+    Quantity = 'Sum'
+    Category = '=COUNTIF([Category],"<>Electronics")' # Count the number of categories not equal to Electronics
+    Sales    = @{
+        Function = '=SUMIF([Category],"<>Electronics",[Sales])'
+        Comment  = "Sum of sales for everything that is NOT Electronics"
+    }
+}
+
+$data | Export-Excel -Path $xlfile -TableName Sales -TableStyle Medium10 -TableTotalSettings $TableTotalSettings -AutoSize -Show

Examples/Tables/TotalsRow.ps1

@@ -0,0 +1,16 @@
+try {Import-Module $PSScriptRoot\..\..\ImportExcel.psd1} catch {throw ; return}
+
+$r = Get-ChildItem C:\WINDOWS\system32 -File
+
+$TotalSettings = @{ 
+    Name = "Count"
+    # You can create the formula in an Excel workbook first and copy-paste it here
+    # This syntax can only be used for the Custom type
+    Extension = "=COUNTIF([Extension];`".exe`")"
+    Length = @{
+        Function = "=SUMIF([Extension];`".exe`";[Length])"
+        Comment = "Sum of all exe sizes"
+    }
+}
+
+$r | Export-Excel -TableName system32files -TableStyle Medium10 -TableTotalSettings $TotalSettings -Show

ImportExcel.psd1

@@ -6,7 +6,7 @@
     RootModule         = 'ImportExcel.psm1'
 
     # Version number of this module.
-    ModuleVersion      = '7.8.2'
+    ModuleVersion      = '7.8.3'
 
     # ID used to uniquely identify this module
     GUID               = '60dd4136-feff-401a-ba27-a84458c57ede'
@@ -88,6 +88,7 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
         'Remove-Worksheet',
         'Select-Worksheet',
         'Send-SQLDataToExcel',
+        'Set-CellComment',
         'Set-CellStyle',
         'Set-ExcelColumn',
         'Set-ExcelRange',

Public/Add-ExcelTable.ps1

@@ -9,7 +9,7 @@ function Add-ExcelTable {
         [Switch]$ShowHeader ,
         [Switch]$ShowFilter,
         [Switch]$ShowTotal,
-        [hashtable]$TotalSettings,
+        [hashtable]$TableTotalSettings,
         [Switch]$ShowFirstColumn,
         [Switch]$ShowLastColumn,
         [Switch]$ShowRowStripes,
@@ -51,14 +51,65 @@ function Add-ExcelTable {
         }
         #it seems that show total changes some of the others, so the sequence matters.
         if     ($PSBoundParameters.ContainsKey('ShowHeader'))        {$tbl.ShowHeader        = [bool]$ShowHeader}
-        if     ($PSBoundParameters.ContainsKey('TotalSettings'))     {
+        if     ($PSBoundParameters.ContainsKey('TableTotalSettings') -And $Null -ne $TableTotalSettings)     {
             $tbl.ShowTotal = $true
-            foreach ($k in $TotalSettings.keys) {
-                if (-not $tbl.Columns[$k]) {Write-Warning -Message "Table does not have a Column '$k'."}
-                elseif ($TotalSettings[$k] -notin @("Average", "Count", "CountNums", "Max", "Min", "None", "StdDev", "Sum", "Var") ) {
-                    Write-Warning -Message "'$($TotalSettings[$k])' is not a valid total function."
+            foreach ($k in $TableTotalSettings.keys) {
+                
+                # Get the Function to be added in the totals row
+                if ($TableTotalSettings[$k] -is [HashTable]) { 
+                    If ($TableTotalSettings[$k].Keys -contains "Function") {
+                        $TotalFunction = $TableTotalSettings[$k]["Function"]
+                    }
+                    Else { Write-Warning -Message "TableTotalSettings parameter for column '$k' needs a key 'Function'" }
+                }
+                else { 
+                    $TotalFunction = [String]($TableTotalSettings[$k]) 
+                }
+                
+                # Add the totals row
+                if (-not $tbl.Columns[$k]) {Write-Warning -Message "Table does not have a Column '$k'."}
+                elseif ($TotalFunction -match "^=") {
+                    ### A function in Excel uses ";" between parameters but the OpenXML parameter separator is ","
+                    ### Only replace semicolon when it's NOT somewhere between quotes quotes. 
+                    # Get all text between quotes
+                    $QuoteMatches = [Regex]::Matches($TotalFunction,"`"[^`"]*`"|'[^']*'") 
+                    # Create array with all indexes of characters between quotes (and the quotes themselves)
+                    $QuoteCharIndexes = $(
+                        Foreach ($QuoteMatch in $QuoteMatches) {
+                            (($QuoteMatch.Index)..($QuoteMatch.Index + $QuoteMatch.Length - 1))
+                        }
+                    )
+
+                    # Get all semicolons
+                    $SemiColonMatches = [Regex]::Matches($TotalFunction, ";")
+                    # Replace the semicolons of which the index is not in the list of quote-text indexes
+                    Foreach ($SemiColonMatch in $SemiColonMatches.Index) {
+                        If ($QuoteCharIndexes -notcontains $SemiColonMatch) {
+                            $TotalFunction = $TotalFunction.remove($SemiColonMatch,1).Insert($SemiColonMatch,",")
+                        }
+                    }
+
+                    # Configure the formula. The TotalsRowFunction is automatically set to "Custom" when the TotalsRowFormula is set.
+                    $tbl.Columns[$k].TotalsRowFormula = $TotalFunction
+                }
+                elseif ($TotalFunction -notin @("Average", "Count", "CountNums", "Max", "Min", "None", "StdDev", "Sum", "Var") ) {
+                    Write-Warning -Message "'$($TotalFunction)' is not a valid total function."
+                }
+                else {$tbl.Columns[$k].TotalsRowFunction = $TotalFunction}
+
+                # Set comment on totals row
+                If ($TableTotalSettings[$k] -is [HashTable] -and $TableTotalSettings[$k].Keys -contains "Comment" -and ![String]::IsNullOrEmpty($TableTotalSettings[$k]["Comment"])) {
+                    $ColumnLetter = [officeOpenXml.ExcelAddress]::GetAddressCol(($tbl.columns | ? { $_.name -eq $k }).Id, $False)
+                    $CommentRange = "{0}{1}" -f $ColumnLetter, $tbl.Address.End.Row
+
+                    $CellCommentParams = @{
+                        Worksheet    = $tbl.WorkSheet
+                        Range        = $CommentRange
+                        Text         = $TableTotalSettings[$k]["Comment"]
+                    }
+
+                    Set-CellComment  @CellCommentParams
                 }
-                else {$tbl.Columns[$k].TotalsRowFunction = $TotalSettings[$k]}
             }
         }
         elseif ($PSBoundParameters.ContainsKey('ShowTotal'))         {$tbl.ShowTotal         = [bool]$ShowTotal}

Public/Export-Excel.ps1

@@ -56,6 +56,7 @@
         [Alias('Table')]
         $TableName,
         [OfficeOpenXml.Table.TableStyles]$TableStyle = [OfficeOpenXml.Table.TableStyles]::Medium6,
+        [HashTable]$TableTotalSettings,
         [Switch]$BarChart,
         [Switch]$PieChart,
         [Switch]$LineChart ,
@@ -211,7 +212,7 @@
                 $row ++
                 $null = $ws.Cells[$row, $StartColumn].LoadFromDataTable($InputObject, $false )
                 if ($TableName -or $PSBoundParameters.ContainsKey('TableStyle')) {
-                    Add-ExcelTable -Range $ws.Cells[$ws.Dimension] -TableName $TableName -TableStyle $TableStyle
+                    Add-ExcelTable -Range $ws.Cells[$ws.Dimension] -TableName $TableName -TableStyle $TableStyle -TableTotalSettings $TableTotalSettings
                 }
             }
             else {
@@ -424,7 +425,7 @@
         if ($null -ne $TableName -or $PSBoundParameters.ContainsKey('TableStyle')) {
             #Already inserted Excel table if input was a DataTable
             if ($InputObject -isnot [System.Data.DataTable]) {
-                Add-ExcelTable -Range $ws.Cells[$dataRange] -TableName $TableName -TableStyle $TableStyle
+                Add-ExcelTable -Range $ws.Cells[$dataRange] -TableName $TableName -TableStyle $TableStyle -TableTotalSettings $TableTotalSettings
             }
         }
         elseif ($AutoFilter) {

Public/Import-Excel.ps1

@@ -23,7 +23,7 @@
         [Parameter(ParameterSetName = 'PackageC', Mandatory)]
         [Switch]$NoHeader     ,
         [Alias('HeaderRow', 'TopRow')]
-        [ValidateRange(1, 9999)]
+        [ValidateRange(1, 1048576)]
         [Int]$StartRow = 1,
         [Alias('StopRow', 'BottomRow')]
         [Int]$EndRow ,

Public/Set-CellComment.ps1

@@ -0,0 +1,70 @@
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Scope='Function', Target='Set*', Justification='Does not change system state')]
+param()
+
+function Set-CellComment {
+    [CmdletBinding(DefaultParameterSetName = "Range")]
+    param(
+        [Parameter(Mandatory = $True, ParameterSetName = "ColumnLetter")]
+        [Parameter(Mandatory = $True, ParameterSetName = "ColumnNumber")]
+        [Parameter(Mandatory = $False, ParameterSetName = "Range")]
+        [OfficeOpenXml.ExcelWorkSheet]$Worksheet,
+
+        [Parameter(Mandatory = $True, ParameterSetName = "Range", ValueFromPipeline = $true,Position=0)]
+        [Alias("Address")]
+        $Range,
+
+        [Parameter(Mandatory = $True, ParameterSetName = "ColumnLetter")]
+        [Parameter(Mandatory = $True, ParameterSetName = "ColumnNumber")]
+        [Int]$Row,
+
+        [Parameter(Mandatory = $True, ParameterSetName = "ColumnLetter")]
+        [String]$ColumnLetter,
+
+        [Parameter(Mandatory = $True, ParameterSetName = "ColumnNumber")]
+        [Int]$ColumnNumber,
+
+        [Parameter(Mandatory = $True)]
+        [String]$Text
+    )
+
+    If ($PSCmdlet.ParameterSetName -eq "Range") {
+        Write-Verbose "Using 'Range' Parameter Set"
+        if  ($Range -is [Array])  {
+            $null = $PSBoundParameters.Remove("Range")
+            $Range | Set-CellComment @PSBoundParameters
+        }
+        else {
+            #We should accept, a worksheet and a name of a range or a cell address; a table; the address of a table; a named range; a row, a column or .Cells[ ]
+            if ($Range -is [OfficeOpenXml.Table.ExcelTable]) {$Range = $Range.Address}
+            elseif ($Worksheet -and $Range -is [string]) {
+                # Convert range as string to OfficeOpenXml.ExcelAddress
+                $Range = [OfficeOpenXml.ExcelAddress]::new($Range)
+            }
+            elseif ($Range -is [string]) {Write-Warning -Message "The range parameter you have specified also needs a worksheet parameter." ;return}
+            #else we assume $Range is a OfficeOpenXml.ExcelAddress
+        }
+    }
+    ElseIf ($PSCmdlet.ParameterSetName -eq "ColumnNumber") {
+        $Range = [OfficeOpenXml.ExcelAddress]::new($Row, $ColumnNumber, $Row, $ColumnNumber)
+    }
+    ElseIf ($PSCmdlet.ParameterSetName -eq "ColumnLetter") {
+        $Range = [OfficeOpenXml.ExcelAddress]::new(("{0}{1}" -f $ColumnLetter,$Row))
+    }
+
+    If  ($Range -isnot [Array])  {
+        Foreach ($c in $Worksheet.Cells[$Range]) {
+            write-verbose $c.address
+            Try {
+                If ($Null -eq $c.comment) {
+                    [Void]$c.AddComment($Text, "ImportExcel")
+                }
+                Else {
+                    $c.Comment.Text = $Text
+                    $c.Comment.Author = "ImportExcel"
+                }
+                $c.Comment.AutoFit = $True
+            }
+            Catch { "Could not add comment to cell {0}: {1}" -f $c.Address, $_.ToString() }
+        }
+    }
+}

__tests__/Export-Excel.Tests.ps1

@@ -1,4 +1,4 @@
-#Requires -Modules Pester
+#Requires -Modules @{ ModuleName="Pester"; ModuleVersion="4.0.0" }
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', '', Justification = 'False Positives')]
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidAssignmentToAutomaticVariable', '', Justification = 'Only executes on versions without the automatic variable')]
 param()
@@ -683,6 +683,72 @@ Describe ExportExcel -Tag "ExportExcel" {
         }
     }
 
+    Context "#Example 10     # Creates a file with a table with a 'totals' row".PadRight(87) {
+        BeforeEach {
+            $path = "TestDrive:\test.xlsx"
+            Remove-item -Path $path -ErrorAction SilentlyContinue
+            
+            #Test with a maximum of 50 processes for speed; export limited set of properties.
+            $processes = Get-Process | Where-Object { $_.StartTime } | Select-Object -First 50
+
+            # Export as table with a totals row with a set of possibilities
+            $TableTotalSettings = @{ 
+                Id         = "COUNT"
+                WS         = "SUM"
+                Handles    = "AVERAGE"
+                CPU        = '=COUNTIF([CPU];"<1")'
+                NPM        = @{
+                    Function = '=SUMIF([Name];"=Chrome";[NPM])'
+                    Comment  = "Sum of Non-Paged Memory (NPM) for all chrome processes"
+                }
+            }
+            $Processes | Export-Excel $path -TableName "processes" -TableTotalSettings $TableTotalSettings
+            $TotalRows = $Processes.count + 2 # Column header + Data (50 processes) + Totals row
+            $Excel = Open-ExcelPackage -Path $path
+            $ws = $Excel.Workbook.Worksheets[1]
+        }
+
+        it "Totals row was created".PadRight(87) {
+            $ws.Tables[0].Address.Rows                                          | Should -Be $TotalRows
+            $ws.tables[0].ShowTotal                                             | Should -Be $True
+        }
+        
+        it "Added four calculations in the totals row".PadRight(87) {
+            $IDcolumn = $ws.Tables[0].Columns | Where-Object { $_.Name -eq "id" }
+            $WScolumn = $ws.Tables[0].Columns | Where-Object { $_.Name -eq "WS" }
+            $HandlesColumn = $ws.Tables[0].Columns | Where-Object { $_.Name -eq "Handles" }
+            $CPUColumn = $ws.Tables[0].Columns | Where-Object { $_.Name -eq "CPU" }
+            $NPMColumn = $ws.Tables[0].Columns | Where-Object { $_.Name -eq "NPM" }
+
+            # Testing column properties
+            $IDcolumn      | Select-Object -ExpandProperty TotalsRowFunction    | Should -Be "Count"
+            $WScolumn      | Select-Object -ExpandProperty TotalsRowFunction    | Should -Be "Sum"
+            $HandlesColumn | Select-Object -ExpandProperty TotalsRowFunction    | Should -Be "Average"
+            $CPUColumn     | Select-Object -ExpandProperty TotalsRowFunction    | Should -Be "Custom"
+            $CPUColumn     | Select-Object -ExpandProperty TotalsRowFormula     | Should -Be 'COUNTIF([CPU],"<1")'
+            $NPMColumn     | Select-Object -ExpandProperty TotalsRowFunction    | Should -Be "Custom"
+            $NPMColumn     | Select-Object -ExpandProperty TotalsRowFormula     | Should -Be 'SUMIF([Name],"=Chrome",[NPM])'
+
+            # Testing actual cell properties
+            $CountAddress = "{0}{1}" -f (Get-ExcelColumnName -ColumnNumber $IDcolumn.Id).ColumnName, $TotalRows
+            $SumAddress = "{0}{1}" -f (Get-ExcelColumnName -ColumnNumber $WScolumn.Id).ColumnName, $TotalRows
+            $AverageAddress = "{0}{1}" -f (Get-ExcelColumnName -ColumnNumber $HandlesColumn.Id).ColumnName, $TotalRows
+            $CustomAddress = "{0}{1}" -f (Get-ExcelColumnName -ColumnNumber $CPUColumn.Id).ColumnName, $TotalRows
+            $CustomCommentAddress = "{0}{1}" -f (Get-ExcelColumnName -ColumnNumber $NPMColumn.Id).ColumnName, $TotalRows
+
+            $ws.Cells[$CountAddress].Formula                                    | Should      -Be "SUBTOTAL(103,processes[Id])"
+            $ws.Cells[$SumAddress].Formula                                      | Should      -Be "SUBTOTAL(109,processes[Ws])"
+            $ws.Cells[$AverageAddress].Formula                                  | Should      -Be "SUBTOTAL(101,processes[Handles])"
+            $ws.Cells[$CustomAddress].Formula                                   | Should      -Be 'COUNTIF([CPU],"<1")'
+            $ws.Cells[$CustomCommentAddress].Formula                            | Should      -Be 'SUMIF([Name],"=Chrome",[NPM])'
+            $ws.Cells[$CustomCommentAddress].Comment.Text                       | Should -Not -BeNullOrEmpty
+        }
+
+        AfterEach {
+            Close-ExcelPackage -ExcelPackage $Excel
+        }
+    }
+
     # Context "#Example 11     # Create and append with title, inc ranges and Pivot table" {
     #     $path = "TestDrive:\test.xlsx"
     #     #Test New-PivotTableDefinition builds definition using -Pivotfilter and -PivotTotals options.

__tests__/ImportExcelTests/ImportExcelEndRowEndColumn.tests.ps1

@@ -32,6 +32,12 @@ Describe 'Test' -Tag ImportExcelEndRowAndCols {
             $colNames[0] | Should -Be 'Units'
             $colNames[1] | Should -Be 'Price'
         }
+
+        It 'Should read any row up to maximum allowed row' {
+            $xlMaxRows = "$PSScriptRoot\MaxRows.xlsx"
+            $actual = Import-Excel $xlMaxRows -StartRow 1048576 -EndRow 1048576 -NoHeader
+            $actual.P1 | Should -Be 1048576
+        }
     }
 
     Context 'Test reading multiple sheets with data in differnt rows and columns' {

__tests__/Path.tests.ps1

@@ -1,11 +1,12 @@
 Describe "Test reading relative paths" {
     BeforeAll {
         $script:xlfileName = "TestR.xlsx"
-        @{data = 1 } | Export-Excel (Join-Path $PWD  "TestR.xlsx")
+        If ([String]::IsNullOrEmpty($PWD)) { $PWD = $PSScriptRoot }
+        @{data = 1 } | Export-Excel (Join-Path $PWD "TestR.xlsx")
     }
 
     AfterAll {
-        Remove-Item (Join-Path $PWD  "$($script:xlfileName)")
+        Remove-Item (Join-Path $PWD "$($script:xlfileName)")
     }
 
     It "Should read local file".PadRight(90) {

__tests__/Set-CellComment.tests.ps1

@@ -0,0 +1,44 @@
+if (-not (Get-command Import-Excel -ErrorAction SilentlyContinue)) {
+    Import-Module $PSScriptRoot\..\ImportExcel.psd1
+}
+
+Describe "Test setting comment on cells in different ways" -Tag SetCellComment {
+    BeforeAll {
+        $data = ConvertFrom-Csv @"
+OrderId,Category,Sales,Quantity,Discount
+1,Cosmetics,744.01,07,0.7
+2,Grocery,349.13,25,0.3
+3,Apparels,535.11,88,0.2
+4,Electronics,524.69,60,0.1
+5,Electronics,439.10,41,0.0
+6,Apparels,56.84,54,0.8
+7,Electronics,326.66,97,0.7
+8,Cosmetics,17.25,74,0.6
+9,Grocery,199.96,39,0.4
+10,Grocery,731.77,20,0.3
+"@
+
+        $Excel = $data | Export-Excel -PassThru
+        $ws = $Excel.Workbook.Worksheets | Select-Object -First 1
+    }
+
+    AfterAll {
+        Close-ExcelPackage $Excel
+    }
+
+    It "Should add comments to multiple cells".PadRight(87) {
+        Set-CellComment -Range "A1" -Worksheet $ws -Text "This was added with a single cell range"
+        Set-CellComment -Range "A2:C2" -Worksheet $ws -Text "This was added with a multiple cell range"
+        Set-CellComment -ColumnLetter A -Row 3 -Worksheet $ws -Text "This was added using a column letter and rownumber"
+        Set-CellComment -ColumnNumber 1 -Row 4 -Worksheet $ws -Text "This was added using a column number and row number"
+
+        Set-CellComment -Range "B2" -Worksheet $ws -Text "This demonstrates an overwrite of a previously set comment"
+
+        $ws.Cells["A1"].Comment.Text | Should -BeExactly "This was added with a single cell range"
+        $ws.Cells["A2"].Comment.Text | Should -BeExactly "This was added with a multiple cell range" 
+        $ws.Cells["B2"].Comment.Text | Should -BeExactly "This demonstrates an overwrite of a previously set comment" 
+        $ws.Cells["C2"].Comment.Text | Should -BeExactly "This was added with a multiple cell range"
+        $ws.Cells["A3"].Comment.Text | Should -BeExactly "This was added using a column letter and rownumber"
+        $ws.Cells["A4"].Comment.Text | Should -BeExactly "This was added using a column number and row number"
+    }
+}

__tests__/Set-Row_Set-Column-SetFormat.tests.ps1

@@ -132,6 +132,11 @@ Describe "Set-ExcelColumn, Set-ExcelRow and Set-ExcelRange"  {
         12011,Crowbar,7,23.48
 "@
 
+        # Pester errors for countries with ',' as decimal separator
+        Foreach ($datarow in $data) {
+            $datarow.Price = [decimal]($datarow.Price)
+        }
+
         $DriverData = convertFrom-CSv @"
         Name,Wikipage,DateOfBirth
         Fernando Alonso,/wiki/Fernando_Alonso,1981-07-29
@@ -392,7 +397,7 @@ Describe "Table Formatting"  {
         $excel = $data2 | Export-excel -path $path -WorksheetName Hardware -AutoNameRange -AutoSize -BoldTopRow -FreezeTopRow -PassThru
         $ws = $excel.Workbook.Worksheets[1]
         #test showfilter & TotalSettings
-        $Table = Add-ExcelTable -PassThru -Range $ws.Cells[$($ws.Dimension.address)] -TableStyle Light1 -TableName HardwareTable  -TotalSettings @{"Total" = "Sum"} -ShowFirstColumn -ShowFilter:$false
+        $Table = Add-ExcelTable -PassThru -Range $ws.Cells[$($ws.Dimension.address)] -TableStyle Light1 -TableName HardwareTable  -TableTotalSettings @{"Total" = "Sum"} -ShowFirstColumn -ShowFilter:$false
         #test expnading named number formats
         Set-ExcelColumn -Worksheet $ws -Column 4 -NumberFormat 'Currency'
         Set-ExcelColumn -Worksheet $ws -Column 5 -NumberFormat 'Currency'

changelog.md

@@ -1,8 +1,18 @@
+# 7.8.3
+
+Thanks [Thomas Hofkens](https://github.com/thkn-hofa)
+
+- Extended Export-Excel with parameter TableTotalSettings
+- New Feature: Set-CellComment
+- Fix Pester error for countries with ',' as decimal separator
+- Fix Pester error for Windows PowerShell 5.1
+
 # 7.8.2
 
 - Fix docs [#1254](https://github.com/dfinke/ImportExcel/pull/1251)`Add-Worksheet` warning. Thank you [Wilson Stewart](https://github.com/WilsonStewart)
 - Fix docs [#1251](https://github.com/dfinke/ImportExcel/pull/1251)`Add-Worksheet` warning. Thank you [Jeremiah Adams](https://github.com/JeremiahTheFirst)
 - Fix docs [#1253](https://github.com/dfinke/ImportExcel/pull/1253) `convertfrom-exceltosqlinsert`. Thank you [Wes Stahler](https://github.com/stahler)
+- Set Validate Range for rows to max rows available [#1273](https://github.com/dfinke/ImportExcel/pull/1273). Thank you [Stephen Brown](https://github.com/steve-daedilus)
 - Extended Get-ExcelFileSummary to include more Visible -eq $true|$false
 
 # 7.8.1

mdHelp/en/add-excelchart.md

@@ -112,7 +112,7 @@ An existing Sheet where the chart will be created.
 
 ```yaml
 Type: ExcelWorksheet
-Parameter Sets: Workshet
+Parameter Sets: Worksheet
 Aliases:
 
 Required: True

mdHelp/en/add-exceltable.md

@@ -14,7 +14,7 @@ Adds Tables to Excel workbooks.
 ## SYNTAX
 
 ```text
-Add-ExcelTable [-Range] <ExcelRange> [[-TableName] <String>] [[-TableStyle] <TableStyles>] [-ShowHeader] [-ShowFilter] [-ShowTotal] [[-TotalSettings] <Hashtable>] [-ShowFirstColumn] [-ShowLastColumn]  [-ShowRowStripes] [-ShowColumnStripes] [-PassThru] [<CommonParameters>]
+Add-ExcelTable [-Range] <ExcelRange> [[-TableName] <String>] [[-TableStyle] <TableStyles>] [-ShowHeader] [-ShowFilter] [-ShowTotal] [[-TableTotalSettings] <Hashtable>] [-ShowFirstColumn] [-ShowLastColumn]  [-ShowRowStripes] [-ShowColumnStripes] [-PassThru] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -142,9 +142,19 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -TotalSettings
+### -TableTotalSettings
 
-A HashTable in the form ColumnName = "Average"\|"Count"\|"CountNums"\|"Max"\|"Min"\|"None"\|"StdDev"\|"Sum"\|"Var" - if specified, -ShowTotal is not needed.
+A HashTable in the form of either
+
+- ColumnName = "Average"\|"Count"\|"CountNums"\|"Max"\|"Min"\|"None"\|"StdDev"\|"Sum"\|"Var"|\<Custom Excel function starting with "="\>
+- ```powershell
+  ColumnName = @{
+      Function = "Average"\|"Count"\|"CountNums"\|"Max"\|"Min"\|"None"\|"StdDev"\|"Sum"\|"Var"|<Custom Excel function starting with "=">
+      Comment = $HoverComment
+  }
+  ```
+
+if specified, -ShowTotal is not needed.
 
 ```yaml
 Type: Hashtable

mdHelp/en/export-excel.md

@@ -16,13 +16,13 @@ Exports data to an Excel worksheet.
 ### Default \(Default\)
 
 ```text
-Export-Excel [[-Path] <String>] [-InputObject <Object>] [-Calculate] [-Show] [-WorksheetName <String>] [-Password <String>] [-ClearSheet] [-Append] [-Title <String>] [-TitleFillPattern <ExcelFillStyle>] [-TitleBold] [-TitleSize <Int32>] [-TitleBackgroundColor <Object>][-IncludePivotTable] [-PivotTableName <String>] [-PivotRows <String[]> [-PivotColumns <String[]>] [-PivotData <Object>] [-PivotFilter <String[]>] [-PivotDataToColumn] [-PivotTableDefinition <Hashtable>] [-IncludePivotChart] [-ChartType <eChartType>] [-NoLegend] [-ShowCategory] [-ShowPercent] [-AutoSize] [-MaxAutoSizeRows <Object>] [-NoClobber] [-FreezeTopRow] [-FreezeFirstColumn] [-FreezeTopRowFirstColumn] [-FreezePane <Int32[]>] [-AutoFilter] [-BoldTopRow] [-NoHeader] [-RangeName <String>] [-TableName <Object>] [-TableStyle <TableStyles>] [-Barchart] [-PieChart] [-LineChart] [-ColumnChart] [-ExcelChartDefinition <Object[]>] [-HideSheet <String[]>] [-UnHideSheet <String[]>] [-MoveToStart] [-MoveToEnd] [-MoveBefore <Object>] [-MoveAfter <Object>] [-KillExcel] [-AutoNameRange] [-StartRow <Int32>] [-StartColumn <Int32>] [-PassThru] [-Numberformat <String>] [-ExcludeProperty <String[]>] [-NoAliasOrScriptPropeties] [-DisplayPropertySet] [-NoNumberConversion <String[]>] [-ConditionalFormat <Object[]>] [-ConditionalText <Object[]>] [-Style <Object[]>] [-CellStyleSB <ScriptBlock>] [-Activate] [-Now] [-ReturnRange] [-PivotTotals <String>] [-NoTotalsInPivot] [-ReZip] [<CommonParameters>]
+Export-Excel [[-Path] <String>] [-InputObject <Object>] [-Calculate] [-Show] [-WorksheetName <String>] [-Password <String>] [-ClearSheet] [-Append] [-Title <String>] [-TitleFillPattern <ExcelFillStyle>] [-TitleBold] [-TitleSize <Int32>] [-TitleBackgroundColor <Object>][-IncludePivotTable] [-PivotTableName <String>] [-PivotRows <String[]> [-PivotColumns <String[]>] [-PivotData <Object>] [-PivotFilter <String[]>] [-PivotDataToColumn] [-PivotTableDefinition <Hashtable>] [-IncludePivotChart] [-ChartType <eChartType>] [-NoLegend] [-ShowCategory] [-ShowPercent] [-AutoSize] [-MaxAutoSizeRows <Object>] [-NoClobber] [-FreezeTopRow] [-FreezeFirstColumn] [-FreezeTopRowFirstColumn] [-FreezePane <Int32[]>] [-AutoFilter] [-BoldTopRow] [-NoHeader] [-RangeName <String>] [-TableName <Object>] [-TableStyle <TableStyles>] [-TableTotalSettings <HashTable>] [-Barchart] [-PieChart] [-LineChart] [-ColumnChart] [-ExcelChartDefinition <Object[]>] [-HideSheet <String[]>] [-UnHideSheet <String[]>] [-MoveToStart] [-MoveToEnd] [-MoveBefore <Object>] [-MoveAfter <Object>] [-KillExcel] [-AutoNameRange] [-StartRow <Int32>] [-StartColumn <Int32>] [-PassThru] [-Numberformat <String>] [-ExcludeProperty <String[]>] [-NoAliasOrScriptPropeties] [-DisplayPropertySet] [-NoNumberConversion <String[]>] [-ConditionalFormat <Object[]>] [-ConditionalText <Object[]>] [-Style <Object[]>] [-CellStyleSB <ScriptBlock>] [-Activate] [-Now] [-ReturnRange] [-PivotTotals <String>] [-NoTotalsInPivot] [-ReZip] [<CommonParameters>]
 ```
 
 ### Package
 
 ```text
-Export-Excel -ExcelPackage <ExcelPackage> [-InputObject <Object>] [-Calculate] [-Show] [-WorksheetName <String>] [-Password <String>] [-ClearSheet] [-Append] [-Title <String>] [-TitleFillPattern <ExcelFillStyle>] [-TitleBold] [-TitleSize <Int32>] [-TitleBackgroundColor <Object>] [-IncludePivotTable] [-PivotTableName <String>] [-PivotRows <String[]>] [-PivotColumns <String[]>] [-PivotData <Object>] [-PivotFilter <String[]>] [-PivotDataToColumn] [-PivotTableDefinition <Hashtable>] [-IncludePivotChart] [-ChartType <eChartType>] [-NoLegend] [-ShowCategory] [-ShowPercent] [-AutoSize] [-MaxAutoSizeRows <Object>] [-NoClobber] [-FreezeTopRow] [-FreezeFirstColumn] [-FreezeTopRowFirstColumn] [-FreezePane <Int32[]>] [-AutoFilter] [-BoldTopRow] [-NoHeader] [-RangeName <String>] [-TableName <Object>] [-TableStyle <TableStyles>] [-Barchart] [-PieChart] [-LineChart] [-ColumnChart] [-ExcelChartDefinition <Object[]>] [-HideSheet <String[]>] [-UnHideSheet <String[]>] [-MoveToStart] [-MoveToEnd] [-MoveBefore <Object>] [-MoveAfter <Object>] [-KillExcel] [-AutoNameRange] [-StartRow <Int32>] [-StartColumn <Int32>] [-PassThru] [-Numberformat <String>] [-ExcludeProperty <String[]>]
+Export-Excel -ExcelPackage <ExcelPackage> [-InputObject <Object>] [-Calculate] [-Show] [-WorksheetName <String>] [-Password <String>] [-ClearSheet] [-Append] [-Title <String>] [-TitleFillPattern <ExcelFillStyle>] [-TitleBold] [-TitleSize <Int32>] [-TitleBackgroundColor <Object>] [-IncludePivotTable] [-PivotTableName <String>] [-PivotRows <String[]>] [-PivotColumns <String[]>] [-PivotData <Object>] [-PivotFilter <String[]>] [-PivotDataToColumn] [-PivotTableDefinition <Hashtable>] [-IncludePivotChart] [-ChartType <eChartType>] [-NoLegend] [-ShowCategory] [-ShowPercent] [-AutoSize] [-MaxAutoSizeRows <Object>] [-NoClobber] [-FreezeTopRow] [-FreezeFirstColumn] [-FreezeTopRowFirstColumn] [-FreezePane <Int32[]>] [-AutoFilter] [-BoldTopRow] [-NoHeader] [-RangeName <String>] [-TableName <Object>] [-TableStyle <TableStyles>] [-TableTotalSettings <HashTable>] [-Barchart] [-PieChart] [-LineChart] [-ColumnChart] [-ExcelChartDefinition <Object[]>] [-HideSheet <String[]>] [-UnHideSheet <String[]>] [-MoveToStart] [-MoveToEnd] [-MoveBefore <Object>] [-MoveAfter <Object>] [-KillExcel] [-AutoNameRange] [-StartRow <Int32>] [-StartColumn <Int32>] [-PassThru] [-Numberformat <String>] [-ExcludeProperty <String[]>]
  [-NoAliasOrScriptPropeties] [-DisplayPropertySet] [-NoNumberConversion <String[]>] [-ConditionalFormat <Object[]>] [-ConditionalText <Object[]>] [-Style <Object[]>] [-CellStyleSB <ScriptBlock>] [-Activate] [-ReturnRange] [-PivotTotals <String>] [-NoTotalsInPivot] [-ReZip] [<CommonParameters>]
 ```
 
@@ -156,6 +156,29 @@ If neither condition is met, the color will be the default, black text on a whit
 
 ### EXAMPLE 7
 
+```text
+PS\> $r = Get-ChildItem C:\WINDOWS\system32 -File
+
+PS\> $TotalSettings = @{ 
+         Name = "Count"
+         Extension = "=COUNTIF([Extension];`".exe`")"
+         Length = @{
+             Function = "=SUMIF([Extension];`".exe`";[Length])"
+             Comment = "Sum of all exe sizes"
+         }
+     }
+
+PS\> $r | Export-Excel -TableName system32files -TableStyle Medium10 -TableTotalSettings $TotalSettings -Show
+```
+
+Exports a list of files with a totals row with three calculated totals:
+
+- Total count of names
+- Count of files with the extension ".exe"
+- Total size of all file with extension ".exe" and add a comment as to not be mistaken that is is the total size of all files
+
+### EXAMPLE 8
+
 ```text
 PS\> $ExcelParams = @{
         Path      = $env:TEMP + '\Excel.xlsx'
@@ -189,25 +212,25 @@ PS\> $Array | Update-FirstObjectProperties | Export-Excel @ExcelParams -Workshee
 
 Updates the first object of the array by adding property 'Member3' and 'Member4'. Afterwards, all objects are exported to an Excel file and all column headers are visible.
 
-### EXAMPLE 8
+### EXAMPLE 9
 
 ```text
 PS\> Get-Process | Export-Excel .\test.xlsx -WorksheetName Processes -IncludePivotTable -Show -PivotRows Company -PivotData PM
 ```
 
-### EXAMPLE 9
+### EXAMPLE 10
 
 ```text
 PS\> Get-Process | Export-Excel .\test.xlsx -WorksheetName Processes -ChartType PieExploded3D -IncludePivotChart -IncludePivotTable -Show -PivotRows Company -PivotData PM
 ```
 
-### EXAMPLE 10
+### EXAMPLE 11
 
 ```text
 PS\> Get-Service | Export-Excel 'c:\temp\test.xlsx'  -Show -IncludePivotTable -PivotRows status -PivotData @{status='count'}
 ```
 
-### EXAMPLE 11
+### EXAMPLE 12
 
 ```text
 PS\> $pt = [ordered]@{}
@@ -237,7 +260,7 @@ Then it puts Service data on Sheet1 with one call to Export-Excel and Process Da
 
 The third and final call adds the two PivotTables and opens the spreadsheet in Excel.
 
-### EXAMPLE 12
+### EXAMPLE 13
 
 ```text
 PS\> Remove-Item  -Path .\test.xlsx
@@ -258,7 +281,7 @@ It then uses the package object to apply formatting, and then saves the workbook
 
 Note: Other commands in the module remove the need to work directly with the package object in this way.
 
-### EXAMPLE 13
+### EXAMPLE 14
 
 ```text
 PS\> Remove-Item -Path .\test.xlsx -ErrorAction Ignore
@@ -281,7 +304,7 @@ This a more sophisticated version of the previous example showing different ways
 
 In the final command a PivotChart is added and the workbook is opened in Excel.
 
-### EXAMPLE 14
+### EXAMPLE 15
 
 ```text
 PS\> 0..360 | ForEach-Object {[pscustomobject][ordered]@{X=$_; Sinx="=Sin(Radians(x)) "} } |
@@ -290,7 +313,7 @@ PS\> 0..360 | ForEach-Object {[pscustomobject][ordered]@{X=$_; Sinx="=Sin(Radian
 
 Creates a line chart showing the value of Sine\(x\) for values of X between 0 and 360 degrees.
 
-### EXAMPLE 15
+### EXAMPLE 16
 
 ```text
 PS\> Invoke-Sqlcmd -ServerInstance localhost\DEFAULT -Database AdventureWorks2014 -Query "select *  from sys.tables" -OutputAs DataRows |
@@ -337,7 +360,7 @@ Accept wildcard characters: False
 
 ### -InputObject
 
-Date is usually piped into Export-Excel, but it also accepts data through the InputObject parameter
+Data is usually piped into Export-Excel, but it also accepts data through the InputObject parameter
 
 ```yaml
 Type: Object
@@ -952,6 +975,32 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -TableTotalSettings
+
+A HashTable in the form of either
+
+- ColumnName = "Average"\|"Count"\|"CountNums"\|"Max"\|"Min"\|"None"\|"StdDev"\|"Sum"\|"Var"|\<Custom Excel function starting with "="\>
+- ```powershell
+  ColumnName = @{
+      Function = "Average"\|"Count"\|"CountNums"\|"Max"\|"Min"\|"None"\|"StdDev"\|"Sum"\|"Var"|<Custom Excel function starting with "=">
+      Comment = $HoverComment
+  }
+  ```
+
+if specified, -ShowTotal is not needed.
+
+```yaml
+Type: Hashtable
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 4
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Barchart
 
 Creates a "quick" bar chart using the first text column as labels and the first numeric column as values.

mdHelp/en/import-excel.md

@@ -64,6 +64,7 @@ If the default behavior is not desired and you want to import the complete works
 ### EXAMPLE 1
 
 ```text
+
 ----------------------------------------------
 | File: Movies.xlsx     -      Sheet: Actors |
 ----------------------------------------------
@@ -89,6 +90,7 @@ Notice that column 'B' is not imported because there's no value in cell 'B1' tha
 ### EXAMPLE 2
 
 ```text
+
 ----------------------------------------------
 | File: Movies.xlsx     -      Sheet: Actors |
 ----------------------------------------------
@@ -120,6 +122,7 @@ Notice that the column header \(row 1\) is imported as an object too.
 ### EXAMPLE 3
 
 ```text
+
 ----------------------------------------------------------
 | File: Movies.xlsx            -           Sheet: Movies |
 ----------------------------------------------------------
@@ -160,6 +163,7 @@ Notice that empty rows are imported and that data for the property 'Genre' is no
 ### EXAMPLE 4
 
 ```text
+
 ----------------------------------------------------------
 | File: Movies.xlsx            -           Sheet: Movies |
 ----------------------------------------------------------
@@ -192,6 +196,7 @@ Notice that empty rows and empty columns are not imported.
 ### EXAMPLE 5
 
 ```text
+
 ----------------------------------------------------------
 | File: Movies.xlsx            -           Sheet: Actors |
 ----------------------------------------------------------