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

Minor refactor

Browse Source
This commit is contained in:
SJost 2018-07-06 11:13:40 +02:00
parent 46ef39f40d
commit f49001993c
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Handler/Sheet.hs
View File

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