sheet display extended, not yet complete

models

@@ -94,8 +94,9 @@ CourseParticipant
 Sheet
     courseId        CourseId
     name            Text
+    description     Html Maybe
     type            SheetType
-    markingText     Text Maybe
+    markingText     Html Maybe
     activeFrom      UTCTime
     activeTo        UTCTime
     hintFrom        UTCTime Maybe

src/Handler/Sheet.hs

@@ -32,8 +32,9 @@ import qualified Data.UUID.Cryptographic as UUID
 data SheetForm = SheetForm
       { sfCourseId     :: Maybe CourseId
       , sfName         :: Text
+      , sfComment      :: Maybe Html
       , sfType         :: SheetType
-      , sfMarkingText  :: Maybe Text
+      , sfMarkingText  :: Maybe Html
       , sfActiveFrom   :: UTCTime
       , sfActiveTo     :: UTCTime
       , sfSheetF       :: Maybe FileInfo
@@ -47,10 +48,11 @@ data SheetForm = SheetForm
 makeSheetForm :: Maybe CourseId -> Maybe SheetForm -> Form SheetForm
 makeSheetForm cid template = identForm FIDsheet $ \html -> do
     (result, widget) <- flip (renderBootstrap3 bsHorizontalDefault) html $ SheetForm
-      <$> areq hiddenField "KursId" (Just cid)
-      <*> areq textField    (fsb "Name") (sfName <$> template)
-      <*> sheetTypeAFormReq (fsb "Bewertung") (sfType <$> template)
-      <*> aopt textField    (fsb "Hinweise zur Bewertung") (sfMarkingText <$> template)
+      <$> areq hiddenField       "KursId"       (Just cid)
+      <*> areq textField    (fsb "Name")        (sfName <$> template)
+      <*> aopt htmlField    (fsb "Hinweise für Teilnehmer")  (sfMarkingText <$> template)
+      <*> sheetTypeAFormReq (fsb "Bewertung")   (sfType <$> template)
+      <*> aopt htmlField    (fsb "Hinweise für Korrektoren") (sfMarkingText <$> template)
       <*> areq utcTimeField (fsb "Abgabe ab")   (sfActiveFrom   <$> template)
       <*> areq utcTimeField (fsb "Abgabefrist") (sfActiveTo     <$> template)
       <*> fileAFormOpt      (fsb "Aufgaben")
@@ -107,7 +109,7 @@ getSheetList courseEnt = do
         rated       <- count $ (SubmissionRatingTime !=. Nothing):sheetsub
         return (sid, sheet, (submissions, rated))
   let colSheets = mconcat
-       [ headed "Blatt"  $ toWgt . sheetName . snd3
+       [ headed "Blatt"       $ toWgt . sheetName . snd3
        , headed "Abgabe ab"   $ toWgt . formatTimeGerWD . sheetActiveFrom . snd3
        , headed "Abgabe bis"  $ toWgt . formatTimeGerWD . sheetActiveTo   . snd3
        , headed "Bewertung"   $ toWgt . show . sheetType . snd3
@@ -143,9 +145,8 @@ getSheetShow entSheet = do
   let sheet = entityVal entSheet
   defaultLayout $ do
     setTitle $ toHtml $ T.append "Übung " $ sheetName sheet
-    -- $(widgetFile "sheetAdmin")
     [whamlet| Under Construction !!! |] -- TODO
-
+    $(widgetFile "sheetAdmin")
 
 getSheetNewR :: TermIdentifier -> Text -> Handler Html
 getSheetNewR tid csh = do

templates/course.hamlet

@@ -24,6 +24,11 @@
                 #{participants}
                 $maybe capacity <- courseCapacity course
                   \ von #{capacity}
+                <br>
+                $maybe regFrom <- courseRegisterFrom course
+                  Anmeldezeitraum: #{formatTimeGerWD regFrom}
+                  $maybe regTo   <- courseRegisterTo   course
+                    \ bis #{formatTimeGerWD regTo}
                 <form method=post action=@{CourseShowR tid csh} enctype=#{regEnctype}>
                   ^{regWidget}
                 

templates/sheetAdmin.hamlet

@@ -9,22 +9,22 @@
             <div .col-lg-12>
                 <div .page-header>                    
 
-                    $maybe descr <- courseDescription course
-                      <h2 #description>Beschreibung
-                      <p> #{descr}  
-                    $maybe link <- courseLinkExternal course
-                      <h4 #linl>Homepage
-                      <a href=#{link}>#{link}
+                    $maybe descr <- sheetDescription sheet
+                      <h2 #description>Hinweise
+                      <p> #{descr}
+                    <h3>Bewertung
+                    <p> #{show $ sheetType sheet}
+                      $maybe marking <- sheetMarkingText sheet
+                        <p> #{marking}
+                    <br>
+                    Freigeschaltet ab:
+                    \  #{formatTimeGerWD $ sheetActiveFrom sheet}
+                    \ Abgabe bis:
+                    \  #{formatTimeGerWD $ sheetActiveTo sheet}
+
         <div .row>
             <div .col-lg-12>     
-                <h4>Teilnehmer
-                #{participants}
-                $maybe capacity <- courseCapacity course
-                  \ von #{capacity}
-                <form method=post action=@{CourseShowR tid csh} enctype=#{regEnctype}>
-                  ^{regWidget}
-                
-
+                <h2>Abgaben
 
     <hr>