Merge pull request #1197 from dfinke/fix-1194-EndRow-and-EndColumn-Parameters-Ignored

Fix 1194 end row and end column parameters ignored

Examples/CustomNumbers/ShortenNumbers.ps1

@@ -0,0 +1,23 @@
+# How to convert abbreviate or shorten long numbers in Excel
+
+Remove-Item .\custom.xlsx -ErrorAction SilentlyContinue
+
+$data = $(
+    12000
+    1000
+    2000
+    3000
+    2400
+    3600
+    6000
+    13000
+    40000
+    400000
+    1000000    
+) 
+
+$excel = $data | Export-Excel .\custom.xlsx -PassThru
+
+Set-ExcelRange -Worksheet $excel.Sheet1 -Range "A:A" -NumberFormat '[>999999]#,,"M";#,"K"'
+
+Close-ExcelPackage $excel -Show

ImportExcel.psd1

@@ -6,7 +6,7 @@
     RootModule         = 'ImportExcel.psm1'
 
     # Version number of this module.
-    ModuleVersion      = '7.5.2'
+    ModuleVersion      = '7.6.0'
 
     # ID used to uniquely identify this module
     GUID               = '60dd4136-feff-401a-ba27-a84458c57ede'
@@ -131,9 +131,8 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
         '.\Charting\Charting.ps1',
         '.\InferData\InferData.ps1',
         '.\Pivot\Pivot.ps1',
-        '.\spikes\ConvertFrom-ExcelColumnName.ps1',
-        '.\Examples', '.\images', '.\Testimonials'
-
+        '.\Examples', 
+        '.\Testimonials'
     )
 
     # Private data to pass to the module specified in RootModule/ModuleToProcess

InstallModule.ps1

@@ -7,5 +7,5 @@ if (-not $fullPath) {
             $fullPath = Join-Path $fullPath -ChildPath "ImportExcel"
 }
 Push-location $PSScriptRoot
-Robocopy . $fullPath /mir /XD .vscode .git CI __tests__ data mdHelp /XF appveyor.yml azure-pipelines.yml .gitattributes .gitignore filelist.txt install.ps1 InstallModule.ps1
+Robocopy . $fullPath /mir /XD .vscode images .git .github CI __tests__ data mdHelp spikes /XF README.md README.original.md appveyor.yml azure-pipelines.yml .gitattributes .gitignore filelist.txt install.ps1 InstallModule.ps1 PublishToGallery.ps1
 Pop-Location

Public/Import-Excel.ps1

@@ -134,8 +134,16 @@
 
                 $xlBook = [Ordered]@{}
                 foreach ($sheet in $Worksheet) {
-                    $EndRow = 0
-                    $EndColumn = 0
+                    if ($Worksheet.Count -gt 1 -or $Paths.Count -gt 1) {
+                        <#
+                            Needed under these conditions to handle sheets of different number of Row/Col 
+                                - When reading more than one xlsx file
+                                - When reading more than one worksheet in the same file
+                        #>
+                        $EndRow = $null
+                        $EndColumn = $null
+                    }
+
                     $targetSheetname = $sheet.Name
                     $xlBook["$targetSheetname"] = @()
                     #region Get rows and columns

__tests__/ImportExcelTests/ImportExcelEndRowEndColumn.tests.ps1

@@ -0,0 +1,51 @@
+Import-Module $PSScriptRoot\..\..\ImportExcel.psd1 -Force
+
+Describe 'Test' -Tag ImportExcelEndRowAndCols {
+    BeforeAll {
+        $script:xlFilename = "$PSScriptRoot\DataInDiffRowCol.xlsx"
+    }
+
+    Context 'Test reading a partial sheet' {
+        It 'Should read 2 rows and first 3 columns' {
+            $actual = Import-Excel $xlFilename -StartRow 5 -EndRow 7 -StartColumn 3 -EndColumn 5 
+
+            # $actual | out-host
+            $actual.Count | Should -Be 2
+
+            $colNames = $actual[0].psobject.properties.Name
+            $colNames.Count | Should -Be 3
+
+            $colNames[0] | Should -Be 'Region'
+            $colNames[1] | Should -Be 'State'
+            $colNames[2] | Should -Be 'Units'
+        }
+
+        It 'Should read second 2 rows and last 2 columns' {
+            $actual = Import-Excel $xlFilename -StartRow 8 -EndRow 9 -StartColumn 5 -EndColumn 6 -HeaderName 'Units', 'Price'
+
+            # $actual | out-host
+            $actual.Count | Should -Be 2
+
+            $colNames = $actual[0].psobject.properties.Name
+            $colNames.Count | Should -Be 2            
+
+            $colNames[0] | Should -Be 'Units'
+            $colNames[1] | Should -Be 'Price'
+        }
+    }
+
+    Context 'Test reading multiple sheets with data in differnt rows and columns' {
+        It 'Should read 2 sheets same StartRow different dimensions' {
+            $xlFilename = "$PSScriptRoot\DataInDiffRowColMultipleSheets.xlsx"
+            
+            $actual = Import-Excel $xlFilename -StartRow 5 -WorksheetName *
+            
+            $actual.Keys.Count | Should -Be 2
+            $actual.Contains('Sheet1') | Should -BeTrue
+            $actual.Contains('Sheet2') | Should -BeTrue
+
+            $actual['Sheet1'].Count | Should -Be 9
+            $actual['Sheet2'].Count | Should -Be 12
+        }
+    }
+}

__tests__/ImportExcelTests/ReadMultipleXLSXFiles.tests.ps1

@@ -3,7 +3,7 @@ Param()
 
 Import-Module $PSScriptRoot\..\..\ImportExcel.psd1 -Force
 
-Describe "Test reading multiple XLSX files of differernt row count" -Tag ReadMultipleXLSX {
+Describe "Test reading multiple XLSX files of different row count" -Tag ReadMultipleXLSX {
     It "Should find these xlsx files" {
         Test-Path -Path $PSScriptRoot\rows05.xlsx | Should -BeTrue
         Test-Path -Path $PSScriptRoot\rows10.xlsx | Should -BeTrue

changelog.md

@@ -1,3 +1,6 @@
+# 7.6.0
+- Fix -StartRow and -StartColumn being ignored.
+
 # v7.5.2
 - Changed the switch `-NotAsDictionary` to `-Raw`. Works with `-Worksheetname *` reads all the sheets in the xlsx file and returns an array.