From 16c556b852501a5e6c88094556f5054c4d4f352b Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 27 Jun 2019 18:48:15 +0200
Subject: [PATCH] fix(correction assignment): correcting lecturer's names are
 shown now

Table only shows sheet correctors, but lecturers may occasionally
correct too
---
 src/Handler/Corrections.hs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index ddf820d18..c3a2574fe 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -1085,7 +1085,7 @@ assignHandler tid ssh csh cid assignSids = do
   (btnWdgt, btnResult) <- runButtonForm FIDAssignSubmissions
 
   -- gather data
-  (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment) <- runDB $ do
+  (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment, lecturerNames) <- runDB $ do
       -- cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
       nrParticipants <- count [CourseParticipantCourse ==. cid]
 
@@ -1141,6 +1141,12 @@ assignHandler tid ssh csh cid assignSids = do
               in  Map.insertWith (\(usr, ma) (_, mb) -> (usr, Map.union ma mb))  uid (user, Map.singleton shn sheetcorr) acc
             )
 
+      -- lecturerNames :: Map UserId User
+      lecturerNames <- fmap entities2map $ E.select $ E.from $ \(user `E.InnerJoin` lecturer) -> do
+          E.on $ user E.^. UserId E.==. lecturer E.^. LecturerUser
+          E.where_ $ lecturer E.^. LecturerCourse E.==. E.val cid
+          return user
+
       submissions <- E.select . E.from $ \submission -> do
           E.where_ $ submission E.^. SubmissionSheet `E.in_` E.valList sheetIds
           let numSubmittors = E.sub_select . E.from $ \subUser -> do
@@ -1173,7 +1179,7 @@ assignHandler tid ssh csh cid assignSids = do
                             }
               in Map.insertWith (Map.unionWith (<>)) shnm cinf m
 
-      return (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment)
+      return (assignSheetNames, nrParticipants, groupsPossible, infoMap, correctorMap, assignment, lecturerNames)
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
       -- create aggregate maps
@@ -1203,7 +1209,6 @@ assignHandler tid ssh csh cid assignSids = do
       corrInfos = sortBy (compare `on` (byName . ciCorrector) ) $ Map.elems corrMap
         where byName Nothing    = Nothing
               byName (Just uid) = Map.lookup uid correctorMap
-
       corrMapSum :: CorrectionInfo
       corrMapSum = fold corrMap
 
@@ -1213,6 +1218,8 @@ assignHandler tid ssh csh cid assignSids = do
       getCorrector (Just uid)
         | Just (User{..},loadMap) <- Map.lookup uid correctorMap
         = (nameEmailWidget userEmail userDisplayName userSurname, loadMap)
+        | Just (User{..} ) <- Map.lookup uid lecturerNames
+        = (nameEmailWidget userEmail userDisplayName userSurname, mempty)  -- lecturers may also correct in rare cases
       getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty)
       -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo