From 38e438b7741f4ef62b76c276405afef9e1119c6c Mon Sep 17 00:00:00 2001 From: SJost Date: Fri, 4 May 2018 12:55:23 +0200 Subject: [PATCH] correctorForm just a stub --- src/Foundation.hs | 8 +++++++- src/Handler/Sheet.hs | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index 6173ab602..01b41558c 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -97,7 +97,7 @@ data MenuItem = MenuItem { menuItemLabel :: Text , menuItemIcon :: Maybe Text , menuItemRoute :: Route UniWorX - , menuItemAccessCallback' :: Handler Bool + , menuItemAccessCallback' :: Handler Bool -- Check whether action is shown in ADDITION to authorization (which is always checked) } menuItemAccessCallback :: MenuItem -> Handler Bool @@ -426,6 +426,12 @@ pageActions (CourseR tid csh CourseShowR) = , menuItemRoute = CSheetR tid csh SheetListR , menuItemAccessCallback' = return True } + , PageActionPrime $ MenuItem + { menuItemLabel = "Kurs Editieren" + , menuItemIcon = Nothing + , menuItemRoute = CourseR tid csh CourseEditR + , menuItemAccessCallback' = return True + } ] pageActions (CSheetR tid csh SheetListR) = [ PageActionPrime $ MenuItem diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 0afefdeed..8f3d895cb 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -62,6 +62,7 @@ data SheetForm = SheetForm , sfSolutionFrom :: Maybe UTCTime , sfSolutionF :: Maybe FileInfo -- Keine SheetId im Formular! + , sfCorrectors :: [(UserId,Load)] } @@ -89,7 +90,8 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do <*> fileAFormOpt (fsb "Hinweis") <*> aopt utcTimeField (fsb "Lösung ab") (sfSolutionFrom <$> template) <*> fileAFormOpt (fsb "Lösung") - <* submitButton + <*> formToAForm (correctorForm msId (maybe [] sfCorrectors template)) + -- <* submitButton return $ case result of FormSuccess sheetResult | errorMsgs <- validateSheet sheetResult @@ -118,7 +120,14 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do -- TODO: continue validation here!!! ] ] - +correctorForm :: Maybe SheetId -> [(UserId,Load)] -> MForm Handler (FormResult [(UserId,Load)], [FieldView UniWorX]) +correctorForm _msid templates = do undefined + -- Datenbank UserId -> UserName + -- Eingabelist für Colonnade + -- enthält die benötigten Felder + -- FormResult konstruieren + -- Eingabebox für Korrektor hinzufügen + -- Eingabe für Korrekt ausgefüllt: FormMissing zurückschicken um dann Feld hinzuzufügen -- List Sheets @@ -289,6 +298,7 @@ getSheetEditR tid csh shn = do , sfHintF = Nothing -- TODO , sfSolutionFrom = sheetSolutionFrom , sfSolutionF = Nothing -- TODO + , sfCorrectors = [] -- TODO read correctors from list } let action newSheet = do replaceRes <- myReplaceUnique sid $ newSheet