fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: oops

Browse Source
This commit is contained in:
Wolfgang Witt 2021-03-17 17:10:16 +01:00 committed by Gregor Kleen
parent a35a481f33
commit f6cbf99245
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Handler/Exam/AutoOccurrence.hs
View File

@ -62,7 +62,7 @@ examAutoOccurrenceCalculateForm ExamAutoOccurrenceCalculateForm{ eaofConfig }
automaticIfTrue False = EAOIRManual Set.empty automaticIfTrue False = EAOIRManual Set.empty
ignoreRooms :: ExamAutoOccurrenceIgnoreRooms -> Bool ignoreRooms :: ExamAutoOccurrenceIgnoreRooms -> Bool
ignoreRooms EAOIRAutomatic = True ignoreRooms EAOIRAutomatic = True
ignoreRooms (EAOIRManual s) = null s ignoreRooms (EAOIRManual s) = not $ null s
examAutoOccurrenceNudgeForm :: ExamOccurrenceId -> Maybe ExamAutoOccurrenceCalculateForm -> Form ExamAutoOccurrenceCalculateForm examAutoOccurrenceNudgeForm :: ExamOccurrenceId -> Maybe ExamAutoOccurrenceCalculateForm -> Form ExamAutoOccurrenceCalculateForm
examAutoOccurrenceNudgeForm occId protoForm html = do examAutoOccurrenceNudgeForm occId protoForm html = do

2
src/Handler/Utils/Exam.hs
View File

@ -413,7 +413,7 @@ examAutoOccurrence (hash -> seed) rule ExamAutoOccurrenceConfig{..} occurrences
-- If a single occurrence can accommodate all participants, pick the one with -- If a single occurrence can accommodate all participants, pick the one with
-- the least capacity -- the least capacity
(occurrences'', ignoredOccurrences) = case eaocIgnoreRooms of (occurrences'', ignoredOccurrences) = case eaocIgnoreRooms of
(EAOIRManual manuallyIgnored) -> (Map.toList $ Map.restrictKeys occurrences' manuallyIgnored, manuallyIgnored) (EAOIRManual manuallyIgnored) -> (Map.toList $ Map.withoutKeys occurrences' manuallyIgnored, manuallyIgnored)
EAOIRAutomatic -- effect of ticked minimizeRooms Checkbox EAOIRAutomatic -- effect of ticked minimizeRooms Checkbox
| Just largeEnoughs <- fromNullable . filter ((>= Restricted usersCount) . view _2) $ Map.toList occurrences' | Just largeEnoughs <- fromNullable . filter ((>= Restricted usersCount) . view _2) $ Map.toList occurrences'
-> let pickedLargeEnough = minimumBy (comparing $ view _2) largeEnoughs -> let pickedLargeEnough = minimumBy (comparing $ view _2) largeEnoughs