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

assign submission reports results now

Browse Source
This commit is contained in:
SJost 2018-05-04 10:24:58 +02:00
parent fcc2f68cea
commit 967fb666d9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Handler/Utils/Submission.hs
View File

@ -26,6 +26,7 @@ import qualified Control.Monad.Random as Rand
import Data.Maybe import Data.Maybe
import qualified Data.List as List
import Data.Set (Set) import Data.Set (Set)
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Map (Map, (!?)) import Data.Map (Map, (!?))
@ -47,7 +48,12 @@ data AssignSubmissionException = NoCorrectorsByProportion
instance Exception AssignSubmissionException instance Exception AssignSubmissionException
assignSubmissions :: SheetId -> YesodDB UniWorX () -- | Assigns all submissions according to sheet corrector loads
assignSubmissions ::
SheetId -- ^ Sheet do distribute to correction
-> YesodDB UniWorX (Set SubmissionId -- ^ assigned submissions
,Set SubmissionId -- ^ unassigend submissions (no tutors by load)
)
assignSubmissions sid = do assignSubmissions sid = do
correctors <- selectList [SheetCorrectorSheet ==. sid] [] correctors <- selectList [SheetCorrectorSheet ==. sid] []
let (corrsGroup, (filterNonPositive -> corrsProp)) = partition (is _ByTutorial . sheetCorrectorLoad . entityVal) correctors let (corrsGroup, (filterNonPositive -> corrsProp)) = partition (is _ByTutorial . sheetCorrectorLoad . entityVal) correctors
@ -75,24 +81,22 @@ assignSubmissions sid = do
(smid, Just tutid) -> do (smid, Just tutid) -> do
_1 %= Map.insert smid tutid _1 %= Map.insert smid tutid
when (any ((== tutid) . sheetCorrectorUser . entityVal) corrsProp && countsToLoad' tutid) $ when (any ((== tutid) . sheetCorrectorUser . entityVal) corrsProp && countsToLoad' tutid) $
_2 %= delFirst (Just tutid) _2 %= List.delete (Just tutid)
(smid, Nothing) -> do (smid, Nothing) -> do
(q:qs) <- use _2 (q:qs) <- use _2
_2 .= qs _2 .= qs
case q of case q of
Just q -> _1 %= Map.insert smid q Just q -> _1 %= Map.insert smid q
Nothing -> throwM NoCorrectorsByProportion Nothing -> return () -- NOTE: throwM NoCorrectorsByProportion
forM_ (Map.toList subTutor) $ \(smid, tutid) -> update smid [SubmissionRatingBy =. Just tutid] forM_ (Map.toList subTutor) $ \(smid, tutid) -> update smid [SubmissionRatingBy =. Just tutid]
return () let assignedSubmissions = Map.keysSet subTutor
unassigendSubmissions = Map.keysSet subTutor' \\ assignedSubmissions
return (assignedSubmissions, unassigendSubmissions)
where where
filterNonPositive = filter $ (> 0) . load . sheetCorrectorLoad . entityVal filterNonPositive = filter $ (> 0) . load . sheetCorrectorLoad . entityVal
delFirst _ [] = []
delFirst x (y:ys)
| x == y = ys
| otherwise = y:delFirst x ys