fixed duplicate shifts under certain circumstances

config.json

@@ -1,32 +1,47 @@
 {
-    "monday": {
+  "monday": {
-        "ds": "jiri.kotlan@itego.cz",
+    "ds": "jiri.kotlan@itego.cz",
-        "ho": ["milan.husak@itego.cz"],
+    "ho": ["milan.husak@itego.cz"],
-        "os": ["vaclav.spaninger@itego.cz","roman.lesyk@itego.cz","jan.zazvonil@itego.cz"],
+    "os": [
-        "ns": []
+      { "email": "vaclav.spaninger@itego.cz", "customer": "KB" },
-    },
+      { "email": "roman.lesyk@itego.cz", "customer": "KB" },
-    "tuesday": {
+      { "email": "jan.zazvonil@itego.cz", "customer": "Pragolab" }
-        "ds": "milan.husak@itego.cz",
+    ],
-        "ho": ["jiri.kotlan@itego.cz"],
+    "ns": []
-        "os": ["vaclav.spaninger@itego.cz","roman.lesyk@itego.cz"],
+  },
-        "ns": ["jan.zazvonil@itego.cz"]
+  "tuesday": {
-    },
+    "ds": "milan.husak@itego.cz",
-    "wednesday": {
+    "ho": ["jiri.kotlan@itego.cz"],
-        "ds": "jiri.kotlan@itego.cz",
+    "os": [
-        "ho": ["jiri.kotlan@itego.cz"],
+      { "email": "vaclav.spaninger@itego.cz", "customer": "KB" },
-        "os": ["vaclav.spaninger@itego.cz","roman.lesyk@itego.cz"],
+      { "email": "roman.lesyk@itego.cz", "customer": "KB" }
-        "ns": ["jan.zazvonil@itego.cz"]
+    ],
-    },
+    "ns": ["jan.zazvonil@itego.cz"]
-    "thursday": {
+  },
-        "ds": "milan.husak@itego.cz",
+  "wednesday": {
-        "ho": ["milan.husak@itego.cz"],
+    "ds": "jiri.kotlan@itego.cz",
-        "os": ["vaclav.spaninger@itego.cz","roman.lesyk@itego.cz"],
+    "ho": ["jiri.kotlan@itego.cz"],
-        "ns": ["jan.zazvonil@itego.cz"]
+    "os": [
-    },
+      { "email": "vaclav.spaninger@itego.cz", "customer": "KB" },
-    "friday": {
+      { "email": "roman.lesyk@itego.cz", "customer": "KB" }
-        "ds": "roman.lesyk@itego.cz",
+    ],
-        "ho": [],
+    "ns": ["jan.zazvonil@itego.cz"]
-        "os": ["jan.zazvonil@itego.cz"],
+  },
-        "ns": []
+  "thursday": {
-    }
+    "ds": "milan.husak@itego.cz",
+    "ho": ["milan.husak@itego.cz"],
+    "os": [
+      { "email": "vaclav.spaninger@itego.cz", "customer": "KB" },
+      { "email": "roman.lesyk@itego.cz", "customer": "KB" }
+    ],
+    "ns": ["jan.zazvonil@itego.cz"]
+  },
+  "friday": {
+    "ds": "roman.lesyk@itego.cz",
+    "ho": [],
+    "os": [
+      { "email": "jan.zazvonil@itego.cz", "customer": "Pragolab" }
+    ],
+    "ns": []
+  }
 }

shifts.ps1

@@ -56,30 +56,31 @@ function Set-Shift {
     }
 
     if($script:noplan -eq $false) {
-        $newShift = New-MgTeamScheduleShift -TeamId $teamID -BodyParameter $params -Headers @{ "MS-APP-ACTS-AS" = $userIdAdmin }
+        $newshift = New-MgTeamScheduleShift -TeamId $teamID -BodyParameter $params -Headers @{ "MS-APP-ACTS-AS" = $userIdAdmin }
-        Write-Debug("{0} {1}: setting {2}'s shift - {3} {4}-{5}" -f $dayDate, $dayDate.DayOfWeek, $mail, $shiftName, $StartDate, $EndDate)
+        Write-Debug("{0} {1}: setting {2}'s shift - {3} {4}-{5}" -f $dayDate.Date, $dayDate.DayOfWeek, $mail, $shiftName, $StartDate, $EndDate)
     }
     else {
-        Write-Debug("{0} {1}: Not setting {2}'s shift - {3} {4}-{5} - running with -noplan" -f $dayDate, $dayDate.DayOfWeek, $mail, $shiftName, $StartDate, $EndDate)
+        Write-Debug("{0} {1}: Not setting {2}'s shift - {3} {4}-{5} - running with -noplan" -f $dayDate.Date, $dayDate.DayOfWeek, $mail, $shiftName, $StartDate, $EndDate)
         $newshift = 0
     }
     
 
-    return $newShift
+    return $newshift
 }
 
 function Remove-Shift {
     param(
         [PSCustomObject]$shift,
-        [string]$teamID
+        [string]$teamID,
+        [string]$removal_email
     )
 
     if($script:noplan -eq $false) {
-        Write-Debug("{0} {1}: removing {2}'s shift - {2} {3}-{4}" -f $dayDate, $dayDate.DayOfWeek, $futureds_email, $shift.Notes, $shift.StartDateTime, $shift.EndDateTime)
+        Write-Debug("{0} {1}: removing {2}'s shift - {3} {4}-{5}" -f $dayDate.Date, $dayDate.DayOfWeek, $removal_email, $shift.SharedShift.Notes, $shift.SharedShift.StartDateTime, $shift.SharedShift.EndDateTime)
         Remove-MgTeamScheduleShift -ShiftId $shift.id -TeamId $teamID
     }
     else {
-        Write-Debug("{0} {1}: Not removing {2}'s shift - {2} {3}-{4} - running with -noplan" -f $dayDate, $dayDate.DayOfWeek, $futureds_email, $shift.Notes, $shift.StartDateTime, $shift.EndDateTime)
+        Write-Debug("{0} {1}: Not removing {2}'s shift - {3} {4}-{5} - running with -noplan" -f $dayDate.Date, $dayDate.DayOfWeek, $removal_email, $shift.SharedShift.Notes, $shift.SharedShift.StartDateTime, $shift.SharedShift.EndDateTime)
     }
 }
 
@@ -92,7 +93,7 @@ function Invoke-HasTimeOff {
 
     foreach ($toff in $timeoff) {
         if($toff.UserId -eq $UID) {
-            Write-Debug("{0} {1}: {2} has time off" -f $dayDate, $dayDate.DayOfWeek, $mail)
+            Write-Debug("{0} {1}: {2} has time off" -f $dayDate.Date, $dayDate.DayOfWeek, $mail)
             return $true
             break
         }
@@ -108,7 +109,7 @@ function Invoke-HasShift {
 
     foreach ($shift in $shifts) {
         if($shift.UserId -eq $UID) {
-            Write-Debug("{0} {1}: {2} has a shift already - {3} {4}-{5}" -f $dayDate, $dayDate.DayOfWeek, $mail, $shift.SharedShift.Notes, $shift.SharedShift.StartDateTime, $shift.SharedShift.EndDateTime)
+            Write-Debug("{0} {1}: {2} has a shift already - {3} {4}-{5}" -f $dayDate.Date, $dayDate.DayOfWeek, $mail, $shift.SharedShift.Notes, $shift.SharedShift.StartDateTime, $shift.SharedShift.EndDateTime)
             return $true
             break
         }
@@ -126,7 +127,7 @@ function Invoke-HasShiftorTimeOff {
 
     foreach ($shift in $shifts) {
         if($shift.UserId -eq $UID) {
-            Write-Debug("{0} {1}: {2} has a shift already - {3} {4}-{5}" -f $dayDate, $dayDate.DayOfWeek, $mail, $shift.SharedShift.Notes, $shift.SharedShift.StartDateTime, $shift.SharedShift.EndDateTime)
+            Write-Debug("{0} {1}: {2} has a shift already - {3} {4}-{5}" -f $dayDate.Date, $dayDate.DayOfWeek, $mail, $shift.SharedShift.Notes, $shift.SharedShift.StartDateTime, $shift.SharedShift.EndDateTime)
             return $true
             break
         }
@@ -134,7 +135,7 @@ function Invoke-HasShiftorTimeOff {
 
     foreach ($toff in $timeoff) {
         if($toff.UserId -eq $UID) {
-            Write-Debug("{0} {1}: {2} has time off" -f $dayDate, $dayDate.DayOfWeek, $mail)
+            Write-Debug("{0} {1}: {2} has time off" -f $dayDate.Date, $dayDate.DayOfWeek, $mail)
             return $true
             break
         }
@@ -165,11 +166,14 @@ $schedule = Get-Content -Path "./config.json" -Raw | ConvertFrom-Json
 
 # ---| ALL MEMBERS SPECIFIED IN THE SCHEDULE |---
 $allemails = $schedule.PSObject.Properties | ForEach-Object {
-    if ($_.Name -in @("monday", "tuesday", "wednesday", "thursday", "friday")) {
+    if ($_.Name -in @("Monday", "Tuesday", "Wednesday", "Thursday", "Friday")) {
         $_.Value.PSObject.Properties | ForEach-Object {
             if ($_.Name -in @("ds", "ho", "os", "ns")) {
-                $_.Value | ForEach-Object {
+                if ($_.Name -eq "os") {
-                    $_
+                    $_.Value | ForEach-Object { $_.email }
+                }
+                else {
+                    $_.Value | ForEach-Object { $_ }
                 }
             }
         }
@@ -182,10 +186,11 @@ $allemails = $schedule.PSObject.Properties | ForEach-Object {
 $today = (Get-Date).Date
 
 # ---| Specific date |---
-#$today = Get-Date -Day 20 -Month 10 -Year 2025 -Hour 9 -Minute 00 -Second 00 -Millisecond 00
+#$today = Get-Date -Day 1 -Month 1 -Year 2026 -Hour 9 -Minute 00 -Second 00 -Millisecond 00
 
 $daysahead = 14 #How many days ahead to plan
 $timeoff_past_look = -7 #How many days to look into the past for the start of a multi-day time off
+$ds_replace_daysahead = 14 #How many days ahead do we look for a day-shift replacement
 
 # ---| Time span |---
 $startSpanDate = Get-Date -Day $today.Day -Month $today.Month -Year $today.Year -Hour 9 -Minute 00 -Second 00 -Millisecond 00
@@ -195,6 +200,7 @@ $endSpanDate = Get-Date -Day $startSpanDate.AddDays($daysahead).Day -Month $star
 
 $rlcz_mtnc_email = "jiri.kotlan@itego.cz"
 $rlcz_shift_reduction = -3 #How many hours does the next day shift get reduced by
+#$rlcz_maintenance_length = 4
 
 # --------------------------- | MAIN SCRIPT | ---------------------------
 
@@ -209,7 +215,7 @@ try {
     if ($clear) {
         foreach ($shift in $allshifts) {
             if($shift.SharedShift.Notes -ne "RLCZ") {
-                Remove-Shift -shift $shift -teamID $team.Id
+                Remove-Shift -shift $shift -teamID $team.Id -removal_email "someone"
             }
         }
        return
@@ -225,7 +231,7 @@ try {
 
         # ---| WEEKEND CHECK |---
         if($dayDate.DayOfWeek -in  @("Saturday", "Sunday")) {
-            Write-Debug("{0} {1}: skipping weekend day" -f $dayDate, $dayDate.DayOfWeek)
+            Write-Debug("{0} {1}: skipping weekend day" -f $dayDate.Date, $dayDate.DayOfWeek)
             continue
         }
 
@@ -233,7 +239,7 @@ try {
         $holiday_response = (Invoke-WebRequest -Uri "https://svatky.steelants.cz/api/$($dayDate.ToString('yyyy-MM-dd'))" -Method GET -Headers $headers_holiday) | ConvertFrom-Json
 
         if($holiday_response.isPublicHoliday) {
-            Write-Debug("{0} {1}: skipping holiday" -f $dayDate, $dayDate.DayOfWeek)
+            Write-Debug("{0} {1}: skipping holiday" -f $dayDate.Date, $dayDate.DayOfWeek)
             continue
         }
 
@@ -241,7 +247,8 @@ try {
         $ds_shift_inplace = $false
         $ho_emails = $schedule.($dayDate.DayOfWeek.ToString().ToLower()).'ho'
         $ds_email = $schedule.($dayDate.DayOfWeek.ToString().ToLower()).'ds'
-        $os_emails = $schedule.($dayDate.DayOfWeek.ToString().ToLower()).'os'
+        $os_entries = $schedule.($dayDate.DayOfWeek.ToString().ToLower()).'os'
+        $os_emails = $os_entries | ForEach-Object { $_.email }
         $ns_emails = $schedule.($dayDate.DayOfWeek.ToString().ToLower()).'ns'
 
         # ---| TIME SYNC |---
@@ -258,7 +265,7 @@ try {
 
         # ---| TODAY'S SHIFTS AND TIME OFF |---
         $shifts_today = [Object[]] $allshifts | Where-Object -Filter { 
-            $_.schedulingGroupId -eq $group.Id -and $_.SharedShift.StartDateTime.ToString("yyyy-MM-dd HH:mm") -ge $dateStart.ToString("yyyy-MM-dd HH:mm") -and $_.SharedShift.EndDateTime.ToString("yyyy-MM-dd HH:mm") -le $dateEnd.ToString("yyyy-MM-dd HH:mm") 
+            $_.schedulingGroupId -eq $group.Id -and $_.SharedShift.StartDateTime.ToString("yyyy-MM-dd HH:mm") -ge $dateStart.ToString("yyyy-MM-dd HH:mm") -and $_.SharedShift.EndDateTime.ToString("yyyy-MM-dd HH:mm") -le $dateEnd.ToString("yyyy-MM-dd HH:mm")
         }
 
         $timeoff_today = [Object[]] $timeoff_all | Where-Object {
@@ -270,21 +277,80 @@ try {
             
         if ($null -eq $manual_dayshifts) {
             $ds_shift_inplace = $false
-            Write-Debug("{0} {1}: day shift not yet set" -f $dayDate, $dayDate.DayOfWeek)
+            Write-Debug("{0} {1}: day shift not yet set" -f $dayDate.Date, $dayDate.DayOfWeek)
         }
         else {
             $ds_shift_inplace = $true
-            Write-Debug("{0} {1}: day shift set already" -f $dayDate, $dayDate.DayOfWeek)
+            Write-Debug("{0} {1}: day shift set already" -f $dayDate.Date, $dayDate.DayOfWeek)
         }
 
         # ---| TEAM MEMBER LOOP |---
         foreach($email in $allemails) {
             $userId = $(Get-MgUser -Filter "UserPrincipalName eq '$email' or proxyAddresses/any(c:c eq 'smtp:$email')").Id
 
+            # ---| TIME OFF AND SHIFT OVERLAP CHECK |---
+        #   if(Invoke-HasTimeOff -UID $userId -timeoff $timeoff_today -mail $email) {
+        #       if(Invoke-HasShift -UID $userId -shifts $shifts_today -mail $email) {
+        #           Write-Debug("{0} {1}: {2} has approved time-off and a shift, checking overlap..." -f $dayDate.Date, $dayDate.DayOfWeek, $email)
+        #          
+        #           # ---| IDENTIFY SHIFT AND TIME OFF VARIABLES |---
+        #           foreach($shift in $shifts_today) {
+        #               if($shift.UserId -eq $userId) {
+        #                   $overlap_shift = $shift
+        #               }
+        #           }
+        #           foreach($timeoff in $timeoff_today) {
+        #               if($timeoff.UserId -eq $userId) {
+        #                   $overlap_timeoff = $timeoff
+        #               }
+        #           }
+        #           if(($null -eq $overlap_shift) -or ($null -eq $overlap_timeoff)) {
+        #           Write-Debug("{0} {1}: {2} couldn't find the specific shift or time off, ignoring..." -f $dayDate.Date, $dayDate.DayOfWeek, $email)
+        #           continue
+        #           }
+        #
+        #           # ---| OVERLAP CHECK |---
+        #           if($overlap_shift.SharedShift.StartDateTime.ToString("yyyy-MM-dd HH:mm") -ge $overlap_timeoff.SharedTimeOff.StartDateTime.ToString("yyyy-MM-dd HH:mm")) {
+        #               Write-Debug("{0} {1}: {2} today's shift starts after today's time off starts..." -f $dayDate.Date, $dayDate.DayOfWeek, $email)
+        #               if($overlap_shift.SharedShift.StartDateTime.ToString("yyyy-MM-dd HH:mm") -lt $overlap_timeoff.SharedTimeOff.EndDateTime.ToString("yyyy-MM-dd HH:mm")) {
+        #                   Write-Debug("{0} {1}: {2} today's shift starts before today's time off ends... overlap found" -f $dayDate.Date, $dayDate.DayOfWeek, $email)
+        #                   Remove-Shift -shift $overlap_shift -teamID $team.Id -removal_email $email
+        #                   $allshifts = $allshifts | Where-Object { $_.SharedShift.Id -ne $overlap_shift.SharedShift.Id }
+        #               }
+        #               else {
+        #                   Write-Debug("{0} {1}: {2} today's shift starts after today's time off ends... no overlap" -f $dayDate.Date, $dayDate.DayOfWeek, $email)
+        #               }
+        #           }
+        #       }
+        #   }
+
+            # ---| RLCZ MAINTENANCE PLANNER |---
+            #if($dayDate.DayOfWeek -eq 'Wednesday') {
+            #    if($email -eq $rlcz_mtnc_email) {
+            #        $tuesdaynumber = (1..$dayDate.Day | ForEach-Object {
+            #            (Get-Date -Year $dayDate.Year -Month $dayDate.Month -Day $_).DayOfWeek
+            #        } | Where-Object { $_ -eq 'Tuesday' }).Count
+
+            #        if($tuesdaynumber -ge 2 -and $tuesdaynumber -le 4) {
+            #            Write-Debug("{0} {1}: yesterday was Tuesday number {3}, planning RLCZ maintenance shift" -f $dayDate.Date, $dayDate.DayOfWeek, $email, $tuesdaynumber)
+             #           $rlcz_starttime = $dateEnd.AddHours(1)
+            #            $rlcz_endtime = $rlcz_starttime.AddHours($rlcz_maintenance_length)
+            #            $rlcz_shifts = [Object[]] $allshifts | Where-Object -Filter { $_.schedulingGroupId -eq $group.Id -and $_.SharedShift.Notes -eq "RLCZ" -and ($_.SharedShift.StartDateTime.ToString("yyyy-MM-dd HH:mm") -eq $rlcz_starttime.ToString("yyyy-MM-dd HH:mm") -and $_.SharedShift.EndDateTime.ToString("yyyy-MM-dd HH:mm") -eq $rlcz_endtime.ToString("yyyy-MM-dd HH:mm")) }
+            #            if(Invoke-HasShift -UID $userId -shifts $rlcz_shifts -mail $email) {
+            #                Write-Debug("{0} {1}: RLCZ maintenance shift is already set for {2}" -f $dayDate.Date, $dayDate.DayOfWeek, $email)
+            #            }
+            #            else {
+            #                $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName "RLCZ" -StartDate $rlcz_starttime -EndDate $rlcz_endtime -color "yellow" -teamID $team.id -mail $email
+            #                $allshifts += [Object[]] $newshift
+            #            }
+            #        }
+            #    }
+            #}
+
             # ---| DAY SHIFT CHECK |---
             if($ds_shift_inplace -eq $false) {
                 if($email -eq $ds_email) {
-                    Write-Debug("{0} {1}: checking {2} for day shift availability..." -f $dayDate, $dayDate.DayOfWeek, $email)
+                    Write-Debug("{0} {1}: checking {2} for day shift availability..." -f $dayDate.Date, $dayDate.DayOfWeek, $email)
 
                     # ---| IF DAY SHIFT CAN BE ASSIGNED TO THE PROPER MEMEBER |---
                     if((Invoke-HasShiftorTimeOff -UID $userId -shifts $shifts_today -timeoff $timeoff_today -mail $email) -eq $false) {
@@ -298,7 +364,7 @@ try {
                         # ---| OFFICE DAY SHIFT |---
                         else {
                             $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName "Office - Denní směna" -StartDate $dateStart -EndDate $dateEnd -color "purple" -teamID $team.id -mail $email
-                            $allshifts += [Object[]] $newShift
+                            $allshifts += [Object[]] $newshift
                             $ds_shift_inplace = $true
                             continue
                         }
@@ -306,11 +372,10 @@ try {
 
                     # ---| DAY SHIFT REPLACEMENT CHECK |---
                     else { 
-                        Write-Debug("{0} {1}: looking ahead for a day shift replacement" -f $dayDate, $dayDate.DayOfWeek)
+                        Write-Debug("{0} {1}: looking ahead for a day shift replacement" -f $dayDate.Date, $dayDate.DayOfWeek)
-                        $remainingdays = $timespan.Days - $dayNumber
                         
                         # ---| FUTURE DAYS LOOP |---
-                        for ($daysahead = 1; $daysahead -lt $remainingdays; $daysahead++) {
+                        for ($daysahead = 1; $daysahead -lt $ds_replace_daysahead; $daysahead++) {
                             $futureday = $dayDate.AddDays($daysahead)
 
                             # ---| WEEKEND CHECK |---
@@ -327,9 +392,15 @@ try {
                             # ---| THE NEXT IN LINE FOR THE DAY-SHIFT DOESN'T HAVE TIME OFF, NO-SHIFT OR ON-SITE |---
                             if((Invoke-HasTimeOff -UID $futureds_id -timeoff $timeoff_today -mail $futureds_email) -eq $false -and ($futureds_email -notin $os_emails) -and ($futureds_email -notin $ns_emails)) {
                                 
+                                # ---| UPDATE COLLECTION OF SHIFTS TODAY |---
+                                $shifts_today = [Object[]] $allshifts | Where-Object -Filter { 
+                                    $_.schedulingGroupId -eq $group.Id -and $_.SharedShift.StartDateTime.ToString("yyyy-MM-dd HH:mm") -ge $dateStart.ToString("yyyy-MM-dd HH:mm") -and $_.SharedShift.EndDateTime.ToString("yyyy-MM-dd HH:mm") -le $dateEnd.ToString("yyyy-MM-dd HH:mm") 
+                                }
+                                
                                 # ---| NEXT IN LINE DOESN'T HAVE A SHIFT ALREADY |---
                                 if((Invoke-HasShift -UID $futureds_id -shifts $shifts_today -mail $futureds_email) -eq $false) {
 
+
                                     # ---| HOME-OFFICE DAY SHIFT |---
                                     if($futureds_email -in $ho_emails) {
                                         $newshift = Set-Shift -userId $futureds_id -groupID $group.id -shiftName "Home Office - Denní směna" -StartDate $dateStart -EndDate $dateEnd -color "purple" -teamID $team.id -mail $futureds_email
@@ -340,7 +411,7 @@ try {
                                     # ---| OFFICE DAY SHIFT |---
                                     else {
                                         $newshift = Set-Shift -userId $futureds_id -groupID $group.id -shiftName "Office - Denní směna" -StartDate $dateStart -EndDate $dateEnd -color "purple" -teamID $team.id -mail $futureds_email
-                                        $allshifts += [Object[]] $newShift
+                                        $allshifts += [Object[]] $newshift
                                         $ds_shift_inplace = $true
                                         break
                                     }
@@ -351,7 +422,8 @@ try {
                                     foreach ($shift in $shifts_today) {
                                         if($shift.UserId -eq $futureds_id -and $shift.SharedShift.Notes -ne "On-site") {
                                             # ---| REMOVE THE SHIFT |---
-                                            Remove-Shift -shift $shift -teamID $team.Id
+                                            Remove-Shift -shift $shift -teamID $team.Id -removal_email $futureds_email
+                                            $allshifts = $allshifts | Where-Object { $_.SharedShift.Id -ne $shift.SharedShift.Id }
                                             
                                             # ---| HOME-OFFICE DAY SHIFT |---
                                             if($futureds_email -in $ho_emails) {
@@ -363,7 +435,7 @@ try {
                                             # ---| OFFICE DAY SHIFT |---
                                             else {
                                                 $newshift = Set-Shift -userId $futureds_id -groupID $group.id -shiftName "Office - Denní směna" -StartDate $dateStart -EndDate $dateEnd -color "purple" -teamID $team.id -mail $futureds_email
-                                                $allshifts += [Object[]] $newShift
+                                                $allshifts += [Object[]] $newshift
                                                 $ds_shift_inplace = $true
                                                 break
                                             }
@@ -391,8 +463,12 @@ try {
 
             # ---| ON-SITE SHIFT CHECK |---
             if($email -in $os_emails) {
+                $entry = $os_entries | Where-Object { $_.email -eq $email }
+                $customer = $entry.customer
+                $os_shift_name = ("On-Site - {0}" -f $customer)
+
                 if((Invoke-HasShiftorTimeOff -UID $userId -shifts $shifts_today -timeoff $timeoff_today -mail $email) -eq $false) {
-                    $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName "On-site" -StartDate $dateStart -EndDate $dateEnd -color "white" -teamID $team.id -mail $email
+                    $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName $os_shift_name -StartDate $dateStart -EndDate $dateEnd -color "white" -teamID $team.id -mail $email
                     $allshifts += [Object[]] $newshift
                     continue
                 }
@@ -400,7 +476,7 @@ try {
 
             # ---| NO-SHIFT CHECK |---
             if($email -in $ns_emails) {
-                Write-Debug("{0} {1}: {2} has no-shift defined for today" -f $dayDate, $dayDate.DayOfWeek, $email)
+                Write-Debug("{0} {1}: {2} has no-shift defined for today" -f $dayDate.Date, $dayDate.DayOfWeek, $email)
                 continue
             }
 
@@ -413,7 +489,7 @@ try {
                     if (Invoke-HasShift -UID $userId -shifts $rlcz_shifts -mail $email) {
                         if((Invoke-HasShiftorTimeOff -UID $userId -shifts $shifts_today -timeoff $timeoff_today -mail $email) -eq $false) {
                             if($email -in $ho_emails) {
-                                $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName "Home office" -StartDate $dateStart -EndDate $dateEnd.AddHours($rlcz_shift_reduction) -color "pink" -teamID $team.id -mail $email
+                                $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName "Home Office" -StartDate $dateStart -EndDate $dateEnd.AddHours($rlcz_shift_reduction) -color "pink" -teamID $team.id -mail $email
                                 $allshifts += [Object[]] $newshift
                                 continue
                             }
@@ -430,7 +506,7 @@ try {
             # ---| HOME-OFFICE CHECK |---
             if($email -in $ho_emails) {
                 if((Invoke-HasShiftorTimeOff -UID $userId -shifts $shifts_today -timeoff $timeoff_today -mail $email) -eq $false) {
-                    $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName "Home office" -StartDate $dateStart -EndDate $dateEnd -color "pink" -teamID $team.id -mail $email
+                    $newshift = Set-Shift -userId $userId -groupID $group.id -shiftName "Home Office" -StartDate $dateStart -EndDate $dateEnd -color "pink" -teamID $team.id -mail $email
                     $allshifts += [Object[]] $newshift
                     continue
                 }