Skip to content

Commit a180a03

Browse files
authored
Merge pull request #2529 from microsoft/QuickExceptions
Quick exceptions
2 parents 232ba3a + 6741d8f commit a180a03

10 files changed

Lines changed: 1272 additions & 94 deletions

Calendar/CalLogHelpers/CalLogCSVFunctions.ps1

Lines changed: 560 additions & 13 deletions
Large diffs are not rendered by default.

Calendar/CalLogHelpers/CalLogExportFunctions.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function Export-CalLog {
5555
}
5656

5757
function Export-CalLogCSV {
58-
$GCDOResults | Export-Csv -Path $Filename -NoTypeInformation -Encoding UTF8
58+
$script:EnhancedCalLogs | Export-Csv -Path $Filename -NoTypeInformation -Encoding UTF8
5959
$script:GCDO | Export-Csv -Path $FilenameRaw -NoTypeInformation -Encoding UTF8
6060
}
6161

Calendar/CalLogHelpers/CreateTimelineRow.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function CreateTimelineRow {
8686
}
8787

8888
$Extra = ""
89-
if ($CalLog.CalendarItemType -eq "Exception") {
89+
if (IsExceptionLog $CalLog) {
9090
$Extra = " to the meeting starting $($CalLog.StartTime)"
9191
} elseif ($CalLog.AppointmentRecurring) {
9292
$Extra = " to the meeting series"
@@ -112,7 +112,7 @@ function CreateTimelineRow {
112112
Forward.Notification {
113113
[array] $Output = "The meeting was FORWARDED by [$($CalLog.Organizer)]."
114114
}
115-
Exception {
115+
Exception* {
116116
if ($CalLog.ResponsibleUser -ne "Calendar Assistant") {
117117
[array] $Output = "[$($CalLog.ResponsibleUser)] $($CalLog.TriggerAction)d Exception starting $($CalLog.StartTime) to the meeting series with $($CalLog.Client)."
118118
}

0 commit comments

Comments
 (0)