diff --git a/backend/handlers/scheduling/default-hours.go b/backend/handlers/scheduling/default-hours.go index 1feccd6..09b5e90 100644 --- a/backend/handlers/scheduling/default-hours.go +++ b/backend/handlers/scheduling/default-hours.go @@ -382,17 +382,14 @@ func GetWorkingHours(w http.ResponseWriter, r *http.Request) { day.EndTime = applied.EndTime day.IsOpen = applied.IsOpen day.Source = "exceptional" - } else if stagedChange != nil { - dayDateStr := d.Format("2006-01-02") - if dayDateStr >= stagedChange.EffectiveDate { - for _, sh := range stagedChange.Hours { - if sh.Weekday == weekday { - day.StartTime = sh.StartTime - day.EndTime = sh.EndTime - day.IsOpen = sh.IsOpen - day.Source = "default" - break - } + } else if stagedChange != nil && d.Format("2006-01-02") >= stagedChange.EffectiveDate { + for _, sh := range stagedChange.Hours { + if sh.Weekday == weekday { + day.StartTime = sh.StartTime + day.EndTime = sh.EndTime + day.IsOpen = sh.IsOpen + day.Source = "default" + break } } } else if def, ok := defaultMap[weekday]; ok {