jgaunt/ImportExcel
1
0
Fork 0
mirror of https://github.com/dfinke/ImportExcel.git synced 2025-12-06 00:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

One last bug in compare, and fixed bug #310 in Set-Format

Browse Source
This commit is contained in:
jhoneill
2018-05-02 17:03:13 +01:00
committed by dfinke
parent 8f2dd982c5
commit 6dd928097c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SetFormat.ps1
View File

@@ -150,7 +150,7 @@
if ($Address -is [OfficeOpenXml.ExcelRow] ) {$Address.Height = $Height } if ($Address -is [OfficeOpenXml.ExcelRow] ) {$Address.Height = $Height }
elseif ($Address -is [OfficeOpenXml.ExcelRange] ) { elseif ($Address -is [OfficeOpenXml.ExcelRange] ) {
($Address.Start.Row)..($Address.Start.Row + $Address.Rows) | ($Address.Start.Row)..($Address.Start.Row + $Address.Rows) |
ForEach-Object {$ws.Row($_).Height = $Height } ForEach-Object {$Address.WorkSheet.Row($_).Height = $Height }
} }
else {Write-Warning -Message ("Can set the height of a row or a range but not a {0} object" -f ($Address.GetType().name)) } else {Write-Warning -Message ("Can set the height of a row or a range but not a {0} object" -f ($Address.GetType().name)) }
} }

6
compare-WorkSheet.ps1
View File

@@ -132,7 +132,7 @@
Sort-Object -Property "_Row","File" Sort-Object -Property "_Row","File"
#if BackgroundColor was specified, set it on extra or extra or changed rows #if BackgroundColor was specified, set it on extra or extra or changed rows
if ($BackgroundColor ) { if ($diff -and $BackgroundColor) {
#Differences may only exist in one file. So gather the changes for each file; open the file, update each impacted row in the shee, save the file #Differences may only exist in one file. So gather the changes for each file; open the file, update each impacted row in the shee, save the file
$updates = $diff.where({$_.SideIndicator -ne "=="}) | Group-object -Property "_File" $updates = $diff.where({$_.SideIndicator -ne "=="}) | Group-object -Property "_File"
foreach ($file in $updates) { foreach ($file in $updates) {
@@ -160,7 +160,7 @@
} }
} }
#if font colour was specified, set it on changed properties where the same key appears in both sheets. #if font colour was specified, set it on changed properties where the same key appears in both sheets.
if ($FontColor -and ($propList -contains $Key) ) { if ($diff -and $FontColor -and ($propList -contains $Key) ) {
$updates = $diff.where({$_.SideIndicator -ne "=="}) | Group-object -Property $Key | where {$_.count -eq 2} $updates = $diff.where({$_.SideIndicator -ne "=="}) | Group-object -Property $Key | where {$_.count -eq 2}
if ($updates) { if ($updates) {
$XL1 = Open-ExcelPackage -path $Referencefile $XL1 = Open-ExcelPackage -path $Referencefile
@@ -178,7 +178,7 @@
if (-not $oneFile) {$xl2.Save() ; $xl2.Stream.Close() ; $xl2.Dispose()} if (-not $oneFile) {$xl2.Save() ; $xl2.Stream.Close() ; $xl2.Dispose()}
} }
} }
elseif ($FontColor) {Write-Warning -Message "To match rows to set changed cells, you must specify -Key and it must match one of the included properties" } elseif ($diff -and $FontColor) {Write-Warning -Message "To match rows to set changed cells, you must specify -Key and it must match one of the included properties" }
if ($show) { if ($show) {
Start-Process -FilePath $Referencefile Start-Process -FilePath $Referencefile