Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions plexams/invigilators.go
Original file line number Diff line number Diff line change
Expand Up @@ -523,19 +523,21 @@ func (p *Plexams) InvigilatorsForDay(ctx context.Context, day int) (*model.Invig

func dayOkForInvigilator(day int, invigilator *model.Invigilator) (wantDay, canDay bool) {
// day in exlude days?
for _, excludedDay := range invigilator.Requirements.ExcludedDays {
if day == excludedDay {
return false, false
if invigilator.Requirements != nil {
for _, excludedDay := range invigilator.Requirements.ExcludedDays {
if day == excludedDay {
return false, false
}
}
}
for _, examDay := range invigilator.Requirements.ExamDays {
if day == examDay {
return true, true
for _, examDay := range invigilator.Requirements.ExamDays {
if day == examDay {
return true, true
}
}
}
for _, invigilationDay := range invigilator.Todos.InvigilationDays {
if day == invigilationDay {
return true, true
for _, invigilationDay := range invigilator.Todos.InvigilationDays {
if day == invigilationDay {
return true, true
}
}
}
return false, true
Expand Down
Loading