Fachschaft/sprechstunden-go
7
1
Fork 0
Code Issues 8 Pull requests Releases Activity

Berücksichtige zweiwöchentliche Rythmen bei der Raumkapazität

Browse source
This commit is contained in:
Gonne 2022-10-20 08:46:39 +02:00
parent ae3f261047
commit 12a5080659
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
repositories/officeHour.go
View file

@ -240,9 +240,11 @@ func (r *OfficeHourRepo) NumberByTimeSpanAndRoom(date models.Date, duration int,
for _, officeHour := range officeHours { for _, officeHour := range officeHours {
// increase count if officehour starts before this point in time and ends later // 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)) { if models.DateLess(officeHour.Date, models.GetEndDate(date, minute, false)) && models.DateLess(models.GetEndDate(date, minute, false), models.GetEndDate(officeHour.Date, officeHour.Duration, false)) {
if date.Week == 0 || officeHour.Week == 0 || date.Week == officeHour.Week { // office hours in alternating weeks should not collide
minuteCount += 1 minuteCount += 1
} }
} }
}
if minuteCount > count { if minuteCount > count {
count = minuteCount count = minuteCount
} }