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

fix: sort occurrences in the right order

Browse Source
This commit is contained in:
Wolfgang Witt 2021-03-18 16:23:50 +01:00 committed by Gregor Kleen
parent 30fb1462ab
commit 732df50530
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,7 +417,7 @@ examAutoOccurrence (hash -> seed) rule ExamAutoOccurrenceConfig{..} occurrences
ignoredOccurrences :: ExamAutoOccurrenceIgnoreRooms ignoredOccurrences :: ExamAutoOccurrenceIgnoreRooms
-- ^ will always be EAOIRManual with eaoirSorted noting if occurrences were downwards sorted by size -- ^ will always be EAOIRManual with eaoirSorted noting if occurrences were downwards sorted by size
(occurrences'', ignoredOccurrences) = case eaocIgnoreRooms of (occurrences'', ignoredOccurrences) = case eaocIgnoreRooms of
EAOIRManual {..} -> ((if eaoirmSorted then sortOn (Down . view _2) else id) $ Map.toList $ Map.withoutKeys occurrences' eaoirmIgnored, eaocIgnoreRooms) EAOIRManual {..} -> ((if eaoirmSorted then sortOn (view _2) else id) $ Map.toList $ Map.withoutKeys occurrences' eaoirmIgnored, eaocIgnoreRooms)
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
@ -467,6 +467,7 @@ examAutoOccurrence (hash -> seed) rule ExamAutoOccurrenceConfig{..} occurrences
where where
restrictedLines :: [(lineId, Natural)] restrictedLines :: [(lineId, Natural)]
unrestrictedLines :: [lineId] unrestrictedLines :: [lineId]
-- partitionRestricted reverses the order of occurrences
(unrestrictedLines, restrictedLines) = partitionRestricted ([], []) lineLengths (unrestrictedLines, restrictedLines) = partitionRestricted ([], []) lineLengths
-- reorder so unrestricted lines are at the end and my be left empty -- reorder so unrestricted lines are at the end and my be left empty