Minor refactor

src/Handler/Sheet.hs

@@ -140,28 +140,24 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do
       ] ]
 
 -- List Sheets
-getSheetListCID :: CourseId -> Handler Html
-getSheetListCID cid = getSheetList =<<
-  (Entity cid) <$> (runDB $ get404 cid)
+-- getSheetListCID :: CourseId -> Handler Html
+-- getSheetListCID cid = getSheetList =<<
+--   (Entity cid) <$> (runDB $ get404 cid)
 
 getSheetListR :: TermId -> Text -> Handler Html
-getSheetListR tid csh = getSheetList =<<
-  (runDB $ getBy404 $ CourseTermShort tid csh)
-
-getSheetList :: Entity Course -> Handler Html
-getSheetList courseEnt = do
+getSheetListR tid csh = do
   -- mbAid <- maybeAuthId
-  let cid    = entityKey courseEnt
-  let course = entityVal courseEnt
-  let csh    = courseShorthand course
-  let tid    = courseTerm course
-  sheets <- runDB $ do
-    rawSheets <- selectList [SheetCourse ==. cid] [Desc SheetActiveFrom]
-    forM rawSheets $ \(Entity sid sheet) -> do
+  (Entity cid course, sheets) <- runDB $ do
+    entCourse <- getBy404 $ CourseTermShort tid csh
+    rawSheets <- selectList [SheetCourse ==. entityKey entCourse] [Desc SheetActiveFrom]
+    sheets <- forM rawSheets $ \(Entity sid sheet) -> do
         let sheetsub = [SubmissionSheet ==. sid]
         submissions <- count sheetsub
         rated       <- count $ (SubmissionRatingTime !=. Nothing):sheetsub
         return (sid, sheet, (submissions, rated))
+    return (entCourse, sheets)
+  let csh = courseShorthand course
+  let tid = courseTerm course
   let colBase = mconcat
         [ headed "Blatt"       $ \(sid,sheet,_) -> simpleLink (toWgt $ sheetName sheet) $ CSheetR tid csh (sheetName sheet) SShowR
         , headed "Abgabe ab"   $ toWgt . formatTimeGerWD . sheetActiveFrom . snd3