diff --git a/repositories/officeHour.go b/repositories/officeHour.go index 21dae2b..a5de5ad 100644 --- a/repositories/officeHour.go +++ b/repositories/officeHour.go @@ -240,7 +240,9 @@ func (r *OfficeHourRepo) NumberByTimeSpanAndRoom(date models.Date, duration int, for _, officeHour := range officeHours { // increase count if officehour starts before this point in time and ends later if models.DateLess(officeHour.Date, models.GetEndDate(date, minute, false)) && models.DateLess(models.GetEndDate(date, minute, false), models.GetEndDate(officeHour.Date, officeHour.Duration, false)) { - minuteCount += 1 + if date.Week == 0 || officeHour.Week == 0 || date.Week == officeHour.Week { // office hours in alternating weeks should not collide + minuteCount += 1 + } } } if minuteCount > count {